[packaging] Branch 'ucs/3.1/kolab-2.3' - 5 commits - bin/jsshrink.sh bin/updatedb.sh bin/update.sh CHANGELOG config/db.inc.php.dist config/main.inc.php.dist debian/changelog debian/patches debian/rules .htaccess index.php installer/check.php installer/config.php installer/rcube_install.php installer/test.php plugins/acl plugins/additional_message_headers plugins/archive plugins/autologon plugins/database_attachments plugins/debug_logger plugins/emoticons plugins/enigma plugins/example_addressbook plugins/filesystem_attachments plugins/help plugins/hide_blockquote plugins/http_authentication plugins/jqueryui plugins/managesieve plugins/markasjunk plugins/newmail_notifier plugins/new_user_dialog plugins/new_user_identity plugins/password plugins/redundant_attachments plugins/show_additional_headers plugins/squirrelmail_usercopy plugins/subscriptions_option plugins/userinfo plugins/vcard_attachments plugins/virtuser_file plugins/virtuser_query plugins/zipdownload program/include program/js program/lib program/localization program/steps skins/classic skins/larry SQL/mssql SQL/mssql.initial.sql SQL/mssql.upgrade.sql SQL/mysql SQL/mysql.initial.sql SQL/mysql.update.sql SQL/postgres SQL/postgres.initial.sql SQL/postgres.update.sql SQL/sqlite SQL/sqlite.initial.sql SQL/sqlite.update.sql

Christoph Wickert wickert at kolabsys.com
Fri Mar 22 15:45:26 CET 2013


 .htaccess                                                             |    3 
 CHANGELOG                                                             |   18 
 SQL/mssql.initial.sql                                                 |   16 
 SQL/mssql.upgrade.sql                                                 |  273 ----
 SQL/mssql/2009103100.sql                                              |   87 +
 SQL/mssql/2010100600.sql                                              |    9 
 SQL/mssql/2011011200.sql                                              |   10 
 SQL/mssql/2011092800.sql                                              |  127 ++
 SQL/mssql/2011111600.sql                                              |    4 
 SQL/mssql/2011121400.sql                                              |    9 
 SQL/mssql/2012051800.sql                                              |   18 
 SQL/mssql/2012080700.sql                                              |    8 
 SQL/mssql/2013011000.sql                                              |   14 
 SQL/mysql.initial.sql                                                 |   10 
 SQL/mysql.update.sql                                                  |  247 ----
 SQL/mysql/2008030300.sql                                              |   16 
 SQL/mysql/2008040500.sql                                              |    9 
 SQL/mysql/2008060900.sql                                              |    4 
 SQL/mysql/2008092100.sql                                              |   20 
 SQL/mysql/2009090400.sql                                              |   12 
 SQL/mysql/2009103100.sql                                              |   52 
 SQL/mysql/2010042300.sql                                              |    4 
 SQL/mysql/2010100600.sql                                              |    8 
 SQL/mysql/2011011200.sql                                              |    8 
 SQL/mysql/2011092800.sql                                              |   67 +
 SQL/mysql/2011111600.sql                                              |    3 
 SQL/mysql/2011121400.sql                                              |   22 
 SQL/mysql/2012080700.sql                                              |    5 
 SQL/mysql/2013011000.sql                                              |    7 
 SQL/postgres.initial.sql                                              |   13 
 SQL/postgres.update.sql                                               |  185 ---
 SQL/postgres/2008030300.sql                                           |   18 
 SQL/postgres/2008060900.sql                                           |    3 
 SQL/postgres/2008092100.sql                                           |   14 
 SQL/postgres/2009090400.sql                                           |    6 
 SQL/postgres/2009103100.sql                                           |   32 
 SQL/postgres/2010042300.sql                                           |    4 
 SQL/postgres/2010100600.sql                                           |    7 
 SQL/postgres/2011011200.sql                                           |    7 
 SQL/postgres/2011092800.sql                                           |   64 +
 SQL/postgres/2011111600.sql                                           |    3 
 SQL/postgres/2011121400.sql                                           |    5 
 SQL/postgres/2012080700.sql                                           |    7 
 SQL/postgres/2013011000.sql                                           |    4 
 SQL/sqlite.initial.sql                                                |   13 
 SQL/sqlite.update.sql                                                 |  380 ------
 SQL/sqlite/2008030300.sql                                             |   25 
 SQL/sqlite/2008060900.sql                                             |    3 
 SQL/sqlite/2008092100.sql                                             |    4 
 SQL/sqlite/2009090400.sql                                             |    8 
 SQL/sqlite/2009103100.sql                                             |   61 +
 SQL/sqlite/2010042300.sql                                             |   35 
 SQL/sqlite/2010100600.sql                                             |   40 
 SQL/sqlite/2011011200.sql                                             |   41 
 SQL/sqlite/2011092800.sql                                             |   54 
 SQL/sqlite/2011111600.sql                                             |   11 
 SQL/sqlite/2011121400.sql                                             |   38 
 SQL/sqlite/2012080700.sql                                             |   44 
 SQL/sqlite/2013011000.sql                                             |    6 
 SQL/sqlite/2013011700.sql                                             |    2 
 bin/jsshrink.sh                                                       |   23 
 bin/update.sh                                                         |   40 
 bin/updatedb.sh                                                       |  184 +++
 config/db.inc.php.dist                                                |    1 
 config/main.inc.php.dist                                              |    1 
 debian/changelog                                                      |    7 
 debian/patches/fix-advanced-ACL-editing.patch                         |   33 
 debian/patches/series                                                 |    1 
 debian/rules                                                          |   14 
 index.php                                                             |    2 
 installer/check.php                                                   |    7 
 installer/config.php                                                  |    7 
 installer/rcube_install.php                                           |   55 
 installer/test.php                                                    |   20 
 plugins/acl/acl.js                                                    |    2 
 plugins/acl/acl.php                                                   |   27 
 plugins/acl/localization/az_AZ.inc                                    |   72 -
 plugins/acl/localization/bs_BA.inc                                    |   72 -
 plugins/acl/localization/ca_ES.inc                                    |   72 -
 plugins/acl/localization/cs_CZ.inc                                    |   75 -
 plugins/acl/localization/cy_GB.inc                                    |   72 -
 plugins/acl/localization/da_DK.inc                                    |   72 -
 plugins/acl/localization/de_CH.inc                                    |    4 
 plugins/acl/localization/de_DE.inc                                    |   76 -
 plugins/acl/localization/en_GB.inc                                    |   72 -
 plugins/acl/localization/eo.inc                                       |   74 -
 plugins/acl/localization/es_ES.inc                                    |   72 -
 plugins/acl/localization/et_EE.inc                                    |   83 +
 plugins/acl/localization/fa_IR.inc                                    |   72 -
 plugins/acl/localization/fi_FI.inc                                    |  120 +-
 plugins/acl/localization/fr_FR.inc                                    |   72 -
 plugins/acl/localization/gl_ES.inc                                    |   81 +
 plugins/acl/localization/he_IL.inc                                    |   72 -
 plugins/acl/localization/hu_HU.inc                                    |   72 -
 plugins/acl/localization/hy_AM.inc                                    |   72 -
 plugins/acl/localization/id_ID.inc                                    |   91 +
 plugins/acl/localization/it_IT.inc                                    |   77 -
 plugins/acl/localization/ja_JP.inc                                    |   72 -
 plugins/acl/localization/ko_KR.inc                                    |   84 +
 plugins/acl/localization/lt_LT.inc                                    |   81 -
 plugins/acl/localization/nb_NO.inc                                    |   72 -
 plugins/acl/localization/nl_NL.inc                                    |   74 -
 plugins/acl/localization/nn_NO.inc                                    |   72 -
 plugins/acl/localization/pl_PL.inc                                    |   72 -
 plugins/acl/localization/pt_BR.inc                                    |   72 -
 plugins/acl/localization/pt_PT.inc                                    |   72 -
 plugins/acl/localization/ro_RO.inc                                    |   85 +
 plugins/acl/localization/ru_RU.inc                                    |   72 -
 plugins/acl/localization/sk_SK.inc                                    |   72 -
 plugins/acl/localization/sl_SI.inc                                    |   72 -
 plugins/acl/localization/sr_CS.inc                                    |   92 +
 plugins/acl/localization/sv_SE.inc                                    |   72 -
 plugins/acl/localization/tr_TR.inc                                    |   72 -
 plugins/acl/localization/vi_VN.inc                                    |   72 -
 plugins/acl/localization/zh_CN.inc                                    |   89 +
 plugins/acl/localization/zh_TW.inc                                    |   74 -
 plugins/acl/package.xml                                               |    4 
 plugins/acl/tests/Acl.php                                             |   23 
 plugins/additional_message_headers/tests/AdditionalMessageHeaders.php |   23 
 plugins/archive/localization/ar_SA.inc                                |   27 
 plugins/archive/localization/az_AZ.inc                                |   27 
 plugins/archive/localization/be_BE.inc                                |   27 
 plugins/archive/localization/bg_BG.inc                                |   27 
 plugins/archive/localization/br.inc                                   |   27 
 plugins/archive/localization/bs_BA.inc                                |   27 
 plugins/archive/localization/ca_ES.inc                                |   27 
 plugins/archive/localization/cs_CZ.inc                                |   27 
 plugins/archive/localization/cy_GB.inc                                |   27 
 plugins/archive/localization/da_DK.inc                                |   27 
 plugins/archive/localization/de_CH.inc                                |   15 
 plugins/archive/localization/de_DE.inc                                |   27 
 plugins/archive/localization/el_GR.inc                                |   27 
 plugins/archive/localization/en_GB.inc                                |   27 
 plugins/archive/localization/eo.inc                                   |   29 
 plugins/archive/localization/es_AR.inc                                |   27 
 plugins/archive/localization/es_ES.inc                                |   27 
 plugins/archive/localization/et_EE.inc                                |   27 
 plugins/archive/localization/fa_IR.inc                                |   27 
 plugins/archive/localization/fi_FI.inc                                |   27 
 plugins/archive/localization/fr_FR.inc                                |   27 
 plugins/archive/localization/gl_ES.inc                                |   27 
 plugins/archive/localization/he_IL.inc                                |   27 
 plugins/archive/localization/hr_HR.inc                                |   27 
 plugins/archive/localization/hu_HU.inc                                |   27 
 plugins/archive/localization/hy_AM.inc                                |   27 
 plugins/archive/localization/id_ID.inc                                |   27 
 plugins/archive/localization/it_IT.inc                                |   27 
 plugins/archive/localization/ja_JP.inc                                |   27 
 plugins/archive/localization/km_KH.inc                                |   27 
 plugins/archive/localization/ko_KR.inc                                |   27 
 plugins/archive/localization/ku.inc                                   |   27 
 plugins/archive/localization/lt_LT.inc                                |   27 
 plugins/archive/localization/lv_LV.inc                                |   27 
 plugins/archive/localization/ml_IN.inc                                |   27 
 plugins/archive/localization/mr_IN.inc                                |   27 
 plugins/archive/localization/nb_NO.inc                                |   27 
 plugins/archive/localization/nl_NL.inc                                |   27 
 plugins/archive/localization/nn_NO.inc                                |   27 
 plugins/archive/localization/pl_PL.inc                                |   27 
 plugins/archive/localization/pt_BR.inc                                |   27 
 plugins/archive/localization/pt_PT.inc                                |   27 
 plugins/archive/localization/ro_RO.inc                                |   27 
 plugins/archive/localization/ru_RU.inc                                |   27 
 plugins/archive/localization/si_LK.inc                                |   27 
 plugins/archive/localization/sk_SK.inc                                |   27 
 plugins/archive/localization/sl_SI.inc                                |   27 
 plugins/archive/localization/sr_CS.inc                                |   27 
 plugins/archive/localization/sv_SE.inc                                |   29 
 plugins/archive/localization/tr_TR.inc                                |   27 
 plugins/archive/localization/uk_UA.inc                                |   27 
 plugins/archive/localization/vi_VN.inc                                |   27 
 plugins/archive/localization/zh_CN.inc                                |   27 
 plugins/archive/localization/zh_TW.inc                                |   27 
 plugins/archive/tests/Archive.php                                     |   23 
 plugins/autologon/tests/Autologon.php                                 |   23 
 plugins/database_attachments/tests/DatabaseAttachments.php            |   23 
 plugins/debug_logger/debug_logger.php                                 |    7 
 plugins/debug_logger/tests/DebugLogger.php                            |   23 
 plugins/emoticons/tests/Emoticons.php                                 |   23 
 plugins/enigma/tests/Enigma.php                                       |   23 
 plugins/example_addressbook/tests/ExampleAddressbook.php              |   23 
 plugins/filesystem_attachments/tests/FilesystemAttachments.php        |   23 
 plugins/help/localization/ar_SA.inc                                   |   16 
 plugins/help/localization/az_AZ.inc                                   |   16 
 plugins/help/localization/br.inc                                      |   16 
 plugins/help/localization/bs_BA.inc                                   |   16 
 plugins/help/localization/ca_ES.inc                                   |   16 
 plugins/help/localization/cs_CZ.inc                                   |   25 
 plugins/help/localization/cy_GB.inc                                   |   16 
 plugins/help/localization/da_DK.inc                                   |   16 
 plugins/help/localization/de_CH.inc                                   |    4 
 plugins/help/localization/de_DE.inc                                   |   18 
 plugins/help/localization/en_GB.inc                                   |   16 
 plugins/help/localization/eo.inc                                      |   16 
 plugins/help/localization/es_ES.inc                                   |   16 
 plugins/help/localization/et_EE.inc                                   |   16 
 plugins/help/localization/fa_IR.inc                                   |   16 
 plugins/help/localization/fi_FI.inc                                   |   16 
 plugins/help/localization/fr_FR.inc                                   |   16 
 plugins/help/localization/gl_ES.inc                                   |   16 
 plugins/help/localization/he_IL.inc                                   |   16 
 plugins/help/localization/hu_HU.inc                                   |   16 
 plugins/help/localization/hy_AM.inc                                   |   16 
 plugins/help/localization/id_ID.inc                                   |   18 
 plugins/help/localization/it_IT.inc                                   |   16 
 plugins/help/localization/ja_JP.inc                                   |   16 
 plugins/help/localization/km_KH.inc                                   |   16 
 plugins/help/localization/ko_KR.inc                                   |   16 
 plugins/help/localization/lt_LT.inc                                   |   16 
 plugins/help/localization/nb_NO.inc                                   |   16 
 plugins/help/localization/nl_NL.inc                                   |   16 
 plugins/help/localization/nn_NO.inc                                   |   16 
 plugins/help/localization/pl_PL.inc                                   |   16 
 plugins/help/localization/pt_BR.inc                                   |   16 
 plugins/help/localization/pt_PT.inc                                   |   16 
 plugins/help/localization/ru_RU.inc                                   |   23 
 plugins/help/localization/sk_SK.inc                                   |   16 
 plugins/help/localization/sl_SI.inc                                   |   16 
 plugins/help/localization/sr_CS.inc                                   |   16 
 plugins/help/localization/sv_SE.inc                                   |   16 
 plugins/help/localization/tr_TR.inc                                   |   16 
 plugins/help/localization/vi_VN.inc                                   |   18 
 plugins/help/localization/zh_CN.inc                                   |   16 
 plugins/help/localization/zh_TW.inc                                   |   16 
 plugins/help/tests/Help.php                                           |   23 
 plugins/hide_blockquote/localization/az_AZ.inc                        |   16 
 plugins/hide_blockquote/localization/bs_BA.inc                        |   16 
 plugins/hide_blockquote/localization/ca_ES.inc                        |   16 
 plugins/hide_blockquote/localization/cs_CZ.inc                        |   16 
 plugins/hide_blockquote/localization/cy_GB.inc                        |   16 
 plugins/hide_blockquote/localization/da_DK.inc                        |   16 
 plugins/hide_blockquote/localization/de_CH.inc                        |    4 
 plugins/hide_blockquote/localization/de_DE.inc                        |   16 
 plugins/hide_blockquote/localization/en_GB.inc                        |   16 
 plugins/hide_blockquote/localization/eo.inc                           |   16 
 plugins/hide_blockquote/localization/es_ES.inc                        |   18 
 plugins/hide_blockquote/localization/et_EE.inc                        |   16 
 plugins/hide_blockquote/localization/fa_IR.inc                        |   16 
 plugins/hide_blockquote/localization/fi_FI.inc                        |   18 
 plugins/hide_blockquote/localization/fr_FR.inc                        |   16 
 plugins/hide_blockquote/localization/gl_ES.inc                        |   16 
 plugins/hide_blockquote/localization/he_IL.inc                        |   16 
 plugins/hide_blockquote/localization/hu_HU.inc                        |   16 
 plugins/hide_blockquote/localization/hy_AM.inc                        |   16 
 plugins/hide_blockquote/localization/id_ID.inc                        |   19 
 plugins/hide_blockquote/localization/it_IT.inc                        |   16 
 plugins/hide_blockquote/localization/ja_JP.inc                        |   16 
 plugins/hide_blockquote/localization/ko_KR.inc                        |   16 
 plugins/hide_blockquote/localization/lt_LT.inc                        |   16 
 plugins/hide_blockquote/localization/nb_NO.inc                        |   16 
 plugins/hide_blockquote/localization/nl_NL.inc                        |   16 
 plugins/hide_blockquote/localization/nn_NO.inc                        |   16 
 plugins/hide_blockquote/localization/pl_PL.inc                        |   16 
 plugins/hide_blockquote/localization/pt_BR.inc                        |   16 
 plugins/hide_blockquote/localization/pt_PT.inc                        |   16 
 plugins/hide_blockquote/localization/ru_RU.inc                        |   16 
 plugins/hide_blockquote/localization/sk_SK.inc                        |   16 
 plugins/hide_blockquote/localization/sl_SI.inc                        |   16 
 plugins/hide_blockquote/localization/sr_CS.inc                        |   16 
 plugins/hide_blockquote/localization/sv_SE.inc                        |   16 
 plugins/hide_blockquote/localization/tr_TR.inc                        |   16 
 plugins/hide_blockquote/localization/vi_VN.inc                        |   16 
 plugins/hide_blockquote/localization/zh_CN.inc                        |   16 
 plugins/hide_blockquote/localization/zh_TW.inc                        |   16 
 plugins/hide_blockquote/tests/HideBlockquote.php                      |   23 
 plugins/http_authentication/tests/HttpAuthentication.php              |   23 
 plugins/jqueryui/tests/Jqueryui.php                                   |   23 
 plugins/managesieve/Changelog                                         |    4 
 plugins/managesieve/localization/az_AZ.inc                            |  101 +
 plugins/managesieve/localization/be_BE.inc                            |  137 ++
 plugins/managesieve/localization/bg_BG.inc                            |  153 ++
 plugins/managesieve/localization/bs_BA.inc                            |  101 +
 plugins/managesieve/localization/ca_ES.inc                            |  101 +
 plugins/managesieve/localization/cs_CZ.inc                            |  101 +
 plugins/managesieve/localization/cy_GB.inc                            |  101 +
 plugins/managesieve/localization/da_DK.inc                            |  101 +
 plugins/managesieve/localization/de_CH.inc                            |    4 
 plugins/managesieve/localization/de_DE.inc                            |  101 +
 plugins/managesieve/localization/el_GR.inc                            |  146 ++
 plugins/managesieve/localization/en_GB.inc                            |  101 +
 plugins/managesieve/localization/eo.inc                               |  139 ++
 plugins/managesieve/localization/es_AR.inc                            |  142 +-
 plugins/managesieve/localization/es_ES.inc                            |  111 +
 plugins/managesieve/localization/et_EE.inc                            |  101 +
 plugins/managesieve/localization/fa_IR.inc                            |  101 +
 plugins/managesieve/localization/fi_FI.inc                            |  249 ++--
 plugins/managesieve/localization/fr_FR.inc                            |  101 +
 plugins/managesieve/localization/gl_ES.inc                            |  141 +-
 plugins/managesieve/localization/he_IL.inc                            |  101 +
 plugins/managesieve/localization/hr_HR.inc                            |  101 +
 plugins/managesieve/localization/hu_HU.inc                            |  101 +
 plugins/managesieve/localization/hy_AM.inc                            |  101 +
 plugins/managesieve/localization/ia.inc                               |  168 ++
 plugins/managesieve/localization/id_ID.inc                            |  112 +
 plugins/managesieve/localization/it_IT.inc                            |  101 +
 plugins/managesieve/localization/ja_JP.inc                            |  101 +
 plugins/managesieve/localization/ko_KR.inc                            |  119 +-
 plugins/managesieve/localization/lt_LT.inc                            |   72 +
 plugins/managesieve/localization/lv_LV.inc                            |   92 +
 plugins/managesieve/localization/ml_IN.inc                            |  101 +
 plugins/managesieve/localization/mr_IN.inc                            |  156 ++
 plugins/managesieve/localization/nb_NO.inc                            |  101 +
 plugins/managesieve/localization/nl_NL.inc                            |  101 +
 plugins/managesieve/localization/nn_NO.inc                            |  101 +
 plugins/managesieve/localization/pl_PL.inc                            |  101 +
 plugins/managesieve/localization/pt_BR.inc                            |  101 +
 plugins/managesieve/localization/pt_PT.inc                            |  101 +
 plugins/managesieve/localization/ro_RO.inc                            |  102 +
 plugins/managesieve/localization/ru_RU.inc                            |  101 +
 plugins/managesieve/localization/si_LK.inc                            |  150 ++
 plugins/managesieve/localization/sk_SK.inc                            |  101 +
 plugins/managesieve/localization/sl_SI.inc                            |  101 +
 plugins/managesieve/localization/sv_SE.inc                            |  101 +
 plugins/managesieve/localization/tr_TR.inc                            |  101 +
 plugins/managesieve/localization/uk_UA.inc                            |  143 +-
 plugins/managesieve/localization/vi_VN.inc                            |  101 +
 plugins/managesieve/localization/zh_CN.inc                            |   99 +
 plugins/managesieve/localization/zh_TW.inc                            |  110 +
 plugins/managesieve/managesieve.php                                   |   14 
 plugins/managesieve/package.xml                                       |    4 
 plugins/managesieve/tests/Managesieve.php                             |   23 
 plugins/markasjunk/localization/az_AZ.inc                             |   16 
 plugins/markasjunk/localization/be_BE.inc                             |   18 
 plugins/markasjunk/localization/br.inc                                |   16 
 plugins/markasjunk/localization/bs_BA.inc                             |   16 
 plugins/markasjunk/localization/ca_ES.inc                             |   16 
 plugins/markasjunk/localization/cs_CZ.inc                             |   16 
 plugins/markasjunk/localization/cy_GB.inc                             |   16 
 plugins/markasjunk/localization/da_DK.inc                             |   16 
 plugins/markasjunk/localization/de_CH.inc                             |    4 
 plugins/markasjunk/localization/de_DE.inc                             |   16 
 plugins/markasjunk/localization/el_GR.inc                             |   18 
 plugins/markasjunk/localization/en_GB.inc                             |   16 
 plugins/markasjunk/localization/eo.inc                                |   16 
 plugins/markasjunk/localization/es_AR.inc                             |   18 
 plugins/markasjunk/localization/es_ES.inc                             |   16 
 plugins/markasjunk/localization/et_EE.inc                             |   16 
 plugins/markasjunk/localization/fa_IR.inc                             |   16 
 plugins/markasjunk/localization/fi_FI.inc                             |   18 
 plugins/markasjunk/localization/fr_FR.inc                             |   16 
 plugins/markasjunk/localization/gl_ES.inc                             |   18 
 plugins/markasjunk/localization/he_IL.inc                             |   16 
 plugins/markasjunk/localization/hr_HR.inc                             |   18 
 plugins/markasjunk/localization/hu_HU.inc                             |   16 
 plugins/markasjunk/localization/hy_AM.inc                             |   16 
 plugins/markasjunk/localization/id_ID.inc                             |   18 
 plugins/markasjunk/localization/it_IT.inc                             |   16 
 plugins/markasjunk/localization/ja_JP.inc                             |   16 
 plugins/markasjunk/localization/km_KH.inc                             |   16 
 plugins/markasjunk/localization/ko_KR.inc                             |   16 
 plugins/markasjunk/localization/ku.inc                                |   18 
 plugins/markasjunk/localization/lt_LT.inc                             |   16 
 plugins/markasjunk/localization/lv_LV.inc                             |   18 
 plugins/markasjunk/localization/ml_IN.inc                             |   17 
 plugins/markasjunk/localization/mr_IN.inc                             |   18 
 plugins/markasjunk/localization/nb_NO.inc                             |   16 
 plugins/markasjunk/localization/nl_NL.inc                             |   16 
 plugins/markasjunk/localization/nn_NO.inc                             |   16 
 plugins/markasjunk/localization/pl_PL.inc                             |   16 
 plugins/markasjunk/localization/pt_BR.inc                             |   16 
 plugins/markasjunk/localization/pt_PT.inc                             |   16 
 plugins/markasjunk/localization/ro_RO.inc                             |   16 
 plugins/markasjunk/localization/ru_RU.inc                             |   16 
 plugins/markasjunk/localization/si_LK.inc                             |   18 
 plugins/markasjunk/localization/sk_SK.inc                             |   16 
 plugins/markasjunk/localization/sl_SI.inc                             |   16 
 plugins/markasjunk/localization/sr_CS.inc                             |   16 
 plugins/markasjunk/localization/sv_SE.inc                             |   16 
 plugins/markasjunk/localization/tr_TR.inc                             |   16 
 plugins/markasjunk/localization/uk_UA.inc                             |   18 
 plugins/markasjunk/localization/vi_VN.inc                             |   16 
 plugins/markasjunk/localization/zh_CN.inc                             |   16 
 plugins/markasjunk/localization/zh_TW.inc                             |   16 
 plugins/markasjunk/tests/Markasjunk.php                               |   23 
 plugins/new_user_dialog/localization/az_AZ.inc                        |   16 
 plugins/new_user_dialog/localization/be_BE.inc                        |   17 
 plugins/new_user_dialog/localization/bg_BG.inc                        |   17 
 plugins/new_user_dialog/localization/bs_BA.inc                        |   17 
 plugins/new_user_dialog/localization/ca_ES.inc                        |   16 
 plugins/new_user_dialog/localization/cs_CZ.inc                        |   17 
 plugins/new_user_dialog/localization/cy_GB.inc                        |   17 
 plugins/new_user_dialog/localization/da_DK.inc                        |   17 
 plugins/new_user_dialog/localization/de_CH.inc                        |    4 
 plugins/new_user_dialog/localization/de_DE.inc                        |   17 
 plugins/new_user_dialog/localization/el_GR.inc                        |   17 
 plugins/new_user_dialog/localization/en_GB.inc                        |   17 
 plugins/new_user_dialog/localization/eo.inc                           |   16 
 plugins/new_user_dialog/localization/es_ES.inc                        |   17 
 plugins/new_user_dialog/localization/et_EE.inc                        |   17 
 plugins/new_user_dialog/localization/fa_IR.inc                        |   17 
 plugins/new_user_dialog/localization/fi_FI.inc                        |   19 
 plugins/new_user_dialog/localization/fr_FR.inc                        |   17 
 plugins/new_user_dialog/localization/gl_ES.inc                        |   17 
 plugins/new_user_dialog/localization/he_IL.inc                        |   17 
 plugins/new_user_dialog/localization/hr_HR.inc                        |   17 
 plugins/new_user_dialog/localization/hu_HU.inc                        |   17 
 plugins/new_user_dialog/localization/hy_AM.inc                        |   16 
 plugins/new_user_dialog/localization/id_ID.inc                        |   17 
 plugins/new_user_dialog/localization/it_IT.inc                        |   17 
 plugins/new_user_dialog/localization/ja_JP.inc                        |   17 
 plugins/new_user_dialog/localization/km_KH.inc                        |   16 
 plugins/new_user_dialog/localization/ko_KR.inc                        |   16 
 plugins/new_user_dialog/localization/ku.inc                           |   17 
 plugins/new_user_dialog/localization/lt_LT.inc                        |   17 
 plugins/new_user_dialog/localization/lv_LV.inc                        |   17 
 plugins/new_user_dialog/localization/ml_IN.inc                        |   16 
 plugins/new_user_dialog/localization/mr_IN.inc                        |   17 
 plugins/new_user_dialog/localization/nb_NO.inc                        |   16 
 plugins/new_user_dialog/localization/nl_NL.inc                        |   17 
 plugins/new_user_dialog/localization/nn_NO.inc                        |   16 
 plugins/new_user_dialog/localization/pl_PL.inc                        |   17 
 plugins/new_user_dialog/localization/pt_BR.inc                        |   16 
 plugins/new_user_dialog/localization/pt_PT.inc                        |   17 
 plugins/new_user_dialog/localization/ro_RO.inc                        |   17 
 plugins/new_user_dialog/localization/ru_RU.inc                        |   17 
 plugins/new_user_dialog/localization/sk_SK.inc                        |   17 
 plugins/new_user_dialog/localization/sl_SI.inc                        |   17 
 plugins/new_user_dialog/localization/sr_CS.inc                        |   16 
 plugins/new_user_dialog/localization/sv_SE.inc                        |   16 
 plugins/new_user_dialog/localization/tr_TR.inc                        |   17 
 plugins/new_user_dialog/localization/uk_UA.inc                        |   17 
 plugins/new_user_dialog/localization/vi_VN.inc                        |   16 
 plugins/new_user_dialog/localization/zh_CN.inc                        |   16 
 plugins/new_user_dialog/localization/zh_TW.inc                        |   17 
 plugins/new_user_dialog/tests/NewUserDialog.php                       |   23 
 plugins/new_user_identity/tests/NewUserIdentity.php                   |   23 
 plugins/newmail_notifier/localization/ar_SA.inc                       |   17 
 plugins/newmail_notifier/localization/az_AZ.inc                       |   17 
 plugins/newmail_notifier/localization/be_BE.inc                       |   18 
 plugins/newmail_notifier/localization/br.inc                          |   24 
 plugins/newmail_notifier/localization/bs_BA.inc                       |   18 
 plugins/newmail_notifier/localization/ca_ES.inc                       |   17 
 plugins/newmail_notifier/localization/cs_CZ.inc                       |   18 
 plugins/newmail_notifier/localization/cy_GB.inc                       |   18 
 plugins/newmail_notifier/localization/da_DK.inc                       |   18 
 plugins/newmail_notifier/localization/de_CH.inc                       |    2 
 plugins/newmail_notifier/localization/de_DE.inc                       |   18 
 plugins/newmail_notifier/localization/en_GB.inc                       |   18 
 plugins/newmail_notifier/localization/eo.inc                          |   17 
 plugins/newmail_notifier/localization/es_ES.inc                       |   20 
 plugins/newmail_notifier/localization/et_EE.inc                       |   18 
 plugins/newmail_notifier/localization/fa_IR.inc                       |   18 
 plugins/newmail_notifier/localization/fi_FI.inc                       |   24 
 plugins/newmail_notifier/localization/fr_FR.inc                       |   18 
 plugins/newmail_notifier/localization/gl_ES.inc                       |   24 
 plugins/newmail_notifier/localization/he_IL.inc                       |   18 
 plugins/newmail_notifier/localization/hr_HR.inc                       |   18 
 plugins/newmail_notifier/localization/hu_HU.inc                       |   18 
 plugins/newmail_notifier/localization/hy_AM.inc                       |   17 
 plugins/newmail_notifier/localization/ia.inc                          |   22 
 plugins/newmail_notifier/localization/id_ID.inc                       |   24 
 plugins/newmail_notifier/localization/it_IT.inc                       |   18 
 plugins/newmail_notifier/localization/ja_JP.inc                       |   18 
 plugins/newmail_notifier/localization/km_KH.inc                       |   21 
 plugins/newmail_notifier/localization/ko_KR.inc                       |   17 
 plugins/newmail_notifier/localization/lt_LT.inc                       |   18 
 plugins/newmail_notifier/localization/lv_LV.inc                       |   18 
 plugins/newmail_notifier/localization/ml_IN.inc                       |   17 
 plugins/newmail_notifier/localization/mr_IN.inc                       |   22 
 plugins/newmail_notifier/localization/nb_NO.inc                       |   17 
 plugins/newmail_notifier/localization/nl_NL.inc                       |   18 
 plugins/newmail_notifier/localization/nn_NO.inc                       |   17 
 plugins/newmail_notifier/localization/pl_PL.inc                       |   18 
 plugins/newmail_notifier/localization/pt_BR.inc                       |   18 
 plugins/newmail_notifier/localization/pt_PT.inc                       |   18 
 plugins/newmail_notifier/localization/ro_RO.inc                       |   18 
 plugins/newmail_notifier/localization/ru_RU.inc                       |   18 
 plugins/newmail_notifier/localization/si_LK.inc                       |   26 
 plugins/newmail_notifier/localization/sk_SK.inc                       |   18 
 plugins/newmail_notifier/localization/sl_SI.inc                       |   18 
 plugins/newmail_notifier/localization/sr_CS.inc                       |   17 
 plugins/newmail_notifier/localization/sv_SE.inc                       |   18 
 plugins/newmail_notifier/localization/tr_TR.inc                       |   18 
 plugins/newmail_notifier/localization/uk_UA.inc                       |   18 
 plugins/newmail_notifier/localization/vi_VN.inc                       |   17 
 plugins/newmail_notifier/localization/zh_CN.inc                       |   17 
 plugins/newmail_notifier/localization/zh_TW.inc                       |   18 
 plugins/newmail_notifier/newmail_notifier.php                         |    2 
 plugins/newmail_notifier/tests/NewmailNotifier.php                    |   23 
 plugins/password/localization/az_AZ.inc                               |   46 
 plugins/password/localization/bg_BG.inc                               |   43 
 plugins/password/localization/br.inc                                  |   45 
 plugins/password/localization/bs_BA.inc                               |   46 
 plugins/password/localization/ca_ES.inc                               |   46 
 plugins/password/localization/cs_CZ.inc                               |   46 
 plugins/password/localization/cy_GB.inc                               |   46 
 plugins/password/localization/da_DK.inc                               |   46 
 plugins/password/localization/de_CH.inc                               |    2 
 plugins/password/localization/de_DE.inc                               |   46 
 plugins/password/localization/en_GB.inc                               |   46 
 plugins/password/localization/eo.inc                                  |   46 
 plugins/password/localization/es_AR.inc                               |   46 
 plugins/password/localization/es_ES.inc                               |   46 
 plugins/password/localization/et_EE.inc                               |   46 
 plugins/password/localization/fa_IR.inc                               |   46 
 plugins/password/localization/fi_FI.inc                               |   46 
 plugins/password/localization/fr_FR.inc                               |   46 
 plugins/password/localization/gl_ES.inc                               |   46 
 plugins/password/localization/he_IL.inc                               |   46 
 plugins/password/localization/hr_HR.inc                               |   46 
 plugins/password/localization/hu_HU.inc                               |   46 
 plugins/password/localization/hy_AM.inc                               |   46 
 plugins/password/localization/id_ID.inc                               |   35 
 plugins/password/localization/it_IT.inc                               |   46 
 plugins/password/localization/ja_JP.inc                               |   46 
 plugins/password/localization/ko_KR.inc                               |   46 
 plugins/password/localization/ku.inc                                  |   33 
 plugins/password/localization/lt_LT.inc                               |   46 
 plugins/password/localization/lv_LV.inc                               |   45 
 plugins/password/localization/nb_NO.inc                               |   46 
 plugins/password/localization/nl_NL.inc                               |   46 
 plugins/password/localization/nn_NO.inc                               |   46 
 plugins/password/localization/pl_PL.inc                               |   46 
 plugins/password/localization/pt_BR.inc                               |   46 
 plugins/password/localization/pt_PT.inc                               |   46 
 plugins/password/localization/ro_RO.inc                               |   46 
 plugins/password/localization/ru_RU.inc                               |   46 
 plugins/password/localization/sk_SK.inc                               |   46 
 plugins/password/localization/sl_SI.inc                               |   46 
 plugins/password/localization/sr_CS.inc                               |   46 
 plugins/password/localization/sv_SE.inc                               |   46 
 plugins/password/localization/tr_TR.inc                               |   46 
 plugins/password/localization/vi_VN.inc                               |   46 
 plugins/password/localization/zh_CN.inc                               |   46 
 plugins/password/localization/zh_TW.inc                               |   46 
 plugins/password/tests/Password.php                                   |   23 
 plugins/redundant_attachments/tests/RedundantAttachments.php          |   23 
 plugins/show_additional_headers/tests/ShowAdditionalHeaders.php       |   23 
 plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php          |   23 
 plugins/subscriptions_option/localization/bs_BA.inc                   |   18 
 plugins/subscriptions_option/localization/ca_ES.inc                   |   18 
 plugins/subscriptions_option/localization/cs_CZ.inc                   |   18 
 plugins/subscriptions_option/localization/cy_GB.inc                   |   18 
 plugins/subscriptions_option/localization/da_DK.inc                   |   18 
 plugins/subscriptions_option/localization/de_CH.inc                   |    2 
 plugins/subscriptions_option/localization/de_DE.inc                   |   18 
 plugins/subscriptions_option/localization/en_GB.inc                   |   18 
 plugins/subscriptions_option/localization/eo.inc                      |   18 
 plugins/subscriptions_option/localization/es_ES.inc                   |   18 
 plugins/subscriptions_option/localization/et_EE.inc                   |   18 
 plugins/subscriptions_option/localization/fa_IR.inc                   |   18 
 plugins/subscriptions_option/localization/fi_FI.inc                   |   18 
 plugins/subscriptions_option/localization/fr_FR.inc                   |   18 
 plugins/subscriptions_option/localization/gl_ES.inc                   |   18 
 plugins/subscriptions_option/localization/he_IL.inc                   |   18 
 plugins/subscriptions_option/localization/hu_HU.inc                   |   18 
 plugins/subscriptions_option/localization/hy_AM.inc                   |   18 
 plugins/subscriptions_option/localization/it_IT.inc                   |   18 
 plugins/subscriptions_option/localization/ja_JP.inc                   |   18 
 plugins/subscriptions_option/localization/ko_KR.inc                   |   18 
 plugins/subscriptions_option/localization/lt_LT.inc                   |   18 
 plugins/subscriptions_option/localization/nb_NO.inc                   |   18 
 plugins/subscriptions_option/localization/nl_NL.inc                   |   18 
 plugins/subscriptions_option/localization/pl_PL.inc                   |   18 
 plugins/subscriptions_option/localization/pt_BR.inc                   |   18 
 plugins/subscriptions_option/localization/pt_PT.inc                   |   18 
 plugins/subscriptions_option/localization/ru_RU.inc                   |   18 
 plugins/subscriptions_option/localization/sk_SK.inc                   |   18 
 plugins/subscriptions_option/localization/sl_SI.inc                   |   18 
 plugins/subscriptions_option/localization/sr_CS.inc                   |   18 
 plugins/subscriptions_option/localization/sv_SE.inc                   |   18 
 plugins/subscriptions_option/localization/tr_TR.inc                   |   18 
 plugins/subscriptions_option/localization/vi_VN.inc                   |   18 
 plugins/subscriptions_option/localization/zh_CN.inc                   |   18 
 plugins/subscriptions_option/localization/zh_TW.inc                   |   18 
 plugins/subscriptions_option/tests/SubscriptionsOption.php            |   23 
 plugins/userinfo/localization/ar_SA.inc                               |   17 
 plugins/userinfo/localization/az_AZ.inc                               |   16 
 plugins/userinfo/localization/be_BE.inc                               |   17 
 plugins/userinfo/localization/br.inc                                  |   17 
 plugins/userinfo/localization/bs_BA.inc                               |   17 
 plugins/userinfo/localization/ca_ES.inc                               |   16 
 plugins/userinfo/localization/cs_CZ.inc                               |   17 
 plugins/userinfo/localization/cy_GB.inc                               |   17 
 plugins/userinfo/localization/da_DK.inc                               |   17 
 plugins/userinfo/localization/de_CH.inc                               |    2 
 plugins/userinfo/localization/de_DE.inc                               |   17 
 plugins/userinfo/localization/en_GB.inc                               |   17 
 plugins/userinfo/localization/eo.inc                                  |   17 
 plugins/userinfo/localization/es_ES.inc                               |   17 
 plugins/userinfo/localization/et_EE.inc                               |   17 
 plugins/userinfo/localization/fa_IR.inc                               |   17 
 plugins/userinfo/localization/fi_FI.inc                               |   19 
 plugins/userinfo/localization/fr_FR.inc                               |   17 
 plugins/userinfo/localization/gl_ES.inc                               |   17 
 plugins/userinfo/localization/he_IL.inc                               |   17 
 plugins/userinfo/localization/hr_HR.inc                               |   17 
 plugins/userinfo/localization/hu_HU.inc                               |   17 
 plugins/userinfo/localization/hy_AM.inc                               |   16 
 plugins/userinfo/localization/ia.inc                                  |   16 
 plugins/userinfo/localization/id_ID.inc                               |   17 
 plugins/userinfo/localization/it_IT.inc                               |   17 
 plugins/userinfo/localization/ja_JP.inc                               |   17 
 plugins/userinfo/localization/km_KH.inc                               |   16 
 plugins/userinfo/localization/ko_KR.inc                               |   16 
 plugins/userinfo/localization/ku.inc                                  |   17 
 plugins/userinfo/localization/lt_LT.inc                               |   17 
 plugins/userinfo/localization/lv_LV.inc                               |   17 
 plugins/userinfo/localization/ml_IN.inc                               |   16 
 plugins/userinfo/localization/mr_IN.inc                               |   19 
 plugins/userinfo/localization/nb_NO.inc                               |   16 
 plugins/userinfo/localization/nl_NL.inc                               |   17 
 plugins/userinfo/localization/nn_NO.inc                               |   16 
 plugins/userinfo/localization/pl_PL.inc                               |   17 
 plugins/userinfo/localization/pt_BR.inc                               |   17 
 plugins/userinfo/localization/pt_PT.inc                               |   17 
 plugins/userinfo/localization/ro_RO.inc                               |   17 
 plugins/userinfo/localization/ru_RU.inc                               |   17 
 plugins/userinfo/localization/sk_SK.inc                               |   17 
 plugins/userinfo/localization/sl_SI.inc                               |   17 
 plugins/userinfo/localization/sr_CS.inc                               |   16 
 plugins/userinfo/localization/sv_SE.inc                               |   16 
 plugins/userinfo/localization/tr_TR.inc                               |   17 
 plugins/userinfo/localization/uk_UA.inc                               |   17 
 plugins/userinfo/localization/vi_VN.inc                               |   16 
 plugins/userinfo/localization/zh_CN.inc                               |   19 
 plugins/userinfo/localization/zh_TW.inc                               |   17 
 plugins/userinfo/tests/Userinfo.php                                   |   23 
 plugins/vcard_attachments/localization/az_AZ.inc                      |   16 
 plugins/vcard_attachments/localization/be_BE.inc                      |   17 
 plugins/vcard_attachments/localization/bs_BA.inc                      |   17 
 plugins/vcard_attachments/localization/ca_ES.inc                      |   16 
 plugins/vcard_attachments/localization/cs_CZ.inc                      |   17 
 plugins/vcard_attachments/localization/cy_GB.inc                      |   17 
 plugins/vcard_attachments/localization/da_DK.inc                      |   17 
 plugins/vcard_attachments/localization/de_CH.inc                      |    2 
 plugins/vcard_attachments/localization/de_DE.inc                      |   17 
 plugins/vcard_attachments/localization/en_GB.inc                      |   17 
 plugins/vcard_attachments/localization/eo.inc                         |   16 
 plugins/vcard_attachments/localization/es_ES.inc                      |   17 
 plugins/vcard_attachments/localization/et_EE.inc                      |   17 
 plugins/vcard_attachments/localization/fa_IR.inc                      |   17 
 plugins/vcard_attachments/localization/fi_FI.inc                      |   17 
 plugins/vcard_attachments/localization/fr_FR.inc                      |   17 
 plugins/vcard_attachments/localization/gl_ES.inc                      |   17 
 plugins/vcard_attachments/localization/he_IL.inc                      |   17 
 plugins/vcard_attachments/localization/hr_HR.inc                      |   17 
 plugins/vcard_attachments/localization/hu_HU.inc                      |   17 
 plugins/vcard_attachments/localization/hy_AM.inc                      |   16 
 plugins/vcard_attachments/localization/id_ID.inc                      |   19 
 plugins/vcard_attachments/localization/it_IT.inc                      |   17 
 plugins/vcard_attachments/localization/ja_JP.inc                      |   17 
 plugins/vcard_attachments/localization/km_KH.inc                      |   16 
 plugins/vcard_attachments/localization/ko_KR.inc                      |   16 
 plugins/vcard_attachments/localization/lt_LT.inc                      |   17 
 plugins/vcard_attachments/localization/lv_LV.inc                      |   17 
 plugins/vcard_attachments/localization/ml_IN.inc                      |   16 
 plugins/vcard_attachments/localization/mr_IN.inc                      |   17 
 plugins/vcard_attachments/localization/nb_NO.inc                      |   17 
 plugins/vcard_attachments/localization/nl_NL.inc                      |   17 
 plugins/vcard_attachments/localization/nn_NO.inc                      |   16 
 plugins/vcard_attachments/localization/pl_PL.inc                      |   17 
 plugins/vcard_attachments/localization/pt_BR.inc                      |   17 
 plugins/vcard_attachments/localization/pt_PT.inc                      |   17 
 plugins/vcard_attachments/localization/ro_RO.inc                      |   17 
 plugins/vcard_attachments/localization/ru_RU.inc                      |   17 
 plugins/vcard_attachments/localization/si_LK.inc                      |   17 
 plugins/vcard_attachments/localization/sk_SK.inc                      |   17 
 plugins/vcard_attachments/localization/sl_SI.inc                      |   17 
 plugins/vcard_attachments/localization/sr_CS.inc                      |   16 
 plugins/vcard_attachments/localization/sv_SE.inc                      |   17 
 plugins/vcard_attachments/localization/tr_TR.inc                      |   17 
 plugins/vcard_attachments/localization/uk_UA.inc                      |   17 
 plugins/vcard_attachments/localization/vi_VN.inc                      |   17 
 plugins/vcard_attachments/localization/zh_CN.inc                      |   16 
 plugins/vcard_attachments/localization/zh_TW.inc                      |   17 
 plugins/vcard_attachments/tests/VcardAttachments.php                  |   23 
 plugins/virtuser_file/tests/VirtuserFile.php                          |   23 
 plugins/virtuser_query/tests/VirtuserQuery.php                        |   23 
 plugins/zipdownload/localization/az_AZ.inc                            |   16 
 plugins/zipdownload/localization/br.inc                               |   16 
 plugins/zipdownload/localization/bs_BA.inc                            |   16 
 plugins/zipdownload/localization/ca_ES.inc                            |   19 
 plugins/zipdownload/localization/cs_CZ.inc                            |   19 
 plugins/zipdownload/localization/cy_GB.inc                            |   16 
 plugins/zipdownload/localization/da_DK.inc                            |   19 
 plugins/zipdownload/localization/de_CH.inc                            |    2 
 plugins/zipdownload/localization/de_DE.inc                            |   19 
 plugins/zipdownload/localization/en_GB.inc                            |   19 
 plugins/zipdownload/localization/es_AR.inc                            |   20 
 plugins/zipdownload/localization/es_ES.inc                            |   19 
 plugins/zipdownload/localization/et_EE.inc                            |   16 
 plugins/zipdownload/localization/fa_IR.inc                            |   16 
 plugins/zipdownload/localization/fr_FR.inc                            |   19 
 plugins/zipdownload/localization/gl_ES.inc                            |   19 
 plugins/zipdownload/localization/he_IL.inc                            |   16 
 plugins/zipdownload/localization/hu_HU.inc                            |   19 
 plugins/zipdownload/localization/it_IT.inc                            |   19 
 plugins/zipdownload/localization/ja_JP.inc                            |   16 
 plugins/zipdownload/localization/km_KH.inc                            |   16 
 plugins/zipdownload/localization/lt_LT.inc                            |   16 
 plugins/zipdownload/localization/nb_NO.inc                            |   16 
 plugins/zipdownload/localization/nl_NL.inc                            |   19 
 plugins/zipdownload/localization/nn_NO.inc                            |   16 
 plugins/zipdownload/localization/pl_PL.inc                            |   19 
 plugins/zipdownload/localization/pt_BR.inc                            |   16 
 plugins/zipdownload/localization/pt_PT.inc                            |   16 
 plugins/zipdownload/localization/ro_RO.inc                            |   20 
 plugins/zipdownload/localization/ru_RU.inc                            |   19 
 plugins/zipdownload/localization/sk_SK.inc                            |   16 
 plugins/zipdownload/localization/sr_CS.inc                            |   16 
 plugins/zipdownload/localization/sv_SE.inc                            |   16 
 plugins/zipdownload/localization/tr_TR.inc                            |   19 
 plugins/zipdownload/localization/vi_VN.inc                            |   16 
 plugins/zipdownload/localization/zh_TW.inc                            |   16 
 plugins/zipdownload/tests/Zipdownload.php                             |   23 
 plugins/zipdownload/zipdownload.php                                   |   10 
 program/include/iniset.php                                            |    2 
 program/include/rcmail_html_page.php                                  |   16 
 program/include/rcmail_output_html.php                                |   21 
 program/js/app.js                                                     |  380 +++---
 program/js/app.js.src                                                 |   85 -
 program/lib/Roundcube/rcube_addressbook.php                           |   16 
 program/lib/Roundcube/rcube_csv2vcard.php                             |    6 
 program/lib/Roundcube/rcube_db.php                                    |    3 
 program/lib/Roundcube/rcube_db_mysql.php                              |    3 
 program/lib/Roundcube/rcube_html2text.php                             |   94 -
 program/lib/Roundcube/rcube_imap.php                                  |   30 
 program/lib/Roundcube/rcube_imap_generic.php                          |    2 
 program/lib/Roundcube/rcube_ldap.php                                  |  184 +--
 program/lib/Roundcube/rcube_message.php                               |    2 
 program/lib/Roundcube/rcube_mime.php                                  |   30 
 program/lib/Roundcube/rcube_spellchecker.php                          |    4 
 program/lib/Roundcube/rcube_string_replacer.php                       |    2 
 program/lib/Roundcube/rcube_utils.php                                 |    2 
 program/lib/Roundcube/rcube_vcard.php                                 |    2 
 program/lib/Roundcube/rcube_washtml.php                               |    3 
 program/lib/tnef_decoder.php                                          |   11 
 program/localization/ar_SA/labels.inc                                 |  462 ++++---
 program/localization/ar_SA/messages.inc                               |   39 
 program/localization/ast/labels.inc                                   |  530 ++++++---
 program/localization/ast/messages.inc                                 |   97 +
 program/localization/az_AZ/labels.inc                                 |  443 ++++---
 program/localization/az_AZ/messages.inc                               |   32 
 program/localization/be_BE/labels.inc                                 |  542 ++++++++-
 program/localization/be_BE/messages.inc                               |  158 ++
 program/localization/bg_BG/labels.inc                                 |  483 ++++----
 program/localization/bg_BG/messages.inc                               |   50 
 program/localization/bn_BD/labels.inc                                 |  532 ++++++---
 program/localization/bn_BD/messages.inc                               |  107 +
 program/localization/br/labels.inc                                    |  577 +++++++--
 program/localization/br/messages.inc                                  |  120 +-
 program/localization/bs_BA/labels.inc                                 |  443 ++++---
 program/localization/bs_BA/messages.inc                               |   32 
 program/localization/ca_ES/labels.inc                                 |  447 ++++---
 program/localization/ca_ES/messages.inc                               |   32 
 program/localization/cs_CZ/labels.inc                                 |  449 ++++---
 program/localization/cs_CZ/messages.inc                               |   37 
 program/localization/cy_GB/labels.inc                                 |  443 ++++---
 program/localization/cy_GB/messages.inc                               |   32 
 program/localization/da_DK/labels.inc                                 |  456 ++++---
 program/localization/da_DK/messages.inc                               |   39 
 program/localization/de_CH/labels.inc                                 |    4 
 program/localization/de_CH/messages.inc                               |    2 
 program/localization/de_DE/labels.inc                                 |  443 ++++---
 program/localization/de_DE/messages.inc                               |   36 
 program/localization/el_GR/labels.inc                                 |  462 ++++---
 program/localization/el_GR/messages.inc                               |   68 -
 program/localization/en_GB/labels.inc                                 |  443 ++++---
 program/localization/en_GB/messages.inc                               |   32 
 program/localization/eo/labels.inc                                    |  543 ++++++---
 program/localization/eo/messages.inc                                  |  112 +
 program/localization/es_AR/labels.inc                                 |  486 ++++++--
 program/localization/es_AR/messages.inc                               |   88 +
 program/localization/es_ES/labels.inc                                 |  451 ++++---
 program/localization/es_ES/messages.inc                               |  191 +--
 program/localization/et_EE/labels.inc                                 |  447 ++++---
 program/localization/et_EE/messages.inc                               |   36 
 program/localization/eu_ES/labels.inc                                 |  557 +++++++--
 program/localization/eu_ES/messages.inc                               |  117 +-
 program/localization/fa_AF/labels.inc                                 |  532 ++++++---
 program/localization/fa_AF/messages.inc                               |  107 +
 program/localization/fa_IR/labels.inc                                 |  473 ++++----
 program/localization/fa_IR/messages.inc                               |   34 
 program/localization/fi_FI/labels.inc                                 |  456 ++++---
 program/localization/fi_FI/messages.inc                               |   39 
 program/localization/fr_FR/labels.inc                                 |  444 ++++---
 program/localization/fr_FR/messages.inc                               |   33 
 program/localization/fy_NL/labels.inc                                 |  559 ++++++++-
 program/localization/ga_IE/labels.inc                                 |  577 +++++++--
 program/localization/ga_IE/messages.inc                               |  123 +-
 program/localization/gl_ES/labels.inc                                 |  459 ++++---
 program/localization/gl_ES/messages.inc                               |   42 
 program/localization/he_IL/labels.inc                                 |  449 ++++---
 program/localization/he_IL/messages.inc                               |   36 
 program/localization/hi_IN/labels.inc                                 |  578 +++++++--
 program/localization/hi_IN/messages.inc                               |  128 +-
 program/localization/hr_HR/labels.inc                                 |  463 ++++---
 program/localization/hr_HR/messages.inc                               |   40 
 program/localization/hu_HU/labels.inc                                 |  447 ++++---
 program/localization/hu_HU/messages.inc                               |   32 
 program/localization/hy_AM/labels.inc                                 |  464 ++++---
 program/localization/hy_AM/messages.inc                               |   41 
 program/localization/ia/labels.inc                                    |  535 ++++++---
 program/localization/ia/messages.inc                                  |  146 ++
 program/localization/id_ID/labels.inc                                 |  484 ++++----
 program/localization/id_ID/messages.inc                               |   85 -
 program/localization/is_IS/labels.inc                                 |  462 ++++---
 program/localization/is_IS/messages.inc                               |  134 ++
 program/localization/it_IT/labels.inc                                 |  449 ++++---
 program/localization/it_IT/messages.inc                               |   36 
 program/localization/ja_JP/labels.inc                                 |  443 ++++---
 program/localization/ja_JP/messages.inc                               |   32 
 program/localization/ka_GE/labels.inc                                 |  491 +++++---
 program/localization/ka_GE/messages.inc                               |   76 +
 program/localization/km_KH/labels.inc                                 |  480 +++++---
 program/localization/km_KH/messages.inc                               |   64 -
 program/localization/ko_KR/labels.inc                                 |  493 +++++---
 program/localization/ko_KR/messages.inc                               |   47 
 program/localization/ku/labels.inc                                    |  547 +++++++--
 program/localization/ku/messages.inc                                  |  119 +-
 program/localization/lt_LT/labels.inc                                 |  456 ++++---
 program/localization/lt_LT/messages.inc                               |   39 
 program/localization/lv_LV/labels.inc                                 |  458 ++++---
 program/localization/lv_LV/messages.inc                               |   40 
 program/localization/mk_MK/labels.inc                                 |  515 ++++++--
 program/localization/mk_MK/messages.inc                               |   94 +
 program/localization/ml_IN/labels.inc                                 |  539 ++++++---
 program/localization/ml_IN/messages.inc                               |  155 ++
 program/localization/mr_IN/labels.inc                                 |  485 +++++---
 program/localization/mr_IN/messages.inc                               |   81 +
 program/localization/ms_MY/labels.inc                                 |  538 ++++++---
 program/localization/ms_MY/messages.inc                               |  119 +-
 program/localization/nb_NO/labels.inc                                 |  443 ++++---
 program/localization/nb_NO/messages.inc                               |   32 
 program/localization/ne_NP/labels.inc                                 |  583 +++++++---
 program/localization/ne_NP/messages.inc                               |  123 +-
 program/localization/nl_BE/labels.inc                                 |  467 +++++---
 program/localization/nl_BE/messages.inc                               |  169 +-
 program/localization/nl_NL/labels.inc                                 |  497 ++++----
 program/localization/nl_NL/messages.inc                               |  120 +-
 program/localization/nn_NO/labels.inc                                 |  443 ++++---
 program/localization/nn_NO/messages.inc                               |   32 
 program/localization/pl_PL/labels.inc                                 |  445 ++++---
 program/localization/pl_PL/messages.inc                               |   34 
 program/localization/ps/labels.inc                                    |  532 ++++++---
 program/localization/ps/messages.inc                                  |  107 +
 program/localization/pt_BR/labels.inc                                 |  463 ++++---
 program/localization/pt_BR/messages.inc                               |   34 
 program/localization/pt_PT/labels.inc                                 |  443 ++++---
 program/localization/pt_PT/messages.inc                               |   32 
 program/localization/ro_RO/labels.inc                                 |  458 ++++---
 program/localization/ro_RO/messages.inc                               |   38 
 program/localization/ru_RU/labels.inc                                 |  443 ++++---
 program/localization/ru_RU/messages.inc                               |   32 
 program/localization/si_LK/labels.inc                                 |  528 ++++++---
 program/localization/si_LK/messages.inc                               |  107 +
 program/localization/sk_SK/labels.inc                                 |  447 ++++---
 program/localization/sk_SK/messages.inc                               |   36 
 program/localization/sl_SI/labels.inc                                 |  472 ++++----
 program/localization/sl_SI/messages.inc                               |   39 
 program/localization/sq_AL/labels.inc                                 |  547 +++++++--
 program/localization/sq_AL/messages.inc                               |  119 +-
 program/localization/sr_CS/labels.inc                                 |  473 +++++---
 program/localization/sr_CS/messages.inc                               |   32 
 program/localization/sv_SE/labels.inc                                 |  449 ++++---
 program/localization/sv_SE/messages.inc                               |   34 
 program/localization/ta_IN/labels.inc                                 |  515 ++++++--
 program/localization/ta_IN/messages.inc                               |   94 +
 program/localization/th_TH/labels.inc                                 |  576 +++++++--
 program/localization/th_TH/messages.inc                               |  123 +-
 program/localization/tr_TR/labels.inc                                 |  443 ++++---
 program/localization/tr_TR/messages.inc                               |   32 
 program/localization/uk_UA/labels.inc                                 |  458 ++++---
 program/localization/uk_UA/messages.inc                               |   41 
 program/localization/vi_VN/labels.inc                                 |  447 ++++---
 program/localization/vi_VN/messages.inc                               |   42 
 program/localization/zh_CN/labels.inc                                 |  459 ++++---
 program/localization/zh_CN/messages.inc                               |   51 
 program/localization/zh_TW/csv2vcard.inc                              |   99 +
 program/localization/zh_TW/labels.inc                                 |  456 ++++---
 program/localization/zh_TW/messages.inc                               |   36 
 program/steps/addressbook/delete.inc                                  |    2 
 program/steps/addressbook/export.inc                                  |    2 
 program/steps/addressbook/func.inc                                    |   41 
 program/steps/addressbook/list.inc                                    |    2 
 program/steps/addressbook/save.inc                                    |    2 
 program/steps/addressbook/search.inc                                  |    2 
 program/steps/mail/compose.inc                                        |    2 
 program/steps/mail/func.inc                                           |    2 
 program/steps/mail/get.inc                                            |   38 
 program/steps/mail/list_contacts.inc                                  |  153 +-
 program/steps/mail/search_contacts.inc                                |  112 +
 program/steps/mail/show.inc                                           |    2 
 skins/classic/addressbook.css                                         |    2 
 skins/classic/embed.css                                               |   35 
 skins/classic/functions.js                                            |   23 
 skins/classic/googiespell.css                                         |    1 
 skins/classic/ie6hacks.css                                            |   16 
 skins/classic/iehacks.css                                             |   12 
 skins/classic/images/icons/groupactions.gif                           |binary
 skins/classic/images/icons/groupactions.png                           |binary
 skins/classic/mail.css                                                |  154 ++
 skins/classic/splitter.js                                             |    9 
 skins/classic/templates/about.html                                    |    2 
 skins/classic/templates/compose.html                                  |   88 +
 skins/classic/templates/mail.html                                     |    6 
 skins/larry/addressbook.css                                           |    2 
 skins/larry/embed.css                                                 |   34 
 skins/larry/ie7hacks.css                                              |    2 
 skins/larry/iehacks.css                                               |    8 
 skins/larry/images/filetypes.png                                      |binary
 skins/larry/includes/header.html                                      |    6 
 skins/larry/mail.css                                                  |   23 
 skins/larry/print.css                                                 |    2 
 skins/larry/styles.css                                                |   51 
 skins/larry/svggradients.css                                          |    2 
 skins/larry/templates/about.html                                      |    2 
 skins/larry/templates/addressbook.html                                |    2 
 skins/larry/templates/compose.html                                    |    7 
 skins/larry/templates/error.html                                      |    7 
 skins/larry/templates/mail.html                                       |    2 
 skins/larry/ui.js                                                     |    6 
 913 files changed, 42145 insertions(+), 21248 deletions(-)

New commits:
commit 9b8871086bef8aa1b9b66624c728f3fae86ee8a2
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Mar 22 15:44:39 2013 +0100

    0.9~rc-1: Update changelog

diff --git a/debian/changelog b/debian/changelog
index 6b7d703..c43f7bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.9~rc-1) unstable; urgency=low
+
+  * Update to 0.9-rc
+  * Remove fix-advanced-ACL-editing.patch, already included in 0.9-rc
+
+ -- Christoph Wickert <wickert at kolabsys.com>  Fri, 22 Mar 2013 14:08:36 +0100
+
 roundcube (0.9~beta-15) unstable; urgency=low
 
   * Ship the zipdownload plugin as part of roundcube-plugins


commit f5f16a6d955a4e8af2dfa0d121083db91428009f
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Mar 22 15:44:15 2013 +0100

    Fix installation of *.sql files

diff --git a/debian/rules b/debian/rules
index 0e9ddbc..621ff23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG
-DEB_COMPRESS_EXCLUDE=SQL/mysql.initial.sql \
-	SQL/mysql.update.sql \
-	SQL/postgres.initial.sql \
-	SQL/postgres.update.sql
+DEB_COMPRESS_EXCLUDE=.sql
 
 binary-install/roundcube-core::
 	# Install config files
@@ -20,10 +17,11 @@ binary-install/roundcube-core::
 
 	# Database related files
 	# Install empty tables and updates for each db type
-	install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/mysql.initial.sql
-	install -m 0644 $(CURDIR)/SQL/mysql.update.sql $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/mysql.update.sql
-	install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/postgres.initial.sql
-	install -m 0644 $(CURDIR)/SQL/postgres.update.sql $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/postgres.update.sql
+	cp -a $(CURDIR)/SQL/* $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/
+	#install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/mysql.initial.sql
+	#install -m 0644 $(CURDIR)/SQL/mysql.update.sql $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/mysql.update.sql
+	#install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/postgres.initial.sql
+	#install -m 0644 $(CURDIR)/SQL/postgres.update.sql $(CURDIR)/debian/roundcube-core/usr/share/doc/roundcube/SQL/postgres.update.sql
 
 	# Some files are executable while not being scripts or binary...
 	find $(CURDIR)/debian/roundcube-core/usr/share/roundcube -type f -print0 | xargs -r0 chmod -x


commit 0423a11354310bb3ddf2b601d0db7824e48516b5
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Mar 22 14:12:53 2013 +0100

    Remove fix-advanced-ACL-editing.patch (already included in 0.9-rc)

diff --git a/debian/patches/fix-advanced-ACL-editing.patch b/debian/patches/fix-advanced-ACL-editing.patch
deleted file mode 100644
index 527c594..0000000
--- a/debian/patches/fix-advanced-ACL-editing.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit f5584cbfeb098fbf26f57c74fa36464a634e2397
-Author: Aleksander Machniak <alec at alec.pl>
-Date:   Fri Mar 1 17:45:43 2013 +0100
-
-    Fixed ACL edition in advanced mode
-
-diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
-index b6e2c81..d693478 100644
---- a/plugins/acl/acl.js
-+++ b/plugins/acl/acl.js
-@@ -302,7 +302,7 @@ rcube_webmail.prototype.acl_init_form = function(id)
-         li_elements.map(function() {
-             val = this.value;
-             td = $('td.'+this.id, row);
--            if (td && td.hasClass('enabled'))
-+            if (td.length && td.hasClass('enabled'))
-                 this.checked = true;
-         });
- 
-diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
-index ab7c8ce..a4abe28 100644
---- a/plugins/acl/acl.php
-+++ b/plugins/acl/acl.php
-@@ -233,7 +233,8 @@ class acl extends rcube_plugin
- 
-         // Advanced rights
-         $attrib['id'] = 'advancedrights';
--        foreach ($supported as $idx => $val) {
-+        foreach ($supported as $key => $val) {
-+            $id = "acl$val";
-             $ul .= html::tag('li', null,
-                 $input->show('', array(
-                     'name' => "acl[$val]", 'value' => $val, 'id' => $id))
diff --git a/debian/patches/series b/debian/patches/series
index cd56df2..65fd075 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 correct_install_path.patch
 #use_pspell.patch
 default-charset-utf8.patch
-fix-advanced-ACL-editing.patch
 0001-Change-the-maximum-length-of-email-addresses-to-254-.patch


commit d041c955bb11c1ebcd2eb64e85e8fc0cd8c6e77b
Merge: 02c45b2 f742b6c
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Mar 22 12:37:45 2013 +0100

    Merge tag 'upstream/0.9_rc' into ucs/3.1/kolab-2.3
    
    Upstream version 0.9~rc



commit f742b6c1412b2163c6b08e19bcba38ecfb610d48
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Mar 22 12:37:40 2013 +0100

    Imported Upstream version 0.9~rc

diff --git a/.htaccess b/.htaccess
index 25e153f..481bd09 100644
--- a/.htaccess
+++ b/.htaccess
@@ -31,7 +31,8 @@ RewriteEngine On
 RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
 # security rules
 RewriteRule .git - [F]
-RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|SQL|bin|CHANGELOG)$ - [F]
+RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ - [F]
+RewriteRule ^/?(SQL|bin) - [F]
 </IfModule>
 
 <IfModule mod_deflate.c>
diff --git a/CHANGELOG b/CHANGELOG
index fc50d97..8d67178 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,24 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix plain text spellchecker icorrect highlighting in non-ASCII text (#1488973)
+- Add workaround for invalid message charset detection by IMAP servers (#1488968)
+- Fix NUL characters in content-type of ms-tnef attachment (#1488964)
+- Fix regression in handling LDAP contact identifiers (#1488959)
+- Updated translations from Transifex
+- Fix buggy error template in a frame (#1488938)
+- Add addressbook widget on compose page in classic skin
+- Add search box to compose address book widget (#1488381)
+- Fix login in case when default_host is an array with one element (#1488928)
+- Use LDAP fallback hosts on connect + bind instead of ldap_connect() only.
+- Add config option for LDAP bind timeout (sets LDAP_OPT_NETWORK_TIMEOUT option)
+- Submit Addressbook advanced search form with Enter key (#1488568)
+- Also block remote images in HTML part view (#1488827)
+- Improved database schema upgrade procedure, added updatedb.sh script
+- Force autocommit mode in mysql database driver (#1488902)
+
+RELEASE 0.9-beta
+----------------
 - Fix searching by date in address book (#1488888)
 - Improve charset detection by prioritizing charset according to user language (#1485669)
 - Fix handling of escaped separator in vCard file (#1488896)
diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
index 85b8e4e..9139509 100644
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -115,6 +115,12 @@ CREATE TABLE [dbo].[searches] (
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
+CREATE TABLE [dbo].[system] (
+	[name] [varchar] (64) COLLATE Latin1_General_CI_AI NOT NULL ,
+	[value] [text] COLLATE Latin1_General_CI_AI NOT NULL 
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
 ALTER TABLE [dbo].[cache_index] WITH NOCHECK ADD 
 	 PRIMARY KEY CLUSTERED 
 	(
@@ -185,6 +191,13 @@ ALTER TABLE [dbo].[searches] WITH NOCHECK ADD
 	) ON [PRIMARY] 
 GO
 
+ALTER TABLE [dbo].[system] WITH NOCHECK ADD 
+	CONSTRAINT [PK_system_name] PRIMARY KEY CLUSTERED 
+	(
+		[name]
+	) ON [PRIMARY] 
+GO
+
 ALTER TABLE [dbo].[cache] ADD 
 	CONSTRAINT [DF_cache_user_id] DEFAULT ('0') FOR [user_id],
 	CONSTRAINT [DF_cache_cache_key] DEFAULT ('') FOR [cache_key],
@@ -358,3 +371,6 @@ CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]
     WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
 GO
 
+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013011700')
+GO
+
\ No newline at end of file
diff --git a/SQL/mssql.upgrade.sql b/SQL/mssql.upgrade.sql
deleted file mode 100644
index 26001e7..0000000
--- a/SQL/mssql.upgrade.sql
+++ /dev/null
@@ -1,273 +0,0 @@
--- Roundcube Webmail update script for MSSQL databases
-
--- Updates from version 0.3.1
-
-ALTER TABLE [dbo].[messages] ADD CONSTRAINT [FK_messages_user_id]
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
-ALTER TABLE [dbo].[cache] ADD CONSTRAINT [FK_cache_user_id]
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
-ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [FK_contacts_user_id]
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
-ALTER TABLE [dbo].[identities] ADD CONSTRAINT [FK_identities_user_id] 
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
-ALTER TABLE [dbo].[identities] ADD [changed] [datetime] NULL 
-GO
-
-CREATE TABLE [dbo].[contactgroups] (
-	[contactgroup_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[user_id] [int] NOT NULL ,
-	[changed] [datetime] NOT NULL ,
-	[del] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
-	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL
-) ON [PRIMARY] 
-GO
-
-CREATE TABLE [dbo].[contactgroupmembers] (
-	[contactgroup_id] [int] NOT NULL ,
-	[contact_id] [int] NOT NULL ,
-	[created] [datetime] NOT NULL
-) ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[contactgroups] WITH NOCHECK ADD 
-	CONSTRAINT [PK_contactgroups_contactgroup_id] PRIMARY KEY CLUSTERED 
-	(
-		[contactgroup_id]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[contactgroupmembers] WITH NOCHECK ADD 
-	CONSTRAINT [PK_contactgroupmembers_id] PRIMARY KEY CLUSTERED 
-	(
-		[contactgroup_id], [contact_id]
-	)  ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[contactgroups] ADD 
-	CONSTRAINT [DF_contactgroups_user_id] DEFAULT (0) FOR [user_id],
-	CONSTRAINT [DF_contactgroups_changed] DEFAULT (getdate()) FOR [changed],
-	CONSTRAINT [DF_contactgroups_del] DEFAULT ('0') FOR [del],
-	CONSTRAINT [DF_contactgroups_name] DEFAULT ('') FOR [name],
-	CONSTRAINT [CK_contactgroups_del] CHECK ([del] = '1' or [del] = '0')
-GO
-
-CREATE  INDEX [IX_contactgroups_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[contactgroupmembers] ADD 
-	CONSTRAINT [DF_contactgroupmembers_contactgroup_id] DEFAULT (0) FOR [contactgroup_id],
-	CONSTRAINT [DF_contactgroupmembers_contact_id] DEFAULT (0) FOR [contact_id],
-	CONSTRAINT [DF_contactgroupmembers_created] DEFAULT (getdate()) FOR [created]
-GO
-
-ALTER TABLE [dbo].[contactgroupmembers] ADD CONSTRAINT [FK_contactgroupmembers_contactgroup_id]
-    FOREIGN KEY ([contactgroup_id]) REFERENCES [dbo].[contactgroups] ([contactgroup_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
-CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]
-    AFTER DELETE AS
-    DELETE FROM [dbo].[contactgroupmembers]
-    WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
-GO
-
-ALTER TABLE [dbo].[contactgroups] ADD CONSTRAINT [FK_contactgroups_user_id]
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
--- Updates from version 0.4.2
-
-DROP INDEX [IX_users_username]
-GO
-CREATE UNIQUE INDEX [IX_users_username] ON [dbo].[users]([username],[mail_host]) ON [PRIMARY]
-GO
-ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL
-GO
-
--- Updates from version 0.5.1
--- Updates from version 0.5.2
--- Updates from version 0.5.3
--- Updates from version 0.5.4
-
-ALTER TABLE [dbo].[contacts] ADD [words] [text] COLLATE Latin1_General_CI_AI NULL 
-GO
-CREATE INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]
-GO
-DELETE FROM [dbo].[messages]
-GO
-DELETE FROM [dbo].[cache]
-GO
-
--- Updates from version 0.6
-
-CREATE TABLE [dbo].[dictionary] (
-    [user_id] [int] ,
-    [language] [varchar] (5) COLLATE Latin1_General_CI_AI NOT NULL ,
-    [data] [text] COLLATE Latin1_General_CI_AI NOT NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-CREATE  UNIQUE INDEX [IX_dictionary_user_language] ON [dbo].[dictionary]([user_id],[language]) ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[searches] (
-	[search_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[user_id] [int] NOT NULL ,
-	[type] [tinyint] NOT NULL ,
-	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
-	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[searches] WITH NOCHECK ADD 
-	CONSTRAINT [PK_searches_search_id] PRIMARY KEY CLUSTERED 
-	(
-		[search_id]
-	) ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[searches] ADD 
-	CONSTRAINT [DF_searches_user] DEFAULT (0) FOR [user_id],
-	CONSTRAINT [DF_searches_type] DEFAULT (0) FOR [type],
-GO
-
-CREATE UNIQUE INDEX [IX_searches_user_type_name] ON [dbo].[searches]([user_id],[type],[name]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[searches] ADD CONSTRAINT [FK_searches_user_id]
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
-DROP TABLE [dbo].[messages]
-GO
-CREATE TABLE [dbo].[cache_index] (
-	[user_id] [int] NOT NULL ,
-	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
-	[changed] [datetime] NOT NULL ,
-	[valid] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
-	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[cache_thread] (
-	[user_id] [int] NOT NULL ,
-	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
-	[changed] [datetime] NOT NULL ,
-	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE TABLE [dbo].[cache_messages] (
-	[user_id] [int] NOT NULL ,
-	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
-	[uid] [int] NOT NULL ,
-	[changed] [datetime] NOT NULL ,
-	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,
-	[flags] [int] NOT NULL
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[cache_index] WITH NOCHECK ADD 
-	 PRIMARY KEY CLUSTERED 
-	(
-		[user_id],[mailbox]
-	) ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[cache_thread] WITH NOCHECK ADD 
-	 PRIMARY KEY CLUSTERED 
-	(
-		[user_id],[mailbox]
-	) ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[cache_messages] WITH NOCHECK ADD 
-	 PRIMARY KEY CLUSTERED 
-	(
-		[user_id],[mailbox],[uid]
-	) ON [PRIMARY] 
-GO
-
-ALTER TABLE [dbo].[cache_index] ADD 
-	CONSTRAINT [DF_cache_index_changed] DEFAULT (getdate()) FOR [changed],
-	CONSTRAINT [DF_cache_index_valid] DEFAULT ('0') FOR [valid]
-GO
-
-CREATE  INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[cache_thread] ADD 
-	CONSTRAINT [DF_cache_thread_changed] DEFAULT (getdate()) FOR [changed]
-GO
-
-CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[cache_messages] ADD 
-	CONSTRAINT [DF_cache_messages_changed] DEFAULT (getdate()) FOR [changed],
-	CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]
-GO
-
-CREATE  INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]
-GO
-
-ALTER TABLE [dbo].[cache_index] ADD CONSTRAINT [FK_cache_index_user_id]
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
-ALTER TABLE [dbo].[cache_thread] ADD CONSTRAINT [FK_cache_thread_user_id]
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
-ALTER TABLE [dbo].[cache_messages] ADD CONSTRAINT [FK_cache_messages_user_id]
-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
-    ON DELETE CASCADE ON UPDATE CASCADE
-GO
-
--- Updates from version 0.7-beta
-
-ALTER TABLE [dbo].[session] ALTER COLUMN [sess_id] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL
-GO
-
--- Updates from version 0.7
-
-ALTER TABLE [dbo].[contacts] DROP CONSTRAINT [DF_contacts_email]
-GO
-ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [text] COLLATE Latin1_General_CI_AI NOT NULL
-GO
-ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email]
-GO
-
--- Updates from version 0.8-rc
-
-ALTER TABLE [dbo].[contacts] DROP CONSTRAINT [DF_contacts_email]
-GO
-ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (8000) COLLATE Latin1_General_CI_AI NOT NULL
-GO
-ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email]
-GO
-
--- Updates from version 0.8
-
-ALTER TABLE [dbo].[cache] DROP COLUMN [cache_id]
-GO
-ALTER TABLE [dbo].[users] DROP COLUMN [alias]
-GO
-CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]
-GO
-
\ No newline at end of file
diff --git a/SQL/mssql/2009103100.sql b/SQL/mssql/2009103100.sql
new file mode 100644
index 0000000..646fe38
--- /dev/null
+++ b/SQL/mssql/2009103100.sql
@@ -0,0 +1,87 @@
+-- Updates from version 0.3.1
+
+ALTER TABLE [dbo].[messages] ADD CONSTRAINT [FK_messages_user_id]
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
+
+ALTER TABLE [dbo].[cache] ADD CONSTRAINT [FK_cache_user_id]
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
+
+ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [FK_contacts_user_id]
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
+
+ALTER TABLE [dbo].[identities] ADD CONSTRAINT [FK_identities_user_id] 
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
+
+ALTER TABLE [dbo].[identities] ADD [changed] [datetime] NULL 
+GO
+
+CREATE TABLE [dbo].[contactgroups] (
+	[contactgroup_id] [int] IDENTITY (1, 1) NOT NULL ,
+	[user_id] [int] NOT NULL ,
+	[changed] [datetime] NOT NULL ,
+	[del] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
+	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL
+) ON [PRIMARY] 
+GO
+
+CREATE TABLE [dbo].[contactgroupmembers] (
+	[contactgroup_id] [int] NOT NULL ,
+	[contact_id] [int] NOT NULL ,
+	[created] [datetime] NOT NULL
+) ON [PRIMARY] 
+GO
+
+ALTER TABLE [dbo].[contactgroups] WITH NOCHECK ADD 
+	CONSTRAINT [PK_contactgroups_contactgroup_id] PRIMARY KEY CLUSTERED 
+	(
+		[contactgroup_id]
+	)  ON [PRIMARY] 
+GO
+
+ALTER TABLE [dbo].[contactgroupmembers] WITH NOCHECK ADD 
+	CONSTRAINT [PK_contactgroupmembers_id] PRIMARY KEY CLUSTERED 
+	(
+		[contactgroup_id], [contact_id]
+	)  ON [PRIMARY] 
+GO
+
+ALTER TABLE [dbo].[contactgroups] ADD 
+	CONSTRAINT [DF_contactgroups_user_id] DEFAULT (0) FOR [user_id],
+	CONSTRAINT [DF_contactgroups_changed] DEFAULT (getdate()) FOR [changed],
+	CONSTRAINT [DF_contactgroups_del] DEFAULT ('0') FOR [del],
+	CONSTRAINT [DF_contactgroups_name] DEFAULT ('') FOR [name],
+	CONSTRAINT [CK_contactgroups_del] CHECK ([del] = '1' or [del] = '0')
+GO
+
+CREATE  INDEX [IX_contactgroups_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[contactgroupmembers] ADD 
+	CONSTRAINT [DF_contactgroupmembers_contactgroup_id] DEFAULT (0) FOR [contactgroup_id],
+	CONSTRAINT [DF_contactgroupmembers_contact_id] DEFAULT (0) FOR [contact_id],
+	CONSTRAINT [DF_contactgroupmembers_created] DEFAULT (getdate()) FOR [created]
+GO
+
+ALTER TABLE [dbo].[contactgroupmembers] ADD CONSTRAINT [FK_contactgroupmembers_contactgroup_id]
+    FOREIGN KEY ([contactgroup_id]) REFERENCES [dbo].[contactgroups] ([contactgroup_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
+
+CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]
+    AFTER DELETE AS
+    DELETE FROM [dbo].[contactgroupmembers]
+    WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
+GO
+
+ALTER TABLE [dbo].[contactgroups] ADD CONSTRAINT [FK_contactgroups_user_id]
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
diff --git a/SQL/mssql/2010100600.sql b/SQL/mssql/2010100600.sql
new file mode 100644
index 0000000..fb045e3
--- /dev/null
+++ b/SQL/mssql/2010100600.sql
@@ -0,0 +1,9 @@
+-- Updates from version 0.4.2
+
+DROP INDEX [IX_users_username]
+GO
+CREATE UNIQUE INDEX [IX_users_username] ON [dbo].[users]([username],[mail_host]) ON [PRIMARY]
+GO
+ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL
+GO
+
\ No newline at end of file
diff --git a/SQL/mssql/2011011200.sql b/SQL/mssql/2011011200.sql
new file mode 100644
index 0000000..8715455
--- /dev/null
+++ b/SQL/mssql/2011011200.sql
@@ -0,0 +1,10 @@
+-- Updates from version 0.5.x
+
+ALTER TABLE [dbo].[contacts] ADD [words] [text] COLLATE Latin1_General_CI_AI NULL 
+GO
+CREATE INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]
+GO
+DELETE FROM [dbo].[messages]
+GO
+DELETE FROM [dbo].[cache]
+GO
diff --git a/SQL/mssql/2011092800.sql b/SQL/mssql/2011092800.sql
new file mode 100644
index 0000000..00f79bb
--- /dev/null
+++ b/SQL/mssql/2011092800.sql
@@ -0,0 +1,127 @@
+-- Updates from version 0.6
+
+CREATE TABLE [dbo].[dictionary] (
+    [user_id] [int] ,
+    [language] [varchar] (5) COLLATE Latin1_General_CI_AI NOT NULL ,
+    [data] [text] COLLATE Latin1_General_CI_AI NOT NULL 
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+CREATE  UNIQUE INDEX [IX_dictionary_user_language] ON [dbo].[dictionary]([user_id],[language]) ON [PRIMARY]
+GO
+
+CREATE TABLE [dbo].[searches] (
+	[search_id] [int] IDENTITY (1, 1) NOT NULL ,
+	[user_id] [int] NOT NULL ,
+	[type] [tinyint] NOT NULL ,
+	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[searches] WITH NOCHECK ADD 
+	CONSTRAINT [PK_searches_search_id] PRIMARY KEY CLUSTERED 
+	(
+		[search_id]
+	) ON [PRIMARY] 
+GO
+
+ALTER TABLE [dbo].[searches] ADD 
+	CONSTRAINT [DF_searches_user] DEFAULT (0) FOR [user_id],
+	CONSTRAINT [DF_searches_type] DEFAULT (0) FOR [type],
+GO
+
+CREATE UNIQUE INDEX [IX_searches_user_type_name] ON [dbo].[searches]([user_id],[type],[name]) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[searches] ADD CONSTRAINT [FK_searches_user_id]
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
+
+DROP TABLE [dbo].[messages]
+GO
+CREATE TABLE [dbo].[cache_index] (
+	[user_id] [int] NOT NULL ,
+	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
+	[changed] [datetime] NOT NULL ,
+	[valid] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,
+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+CREATE TABLE [dbo].[cache_thread] (
+	[user_id] [int] NOT NULL ,
+	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
+	[changed] [datetime] NOT NULL ,
+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+CREATE TABLE [dbo].[cache_messages] (
+	[user_id] [int] NOT NULL ,
+	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,
+	[uid] [int] NOT NULL ,
+	[changed] [datetime] NOT NULL ,
+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,
+	[flags] [int] NOT NULL
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[cache_index] WITH NOCHECK ADD 
+	 PRIMARY KEY CLUSTERED 
+	(
+		[user_id],[mailbox]
+	) ON [PRIMARY] 
+GO
+
+ALTER TABLE [dbo].[cache_thread] WITH NOCHECK ADD 
+	 PRIMARY KEY CLUSTERED 
+	(
+		[user_id],[mailbox]
+	) ON [PRIMARY] 
+GO
+
+ALTER TABLE [dbo].[cache_messages] WITH NOCHECK ADD 
+	 PRIMARY KEY CLUSTERED 
+	(
+		[user_id],[mailbox],[uid]
+	) ON [PRIMARY] 
+GO
+
+ALTER TABLE [dbo].[cache_index] ADD 
+	CONSTRAINT [DF_cache_index_changed] DEFAULT (getdate()) FOR [changed],
+	CONSTRAINT [DF_cache_index_valid] DEFAULT ('0') FOR [valid]
+GO
+
+CREATE  INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[cache_thread] ADD 
+	CONSTRAINT [DF_cache_thread_changed] DEFAULT (getdate()) FOR [changed]
+GO
+
+CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[cache_messages] ADD 
+	CONSTRAINT [DF_cache_messages_changed] DEFAULT (getdate()) FOR [changed],
+	CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]
+GO
+
+CREATE  INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[cache_index] ADD CONSTRAINT [FK_cache_index_user_id]
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
+
+ALTER TABLE [dbo].[cache_thread] ADD CONSTRAINT [FK_cache_thread_user_id]
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
+
+ALTER TABLE [dbo].[cache_messages] ADD CONSTRAINT [FK_cache_messages_user_id]
+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])
+    ON DELETE CASCADE ON UPDATE CASCADE
+GO
diff --git a/SQL/mssql/2011111600.sql b/SQL/mssql/2011111600.sql
new file mode 100644
index 0000000..3878776
--- /dev/null
+++ b/SQL/mssql/2011111600.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.7-beta
+
+ALTER TABLE [dbo].[session] ALTER COLUMN [sess_id] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL
+GO
diff --git a/SQL/mssql/2011121400.sql b/SQL/mssql/2011121400.sql
new file mode 100644
index 0000000..fde63ea
--- /dev/null
+++ b/SQL/mssql/2011121400.sql
@@ -0,0 +1,9 @@
+-- Updates from version 0.7
+
+ALTER TABLE [dbo].[contacts] DROP CONSTRAINT [DF_contacts_email]
+GO
+ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [text] COLLATE Latin1_General_CI_AI NOT NULL
+GO
+ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email]
+GO
+
\ No newline at end of file
diff --git a/SQL/mssql/2012051800.sql b/SQL/mssql/2012051800.sql
new file mode 100644
index 0000000..8dcf7bf
--- /dev/null
+++ b/SQL/mssql/2012051800.sql
@@ -0,0 +1,18 @@
+-- Updates from version 0.8-rc
+
+ALTER TABLE [dbo].[contacts] DROP CONSTRAINT [DF_contacts_email]
+GO
+ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (8000) COLLATE Latin1_General_CI_AI NOT NULL
+GO
+ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email]
+GO
+
+-- Updates from version 0.8
+
+ALTER TABLE [dbo].[cache] DROP COLUMN [cache_id]
+GO
+ALTER TABLE [dbo].[users] DROP COLUMN [alias]
+GO
+CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]
+GO
+
\ No newline at end of file
diff --git a/SQL/mssql/2012080700.sql b/SQL/mssql/2012080700.sql
new file mode 100644
index 0000000..33e6133
--- /dev/null
+++ b/SQL/mssql/2012080700.sql
@@ -0,0 +1,8 @@
+-- Updates from version 0.8
+
+ALTER TABLE [dbo].[cache] DROP COLUMN [cache_id]
+GO
+ALTER TABLE [dbo].[users] DROP COLUMN [alias]
+GO
+CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]
+GO
diff --git a/SQL/mssql/2013011000.sql b/SQL/mssql/2013011000.sql
new file mode 100644
index 0000000..2eb51e6
--- /dev/null
+++ b/SQL/mssql/2013011000.sql
@@ -0,0 +1,14 @@
+-- Upgrades from 0.9-beta
+
+CREATE TABLE [dbo].[system] (
+    [name] [varchar] (64) COLLATE Latin1_General_CI_AI NOT NULL ,
+    [value] [text] COLLATE Latin1_General_CI_AI 
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[system] WITH NOCHECK ADD
+    CONSTRAINT [PK_system_name] PRIMARY KEY CLUSTERED
+    (
+        [name]
+    ) ON [PRIMARY]
+GO
diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 47d9db4..cb750c5 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -186,4 +186,14 @@ CREATE TABLE `searches` (
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 
+-- Table structure for table `system`
+
+CREATE TABLE `system` (
+ `name` varchar(64) NOT NULL,
+ `value` mediumtext,
+ PRIMARY KEY(`name`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
 /*!40014 SET FOREIGN_KEY_CHECKS=1 */;
+
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700');
diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
deleted file mode 100644
index 237aa3e..0000000
--- a/SQL/mysql.update.sql
+++ /dev/null
@@ -1,247 +0,0 @@
--- Roundcube Webmail update script for MySQL databases
-
--- Updates from version 0.1-stable
-
-TRUNCATE TABLE `messages`;
-
-ALTER TABLE `messages`
-  DROP INDEX `idx`,
-  DROP INDEX `uid`;
-
-ALTER TABLE `cache`
-  DROP INDEX `cache_key`,
-  DROP INDEX `session_id`,
-  ADD INDEX `user_cache_index` (`user_id`,`cache_key`);
-
-ALTER TABLE `users`
-    ADD INDEX `username_index` (`username`),
-    ADD INDEX `alias_index` (`alias`);
-
--- Updates from version 0.1.1
-
-ALTER TABLE `identities`
-    MODIFY `signature` text, 
-    MODIFY `bcc` varchar(128) NOT NULL DEFAULT '', 
-    MODIFY `reply-to` varchar(128) NOT NULL DEFAULT '', 
-    MODIFY `organization` varchar(128) NOT NULL DEFAULT '',
-    MODIFY `name` varchar(128) NOT NULL, 
-    MODIFY `email` varchar(128) NOT NULL; 
-
--- Updates from version 0.2-alpha
-
-ALTER TABLE `messages`
-    ADD INDEX `created_index` (`created`);
-
--- Updates from version 0.2-beta (InnoDB required)
-
-ALTER TABLE `cache`
-    DROP `session_id`;
-
-ALTER TABLE `session`
-    ADD INDEX `changed_index` (`changed`);
-
-ALTER TABLE `cache`
-    ADD INDEX `created_index` (`created`);
-
-ALTER TABLE `users`
-    CHANGE `language` `language` varchar(5);
-
-ALTER TABLE `cache` ENGINE=InnoDB;
-ALTER TABLE `session` ENGINE=InnoDB;
-ALTER TABLE `messages` ENGINE=InnoDB;
-ALTER TABLE `users` ENGINE=InnoDB;
-ALTER TABLE `contacts` ENGINE=InnoDB;
-ALTER TABLE `identities` ENGINE=InnoDB;
-
--- Updates from version 0.3-stable
-
-TRUNCATE `messages`;
-
-ALTER TABLE `messages`
-    ADD INDEX `index_index` (`user_id`, `cache_key`, `idx`);
-
-ALTER TABLE `session` 
-    CHANGE `vars` `vars` MEDIUMTEXT NOT NULL;
-
-ALTER TABLE `contacts`
-    ADD INDEX `user_contacts_index` (`user_id`,`email`);
-
--- Updates from version 0.3.1
--- WARNING: Make sure that all tables are using InnoDB engine!!!
---          If not, use: ALTER TABLE xxx ENGINE=InnoDB;
-
-/* MySQL bug workaround: http://bugs.mysql.com/bug.php?id=46293 */
-/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
-
-ALTER TABLE `messages` DROP FOREIGN KEY `user_id_fk_messages`;
-ALTER TABLE `cache` DROP FOREIGN KEY `user_id_fk_cache`;
-ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
-ALTER TABLE `identities` DROP FOREIGN KEY `user_id_fk_identities`;
-
-ALTER TABLE `messages` ADD CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `cache` ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `identities` ADD CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `contacts` ALTER `name` SET DEFAULT '';
-ALTER TABLE `contacts` ALTER `firstname` SET DEFAULT '';
-ALTER TABLE `contacts` ALTER `surname` SET DEFAULT '';
-
-ALTER TABLE `identities` ADD INDEX `user_identities_index` (`user_id`, `del`);
-ALTER TABLE `identities` ADD `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER `user_id`;
-
-CREATE TABLE `contactgroups` (
-  `contactgroup_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
-  `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
-  `del` tinyint(1) NOT NULL DEFAULT '0',
-  `name` varchar(128) NOT NULL DEFAULT '',
-  PRIMARY KEY(`contactgroup_id`),
-  CONSTRAINT `user_id_fk_contactgroups` FOREIGN KEY (`user_id`)
-    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  INDEX `contactgroups_user_index` (`user_id`,`del`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `contactgroupmembers` (
-  `contactgroup_id` int(10) UNSIGNED NOT NULL,
-  `contact_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
-  `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
-  PRIMARY KEY (`contactgroup_id`, `contact_id`),
-  CONSTRAINT `contactgroup_id_fk_contactgroups` FOREIGN KEY (`contactgroup_id`)
-    REFERENCES `contactgroups`(`contactgroup_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `contact_id_fk_contacts` FOREIGN KEY (`contact_id`)
-    REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */;
-
-/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
-
--- Updates from version 0.4-beta
-
-ALTER TABLE `users` CHANGE `last_login` `last_login` datetime DEFAULT NULL;
-UPDATE `users` SET `last_login` = NULL WHERE `last_login` = '1000-01-01 00:00:00';
-
--- Updates from version 0.4.2
-
-ALTER TABLE `users` DROP INDEX `username_index`;
-ALTER TABLE `users` ADD UNIQUE `username` (`username`, `mail_host`);
-
-ALTER TABLE `contacts` MODIFY `email` varchar(255) NOT NULL;
-
-TRUNCATE TABLE `messages`;
-
--- Updates from version 0.5.1
--- Updates from version 0.5.2
--- Updates from version 0.5.3
--- Updates from version 0.5.4
-
-ALTER TABLE `contacts` ADD `words` TEXT NULL AFTER `vcard`;
-ALTER TABLE `contacts` CHANGE `vcard` `vcard` LONGTEXT /*!40101 CHARACTER SET utf8 */ NULL DEFAULT NULL;
-ALTER TABLE `contactgroupmembers` ADD INDEX `contactgroupmembers_contact_index` (`contact_id`);
-
-TRUNCATE TABLE `messages`;
-TRUNCATE TABLE `cache`;
-
--- Updates from version 0.6
-
-/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
-
-ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL;
-ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
-
-CREATE TABLE `dictionary` (
-  `user_id` int(10) UNSIGNED DEFAULT NULL,
-  `language` varchar(5) NOT NULL,
-  `data` longtext NOT NULL,
-  CONSTRAINT `user_id_fk_dictionary` FOREIGN KEY (`user_id`)
-    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  UNIQUE `uniqueness` (`user_id`, `language`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `searches` (
-  `search_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
-  `type` int(3) NOT NULL DEFAULT '0',
-  `name` varchar(128) NOT NULL,
-  `data` text,
-  PRIMARY KEY(`search_id`),
-  CONSTRAINT `user_id_fk_searches` FOREIGN KEY (`user_id`)
-    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  UNIQUE `uniqueness` (`user_id`, `type`, `name`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE `messages`;
-
-CREATE TABLE `cache_index` (
- `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
- `mailbox` varchar(255) BINARY NOT NULL,
- `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
- `valid` tinyint(1) NOT NULL DEFAULT '0',
- `data` longtext NOT NULL,
- CONSTRAINT `user_id_fk_cache_index` FOREIGN KEY (`user_id`)
-   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- INDEX `changed_index` (`changed`),
- PRIMARY KEY (`user_id`, `mailbox`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `cache_thread` (
- `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
- `mailbox` varchar(255) BINARY NOT NULL,
- `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
- `data` longtext NOT NULL,
- CONSTRAINT `user_id_fk_cache_thread` FOREIGN KEY (`user_id`)
-   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- INDEX `changed_index` (`changed`),
- PRIMARY KEY (`user_id`, `mailbox`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `cache_messages` (
- `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
- `mailbox` varchar(255) BINARY NOT NULL,
- `uid` int(11) UNSIGNED NOT NULL DEFAULT '0',
- `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
- `data` longtext NOT NULL,
- `flags` int(11) NOT NULL DEFAULT '0',
- CONSTRAINT `user_id_fk_cache_messages` FOREIGN KEY (`user_id`)
-   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- INDEX `changed_index` (`changed`),
- PRIMARY KEY (`user_id`, `mailbox`, `uid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
-
--- Updates from version 0.7-beta
-
-ALTER TABLE `session` CHANGE `sess_id` `sess_id` varchar(128) NOT NULL;
-
--- Updates from version 0.7
-
-/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
-
-ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
-ALTER TABLE `contacts` DROP INDEX `user_contacts_index`;
-ALTER TABLE `contacts` MODIFY `email` text NOT NULL;
-ALTER TABLE `contacts` ADD INDEX `user_contacts_index` (`user_id`,`del`);
-ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
-   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `cache` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `cache_index` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `cache_thread` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `cache_messages` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `contacts` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `contactgroups` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `contactgroupmembers` ALTER `contact_id` DROP DEFAULT;
-ALTER TABLE `identities` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `searches` ALTER `user_id` DROP DEFAULT;
-
-/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
-
--- Updates from version 0.8
-
-ALTER TABLE `cache` DROP COLUMN `cache_id`;
-ALTER TABLE `users` DROP COLUMN `alias`;
-ALTER TABLE `identities` ADD INDEX `email_identities_index` (`email`, `del`);
diff --git a/SQL/mysql/2008030300.sql b/SQL/mysql/2008030300.sql
new file mode 100644
index 0000000..9a3d048
--- /dev/null
+++ b/SQL/mysql/2008030300.sql
@@ -0,0 +1,16 @@
+-- Updates from version 0.1-stable
+
+TRUNCATE TABLE `messages`;
+
+ALTER TABLE `messages`
+  DROP INDEX `idx`,
+  DROP INDEX `uid`;
+
+ALTER TABLE `cache`
+  DROP INDEX `cache_key`,
+  DROP INDEX `session_id`,
+  ADD INDEX `user_cache_index` (`user_id`,`cache_key`);
+
+ALTER TABLE `users`
+    ADD INDEX `username_index` (`username`),
+    ADD INDEX `alias_index` (`alias`);
diff --git a/SQL/mysql/2008040500.sql b/SQL/mysql/2008040500.sql
new file mode 100644
index 0000000..f538f63
--- /dev/null
+++ b/SQL/mysql/2008040500.sql
@@ -0,0 +1,9 @@
+-- Updates from version 0.1.1
+
+ALTER TABLE `identities`
+    MODIFY `signature` text, 
+    MODIFY `bcc` varchar(128) NOT NULL DEFAULT '', 
+    MODIFY `reply-to` varchar(128) NOT NULL DEFAULT '', 
+    MODIFY `organization` varchar(128) NOT NULL DEFAULT '',
+    MODIFY `name` varchar(128) NOT NULL, 
+    MODIFY `email` varchar(128) NOT NULL; 
diff --git a/SQL/mysql/2008060900.sql b/SQL/mysql/2008060900.sql
new file mode 100644
index 0000000..9f8de0a
--- /dev/null
+++ b/SQL/mysql/2008060900.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.2-alpha
+
+ALTER TABLE `messages`
+    ADD INDEX `created_index` (`created`);
diff --git a/SQL/mysql/2008092100.sql b/SQL/mysql/2008092100.sql
new file mode 100644
index 0000000..3989c75
--- /dev/null
+++ b/SQL/mysql/2008092100.sql
@@ -0,0 +1,20 @@
+-- Updates from version 0.2-beta (InnoDB required)
+
+ALTER TABLE `cache`
+    DROP `session_id`;
+
+ALTER TABLE `session`
+    ADD INDEX `changed_index` (`changed`);
+
+ALTER TABLE `cache`
+    ADD INDEX `created_index` (`created`);
+
+ALTER TABLE `users`
+    CHANGE `language` `language` varchar(5);
+
+ALTER TABLE `cache` ENGINE=InnoDB;
+ALTER TABLE `session` ENGINE=InnoDB;
+ALTER TABLE `messages` ENGINE=InnoDB;
+ALTER TABLE `users` ENGINE=InnoDB;
+ALTER TABLE `contacts` ENGINE=InnoDB;
+ALTER TABLE `identities` ENGINE=InnoDB;
diff --git a/SQL/mysql/2009090400.sql b/SQL/mysql/2009090400.sql
new file mode 100644
index 0000000..fd31bed
--- /dev/null
+++ b/SQL/mysql/2009090400.sql
@@ -0,0 +1,12 @@
+-- Updates from version 0.3-stable
+
+TRUNCATE `messages`;
+
+ALTER TABLE `messages`
+    ADD INDEX `index_index` (`user_id`, `cache_key`, `idx`);
+
+ALTER TABLE `session` 
+    CHANGE `vars` `vars` MEDIUMTEXT NOT NULL;
+
+ALTER TABLE `contacts`
+    ADD INDEX `user_contacts_index` (`user_id`,`email`);
diff --git a/SQL/mysql/2009103100.sql b/SQL/mysql/2009103100.sql
new file mode 100644
index 0000000..aafbe23
--- /dev/null
+++ b/SQL/mysql/2009103100.sql
@@ -0,0 +1,52 @@
+-- Updates from version 0.3.1
+-- WARNING: Make sure that all tables are using InnoDB engine!!!
+--          If not, use: ALTER TABLE xxx ENGINE=InnoDB;
+
+/* MySQL bug workaround: http://bugs.mysql.com/bug.php?id=46293 */
+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
+
+ALTER TABLE `messages` DROP FOREIGN KEY `user_id_fk_messages`;
+ALTER TABLE `cache` DROP FOREIGN KEY `user_id_fk_cache`;
+ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
+ALTER TABLE `identities` DROP FOREIGN KEY `user_id_fk_identities`;
+
+ALTER TABLE `messages` ADD CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `cache` ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `identities` ADD CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `contacts` ALTER `name` SET DEFAULT '';
+ALTER TABLE `contacts` ALTER `firstname` SET DEFAULT '';
+ALTER TABLE `contacts` ALTER `surname` SET DEFAULT '';
+
+ALTER TABLE `identities` ADD INDEX `user_identities_index` (`user_id`, `del`);
+ALTER TABLE `identities` ADD `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER `user_id`;
+
+CREATE TABLE `contactgroups` (
+  `contactgroup_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+  `del` tinyint(1) NOT NULL DEFAULT '0',
+  `name` varchar(128) NOT NULL DEFAULT '',
+  PRIMARY KEY(`contactgroup_id`),
+  CONSTRAINT `user_id_fk_contactgroups` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  INDEX `contactgroups_user_index` (`user_id`,`del`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `contactgroupmembers` (
+  `contactgroup_id` int(10) UNSIGNED NOT NULL,
+  `contact_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+  PRIMARY KEY (`contactgroup_id`, `contact_id`),
+  CONSTRAINT `contactgroup_id_fk_contactgroups` FOREIGN KEY (`contactgroup_id`)
+    REFERENCES `contactgroups`(`contactgroup_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `contact_id_fk_contacts` FOREIGN KEY (`contact_id`)
+    REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) /*!40000 ENGINE=INNODB */;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
diff --git a/SQL/mysql/2010042300.sql b/SQL/mysql/2010042300.sql
new file mode 100644
index 0000000..8b90af4
--- /dev/null
+++ b/SQL/mysql/2010042300.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.4-beta
+
+ALTER TABLE `users` CHANGE `last_login` `last_login` datetime DEFAULT NULL;
+UPDATE `users` SET `last_login` = NULL WHERE `last_login` = '1000-01-01 00:00:00';
diff --git a/SQL/mysql/2010100600.sql b/SQL/mysql/2010100600.sql
new file mode 100644
index 0000000..ca0fec8
--- /dev/null
+++ b/SQL/mysql/2010100600.sql
@@ -0,0 +1,8 @@
+-- Updates from version 0.4.2
+
+ALTER TABLE `users` DROP INDEX `username_index`;
+ALTER TABLE `users` ADD UNIQUE `username` (`username`, `mail_host`);
+
+ALTER TABLE `contacts` MODIFY `email` varchar(255) NOT NULL;
+
+TRUNCATE TABLE `messages`;
diff --git a/SQL/mysql/2011011200.sql b/SQL/mysql/2011011200.sql
new file mode 100644
index 0000000..6597034
--- /dev/null
+++ b/SQL/mysql/2011011200.sql
@@ -0,0 +1,8 @@
+-- Updates from version 0.5.x
+
+ALTER TABLE `contacts` ADD `words` TEXT NULL AFTER `vcard`;
+ALTER TABLE `contacts` CHANGE `vcard` `vcard` LONGTEXT /*!40101 CHARACTER SET utf8 */ NULL DEFAULT NULL;
+ALTER TABLE `contactgroupmembers` ADD INDEX `contactgroupmembers_contact_index` (`contact_id`);
+
+TRUNCATE TABLE `messages`;
+TRUNCATE TABLE `cache`;
diff --git a/SQL/mysql/2011092800.sql b/SQL/mysql/2011092800.sql
new file mode 100644
index 0000000..6b7cbe1
--- /dev/null
+++ b/SQL/mysql/2011092800.sql
@@ -0,0 +1,67 @@
+-- Updates from version 0.6
+
+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
+
+ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL;
+ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
+
+CREATE TABLE `dictionary` (
+  `user_id` int(10) UNSIGNED DEFAULT NULL,
+  `language` varchar(5) NOT NULL,
+  `data` longtext NOT NULL,
+  CONSTRAINT `user_id_fk_dictionary` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  UNIQUE `uniqueness` (`user_id`, `language`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `searches` (
+  `search_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `type` int(3) NOT NULL DEFAULT '0',
+  `name` varchar(128) NOT NULL,
+  `data` text,
+  PRIMARY KEY(`search_id`),
+  CONSTRAINT `user_id_fk_searches` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  UNIQUE `uniqueness` (`user_id`, `type`, `name`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE `messages`;
+
+CREATE TABLE `cache_index` (
+ `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+ `mailbox` varchar(255) BINARY NOT NULL,
+ `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `valid` tinyint(1) NOT NULL DEFAULT '0',
+ `data` longtext NOT NULL,
+ CONSTRAINT `user_id_fk_cache_index` FOREIGN KEY (`user_id`)
+   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ INDEX `changed_index` (`changed`),
+ PRIMARY KEY (`user_id`, `mailbox`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `cache_thread` (
+ `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+ `mailbox` varchar(255) BINARY NOT NULL,
+ `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `data` longtext NOT NULL,
+ CONSTRAINT `user_id_fk_cache_thread` FOREIGN KEY (`user_id`)
+   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ INDEX `changed_index` (`changed`),
+ PRIMARY KEY (`user_id`, `mailbox`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `cache_messages` (
+ `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+ `mailbox` varchar(255) BINARY NOT NULL,
+ `uid` int(11) UNSIGNED NOT NULL DEFAULT '0',
+ `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `data` longtext NOT NULL,
+ `flags` int(11) NOT NULL DEFAULT '0',
+ CONSTRAINT `user_id_fk_cache_messages` FOREIGN KEY (`user_id`)
+   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ INDEX `changed_index` (`changed`),
+ PRIMARY KEY (`user_id`, `mailbox`, `uid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
diff --git a/SQL/mysql/2011111600.sql b/SQL/mysql/2011111600.sql
new file mode 100644
index 0000000..6f53daa
--- /dev/null
+++ b/SQL/mysql/2011111600.sql
@@ -0,0 +1,3 @@
+-- Updates from version 0.7-beta
+
+ALTER TABLE `session` CHANGE `sess_id` `sess_id` varchar(128) NOT NULL;
diff --git a/SQL/mysql/2011121400.sql b/SQL/mysql/2011121400.sql
new file mode 100644
index 0000000..5aee806
--- /dev/null
+++ b/SQL/mysql/2011121400.sql
@@ -0,0 +1,22 @@
+-- Updates from version 0.7
+
+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
+
+ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
+ALTER TABLE `contacts` DROP INDEX `user_contacts_index`;
+ALTER TABLE `contacts` MODIFY `email` text NOT NULL;
+ALTER TABLE `contacts` ADD INDEX `user_contacts_index` (`user_id`,`del`);
+ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
+   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `cache` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_index` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_thread` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_messages` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contacts` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contactgroups` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contactgroupmembers` ALTER `contact_id` DROP DEFAULT;
+ALTER TABLE `identities` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `searches` ALTER `user_id` DROP DEFAULT;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
diff --git a/SQL/mysql/2012080700.sql b/SQL/mysql/2012080700.sql
new file mode 100644
index 0000000..789b712
--- /dev/null
+++ b/SQL/mysql/2012080700.sql
@@ -0,0 +1,5 @@
+-- Updates from version 0.8
+
+ALTER TABLE `cache` DROP COLUMN `cache_id`;
+ALTER TABLE `users` DROP COLUMN `alias`;
+ALTER TABLE `identities` ADD INDEX `email_identities_index` (`email`, `del`);
diff --git a/SQL/mysql/2013011000.sql b/SQL/mysql/2013011000.sql
new file mode 100644
index 0000000..f0b5e6a
--- /dev/null
+++ b/SQL/mysql/2013011000.sql
@@ -0,0 +1,7 @@
+-- Upgrade from 0.9-beta
+
+CREATE TABLE `system` (
+ `name` varchar(64) NOT NULL,
+ `value` mediumtext,
+ PRIMARY KEY(`name`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index f7b2d96..32d8ede 100644
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -262,3 +262,16 @@ CREATE TABLE searches (
     data text NOT NULL,
     CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name)
 );
+
+
+--
+-- Table "system"
+-- Name: system; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE "system" (
+    name varchar(64) NOT NULL PRIMARY KEY,
+    value text
+);
+
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700');
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
deleted file mode 100644
index 11ab93b..0000000
--- a/SQL/postgres.update.sql
+++ /dev/null
@@ -1,185 +0,0 @@
--- Roundcube Webmail update script for Postgres databases
--- Updates from version 0.1-stable to 0.1.1
-
-CREATE INDEX cache_user_id_idx ON cache (user_id, cache_key);
-CREATE INDEX contacts_user_id_idx ON contacts (user_id);
-CREATE INDEX identities_user_id_idx ON identities (user_id);
-
-CREATE INDEX users_username_id_idx ON users (username);
-CREATE INDEX users_alias_id_idx ON users (alias);
-
--- added ON DELETE/UPDATE actions
-ALTER TABLE messages DROP CONSTRAINT messages_user_id_fkey;
-ALTER TABLE messages ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE identities DROP CONSTRAINT identities_user_id_fkey;
-ALTER TABLE identities ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE contacts DROP CONSTRAINT contacts_user_id_fkey;
-ALTER TABLE contacts ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE cache DROP CONSTRAINT cache_user_id_fkey;
-ALTER TABLE cache ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- Updates from version 0.2-alpha
-
-CREATE INDEX messages_created_idx ON messages (created);
-
--- Updates from version 0.2-beta
-
-ALTER TABLE cache DROP session_id;
-
-CREATE INDEX session_changed_idx ON session (changed);
-CREATE INDEX cache_created_idx ON "cache" (created);
-
-ALTER TABLE users ALTER "language" DROP NOT NULL;
-ALTER TABLE users ALTER "language" DROP DEFAULT;
-
-ALTER TABLE identities ALTER del TYPE smallint;
-ALTER TABLE identities ALTER standard TYPE smallint;
-ALTER TABLE contacts ALTER del TYPE smallint;
-ALTER TABLE messages ALTER del TYPE smallint;
-
--- Updates from version 0.3-stable
-
-TRUNCATE messages;
-CREATE INDEX messages_index_idx ON messages (user_id, cache_key, idx);
-DROP INDEX contacts_user_id_idx;
-CREATE INDEX contacts_user_id_idx ON contacts (user_id, email);
-
--- Updates from version 0.3.1
-
-DROP INDEX identities_user_id_idx;
-CREATE INDEX identities_user_id_idx ON identities (user_id, del);
-
-ALTER TABLE identities ADD changed timestamp with time zone DEFAULT now() NOT NULL;
-
-CREATE SEQUENCE contactgroups_ids
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-CREATE TABLE contactgroups (
-    contactgroup_id integer DEFAULT nextval('contactgroups_ids'::text) PRIMARY KEY,
-    user_id 	integer		NOT NULL
-        REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    changed 	timestamp with time zone DEFAULT now() NOT NULL,
-    del 	smallint 	NOT NULL DEFAULT 0,
-    name 	varchar(128) 	NOT NULL DEFAULT ''
-);
-
-CREATE INDEX contactgroups_user_id_idx ON contactgroups (user_id, del);
-
-CREATE TABLE contactgroupmembers (
-    contactgroup_id 	integer NOT NULL
-	REFERENCES contactgroups(contactgroup_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    contact_id 		integer NOT NULL
-	REFERENCES contacts(contact_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    created timestamp with time zone DEFAULT now() NOT NULL,
-    PRIMARY KEY (contactgroup_id, contact_id)
-);
-
--- Updates from version 0.4-beta
-
-ALTER TABLE users ALTER last_login DROP NOT NULL;
-ALTER TABLE users ALTER last_login SET DEFAULT NULL;
-
--- Updates from version 0.4.2
-
-DROP INDEX users_username_id_idx;
-ALTER TABLE users ADD CONSTRAINT users_username_key UNIQUE (username, mail_host);
-ALTER TABLE contacts ALTER email TYPE varchar(255);
-
-TRUNCATE messages;
-
--- Updates from version 0.5.1
--- Updates from version 0.5.2
--- Updates from version 0.5.3
--- Updates from version 0.5.4
-
-ALTER TABLE contacts ADD words TEXT NULL;
-CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
-
-TRUNCATE messages;
-TRUNCATE cache;
-
--- Updates from version 0.6
-
-CREATE TABLE dictionary (
-    user_id integer DEFAULT NULL
-        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-   "language" varchar(5) NOT NULL,
-    data text NOT NULL,
-    CONSTRAINT dictionary_user_id_language_key UNIQUE (user_id, "language")
-);
-
-CREATE SEQUENCE search_ids
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-CREATE TABLE searches (
-    search_id integer DEFAULT nextval('search_ids'::text) PRIMARY KEY,
-    user_id integer NOT NULL
-        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    "type" smallint DEFAULT 0 NOT NULL,
-    name varchar(128) NOT NULL,
-    data text NOT NULL,
-    CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name)
-);
-
-DROP SEQUENCE message_ids;
-DROP TABLE messages;
-
-CREATE TABLE cache_index (
-    user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    mailbox varchar(255) NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT NULL,
-    valid smallint NOT NULL DEFAULT 0,
-    data text NOT NULL,
-    PRIMARY KEY (user_id, mailbox)
-);
-
-CREATE INDEX cache_index_changed_idx ON cache_index (changed);
-
-CREATE TABLE cache_thread (
-    user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    mailbox varchar(255) NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT NULL,
-    data text NOT NULL,
-    PRIMARY KEY (user_id, mailbox)
-);
-
-CREATE INDEX cache_thread_changed_idx ON cache_thread (changed);
-
-CREATE TABLE cache_messages (
-    user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    mailbox varchar(255) NOT NULL,
-    uid integer NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT NULL,
-    data text NOT NULL,
-    flags integer NOT NULL DEFAULT 0,
-    PRIMARY KEY (user_id, mailbox, uid)
-);
-
-CREATE INDEX cache_messages_changed_idx ON cache_messages (changed);
-
--- Updates from version 0.7-beta
-
-ALTER TABLE "session" ALTER sess_id TYPE varchar(128);
-
--- Updates from version 0.7
-
-DROP INDEX contacts_user_id_idx;
-CREATE INDEX contacts_user_id_idx ON contacts USING btree (user_id, del);
-ALTER TABLE contacts ALTER email TYPE text;
-
--- Updates from version 0.8
-
-ALTER TABLE cache DROP COLUMN cache_id;
-DROP SEQUENCE cache_ids;
-
-ALTER TABLE users DROP COLUMN alias;
-CREATE INDEX identities_email_idx ON identities (email, del);
diff --git a/SQL/postgres/2008030300.sql b/SQL/postgres/2008030300.sql
new file mode 100644
index 0000000..67a8f15
--- /dev/null
+++ b/SQL/postgres/2008030300.sql
@@ -0,0 +1,18 @@
+-- Updates from version 0.1-stable to 0.1.1
+
+CREATE INDEX cache_user_id_idx ON cache (user_id, cache_key);
+CREATE INDEX contacts_user_id_idx ON contacts (user_id);
+CREATE INDEX identities_user_id_idx ON identities (user_id);
+
+CREATE INDEX users_username_id_idx ON users (username);
+CREATE INDEX users_alias_id_idx ON users (alias);
+
+-- added ON DELETE/UPDATE actions
+ALTER TABLE messages DROP CONSTRAINT messages_user_id_fkey;
+ALTER TABLE messages ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE identities DROP CONSTRAINT identities_user_id_fkey;
+ALTER TABLE identities ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE contacts DROP CONSTRAINT contacts_user_id_fkey;
+ALTER TABLE contacts ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE cache DROP CONSTRAINT cache_user_id_fkey;
+ALTER TABLE cache ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/SQL/postgres/2008060900.sql b/SQL/postgres/2008060900.sql
new file mode 100644
index 0000000..7c60a44
--- /dev/null
+++ b/SQL/postgres/2008060900.sql
@@ -0,0 +1,3 @@
+-- Updates from version 0.2-alpha
+
+CREATE INDEX messages_created_idx ON messages (created);
diff --git a/SQL/postgres/2008092100.sql b/SQL/postgres/2008092100.sql
new file mode 100644
index 0000000..6cd1929
--- /dev/null
+++ b/SQL/postgres/2008092100.sql
@@ -0,0 +1,14 @@
+-- Updates from version 0.2-beta
+
+ALTER TABLE cache DROP session_id;
+
+CREATE INDEX session_changed_idx ON session (changed);
+CREATE INDEX cache_created_idx ON "cache" (created);
+
+ALTER TABLE users ALTER "language" DROP NOT NULL;
+ALTER TABLE users ALTER "language" DROP DEFAULT;
+
+ALTER TABLE identities ALTER del TYPE smallint;
+ALTER TABLE identities ALTER standard TYPE smallint;
+ALTER TABLE contacts ALTER del TYPE smallint;
+ALTER TABLE messages ALTER del TYPE smallint;
diff --git a/SQL/postgres/2009090400.sql b/SQL/postgres/2009090400.sql
new file mode 100644
index 0000000..8eb4949
--- /dev/null
+++ b/SQL/postgres/2009090400.sql
@@ -0,0 +1,6 @@
+-- Updates from version 0.3-stable
+
+TRUNCATE messages;
+CREATE INDEX messages_index_idx ON messages (user_id, cache_key, idx);
+DROP INDEX contacts_user_id_idx;
+CREATE INDEX contacts_user_id_idx ON contacts (user_id, email);
diff --git a/SQL/postgres/2009103100.sql b/SQL/postgres/2009103100.sql
new file mode 100644
index 0000000..2350f79
--- /dev/null
+++ b/SQL/postgres/2009103100.sql
@@ -0,0 +1,32 @@
+-- Updates from version 0.3.1
+
+DROP INDEX identities_user_id_idx;
+CREATE INDEX identities_user_id_idx ON identities (user_id, del);
+
+ALTER TABLE identities ADD changed timestamp with time zone DEFAULT now() NOT NULL;
+
+CREATE SEQUENCE contactgroups_ids
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+CREATE TABLE contactgroups (
+    contactgroup_id integer DEFAULT nextval('contactgroups_ids'::text) PRIMARY KEY,
+    user_id integer NOT NULL
+        REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    changed timestamp with time zone DEFAULT now() NOT NULL,
+    del smallint NOT NULL DEFAULT 0,
+    name varchar(128) NOT NULL DEFAULT ''
+);
+
+CREATE INDEX contactgroups_user_id_idx ON contactgroups (user_id, del);
+
+CREATE TABLE contactgroupmembers (
+    contactgroup_id integer NOT NULL
+        REFERENCES contactgroups(contactgroup_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    contact_id integer NOT NULL
+        REFERENCES contacts(contact_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    created timestamp with time zone DEFAULT now() NOT NULL,
+    PRIMARY KEY (contactgroup_id, contact_id)
+);
diff --git a/SQL/postgres/2010042300.sql b/SQL/postgres/2010042300.sql
new file mode 100644
index 0000000..bc9bd82
--- /dev/null
+++ b/SQL/postgres/2010042300.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.4-beta
+
+ALTER TABLE users ALTER last_login DROP NOT NULL;
+ALTER TABLE users ALTER last_login SET DEFAULT NULL;
diff --git a/SQL/postgres/2010100600.sql b/SQL/postgres/2010100600.sql
new file mode 100644
index 0000000..8dfcc12
--- /dev/null
+++ b/SQL/postgres/2010100600.sql
@@ -0,0 +1,7 @@
+-- Updates from version 0.4.2
+
+DROP INDEX users_username_id_idx;
+ALTER TABLE users ADD CONSTRAINT users_username_key UNIQUE (username, mail_host);
+ALTER TABLE contacts ALTER email TYPE varchar(255);
+
+TRUNCATE messages;
diff --git a/SQL/postgres/2011011200.sql b/SQL/postgres/2011011200.sql
new file mode 100644
index 0000000..db468d8
--- /dev/null
+++ b/SQL/postgres/2011011200.sql
@@ -0,0 +1,7 @@
+-- Updates from version 0.5.x
+
+ALTER TABLE contacts ADD words TEXT NULL;
+CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
+
+TRUNCATE messages;
+TRUNCATE cache;
diff --git a/SQL/postgres/2011092800.sql b/SQL/postgres/2011092800.sql
new file mode 100644
index 0000000..fac3cd3
--- /dev/null
+++ b/SQL/postgres/2011092800.sql
@@ -0,0 +1,64 @@
+-- Updates from version 0.6
+
+CREATE TABLE dictionary (
+    user_id integer DEFAULT NULL
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+   "language" varchar(5) NOT NULL,
+    data text NOT NULL,
+    CONSTRAINT dictionary_user_id_language_key UNIQUE (user_id, "language")
+);
+
+CREATE SEQUENCE search_ids
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+CREATE TABLE searches (
+    search_id integer DEFAULT nextval('search_ids'::text) PRIMARY KEY,
+    user_id integer NOT NULL
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    "type" smallint DEFAULT 0 NOT NULL,
+    name varchar(128) NOT NULL,
+    data text NOT NULL,
+    CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name)
+);
+
+DROP SEQUENCE message_ids;
+DROP TABLE messages;
+
+CREATE TABLE cache_index (
+    user_id integer NOT NULL
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    mailbox varchar(255) NOT NULL,
+    changed timestamp with time zone DEFAULT now() NOT NULL,
+    valid smallint NOT NULL DEFAULT 0,
+    data text NOT NULL,
+    PRIMARY KEY (user_id, mailbox)
+);
+
+CREATE INDEX cache_index_changed_idx ON cache_index (changed);
+
+CREATE TABLE cache_thread (
+    user_id integer NOT NULL
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    mailbox varchar(255) NOT NULL,
+    changed timestamp with time zone DEFAULT now() NOT NULL,
+    data text NOT NULL,
+    PRIMARY KEY (user_id, mailbox)
+);
+
+CREATE INDEX cache_thread_changed_idx ON cache_thread (changed);
+
+CREATE TABLE cache_messages (
+    user_id integer NOT NULL
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    mailbox varchar(255) NOT NULL,
+    uid integer NOT NULL,
+    changed timestamp with time zone DEFAULT now() NOT NULL,
+    data text NOT NULL,
+    flags integer NOT NULL DEFAULT 0,
+    PRIMARY KEY (user_id, mailbox, uid)
+);
+
+CREATE INDEX cache_messages_changed_idx ON cache_messages (changed);
diff --git a/SQL/postgres/2011111600.sql b/SQL/postgres/2011111600.sql
new file mode 100644
index 0000000..a382ba0
--- /dev/null
+++ b/SQL/postgres/2011111600.sql
@@ -0,0 +1,3 @@
+-- Updates from version 0.7-beta
+
+ALTER TABLE "session" ALTER sess_id TYPE varchar(128);
diff --git a/SQL/postgres/2011121400.sql b/SQL/postgres/2011121400.sql
new file mode 100644
index 0000000..81a0cb8
--- /dev/null
+++ b/SQL/postgres/2011121400.sql
@@ -0,0 +1,5 @@
+-- Updates from version 0.7
+
+DROP INDEX contacts_user_id_idx;
+CREATE INDEX contacts_user_id_idx ON contacts USING btree (user_id, del);
+ALTER TABLE contacts ALTER email TYPE text;
diff --git a/SQL/postgres/2012080700.sql b/SQL/postgres/2012080700.sql
new file mode 100644
index 0000000..41f6016
--- /dev/null
+++ b/SQL/postgres/2012080700.sql
@@ -0,0 +1,7 @@
+-- Updates from version 0.8
+
+ALTER TABLE cache DROP COLUMN cache_id;
+DROP SEQUENCE cache_ids;
+
+ALTER TABLE users DROP COLUMN alias;
+CREATE INDEX identities_email_idx ON identities (email, del);
diff --git a/SQL/postgres/2013011000.sql b/SQL/postgres/2013011000.sql
new file mode 100644
index 0000000..a8cf917
--- /dev/null
+++ b/SQL/postgres/2013011000.sql
@@ -0,0 +1,4 @@
+CREATE TABLE "system" (
+    name varchar(64) NOT NULL PRIMARY KEY,
+    value text
+);
diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index f5b5615..83874ce 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -197,3 +197,16 @@ CREATE TABLE cache_messages (
 );
 
 CREATE INDEX ix_cache_messages_changed ON cache_messages (changed);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table system
+--
+
+CREATE TABLE system (
+  name varchar(64) NOT NULL PRIMARY KEY,
+  value text NOT NULL
+);
+
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700');
diff --git a/SQL/sqlite.update.sql b/SQL/sqlite.update.sql
deleted file mode 100644
index 72a29e9..0000000
--- a/SQL/sqlite.update.sql
+++ /dev/null
@@ -1,380 +0,0 @@
--- Roundcube Webmail update script for SQLite databases
--- Updates from version 0.1-stable to 0.1.1
-
-DROP TABLE messages;
-
-CREATE TABLE messages (
-  message_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  del tinyint NOT NULL default '0',
-  cache_key varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  idx integer NOT NULL default '0',
-  uid integer NOT NULL default '0',
-  subject varchar(255) NOT NULL default '',
-  "from" varchar(255) NOT NULL default '',
-  "to" varchar(255) NOT NULL default '',
-  "cc" varchar(255) NOT NULL default '',
-  "date" datetime NOT NULL default '0000-00-00 00:00:00',
-  size integer NOT NULL default '0',
-  headers text NOT NULL,
-  structure text
-);
-
-CREATE INDEX ix_messages_user_cache_uid ON messages(user_id,cache_key,uid);
-CREATE INDEX ix_users_username ON users(username);
-CREATE INDEX ix_users_alias ON users(alias);
-
--- Updates from version 0.2-alpha
-
-CREATE INDEX ix_messages_created ON messages (created);
-
--- Updates from version 0.2-beta
-
-CREATE INDEX ix_session_changed ON session (changed);
-CREATE INDEX ix_cache_created ON cache (created);
-
--- Updates from version 0.3-stable
-
-DELETE FROM messages;
-DROP INDEX ix_messages_user_cache_uid;
-CREATE UNIQUE INDEX ix_messages_user_cache_uid ON messages (user_id,cache_key,uid);
-CREATE INDEX ix_messages_index ON messages (user_id,cache_key,idx);
-DROP INDEX ix_contacts_user_id;
-CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
-
--- Updates from version 0.3.1
-
--- ALTER TABLE identities ADD COLUMN changed datetime NOT NULL default '0000-00-00 00:00:00'; --
-
-CREATE TABLE temp_identities (
-  identity_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  standard tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  organization varchar(128) default '',
-  email varchar(128) NOT NULL default '',
-  "reply-to" varchar(128) NOT NULL default '',
-  bcc varchar(128) NOT NULL default '',
-  signature text NOT NULL default '',
-  html_signature tinyint NOT NULL default '0'
-);
-INSERT INTO temp_identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature)
-  SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature
-  FROM identities WHERE del=0;
-
-DROP INDEX ix_identities_user_id;
-DROP TABLE identities;
-
-CREATE TABLE identities (
-  identity_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  del tinyint NOT NULL default '0',
-  standard tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  organization varchar(128) default '',
-  email varchar(128) NOT NULL default '',
-  "reply-to" varchar(128) NOT NULL default '',
-  bcc varchar(128) NOT NULL default '',
-  signature text NOT NULL default '',
-  html_signature tinyint NOT NULL default '0'
-);
-CREATE INDEX ix_identities_user_id ON identities(user_id, del);
-
-INSERT INTO identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature)
-  SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature
-  FROM temp_identities;
-
-DROP TABLE temp_identities;
-
-CREATE TABLE contactgroups (
-  contactgroup_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  del tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default ''
-);
-
-CREATE INDEX ix_contactgroups_user_id ON contactgroups(user_id, del);
-
-CREATE TABLE contactgroupmembers (
-  contactgroup_id integer NOT NULL,
-  contact_id integer NOT NULL default '0',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY (contactgroup_id, contact_id)
-);
-
--- Updates from version 0.3.1
-
-CREATE TABLE tmp_users (
-  user_id integer NOT NULL PRIMARY KEY,
-  username varchar(128) NOT NULL default '',
-  mail_host varchar(128) NOT NULL default '',
-  alias varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  last_login datetime NOT NULL default '0000-00-00 00:00:00',
-  language varchar(5),
-  preferences text NOT NULL default ''
-);
-
-INSERT INTO tmp_users (user_id, username, mail_host, alias, created, last_login, language, preferences)
-    SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM users;
-
-DROP TABLE users;
-
-CREATE TABLE users (
-  user_id integer NOT NULL PRIMARY KEY,
-  username varchar(128) NOT NULL default '',
-  mail_host varchar(128) NOT NULL default '',
-  alias varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  last_login datetime DEFAULT NULL,
-  language varchar(5),
-  preferences text NOT NULL default ''
-);
-
-INSERT INTO users (user_id, username, mail_host, alias, created, last_login, language, preferences)
-    SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM tmp_users;
-
-CREATE INDEX ix_users_username ON users(username);
-CREATE INDEX ix_users_alias ON users(alias);
-DROP TABLE tmp_users;
-
--- Updates from version 0.4.2
-
-DROP INDEX ix_users_username;
-CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
-
-CREATE TABLE contacts_tmp (
-    contact_id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL default '0',
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    del tinyint NOT NULL default '0',
-    name varchar(128) NOT NULL default '',
-    email varchar(255) NOT NULL default '',
-    firstname varchar(128) NOT NULL default '',
-    surname varchar(128) NOT NULL default '',
-    vcard text NOT NULL default ''
-);
-
-INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
-
-DROP TABLE contacts;
-CREATE TABLE contacts (
-    contact_id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL default '0',
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    del tinyint NOT NULL default '0',
-    name varchar(128) NOT NULL default '',
-    email varchar(255) NOT NULL default '',
-    firstname varchar(128) NOT NULL default '',
-    surname varchar(128) NOT NULL default '',
-    vcard text NOT NULL default ''
-);
-
-INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
-
-CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
-DROP TABLE contacts_tmp;
-
-DELETE FROM messages;
-
-
--- Updates from version 0.5.1
--- Updates from version 0.5.2
--- Updates from version 0.5.3
--- Updates from version 0.5.4
-
-CREATE TABLE contacts_tmp (
-    contact_id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL default '0',
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    del tinyint NOT NULL default '0',
-    name varchar(128) NOT NULL default '',
-    email varchar(255) NOT NULL default '',
-    firstname varchar(128) NOT NULL default '',
-    surname varchar(128) NOT NULL default '',
-    vcard text NOT NULL default ''
-);
-
-INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
-
-DROP TABLE contacts;
-CREATE TABLE contacts (
-    contact_id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL default '0',
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    del tinyint NOT NULL default '0',
-    name varchar(128) NOT NULL default '',
-    email varchar(255) NOT NULL default '',
-    firstname varchar(128) NOT NULL default '',
-    surname varchar(128) NOT NULL default '',
-    vcard text NOT NULL default '',
-    words text NOT NULL default ''
-);
-
-INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
-
-CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
-DROP TABLE contacts_tmp;
-
-
-DELETE FROM messages;
-DELETE FROM cache;
-CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);
-
--- Updates from version 0.6
-
-CREATE TABLE dictionary (
-    user_id integer DEFAULT NULL,
-   "language" varchar(5) NOT NULL,
-    data text NOT NULL
-);
-
-CREATE UNIQUE INDEX ix_dictionary_user_language ON dictionary (user_id, "language");
-
-CREATE TABLE searches (
-  search_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL DEFAULT '0',
-  "type" smallint NOT NULL DEFAULT '0',
-  name varchar(128) NOT NULL,
-  data text NOT NULL
-);
-
-CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
-
-DROP TABLE messages;
-
-CREATE TABLE cache_index (
-    user_id integer NOT NULL,
-    mailbox varchar(255) NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    valid smallint NOT NULL DEFAULT '0',
-    data text NOT NULL,
-    PRIMARY KEY (user_id, mailbox)
-);
-
-CREATE INDEX ix_cache_index_changed ON cache_index (changed);
-
-CREATE TABLE cache_thread (
-    user_id integer NOT NULL,
-    mailbox varchar(255) NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    data text NOT NULL,
-    PRIMARY KEY (user_id, mailbox)
-);
-
-CREATE INDEX ix_cache_thread_changed ON cache_thread (changed);
-
-CREATE TABLE cache_messages (
-    user_id integer NOT NULL,
-    mailbox varchar(255) NOT NULL,
-    uid integer NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    data text NOT NULL,
-    flags integer NOT NULL DEFAULT '0',
-    PRIMARY KEY (user_id, mailbox, uid)
-);
-
-CREATE INDEX ix_cache_messages_changed ON cache_messages (changed);
-
--- Updates from version 0.7-beta
-
-DROP TABLE session;
-CREATE TABLE session (
-  sess_id varchar(128) NOT NULL PRIMARY KEY,
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  ip varchar(40) NOT NULL default '',
-  vars text NOT NULL
-);
-CREATE INDEX ix_session_changed ON session (changed);
-
--- Updates from version 0.7
-
-CREATE TABLE contacts_tmp (
-  contact_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL,
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  del tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  email text NOT NULL default '',
-  firstname varchar(128) NOT NULL default '',
-  surname varchar(128) NOT NULL default '',
-  vcard text NOT NULL default '',
-  words text NOT NULL default ''
-);
-
-INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts;
-
-DROP TABLE contacts;
-
-CREATE TABLE contacts (
-  contact_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL,
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  del tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  email text NOT NULL default '',
-  firstname varchar(128) NOT NULL default '',
-  surname varchar(128) NOT NULL default '',
-  vcard text NOT NULL default '',
-  words text NOT NULL default ''
-);
-
-INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts_tmp;
-
-CREATE INDEX ix_contacts_user_id ON contacts(user_id, del);
-DROP TABLE contacts_tmp;
-
--- Updates from version 0.8
-
-DROP TABLE cache;
-CREATE TABLE cache (
-  user_id integer NOT NULL default 0,
-  cache_key varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  data text NOT NULL
-);
-
-CREATE INDEX ix_cache_user_cache_key ON cache(user_id, cache_key);
-CREATE INDEX ix_cache_created ON cache(created);
-
-CREATE TABLE tmp_users (
-  user_id integer NOT NULL PRIMARY KEY,
-  username varchar(128) NOT NULL default '',
-  mail_host varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  last_login datetime DEFAULT NULL,
-  language varchar(5),
-  preferences text NOT NULL default ''
-);
-
-INSERT INTO tmp_users (user_id, username, mail_host, created, last_login, language, preferences)
-    SELECT user_id, username, mail_host, created, last_login, language, preferences FROM users;
-
-DROP TABLE users;
-
-CREATE TABLE users (
-  user_id integer NOT NULL PRIMARY KEY,
-  username varchar(128) NOT NULL default '',
-  mail_host varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  last_login datetime DEFAULT NULL,
-  language varchar(5),
-  preferences text NOT NULL default ''
-);
-
-INSERT INTO users (user_id, username, mail_host, created, last_login, language, preferences)
-    SELECT user_id, username, mail_host, created, last_login, language, preferences FROM tmp_users;
-
-CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
-
-CREATE INDEX ix_identities_email ON identities(email, del);
diff --git a/SQL/sqlite/2008030300.sql b/SQL/sqlite/2008030300.sql
new file mode 100644
index 0000000..b5b4890
--- /dev/null
+++ b/SQL/sqlite/2008030300.sql
@@ -0,0 +1,25 @@
+-- Updates from version 0.1-stable to 0.1.1
+
+DROP TABLE messages;
+
+CREATE TABLE messages (
+  message_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  del tinyint NOT NULL default '0',
+  cache_key varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  idx integer NOT NULL default '0',
+  uid integer NOT NULL default '0',
+  subject varchar(255) NOT NULL default '',
+  "from" varchar(255) NOT NULL default '',
+  "to" varchar(255) NOT NULL default '',
+  "cc" varchar(255) NOT NULL default '',
+  "date" datetime NOT NULL default '0000-00-00 00:00:00',
+  size integer NOT NULL default '0',
+  headers text NOT NULL,
+  structure text
+);
+
+CREATE INDEX ix_messages_user_cache_uid ON messages(user_id,cache_key,uid);
+CREATE INDEX ix_users_username ON users(username);
+CREATE INDEX ix_users_alias ON users(alias);
diff --git a/SQL/sqlite/2008060900.sql b/SQL/sqlite/2008060900.sql
new file mode 100644
index 0000000..157029c
--- /dev/null
+++ b/SQL/sqlite/2008060900.sql
@@ -0,0 +1,3 @@
+-- Updates from version 0.2-alpha
+
+CREATE INDEX ix_messages_created ON messages (created);
diff --git a/SQL/sqlite/2008092100.sql b/SQL/sqlite/2008092100.sql
new file mode 100644
index 0000000..8bc081c
--- /dev/null
+++ b/SQL/sqlite/2008092100.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.2-beta
+
+CREATE INDEX ix_session_changed ON session (changed);
+CREATE INDEX ix_cache_created ON cache (created);
diff --git a/SQL/sqlite/2009090400.sql b/SQL/sqlite/2009090400.sql
new file mode 100644
index 0000000..c8a53ed
--- /dev/null
+++ b/SQL/sqlite/2009090400.sql
@@ -0,0 +1,8 @@
+-- Updates from version 0.3-stable
+
+DELETE FROM messages;
+DROP INDEX ix_messages_user_cache_uid;
+CREATE UNIQUE INDEX ix_messages_user_cache_uid ON messages (user_id,cache_key,uid);
+CREATE INDEX ix_messages_index ON messages (user_id,cache_key,idx);
+DROP INDEX ix_contacts_user_id;
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
diff --git a/SQL/sqlite/2009103100.sql b/SQL/sqlite/2009103100.sql
new file mode 100644
index 0000000..bd7b174
--- /dev/null
+++ b/SQL/sqlite/2009103100.sql
@@ -0,0 +1,61 @@
+-- Updates from version 0.3.1
+
+-- ALTER TABLE identities ADD COLUMN changed datetime NOT NULL default '0000-00-00 00:00:00'; --
+
+CREATE TABLE temp_identities (
+  identity_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  standard tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  organization varchar(128) default '',
+  email varchar(128) NOT NULL default '',
+  "reply-to" varchar(128) NOT NULL default '',
+  bcc varchar(128) NOT NULL default '',
+  signature text NOT NULL default '',
+  html_signature tinyint NOT NULL default '0'
+);
+INSERT INTO temp_identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature)
+  SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature
+  FROM identities WHERE del=0;
+
+DROP INDEX ix_identities_user_id;
+DROP TABLE identities;
+
+CREATE TABLE identities (
+  identity_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  standard tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  organization varchar(128) default '',
+  email varchar(128) NOT NULL default '',
+  "reply-to" varchar(128) NOT NULL default '',
+  bcc varchar(128) NOT NULL default '',
+  signature text NOT NULL default '',
+  html_signature tinyint NOT NULL default '0'
+);
+CREATE INDEX ix_identities_user_id ON identities(user_id, del);
+
+INSERT INTO identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature)
+  SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature
+  FROM temp_identities;
+
+DROP TABLE temp_identities;
+
+CREATE TABLE contactgroups (
+  contactgroup_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default ''
+);
+
+CREATE INDEX ix_contactgroups_user_id ON contactgroups(user_id, del);
+
+CREATE TABLE contactgroupmembers (
+  contactgroup_id integer NOT NULL,
+  contact_id integer NOT NULL default '0',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY (contactgroup_id, contact_id)
+);
diff --git a/SQL/sqlite/2010042300.sql b/SQL/sqlite/2010042300.sql
new file mode 100644
index 0000000..1a9023c
--- /dev/null
+++ b/SQL/sqlite/2010042300.sql
@@ -0,0 +1,35 @@
+-- Updates from version 0.4-beta
+
+CREATE TABLE tmp_users (
+  user_id integer NOT NULL PRIMARY KEY,
+  username varchar(128) NOT NULL default '',
+  mail_host varchar(128) NOT NULL default '',
+  alias varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  last_login datetime NOT NULL default '0000-00-00 00:00:00',
+  language varchar(5),
+  preferences text NOT NULL default ''
+);
+
+INSERT INTO tmp_users (user_id, username, mail_host, alias, created, last_login, language, preferences)
+    SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM users;
+
+DROP TABLE users;
+
+CREATE TABLE users (
+  user_id integer NOT NULL PRIMARY KEY,
+  username varchar(128) NOT NULL default '',
+  mail_host varchar(128) NOT NULL default '',
+  alias varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  last_login datetime DEFAULT NULL,
+  language varchar(5),
+  preferences text NOT NULL default ''
+);
+
+INSERT INTO users (user_id, username, mail_host, alias, created, last_login, language, preferences)
+    SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM tmp_users;
+
+CREATE INDEX ix_users_username ON users(username);
+CREATE INDEX ix_users_alias ON users(alias);
+DROP TABLE tmp_users;
diff --git a/SQL/sqlite/2010100600.sql b/SQL/sqlite/2010100600.sql
new file mode 100644
index 0000000..5c7259f
--- /dev/null
+++ b/SQL/sqlite/2010100600.sql
@@ -0,0 +1,40 @@
+-- Updates from version 0.4.2
+
+DROP INDEX ix_users_username;
+CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
+
+CREATE TABLE contacts_tmp (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default ''
+);
+
+INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
+
+DROP TABLE contacts;
+CREATE TABLE contacts (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default ''
+);
+
+INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
+
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
+DROP TABLE contacts_tmp;
+
+DELETE FROM messages;
diff --git a/SQL/sqlite/2011011200.sql b/SQL/sqlite/2011011200.sql
new file mode 100644
index 0000000..4cca740
--- /dev/null
+++ b/SQL/sqlite/2011011200.sql
@@ -0,0 +1,41 @@
+-- Updates from version 0.5.x
+
+CREATE TABLE contacts_tmp (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default ''
+);
+
+INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
+
+DROP TABLE contacts;
+CREATE TABLE contacts (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default '',
+    words text NOT NULL default ''
+);
+
+INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
+
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
+DROP TABLE contacts_tmp;
+
+
+DELETE FROM messages;
+DELETE FROM cache;
+CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);
diff --git a/SQL/sqlite/2011092800.sql b/SQL/sqlite/2011092800.sql
new file mode 100644
index 0000000..27dbffc
--- /dev/null
+++ b/SQL/sqlite/2011092800.sql
@@ -0,0 +1,54 @@
+-- Updates from version 0.6
+
+CREATE TABLE dictionary (
+    user_id integer DEFAULT NULL,
+   "language" varchar(5) NOT NULL,
+    data text NOT NULL
+);
+
+CREATE UNIQUE INDEX ix_dictionary_user_language ON dictionary (user_id, "language");
+
+CREATE TABLE searches (
+  search_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL DEFAULT '0',
+  "type" smallint NOT NULL DEFAULT '0',
+  name varchar(128) NOT NULL,
+  data text NOT NULL
+);
+
+CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
+
+DROP TABLE messages;
+
+CREATE TABLE cache_index (
+    user_id integer NOT NULL,
+    mailbox varchar(255) NOT NULL,
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    valid smallint NOT NULL DEFAULT '0',
+    data text NOT NULL,
+    PRIMARY KEY (user_id, mailbox)
+);
+
+CREATE INDEX ix_cache_index_changed ON cache_index (changed);
+
+CREATE TABLE cache_thread (
+    user_id integer NOT NULL,
+    mailbox varchar(255) NOT NULL,
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    data text NOT NULL,
+    PRIMARY KEY (user_id, mailbox)
+);
+
+CREATE INDEX ix_cache_thread_changed ON cache_thread (changed);
+
+CREATE TABLE cache_messages (
+    user_id integer NOT NULL,
+    mailbox varchar(255) NOT NULL,
+    uid integer NOT NULL,
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    data text NOT NULL,
+    flags integer NOT NULL DEFAULT '0',
+    PRIMARY KEY (user_id, mailbox, uid)
+);
+
+CREATE INDEX ix_cache_messages_changed ON cache_messages (changed);
diff --git a/SQL/sqlite/2011111600.sql b/SQL/sqlite/2011111600.sql
new file mode 100644
index 0000000..cea0d12
--- /dev/null
+++ b/SQL/sqlite/2011111600.sql
@@ -0,0 +1,11 @@
+-- Updates from version 0.7-beta
+
+DROP TABLE session;
+CREATE TABLE session (
+  sess_id varchar(128) NOT NULL PRIMARY KEY,
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  ip varchar(40) NOT NULL default '',
+  vars text NOT NULL
+);
+CREATE INDEX ix_session_changed ON session (changed);
diff --git a/SQL/sqlite/2011121400.sql b/SQL/sqlite/2011121400.sql
new file mode 100644
index 0000000..9d92276
--- /dev/null
+++ b/SQL/sqlite/2011121400.sql
@@ -0,0 +1,38 @@
+-- Updates from version 0.7
+
+CREATE TABLE contacts_tmp (
+  contact_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL,
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  email text NOT NULL default '',
+  firstname varchar(128) NOT NULL default '',
+  surname varchar(128) NOT NULL default '',
+  vcard text NOT NULL default '',
+  words text NOT NULL default ''
+);
+
+INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts;
+
+DROP TABLE contacts;
+
+CREATE TABLE contacts (
+  contact_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL,
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  email text NOT NULL default '',
+  firstname varchar(128) NOT NULL default '',
+  surname varchar(128) NOT NULL default '',
+  vcard text NOT NULL default '',
+  words text NOT NULL default ''
+);
+
+INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts_tmp;
+
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, del);
+DROP TABLE contacts_tmp;
diff --git a/SQL/sqlite/2012080700.sql b/SQL/sqlite/2012080700.sql
new file mode 100644
index 0000000..c6ede89
--- /dev/null
+++ b/SQL/sqlite/2012080700.sql
@@ -0,0 +1,44 @@
+-- Updates from version 0.8
+
+DROP TABLE cache;
+CREATE TABLE cache (
+  user_id integer NOT NULL default 0,
+  cache_key varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  data text NOT NULL
+);
+
+CREATE INDEX ix_cache_user_cache_key ON cache(user_id, cache_key);
+CREATE INDEX ix_cache_created ON cache(created);
+
+CREATE TABLE tmp_users (
+  user_id integer NOT NULL PRIMARY KEY,
+  username varchar(128) NOT NULL default '',
+  mail_host varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  last_login datetime DEFAULT NULL,
+  language varchar(5),
+  preferences text NOT NULL default ''
+);
+
+INSERT INTO tmp_users (user_id, username, mail_host, created, last_login, language, preferences)
+    SELECT user_id, username, mail_host, created, last_login, language, preferences FROM users;
+
+DROP TABLE users;
+
+CREATE TABLE users (
+  user_id integer NOT NULL PRIMARY KEY,
+  username varchar(128) NOT NULL default '',
+  mail_host varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  last_login datetime DEFAULT NULL,
+  language varchar(5),
+  preferences text NOT NULL default ''
+);
+
+INSERT INTO users (user_id, username, mail_host, created, last_login, language, preferences)
+    SELECT user_id, username, mail_host, created, last_login, language, preferences FROM tmp_users;
+
+CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
+
+CREATE INDEX ix_identities_email ON identities(email, del);
diff --git a/SQL/sqlite/2013011000.sql b/SQL/sqlite/2013011000.sql
new file mode 100644
index 0000000..2c66ef9
--- /dev/null
+++ b/SQL/sqlite/2013011000.sql
@@ -0,0 +1,6 @@
+-- Updates from version 0.9-beta
+
+CREATE TABLE system (
+  name varchar(64) NOT NULL PRIMARY KEY,
+  value text NOT NULL
+);
diff --git a/SQL/sqlite/2013011700.sql b/SQL/sqlite/2013011700.sql
new file mode 100644
index 0000000..533e70f
--- /dev/null
+++ b/SQL/sqlite/2013011700.sql
@@ -0,0 +1,2 @@
+-- drop temp table created in 2012080700.sql
+DROP TABLE IF EXISTS tmp_users;
diff --git a/bin/jsshrink.sh b/bin/jsshrink.sh
index 9cfd660..1d77ff3 100755
--- a/bin/jsshrink.sh
+++ b/bin/jsshrink.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 JS_DIR=`dirname "$0"`/../program/js
 JAR_DIR='/tmp'
+LANG_IN='ECMASCRIPT3'
 CLOSURE_COMPILER_URL='http://closure-compiler.googlecode.com/files/compiler-latest.zip'
 
 do_shrink() {
 	rm -f "$2"
-	java -jar $JAR_DIR/compiler.jar --compilation_level=SIMPLE_OPTIMIZATIONS --js="$1" --js_output_file="$2"
+	java -jar $JAR_DIR/compiler.jar --compilation_level=SIMPLE_OPTIMIZATIONS --js="$1" --js_output_file="$2" --language_in="$3"
 }
 
 if [ ! -d "$JS_DIR" ]; then
@@ -37,6 +38,24 @@ if [ ! -r "$JAR_DIR/compiler.jar" ]; then
 	rm -f "/tmp/$$.zip"
 fi
 
+# compress single file from argument
+if [ $# -gt 0 ]; then
+	JS_DIR=`dirname "$1"`
+	JS_FILE="$1"
+
+	if [ $# -gt 1 ]; then
+		LANG_IN="$2"
+	fi
+
+	if [ ! -r "${JS_FILE}.src" ]; then
+		mv "$JS_FILE" "${JS_FILE}.src"
+	fi
+	echo "Shrinking $JS_FILE"
+	do_shrink "${JS_FILE}.src" "$JS_FILE" "$LANG_IN"
+	exit
+fi
+
+# default: compress application scripts
 for fn in app common googiespell list; do
 	if [ -r "$JS_DIR/${fn}.js.src" ]; then
 		echo "$JS_DIR/${fn}.js.src already exists, not overwriting"
@@ -44,5 +63,5 @@ for fn in app common googiespell list; do
 		mv "$JS_DIR/${fn}.js" "$JS_DIR/${fn}.js.src"
 	fi
 	echo "Shrinking $JS_DIR/${fn}.js"
-	do_shrink "$JS_DIR/${fn}.js.src" "$JS_DIR/${fn}.js"
+	do_shrink "$JS_DIR/${fn}.js.src" "$JS_DIR/${fn}.js" "$LANG_IN"
 done
diff --git a/bin/update.sh b/bin/update.sh
index 2015aa9..05956b9 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -32,9 +32,11 @@ if (!$opts['version']) {
   echo "What version are you upgrading from? Type '?' if you don't know.\n";
   if (($input = trim(fgets(STDIN))) && preg_match('/^[0-9.]+[a-z-]*$/', $input))
     $opts['version'] = $input;
+  else
+    $opts['version'] = RCMAIL_VERSION;
 }
 
-if ($opts['version'] && version_compare(version_parse($opts['version']), version_parse(RCMAIL_VERSION), '>'))
+if ($opts['version'] && version_compare(version_parse($opts['version']), version_parse(RCMAIL_VERSION), '>='))
   die("Nothing to be done here. Bye!\n");
 
 
@@ -124,7 +126,7 @@ if ($RCI->configured) {
         }
       }
       else {
-        echo "Please update your config files manually according to the above messages.\n\n";
+        echo "Please update your config files manually according to the above messages.\n";
       }
     }
 
@@ -143,36 +145,18 @@ if ($RCI->configured) {
 
   // check database schema
   if ($RCI->config['db_dsnw']) {
-    $DB = rcube_db::factory($RCI->config['db_dsnw'], '', false);
-    $DB->db_connect('w');
-    if ($db_error_msg = $DB->is_error()) {
-      echo "Error connecting to database: $db_error_msg\n";
-      $success = false;
-    }
-    else if ($err = $RCI->db_schema_check($DB, false)) {
-      $updatefile = INSTALL_PATH . 'SQL/' . (isset($RCI->db_map[$DB->db_provider]) ? $RCI->db_map[$DB->db_provider] : $DB->db_provider) . '.update.sql';
-      echo "WARNING: Database schema needs to be updated!\n";
-      echo join("\n", $err) . "\n\n";
-      $success = false;
-      
-      if ($opts['version']) {
-        echo "Do you want to run the update queries to get the schmea fixed? (y/N)\n";
-        $input = trim(fgets(STDIN));
-        if (strtolower($input) == 'y') {
-          $success = $RCI->update_db($DB, $opts['version']);
-        }
-      }
-      
-      if (!$success)
-        echo "Open $updatefile and execute all queries below the comment with the currently installed version number.\n";
-    }
+    echo "Executing database schema update.\n";
+    system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version']
+      . " --dir=" . INSTALL_PATH . DIRECTORY_SEPARATOR . "SQL", $res);
+
+    $success = !$res;
   }
-  
+
   // index contacts for fulltext searching
   if (version_compare(version_parse($opts['version']), '0.6.0', '<')) {
     system(INSTALL_PATH . 'bin/indexcontacts.sh');
   }
-  
+
   if ($success) {
     echo "This instance of Roundcube is up-to-date.\n";
     echo "Have fun!\n";
@@ -183,6 +167,4 @@ else {
   echo "Open http://url-to-roundcube/installer/ in your browser and follow the instuctions.\n";
 }
 
-echo "\n";
-
 ?>
diff --git a/bin/updatedb.sh b/bin/updatedb.sh
new file mode 100755
index 0000000..c856e0d
--- /dev/null
+++ b/bin/updatedb.sh
@@ -0,0 +1,184 @@
+#!/usr/bin/env php
+<?php
+/*
+ +-----------------------------------------------------------------------+
+ | bin/updatedb.sh                                                       |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2010-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2010-2012, Kolab Systems AG                             |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Update database schema                                              |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec at alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
+
+require_once INSTALL_PATH . 'program/include/clisetup.php';
+
+// get arguments
+$opts = rcube_utils::get_opt(array(
+    'v' => 'version',
+    'd' => 'dir',
+    'p' => 'package',
+));
+
+if (empty($opts['dir'])) {
+  echo "ERROR: Database schema directory not specified (--dir).\n";
+  exit(1);
+}
+if (empty($opts['package'])) {
+  echo "ERROR: Database schema package name not specified (--package).\n";
+  exit(1);
+}
+
+// Check if directory exists
+if (!file_exists($opts['dir'])) {
+  echo "ERROR: Specified database schema directory doesn't exist.\n";
+  exit(1);
+}
+
+$RC = rcube::get_instance();
+$DB = rcube_db::factory($RC->config->get('db_dsnw'));
+
+// Connect to database
+$DB->db_connect('w');
+if (!$DB->is_connected()) {
+    echo "Error connecting to database: " . $DB->is_error() . ".\n";
+    exit(1);
+}
+
+// Read DB schema version from database (if 'system' table exists)
+if (in_array('system', (array)$DB->list_tables())) {
+    $DB->query("SELECT " . $DB->quote_identifier('value')
+        ." FROM " . $DB->quote_identifier($DB->table_name('system'))
+        ." WHERE " . $DB->quote_identifier('name') ." = ?",
+        $opts['package'] . '-version');
+
+    $row     = $DB->fetch_array();
+    $version = preg_replace('/[^0-9]/', '', $row[0]);
+}
+
+// DB version not found, but release version is specified
+if (!$version && $opts['version']) {
+    // Map old release version string to DB schema version
+    // Note: This is for backward compat. only, do not need to be updated
+    $map = array(
+        '0.1-stable' => 1,
+        '0.1.1'      => 2008030300,
+        '0.2-alpha'  => 2008040500,
+        '0.2-beta'   => 2008060900,
+        '0.2-stable' => 2008092100,
+        '0.3-stable' => 2008092100,
+        '0.3.1'      => 2009090400,
+        '0.4-beta'   => 2009103100,
+        '0.4.2'      => 2010042300,
+        '0.5-beta'   => 2010100600,
+        '0.5'        => 2010100600,
+        '0.5.1'      => 2010100600,
+        '0.6-beta'   => 2011011200,
+        '0.6'        => 2011011200,
+        '0.7-beta'   => 2011092800,
+        '0.7'        => 2011111600,
+        '0.7.1'      => 2011111600,
+        '0.7.2'      => 2011111600,
+        '0.7.3'      => 2011111600,
+        '0.8-beta'   => 2011121400,
+        '0.8-rc'     => 2011121400,
+        '0.8.0'      => 2011121400,
+        '0.8.1'      => 2011121400,
+        '0.8.2'      => 2011121400,
+        '0.8.3'      => 2011121400,
+        '0.8.4'      => 2011121400,
+        '0.9-beta'   => 2012080700,
+    );
+
+    $version = $map[$opts['version']];
+}
+
+// Assume last version before the 'system' table was added
+if (empty($version)) {
+    $version = 2012080700;
+}
+
+$dir = $opts['dir'] . DIRECTORY_SEPARATOR . $DB->db_provider;
+if (!file_exists($dir)) {
+    echo "DDL Upgrade files for " . $DB->db_provider . " driver not found.\n";
+    exit(1);
+}
+
+$dh     = opendir($dir);
+$result = array();
+
+while ($file = readdir($dh)) {
+    if (preg_match('/^([0-9]+)\.sql$/', $file, $m) && $m[1] > $version) {
+        $result[] = $m[1];
+    }
+}
+sort($result, SORT_NUMERIC);
+
+foreach ($result as $v) {
+    echo "Updating database schema ($v)... ";
+    $error = update_db_schema($opts['package'], $v, $dir . DIRECTORY_SEPARATOR . "$v.sql");
+
+    if ($error) {
+        echo "\nError in DDL upgrade $v: $error\n";
+        exit(1);
+    }
+    echo "[OK]\n";
+}
+
+exit(0);
+
+function update_db_schema($package, $version, $file)
+{
+    global $DB;
+
+    // read DDL file
+    if ($lines = file($file)) {
+        $sql = '';
+        foreach ($lines as $line) {
+            if (preg_match('/^--/', $line) || trim($line) == '')
+                continue;
+
+            $sql .= $line . "\n";
+            if (preg_match('/(;|^GO)$/', trim($line))) {
+                @$DB->query($sql);
+                $sql = '';
+                if ($error = $DB->is_error()) {
+                    return $error;
+                }
+            }
+        }
+    }
+
+    // escape if 'system' table does not exist
+    if ($version < 2013011000) {
+        return;
+    }
+
+    $system_table = $DB->quote_identifier($DB->table_name('system'));
+
+    $DB->query("UPDATE " . $system_table
+        ." SET " . $DB->quote_identifier('value') . " = ?"
+        ." WHERE " . $DB->quote_identifier('name') . " = ?",
+        $version, $package . '-version');
+
+    if (!$DB->is_error() && !$DB->affected_rows()) {
+        $DB->query("INSERT INTO " . $system_table
+            ." (" . $DB->quote_identifier('name') . ", " . $DB->quote_identifier('value') . ")"
+            ." VALUES (?, ?)",
+            $package . '-version', $version);
+    }
+
+    return $DB->is_error();
+}
+
+?>
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
index a596d64..9bbf7d7 100644
--- a/config/db.inc.php.dist
+++ b/config/db.inc.php.dist
@@ -49,6 +49,7 @@ $rcmail_config['db_table_cache_thread'] = 'cache_thread';
 $rcmail_config['db_table_cache_messages'] = 'cache_messages';
 $rcmail_config['db_table_dictionary'] = 'dictionary';
 $rcmail_config['db_table_searches'] = 'searches';
+$rcmail_config['db_table_system'] = 'system';
 
 // you can define specific sequence names used in PostgreSQL
 $rcmail_config['db_sequence_users'] = 'user_ids';
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index e6cb9fd..b113b41 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -577,6 +577,7 @@ $rcmail_config['ldap_public']['Verisign'] = array(
   'port'          => 389,
   'use_tls'	      => false,
   'ldap_version'  => 3,       // using LDAPv3
+  'network_timeout' => 10,    // The timeout (in seconds) for connect + bind arrempts. This is only supported in PHP >= 5.3.0 with OpenLDAP 2.x
   'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
   // %fu - The full username provided, assumes the username is an email
   //       address, uses the username_domain value if not an email address.
diff --git a/index.php b/index.php
index b1250d0..17bcb77 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 0.9-beta                                                         |
+ | Version 0.9-rc                                                          |
  |                                                                         |
  | Copyright (C) 2005-2013, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/installer/check.php b/installer/check.php
index 886200b..14fc4f0 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php" method="get">
 <?php
 
diff --git a/installer/config.php b/installer/config.php
index 6897ffb..d6846ed 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php" method="post">
 <input type="hidden" name="_step" value="2" />
 <?php
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 530be3e..7522b3b 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -29,7 +29,6 @@ class rcube_install
   var $config = array();
   var $configured = false;
   var $last_error = null;
-  var $db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql', 'sqlsrv' => 'mssql');
   var $email_pattern = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9])';
   var $bool_config_props = array();
 
@@ -65,7 +64,7 @@ class rcube_install
   /**
    * Constructor
    */
-  function rcube_install()
+  function __construct()
   {
     $this->step = intval($_REQUEST['_step']);
     $this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
@@ -74,7 +73,7 @@ class rcube_install
   /**
    * Singleton getter
    */
-  function get_instance()
+  static function get_instance()
   {
     static $inst;
 
@@ -261,6 +260,11 @@ class rcube_install
       }
     }
 
+    // the old default mime_magic reference is obsolete
+    if ($this->config['mime_magic'] == '/usr/share/misc/magic') {
+        $out['obsolete'][] = array('prop' => 'mime_magic', 'explain' => "Set value to null in order to use system default");
+    }
+
     // iterate over default config
     foreach ($defaults as $prop => $value) {
       if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop])))
@@ -451,7 +455,8 @@ class rcube_install
         '0.5-beta', '0.5', '0.5.1',
         '0.6-beta', '0.6',
         '0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3',
-        '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4',
+        '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5',
+        '0.9-beta',
     ));
     return $select;
   }
@@ -603,7 +608,7 @@ class rcube_install
    */
   function init_db($DB)
   {
-    $engine = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;
+    $engine = $DB->db_provider;
 
     // read schema file from /SQL/*
     $fname = INSTALL_PATH . "SQL/$engine.initial.sql";
@@ -625,46 +630,18 @@ class rcube_install
 
 
   /**
-   * Update database with SQL statements from SQL/*.update.sql
+   * Update database schema
    *
-   * @param object rcube_db Database connection
    * @param string Version to update from
+   *
    * @return boolen True on success, False on error
    */
-  function update_db($DB, $version)
+  function update_db($version)
   {
-    $version = version_parse(strtolower($version));
-    $engine  = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;
-
-    // read schema file from /SQL/*
-    $fname = INSTALL_PATH . "SQL/$engine.update.sql";
-    if ($lines = @file($fname, FILE_SKIP_EMPTY_LINES)) {
-      $from = false; $sql = '';
-      foreach ($lines as $line) {
-        $is_comment = preg_match('/^--/', $line);
-        if (!$from && $is_comment && preg_match('/from version\s([0-9.]+[a-z-]*)/', $line, $m)) {
-          $v = version_parse(strtolower($m[1]));
-          if ($v == $version || version_compare($version, $v, '<='))
-            $from = true;
-        }
-        if ($from && !$is_comment)
-          $sql .= $line. "\n";
-      }
-
-      if ($sql)
-        $this->exec_sql($sql, $DB);
-    }
-    else {
-      $this->fail('DB Schema', "Cannot read the update file: $fname");
-      return false;
-    }
+    system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $version
+      . " --dir=" . INSTALL_PATH . "SQL", $result);
 
-    if ($err = $this->get_error()) {
-      $this->fail('DB Schema', "Error updating database: $err");
-      return false;
-    }
-
-    return true;
+    return !$result;
   }
 
 
diff --git a/installer/test.php b/installer/test.php
index e266bf0..bd49ac5 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php?_step=3" method="post">
 
 <h3>Check config files</h3>
@@ -157,11 +164,9 @@ if ($db_working && $_POST['initdb']) {
 }
 
 else if ($db_working && $_POST['updatedb']) {
-  if (!($success = $RCI->update_db($DB, $_POST['version']))) {
-      $updatefile = INSTALL_PATH . 'SQL/' . (isset($RCI->db_map[$DB->db_provider]) ? $RCI->db_map[$DB->db_provider] : $DB->db_provider) . '.update.sql';
-      echo '<p class="warning">Please manually execute the SQL statements from '.$updatefile.' on your database.<br/>';
-      echo 'See comments in the file and execute queries below the comment with the currently installed version number.</p>';
-  }
+    if (!($success = $RCI->update_db($_POST['version']))) {
+        echo '<p class="warning">Database schema update failed.</p>';
+    }
 }
 
 // test database
@@ -176,9 +181,8 @@ if ($db_working) {
         $RCI->fail('DB Schema', "Database schema differs");
         echo '<ul style="margin:0"><li>' . join("</li>\n<li>", $err) . "</li></ul>";
         $select = $RCI->versions_select(array('name' => 'version'));
-        echo '<p class="suggestion">You should run the update queries to get the schmea fixed.<br/><br/>Version to update from: ' . $select->show() . '&nbsp;<input type="submit" name="updatedb" value="Update" /></p>';
-//        echo '<p class="warning">Please manually execute the SQL statements from '.$updatefile.' on your database.<br/>';
-//        echo 'See comments in the file and execute queries that are superscribed with the currently installed version number.</p>';
+        $select->add('0.9 or newer', '');
+        echo '<p class="suggestion">You should run the update queries to get the schema fixed.<br/><br/>Version to update from: ' . $select->show() . '&nbsp;<input type="submit" name="updatedb" value="Update" /></p>';
         $db_working = false;
     }
     else {
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index b6e2c81..d693478 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -302,7 +302,7 @@ rcube_webmail.prototype.acl_init_form = function(id)
         li_elements.map(function() {
             val = this.value;
             td = $('td.'+this.id, row);
-            if (td && td.hasClass('enabled'))
+            if (td.length && td.hasClass('enabled'))
                 this.checked = true;
         });
 
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 1952dad..a4abe28 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -233,7 +233,8 @@ class acl extends rcube_plugin
 
         // Advanced rights
         $attrib['id'] = 'advancedrights';
-        foreach ($supported as $idx => $val) {
+        foreach ($supported as $key => $val) {
+            $id = "acl$val";
             $ul .= html::tag('li', null,
                 $input->show('', array(
                     'name' => "acl[$val]", 'value' => $val, 'id' => $id))
@@ -441,7 +442,7 @@ class acl extends rcube_plugin
             if (!empty($this->specials) && in_array($user, $this->specials)) {
                 $username = $this->gettext($user);
             }
-            else {
+            else if (!empty($user)) {
                 if (!strpos($user, '@') && ($realm = $this->get_realm())) {
                     $user .= '@' . rcube_idn_to_ascii(preg_replace('/^@/', '', $realm));
                 }
@@ -452,6 +453,9 @@ class acl extends rcube_plugin
                 continue;
             }
 
+            $user     = $this->mod_login($user);
+            $username = $this->mod_login($username);
+
             if ($user != $_SESSION['username'] && $username != $_SESSION['username']) {
                 if ($this->rc->storage->set_acl($mbox, $user, $acl)) {
                     $ret = array('id' => html_identifier($user),
@@ -703,4 +707,23 @@ class acl extends rcube_plugin
 
         return $this->ldap->ready;
     }
+
+    /**
+     * Modify user login according to 'login_lc' setting
+     */
+    protected function mod_login($user)
+    {
+        $login_lc = $this->rc->config->get('login_lc');
+
+        if ($login_lc === true || $login_lc == 2) {
+            $user = mb_strtolower($user);
+        }
+        // lowercase domain name
+        else if ($login_lc && strpos($user, '@')) {
+            list($local, $domain) = explode('@', $user);
+            $user = $local . '@' . mb_strtolower($domain);
+        }
+
+        return $user;
+    }
 }
diff --git a/plugins/acl/localization/az_AZ.inc b/plugins/acl/localization/az_AZ.inc
index 77d1d9d..d5543dd 100644
--- a/plugins/acl/localization/az_AZ.inc
+++ b/plugins/acl/localization/az_AZ.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger at box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'PaylaÅŸma';
 $labels['myrights'] = 'Giriş hüququ';
 $labels['username'] = 'İstifadəçi:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Giriş hüququ ilə hərəkət...';
 $labels['anyone'] = 'Bütün istifadəçilər (istənilən)';
 $labels['anonymous'] = 'Qonaqlar (anonimlər)';
 $labels['identifier'] = 'Ä°dentifikator';
+
 $labels['acll'] = 'Baxış';
-$labels['shortacll'] = 'Baxış';
 $labels['aclr'] = 'Məktubu oxu';
 $labels['acls'] = 'Oxunulan kimi saxla';
 $labels['aclw'] = 'Yazı bayrağı';
 $labels['acli'] = 'Əlavə et (kopyala)';
 $labels['aclp'] = 'Yazı';
-$labels['shortaclp'] = 'Yazı';
 $labels['aclc'] = 'Qovluqaltı yarat';
 $labels['aclk'] = 'Qovluqaltı yarat';
 $labels['acld'] = 'Məktubu sil';
 $labels['aclt'] = 'Məktubu sil';
 $labels['acle'] = 'Poz';
-$labels['shortacle'] = 'Poz';
 $labels['aclx'] = 'QovluÄŸu sil';
 $labels['acla'] = 'Ä°darÉ™';
-$labels['shortacla'] = 'Ä°darÉ™';
+
 $labels['aclfull'] = 'Tam idarÉ™';
 $labels['aclother'] = 'Digər';
-$labels['shortaclother'] = 'Digər';
 $labels['aclread'] = 'Oxu';
-$labels['shortaclr'] = 'Oxu';
-$labels['shortaclread'] = 'Oxu';
 $labels['aclwrite'] = 'Yaz';
-$labels['shortaclw'] = 'Yaz';
-$labels['shortaclwrite'] = 'Yaz';
 $labels['acldelete'] = 'Sil';
-$labels['shortacld'] = 'Sil';
-$labels['shortaclt'] = 'Sil';
-$labels['shortacldelete'] = 'Sil';
+
+$labels['shortacll'] = 'Baxış';
+$labels['shortaclr'] = 'Oxu';
 $labels['shortacls'] = 'Saxla';
+$labels['shortaclw'] = 'Yaz';
 $labels['shortacli'] = 'Yerləşdir';
+$labels['shortaclp'] = 'Yazı';
 $labels['shortaclc'] = 'Yarat';
 $labels['shortaclk'] = 'Yarat';
+$labels['shortacld'] = 'Sil';
+$labels['shortaclt'] = 'Sil';
+$labels['shortacle'] = 'Poz';
 $labels['shortaclx'] = 'Qovluğun silinməsi';
+$labels['shortacla'] = 'Ä°darÉ™';
+
+$labels['shortaclother'] = 'Digər';
+$labels['shortaclread'] = 'Oxu';
+$labels['shortaclwrite'] = 'Yaz';
+$labels['shortacldelete'] = 'Sil';
+
 $labels['longacll'] = 'Qovluq siyahıda görünür və yazılmağa hazırdır';
 $labels['longaclr'] = 'Bu qovluq oxunmaq üçün açıla bilər';
-$labels['longaclread'] = 'Bu qovluq oxunmaq üçün açıla bilər';
 $labels['longacls'] = 'Oxunulan flaqı dəyişdirilə bilər';
 $labels['longaclw'] = 'Oxunulan və silinənlərdən başqa flaqlar və açar sözləri dəyişdirilə bilər';
 $labels['longacli'] = 'Məktub qovluğa yazıla və ya saxlanıla bilər';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Silinən flaqı dəyişdirilə bilər';
 $labels['longacle'] = 'Məktublar pozula bilər';
 $labels['longaclx'] = 'Bu qovluq silinə və ya adı dəyişdirilə bilər';
 $labels['longacla'] = 'Bu qovluğa giriş hüququ dəyişdirilə bilər';
+
 $labels['longaclfull'] = 'Qovluğun idarəsi ilə birlikdə, tam giriş.';
+$labels['longaclread'] = 'Bu qovluq oxunmaq üçün açıla bilər';
 $labels['longaclwrite'] = 'Məktubu bu qovluğa qeyd etmək, yazmaq və kopyalamaq olar';
 $labels['longacldelete'] = 'Məktubu silmək olar';
-$labels['deleting'] = 'Giriş hüququnun silinməsi...';
-$labels['saving'] = 'Giriş hüququnun saxlanılması...';
-$labels['updatesuccess'] = 'Giriş hüququ dəyişdirildi';
-$labels['deletesuccess'] = 'Giriş hüququ silindi';
-$labels['createsuccess'] = 'Giriş hüququ əlavə edildi';
-$labels['updateerror'] = 'Giriş hüququnu yeniləmək mümkün deyil';
-$labels['deleteerror'] = 'Giriş hüququnu silmək mümkün deyil';
-$labels['createerror'] = 'Giriş hüququnu əlavə etmək mümkün deyil';
-$labels['deleteconfirm'] = 'Seçilmiş istifadəçilərin giriş hüququnu silməkdə əminsiniz?';
-$labels['norights'] = 'Giriş hüquqları göstərilməyib!';
-$labels['nouser'] = 'İstifadəçi adı təyin olunmayıb!';
 
+$messages['deleting'] = 'Giriş hüququnun silinməsi...';
+$messages['saving'] = 'Giriş hüququnun saxlanılması...';
+$messages['updatesuccess'] = 'Giriş hüququ dəyişdirildi';
+$messages['deletesuccess'] = 'Giriş hüququ silindi';
+$messages['createsuccess'] = 'Giriş hüququ əlavə edildi';
+$messages['updateerror'] = 'Giriş hüququnu yeniləmək mümkün deyil';
+$messages['deleteerror'] = 'Giriş hüququnu silmək mümkün deyil';
+$messages['createerror'] = 'Giriş hüququnu əlavə etmək mümkün deyil';
+$messages['deleteconfirm'] = 'Seçilmiş istifadəçilərin giriş hüququnu silməkdə əminsiniz?';
+$messages['norights'] = 'Giriş hüquqları göstərilməyib!';
+$messages['nouser'] = 'İstifadəçi adı təyin olunmayıb!';
+
+?>
diff --git a/plugins/acl/localization/bs_BA.inc b/plugins/acl/localization/bs_BA.inc
index 90eb254..b14db1b 100644
--- a/plugins/acl/localization/bs_BA.inc
+++ b/plugins/acl/localization/bs_BA.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008 at gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Razmjena';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Akcije za prava pristupa...';
 $labels['anyone'] = 'Svi korisnici (bilo ko)';
 $labels['anonymous'] = 'Gosti (anonimno)';
 $labels['identifier'] = 'Identifikator';
+
 $labels['acll'] = 'Pronađi';
-$labels['shortacll'] = 'Pronađi';
 $labels['aclr'] = 'Pročitaj poruke';
 $labels['acls'] = 'Zadrži stanje pregleda';
 $labels['aclw'] = 'Oznake za pisanje';
 $labels['acli'] = 'Umetni (Kopiraj u)';
 $labels['aclp'] = 'Objavi';
-$labels['shortaclp'] = 'Objavi';
 $labels['aclc'] = 'Napravi podfoldere';
 $labels['aclk'] = 'Napravi podfoldere';
 $labels['acld'] = 'Obriši poruke';
 $labels['aclt'] = 'Obriši poruke';
 $labels['acle'] = 'Izbriši';
-$labels['shortacle'] = 'Izbriši';
 $labels['aclx'] = 'Obriši folder';
 $labels['acla'] = 'Administracija';
-$labels['shortacla'] = 'Administracija';
+
 $labels['aclfull'] = 'Puna kontrola';
 $labels['aclother'] = 'Ostalo';
-$labels['shortaclother'] = 'Ostalo';
 $labels['aclread'] = 'Pročitano';
-$labels['shortaclr'] = 'Pročitano';
-$labels['shortaclread'] = 'Pročitano';
 $labels['aclwrite'] = 'Piši';
-$labels['shortaclw'] = 'Piši';
-$labels['shortaclwrite'] = 'Piši';
 $labels['acldelete'] = 'Obriši';
-$labels['shortacld'] = 'Obriši';
-$labels['shortaclt'] = 'Obriši';
-$labels['shortacldelete'] = 'Obriši';
+
+$labels['shortacll'] = 'Pronađi';
+$labels['shortaclr'] = 'Pročitano';
 $labels['shortacls'] = 'Zadrži';
+$labels['shortaclw'] = 'Piši';
 $labels['shortacli'] = 'Umetni';
+$labels['shortaclp'] = 'Objavi';
 $labels['shortaclc'] = 'Kreiraj';
 $labels['shortaclk'] = 'Kreiraj';
+$labels['shortacld'] = 'Obriši';
+$labels['shortaclt'] = 'Obriši';
+$labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Brisanje foldera';
+$labels['shortacla'] = 'Administracija';
+
+$labels['shortaclother'] = 'Ostalo';
+$labels['shortaclread'] = 'Pročitano';
+$labels['shortaclwrite'] = 'Piši';
+$labels['shortacldelete'] = 'Obriši';
+
 $labels['longacll'] = 'Ovaj folder je vidljiv u listama i moguće je izvršiti pretplatu na njega';
 $labels['longaclr'] = 'Folder je moguće otvoriti radi čitanja';
-$labels['longaclread'] = 'Folder je moguće otvoriti radi čitanja';
 $labels['longacls'] = 'Oznaka čitanja za poruke se može promijeniti';
 $labels['longaclw'] = 'Oznake za poruke i ključne riječi je moguće promijeniti, osim za pregledano i obrisano';
 $labels['longacli'] = 'Moguće je kopirati i zapisivati poruke u folder';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Oznaka za obrisane poruke se može mijenjati';
 $labels['longacle'] = 'Poruke je moguće obrisati';
 $labels['longaclx'] = 'Folder je moguće obrisati ili preimenovati';
 $labels['longacla'] = 'Pristupna prava foldera je moguće promijeniti';
+
 $labels['longaclfull'] = 'Puna kontrola uključujući i administraciju foldera';
+$labels['longaclread'] = 'Folder je moguće otvoriti radi čitanja';
 $labels['longaclwrite'] = 'Moguće je označavati, zapisivati i kopirati poruke u folder';
 $labels['longacldelete'] = 'Moguće je obrisati poruke';
-$labels['deleting'] = 'Brišem prava pristupa...';
-$labels['saving'] = 'Snimam prava pristupa...';
-$labels['updatesuccess'] = 'Prava pristupa su uspješno promijenjena';
-$labels['deletesuccess'] = 'Prava pristupa su uspješno obrisana';
-$labels['createsuccess'] = 'Prava pristupa su uspješno dodana';
-$labels['updateerror'] = 'Nije moguće ažurirati prava pristupa';
-$labels['deleteerror'] = 'Nije moguće obrisati prava pristupa';
-$labels['createerror'] = 'Nije moguće dodati prava pristupa';
-$labels['deleteconfirm'] = 'Jeste li sigurni da želite ukloniti prava pristupa za odabrane korisnike?';
-$labels['norights'] = 'Niste odabrali prava pristupa!';
-$labels['nouser'] = 'Niste odabrali korisničko ime!';
 
+$messages['deleting'] = 'Brišem prava pristupa...';
+$messages['saving'] = 'Snimam prava pristupa...';
+$messages['updatesuccess'] = 'Prava pristupa su uspješno promijenjena';
+$messages['deletesuccess'] = 'Prava pristupa su uspješno obrisana';
+$messages['createsuccess'] = 'Prava pristupa su uspješno dodana';
+$messages['updateerror'] = 'Nije moguće ažurirati prava pristupa';
+$messages['deleteerror'] = 'Nije moguće obrisati prava pristupa';
+$messages['createerror'] = 'Nije moguće dodati prava pristupa';
+$messages['deleteconfirm'] = 'Jeste li sigurni da želite ukloniti prava pristupa za odabrane korisnike?';
+$messages['norights'] = 'Niste odabrali prava pristupa!';
+$messages['nouser'] = 'Niste odabrali korisničko ime!';
+
+?>
diff --git a/plugins/acl/localization/ca_ES.inc b/plugins/acl/localization/ca_ES.inc
index c182736..f660b85 100644
--- a/plugins/acl/localization/ca_ES.inc
+++ b/plugins/acl/localization/ca_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi at fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Comparteix';
 $labels['myrights'] = 'Permisos d\'accés';
 $labels['username'] = 'Usuari:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Accions dels permisos d\'accés';
 $labels['anyone'] = 'Tots els usuaris';
 $labels['anonymous'] = 'Convidats';
 $labels['identifier'] = 'Identificador';
+
 $labels['acll'] = 'Cerca';
-$labels['shortacll'] = 'Cerca';
 $labels['aclr'] = 'Llegeix missatges';
 $labels['acls'] = 'Conserva\'l com a llegit';
 $labels['aclw'] = 'Escriu marques';
 $labels['acli'] = 'Insereix (copia dins)';
 $labels['aclp'] = 'Envia l\'entrada';
-$labels['shortaclp'] = 'Envia l\'entrada';
 $labels['aclc'] = 'Crea subcarpetes';
 $labels['aclk'] = 'Crea subcarpetes';
 $labels['acld'] = 'Suprimeix missatges';
 $labels['aclt'] = 'Suprimeix missatges';
 $labels['acle'] = 'Buida';
-$labels['shortacle'] = 'Buida';
 $labels['aclx'] = 'Suprimeix carpeta';
 $labels['acla'] = 'Administra';
-$labels['shortacla'] = 'Administra';
+
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Un altre';
-$labels['shortaclother'] = 'Un altre';
 $labels['aclread'] = 'Lectura';
-$labels['shortaclr'] = 'Lectura';
-$labels['shortaclread'] = 'Lectura';
 $labels['aclwrite'] = 'Escriptura';
-$labels['shortaclw'] = 'Escriptura';
-$labels['shortaclwrite'] = 'Escriptura';
 $labels['acldelete'] = 'Suprimeix';
-$labels['shortacld'] = 'Suprimeix';
-$labels['shortaclt'] = 'Suprimeix';
-$labels['shortacldelete'] = 'Suprimeix';
+
+$labels['shortacll'] = 'Cerca';
+$labels['shortaclr'] = 'Lectura';
 $labels['shortacls'] = 'Conserva';
+$labels['shortaclw'] = 'Escriptura';
 $labels['shortacli'] = 'Insereix';
+$labels['shortaclp'] = 'Envia l\'entrada';
 $labels['shortaclc'] = 'Crea';
 $labels['shortaclk'] = 'Crea';
+$labels['shortacld'] = 'Suprimeix';
+$labels['shortaclt'] = 'Suprimeix';
+$labels['shortacle'] = 'Buida';
 $labels['shortaclx'] = 'Suprimeix carpeta';
+$labels['shortacla'] = 'Administra';
+
+$labels['shortaclother'] = 'Un altre';
+$labels['shortaclread'] = 'Lectura';
+$labels['shortaclwrite'] = 'Escriptura';
+$labels['shortacldelete'] = 'Suprimeix';
+
 $labels['longacll'] = 'La carpeta és visible a les llistes i s\'hi pot subscriure';
 $labels['longaclr'] = 'La carpeta pot ser oberta per llegir';
-$labels['longaclread'] = 'La carpeta pot ser oberta per llegir';
 $labels['longacls'] = 'Els missatges marcats com a Llegit poden ser canviats';
 $labels['longaclw'] = 'Les marques i les paraules clau dels missatges poden ser canviats, excepte els Llegit i Suprimit';
 $labels['longacli'] = 'Els missatges poden ser escrits i copiats a la carpeta';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Poden ser canviats els missatges amb l\'indicador Suprimi
 $labels['longacle'] = 'Els missatges poden ser purgats';
 $labels['longaclx'] = 'La carpeta pot ser suprimida o reanomenada';
 $labels['longacla'] = 'Els permisos d\'accés a la carpeta poden ser canviats';
+
 $labels['longaclfull'] = 'Control total fins i tot la gestió de carpetes';
+$labels['longaclread'] = 'La carpeta pot ser oberta per llegir';
 $labels['longaclwrite'] = 'Els missatges poden ser marcats, escrits o copiats a la carpeta';
 $labels['longacldelete'] = 'Els missatges poden ser suprimits';
-$labels['deleting'] = 'Suprimint els permisos d\'accés...';
-$labels['saving'] = 'Desant els permisos d\'accés...';
-$labels['updatesuccess'] = 'Els permisos d\'accés han estat canviats correctament';
-$labels['deletesuccess'] = 'Els permisos d\'accés han estat suprimits correctament';
-$labels['createsuccess'] = 'Els permisos d\'accés han afegits suprimits correctament';
-$labels['updateerror'] = 'No s\'ha pogut actualitzar els permisos d\'accés';
-$labels['deleteerror'] = 'No s\'ha pogut suprimir els permisos d\'accés';
-$labels['createerror'] = 'No s\'ha pogut afegir els permisos d\'accés';
-$labels['deleteconfirm'] = 'Esteu segurs que voleu suprimir els permisos d\'accés de l\'usuari o usuaris seleccionats?';
-$labels['norights'] = 'No s\'ha especificat cap permís';
-$labels['nouser'] = 'No s\'ha especificat cap nom d\'usuari';
 
+$messages['deleting'] = 'Suprimint els permisos d\'accés...';
+$messages['saving'] = 'Desant els permisos d\'accés...';
+$messages['updatesuccess'] = 'Els permisos d\'accés han estat canviats correctament';
+$messages['deletesuccess'] = 'Els permisos d\'accés han estat suprimits correctament';
+$messages['createsuccess'] = 'Els permisos d\'accés han afegits suprimits correctament';
+$messages['updateerror'] = 'No s\'ha pogut actualitzar els permisos d\'accés';
+$messages['deleteerror'] = 'No s\'ha pogut suprimir els permisos d\'accés';
+$messages['createerror'] = 'No s\'ha pogut afegir els permisos d\'accés';
+$messages['deleteconfirm'] = 'Esteu segurs que voleu suprimir els permisos d\'accés de l\'usuari o usuaris seleccionats?';
+$messages['norights'] = 'No s\'ha especificat cap permís';
+$messages['nouser'] = 'No s\'ha especificat cap nom d\'usuari';
+
+?>
diff --git a/plugins/acl/localization/cs_CZ.inc b/plugins/acl/localization/cs_CZ.inc
index f3bef53..acf80ac 100644
--- a/plugins/acl/localization/cs_CZ.inc
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -2,62 +2,73 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Zbynek Vanzura <heptau at gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Sdílení';
 $labels['myrights'] = 'Přístupová práva';
 $labels['username'] = 'Uživatel:';
 $labels['advanced'] = 'pokročilý režim';
 $labels['newuser'] = 'Přidat záznam';
+$labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'Všichni uživatelé (kdokoli)';
 $labels['anonymous'] = 'Hosté (anonymní)';
 $labels['identifier'] = 'Identifikátor';
+
+$labels['acll'] = 'Vyhledat';
 $labels['aclr'] = 'Číst zprávy';
+$labels['acls'] = 'Ponechat stav Přečteno';
 $labels['aclw'] = 'Zapsat označení';
 $labels['acli'] = 'Vložit (Kopírovat do)';
 $labels['aclp'] = 'Odeslat';
-$labels['shortaclp'] = 'Odeslat';
 $labels['aclc'] = 'Vytvořit podsložky';
 $labels['aclk'] = 'Vytvořit podsložky';
 $labels['acld'] = 'Smazat zprávy';
 $labels['aclt'] = 'Smazat zprávy';
 $labels['acle'] = 'Vyprázdnit';
-$labels['shortacle'] = 'Vyprázdnit';
 $labels['aclx'] = 'Smazat složku';
 $labels['acla'] = 'Spravovat';
-$labels['shortacla'] = 'Spravovat';
+
 $labels['aclfull'] = 'Plný přístup';
 $labels['aclother'] = 'Ostatní';
-$labels['shortaclother'] = 'Ostatní';
 $labels['aclread'] = 'Číst';
-$labels['shortaclr'] = 'Číst';
-$labels['shortaclread'] = 'Číst';
 $labels['aclwrite'] = 'Zapsat';
-$labels['shortaclw'] = 'Zapsat';
-$labels['shortaclwrite'] = 'Zapsat';
 $labels['acldelete'] = 'Smazat';
-$labels['shortacld'] = 'Smazat';
-$labels['shortaclt'] = 'Smazat';
-$labels['shortacldelete'] = 'Smazat';
+
+$labels['shortacll'] = 'Vyhledat';
+$labels['shortaclr'] = 'Číst';
 $labels['shortacls'] = 'Zachovat';
+$labels['shortaclw'] = 'Zapsat';
 $labels['shortacli'] = 'Vložit';
+$labels['shortaclp'] = 'Odeslat';
 $labels['shortaclc'] = 'Vytvořit';
 $labels['shortaclk'] = 'Vytvořit';
+$labels['shortacld'] = 'Smazat';
+$labels['shortaclt'] = 'Smazat';
+$labels['shortacle'] = 'Vyprázdnit';
 $labels['shortaclx'] = 'Mazat složky';
+$labels['shortacla'] = 'Spravovat';
+
+$labels['shortaclother'] = 'Ostatní';
+$labels['shortaclread'] = 'Číst';
+$labels['shortaclwrite'] = 'Zapsat';
+$labels['shortacldelete'] = 'Smazat';
+
 $labels['longacll'] = 'Složka je viditelná v seznamu a může být přihlášena';
 $labels['longaclr'] = 'Složka může být otevřena pro čtení';
-$labels['longaclread'] = '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['longaclc'] = 'Složka může být vytvořena (nebo přejmenována) přimo v této složce';
@@ -67,18 +78,22 @@ $labels['longaclt'] = 'Značka o smazání zprávy může být změněna';
 $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';
+
 $labels['longaclfull'] = 'Plný přístup včetně správy složky';
+$labels['longaclread'] = 'Složka může být otevřena pro čtení';
 $labels['longaclwrite'] = 'Zpráva může být označena, napsána nebo zkopírována do složky';
 $labels['longacldelete'] = 'Zprávy mohou být smazány';
-$labels['deleting'] = 'Odstraňuji přístupová práva...';
-$labels['saving'] = 'Ukládám přístupová práva...';
-$labels['updatesuccess'] = 'Přístupová práva byla úspěšně změněna';
-$labels['deletesuccess'] = 'Přístupová páva byla úspěšně odstraněna';
-$labels['createsuccess'] = 'Přístupová práva byla úspěšně přídána';
-$labels['updateerror'] = 'Nelze upravit přístupová práva';
-$labels['deleteerror'] = 'Nelze odstranit přístupová práva';
-$labels['createerror'] = 'Nelze přidat přístupová práva';
-$labels['deleteconfirm'] = 'Opravdu si přejete odstranit přístupová práva pro vybrané(ho) uživatele?';
-$labels['norights'] = 'Nejsou specifikována žádná práva!';
-$labels['nouser'] = 'Není specifikováno uživatelské jméno';
 
+$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['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';
+
+?>
diff --git a/plugins/acl/localization/cy_GB.inc b/plugins/acl/localization/cy_GB.inc
index 20dd149..bf6e870 100644
--- a/plugins/acl/localization/cy_GB.inc
+++ b/plugins/acl/localization/cy_GB.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Rhannu';
 $labels['myrights'] = 'Hawliau Mynediad';
 $labels['username'] = 'Defnyddiwr:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Gweithredoedd hawl mynediad...';
 $labels['anyone'] = 'Pob defnyddiwr (unrhywun)';
 $labels['anonymous'] = 'Gwestai (anhysbys)';
 $labels['identifier'] = 'Dynodwr';
+
 $labels['acll'] = 'Chwilio';
-$labels['shortacll'] = 'Chwilio';
 $labels['aclr'] = 'Darllen negeseuon';
 $labels['acls'] = 'Cadw stad Gwelwyd';
 $labels['aclw'] = 'Fflagiau ysgrifennu';
 $labels['acli'] = 'Mewnosod (Copïo fewn i)';
 $labels['aclp'] = 'Postio';
-$labels['shortaclp'] = 'Postio';
 $labels['aclc'] = 'Creu is-ffolderi';
 $labels['aclk'] = 'Creu is-ffolderi';
 $labels['acld'] = 'Dileu negeseuon';
 $labels['aclt'] = 'Dileu negeseuon';
 $labels['acle'] = 'Dileu';
-$labels['shortacle'] = 'Dileu';
 $labels['aclx'] = 'Dileu ffolder';
 $labels['acla'] = 'Gweinyddu';
-$labels['shortacla'] = 'Gweinyddu';
+
 $labels['aclfull'] = 'Rheolaeth lawn';
 $labels['aclother'] = 'Arall';
-$labels['shortaclother'] = 'Arall';
 $labels['aclread'] = 'Darllen';
-$labels['shortaclr'] = 'Darllen';
-$labels['shortaclread'] = 'Darllen';
 $labels['aclwrite'] = 'Ysgrifennu';
-$labels['shortaclw'] = 'Ysgrifennu';
-$labels['shortaclwrite'] = 'Ysgrifennu';
 $labels['acldelete'] = 'Dileu';
-$labels['shortacld'] = 'Dileu';
-$labels['shortaclt'] = 'Dileu';
-$labels['shortacldelete'] = 'Dileu';
+
+$labels['shortacll'] = 'Chwilio';
+$labels['shortaclr'] = 'Darllen';
 $labels['shortacls'] = 'Cadw';
+$labels['shortaclw'] = 'Ysgrifennu';
 $labels['shortacli'] = 'Mewnosod';
+$labels['shortaclp'] = 'Postio';
 $labels['shortaclc'] = 'Creu';
 $labels['shortaclk'] = 'Creu';
+$labels['shortacld'] = 'Dileu';
+$labels['shortaclt'] = 'Dileu';
+$labels['shortacle'] = 'Dileu';
 $labels['shortaclx'] = 'Dileu ffolder';
+$labels['shortacla'] = 'Gweinyddu';
+
+$labels['shortaclother'] = 'Arall';
+$labels['shortaclread'] = 'Darllen';
+$labels['shortaclwrite'] = 'Ysgrifennu';
+$labels['shortacldelete'] = 'Dileu';
+
 $labels['longacll'] = 'Mae\'r ffolder hwn i\'w weld ar y rhestrau a mae\'n bosib tanysgrifio iddo';
 $labels['longaclr'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
-$labels['longaclread'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
 $labels['longacls'] = 'Gellir newid y fflag negeseuon Gwelwyd';
 $labels['longaclw'] = 'Gellir newid y fflagiau negeseuon a allweddeiriau, heblaw Gwelwyd a Dilëuwyd';
 $labels['longacli'] = 'Gellir ysgrifennu neu copïo negeseuon i\'r ffolder';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Gellir newid fflag neges Dileu';
 $labels['longacle'] = 'Gellir gwaredu negeseuon';
 $labels['longaclx'] = 'Gellir dileu neu ail-enwi\'r ffolder';
 $labels['longacla'] = 'Gellir newid hawliau mynediad y ffolder';
+
 $labels['longaclfull'] = 'Rheolaeth lawn yn cynnwys rheolaeth ffolderi';
+$labels['longaclread'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
 $labels['longaclwrite'] = 'Gellir nodi, ysgrifennu neu copïo negeseuon i\'r ffolder';
 $labels['longacldelete'] = 'Gellir dileu negeseuon';
-$labels['deleting'] = 'Yn dileu hawliau mynediad...';
-$labels['saving'] = 'Yn cadw hawliau mynediad...';
-$labels['updatesuccess'] = 'Wedi newid hawliau mynediad yn llwyddiannus';
-$labels['deletesuccess'] = 'Wedi dileu hawliau mynediad yn llwyddiannus';
-$labels['createsuccess'] = 'Wedi ychwanegu hawliau mynediad yn llwyddiannus';
-$labels['updateerror'] = 'Methwyd diweddaru hawliau mynediad';
-$labels['deleteerror'] = 'Methwyd dileu hawliau mynediad';
-$labels['createerror'] = 'Methwyd ychwanegu hawliau mynediad';
-$labels['deleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu hawliau mynediad y defnyddiwr/wyr ddewiswyd?';
-$labels['norights'] = 'Nid oes hawliau wedi eu nodi!';
-$labels['nouser'] = 'Nid oes enw defnyddiwr wedi ei nodi!';
 
+$messages['deleting'] = 'Yn dileu hawliau mynediad...';
+$messages['saving'] = 'Yn cadw hawliau mynediad...';
+$messages['updatesuccess'] = 'Wedi newid hawliau mynediad yn llwyddiannus';
+$messages['deletesuccess'] = 'Wedi dileu hawliau mynediad yn llwyddiannus';
+$messages['createsuccess'] = 'Wedi ychwanegu hawliau mynediad yn llwyddiannus';
+$messages['updateerror'] = 'Methwyd diweddaru hawliau mynediad';
+$messages['deleteerror'] = 'Methwyd dileu hawliau mynediad';
+$messages['createerror'] = 'Methwyd ychwanegu hawliau mynediad';
+$messages['deleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu hawliau mynediad y defnyddiwr/wyr ddewiswyd?';
+$messages['norights'] = 'Nid oes hawliau wedi eu nodi!';
+$messages['nouser'] = 'Nid oes enw defnyddiwr wedi ei nodi!';
+
+?>
diff --git a/plugins/acl/localization/da_DK.inc b/plugins/acl/localization/da_DK.inc
index d37e7c4..0830ccd 100644
--- a/plugins/acl/localization/da_DK.inc
+++ b/plugins/acl/localization/da_DK.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos at openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Adgangrettigheder';
 $labels['username'] = 'Bruger:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Tilgangsrettigheder...';
 $labels['anyone'] = 'Alle brugere';
 $labels['anonymous'] = 'Gæst (anonym)';
 $labels['identifier'] = 'Identifikator';
+
 $labels['acll'] = 'Slå op';
-$labels['shortacll'] = 'Slå op';
 $labels['aclr'] = 'Læs beskeder';
 $labels['acls'] = 'Behold læst-status';
 $labels['aclw'] = 'Skriv flag';
 $labels['acli'] = 'Indsæt (kopier ind i)';
 $labels['aclp'] = 'Send';
-$labels['shortaclp'] = 'Send';
 $labels['aclc'] = 'Opret undermapper';
 $labels['aclk'] = 'Opret undermapper';
 $labels['acld'] = 'Slet beskeder';
 $labels['aclt'] = 'Slet beskeder';
 $labels['acle'] = 'Udslet';
-$labels['shortacle'] = 'Udslet';
 $labels['aclx'] = 'Slet mappe';
 $labels['acla'] = 'Administrer';
-$labels['shortacla'] = 'Administrer';
+
 $labels['aclfull'] = 'Fuld kontrol';
 $labels['aclother'] = 'Andet';
-$labels['shortaclother'] = 'Andet';
 $labels['aclread'] = 'Læse';
-$labels['shortaclr'] = 'Læse';
-$labels['shortaclread'] = 'Læse';
 $labels['aclwrite'] = 'Skrive';
-$labels['shortaclw'] = 'Skrive';
-$labels['shortaclwrite'] = 'Skrive';
 $labels['acldelete'] = 'Slet';
-$labels['shortacld'] = 'Slet';
-$labels['shortaclt'] = 'Slet';
-$labels['shortacldelete'] = 'Slet';
+
+$labels['shortacll'] = 'Slå op';
+$labels['shortaclr'] = 'Læse';
 $labels['shortacls'] = 'Behold';
+$labels['shortaclw'] = 'Skrive';
 $labels['shortacli'] = 'Indsæt';
+$labels['shortaclp'] = 'Send';
 $labels['shortaclc'] = 'Opret';
 $labels['shortaclk'] = 'Opret';
+$labels['shortacld'] = 'Slet';
+$labels['shortaclt'] = 'Slet';
+$labels['shortacle'] = 'Udslet';
 $labels['shortaclx'] = 'Slet mappe';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Andet';
+$labels['shortaclread'] = 'Læse';
+$labels['shortaclwrite'] = 'Skrive';
+$labels['shortacldelete'] = 'Slet';
+
 $labels['longacll'] = 'Mappen er synlig på listen og kan abonneres på';
 $labels['longaclr'] = 'Mappen kan åbnes for læsning';
-$labels['longaclread'] = 'Mappen kan åbnes for læsning';
 $labels['longacls'] = 'Beskeders Læst-flag kan ændres';
 $labels['longaclw'] = 'Beskeders flag og nøgleord kan ændres med undtagelse af Læst og Slettet';
 $labels['longacli'] = 'Beskeder kan blive skrevet eller kopieret til mappen';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Beskeders Slet-flag kan ændres';
 $labels['longacle'] = 'Beskeder kan slettes';
 $labels['longaclx'] = 'Mappen kan blive slettet eller omdøbt';
 $labels['longacla'] = 'Mappen adgangsrettigheder kan ændres';
+
 $labels['longaclfull'] = 'Fuld kontrol inklusiv mappeadministration';
+$labels['longaclread'] = 'Mappen kan åbnes for læsning';
 $labels['longaclwrite'] = 'Beskeder kan blive markeret, skrevet eller kopieret til mappen';
 $labels['longacldelete'] = 'Beskeder kan slettes';
-$labels['deleting'] = 'Slette rettigheder...';
-$labels['saving'] = 'Gemme rettigheder...';
-$labels['updatesuccess'] = 'Tilgangsrettighederne blev ændret';
-$labels['deletesuccess'] = 'Sletterettigheder blev ændret';
-$labels['createsuccess'] = 'Tilgangsrettigheder blev tilføjet';
-$labels['updateerror'] = 'Kunne ikke opdatere tilgangsrettigheder';
-$labels['deleteerror'] = 'Kunne ikke slette tilgangsrettigheder';
-$labels['createerror'] = 'Kunne ikke tilføje tilgangsrettigheder';
-$labels['deleteconfirm'] = 'Er du sikker på, at du vil slette tilgangsrettigheder fra de(n) valgte bruger(e)?';
-$labels['norights'] = 'Der er ikke specificeret nogle rettigheder!';
-$labels['nouser'] = 'Der er ikke angiver et brugernavn!';
 
+$messages['deleting'] = 'Slette rettigheder...';
+$messages['saving'] = 'Gemme rettigheder...';
+$messages['updatesuccess'] = 'Tilgangsrettighederne blev ændret';
+$messages['deletesuccess'] = 'Sletterettigheder blev ændret';
+$messages['createsuccess'] = 'Tilgangsrettigheder blev tilføjet';
+$messages['updateerror'] = 'Kunne ikke opdatere tilgangsrettigheder';
+$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)?';
+$messages['norights'] = 'Der er ikke specificeret nogle rettigheder!';
+$messages['nouser'] = 'Der er ikke angiver et brugernavn!';
+
+?>
diff --git a/plugins/acl/localization/de_CH.inc b/plugins/acl/localization/de_CH.inc
index 65b56ff..4f59667 100644
--- a/plugins/acl/localization/de_CH.inc
+++ b/plugins/acl/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/acl/localization/<lang>.inc                                    |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
  | Localization file of the Roundcube Webmail ACL plugin                 |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/acl/localization/de_DE.inc b/plugins/acl/localization/de_DE.inc
index cfb685c..de8c13a 100644
--- a/plugins/acl/localization/de_DE.inc
+++ b/plugins/acl/localization/de_DE.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Zugriffsrechte Aktionen...';
 $labels['anyone'] = 'Alle Benutzer (anyone)';
 $labels['anonymous'] = 'Gäste (anonymous)';
 $labels['identifier'] = 'Bezeichnung';
+
 $labels['acll'] = 'Sichtbar';
-$labels['shortacll'] = 'Sichtbar';
 $labels['aclr'] = 'Nachrichten lesen';
 $labels['acls'] = 'Lesestatus ändern';
 $labels['aclw'] = 'Flags schreiben';
-$labels['acli'] = 'Nachrichten Hinzufügen';
+$labels['acli'] = 'Nachrichten hinzufügen';
 $labels['aclp'] = 'Senden an';
-$labels['shortaclp'] = 'Senden an';
 $labels['aclc'] = 'Unterordner erstellen';
 $labels['aclk'] = 'Unterordner erstellen';
 $labels['acld'] = 'Nachrichten als gelöscht markieren';
 $labels['aclt'] = 'Nachrichten als gelöscht markieren';
-$labels['acle'] = 'endgültig löschen';
-$labels['shortacle'] = 'endgültig löschen';
+$labels['acle'] = 'Endgültig löschen';
 $labels['aclx'] = 'Ordner löschen';
 $labels['acla'] = 'Verwalten';
-$labels['shortacla'] = 'Verwalten';
+
 $labels['aclfull'] = 'Vollzugriff';
 $labels['aclother'] = 'Andere';
-$labels['shortaclother'] = 'Andere';
 $labels['aclread'] = 'Lesen';
-$labels['shortaclr'] = 'Lesen';
-$labels['shortaclread'] = 'Lesen';
 $labels['aclwrite'] = 'Schreiben';
-$labels['shortaclw'] = 'Schreiben';
-$labels['shortaclwrite'] = 'Schreiben';
 $labels['acldelete'] = 'Löschen';
-$labels['shortacld'] = 'Löschen';
-$labels['shortaclt'] = 'Löschen';
-$labels['shortacldelete'] = 'Löschen';
+
+$labels['shortacll'] = 'Sichtbar';
+$labels['shortaclr'] = 'Lesen';
 $labels['shortacls'] = 'Lesestatus';
+$labels['shortaclw'] = 'Schreiben';
 $labels['shortacli'] = 'Hinzufügen';
+$labels['shortaclp'] = 'Senden an';
 $labels['shortaclc'] = 'Erstellen';
 $labels['shortaclk'] = 'Erstellen';
+$labels['shortacld'] = 'Löschen';
+$labels['shortaclt'] = 'Löschen';
+$labels['shortacle'] = 'Endgültig löschen';
 $labels['shortaclx'] = 'Ordner löschen';
+$labels['shortacla'] = 'Verwalten';
+
+$labels['shortaclother'] = 'Andere';
+$labels['shortaclread'] = 'Lesen';
+$labels['shortaclwrite'] = 'Schreiben';
+$labels['shortacldelete'] = 'Löschen';
+
 $labels['longacll'] = 'Der Ordner ist sichtbar und kann abonniert werden';
 $labels['longaclr'] = 'Der Ordnerinhalt kann gelesen werden';
-$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
 $labels['longacls'] = 'Der Lesestatus von Nachrichten kann geändert werden';
 $labels['longaclw'] = 'Alle Nachrichten-Flags und Schlüsselwörter außer "Gelesen" und "Gelöscht" können geändert werden';
 $labels['longacli'] = 'Nachrichten können in diesen Ordner kopiert oder verschoben werden';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Der "gelöscht" Status von Nachrichten kann geändert wer
 $labels['longacle'] = 'Als "gelöscht" markiert Nachrichten können gelöscht werden.';
 $labels['longaclx'] = 'Der Ordner kann gelöscht oder umbenannt werden';
 $labels['longacla'] = 'Die Zugriffsrechte des Ordners können geändert werden';
+
 $labels['longaclfull'] = 'Vollzugriff inklusive Ordner-Verwaltung';
+$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
 $labels['longaclwrite'] = 'Nachrichten können markiert, an den Ordner gesendet und in den Ordner kopiert oder verschoben werden';
 $labels['longacldelete'] = 'Nachrichten können gelöscht werden';
-$labels['deleting'] = 'Zugriffsrechte werden entzogen...';
-$labels['saving'] = 'Zugriffsrechte werden gewährt...';
-$labels['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
-$labels['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
-$labels['createsuccess'] = 'Zugriffsrechte erfolgreich gewährt';
-$labels['updateerror'] = 'Zugriffsrechte konnten nicht geändert werden';
-$labels['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
-$labels['createerror'] = 'Zugriffsrechte konnten nicht gewährt werden';
-$labels['deleteconfirm'] = 'Sind Sie sicher, daß Sie die Zugriffsrechte den ausgewählten Benutzern entziehen möchten?';
-$labels['norights'] = 'Es wurden keine Zugriffsrechte ausgewählt!';
-$labels['nouser'] = 'Es wurde kein Benutzer ausgewählt!';
 
+$messages['deleting'] = 'Zugriffsrechte werden entzogen...';
+$messages['saving'] = 'Zugriffsrechte werden gewährt...';
+$messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
+$messages['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
+$messages['createsuccess'] = 'Zugriffsrechte erfolgreich gewährt';
+$messages['updateerror'] = 'Zugriffsrechte konnten nicht geändert werden';
+$messages['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
+$messages['createerror'] = 'Zugriffsrechte konnten nicht gewährt werden';
+$messages['deleteconfirm'] = 'Sind Sie sicher, daß Sie die Zugriffsrechte den ausgewählten Benutzern entziehen möchten?';
+$messages['norights'] = 'Es wurden keine Zugriffsrechte ausgewählt!';
+$messages['nouser'] = 'Es wurde kein Benutzer ausgewählt!';
+
+?>
diff --git a/plugins/acl/localization/en_GB.inc b/plugins/acl/localization/en_GB.inc
index 201cb3c..e1b33fb 100644
--- a/plugins/acl/localization/en_GB.inc
+++ b/plugins/acl/localization/en_GB.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
 $labels['identifier'] = 'Identifier';
+
 $labels['acll'] = 'Look-up';
-$labels['shortacll'] = 'Look-up';
 $labels['aclr'] = 'Read messages';
 $labels['acls'] = 'Keep Seen state';
 $labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Insert (copy into)';
 $labels['aclp'] = 'Post';
-$labels['shortaclp'] = 'Post';
 $labels['aclc'] = 'Create sub-folders';
 $labels['aclk'] = 'Create sub-folders';
 $labels['acld'] = 'Delete messages';
 $labels['aclt'] = 'Delete messages';
 $labels['acle'] = 'Expunge';
-$labels['shortacle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
-$labels['shortacla'] = 'Administer';
+
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
-$labels['shortaclother'] = 'Other';
 $labels['aclread'] = 'Read';
-$labels['shortaclr'] = 'Read';
-$labels['shortaclread'] = 'Read';
 $labels['aclwrite'] = 'Write';
-$labels['shortaclw'] = 'Write';
-$labels['shortaclwrite'] = 'Write';
 $labels['acldelete'] = 'Delete';
-$labels['shortacld'] = 'Delete';
-$labels['shortaclt'] = 'Delete';
-$labels['shortacldelete'] = 'Delete';
+
+$labels['shortacll'] = 'Look-up';
+$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['longaclread'] = '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';
@@ -72,18 +78,22 @@ $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';
-$labels['deleting'] = 'Deleting access rights...';
-$labels['saving'] = 'Saving access rights...';
-$labels['updatesuccess'] = 'Successfully changed access rights';
-$labels['deletesuccess'] = 'Successfully deleted access rights';
-$labels['createsuccess'] = 'Successfully added access rights';
-$labels['updateerror'] = 'Ubable to update access rights';
-$labels['deleteerror'] = 'Unable to delete access rights';
-$labels['createerror'] = 'Unable to add access rights';
-$labels['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
-$labels['norights'] = 'No rights has been specified!';
-$labels['nouser'] = 'No username has been specified!';
 
+$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/eo.inc b/plugins/acl/localization/eo.inc
index b24ebcc..ddfacd6 100644
--- a/plugins/acl/localization/eo.inc
+++ b/plugins/acl/localization/eo.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni at mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Kunhavigado';
 $labels['myrights'] = 'Atingrajtoj';
 $labels['username'] = 'Uzanto:';
@@ -23,41 +25,75 @@ $labels['actions'] = 'Agoj de atingrajtoj...';
 $labels['anyone'] = 'Ĉiuj uzantoj (iu ajn)';
 $labels['anonymous'] = 'Gasto (sennome)';
 $labels['identifier'] = 'Identigilo';
+
 $labels['acll'] = 'Elserĉo';
-$labels['shortacll'] = 'Elserĉo';
 $labels['aclr'] = 'Legi mesaĝojn';
 $labels['acls'] = 'Manteni legitan staton';
+$labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Enmeti (alglui)';
 $labels['aclp'] = 'Afiŝi';
-$labels['shortaclp'] = 'Afiŝi';
 $labels['aclc'] = 'Krei subdosierujojn';
 $labels['aclk'] = 'Krei subdosierujojn';
 $labels['acld'] = 'Forigi mesaĝojn';
 $labels['aclt'] = 'Forigi mesaĝojn';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Forigi dosierujon';
 $labels['acla'] = 'Administri';
-$labels['shortacla'] = 'Administri';
+
 $labels['aclfull'] = 'Plena kontrolo';
 $labels['aclother'] = 'Alia';
-$labels['shortaclother'] = 'Alia';
 $labels['aclread'] = 'Legi';
-$labels['shortaclr'] = 'Legi';
-$labels['shortaclread'] = 'Legi';
 $labels['aclwrite'] = 'Skribi';
-$labels['shortaclw'] = 'Skribi';
-$labels['shortaclwrite'] = 'Skribi';
 $labels['acldelete'] = 'Forigi';
-$labels['shortacld'] = 'Forigi';
-$labels['shortaclt'] = 'Forigi';
-$labels['shortacldelete'] = 'Forigi';
+
+$labels['shortacll'] = 'Elserĉo';
+$labels['shortaclr'] = 'Legi';
 $labels['shortacls'] = 'Manteni';
+$labels['shortaclw'] = 'Skribi';
 $labels['shortacli'] = 'Enmeti';
+$labels['shortaclp'] = 'Afiŝi';
 $labels['shortaclc'] = 'Krei';
 $labels['shortaclk'] = 'Krei';
+$labels['shortacld'] = 'Forigi';
+$labels['shortaclt'] = 'Forigi';
+$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Forigo de dosierujo';
+$labels['shortacla'] = 'Administri';
+
+$labels['shortaclother'] = 'Alia';
+$labels['shortaclread'] = 'Legi';
+$labels['shortaclwrite'] = 'Skribi';
+$labels['shortacldelete'] = 'Forigi';
+
 $labels['longacll'] = 'La dosierujo videblas en listoj kaj oni povas aboni al ĝi';
 $labels['longaclr'] = 'La dosierujo malfermeblas por legado';
-$labels['longaclread'] = 'La dosierujo malfermeblas por legado';
+$labels['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_ES.inc b/plugins/acl/localization/es_ES.inc
index a95dcc5..62f89dc 100644
--- a/plugins/acl/localization/es_ES.inc
+++ b/plugins/acl/localization/es_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: pompilos <ciordia at gmail.com>                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartir';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Acciones sobre los permisos de acceso…';
 $labels['anyone'] = 'Todos los usuarios (cualquiera)';
 $labels['anonymous'] = 'Invitados (anónimo)';
 $labels['identifier'] = 'Identificador';
+
 $labels['acll'] = 'Búsqueda';
-$labels['shortacll'] = 'Búsqueda';
 $labels['aclr'] = 'Leer mensajes';
 $labels['acls'] = 'Mantener como "Leído';
 $labels['aclw'] = 'Escribir etiquetas';
 $labels['acli'] = 'Insertar (Copiar dentro)';
 $labels['aclp'] = 'Enviar';
-$labels['shortaclp'] = 'Enviar';
 $labels['aclc'] = 'Crear subcarpetas';
 $labels['aclk'] = 'Crear subcarpetas';
 $labels['acld'] = 'Borrar mensajes';
 $labels['aclt'] = 'Borrar mensajes';
 $labels['acle'] = 'Expurgar';
-$labels['shortacle'] = 'Expurgar';
 $labels['aclx'] = 'Borrar carpeta';
 $labels['acla'] = 'Administrar';
-$labels['shortacla'] = 'Administrar';
+
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Otro';
-$labels['shortaclother'] = 'Otro';
 $labels['aclread'] = 'Leer';
-$labels['shortaclr'] = 'Leer';
-$labels['shortaclread'] = 'Leer';
 $labels['aclwrite'] = 'Escribir';
-$labels['shortaclw'] = 'Escribir';
-$labels['shortaclwrite'] = 'Escribir';
 $labels['acldelete'] = 'Borrar';
-$labels['shortacld'] = 'Borrar';
-$labels['shortaclt'] = 'Borrar';
-$labels['shortacldelete'] = 'Borrar';
+
+$labels['shortacll'] = 'Búsqueda';
+$labels['shortaclr'] = 'Leer';
 $labels['shortacls'] = 'Conservar';
+$labels['shortaclw'] = 'Escribir';
 $labels['shortacli'] = 'Insertar';
+$labels['shortaclp'] = 'Enviar';
 $labels['shortaclc'] = 'Crear';
 $labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Borrar';
+$labels['shortaclt'] = 'Borrar';
+$labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Borrar carpeta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Otro';
+$labels['shortaclread'] = 'Leer';
+$labels['shortaclwrite'] = 'Escribir';
+$labels['shortacldelete'] = 'Borrar';
+
 $labels['longacll'] = 'La carpeta es visible en las listas y es posible suscribirse a ella';
 $labels['longaclr'] = 'Se puede abrir la carpeta para leer';
-$labels['longaclread'] = 'Se puede abrir la carpeta para leer';
 $labels['longacls'] = 'Se pueden cambiar los mensajes con la etiqueta "Leído';
 $labels['longaclw'] = 'Las etiquetas de mensaje y las palabras clave se pueden cambiar, excepto "Leído" y "Borrado';
 $labels['longacli'] = 'Se pueden escribir mensajes o copiarlos a la carpeta';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'No se pueden cambiar los mensajes etiquetados como "Borra
 $labels['longacle'] = 'No se pueden expurgar los mensajes';
 $labels['longaclx'] = 'La carpeta se puede borrar o renombrar';
 $labels['longacla'] = 'Se pueden cambiar los permisos de acceso';
+
 $labels['longaclfull'] = 'Control total, incluyendo la gestión de carpetas';
+$labels['longaclread'] = 'Se puede abrir la carpeta para leer';
 $labels['longaclwrite'] = 'Se pueden etiquetar, escribir o copiar mensajes a la carpeta';
 $labels['longacldelete'] = 'Los mensajes se pueden borrar';
-$labels['deleting'] = 'Borrando permisos de acceso…';
-$labels['saving'] = 'Guardando permisos de acceso…';
-$labels['updatesuccess'] = 'Se han cambiado los permisos de acceso';
-$labels['deletesuccess'] = 'Se han borrado los permisos de acceso';
-$labels['createsuccess'] = 'Se han añadido los permisos de acceso';
-$labels['updateerror'] = 'No se han podido actualizar los permisos de acceso';
-$labels['deleteerror'] = 'No se han podido borrar los permisos de acceso';
-$labels['createerror'] = 'No se han podido añadir los permisos de acceso';
-$labels['deleteconfirm'] = '¿Seguro que quiere borrar los permisos de acceso del usuairo seleccionado?';
-$labels['norights'] = 'No se han especificado los permisos de acceso';
-$labels['nouser'] = 'No se ha especificado un nombre de usuario';
 
+$messages['deleting'] = 'Borrando permisos de acceso…';
+$messages['saving'] = 'Guardando permisos de acceso…';
+$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['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?';
+$messages['norights'] = 'No se han especificado los permisos de acceso';
+$messages['nouser'] = 'No se ha especificado un nombre de usuario';
+
+?>
diff --git a/plugins/acl/localization/et_EE.inc b/plugins/acl/localization/et_EE.inc
index 80aa935..f89e7d6 100644
--- a/plugins/acl/localization/et_EE.inc
+++ b/plugins/acl/localization/et_EE.inc
@@ -2,57 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Jagamine';
 $labels['myrights'] = 'Ligipääsuõigused';
 $labels['username'] = 'Kasutaja:';
+$labels['advanced'] = 'laiendatud režiim';
 $labels['newuser'] = 'Lisa sissekanne';
+$labels['actions'] = 'Ligipääsuõiguste toimingud...';
 $labels['anyone'] = 'Kõik kasutajad';
 $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['shortaclp'] = 'Postita';
 $labels['aclc'] = 'Luua alamkaustu';
 $labels['aclk'] = 'Luua alamkaustu';
 $labels['acld'] = 'Kustutada kirju';
 $labels['aclt'] = 'Kustutada kirju';
 $labels['acle'] = 'Eemalda';
-$labels['shortacle'] = 'Eemalda';
 $labels['aclx'] = 'Kustutada kausta';
 $labels['acla'] = 'Administreerida';
-$labels['shortacla'] = 'Administreerida';
+
 $labels['aclfull'] = 'Täis kontroll';
 $labels['aclother'] = 'Muu';
-$labels['shortaclother'] = 'Muu';
 $labels['aclread'] = 'Loe';
-$labels['shortaclr'] = 'Loe';
-$labels['shortaclread'] = 'Loe';
 $labels['aclwrite'] = 'Kirjuta';
-$labels['shortaclw'] = 'Kirjuta';
-$labels['shortaclwrite'] = 'Kirjuta';
 $labels['acldelete'] = 'Kustuta';
-$labels['shortacld'] = 'Kustuta';
-$labels['shortaclt'] = 'Kustuta';
-$labels['shortacldelete'] = 'Kustuta';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Loe';
 $labels['shortacls'] = 'Säilita';
+$labels['shortaclw'] = 'Kirjuta';
 $labels['shortacli'] = 'Lisa';
+$labels['shortaclp'] = 'Postita';
 $labels['shortaclc'] = 'Loo';
 $labels['shortaclk'] = 'Loo';
+$labels['shortacld'] = 'Kustuta';
+$labels['shortaclt'] = 'Kustuta';
+$labels['shortacle'] = 'Eemalda';
+$labels['shortaclx'] = 'Kausta kustutamine';
+$labels['shortacla'] = 'Administreerida';
+
+$labels['shortaclother'] = 'Muu';
+$labels['shortaclread'] = 'Loe';
+$labels['shortaclwrite'] = 'Kirjuta';
+$labels['shortacldelete'] = 'Kustuta';
+
+$labels['longacll'] = 'See kaust on nimekirjas nähtav ja seda saab tellida';
 $labels['longaclr'] = 'Kausta saab lugemiseks avada';
-$labels['longaclread'] = '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'] = 'Messages Delete flag can be changed';
+$labels['longaclt'] = 'Messages Delete flag can be changed';
+$labels['longacle'] = 'Kirju saab eemaldada';
 $labels['longaclx'] = 'Seda kausta ei saa kustutada ega ümber nimetada';
-$labels['norights'] = 'Õigusi pole määratud!';
-$labels['nouser'] = 'Kasutajanime pole määratud!';
+$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...';
+$messages['updatesuccess'] = 'Ligipääsuõigused on muudetud';
+$messages['deletesuccess'] = 'Ligipääsuõigused on kustutatud';
+$messages['createsuccess'] = 'Ligipääsuõigused on lisatud';
+$messages['updateerror'] = 'Ligipääsuõiguste uuendamine nurjus';
+$messages['deleteerror'] = 'Ligipääsuõiguste kustutamine nurjus';
+$messages['createerror'] = 'Ligipääsuõiguste andmine nurjus';
+$messages['deleteconfirm'] = 'Oled sa kindel, et sa soovid valitudkasutaja(te) õiguseid kustutada?';
+$messages['norights'] = 'Õigusi pole määratud!';
+$messages['nouser'] = 'Kasutajanime pole määratud!';
 
+?>
diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc
index db2c496..48fb8a2 100644
--- a/plugins/acl/localization/fa_IR.inc
+++ b/plugins/acl/localization/fa_IR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h at gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'اشتراک‌گذاری';
 $labels['myrights'] = 'مجوزهای دسترسی';
 $labels['username'] = 'کاربر:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'فعالیت‌های مجوز دسترسی...';
 $labels['anyone'] = 'همه کاربران (هر کسی)';
 $labels['anonymous'] = 'مهمان‌ها (ناشناس‌ها)';
 $labels['identifier'] = 'شناساگر';
+
 $labels['acll'] = 'یافتن';
-$labels['shortacll'] = 'یافتن';
 $labels['aclr'] = 'پیام های خوانده شده';
 $labels['acls'] = 'نگه داشتن حالت بازدید';
 $labels['aclw'] = 'پرچم‌های نوشتن';
 $labels['acli'] = 'وارد کردن (کپی کردن در)';
 $labels['aclp'] = 'نوشته';
-$labels['shortaclp'] = 'نوشته';
 $labels['aclc'] = 'ایجاد زیرپوشه‌ها';
 $labels['aclk'] = 'ایجاد زیرپوشه‌ها';
 $labels['acld'] = 'پاک کردن پیغام‌ها';
 $labels['aclt'] = 'پاک کردن پیغام‌ها';
 $labels['acle'] = 'پاک کردن';
-$labels['shortacle'] = 'پاک کردن';
 $labels['aclx'] = 'حذف پوشه';
 $labels['acla'] = 'مدیر';
-$labels['shortacla'] = 'مدیر';
+
 $labels['aclfull'] = 'کنترل کامل';
 $labels['aclother'] = 'دیگر';
-$labels['shortaclother'] = 'دیگر';
 $labels['aclread'] = 'خوانده شده';
-$labels['shortaclr'] = 'خوانده شده';
-$labels['shortaclread'] = 'خوانده شده';
 $labels['aclwrite'] = 'نوشتن';
-$labels['shortaclw'] = 'نوشتن';
-$labels['shortaclwrite'] = 'نوشتن';
 $labels['acldelete'] = 'حذف';
-$labels['shortacld'] = 'حذف';
-$labels['shortaclt'] = 'حذف';
-$labels['shortacldelete'] = 'حذف';
+
+$labels['shortacll'] = 'یافتن';
+$labels['shortaclr'] = 'خوانده شده';
 $labels['shortacls'] = 'نگه داشتن';
+$labels['shortaclw'] = 'نوشتن';
 $labels['shortacli'] = 'جاگذارى';
+$labels['shortaclp'] = 'نوشته';
 $labels['shortaclc'] = 'ایجاد';
 $labels['shortaclk'] = 'ایجاد';
+$labels['shortacld'] = 'حذف';
+$labels['shortaclt'] = 'حذف';
+$labels['shortacle'] = 'پاک کردن';
 $labels['shortaclx'] = 'حذف کردن پوشه';
+$labels['shortacla'] = 'مدیر';
+
+$labels['shortaclother'] = 'دیگر';
+$labels['shortaclread'] = 'خوانده شده';
+$labels['shortaclwrite'] = 'نوشتن';
+$labels['shortacldelete'] = 'حذف';
+
 $labels['longacll'] = 'پوشه در فهرست‌ها قابل مشاهده است و می‌تواند مشترک به';
 $labels['longaclr'] = 'پوشه می‌تواند برای خواندن باز شود';
-$labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longacls'] = 'پرچم بازدید پیغام‌ها می‌تواند تغییر داده شود';
 $labels['longaclw'] = 'پرچم و کلیدواژه پیغام‌ها می‌تواند تغییر داده شود، به غیر از بازدید و حذف';
 $labels['longacli'] = 'پیغام‌ها می‌توانند کپی یا نوشته شوند به پوشه';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'پرچم حذف پیغام‌ها می‌تواند تغ
 $labels['longacle'] = 'پیغام‌ها می‌توانند حذف شوند';
 $labels['longaclx'] = 'پوشه می‌تواند حذف یا تغییر نام داده شود';
 $labels['longacla'] = 'قوانین دسترسی پوشه می‌تواند تغییر داده شود';
+
 $labels['longaclfull'] = 'کنترل کامل شما مدیریت پوشه';
+$labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longaclwrite'] = 'پیغام‌ها می‌توانند علامتگذاری، نوشته و یا کپی شوند در پوشه';
 $labels['longacldelete'] = 'پیغام‌ها می‌توانند حذف شوند';
-$labels['deleting'] = 'حذف کردن قوانین دسترسی...';
-$labels['saving'] = 'ذخیره قوانین دسترسی...';
-$labels['updatesuccess'] = 'قوانین دسترسی با موفقیت تغییر کردند';
-$labels['deletesuccess'] = 'قوانین دسترسی با موفقیت حذف شدند';
-$labels['createsuccess'] = 'قوانین دسترسی با موفقیت اضافه شدند';
-$labels['updateerror'] = 'ناتوانی در بروزرسانی قوانین دسترسی';
-$labels['deleteerror'] = 'ناتوانی در حذف قوانین دسترسی';
-$labels['createerror'] = 'ناتوانی در اضافه کردن قوانین دسترسی';
-$labels['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید قوانین دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
-$labels['norights'] = 'هیچ قانونی مشخص نشده است!';
-$labels['nouser'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
 
+$messages['deleting'] = 'حذف کردن قوانین دسترسی...';
+$messages['saving'] = 'ذخیره قوانین دسترسی...';
+$messages['updatesuccess'] = 'قوانین دسترسی با موفقیت تغییر کردند';
+$messages['deletesuccess'] = 'قوانین دسترسی با موفقیت حذف شدند';
+$messages['createsuccess'] = 'قوانین دسترسی با موفقیت اضافه شدند';
+$messages['updateerror'] = 'ناتوانی در بروزرسانی قوانین دسترسی';
+$messages['deleteerror'] = 'ناتوانی در حذف قوانین دسترسی';
+$messages['createerror'] = 'ناتوانی در اضافه کردن قوانین دسترسی';
+$messages['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید قوانین دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
+$messages['norights'] = 'هیچ قانونی مشخص نشده است!';
+$messages['nouser'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
+
+?>
diff --git a/plugins/acl/localization/fi_FI.inc b/plugins/acl/localization/fi_FI.inc
index 7af5b3e..329664a 100644
--- a/plugins/acl/localization/fi_FI.inc
+++ b/plugins/acl/localization/fi_FI.inc
@@ -2,60 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $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['aclr'] = 'Lue viestejä';
-$labels['aclc'] = 'Luo alikansioita';
-$labels['aclk'] = 'Luo alikansioita';
-$labels['acld'] = 'Poista viestejä';
-$labels['aclt'] = 'Poista viestejä';
-$labels['aclx'] = 'Poista kansio';
-$labels['aclfull'] = 'Täysi hallinta';
+$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'] = 'Muu';
-$labels['shortaclother'] = 'Muu';
-$labels['aclread'] = 'Luku';
-$labels['shortaclr'] = 'Luku';
-$labels['shortaclread'] = 'Luku';
-$labels['aclwrite'] = 'Kirjoitus';
-$labels['shortaclw'] = 'Kirjoitus';
-$labels['shortaclwrite'] = 'Kirjoitus';
-$labels['acldelete'] = 'Poisto';
-$labels['shortacld'] = 'Poisto';
-$labels['shortaclt'] = 'Poisto';
-$labels['shortacldelete'] = 'Poisto';
+$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'] = 'Luo';
 $labels['shortaclk'] = 'Luo';
-$labels['longaclr'] = 'Kansio voidaan avata lukua varten';
-$labels['longaclread'] = 'Kansio voidaan avata lukua varten';
-$labels['longaclc'] = 'Kansioita voi luoda (tai nimetä uudelleen) tämän kansion alla';
-$labels['longaclk'] = 'Kansioita voi luoda (tai nimetä uudelleen) tämän kansion alla';
-$labels['longaclx'] = 'Kansion voi poistaa tai nimetä uudelleen';
+$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'] = 'Kansion voi avata lukua varten';
+$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'] = 'Kansio voidaan poistaa tai nimetä uudelleen';
 $labels['longacla'] = 'Kansion käyttöoikeuksia voi muuttaa';
-$labels['longaclfull'] = 'Täysi hallinta mukaan lukien kansioiden ylläpidon';
-$labels['longacldelete'] = 'Viestejä voi poistaa';
-$labels['deleting'] = 'Poistetaan käyttöoikeuksia...';
-$labels['saving'] = 'Tallennetaan käyttöoikeuksia...';
-$labels['updatesuccess'] = 'Käyttöoikeudet on muutettu onnistuneesti';
-$labels['deletesuccess'] = 'Käyttöoikeudet on poistettu onnistuneesti';
-$labels['createsuccess'] = 'Käyttöoikeudet on lisätty onnistuneesti';
-$labels['deleteerror'] = 'Käyttöoikeuksien poisto epäonnistui';
-$labels['createerror'] = 'Käyttöoikeuksien lisäys epäonnistui';
-$labels['norights'] = 'Käyttöoikeuksia ei ole määritelty!';
-$labels['nouser'] = 'Käyttäjätunnusta ei ole määritelty!';
 
+$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'] = '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'] = 'Ubable to update access rights';
+$messages['deleteerror'] = 'Käyttöoikeuksien poistaminen epäonnistui';
+$messages['createerror'] = 'Käyttöoikeuksien lisääminen epäonnistui';
+$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/fr_FR.inc b/plugins/acl/localization/fr_FR.inc
index e4239dc..4ac90b6 100644
--- a/plugins/acl/localization/fr_FR.inc
+++ b/plugins/acl/localization/fr_FR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tr4sK                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Partage';
 $labels['myrights'] = 'Droits d\'accès';
 $labels['username'] = 'Utilisateur :';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Action sur les droits d\'accès...';
 $labels['anyone'] = 'Tous les utilisateurs (tout le monde)';
 $labels['anonymous'] = 'Invités (anonymes)';
 $labels['identifier'] = 'Identifiant';
+
 $labels['acll'] = 'Consultation';
-$labels['shortacll'] = 'Consultation';
 $labels['aclr'] = 'Lire les messages';
 $labels['acls'] = 'Garder l\'état vu';
 $labels['aclw'] = 'Écrire une étiquette';
 $labels['acli'] = 'Insérer (Copier dans)';
 $labels['aclp'] = 'Envoyer';
-$labels['shortaclp'] = 'Envoyer';
 $labels['aclc'] = 'Créer des sous-dossiers';
 $labels['aclk'] = 'Créer des sous-dossiers';
 $labels['acld'] = 'Supprimer des messages';
 $labels['aclt'] = 'Supprimer des messages';
 $labels['acle'] = 'Purger';
-$labels['shortacle'] = 'Purger';
 $labels['aclx'] = 'Supprimer un dossier';
 $labels['acla'] = 'Administrer';
-$labels['shortacla'] = 'Administrer';
+
 $labels['aclfull'] = 'Contrôle total';
 $labels['aclother'] = 'Autre';
-$labels['shortaclother'] = 'Autre';
 $labels['aclread'] = 'Lecture';
-$labels['shortaclr'] = 'Lecture';
-$labels['shortaclread'] = 'Lecture';
 $labels['aclwrite'] = 'Écriture';
-$labels['shortaclw'] = 'Écriture';
-$labels['shortaclwrite'] = 'Écriture';
 $labels['acldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
-$labels['shortacld'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
-$labels['shortaclt'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
-$labels['shortacldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+
+$labels['shortacll'] = 'Consultation';
+$labels['shortaclr'] = 'Lecture';
 $labels['shortacls'] = 'Conserver';
+$labels['shortaclw'] = 'Écriture';
 $labels['shortacli'] = 'Insérer';
+$labels['shortaclp'] = 'Envoyer';
 $labels['shortaclc'] = 'Créer';
 $labels['shortaclk'] = 'Créer';
+$labels['shortacld'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortaclt'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortacle'] = 'Purger';
 $labels['shortaclx'] = 'Supprimer un dossier';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Autre';
+$labels['shortaclread'] = 'Lecture';
+$labels['shortaclwrite'] = 'Écriture';
+$labels['shortacldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+
 $labels['longacll'] = 'Ce dossier est visible dans les listes et peut être souscrit';
 $labels['longaclr'] = 'Le dossier peut-être ouvert pour lecture';
-$labels['longaclread'] = 'Le dossier peut-être ouvert pour lecture';
 $labels['longacls'] = 'L\'étiquette Lu peut-être changée';
 $labels['longaclw'] = 'Les étiquettes et les mot-clés peuvent-être changé, sauf pour Vu et Supprimé';
 $labels['longacli'] = 'Les messages peuvent-être écrit ou copié dans le dossier';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'L\'étiquette de suppression des messages peut-être modi
 $labels['longacle'] = 'Les messages peuvent-être purgés';
 $labels['longaclx'] = 'Le dossier peut-être supprimé ou renommé';
 $labels['longacla'] = 'Les droits d\'accès au dossier peuvent-être modifiés';
+
 $labels['longaclfull'] = 'Contrôle total, dossier d\'administration inclus';
+$labels['longaclread'] = 'Le dossier peut-être ouvert pour lecture';
 $labels['longaclwrite'] = 'Les messages peuvent-être marqué, écrit ou copié dans ce dossier';
 $labels['longacldelete'] = 'Les messages peuvent-être supprimé';
-$labels['deleting'] = 'Suppression des droits d\'accès…';
-$labels['saving'] = 'Sauvegarde des droits d\'accès…';
-$labels['updatesuccess'] = 'Les droits d\'accès ont été changé avec succès';
-$labels['deletesuccess'] = 'Les droits d\'accès ont été supprimé avec succès';
-$labels['createsuccess'] = 'Les droits d\'accès ont été ajouté avec succès';
-$labels['updateerror'] = 'Impossible de mettre à jour les droits d\'accès';
-$labels['deleteerror'] = 'Impossible de supprimer les droits d\'accès';
-$labels['createerror'] = 'Impossible d\'ajouter des droits d\'accès';
-$labels['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès du/des utilisateur(s) sélectionné ?';
-$labels['norights'] = 'Aucun droit n\'a été spécifié !';
-$labels['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié !';
 
+$messages['deleting'] = 'Suppression des droits d\'accès…';
+$messages['saving'] = 'Sauvegarde des droits d\'accès…';
+$messages['updatesuccess'] = 'Les droits d\'accès ont été changé avec succès';
+$messages['deletesuccess'] = 'Les droits d\'accès ont été supprimé avec succès';
+$messages['createsuccess'] = 'Les droits d\'accès ont été ajouté avec succès';
+$messages['updateerror'] = 'Impossible de mettre à jour les droits d\'accès';
+$messages['deleteerror'] = 'Impossible de supprimer les droits d\'accès';
+$messages['createerror'] = 'Impossible d\'ajouter des droits d\'accès';
+$messages['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès du/des utilisateur(s) sélectionné ?';
+$messages['norights'] = 'Aucun droit n\'a été spécifié !';
+$messages['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié !';
+
+?>
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index cf1d80c..a287a41 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ghas                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartindo';
 $labels['myrights'] = 'Dereitos de acceso';
 $labels['username'] = 'Usuario:';
@@ -23,10 +25,75 @@ $labels['actions'] = 'Accións sobre os dereitos de acceso...';
 $labels['anyone'] = 'Tódolos usuarios (calquera)';
 $labels['anonymous'] = 'Invitados (anónimo)';
 $labels['identifier'] = 'Identificador';
+
+$labels['acll'] = 'Lookup';
 $labels['aclr'] = 'Ler mensaxes';
+$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'] = 'Borrar mensaxes';
 $labels['aclt'] = 'Borrar mensaxes';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Eliminar carpeta';
 $labels['acla'] = 'Administrar';
+
+$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'] = 'Administrar';
 
+$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/he_IL.inc b/plugins/acl/localization/he_IL.inc
index 83b3f82..d7b027a 100644
--- a/plugins/acl/localization/he_IL.inc
+++ b/plugins/acl/localization/he_IL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish at mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'שיתוף';
 $labels['myrights'] = 'זכויות גישה';
 $labels['username'] = 'משתמש:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'פעולות על זכויות גישה...';
 $labels['anyone'] = 'כל המשתמשים (כל אחד)';
 $labels['anonymous'] = 'אורחים (אנונימי)';
 $labels['identifier'] = 'מזהה';
+
 $labels['acll'] = 'חיפוש';
-$labels['shortacll'] = 'חיפוש';
 $labels['aclr'] = 'קריאת הודעות';
 $labels['acls'] = 'שמירה על סטטוס נראה';
 $labels['aclw'] = 'דגלי כתיבה';
 $labels['acli'] = 'הוספה בין ערכים (העתקה לתוך)';
 $labels['aclp'] = 'פרסום';
-$labels['shortaclp'] = 'פרסום';
 $labels['aclc'] = 'יצירת תת־תיקיות';
 $labels['aclk'] = 'יצירת תת־תיקיות';
 $labels['acld'] = 'מחיקת הודעות';
 $labels['aclt'] = 'מחיקת הודעות';
 $labels['acle'] = 'ניקוי רשומות שבוטלו';
-$labels['shortacle'] = 'ניקוי רשומות שבוטלו';
 $labels['aclx'] = 'מחיקת תיקיה';
 $labels['acla'] = 'מנהל';
-$labels['shortacla'] = 'מנהל';
+
 $labels['aclfull'] = 'שליטה מלאה';
 $labels['aclother'] = 'אחר';
-$labels['shortaclother'] = 'אחר';
 $labels['aclread'] = 'קריאה';
-$labels['shortaclr'] = 'קריאה';
-$labels['shortaclread'] = 'קריאה';
 $labels['aclwrite'] = 'כתיבה';
-$labels['shortaclw'] = 'כתיבה';
-$labels['shortaclwrite'] = 'כתיבה';
 $labels['acldelete'] = 'מחיקה';
-$labels['shortacld'] = 'מחיקה';
-$labels['shortaclt'] = 'מחיקה';
-$labels['shortacldelete'] = 'מחיקה';
+
+$labels['shortacll'] = 'חיפוש';
+$labels['shortaclr'] = 'קריאה';
 $labels['shortacls'] = 'להשאיר';
+$labels['shortaclw'] = 'כתיבה';
 $labels['shortacli'] = 'הוספה בין ערכים';
+$labels['shortaclp'] = 'פרסום';
 $labels['shortaclc'] = 'יצירה';
 $labels['shortaclk'] = 'יצירה';
+$labels['shortacld'] = 'מחיקה';
+$labels['shortaclt'] = 'מחיקה';
+$labels['shortacle'] = 'ניקוי רשומות שבוטלו';
 $labels['shortaclx'] = 'מחיקת תיקיה';
+$labels['shortacla'] = 'מנהל';
+
+$labels['shortaclother'] = 'אחר';
+$labels['shortaclread'] = 'קריאה';
+$labels['shortaclwrite'] = 'כתיבה';
+$labels['shortacldelete'] = 'מחיקה';
+
 $labels['longacll'] = 'התיקיה תראה ברשימות וניתן יהיה להרשם אליה';
 $labels['longaclr'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
-$labels['longaclread'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
 $labels['longacls'] = 'ניתן לשנות דגל נראה בהודעות';
 $labels['longaclw'] = 'ניתן לשנות דגלים ומילות מפתח בהודעות, למעט נראה ונמחק';
 $labels['longacli'] = 'ניתן לכתוב הודעות לתיקיה או למוחקן';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'ניתן לשנות דגל נמחק של הודעות';
 $labels['longacle'] = 'ניתן לנקות הודעות שסומנו כמבוטלות';
 $labels['longaclx'] = 'ניתן למחוק תיקיה זו או לשנות שמה';
 $labels['longacla'] = 'ניתן לשנות זכויות גישה של תיקיה זו';
+
 $labels['longaclfull'] = 'שליטה מלאה כולל ניהול התיקיה';
+$labels['longaclread'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
 $labels['longaclwrite'] = 'ניתן לסמן, לכתוב או להעתיק הודעות לתיקיה זו';
 $labels['longacldelete'] = 'ניתן למחוק הודעות';
-$labels['deleting'] = 'זכויות גישה נמחקות...';
-$labels['saving'] = 'זכויות גישה נשמרות...';
-$labels['updatesuccess'] = 'זכויות גישה שונו בהצלחה';
-$labels['deletesuccess'] = 'זכויות גישה נמחקו בהצלחה';
-$labels['createsuccess'] = 'זכויות גישה נוספו בהצלחה';
-$labels['updateerror'] = 'לא ניתן לעדכן זכויות גישה';
-$labels['deleteerror'] = 'לא ניתן למחוק זכויות גישה';
-$labels['createerror'] = 'לא ניתן להוסיף זכויות גישה';
-$labels['deleteconfirm'] = 'האם ודאי שברצונך להסיר זכויות גישה של המשתמש(ים) שנבחרו?';
-$labels['norights'] = 'לא צוינו זכויות גישה כלשהן !';
-$labels['nouser'] = 'לא צוין שם משתמש כלשהו!';
 
+$messages['deleting'] = 'זכויות גישה נמחקות...';
+$messages['saving'] = 'זכויות גישה נשמרות...';
+$messages['updatesuccess'] = 'זכויות גישה שונו בהצלחה';
+$messages['deletesuccess'] = 'זכויות גישה נמחקו בהצלחה';
+$messages['createsuccess'] = 'זכויות גישה נוספו בהצלחה';
+$messages['updateerror'] = 'לא ניתן לעדכן זכויות גישה';
+$messages['deleteerror'] = 'לא ניתן למחוק זכויות גישה';
+$messages['createerror'] = 'לא ניתן להוסיף זכויות גישה';
+$messages['deleteconfirm'] = 'האם ודאי שברצונך להסיר זכויות גישה של המשתמש(ים) שנבחרו?';
+$messages['norights'] = 'לא צוינו זכויות גישה כלשהן !';
+$messages['nouser'] = 'לא צוין שם משתמש כלשהו!';
+
+?>
diff --git a/plugins/acl/localization/hu_HU.inc b/plugins/acl/localization/hu_HU.inc
index f5ca78f..adc6ad8 100644
--- a/plugins/acl/localization/hu_HU.inc
+++ b/plugins/acl/localization/hu_HU.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Megosztás';
 $labels['myrights'] = 'Hozzáférési jogok';
 $labels['username'] = 'Felhasználó:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Hozzáférési jogok müveletei..';
 $labels['anyone'] = 'Minden felhasználó (bárki)';
 $labels['anonymous'] = 'Vendégek (névtelen)';
 $labels['identifier'] = 'Azonosító';
+
 $labels['acll'] = 'Keresés';
-$labels['shortacll'] = 'Keresés';
 $labels['aclr'] = 'Üzenetek olvasása';
 $labels['acls'] = 'Olvasottsági állapot megtartása';
 $labels['aclw'] = 'Üzenet jelölése';
 $labels['acli'] = 'Beillesztés (Bemásolás)';
 $labels['aclp'] = 'Bejegyzés';
-$labels['shortaclp'] = 'Bejegyzés';
 $labels['aclc'] = 'Almappa létrehozás';
 $labels['aclk'] = 'Almappa létrehozás';
 $labels['acld'] = 'Üzenetek törlése';
 $labels['aclt'] = 'Üzenetek törlése';
 $labels['acle'] = 'Törölt üzenetek eltávolítása';
-$labels['shortacle'] = 'Törölt üzenetek eltávolítása';
 $labels['aclx'] = 'Mappa törlés';
 $labels['acla'] = 'Adminisztrátor';
-$labels['shortacla'] = 'Adminisztrátor';
+
 $labels['aclfull'] = 'Teljes hozzáférés';
 $labels['aclother'] = 'Egyéb';
-$labels['shortaclother'] = 'Egyéb';
 $labels['aclread'] = 'Olvasás';
-$labels['shortaclr'] = 'Olvasás';
-$labels['shortaclread'] = 'Olvasás';
 $labels['aclwrite'] = 'Írás';
-$labels['shortaclw'] = 'Írás';
-$labels['shortaclwrite'] = 'Írás';
 $labels['acldelete'] = 'Törlés';
-$labels['shortacld'] = 'Törlés';
-$labels['shortaclt'] = 'Törlés';
-$labels['shortacldelete'] = 'Törlés';
+
+$labels['shortacll'] = 'Keresés';
+$labels['shortaclr'] = 'Olvasás';
 $labels['shortacls'] = 'Megtartás';
+$labels['shortaclw'] = 'Írás';
 $labels['shortacli'] = 'Beszúrás';
+$labels['shortaclp'] = 'Bejegyzés';
 $labels['shortaclc'] = 'Létrehozás';
 $labels['shortaclk'] = 'Létrehozás';
+$labels['shortacld'] = 'Törlés';
+$labels['shortaclt'] = 'Törlés';
+$labels['shortacle'] = 'Törölt üzenetek eltávolítása';
 $labels['shortaclx'] = 'Mappa törlése';
+$labels['shortacla'] = 'Adminisztrátor';
+
+$labels['shortaclother'] = 'Egyéb';
+$labels['shortaclread'] = 'Olvasás';
+$labels['shortaclwrite'] = 'Írás';
+$labels['shortacldelete'] = 'Törlés';
+
 $labels['longacll'] = 'A mappa látható a listán és fel tudsz rá iratkozni.';
 $labels['longaclr'] = 'A mappa olvasásra megnyitható';
-$labels['longaclread'] = 'A mappa olvasásra megnyitható';
 $labels['longacls'] = 'Az üzenet megtekintési állapota módosítható';
 $labels['longaclw'] = 'Az üzenetek jelölései és kulcsszavai módosíthatóak, kivéve az olvasottsági állapotot és az üzenet törölt állapotát.';
 $labels['longacli'] = 'Üzenetek irhatóak és máolshatóak a mappába.';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Üzenet törölve jelző módositható.';
 $labels['longacle'] = 'Az üzenetek véglegesen eltávolíthatóak';
 $labels['longaclx'] = 'A mappa törölhető vagy átnevezhető';
 $labels['longacla'] = 'A mappa hozzáférési jogai módosíthatóak';
+
 $labels['longaclfull'] = 'Teljes hozzáférés beleértve a mappák kezelését';
+$labels['longaclread'] = 'A mappa olvasásra megnyitható';
 $labels['longaclwrite'] = 'Az üzenetek megjelölhetök, irhatók és másolhatók ebbe a mappába';
 $labels['longacldelete'] = 'Az üzenetek törölhetőek';
-$labels['deleting'] = 'Hozzáférési jogok törlése...';
-$labels['saving'] = 'Hozzáférési jogok mentése...';
-$labels['updatesuccess'] = 'A hozzáférési jogok sikeresen módosultak.';
-$labels['deletesuccess'] = 'A hozzáférési jogok törlése sikeresen megtörtént.';
-$labels['createsuccess'] = 'A hozzáférési jogok hozzáadása sikeresen megtörtént.';
-$labels['updateerror'] = 'Nem sikerült módosítani a hozzáférési jogokat.';
-$labels['deleteerror'] = 'Nem sikerült törölni a hozzáférési jogokat.';
-$labels['createerror'] = 'Nem sikerült a hozzáférési jogok hozzáadása';
-$labels['deleteconfirm'] = 'Biztosan eltávolítja a kiválasztott felhasználó(k) hozzáférési jogait?';
-$labels['norights'] = 'Nincsennek jogok megadva.';
-$labels['nouser'] = 'A felhasználónév nincs megadva.';
 
+$messages['deleting'] = 'Hozzáférési jogok törlése...';
+$messages['saving'] = 'Hozzáférési jogok mentése...';
+$messages['updatesuccess'] = 'A hozzáférési jogok sikeresen módosultak.';
+$messages['deletesuccess'] = 'A hozzáférési jogok törlése sikeresen megtörtént.';
+$messages['createsuccess'] = 'A hozzáférési jogok hozzáadása sikeresen megtörtént.';
+$messages['updateerror'] = 'Nem sikerült módosítani a hozzáférési jogokat.';
+$messages['deleteerror'] = 'Nem sikerült törölni a hozzáférési jogokat.';
+$messages['createerror'] = 'Nem sikerült a hozzáférési jogok hozzáadása';
+$messages['deleteconfirm'] = 'Biztosan eltávolítja a kiválasztott felhasználó(k) hozzáférési jogait?';
+$messages['norights'] = 'Nincsennek jogok megadva.';
+$messages['nouser'] = 'A felhasználónév nincs megadva.';
+
+?>
diff --git a/plugins/acl/localization/hy_AM.inc b/plugins/acl/localization/hy_AM.inc
index 8629298..d39c19a 100644
--- a/plugins/acl/localization/hy_AM.inc
+++ b/plugins/acl/localization/hy_AM.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan at yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Ô¿Õ«Õ½Õ¾Õ¥Õ¬';
 $labels['myrights'] = 'Õ„Õ¸Ö‚Õ¿Ö„Õ« Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€';
 $labels['username'] = 'Õ•Õ£Õ¿Õ¡Õ¿Õ¥Ö€`';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Õ„Õ¸Ö‚Õ¿Ö„Õ« Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ« Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©Õµ
 $labels['anyone'] = 'Բոլոր օգտվողները (ցանկացած)';
 $labels['anonymous'] = 'Õ€ÕµÕ¸Ö‚Ö€Õ¥Ö€Õ¨ (Õ¡Õ¶Õ¡Õ¶Õ¸Ö‚Õ¶)';
 $labels['identifier'] = 'Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ«Õ¹';
+
 $labels['acll'] = 'Õ“Õ¶Õ¿Ö€Õ¸Ö‚Õ´';
-$labels['shortacll'] = 'Õ“Õ¶Õ¿Ö€Õ¸Ö‚Õ´';
 $labels['aclr'] = 'Ô¿Õ¡Ö€Õ¤Õ¡Õ¬ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨';
 $labels['acls'] = 'ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ Õ¤Õ«Õ¿Õ´Õ¡Õ¶ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯Õ¨';
 $labels['aclw'] = 'Ô³Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ¶Õ·Õ¸Ö‚Õ´Õ¶Õ¥Ö€';
 $labels['acli'] = 'Õ†Õ¥Ö€Õ¤Õ¶Õ¥Õ¬ (ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ¶Õ¥Ö€Õ½)';
 $labels['aclp'] = 'Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¥Õ¬';
-$labels['shortaclp'] = 'Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¥Õ¬';
 $labels['aclc'] = 'Ստեղծել ենթապանակներ';
 $labels['aclk'] = 'Ստեղծել ենթապանակներ';
 $labels['acld'] = 'Õ‹Õ¶Õ»Õ¥Õ¬ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨';
 $labels['aclt'] = 'Õ‹Õ¶Õ»Õ¥Õ¬ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨';
 $labels['acle'] = 'Հեռացնել';
-$labels['shortacle'] = 'Հեռացնել';
 $labels['aclx'] = 'Õ‹Õ¶Õ»Õ¥Õ¬ ÕºÕ¡Õ¶Õ¡Õ¯Õ¨';
 $labels['acla'] = 'Ô¿Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ¥Õ¬';
-$labels['shortacla'] = 'Ô¿Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ¥Õ¬';
+
 $labels['aclfull'] = 'Ô¼Ö€Õ«Õ¾ Õ¾Õ¥Ö€Õ¡Õ°Õ½Õ¯Õ¸Ö‚Õ´';
 $labels['aclother'] = 'Ô±ÕµÕ¬';
-$labels['shortaclother'] = 'Ô±ÕµÕ¬';
 $labels['aclread'] = 'Ô¿Õ¡Ö€Õ¤Õ¡Õ¬';
-$labels['shortaclr'] = 'Ô¿Õ¡Ö€Õ¤Õ¡Õ¬';
-$labels['shortaclread'] = 'Ô¿Õ¡Ö€Õ¤Õ¡Õ¬';
 $labels['aclwrite'] = 'Ô³Ö€Õ¥Õ¬';
-$labels['shortaclw'] = 'Ô³Ö€Õ¥Õ¬';
-$labels['shortaclwrite'] = 'Ô³Ö€Õ¥Õ¬';
 $labels['acldelete'] = 'Õ‹Õ¶Õ»Õ¥Õ¬';
-$labels['shortacld'] = 'Õ‹Õ¶Õ»Õ¥Õ¬';
-$labels['shortaclt'] = 'Õ‹Õ¶Õ»Õ¥Õ¬';
-$labels['shortacldelete'] = 'Õ‹Õ¶Õ»Õ¥Õ¬';
+
+$labels['shortacll'] = 'Õ“Õ¶Õ¿Ö€Õ¸Ö‚Õ´';
+$labels['shortaclr'] = 'Ô¿Õ¡Ö€Õ¤Õ¡Õ¬';
 $labels['shortacls'] = 'ÕŠÕ¡Õ°Õ¥Õ¬';
+$labels['shortaclw'] = 'Ô³Ö€Õ¥Õ¬';
 $labels['shortacli'] = 'Õ†Õ¥Ö€Õ¤Õ¶Õ¥Õ¬';
+$labels['shortaclp'] = 'Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¥Õ¬';
 $labels['shortaclc'] = 'Ստեղծել';
 $labels['shortaclk'] = 'Ստեղծել';
+$labels['shortacld'] = 'Õ‹Õ¶Õ»Õ¥Õ¬';
+$labels['shortaclt'] = 'Õ‹Õ¶Õ»Õ¥Õ¬';
+$labels['shortacle'] = 'Հեռացնել';
 $labels['shortaclx'] = 'ÕŠÕ¡Õ¶Õ¡Õ¯Õ« Õ»Õ¶Õ»Õ¸Ö‚Õ´';
+$labels['shortacla'] = 'Ô¿Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ¥Õ¬';
+
+$labels['shortaclother'] = 'Ô±ÕµÕ¬';
+$labels['shortaclread'] = 'Ô¿Õ¡Ö€Õ¤Õ¡Õ¬';
+$labels['shortaclwrite'] = 'Ô³Ö€Õ¥Õ¬';
+$labels['shortacldelete'] = 'Õ‹Õ¶Õ»Õ¥Õ¬';
+
 $labels['longacll'] = 'Պանակը երևում է ցուցակներում և նրան հնարավոր է բաժանորդագրվել';
 $labels['longaclr'] = 'Պանակը կարող է բացվել ընթերցման համար';
-$labels['longaclread'] = 'Պանակը կարող է բացվել ընթերցման համար';
 $labels['longacls'] = 'Տեսված հաղորդագրությունների նշումը կարող է փոփոխվել';
 $labels['longaclw'] = 'Հաղորդագրությունների նշումները և հիմնաբառերը կարող են փոփոխվել, բացառությամբ Տեսած և Ջնջված նշումների';
 $labels['longacli'] = 'Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ£Ö€Õ¾Õ¥Õ¬ Ö‡ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¾Õ¥Õ¬ ÕºÕ¡Õ¶Õ¡Õ¯Õ« Õ´Õ¥Õ»';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ‹Õ¶Õ»Õ¥Õ¬ Õ¶Õ·
 $labels['longacle'] = 'Հաղորդագրությունները կարող են հեռացվել';
 $labels['longaclx'] = 'ÕŠÕ¡Õ¶Õ¡Õ¯Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ»Õ¶Õ»Õ¾Õ¥Õ¬ Õ¯Õ¡Õ´ Õ¾Õ¥Ö€Õ¡Õ¶Õ¾Õ¡Õ¶Õ¾Õ¥Õ¬';
 $labels['longacla'] = 'ÕŠÕ¡Õ¶Õ¡Õ¯Õ« Õ´Õ¸Ö‚Õ¿Ö„Õ« Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ ÖƒÕ¸ÖƒÕ¸Õ­Õ¾Õ¥Õ¬';
+
 $labels['longaclfull'] = 'Ô¼Ö€Õ«Õ¾ Õ¾Õ¥Ö€Õ¡Õ°Õ½Õ¯Õ¸Ö‚Õ´ Õ¶Õ¥Ö€Õ¡Õ¼ÕµÕ¡Õ¬ ÕºÕ¡Õ¶Õ¡Õ¯Õ¶Õ¥Ö€Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´Õ¨';
+$labels['longaclread'] = 'Պանակը կարող է բացվել ընթերցման համար';
 $labels['longaclwrite'] = 'Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ¶Õ·Õ¾Õ¥Õ¬, Õ½Õ¿Õ¥Õ²Õ®Õ¾Õ¥Õ¬ Ö‡ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¾Õ¥Õ¬ Õ¡ÕµÕ½ ÕºÕ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´';
 $labels['longacldelete'] = 'Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ¶ Õ»Õ¶Õ»Õ¾Õ¥Õ¬';
-$labels['deleting'] = 'Ջնջվում են մուտքի իրավունքները…';
-$labels['saving'] = 'Պահպանվում են մուտքի իրավունքները…';
-$labels['updatesuccess'] = 'Մուտքի իրավունքները բարեհաջող փոփոխվեցին։';
-$labels['deletesuccess'] = 'Մուտքի իրավունքները բարեհաջող ջնջվեցին։';
-$labels['createsuccess'] = 'Մուտքի իրավունքները բարեհաջող ավելացվեցվին։';
-$labels['updateerror'] = 'Մուտքի իրավունքները թարմացումը ձախողվեց։';
-$labels['deleteerror'] = 'Մուտքի իրավունքները ջնջումը ձախողվեց։';
-$labels['createerror'] = 'Մուտքի իրավունքները ավելացումը ձախողվեց։';
-$labels['deleteconfirm'] = 'Դուք վստա՞հ էք, որ ցանկանում եք նշված օգտվողներին զրկել մուտքի իրավունքներից։';
-$labels['norights'] = 'ÕˆÕ¹ Õ´Õ« Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„ Õ¹Õ«Õ› Õ¶Õ·Õ¾Õ¥Õ¬Ö‰';
-$labels['nouser'] = 'Õ•Õ£Õ¿Õ¾Õ¸Õ²Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ Õ¹Õ«Õ› Õ¶Õ·Õ¾Õ¥Õ¬Ö‰';
 
+$messages['deleting'] = 'Ջնջվում են մուտքի իրավունքները…';
+$messages['saving'] = 'Պահպանվում են մուտքի իրավունքները…';
+$messages['updatesuccess'] = 'Մուտքի իրավունքները բարեհաջող փոփոխվեցին։';
+$messages['deletesuccess'] = 'Մուտքի իրավունքները բարեհաջող ջնջվեցին։';
+$messages['createsuccess'] = 'Մուտքի իրավունքները բարեհաջող ավելացվեցվին։';
+$messages['updateerror'] = 'Մուտքի իրավունքները թարմացումը ձախողվեց։';
+$messages['deleteerror'] = 'Մուտքի իրավունքները ջնջումը ձախողվեց։';
+$messages['createerror'] = 'Մուտքի իրավունքները ավելացումը ձախողվեց։';
+$messages['deleteconfirm'] = 'Դուք վստա՞հ էք, որ ցանկանում եք նշված օգտվողներին զրկել մուտքի իրավունքներից։';
+$messages['norights'] = 'ÕˆÕ¹ Õ´Õ« Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„ Õ¹Õ«Õ› Õ¶Õ·Õ¾Õ¥Õ¬Ö‰';
+$messages['nouser'] = 'Õ•Õ£Õ¿Õ¾Õ¸Õ²Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ Õ¹Õ«Õ› Õ¶Õ·Õ¾Õ¥Õ¬Ö‰';
+
+?>
diff --git a/plugins/acl/localization/id_ID.inc b/plugins/acl/localization/id_ID.inc
index e38070d..8e8afc0 100644
--- a/plugins/acl/localization/id_ID.inc
+++ b/plugins/acl/localization/id_ID.inc
@@ -2,27 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Berbagi';
 $labels['myrights'] = 'Hak Akses';
 $labels['username'] = 'Pengguna:';
-$labels['identifier'] = 'Identifair';
+$labels['advanced'] = 'mode canggih';
+$labels['newuser'] = 'Tambahkan entri';
+$labels['actions'] = 'Aksi hak akses...';
+$labels['anyone'] = 'Semua pengguna (siapa saja)';
+$labels['anonymous'] = 'Para tamu (anonim)';
+$labels['identifier'] = 'Yang mengidentifikasi';
+
 $labels['acll'] = 'Cari';
-$labels['shortacll'] = 'Cari';
+$labels['aclr'] = 'Baca pesan';
+$labels['acls'] = 'Jaga status terbaca';
+$labels['aclw'] = 'Membuat tanda';
+$labels['acli'] = 'Sisipkan (Salin kedalam)';
 $labels['aclp'] = 'Tulisan';
-$labels['shortaclp'] = 'Tulisan';
 $labels['aclc'] = 'Buat subfolder';
 $labels['aclk'] = 'Buat subfolder';
+$labels['acld'] = 'Hapus pesan';
+$labels['aclt'] = 'Hapus pesan';
+$labels['acle'] = 'Menghapus';
 $labels['aclx'] = 'Hapus folder';
+$labels['acla'] = 'Kelola';
+
+$labels['aclfull'] = 'Kendali penuh';
+$labels['aclother'] = 'Lainnya';
+$labels['aclread'] = 'Baca';
+$labels['aclwrite'] = 'Tulis';
+$labels['acldelete'] = 'Hapus';
+
+$labels['shortacll'] = 'Cari';
+$labels['shortaclr'] = 'Baca';
+$labels['shortacls'] = 'Simpan';
+$labels['shortaclw'] = 'Tulis';
+$labels['shortacli'] = 'Sisipkan';
+$labels['shortaclp'] = 'Tulisan';
+$labels['shortaclc'] = 'Buat';
+$labels['shortaclk'] = 'Buat';
+$labels['shortacld'] = 'Hapus';
+$labels['shortaclt'] = 'Hapus';
+$labels['shortacle'] = 'Buang';
+$labels['shortaclx'] = 'Hapus folder';
+$labels['shortacla'] = 'Kelola';
+
+$labels['shortaclother'] = 'Lainnya';
+$labels['shortaclread'] = 'Baca';
+$labels['shortaclwrite'] = 'Tulis';
+$labels['shortacldelete'] = 'Hapus';
+
+$labels['longacll'] = 'Folder terlihat di daftar dan dapat dijadikan langganan';
+$labels['longaclr'] = 'Folder dapat dibuka untuk dibaca';
+$labels['longacls'] = 'Tanda pesan terbaca dapat diubah';
+$labels['longaclw'] = 'Tanda pesan dan kata kunci dapat diubah, kecuali Terbaca dan Terhapus';
+$labels['longacli'] = 'Pesan dapat ditulis atau disalin kedalam folder';
+$labels['longaclp'] = 'Pesan dapat dikirim ke folder ini';
+$labels['longaclc'] = 'Folder dapat dibuat (atau diubah namanya) langsung dari folder ini';
+$labels['longaclk'] = 'Folder dapat dibuat (atau diubah namanya) langsung dari folder ini';
+$labels['longacld'] = 'Tanda hapus pesan dapat diubah';
+$labels['longaclt'] = 'Tanda hapus pesan dapat diubah';
+$labels['longacle'] = 'Pesan dapat dibuang';
+$labels['longaclx'] = 'Folder dapat dihapus atau diubah namanya';
+$labels['longacla'] = 'Hak akses folder dapat diubah';
+
+$labels['longaclfull'] = 'Kendali penuh penuh termasuk administrasi';
+$labels['longaclread'] = 'Folder dapat dibuka untuk dibaca';
+$labels['longaclwrite'] = 'Pesan dapat ditandai, ditulis atau disalin kedalam folder';
+$labels['longacldelete'] = 'Pesan dapat dihapus';
+
+$messages['deleting'] = 'Menghapus hak akses...';
+$messages['saving'] = 'Menyimpan hak akses...';
+$messages['updatesuccess'] = 'Hak akses berhasil diubah';
+$messages['deletesuccess'] = 'Hak akses berhasil dihapus';
+$messages['createsuccess'] = 'Hak akses berhasil ditambahkan';
+$messages['updateerror'] = 'Tidak dapat memperbaharui hak akses';
+$messages['deleteerror'] = 'Tidak dapat menghapus hak akses';
+$messages['createerror'] = 'Tidak dapat menambah hak akses';
+$messages['deleteconfirm'] = 'Apakah Anda yakin ingin menghapus hak akses dari user terpilih?';
+$messages['norights'] = 'Hak belum ditentukan!';
+$messages['nouser'] = 'Username belum ditentukan!';
 
+?>
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index ce3751c..b4927fb 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -2,79 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini at gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Condivisione';
 $labels['myrights'] = 'Diritti d\'accesso';
 $labels['username'] = 'Utente:';
 $labels['advanced'] = 'modalità avanzata';
 $labels['newuser'] = 'Aggiungi voce';
+$labels['actions'] = 'Azioni permessi d\'accesso...';
 $labels['anyone'] = 'Tutti gli utenti';
 $labels['anonymous'] = 'Osptiti (anonimi)';
 $labels['identifier'] = 'Identificatore';
+
 $labels['acll'] = 'Ricerca';
-$labels['shortacll'] = 'Ricerca';
 $labels['aclr'] = 'Leggi messaggi';
 $labels['acls'] = 'Mantieni lo stato Visto';
 $labels['aclw'] = 'Flag di scrittura';
 $labels['acli'] = 'Inserisci (Copia in)';
+$labels['aclp'] = 'Invio';
 $labels['aclc'] = 'Crea sottocartelle';
 $labels['aclk'] = 'Crea sottocartelle';
 $labels['acld'] = 'Elimina messaggi';
 $labels['aclt'] = 'Elimina messaggi';
+$labels['acle'] = 'Elimina';
 $labels['aclx'] = 'Elimina cartella';
 $labels['acla'] = 'Amministra';
-$labels['shortacla'] = 'Amministra';
+
 $labels['aclfull'] = 'Controllo completo';
 $labels['aclother'] = 'Altri';
-$labels['shortaclother'] = 'Altri';
 $labels['aclread'] = 'Lettura';
-$labels['shortaclr'] = 'Lettura';
-$labels['shortaclread'] = 'Lettura';
 $labels['aclwrite'] = 'Scrittura';
-$labels['shortaclw'] = 'Scrittura';
-$labels['shortaclwrite'] = 'Scrittura';
 $labels['acldelete'] = 'Elimina';
-$labels['shortacld'] = 'Elimina';
-$labels['shortaclt'] = 'Elimina';
-$labels['shortacldelete'] = 'Elimina';
+
+$labels['shortacll'] = 'Ricerca';
+$labels['shortaclr'] = 'Lettura';
 $labels['shortacls'] = 'Mantieni';
+$labels['shortaclw'] = 'Scrittura';
 $labels['shortacli'] = 'Inserisci';
+$labels['shortaclp'] = 'Invio';
 $labels['shortaclc'] = 'Crea';
 $labels['shortaclk'] = 'Crea';
+$labels['shortacld'] = 'Elimina';
+$labels['shortaclt'] = 'Elimina';
+$labels['shortacle'] = 'Elimina';
 $labels['shortaclx'] = 'Cancella cartella';
+$labels['shortacla'] = 'Amministra';
+
+$labels['shortaclother'] = 'Altri';
+$labels['shortaclread'] = 'Lettura';
+$labels['shortaclwrite'] = 'Scrittura';
+$labels['shortacldelete'] = 'Elimina';
+
 $labels['longacll'] = 'La cartella è visibile sulle liste e può essere sottoscritta';
 $labels['longaclr'] = 'Questa cartella può essere aperta in lettura';
-$labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longacls'] = 'Il flag Messaggio Visto può essere cambiato';
 $labels['longaclw'] = 'I flag dei messaggi e le keywords possono essere cambiati, ad esclusione di Visto ed Eliminato';
 $labels['longacli'] = 'I messaggi possono essere scritti o copiati nella cartella';
+$labels['longaclp'] = 'I messaggi possono essere inviati a questa cartella';
+$labels['longaclc'] = 'Possono essere create (o rinominata) cartelle direttamente in questa cartella.';
+$labels['longaclk'] = 'Possono essere create (o rinominata) cartelle direttamente in questa cartella.';
 $labels['longacld'] = 'Il flag Messaggio Eliminato può essere cambiato';
 $labels['longaclt'] = 'Il flag Messaggio Eliminato può essere cambiato';
+$labels['longacle'] = 'I messaggi possono essere cancellati';
 $labels['longaclx'] = 'La cartella può essere eliminata o rinominata';
 $labels['longacla'] = 'I diritti di accesso della cartella possono essere cambiati';
+
 $labels['longaclfull'] = 'Controllo completo incluso cartella di amministrazione';
+$labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longaclwrite'] = 'I messaggi possono essere marcati, scritti o copiati nella cartella';
 $labels['longacldelete'] = 'I messaggi possono essere eliminati';
-$labels['deleting'] = 'Sto eliminando i diritti di accesso...';
-$labels['saving'] = 'Sto salvando i diritti di accesso...';
-$labels['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';
-$labels['deletesuccess'] = 'I diritti d\'accesso sono stati eliminati';
-$labels['createsuccess'] = 'I diritti d\'accesso sono stati aggiunti';
-$labels['updateerror'] = 'Impossibile aggiornare i diritti d\'accesso';
-$labels['deleteerror'] = 'Impossibile eliminare i diritti d\'accesso';
-$labels['createerror'] = 'Impossibile aggiungere i diritti d\'accesso';
-$labels['deleteconfirm'] = 'Sei sicuro, vuoi rimuovere i diritti d\'accesso degli utenti selezionati?';
-$labels['norights'] = 'Nessun diritto specificato!';
-$labels['nouser'] = 'Lo username non è stato specificato!';
 
+$messages['deleting'] = 'Sto eliminando i diritti di accesso...';
+$messages['saving'] = 'Sto salvando i diritti di accesso...';
+$messages['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';
+$messages['deletesuccess'] = 'I diritti d\'accesso sono stati eliminati';
+$messages['createsuccess'] = 'I diritti d\'accesso sono stati aggiunti';
+$messages['updateerror'] = 'Impossibile aggiornare i diritti d\'accesso';
+$messages['deleteerror'] = 'Impossibile eliminare i diritti d\'accesso';
+$messages['createerror'] = 'Impossibile aggiungere i diritti d\'accesso';
+$messages['deleteconfirm'] = 'Sei sicuro, vuoi rimuovere i diritti d\'accesso degli utenti selezionati?';
+$messages['norights'] = 'Nessun diritto specificato!';
+$messages['nouser'] = 'Lo username non è stato specificato!';
+
+?>
diff --git a/plugins/acl/localization/ja_JP.inc b/plugins/acl/localization/ja_JP.inc
index 3f915e2..29e96e6 100644
--- a/plugins/acl/localization/ja_JP.inc
+++ b/plugins/acl/localization/ja_JP.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '共有';
 $labels['myrights'] = 'アクセス権';
 $labels['username'] = 'ユーザー:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'アクセス権の動作...';
 $labels['anyone'] = '(誰でも)すべてのユーザー';
 $labels['anonymous'] = 'ゲスト(匿名)';
 $labels['identifier'] = '識別子';
+
 $labels['acll'] = '検索';
-$labels['shortacll'] = '検索';
 $labels['aclr'] = 'メッセージを読む';
 $labels['acls'] = '既読の状態を保持';
 $labels['aclw'] = '書き込みフラッグ';
 $labels['acli'] = '挿入(中に複製)';
 $labels['aclp'] = '投稿';
-$labels['shortaclp'] = '投稿';
 $labels['aclc'] = 'サブフォルダを作成';
 $labels['aclk'] = 'サブフォルダを作成';
 $labels['acld'] = 'メッセージを削除';
 $labels['aclt'] = 'メッセージを削除';
 $labels['acle'] = '抹消';
-$labels['shortacle'] = '抹消';
 $labels['aclx'] = 'フォルダーを削除';
 $labels['acla'] = '管理';
-$labels['shortacla'] = '管理';
+
 $labels['aclfull'] = '完全な制御';
 $labels['aclother'] = 'その他';
-$labels['shortaclother'] = 'その他';
 $labels['aclread'] = '読み込み';
-$labels['shortaclr'] = '読み込み';
-$labels['shortaclread'] = '読み込み';
 $labels['aclwrite'] = '書き込み';
-$labels['shortaclw'] = '書き込み';
-$labels['shortaclwrite'] = '書き込み';
 $labels['acldelete'] = '削除';
-$labels['shortacld'] = '削除';
-$labels['shortaclt'] = '削除';
-$labels['shortacldelete'] = '削除';
+
+$labels['shortacll'] = '検索';
+$labels['shortaclr'] = '読み込み';
 $labels['shortacls'] = '保持';
+$labels['shortaclw'] = '書き込み';
 $labels['shortacli'] = '挿入';
+$labels['shortaclp'] = '投稿';
 $labels['shortaclc'] = '作成';
 $labels['shortaclk'] = '作成';
+$labels['shortacld'] = '削除';
+$labels['shortaclt'] = '削除';
+$labels['shortacle'] = '抹消';
 $labels['shortaclx'] = 'フォルダーの削除';
+$labels['shortacla'] = '管理';
+
+$labels['shortaclother'] = 'その他';
+$labels['shortaclread'] = '読み込み';
+$labels['shortaclwrite'] = '書き込み';
+$labels['shortacldelete'] = '削除';
+
 $labels['longacll'] = 'フォルダーをリストに見えるようにして登録可能:';
 $labels['longaclr'] = 'フォルダーを読むことを可能';
-$labels['longaclread'] = 'フォルダーを読むことを可能';
 $labels['longacls'] = 'メッセージの既読のフラッグの変更を可能';
 $labels['longaclw'] = '既読と削除のフラッグを除く、メッセージのフラッグとキーワードの変更を可能';
 $labels['longacli'] = 'メッセージに書き込みとフォルダーへの複製を可能';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'メッセージの削除フラッグの変更を可能';
 $labels['longacle'] = 'メッセージの抹消を可能';
 $labels['longaclx'] = 'このフォルダーの削除や名前の変更を可能';
 $labels['longacla'] = 'フォルダーのアクセス権の変更を可能';
+
 $labels['longaclfull'] = 'フォルダーの管理を含めた完全な制御を可能';
+$labels['longaclread'] = 'フォルダーを読むことを可能';
 $labels['longaclwrite'] = 'メッセージにマークの設定、書き込み、フォルダーに複製を可能';
 $labels['longacldelete'] = 'メッセージの削除を可能';
-$labels['deleting'] = 'アクセス権を削除中...';
-$labels['saving'] = 'アクセス権を保存中...';
-$labels['updatesuccess'] = 'アクセス権を変更しました。';
-$labels['deletesuccess'] = 'アクセス権を削除しました。';
-$labels['createsuccess'] = 'アクセス権を追加しました。';
-$labels['updateerror'] = 'アクセス権を更新できません。';
-$labels['deleteerror'] = 'アクセス権を削除できません。';
-$labels['createerror'] = 'アクセス権を追加できません。';
-$labels['deleteconfirm'] = '選択したユーザーのアクセス件を本当に削除したいですか?';
-$labels['norights'] = '何の権限も指定されていません!';
-$labels['nouser'] = 'ユーザー名を指定していません!';
 
+$messages['deleting'] = 'アクセス権を削除中...';
+$messages['saving'] = 'アクセス権を保存中...';
+$messages['updatesuccess'] = 'アクセス権を変更しました。';
+$messages['deletesuccess'] = 'アクセス権を削除しました。';
+$messages['createsuccess'] = 'アクセス権を追加しました。';
+$messages['updateerror'] = 'アクセス権を更新できません。';
+$messages['deleteerror'] = 'アクセス権を削除できません。';
+$messages['createerror'] = 'アクセス権を追加できません。';
+$messages['deleteconfirm'] = '選択したユーザーのアクセス件を本当に削除したいですか?';
+$messages['norights'] = '何の権限も指定されていません!';
+$messages['nouser'] = 'ユーザー名を指定していません!';
+
+?>
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
index 54f7d40..85e3372 100644
--- a/plugins/acl/localization/ko_KR.inc
+++ b/plugins/acl/localization/ko_KR.inc
@@ -2,54 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim at gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $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'] = '식별자';
+
+$labels['acll'] = 'Lookup';
+$labels['aclr'] = 'Read messages';
 $labels['acls'] = '읽은 상태로 유지';
+$labels['aclw'] = 'Write flags';
+$labels['acli'] = 'Insert (Copy into)';
 $labels['aclp'] = '게시';
-$labels['shortaclp'] = '게시';
 $labels['aclc'] = '하위 폴더 만들기';
 $labels['aclk'] = '하위 폴더 만들기';
 $labels['acld'] = '메시지 삭제';
 $labels['aclt'] = '메시지 삭제';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = '폴더 삭제';
 $labels['acla'] = '관리자';
-$labels['shortacla'] = '관리자';
+
+$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'] = '게시';
+$labels['shortaclc'] = 'Create';
+$labels['shortaclk'] = 'Create';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = '폴더 삭제';
+$labels['shortacla'] = '관리자';
+
+$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'] = '폴더에 메시지를 복사하거나 작성할 수 있음';
 $labels['longaclp'] = '이 폴더로 메시지를 게시할 수 있음';
 $labels['longaclc'] = '이 폴더의 바로 밑에 폴더를 생성(또는 이름 변경)할 수 있음';
 $labels['longaclk'] = '이 폴더의 바로 밑에 폴더를 생성(또는 이름 변경)할 수 있음';
 $labels['longacld'] = '메시지 삭제 플래그가 변경될 수 있음';
 $labels['longaclt'] = '메시지 삭제 플래그가 변경될 수 있음';
+$labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = '폴더를 삭제하거나 이름 변경 할 수 있음';
 $labels['longacla'] = '폴더의 접근 권한을 변경할 수 있음';
+
 $labels['longaclfull'] = '폴더 관리를 포함한 모든 제어권';
+$labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = '메시지에 표시하거나, 폴더로 메시지를 복사하거나 작성할 수 있음';
 $labels['longacldelete'] = '메시지를 삭제할 수 있음';
-$labels['deleting'] = '접근 권한 삭제 중...';
-$labels['saving'] = '접근 권한 저장 중...';
-$labels['updatesuccess'] = '접근 권한을 변경하는데 성공 함.';
-$labels['deletesuccess'] = '접근 권한을 삭제하는데 성공 함.';
-$labels['createsuccess'] = '접근 권한을 추가하는데 성공 함.';
-$labels['updateerror'] = '접근 권한을 갱신할 수 없음.';
-$labels['deleteerror'] = '접근 권한을 삭제할 수 없음.';
-$labels['createerror'] = '접근 권한을 추가할 수 없음.';
-$labels['deleteconfirm'] = '선택한 사용자(들)의 접근 권한을 삭제하고자 하는 것이 확실 합니까?';
-$labels['norights'] = '지정된 권한이 없음!';
-$labels['nouser'] = '지정된 username이 없음!';
 
+$messages['deleting'] = '접근 권한 삭제 중...';
+$messages['saving'] = '접근 권한 저장 중...';
+$messages['updatesuccess'] = '접근 권한을 변경하는데 성공 함.';
+$messages['deletesuccess'] = '접근 권한을 삭제하는데 성공 함.';
+$messages['createsuccess'] = '접근 권한을 추가하는데 성공 함.';
+$messages['updateerror'] = '접근 권한을 갱신할 수 없음.';
+$messages['deleteerror'] = '접근 권한을 삭제할 수 없음.';
+$messages['createerror'] = '접근 권한을 추가할 수 없음.';
+$messages['deleteconfirm'] = '선택한 사용자(들)의 접근 권한을 삭제하고자 하는 것이 확실 합니까?';
+$messages['norights'] = '지정된 권한이 없음!';
+$messages['nouser'] = '지정된 username이 없음!';
+
+?>
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index d43dd2e..6507504 100644
--- a/plugins/acl/localization/lt_LT.inc
+++ b/plugins/acl/localization/lt_LT.inc
@@ -2,67 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Linvydas Lapinskas <win0lin1 at gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Dalinimasis';
 $labels['myrights'] = 'Prieigos teisÄ—s';
 $labels['username'] = 'Vartotojas:';
 $labels['advanced'] = 'pažengusio vartotojo rėžimas';
 $labels['newuser'] = 'Pridėti įrašą';
+$labels['actions'] = 'Prieigos teisių veiksmai...';
 $labels['anyone'] = 'Visi vartotojai (bet kas)';
 $labels['anonymous'] = 'Svečias (anonimas)';
 $labels['identifier'] = 'Identifikatorius';
+
 $labels['acll'] = 'Paieška';
-$labels['shortacll'] = 'Paieška';
 $labels['aclr'] = 'Perskaityti pranešimus';
+$labels['acls'] = 'Palikti būseną "Žiūrėtas"';
 $labels['aclw'] = 'Įrašyti vėliavėles';
 $labels['acli'] = 'Įterpti (kopijuoti į)';
 $labels['aclp'] = 'Įrašas';
-$labels['shortaclp'] = 'Įrašas';
 $labels['aclc'] = 'Kurti poaplankius';
 $labels['aclk'] = 'Kurti poaplankius';
 $labels['acld'] = 'Ištrinti žinutes';
 $labels['aclt'] = 'Ištrinti žinutes';
+$labels['acle'] = 'IÅ¡braukti';
 $labels['aclx'] = 'IÅ¡trinti aplankÄ…';
+$labels['acla'] = 'Valdyti';
+
+$labels['aclfull'] = 'Visiška kontrolė';
 $labels['aclother'] = 'Kita';
-$labels['shortaclother'] = 'Kita';
 $labels['aclread'] = 'Skaityti';
-$labels['shortaclr'] = 'Skaityti';
-$labels['shortaclread'] = 'Skaityti';
 $labels['aclwrite'] = 'Įrašyti';
-$labels['shortaclw'] = 'Įrašyti';
-$labels['shortaclwrite'] = 'Įrašyti';
 $labels['acldelete'] = 'Trinti';
-$labels['shortacld'] = 'Trinti';
-$labels['shortaclt'] = 'Trinti';
-$labels['shortacldelete'] = 'Trinti';
+
+$labels['shortacll'] = 'Paieška';
+$labels['shortaclr'] = 'Skaityti';
 $labels['shortacls'] = 'Palikti';
+$labels['shortaclw'] = 'Įrašyti';
 $labels['shortacli'] = 'Įterpti';
+$labels['shortaclp'] = 'Įrašas';
 $labels['shortaclc'] = 'Sukurti';
 $labels['shortaclk'] = 'Sukurti';
+$labels['shortacld'] = 'Trinti';
+$labels['shortaclt'] = 'Trinti';
+$labels['shortacle'] = 'IÅ¡braukti';
 $labels['shortaclx'] = 'IÅ¡trinti aplankÄ…';
+$labels['shortacla'] = 'Valdyti';
+
+$labels['shortaclother'] = 'Kita';
+$labels['shortaclread'] = 'Skaityti';
+$labels['shortaclwrite'] = 'Įrašyti';
+$labels['shortacldelete'] = 'Trinti';
+
+$labels['longacll'] = 'Aplankas yra matomas sąrašuose ir gali būti prenumeruojamas';
+$labels['longaclr'] = 'Aplanką galima peržiūrėti';
+$labels['longacls'] = 'Pranešimų vėliavėlė "Matyta" gali būti pakeista';
+$labels['longaclw'] = 'Pranešimų vėliavėlės ir raktažodžiai gali būti pakeisti, išskyrus "Matytas" ir "Ištrintas"';
 $labels['longacli'] = 'Pranešimai gali būti įrašyti arba nukopijuoti į aplanką';
+$labels['longaclp'] = 'Messages can be posted to this folder';
+$labels['longaclc'] = 'Nauji aplankai gali būti kuriami (arba pervadinami) šioje direktorijoje';
+$labels['longaclk'] = 'Nauji aplankai gali būti kuriami (arba pervadinami) šioje direktorijoje';
+$labels['longacld'] = 'Pranešimų vėliavėlė "Ištrintas" gali būti pakeista';
+$labels['longaclt'] = 'Pranešimų vėliavėlė "Ištrintas" gali būti pakeista';
 $labels['longacle'] = 'Pranešimai gali būti išbraukti';
 $labels['longaclx'] = 'Aplankas gali būti pašalintas arba pervadintas';
+$labels['longacla'] = 'Aplanko prieigos teisės gali būti pakeistos';
+
 $labels['longaclfull'] = 'Visiška kontrolė įskaitant aplanko administravimą';
+$labels['longaclread'] = 'Aplanką galima peržiūrėti';
 $labels['longaclwrite'] = 'Pranešimai gali būti pažymėti, įrašyti arba nukopijuoti į aplanką';
 $labels['longacldelete'] = 'Pranešimai gali būti ištrinti';
-$labels['deleting'] = 'Panaikinamos prieigos teisÄ—s';
-$labels['saving'] = 'IÅ¡saugomos prieigos teisÄ—s';
-$labels['updatesuccess'] = 'Prieigos teisÄ—s sÄ—kmingai pakeistos';
-$labels['deletesuccess'] = 'Prieigos teisÄ—s sÄ—kmingai panaikintos';
-$labels['createsuccess'] = 'Prieigos teisÄ—s sÄ—kmingai pridÄ—tos';
-$labels['updateerror'] = 'Neįmanoma atnaujinti prieigos teises';
-$labels['deleteerror'] = 'Neįmanoma panaikinti prieigos teises';
-$labels['createerror'] = 'Neišeina pridėti prieigos teises';
 
+$messages['deleting'] = 'Panaikinamos prieigos teisÄ—s';
+$messages['saving'] = 'IÅ¡saugomos prieigos teisÄ—s';
+$messages['updatesuccess'] = 'Prieigos teisÄ—s sÄ—kmingai pakeistos';
+$messages['deletesuccess'] = 'Prieigos teisÄ—s sÄ—kmingai panaikintos';
+$messages['createsuccess'] = 'Prieigos teisÄ—s sÄ—kmingai pridÄ—tos';
+$messages['updateerror'] = 'Neįmanoma atnaujinti prieigos teises';
+$messages['deleteerror'] = 'Neįmanoma panaikinti prieigos teises';
+$messages['createerror'] = 'Neišeina pridėti prieigos teises';
+$messages['deleteconfirm'] = 'Ar jūs esate įsitikinę, jog norite panaikinti prieigos teises pažymėtiems vartotojams(-ui)?';
+$messages['norights'] = 'Nenurodytos jokios teisÄ—s!';
+$messages['nouser'] = 'Nenurodytas joks vartotojas!';
+
+?>
diff --git a/plugins/acl/localization/nb_NO.inc b/plugins/acl/localization/nb_NO.inc
index 0ff45fd..2617157 100644
--- a/plugins/acl/localization/nb_NO.inc
+++ b/plugins/acl/localization/nb_NO.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen at gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Tilgangsrettigheter';
 $labels['username'] = 'Bruker:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Valg for tilgangsrettigheter.';
 $labels['anyone'] = 'Alle brukere (alle)';
 $labels['anonymous'] = 'Gjester (anonyme)';
 $labels['identifier'] = 'Identifikator';
+
 $labels['acll'] = 'Oppslag';
-$labels['shortacll'] = 'Oppslag';
 $labels['aclr'] = 'Les meldinger';
 $labels['acls'] = 'Behold lesestatus';
 $labels['aclw'] = 'Lagre flagg';
 $labels['acli'] = 'Lim inn';
 $labels['aclp'] = 'Post';
-$labels['shortaclp'] = 'Post';
 $labels['aclc'] = 'Opprett undermapper';
 $labels['aclk'] = 'Opprett undermapper';
 $labels['acld'] = 'Slett meldinger';
 $labels['aclt'] = 'Slett meldinger';
 $labels['acle'] = 'Slett fullstendig';
-$labels['shortacle'] = 'Slett fullstendig';
 $labels['aclx'] = 'Slett mappe';
 $labels['acla'] = 'Administrer';
-$labels['shortacla'] = 'Administrer';
+
 $labels['aclfull'] = 'Full kontroll';
 $labels['aclother'] = 'Annet';
-$labels['shortaclother'] = 'Annet';
 $labels['aclread'] = 'Les';
-$labels['shortaclr'] = 'Les';
-$labels['shortaclread'] = 'Les';
 $labels['aclwrite'] = 'Skriv';
-$labels['shortaclw'] = 'Skriv';
-$labels['shortaclwrite'] = 'Skriv';
 $labels['acldelete'] = 'Slett';
-$labels['shortacld'] = 'Slett';
-$labels['shortaclt'] = 'Slett';
-$labels['shortacldelete'] = 'Slett';
+
+$labels['shortacll'] = 'Oppslag';
+$labels['shortaclr'] = 'Les';
 $labels['shortacls'] = 'Behold';
+$labels['shortaclw'] = 'Skriv';
 $labels['shortacli'] = 'Sett inn';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Opprett';
 $labels['shortaclk'] = 'Opprett';
+$labels['shortacld'] = 'Slett';
+$labels['shortaclt'] = 'Slett';
+$labels['shortacle'] = 'Slett fullstendig';
 $labels['shortaclx'] = 'Slett mappe';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Annet';
+$labels['shortaclread'] = 'Les';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Slett';
+
 $labels['longacll'] = 'Mappen er synlig og kan abonneres på';
 $labels['longaclr'] = 'Mappen kan åpnes for lesing';
-$labels['longaclread'] = 'Mappen kan åpnes for lesing';
 $labels['longacls'] = 'Meldingenes lesestatusflagg kan endres';
 $labels['longaclw'] = 'Meldingsflagg og -nøkkelord kan endres, bortsett fra status for lesing og sletting';
 $labels['longacli'] = 'Meldinger kan lagres eller kopieres til mappen';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Meldingenes flagg for sletting kan endres';
 $labels['longacle'] = 'Meldingen kan slettes for godt';
 $labels['longaclx'] = 'Mappen kan slettes eller gis nytt navn';
 $labels['longacla'] = 'Mappens tilgangsrettigheter kan endres';
+
 $labels['longaclfull'] = 'Full kontroll, inkludert mappeadministrasjon';
+$labels['longaclread'] = 'Mappen kan åpnes for lesing';
 $labels['longaclwrite'] = 'Meldinger kan merkes, lagres i eller flyttes til mappen';
 $labels['longacldelete'] = 'Meldingen kan slettes';
-$labels['deleting'] = 'Sletter tilgangsrettigheter';
-$labels['saving'] = 'Lagrer tilgangsrettigheter';
-$labels['updatesuccess'] = 'Tilgangsrettigheter ble endret';
-$labels['deletesuccess'] = 'Tilgangsrettigheter ble slettet';
-$labels['createsuccess'] = 'Tilgangsrettigheter ble lagt til';
-$labels['updateerror'] = 'Kunne ikke oppdatere tilgangsrettigheter';
-$labels['deleteerror'] = 'Kunne ikke fjerne tilgangsrettigheter';
-$labels['createerror'] = 'Kunne ikke legge til tilgangsrettigheter';
-$labels['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valgte brukere';
-$labels['norights'] = 'Ingen rettigheter er spesifisert!';
-$labels['nouser'] = 'Brukernavn er ikke spesifisert!';
 
+$messages['deleting'] = 'Sletter tilgangsrettigheter';
+$messages['saving'] = 'Lagrer tilgangsrettigheter';
+$messages['updatesuccess'] = 'Tilgangsrettigheter ble endret';
+$messages['deletesuccess'] = 'Tilgangsrettigheter ble slettet';
+$messages['createsuccess'] = 'Tilgangsrettigheter ble lagt til';
+$messages['updateerror'] = 'Kunne ikke oppdatere tilgangsrettigheter';
+$messages['deleteerror'] = 'Kunne ikke fjerne tilgangsrettigheter';
+$messages['createerror'] = 'Kunne ikke legge til tilgangsrettigheter';
+$messages['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valgte brukere';
+$messages['norights'] = 'Ingen rettigheter er spesifisert!';
+$messages['nouser'] = 'Brukernavn er ikke spesifisert!';
+
+?>
diff --git a/plugins/acl/localization/nl_NL.inc b/plugins/acl/localization/nl_NL.inc
index 68dcc7f..b5ca0c3 100644
--- a/plugins/acl/localization/nl_NL.inc
+++ b/plugins/acl/localization/nl_NL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Delen';
 $labels['myrights'] = 'Toegangsrechten';
 $labels['username'] = 'Gebruiker:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Toegangsrechtenopties...';
 $labels['anyone'] = 'Alle gebruikers (iedereen)';
 $labels['anonymous'] = 'Gasten (anoniem)';
 $labels['identifier'] = 'Identificatie';
+
 $labels['acll'] = 'Opzoeken';
-$labels['shortacll'] = 'Opzoeken';
 $labels['aclr'] = 'Berichten lezen';
 $labels['acls'] = 'Onthoud gelezen-status';
 $labels['aclw'] = 'Markeringen instellen';
-$labels['acli'] = 'Invoergen (kopiëren naar)';
+$labels['acli'] = 'Invoegen (kopiëren naar)';
 $labels['aclp'] = 'Plaatsen';
-$labels['shortaclp'] = 'Plaatsen';
 $labels['aclc'] = 'Submappen aanmaken';
 $labels['aclk'] = 'Submappen aanmaken';
 $labels['acld'] = 'Berichten verwijderen';
 $labels['aclt'] = 'Berichten verwijderen';
 $labels['acle'] = 'Vernietigen';
-$labels['shortacle'] = 'Vernietigen';
 $labels['aclx'] = 'Map verwijderen';
 $labels['acla'] = 'Beheren';
-$labels['shortacla'] = 'Beheren';
+
 $labels['aclfull'] = 'Volledige toegang';
 $labels['aclother'] = 'Overig';
-$labels['shortaclother'] = 'Overig';
 $labels['aclread'] = 'Lezen';
-$labels['shortaclr'] = 'Lezen';
-$labels['shortaclread'] = 'Lezen';
 $labels['aclwrite'] = 'Schrijven';
-$labels['shortaclw'] = 'Schrijven';
-$labels['shortaclwrite'] = 'Schrijven';
 $labels['acldelete'] = 'Verwijderen';
-$labels['shortacld'] = 'Verwijderen';
-$labels['shortaclt'] = 'Verwijderen';
-$labels['shortacldelete'] = 'Verwijderen';
+
+$labels['shortacll'] = 'Opzoeken';
+$labels['shortaclr'] = 'Lezen';
 $labels['shortacls'] = 'Behouden';
+$labels['shortaclw'] = 'Schrijven';
 $labels['shortacli'] = 'Invoegen';
+$labels['shortaclp'] = 'Plaatsen';
 $labels['shortaclc'] = 'Aanmaken';
 $labels['shortaclk'] = 'Aanmaken';
+$labels['shortacld'] = 'Verwijderen';
+$labels['shortaclt'] = 'Verwijderen';
+$labels['shortacle'] = 'Vernietigen';
 $labels['shortaclx'] = 'Map verwijderen';
+$labels['shortacla'] = 'Beheren';
+
+$labels['shortaclother'] = 'Overig';
+$labels['shortaclread'] = 'Lezen';
+$labels['shortaclwrite'] = 'Schrijven';
+$labels['shortacldelete'] = 'Verwijderen';
+
 $labels['longacll'] = 'De map is zichtbaar in lijsten en het is mogelijk om te abonneren op deze map';
 $labels['longaclr'] = 'De map kan geopend worden om te lezen';
-$labels['longaclread'] = 'De map kan geopend worden om te lezen';
 $labels['longacls'] = 'De berichtmarkering \'Gelezen\' kan aangepast worden';
 $labels['longaclw'] = 'Berichtmarkeringen en labels kunnen aangepast worden, behalve \'Gelezen\' en \'Verwijderd\'';
 $labels['longacli'] = 'Berichten kunnen opgesteld worden of gekopieerd worden naar deze map';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'De berichtmarkering \'Verwijderd\' kan aangepast worden';
 $labels['longacle'] = 'Berichten kunnen vernietigd worden';
 $labels['longaclx'] = 'De map kan verwijderd of hernoemd worden';
 $labels['longacla'] = 'De toegangsrechten voor deze map kunnen veranderd worden';
+
 $labels['longaclfull'] = 'Volledige controle inclusief mappenbeheer';
+$labels['longaclread'] = 'De map kan geopend worden om te lezen';
 $labels['longaclwrite'] = 'Berichten kunnen gemarkeerd worden, opgesteld worden of gekopieerd worden naar deze map';
 $labels['longacldelete'] = 'Berichten kunnen verwijderd worden';
-$labels['deleting'] = 'Toegangsrechten worden verwijderd...';
-$labels['saving'] = 'Toegangsrechten worden opgeslagen...';
-$labels['updatesuccess'] = 'Toegangsrechten succesvol veranderd';
-$labels['deletesuccess'] = 'Toegangsrechten succesvol verwijderd';
-$labels['createsuccess'] = 'Toegangsrechten succesvol toegevoegd';
-$labels['updateerror'] = 'Toegangsrechten kunnen niet bijgewerkt worden';
-$labels['deleteerror'] = 'Toegangsrechten kunnen niet verwijderd worden';
-$labels['createerror'] = 'Toegangsrechten kunnen niet toegevoegd worden';
-$labels['deleteconfirm'] = 'Weet u zeker dat u de toegangsrechten van de geselecteerde gebruiker(s) wilt verwijderen?';
-$labels['norights'] = 'Er zijn geen toegangsrechten opgegeven!';
-$labels['nouser'] = 'Er is geen gebruikersnaam opgegeven!';
 
+$messages['deleting'] = 'Toegangsrechten worden verwijderd...';
+$messages['saving'] = 'Toegangsrechten worden opgeslagen...';
+$messages['updatesuccess'] = 'Toegangsrechten succesvol veranderd';
+$messages['deletesuccess'] = 'Toegangsrechten succesvol verwijderd';
+$messages['createsuccess'] = 'Toegangsrechten succesvol toegevoegd';
+$messages['updateerror'] = 'Toegangsrechten kunnen niet bijgewerkt worden';
+$messages['deleteerror'] = 'Toegangsrechten kunnen niet verwijderd worden';
+$messages['createerror'] = 'Toegangsrechten kunnen niet toegevoegd worden';
+$messages['deleteconfirm'] = 'Weet u zeker dat u de toegangsrechten van de geselecteerde gebruiker(s) wilt verwijderen?';
+$messages['norights'] = 'Er zijn geen toegangsrechten opgegeven!';
+$messages['nouser'] = 'Er is geen gebruikersnaam opgegeven!';
+
+?>
diff --git a/plugins/acl/localization/nn_NO.inc b/plugins/acl/localization/nn_NO.inc
index 5930fcf..743d2c8 100644
--- a/plugins/acl/localization/nn_NO.inc
+++ b/plugins/acl/localization/nn_NO.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen at gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Tilgangsrettar';
 $labels['username'] = 'Brukar:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Val for tilgangsrettar...';
 $labels['anyone'] = 'Alle brukarar (alle)';
 $labels['anonymous'] = 'Gjester (anonyme)';
 $labels['identifier'] = 'Identifikator';
+
 $labels['acll'] = 'Oppslag';
-$labels['shortacll'] = 'Oppslag';
 $labels['aclr'] = 'Les meldingar';
 $labels['acls'] = 'Behald lesestatus';
 $labels['aclw'] = 'Skriveflagg';
 $labels['acli'] = 'Lim inn';
 $labels['aclp'] = 'Post';
-$labels['shortaclp'] = 'Post';
 $labels['aclc'] = 'Opprett undermapper';
 $labels['aclk'] = 'Opprett undermapper';
 $labels['acld'] = 'Slett meldingar';
 $labels['aclt'] = 'Slett meldingar';
 $labels['acle'] = 'Slett fullstendig';
-$labels['shortacle'] = 'Slett fullstendig';
 $labels['aclx'] = 'Slett mappe';
 $labels['acla'] = 'Administrér';
-$labels['shortacla'] = 'Administrér';
+
 $labels['aclfull'] = 'Full kontroll';
 $labels['aclother'] = 'Anna';
-$labels['shortaclother'] = 'Anna';
 $labels['aclread'] = 'Les';
-$labels['shortaclr'] = 'Les';
-$labels['shortaclread'] = 'Les';
 $labels['aclwrite'] = 'Skriv';
-$labels['shortaclw'] = 'Skriv';
-$labels['shortaclwrite'] = 'Skriv';
 $labels['acldelete'] = 'Slett';
-$labels['shortacld'] = 'Slett';
-$labels['shortaclt'] = 'Slett';
-$labels['shortacldelete'] = 'Slett';
+
+$labels['shortacll'] = 'Oppslag';
+$labels['shortaclr'] = 'Les';
 $labels['shortacls'] = 'Behald';
+$labels['shortaclw'] = 'Skriv';
 $labels['shortacli'] = 'Sett inn';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Opprett';
 $labels['shortaclk'] = 'Opprett';
+$labels['shortacld'] = 'Slett';
+$labels['shortaclt'] = 'Slett';
+$labels['shortacle'] = 'Slett fullstendig';
 $labels['shortaclx'] = 'Slett mappe';
+$labels['shortacla'] = 'Administrér';
+
+$labels['shortaclother'] = 'Anna';
+$labels['shortaclread'] = 'Les';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Slett';
+
 $labels['longacll'] = 'Mappa er synleg og kan abonnerast på';
 $labels['longaclr'] = 'Mappa kan opnast for lesing';
-$labels['longaclread'] = 'Mappa kan opnast for lesing';
 $labels['longacls'] = 'Meldingane sine lesestatusflagg kan endrast';
 $labels['longaclw'] = 'Meldingsflagg og -nøkkelord kan endrast, bortsett frå status for lesing og sletting';
 $labels['longacli'] = 'Meldingar kan lagrast eller kopierast til mappa';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Meldingane sine flagg for sletting kan endrast';
 $labels['longacle'] = 'Meldinga kan slettast for godt';
 $labels['longaclx'] = 'Mappa kan slettast eller få nytt namn';
 $labels['longacla'] = 'Mappa sine tilgangsrettar kan endrast';
+
 $labels['longaclfull'] = 'Full kontroll, inkludert mappeadministrasjon';
+$labels['longaclread'] = 'Mappa kan opnast for lesing';
 $labels['longaclwrite'] = 'Meldingar kan merkast, lagrast i eller flyttast til mappa';
 $labels['longacldelete'] = 'Meldinga kan slettast';
-$labels['deleting'] = 'Slettar tilgangsrettar…';
-$labels['saving'] = 'Lagrar tilgangsrettar…';
-$labels['updatesuccess'] = 'Tilgangsrettiar vart endra';
-$labels['deletesuccess'] = 'Tilgangsretter vart sletta';
-$labels['createsuccess'] = 'Tilgangsrettar vart legne til';
-$labels['updateerror'] = 'Kunne ikkje oppdatere tilgangsrettar';
-$labels['deleteerror'] = 'Kunne ikkje fjerne tilgangsrettar';
-$labels['createerror'] = 'Kunne ikkje leggje til tilgangsrettar';
-$labels['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valde brukarar?';
-$labels['norights'] = 'Ingen rettar er spesifisert!';
-$labels['nouser'] = 'Brukarnamn er ikkje spesifisert!';
 
+$messages['deleting'] = 'Slettar tilgangsrettar…';
+$messages['saving'] = 'Lagrar tilgangsrettar…';
+$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?';
+$messages['norights'] = 'Ingen rettar er spesifisert!';
+$messages['nouser'] = 'Brukarnamn er ikkje spesifisert!';
+
+?>
diff --git a/plugins/acl/localization/pl_PL.inc b/plugins/acl/localization/pl_PL.inc
index b8007f0..73c0fc4 100644
--- a/plugins/acl/localization/pl_PL.inc
+++ b/plugins/acl/localization/pl_PL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Udostępnianie';
 $labels['myrights'] = 'Prawa dostępu';
 $labels['username'] = 'Użytkownik:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Akcje na prawach...';
 $labels['anyone'] = 'Wszyscy (anyone)';
 $labels['anonymous'] = 'Goście (anonymous)';
 $labels['identifier'] = 'Identyfikator';
+
 $labels['acll'] = 'PodglÄ…d';
-$labels['shortacll'] = 'PodglÄ…d';
 $labels['aclr'] = 'Odczyt (Read)';
 $labels['acls'] = 'Zmiana stanu wiadomości (Keep)';
 $labels['aclw'] = 'Zmiana flag wiadomości (Write)';
 $labels['acli'] = 'Dodawanie/Kopiowanie do (Insert)';
 $labels['aclp'] = 'Wysyłanie';
-$labels['shortaclp'] = 'Wysyłanie';
 $labels['aclc'] = 'Tworzenie podfolderów (Create)';
 $labels['aclk'] = 'Tworzenie podfolderów (Create)';
 $labels['acld'] = 'Usuwanie wiadomości (Delete)';
 $labels['aclt'] = 'Usuwanie wiadomości (Delete)';
 $labels['acle'] = 'PorzÄ…dkowanie';
-$labels['shortacle'] = 'PorzÄ…dkowanie';
 $labels['aclx'] = 'Usuwanie folderu (Delete)';
 $labels['acla'] = 'Administracja';
-$labels['shortacla'] = 'Administracja';
+
 $labels['aclfull'] = 'Wszystkie';
 $labels['aclother'] = 'Pozostałe';
-$labels['shortaclother'] = 'Pozostałe';
 $labels['aclread'] = 'Odczyt';
-$labels['shortaclr'] = 'Odczyt';
-$labels['shortaclread'] = 'Odczyt';
 $labels['aclwrite'] = 'Zapis';
-$labels['shortaclw'] = 'Zapis';
-$labels['shortaclwrite'] = 'Zapis';
 $labels['acldelete'] = 'Usuwanie';
-$labels['shortacld'] = 'Usuwanie';
-$labels['shortaclt'] = 'Usuwanie';
-$labels['shortacldelete'] = 'Usuwanie';
+
+$labels['shortacll'] = 'PodglÄ…d';
+$labels['shortaclr'] = 'Odczyt';
 $labels['shortacls'] = 'Zmiana';
+$labels['shortaclw'] = 'Zapis';
 $labels['shortacli'] = 'Dodawanie';
+$labels['shortaclp'] = 'Wysyłanie';
 $labels['shortaclc'] = 'Tworzenie';
 $labels['shortaclk'] = 'Tworzenie';
+$labels['shortacld'] = 'Usuwanie';
+$labels['shortaclt'] = 'Usuwanie';
+$labels['shortacle'] = 'PorzÄ…dkowanie';
 $labels['shortaclx'] = 'Usuwanie folderu';
+$labels['shortacla'] = 'Administracja';
+
+$labels['shortaclother'] = 'Pozostałe';
+$labels['shortaclread'] = 'Odczyt';
+$labels['shortaclwrite'] = 'Zapis';
+$labels['shortacldelete'] = 'Usuwanie';
+
 $labels['longacll'] = 'Pozwala na subskrybowanie folderu i powoduje, że jest on widoczny na liście';
 $labels['longaclr'] = 'Folder może być otwarty w trybie do odczytu';
-$labels['longaclread'] = 'Folder może być otwarty w trybie do odczytu';
 $labels['longacls'] = 'Pozwala na zmienę stanu wiadomości';
 $labels['longaclw'] = 'Pozwala zmieniać wszystkie flagi wiadomości, oprócz "Przeczytano" i "Usunięto';
 $labels['longacli'] = 'Pozwala zapisywać wiadomości i kopiować do folderu';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Pozwala zmianiać flagę "Usunięto" wiadomości';
 $labels['longacle'] = 'Pozwala na usuwanie wiadomości oznaczonych do usunięcia';
 $labels['longaclx'] = 'Pozwala na zmianę nazwy lub usunięcie folderu';
 $labels['longacla'] = 'Pozwala na zmiane praw dostępu do folderu';
+
 $labels['longaclfull'] = 'Pełna kontrola włącznie z administrowaniem folderem';
+$labels['longaclread'] = 'Folder może być otwarty w trybie do odczytu';
 $labels['longaclwrite'] = 'Wiadomości mogą być oznaczane, zapisywane i kopiowane do folderu';
 $labels['longacldelete'] = 'Wiadomości mogą być usuwane';
-$labels['deleting'] = 'Usuwanie praw dostępu...';
-$labels['saving'] = 'Zapisywanie praw dostępu...';
-$labels['updatesuccess'] = 'Pomyślnie zmieniono prawa dostępu';
-$labels['deletesuccess'] = 'Pomyślnie usunięto prawa dostępu';
-$labels['createsuccess'] = 'Pomyślnie dodano prawa dostępu';
-$labels['updateerror'] = 'Nie udało się zmienić praw dostępu';
-$labels['deleteerror'] = 'Nie udało się usunąć praw dostępu';
-$labels['createerror'] = 'Nie udało się dodać praw dostępu';
-$labels['deleteconfirm'] = 'Czy na pewno chcesz usunąć prawa wybranym użytkownikom?';
-$labels['norights'] = 'Nie wybrano praw dostępu!';
-$labels['nouser'] = 'Nie podano nazwy użytkownika!';
 
+$messages['deleting'] = 'Usuwanie praw dostępu...';
+$messages['saving'] = 'Zapisywanie praw dostępu...';
+$messages['updatesuccess'] = 'Pomyślnie zmieniono prawa dostępu';
+$messages['deletesuccess'] = 'Pomyślnie usunięto prawa dostępu';
+$messages['createsuccess'] = 'Pomyślnie dodano prawa dostępu';
+$messages['updateerror'] = 'Nie udało się zmienić praw dostępu';
+$messages['deleteerror'] = 'Nie udało się usunąć praw dostępu';
+$messages['createerror'] = 'Nie udało się dodać praw dostępu';
+$messages['deleteconfirm'] = 'Czy na pewno chcesz usunąć prawa wybranym użytkownikom?';
+$messages['norights'] = 'Nie wybrano praw dostępu!';
+$messages['nouser'] = 'Nie podano nazwy użytkownika!';
+
+?>
diff --git a/plugins/acl/localization/pt_BR.inc b/plugins/acl/localization/pt_BR.inc
index 2e48283..eaf0421 100644
--- a/plugins/acl/localization/pt_BR.inc
+++ b/plugins/acl/localization/pt_BR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf at gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartilhamento';
 $labels['myrights'] = 'Permissões de Acesso';
 $labels['username'] = 'Usuário:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Ações de direito de acesso...';
 $labels['anyone'] = 'Todos os usuários (qualquer um)';
 $labels['anonymous'] = 'Convidados (anônimos)';
 $labels['identifier'] = 'Identificador';
+
 $labels['acll'] = 'Pesquisar';
-$labels['shortacll'] = 'Pesquisar';
 $labels['aclr'] = 'Ler mensagens';
 $labels['acls'] = 'Manter estado de enviado';
 $labels['aclw'] = 'Salvar marcadores';
 $labels['acli'] = 'Inserir (Cópia em)';
 $labels['aclp'] = 'Enviar';
-$labels['shortaclp'] = 'Enviar';
 $labels['aclc'] = 'Criar subpastas';
 $labels['aclk'] = 'Criar subpastas';
 $labels['acld'] = 'Apagar mensagens';
 $labels['aclt'] = 'Apagar mensagens';
 $labels['acle'] = 'Expurgar';
-$labels['shortacle'] = 'Expurgar';
 $labels['aclx'] = 'Apagar pasta';
 $labels['acla'] = 'Administrar';
-$labels['shortacla'] = 'Administrar';
+
 $labels['aclfull'] = 'Controle total';
 $labels['aclother'] = 'Outro';
-$labels['shortaclother'] = 'Outro';
 $labels['aclread'] = 'Ler';
-$labels['shortaclr'] = 'Ler';
-$labels['shortaclread'] = 'Ler';
 $labels['aclwrite'] = 'Salvar';
-$labels['shortaclw'] = 'Salvar';
-$labels['shortaclwrite'] = 'Salvar';
 $labels['acldelete'] = 'Excluir';
-$labels['shortacld'] = 'Excluir';
-$labels['shortaclt'] = 'Excluir';
-$labels['shortacldelete'] = 'Excluir';
+
+$labels['shortacll'] = 'Pesquisar';
+$labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Salvar';
 $labels['shortacli'] = 'Inserir';
+$labels['shortaclp'] = 'Enviar';
 $labels['shortaclc'] = 'Criar';
 $labels['shortaclk'] = 'Criar';
+$labels['shortacld'] = 'Excluir';
+$labels['shortaclt'] = 'Excluir';
+$labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Excluir pasta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Outro';
+$labels['shortaclread'] = 'Ler';
+$labels['shortaclwrite'] = 'Salvar';
+$labels['shortacldelete'] = 'Excluir';
+
 $labels['longacll'] = 'A pasta está visível nas listas e pode ser inscrita para';
 $labels['longaclr'] = 'A pasta pode ser aberta para leitura';
-$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longacls'] = 'Marcador de Mensagem Enviada pode ser modificadas';
 $labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser modificadas, exceto de Enviadas e Excluídas';
 $labels['longacli'] = 'As mensagens podem ser escritas ou copiadas para a pasta';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'O marcador de Mensagens Excluídas podem ser modificadas'
 $labels['longacle'] = 'As mensagens podem ser expurgadas';
 $labels['longaclx'] = 'A pasta pode ser apagada ou renomeada';
 $labels['longacla'] = 'As permissões de acesso da pasta podem ser alteradas';
+
 $labels['longaclfull'] = 'Controle total incluindo a pasta de administração';
+$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, salvas ou copiadas para a pasta';
 $labels['longacldelete'] = 'Mensagens podem ser apagadas';
-$labels['deleting'] = 'Apagando permissões de acesso...';
-$labels['saving'] = 'Salvando permissões de acesso...';
-$labels['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
-$labels['deletesuccess'] = 'Permissões de acesso apagadas com sucesso';
-$labels['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
-$labels['updateerror'] = 'Não foi possível atualizar as permissões de acesso';
-$labels['deleteerror'] = 'Não foi possível apagar as permissões de acesso';
-$labels['createerror'] = 'Não foi possível adicionar as permissões de acesso';
-$labels['deleteconfirm'] = 'Tem certeza que deseja remover as permissões de acesso do(s) usuário(s) delecionado(s)?';
-$labels['norights'] = 'Não foram definidas permissões!';
-$labels['nouser'] = 'Nome de usuário não especificado!';
 
+$messages['deleting'] = 'Apagando permissões de acesso...';
+$messages['saving'] = 'Salvando permissões de acesso...';
+$messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
+$messages['deletesuccess'] = 'Permissões de acesso apagadas com sucesso';
+$messages['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
+$messages['updateerror'] = 'Não foi possível atualizar as permissões de acesso';
+$messages['deleteerror'] = 'Não foi possível apagar as permissões de acesso';
+$messages['createerror'] = 'Não foi possível adicionar as permissões de acesso';
+$messages['deleteconfirm'] = 'Tem certeza que deseja remover as permissões de acesso do(s) usuário(s) delecionado(s)?';
+$messages['norights'] = 'Não foram definidas permissões!';
+$messages['nouser'] = 'Nome de usuário não especificado!';
+
+?>
diff --git a/plugins/acl/localization/pt_PT.inc b/plugins/acl/localization/pt_PT.inc
index 72c595a..9a2e9a3 100644
--- a/plugins/acl/localization/pt_PT.inc
+++ b/plugins/acl/localization/pt_PT.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Partilhar';
 $labels['myrights'] = 'Permissões de acesso';
 $labels['username'] = 'Utilizador:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Acções de permissão de acesso...';
 $labels['anyone'] = 'Todos os utilizadores (todos)';
 $labels['anonymous'] = 'Convidado (anónimo)';
 $labels['identifier'] = 'Identificador';
+
 $labels['acll'] = 'Pesquisar';
-$labels['shortacll'] = 'Pesquisar';
 $labels['aclr'] = 'Ler mensagens';
 $labels['acls'] = 'Manter estado de enviado';
 $labels['aclw'] = 'Guardar marcadores';
 $labels['acli'] = 'Inserir (cópia em)';
 $labels['aclp'] = 'Publicar';
-$labels['shortaclp'] = 'Publicar';
 $labels['aclc'] = 'Criar subpastas';
 $labels['aclk'] = 'Criar subpastas';
 $labels['acld'] = 'Eliminar mensagens';
 $labels['aclt'] = 'Eliminar mensagens';
 $labels['acle'] = 'Eliminar';
-$labels['shortacle'] = 'Eliminar';
 $labels['aclx'] = 'Eliminar pasta';
 $labels['acla'] = 'Administrar';
-$labels['shortacla'] = 'Administrar';
+
 $labels['aclfull'] = 'Controlo total';
 $labels['aclother'] = 'Outro';
-$labels['shortaclother'] = 'Outro';
 $labels['aclread'] = 'Ler';
-$labels['shortaclr'] = 'Ler';
-$labels['shortaclread'] = 'Ler';
 $labels['aclwrite'] = 'Guardar';
-$labels['shortaclw'] = 'Guardar';
-$labels['shortaclwrite'] = 'Guardar';
 $labels['acldelete'] = 'Eliminar';
-$labels['shortacld'] = 'Eliminar';
-$labels['shortaclt'] = 'Eliminar';
-$labels['shortacldelete'] = 'Eliminar';
+
+$labels['shortacll'] = 'Pesquisar';
+$labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Guardar';
 $labels['shortacli'] = 'Inserir';
+$labels['shortaclp'] = 'Publicar';
 $labels['shortaclc'] = 'Criar';
 $labels['shortaclk'] = 'Criar';
+$labels['shortacld'] = 'Eliminar';
+$labels['shortaclt'] = 'Eliminar';
+$labels['shortacle'] = 'Eliminar';
 $labels['shortaclx'] = 'Eliminar pasta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Outro';
+$labels['shortaclread'] = 'Ler';
+$labels['shortaclwrite'] = 'Guardar';
+$labels['shortacldelete'] = 'Eliminar';
+
 $labels['longacll'] = 'A pasta está visível na lista e pode subscrita para';
 $labels['longaclr'] = 'A pasta pode ser aberta para leitura';
-$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longacls'] = 'O marcador de mensagem enviada pode ser alterado';
 $labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser alterados, excepto de Enviadas e Eliminadas';
 $labels['longacli'] = 'As mensagens podem ser escritas e copiadas para a pasta';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'O marcador de mensagens Eliminadas pode ser alterado';
 $labels['longacle'] = 'As mensagens podem ser eliminadas';
 $labels['longaclx'] = 'A pasta pode ser eliminada ou renomeada';
 $labels['longacla'] = 'As permissões de acesso da pasta podem ser alteradas';
+
 $labels['longaclfull'] = 'Controlo total incluindo administração da pasta';
+$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, guardadas ou copiadas para a pasta';
 $labels['longacldelete'] = 'As mensagens podem ser eliminadas';
-$labels['deleting'] = 'A eliminar as permissões de acesso...';
-$labels['saving'] = 'A guardar as permissões de acesso...';
-$labels['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
-$labels['deletesuccess'] = 'Permissões de acesso eliminadas com sucesso';
-$labels['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
-$labels['updateerror'] = 'Não foi possível actualizar as permissões de acesso';
-$labels['deleteerror'] = 'Não foi possível eliminar as permissões de acesso';
-$labels['createerror'] = 'Não foi possível adicionar as permissões de acesso';
-$labels['deleteconfirm'] = 'Tem a certeza que pretende remover as permissões de acesso do(s) utilizador(es) seleccionado(s)?';
-$labels['norights'] = 'Não foram especificadas quaisquer permissões!';
-$labels['nouser'] = 'Não foi especificado nenhum nome de utilizador!';
 
+$messages['deleting'] = 'A eliminar as permissões de acesso...';
+$messages['saving'] = 'A guardar as permissões de acesso...';
+$messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
+$messages['deletesuccess'] = 'Permissões de acesso eliminadas com sucesso';
+$messages['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
+$messages['updateerror'] = 'Não foi possível actualizar as permissões 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)?';
+$messages['norights'] = 'Não foram especificadas quaisquer permissões!';
+$messages['nouser'] = 'Não foi especificado nenhum nome de utilizador!';
+
+?>
diff --git a/plugins/acl/localization/ro_RO.inc b/plugins/acl/localization/ro_RO.inc
index 5d51f39..e87524a 100644
--- a/plugins/acl/localization/ro_RO.inc
+++ b/plugins/acl/localization/ro_RO.inc
@@ -2,51 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Raduta Alex <raduta.alex at gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
+$labels['sharing'] = 'Partajare';
+$labels['myrights'] = 'Drepturi de acces';
 $labels['username'] = 'Utilizator:';
 $labels['advanced'] = 'mod avansat';
 $labels['newuser'] = 'Adăugare intrare';
+$labels['actions'] = 'Acțiunea drepturilor de acces...';
+$labels['anyone'] = 'Toți utilizatori (oricare)';
 $labels['anonymous'] = 'Vizitator';
 $labels['identifier'] = 'Identificator';
+
 $labels['acll'] = 'Caută';
-$labels['shortacll'] = 'Caută';
 $labels['aclr'] = 'Citire mesaje';
+$labels['acls'] = 'Menține starea de Vâzut';
+$labels['aclw'] = 'Indicator scriere';
+$labels['acli'] = 'Inserare (copiere în)';
 $labels['aclp'] = 'Postează';
-$labels['shortaclp'] = 'Postează';
 $labels['aclc'] = 'Creează subdirectoare';
 $labels['aclk'] = 'Creează subdirectoare';
 $labels['acld'] = 'Ștergere mesaje';
 $labels['aclt'] = 'Ștergere mesaje';
 $labels['acle'] = 'Elimină';
-$labels['shortacle'] = 'Elimină';
 $labels['aclx'] = 'Ștergere dosar';
 $labels['acla'] = 'Administrează';
-$labels['shortacla'] = 'Administrează';
+
+$labels['aclfull'] = 'Control complet';
 $labels['aclother'] = 'Altul';
-$labels['shortaclother'] = 'Altul';
 $labels['aclread'] = 'CiteÅŸte';
-$labels['shortaclr'] = 'CiteÅŸte';
-$labels['shortaclread'] = 'CiteÅŸte';
 $labels['aclwrite'] = 'Scrie';
-$labels['shortaclw'] = 'Scrie';
-$labels['shortaclwrite'] = 'Scrie';
 $labels['acldelete'] = 'Șterge';
-$labels['shortacld'] = 'Șterge';
-$labels['shortaclt'] = 'Șterge';
-$labels['shortacldelete'] = 'Șterge';
+
+$labels['shortacll'] = 'Caută';
+$labels['shortaclr'] = 'CiteÅŸte';
 $labels['shortacls'] = 'Păstrează';
+$labels['shortaclw'] = 'Scrie';
 $labels['shortacli'] = 'Inserează';
+$labels['shortaclp'] = 'Postează';
 $labels['shortaclc'] = 'Creează';
 $labels['shortaclk'] = 'Creează';
+$labels['shortacld'] = 'Șterge';
+$labels['shortaclt'] = 'Șterge';
+$labels['shortacle'] = 'Elimină';
+$labels['shortaclx'] = 'Ștergere dosar';
+$labels['shortacla'] = 'Administrează';
+
+$labels['shortaclother'] = 'Altul';
+$labels['shortaclread'] = 'CiteÅŸte';
+$labels['shortaclwrite'] = 'Scrie';
+$labels['shortacldelete'] = 'Șterge';
+
+$labels['longacll'] = 'Dosarul este vizibil pe liste și se poate înscrie pe el';
+$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';
+$labels['longacli'] = 'Mesajul se poate scrie sau copia într-un dosar';
+$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['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...';
+$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['norights'] = 'Nu au fost specificate drepturi!';
+$messages['nouser'] = 'Nu a fost specificat nume de utilizator!';
 
+?>
diff --git a/plugins/acl/localization/ru_RU.inc b/plugins/acl/localization/ru_RU.inc
index f50610a..93eb9ef 100644
--- a/plugins/acl/localization/ru_RU.inc
+++ b/plugins/acl/localization/ru_RU.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan at yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Совместный доступ';
 $labels['myrights'] = 'Права доступа';
 $labels['username'] = 'Пользователь:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Действия с правами доступа...';
 $labels['anyone'] = 'Все пользователи (любые)';
 $labels['anonymous'] = 'Гости (анонимные)';
 $labels['identifier'] = 'Идентификатор';
+
 $labels['acll'] = 'Поиск';
-$labels['shortacll'] = 'Поиск';
 $labels['aclr'] = 'Прочитать сообщения';
 $labels['acls'] = 'Оставить состояние Увидено';
 $labels['aclw'] = 'Флаги записи';
 $labels['acli'] = 'Вставить (копировать в...)';
 $labels['aclp'] = 'Отправить';
-$labels['shortaclp'] = 'Отправить';
 $labels['aclc'] = 'Создать вложенные папки';
 $labels['aclk'] = 'Создать вложенные папки';
 $labels['acld'] = 'Удалить сообщения';
 $labels['aclt'] = 'Удалить сообщения';
 $labels['acle'] = 'Уничтожить сообщения';
-$labels['shortacle'] = 'Уничтожить сообщения';
 $labels['aclx'] = 'Удалить папку';
 $labels['acla'] = 'Администрировать';
-$labels['shortacla'] = 'Администрировать';
+
 $labels['aclfull'] = 'Полный доступ';
 $labels['aclother'] = 'Другое';
-$labels['shortaclother'] = 'Другое';
 $labels['aclread'] = 'Чтение';
-$labels['shortaclr'] = 'Чтение';
-$labels['shortaclread'] = 'Чтение';
 $labels['aclwrite'] = 'Запись';
-$labels['shortaclw'] = 'Запись';
-$labels['shortaclwrite'] = 'Запись';
 $labels['acldelete'] = 'Удаление';
-$labels['shortacld'] = 'Удаление';
-$labels['shortaclt'] = 'Удаление';
-$labels['shortacldelete'] = 'Удаление';
+
+$labels['shortacll'] = 'Поиск';
+$labels['shortaclr'] = 'Чтение';
 $labels['shortacls'] = 'Оставить';
+$labels['shortaclw'] = 'Запись';
 $labels['shortacli'] = 'Вставить';
+$labels['shortaclp'] = 'Отправить';
 $labels['shortaclc'] = 'Создать';
 $labels['shortaclk'] = 'Создать';
+$labels['shortacld'] = 'Удаление';
+$labels['shortaclt'] = 'Удаление';
+$labels['shortacle'] = 'Уничтожить сообщения';
 $labels['shortaclx'] = 'Удаление папки';
+$labels['shortacla'] = 'Администрировать';
+
+$labels['shortaclother'] = 'Другое';
+$labels['shortaclread'] = 'Чтение';
+$labels['shortaclwrite'] = 'Запись';
+$labels['shortacldelete'] = 'Удаление';
+
 $labels['longacll'] = 'Папка видима в списках и доступна для подписки';
 $labels['longaclr'] = 'Эта папка может быть открыта для чтения';
-$labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $labels['longacls'] = 'Флаг Прочитано может быть изменен';
 $labels['longaclw'] = 'Флаги и ключевые слова, кроме Прочитано и Удалено, могут быть изменены';
 $labels['longacli'] = 'Сообщения могут быть записаны или скопированы в папку';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Флаг Удалено может быть измене
 $labels['longacle'] = 'Сообщения могут быть уничтожены';
 $labels['longaclx'] = 'Эта папка может быть переименована или удалена';
 $labels['longacla'] = 'Права доступа к папке могут быть изменены';
+
 $labels['longaclfull'] = 'Полный доступ, включая управление папкой';
+$labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $labels['longaclwrite'] = 'Сообщения можно помечать, записывать или копировать в папку';
 $labels['longacldelete'] = 'Сообщения можно удалять';
-$labels['deleting'] = 'Удаление прав доступа...';
-$labels['saving'] = 'Сохранение прав доступа...';
-$labels['updatesuccess'] = 'Права доступа успешно изменены';
-$labels['deletesuccess'] = 'Права доступа успешно удалены';
-$labels['createsuccess'] = 'Успешно добавлены права доступа';
-$labels['updateerror'] = 'Невозможно обновить права доступа';
-$labels['deleteerror'] = 'Невозможно удалить права доступа';
-$labels['createerror'] = 'Невозможно добавить права доступа';
-$labels['deleteconfirm'] = 'Вы уверены в том, что хотите удалить права доступа выбранных пользователей?';
-$labels['norights'] = 'Права доступа не установлены!';
-$labels['nouser'] = 'Не определено имя пользователя!';
 
+$messages['deleting'] = 'Удаление прав доступа...';
+$messages['saving'] = 'Сохранение прав доступа...';
+$messages['updatesuccess'] = 'Права доступа успешно изменены';
+$messages['deletesuccess'] = 'Права доступа успешно удалены';
+$messages['createsuccess'] = 'Успешно добавлены права доступа';
+$messages['updateerror'] = 'Невозможно обновить права доступа';
+$messages['deleteerror'] = 'Невозможно удалить права доступа';
+$messages['createerror'] = 'Невозможно добавить права доступа';
+$messages['deleteconfirm'] = 'Вы уверены в том, что хотите удалить права доступа выбранных пользователей?';
+$messages['norights'] = 'Права доступа не установлены!';
+$messages['nouser'] = 'Не определено имя пользователя!';
+
+?>
diff --git a/plugins/acl/localization/sk_SK.inc b/plugins/acl/localization/sk_SK.inc
index 7bd702a..64b146c 100644
--- a/plugins/acl/localization/sk_SK.inc
+++ b/plugins/acl/localization/sk_SK.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav ÄŽurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Zdieľanie';
 $labels['myrights'] = 'Prístupové práva';
 $labels['username'] = 'Používateľ:';
@@ -23,42 +25,48 @@ $labels['actions'] = 'Prístupové práva činností...';
 $labels['anyone'] = 'Všetci užívatelia (ktokoľvek)';
 $labels['anonymous'] = 'Hostia (anonymne)';
 $labels['identifier'] = 'Identifikátor';
+
 $labels['acll'] = 'Vyhľadať';
-$labels['shortacll'] = 'Vyhľadať';
 $labels['aclr'] = 'Čítať správy';
 $labels['acls'] = 'Ponechať ako prečítané';
 $labels['aclw'] = 'Príznaky na zapisovanie';
 $labels['acli'] = 'Vložiť (Skopírovať do)';
+$labels['aclp'] = 'Post';
 $labels['aclc'] = 'Vytvoriť podpriečinky';
 $labels['aclk'] = 'Vytvoriť podpriečinky';
 $labels['acld'] = 'Zmazať správy';
 $labels['aclt'] = 'Zmazať správy';
 $labels['acle'] = 'Vyčistiť';
-$labels['shortacle'] = 'Vyčistiť';
 $labels['aclx'] = 'Zmazať priečinok';
 $labels['acla'] = 'Spravovať';
-$labels['shortacla'] = 'Spravovať';
+
 $labels['aclfull'] = 'Plný prístup';
 $labels['aclother'] = 'Ostatné';
-$labels['shortaclother'] = 'Ostatné';
 $labels['aclread'] = 'Čítanie';
-$labels['shortaclr'] = 'Čítanie';
-$labels['shortaclread'] = 'Čítanie';
 $labels['aclwrite'] = 'Zápis';
-$labels['shortaclw'] = 'Zápis';
-$labels['shortaclwrite'] = 'Zápis';
 $labels['acldelete'] = 'Odstrániť';
-$labels['shortacld'] = 'Odstrániť';
-$labels['shortaclt'] = 'Odstrániť';
-$labels['shortacldelete'] = 'Odstrániť';
+
+$labels['shortacll'] = 'Vyhľadať';
+$labels['shortaclr'] = 'Čítanie';
 $labels['shortacls'] = 'Ponechať';
+$labels['shortaclw'] = 'Zápis';
 $labels['shortacli'] = 'Vložiť';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Vytvoriť';
 $labels['shortaclk'] = 'Vytvoriť';
+$labels['shortacld'] = 'Odstrániť';
+$labels['shortaclt'] = 'Odstrániť';
+$labels['shortacle'] = 'Vyčistiť';
 $labels['shortaclx'] = 'Odstrániť priečinok';
+$labels['shortacla'] = 'Spravovať';
+
+$labels['shortaclother'] = 'Ostatné';
+$labels['shortaclread'] = 'Čítanie';
+$labels['shortaclwrite'] = 'Zápis';
+$labels['shortacldelete'] = 'Odstrániť';
+
 $labels['longacll'] = 'Priečinok je v zoznamoch viditeľný a dá sa doň zapísať';
 $labels['longaclr'] = 'Prečinok je možné otvoriť na čítanie';
-$labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longacls'] = 'Príznak "Prečítané" je možné zmeniť';
 $labels['longaclw'] = 'Príznaky správ a kľúčové slová je možné zmeniť, okrem "Prečítané" a "Vymazané';
 $labels['longacli'] = 'Do tohto priečinka je možné zapisovať alebo kopírovať správy';
@@ -70,18 +78,22 @@ $labels['longaclt'] = 'Príznak správ "Vymazané" je možné zmeniť';
 $labels['longacle'] = 'Správy je možné vymazať';
 $labels['longaclx'] = 'Priečinok je možné vymazať alebo premenovať';
 $labels['longacla'] = 'Je možné zmeniť prístupové práva k priečinku';
+
 $labels['longaclfull'] = 'Úplný prístup, vrátane správy priečinka';
+$labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longaclwrite'] = 'Správy je možné označiť, zapísať alebo skopírovať do prečinka';
 $labels['longacldelete'] = 'Správy je možné vymazať';
-$labels['deleting'] = 'Odstraňovanie prístupových práv...';
-$labels['saving'] = 'Ukladanie prístupových práv...';
-$labels['updatesuccess'] = 'Prístupové práva boli úspešne zmenené';
-$labels['deletesuccess'] = 'Prístupové práva boli úspešne vymazané';
-$labels['createsuccess'] = 'Prístupové práva boli úspešne pridané';
-$labels['updateerror'] = 'Prístupové práva sa nepodarilo aktualizovať';
-$labels['deleteerror'] = 'Prístupové práva sa nepodarilo vymazať';
-$labels['createerror'] = 'Prístupové práva sa nepodarilo pridať';
-$labels['deleteconfirm'] = 'Ste si istý, že chcete odstrániť prístupové práva vybranému používateľovi/používateľom?';
-$labels['norights'] = 'Neboli určené žiadne práva!';
-$labels['nouser'] = 'Nebolo určené žiadne meno používateľa!';
 
+$messages['deleting'] = 'Odstraňovanie prístupových práv...';
+$messages['saving'] = 'Ukladanie prístupových práv...';
+$messages['updatesuccess'] = 'Prístupové práva boli úspešne zmenené';
+$messages['deletesuccess'] = 'Prístupové práva boli úspešne vymazané';
+$messages['createsuccess'] = 'Prístupové práva boli úspešne pridané';
+$messages['updateerror'] = 'Prístupové práva sa nepodarilo aktualizovať';
+$messages['deleteerror'] = 'Prístupové práva sa nepodarilo vymazať';
+$messages['createerror'] = 'Prístupové práva sa nepodarilo pridať';
+$messages['deleteconfirm'] = 'Ste si istý, že chcete odstrániť prístupové práva vybranému používateľovi/používateľom?';
+$messages['norights'] = 'Neboli určené žiadne práva!';
+$messages['nouser'] = 'Nebolo určené žiadne meno používateľa!';
+
+?>
diff --git a/plugins/acl/localization/sl_SI.inc b/plugins/acl/localization/sl_SI.inc
index e644c9d..8c8a552 100644
--- a/plugins/acl/localization/sl_SI.inc
+++ b/plugins/acl/localization/sl_SI.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Teja Cetinski <teja.cetinski at gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Skupna raba';
 $labels['myrights'] = 'Pravice dostopa';
 $labels['username'] = 'Uporabnik:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Nastavitve pravic dostopa';
 $labels['anyone'] = 'Vsi uporabniki';
 $labels['anonymous'] = 'Gosti';
 $labels['identifier'] = 'Označevalnik';
+
 $labels['acll'] = 'Iskanje';
-$labels['shortacll'] = 'Iskanje';
 $labels['aclr'] = 'Prebrana sporočila';
 $labels['acls'] = 'Ohrani status \'Prebrano\'';
 $labels['aclw'] = 'Označi pisanje sporočila';
 $labels['acli'] = 'Vstavi (Kopiraj v)';
 $labels['aclp'] = 'Objava';
-$labels['shortaclp'] = 'Objava';
 $labels['aclc'] = 'Ustvari podmape';
 $labels['aclk'] = 'Ustvari podmape';
 $labels['acld'] = 'Izbriši sporočila';
 $labels['aclt'] = 'Izbriši sporočila';
 $labels['acle'] = 'Izbriši';
-$labels['shortacle'] = 'Izbriši';
 $labels['aclx'] = 'Izbriši mapo';
 $labels['acla'] = 'Uredi';
-$labels['shortacla'] = 'Uredi';
+
 $labels['aclfull'] = 'Popolno upravljanje';
 $labels['aclother'] = 'Ostalo';
-$labels['shortaclother'] = 'Ostalo';
 $labels['aclread'] = 'Preberi';
-$labels['shortaclr'] = 'Preberi';
-$labels['shortaclread'] = 'Preberi';
 $labels['aclwrite'] = 'Sestavi';
-$labels['shortaclw'] = 'Sestavi';
-$labels['shortaclwrite'] = 'Sestavi';
 $labels['acldelete'] = 'Izbriši';
-$labels['shortacld'] = 'Izbriši';
-$labels['shortaclt'] = 'Izbriši';
-$labels['shortacldelete'] = 'Izbriši';
+
+$labels['shortacll'] = 'Iskanje';
+$labels['shortaclr'] = 'Preberi';
 $labels['shortacls'] = 'Ohrani';
+$labels['shortaclw'] = 'Sestavi';
 $labels['shortacli'] = 'Vstavi';
+$labels['shortaclp'] = 'Objava';
 $labels['shortaclc'] = 'Ustvari';
 $labels['shortaclk'] = 'Ustvari';
+$labels['shortacld'] = 'Izbriši';
+$labels['shortaclt'] = 'Izbriši';
+$labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Izbriši mapo';
+$labels['shortacla'] = 'Uredi';
+
+$labels['shortaclother'] = 'Ostalo';
+$labels['shortaclread'] = 'Preberi';
+$labels['shortaclwrite'] = 'Sestavi';
+$labels['shortacldelete'] = 'Izbriši';
+
 $labels['longacll'] = 'Mapa je vidna na seznamih in jo lahko naročite';
 $labels['longaclr'] = 'Mapa je na voljo za branje';
-$labels['longaclread'] = 'Mapa je na voljo za branje';
 $labels['longacls'] = 'Oznaka \'Prebrano sporočilo\' je lahko spremenjena';
 $labels['longaclw'] = 'Oznake sporočil in ključne besede je mogoče spremeniti, z izjemo oznak "Prebrano" in "Izbrisano';
 $labels['longacli'] = 'Sporočilo je lahko poslano ali kopirano v mapo';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Oznako sporočila  \'Izbrisano\' je mogoče spremeniti';
 $labels['longacle'] = 'Sporočila so lahko izbrisana';
 $labels['longaclx'] = 'Mapa je lahko izbrisana ali preimenovana';
 $labels['longacla'] = 'Pravice na mapi so lahko spremenjene';
+
 $labels['longaclfull'] = 'Popolno upravljanje, vključno z urejanjem map';
+$labels['longaclread'] = 'Mapa je na voljo za branje';
 $labels['longaclwrite'] = 'Sporočila je mogoče označiti, sestaviti ali kopirati v mapo';
 $labels['longacldelete'] = 'Sporočila so lahko izbrisana';
-$labels['deleting'] = 'Brisanje pravic';
-$labels['saving'] = 'Shranjevanje pravic';
-$labels['updatesuccess'] = 'Pravice so bile uspešno spremenjene';
-$labels['deletesuccess'] = 'Pravice so bile uspešno izbrisane';
-$labels['createsuccess'] = 'Pravice so bile uspešno dodane';
-$labels['updateerror'] = 'Pravic ni mogoče posodobiti';
-$labels['deleteerror'] = 'Pravic ni mogoče izbrisati';
-$labels['createerror'] = 'Pravic ni bilo mogoče dodati';
-$labels['deleteconfirm'] = 'Ste prepričani, da želite odstraniti pravice dostopa za izbrane uporabnike?';
-$labels['norights'] = 'Pravic niste določili';
-$labels['nouser'] = 'Niste določili uporabnišlega imena';
 
+$messages['deleting'] = 'Brisanje pravic';
+$messages['saving'] = 'Shranjevanje pravic';
+$messages['updatesuccess'] = 'Pravice so bile uspešno spremenjene';
+$messages['deletesuccess'] = 'Pravice so bile uspešno izbrisane';
+$messages['createsuccess'] = 'Pravice so bile uspešno dodane';
+$messages['updateerror'] = 'Pravic ni mogoče posodobiti';
+$messages['deleteerror'] = 'Pravic ni mogoče izbrisati';
+$messages['createerror'] = 'Pravic ni bilo mogoče dodati';
+$messages['deleteconfirm'] = 'Ste prepričani, da želite odstraniti pravice dostopa za izbrane uporabnike?';
+$messages['norights'] = 'Pravic niste določili';
+$messages['nouser'] = 'Niste določili uporabnišlega imena';
+
+?>
diff --git a/plugins/acl/localization/sr_CS.inc b/plugins/acl/localization/sr_CS.inc
index c76e9c0..19f7440 100644
--- a/plugins/acl/localization/sr_CS.inc
+++ b/plugins/acl/localization/sr_CS.inc
@@ -2,20 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Данило Шеган                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $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 a2f41dc..6c68080 100644
--- a/plugins/acl/localization/sv_SE.inc
+++ b/plugins/acl/localization/sv_SE.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Utdelning';
 $labels['myrights'] = 'Åtkomsträttigheter';
 $labels['username'] = 'Användare:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Hantera åtkomsträttigheter...';
 $labels['anyone'] = 'Alla användare (alla)';
 $labels['anonymous'] = 'Gäster (anonyma)';
 $labels['identifier'] = 'Identifikation';
+
 $labels['acll'] = 'Uppslagning';
-$labels['shortacll'] = 'Uppslagning';
 $labels['aclr'] = 'Läs meddelanden';
 $labels['acls'] = 'Behåll status Sett';
 $labels['aclw'] = 'Skriv flaggor';
 $labels['acli'] = 'Infoga (kopiera in)';
 $labels['aclp'] = 'Posta';
-$labels['shortaclp'] = 'Posta';
 $labels['aclc'] = 'Skapa underkataloger';
 $labels['aclk'] = 'Skapa underkataloger';
 $labels['acld'] = 'Ta bort meddelanden';
 $labels['aclt'] = 'Ta bort meddelanden';
 $labels['acle'] = 'Utplåna';
-$labels['shortacle'] = 'Utplåna';
 $labels['aclx'] = 'Ta bort katalog';
 $labels['acla'] = 'Administrera';
-$labels['shortacla'] = 'Administrera';
+
 $labels['aclfull'] = 'Full kontroll';
 $labels['aclother'] = 'Övrig';
-$labels['shortaclother'] = 'Övrig';
 $labels['aclread'] = 'Läs';
-$labels['shortaclr'] = 'Läs';
-$labels['shortaclread'] = 'Läs';
 $labels['aclwrite'] = 'Skriv';
-$labels['shortaclw'] = 'Skriv';
-$labels['shortaclwrite'] = 'Skriv';
 $labels['acldelete'] = 'Ta bort';
-$labels['shortacld'] = 'Ta bort';
-$labels['shortaclt'] = 'Ta bort';
-$labels['shortacldelete'] = 'Ta bort';
+
+$labels['shortacll'] = 'Uppslagning';
+$labels['shortaclr'] = 'Läs';
 $labels['shortacls'] = 'Behåll';
+$labels['shortaclw'] = 'Skriv';
 $labels['shortacli'] = 'Infoga';
+$labels['shortaclp'] = 'Posta';
 $labels['shortaclc'] = 'Skapa';
 $labels['shortaclk'] = 'Skapa';
+$labels['shortacld'] = 'Ta bort';
+$labels['shortaclt'] = 'Ta bort';
+$labels['shortacle'] = 'Utplåna';
 $labels['shortaclx'] = 'Ta bort katalog';
+$labels['shortacla'] = 'Administrera';
+
+$labels['shortaclother'] = 'Övrig';
+$labels['shortaclread'] = 'Läs';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Ta bort';
+
 $labels['longacll'] = 'Katalogen är synlig i listor och den kan prenumereras på';
 $labels['longaclr'] = 'Katalogen kan öppnas för läsning';
-$labels['longaclread'] = 'Katalogen kan öppnas för läsning';
 $labels['longacls'] = 'Meddelandeflagga Sett kan ändras';
 $labels['longaclw'] = 'Meddelandeflaggor och nyckelord kan ändras, undantaget Sett och Raderat';
 $labels['longacli'] = 'Meddelanden kan skrivas eller kopieras till katalogen';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Meddelandeflagga Raderat kan ändras';
 $labels['longacle'] = 'Meddelanden kan utplånas';
 $labels['longaclx'] = 'Katalogen kan tas bort eller ges annat namn';
 $labels['longacla'] = 'Katalogens åtkomsträttigheter kan ändras';
+
 $labels['longaclfull'] = 'Full kontroll inklusive katalogadministration';
+$labels['longaclread'] = 'Katalogen kan öppnas för läsning';
 $labels['longaclwrite'] = 'Meddelanden kan märkas, skrivas eller kopieras till katalogen';
 $labels['longacldelete'] = 'Meddelanden kan tas bort';
-$labels['deleting'] = 'Tar bort åtkomsträttigheter...';
-$labels['saving'] = 'Sparar åtkomsträttigheter...';
-$labels['updatesuccess'] = 'Åtkomsträttigheterna är ändrade';
-$labels['deletesuccess'] = 'Åtkomsträttigheterna är borttagna';
-$labels['createsuccess'] = 'Åtkomsträttigheterna är tillagda';
-$labels['updateerror'] = 'Åtkomsträttigheterna kunde inte ändras';
-$labels['deleteerror'] = 'Åtkomsträttigheterna kunde inte tas bort';
-$labels['createerror'] = 'Åtkomsträttigheterna kunde inte läggas till';
-$labels['deleteconfirm'] = 'Vill du verkligen ta bort åtkomsträttigheterna för markerade användare?';
-$labels['norights'] = 'Inga åtkomsträttigheter angavs!';
-$labels['nouser'] = 'Inget användarnamn angavs!';
 
+$messages['deleting'] = 'Tar bort åtkomsträttigheter...';
+$messages['saving'] = 'Sparar åtkomsträttigheter...';
+$messages['updatesuccess'] = 'Åtkomsträttigheterna är ändrade';
+$messages['deletesuccess'] = 'Åtkomsträttigheterna är borttagna';
+$messages['createsuccess'] = 'Åtkomsträttigheterna är tillagda';
+$messages['updateerror'] = 'Åtkomsträttigheterna kunde inte ändras';
+$messages['deleteerror'] = 'Åtkomsträttigheterna kunde inte tas bort';
+$messages['createerror'] = 'Åtkomsträttigheterna kunde inte läggas till';
+$messages['deleteconfirm'] = 'Vill du verkligen ta bort åtkomsträttigheterna för markerade användare?';
+$messages['norights'] = 'Inga åtkomsträttigheter angavs!';
+$messages['nouser'] = 'Inget användarnamn angavs!';
+
+?>
diff --git a/plugins/acl/localization/tr_TR.inc b/plugins/acl/localization/tr_TR.inc
index 509effa..1569b59 100644
--- a/plugins/acl/localization/tr_TR.inc
+++ b/plugins/acl/localization/tr_TR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Paylaşım';
 $labels['myrights'] = 'Erişim Hakları';
 $labels['username'] = 'Kullanıcı:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Erişim hakları aksiyonları...';
 $labels['anyone'] = 'Tüm kullanıcılar(kim olursa)';
 $labels['anonymous'] = 'Ziyaretçiler(anonim)';
 $labels['identifier'] = 'Tanımlayıcı';
+
 $labels['acll'] = 'Arama';
-$labels['shortacll'] = 'Arama';
 $labels['aclr'] = 'Mesajları oku';
 $labels['acls'] = 'Göründü durumunu muhafaza et';
 $labels['aclw'] = 'Yazma bayrakları';
 $labels['acli'] = 'Ekle(kopyala)';
 $labels['aclp'] = 'Gönder';
-$labels['shortaclp'] = 'Gönder';
 $labels['aclc'] = 'Alt dizinler oluÅŸtur';
 $labels['aclk'] = 'Alt dizinler oluÅŸtur';
 $labels['acld'] = 'Mesajları  sil';
 $labels['aclt'] = 'Mesajları  sil';
 $labels['acle'] = 'Sil';
-$labels['shortacle'] = 'Sil';
 $labels['aclx'] = 'Dizini sil';
 $labels['acla'] = 'Yönet';
-$labels['shortacla'] = 'Yönet';
+
 $labels['aclfull'] = 'Tam kontrol';
 $labels['aclother'] = 'DiÄŸer';
-$labels['shortaclother'] = 'DiÄŸer';
 $labels['aclread'] = 'Oku';
-$labels['shortaclr'] = 'Oku';
-$labels['shortaclread'] = 'Oku';
 $labels['aclwrite'] = 'Yaz';
-$labels['shortaclw'] = 'Yaz';
-$labels['shortaclwrite'] = 'Yaz';
 $labels['acldelete'] = 'Sil';
-$labels['shortacld'] = 'Sil';
-$labels['shortaclt'] = 'Sil';
-$labels['shortacldelete'] = 'Sil';
+
+$labels['shortacll'] = 'Arama';
+$labels['shortaclr'] = 'Oku';
 $labels['shortacls'] = 'Koru';
+$labels['shortaclw'] = 'Yaz';
 $labels['shortacli'] = 'Ekle';
+$labels['shortaclp'] = 'Gönder';
 $labels['shortaclc'] = 'OluÅŸtur';
 $labels['shortaclk'] = 'OluÅŸtur';
+$labels['shortacld'] = 'Sil';
+$labels['shortaclt'] = 'Sil';
+$labels['shortacle'] = 'Sil';
 $labels['shortaclx'] = 'Dizin sil';
+$labels['shortacla'] = 'Yönet';
+
+$labels['shortaclother'] = 'DiÄŸer';
+$labels['shortaclread'] = 'Oku';
+$labels['shortaclwrite'] = 'Yaz';
+$labels['shortacldelete'] = 'Sil';
+
 $labels['longacll'] = 'Klasör listesinde görülebilir ve abone olunabilir';
 $labels['longaclr'] = 'Dizin yazma için okunabilir';
-$labels['longaclread'] = 'Dizin yazma için okunabilir';
 $labels['longacls'] = 'Mesajların göründü bayrağı değiştirilebilir';
 $labels['longaclw'] = 'Görülme ve Silinme bayrakları hariç bayraklar ve anahtar kelimeler değiştirilebilir';
 $labels['longacli'] = 'Mesajlar dizini yazılabilir veya kopyalanabilir';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'mesajları sil bayrakları değiştirilebilir';
 $labels['longacle'] = 'Mesajlar silinebilir';
 $labels['longaclx'] = 'Klasörü silinebilir veya yeniden adlandırılabilir';
 $labels['longacla'] = 'Dizin erişim hakları değiştirilebilir';
+
 $labels['longaclfull'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
+$labels['longaclread'] = 'Dizin yazma için okunabilir';
 $labels['longaclwrite'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
 $labels['longacldelete'] = 'Mesajlar silinebilir';
-$labels['deleting'] = 'Erişim hakları siliniyor...';
-$labels['saving'] = 'Erişim hakları saklanıyor...';
-$labels['updatesuccess'] = 'Erişim hakları başarıyla değiştirildi';
-$labels['deletesuccess'] = 'Erişim hakları başarıyla silindi';
-$labels['createsuccess'] = 'Erişim hakları başarıyla eklendi';
-$labels['updateerror'] = 'Erişim haklarını güncellenemedi';
-$labels['deleteerror'] = 'Erişim haklarını silinemedi';
-$labels['createerror'] = 'Erişim hakları eklenemedi';
-$labels['deleteconfirm'] = 'Seçilen kullanıcılar için erişim haklarını silmek istediğinizden emin misiniz?';
-$labels['norights'] = 'Hiçbir hak belirtilmemiş!';
-$labels['nouser'] = 'Hiçbir kullanıcı belirtilmemiş!';
 
+$messages['deleting'] = 'Erişim hakları siliniyor...';
+$messages['saving'] = 'Erişim hakları saklanıyor...';
+$messages['updatesuccess'] = 'Erişim hakları başarıyla değiştirildi';
+$messages['deletesuccess'] = 'Erişim hakları başarıyla silindi';
+$messages['createsuccess'] = 'Erişim hakları başarıyla eklendi';
+$messages['updateerror'] = 'Erişim haklarını güncellenemedi';
+$messages['deleteerror'] = 'Erişim haklarını silinemedi';
+$messages['createerror'] = 'Erişim hakları eklenemedi';
+$messages['deleteconfirm'] = 'Seçilen kullanıcılar için erişim haklarını silmek istediğinizden emin misiniz?';
+$messages['norights'] = 'Hiçbir hak belirtilmemiş!';
+$messages['nouser'] = 'Hiçbir kullanıcı belirtilmemiş!';
+
+?>
diff --git a/plugins/acl/localization/vi_VN.inc b/plugins/acl/localization/vi_VN.inc
index 65dc96d..1a6ea58 100644
--- a/plugins/acl/localization/vi_VN.inc
+++ b/plugins/acl/localization/vi_VN.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh at gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Chia sẻ';
 $labels['myrights'] = 'Quyền truy cập';
 $labels['username'] = 'Người dùng:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Cách ứng xử quyền truy cập';
 $labels['anyone'] = 'Tất cả người dùng (bất kỳ ai)';
 $labels['anonymous'] = 'Khách (nặc danh)';
 $labels['identifier'] = 'Định danh';
+
 $labels['acll'] = 'Tìm kiếm';
-$labels['shortacll'] = 'Tìm kiếm';
 $labels['aclr'] = 'Đọc thư';
 $labels['acls'] = 'Giữ trạng thái đã xem qua';
 $labels['aclw'] = 'Cờ đánh dấu cho mục viết';
 $labels['acli'] = 'Chèn thêm (sao chép vào)';
 $labels['aclp'] = 'Đăng bài';
-$labels['shortaclp'] = 'Đăng bài';
 $labels['aclc'] = 'Tạo giữ liệu con';
 $labels['aclk'] = 'Tạo giữ liệu con';
 $labels['acld'] = 'Xóa thư';
 $labels['aclt'] = 'Xóa thư';
 $labels['acle'] = 'Thải bỏ';
-$labels['shortacle'] = 'Thải bỏ';
 $labels['aclx'] = 'Xóa giữ liệu';
 $labels['acla'] = 'Quản lý';
-$labels['shortacla'] = 'Quản lý';
+
 $labels['aclfull'] = 'Quản lý toàn bộ';
 $labels['aclother'] = 'Loại khác';
-$labels['shortaclother'] = 'Loại khác';
 $labels['aclread'] = 'Đọc';
-$labels['shortaclr'] = 'Đọc';
-$labels['shortaclread'] = 'Đọc';
 $labels['aclwrite'] = 'Viết';
-$labels['shortaclw'] = 'Viết';
-$labels['shortaclwrite'] = 'Viết';
 $labels['acldelete'] = 'Xoá';
-$labels['shortacld'] = 'Xoá';
-$labels['shortaclt'] = 'Xoá';
-$labels['shortacldelete'] = 'Xoá';
+
+$labels['shortacll'] = 'Tìm kiếm';
+$labels['shortaclr'] = 'Đọc';
 $labels['shortacls'] = 'Giữ';
+$labels['shortaclw'] = 'Viết';
 $labels['shortacli'] = 'Chèn';
+$labels['shortaclp'] = 'Đăng bài';
 $labels['shortaclc'] = 'Tạo mới';
 $labels['shortaclk'] = 'Tạo mới';
+$labels['shortacld'] = 'Xoá';
+$labels['shortaclt'] = 'Xoá';
+$labels['shortacle'] = 'Thải bỏ';
 $labels['shortaclx'] = 'Giữ liệu được xóa';
+$labels['shortacla'] = 'Quản lý';
+
+$labels['shortaclother'] = 'Loại khác';
+$labels['shortaclread'] = 'Đọc';
+$labels['shortaclwrite'] = 'Viết';
+$labels['shortacldelete'] = 'Xoá';
+
 $labels['longacll'] = 'Giữ liệu đã được liệt kê và có thể đóng góp';
 $labels['longaclr'] = 'Giữ liệu có thể được mở để đọc';
-$labels['longaclread'] = 'Giữ liệu có thể được mở để đọc';
 $labels['longacls'] = 'Cờ đánh dấu thư đã xem qua có thể thay đổi';
 $labels['longaclw'] = 'Cờ thư và từ khóa có thể thay đổi, ngoại trừ đã xem qua và bị xóa';
 $labels['longacli'] = 'Thư có thể được ghi hoặc sao chép vào giữ liệu';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Cờ đánh dấu thư xóa có thể thay đổi';
 $labels['longacle'] = 'Thư có thể thải bỏ';
 $labels['longaclx'] = 'Giữ liệu có thể xóa được hoặc đặt lại tên';
 $labels['longacla'] = 'Quyên truy cập giữ liệu có thể thay đổi';
+
 $labels['longaclfull'] = 'Quản lý toàn bộ bao gồm cả sự thi hành giữ liệu';
+$labels['longaclread'] = 'Giữ liệu có thể được mở để đọc';
 $labels['longaclwrite'] = 'Thư có thể được đánh dấu, ghi hoăc sao chép vào giữ liệu';
 $labels['longacldelete'] = 'Thư có thể bị xóa';
-$labels['deleting'] = 'Xóa quyền truy cập...';
-$labels['saving'] = 'Lưu quyền truy cập...';
-$labels['updatesuccess'] = 'Thay đổi quyền truy cập thành công...';
-$labels['deletesuccess'] = 'Xóa quyền truy cập thành công...';
-$labels['createsuccess'] = 'Thêm quyền truy cập thành công...';
-$labels['updateerror'] = 'Không thể cập nhật quyền truy cập';
-$labels['deleteerror'] = 'Khôngthể xóa quyền truy cập';
-$labels['createerror'] = 'Không thể thêm quyền truy cập';
-$labels['deleteconfirm'] = 'Bạn có chắc là muốn xóa bỏ quyền truy cập của người dùng được chọn?';
-$labels['norights'] = 'Chưa có quyền nào được chỉ định!';
-$labels['nouser'] = 'Chưa có tên truy nhập được chỉ định!';
 
+$messages['deleting'] = 'Xóa quyền truy cập...';
+$messages['saving'] = 'Lưu quyền truy cập...';
+$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?';
+$messages['norights'] = 'Chưa có quyền nào được chỉ định!';
+$messages['nouser'] = 'Chưa có tên truy nhập được chỉ định!';
+
+?>
diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 3cde07a..0c51716 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -2,67 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: WeiHua.Deng <mcp2000 at gmail.com>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '共享中';
 $labels['myrights'] = '访问权限';
-$labels['username'] = '用户名:';
+$labels['username'] = '用户:';
 $labels['advanced'] = '高级模式';
 $labels['newuser'] = '添加条目';
+$labels['actions'] = 'Access right actions...';
 $labels['anyone'] = '所有用户(任何人)';
 $labels['anonymous'] = '来宾(匿名)';
 $labels['identifier'] = '标识符';
+
 $labels['acll'] = '查找';
-$labels['shortacll'] = '查找';
 $labels['aclr'] = '读取消息';
 $labels['acls'] = '保存已读状态';
+$labels['aclw'] = 'Write flags';
 $labels['acli'] = '插入(复制至)';
 $labels['aclp'] = '发送';
-$labels['shortaclp'] = '发送';
 $labels['aclc'] = '创建子文件夹';
 $labels['aclk'] = '创建子文件夹';
 $labels['acld'] = '删除消息';
 $labels['aclt'] = '删除消息';
+$labels['acle'] = '清除';
 $labels['aclx'] = '删除文件夹';
 $labels['acla'] = '管理';
-$labels['shortacla'] = '管理';
+
+$labels['aclfull'] = '全部控制';
 $labels['aclother'] = '其他';
-$labels['shortaclother'] = '其他';
+$labels['aclread'] = '阅读';
 $labels['aclwrite'] = '撰写';
-$labels['shortaclw'] = '撰写';
-$labels['shortaclwrite'] = '撰写';
 $labels['acldelete'] = '删除';
-$labels['shortacld'] = '删除';
-$labels['shortaclt'] = '删除';
-$labels['shortacldelete'] = '删除';
+
+$labels['shortacll'] = '查找';
+$labels['shortaclr'] = '阅读';
 $labels['shortacls'] = '保留';
+$labels['shortaclw'] = '撰写';
 $labels['shortacli'] = '插入';
+$labels['shortaclp'] = '发送';
 $labels['shortaclc'] = '新建';
 $labels['shortaclk'] = '新建';
+$labels['shortacld'] = '删除';
+$labels['shortaclt'] = '删除';
+$labels['shortacle'] = '清除';
 $labels['shortaclx'] = '删除文件夹';
+$labels['shortacla'] = '管理';
+
+$labels['shortaclother'] = '其他';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = '撰写';
+$labels['shortacldelete'] = '删除';
+
 $labels['longacll'] = '该文件夹在列表上可见且可被订阅';
 $labels['longaclr'] = '该文件夹可被打开阅读';
-$labels['longaclread'] = '该文件夹可被打开阅读';
+$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'] = '消息可被清除';
 $labels['longaclx'] = '该文件夹可悲删除或重命名';
-$labels['deleting'] = '删除访问权限中…';
-$labels['saving'] = '保存访问权限中…';
-$labels['updatesuccess'] = '成功修改访问权限';
-$labels['deletesuccess'] = '成功删除访问权限';
-$labels['createsuccess'] = '成功添加访问权限';
-$labels['updateerror'] = '无法更新访问权限';
-$labels['deleteerror'] = '无法删除访问权限';
-$labels['createerror'] = '无法添加访问权限';
-$labels['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
-$labels['norights'] = '没有已指定的权限!';
-$labels['nouser'] = '没有已指定的用户名!';
+$labels['longacla'] = '文件夹访问权限可被修改';
+
+$labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclread'] = '该文件夹可被打开阅读';
+$labels['longaclwrite'] = '消息可被标记,撰写或复制至文件夹中';
+$labels['longacldelete'] = '信息可被删除';
+
+$messages['deleting'] = '删除访问权限中…';
+$messages['saving'] = '保存访问权限中…';
+$messages['updatesuccess'] = '成功修改访问权限';
+$messages['deletesuccess'] = '成功删除访问权限';
+$messages['createsuccess'] = '成功添加访问权限';
+$messages['updateerror'] = '无法更新访问权限';
+$messages['deleteerror'] = '无法删除访问权限';
+$messages['createerror'] = '无法添加访问权限';
+$messages['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
+$messages['norights'] = '没有已指定的权限!';
+$messages['nouser'] = '没有已指定的用户名!';
 
+?>
diff --git a/plugins/acl/localization/zh_TW.inc b/plugins/acl/localization/zh_TW.inc
index f04e0b9..3125c28 100644
--- a/plugins/acl/localization/zh_TW.inc
+++ b/plugins/acl/localization/zh_TW.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: 林子忠                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '分享';
 $labels['myrights'] = '存取權限';
 $labels['username'] = '使用者:';
@@ -23,44 +25,50 @@ $labels['actions'] = '權限設定';
 $labels['anyone'] = '所有使用者 (anyone)';
 $labels['anonymous'] = '訪客 (anonymous)';
 $labels['identifier'] = '識別';
+
 $labels['acll'] = '尋找';
-$labels['shortacll'] = '尋找';
 $labels['aclr'] = '讀取訊息';
 $labels['acls'] = '保持上線狀態';
 $labels['aclw'] = '寫入標幟';
 $labels['acli'] = '插入(複製到這裡)';
 $labels['aclp'] = '發表';
-$labels['shortaclp'] = '發表';
 $labels['aclc'] = '建立子資料夾';
 $labels['aclk'] = '建立子資料夾';
 $labels['acld'] = '刪除訊息';
 $labels['aclt'] = '刪除訊息';
 $labels['acle'] = '刪去';
-$labels['shortacle'] = '刪去';
 $labels['aclx'] = '刪除資料夾';
 $labels['acla'] = '管理者';
-$labels['shortacla'] = '管理者';
+
 $labels['aclfull'] = '完全控制';
 $labels['aclother'] = '其它';
-$labels['shortaclother'] = '其它';
 $labels['aclread'] = '讀取';
-$labels['shortaclr'] = '讀取';
-$labels['shortaclread'] = '讀取';
 $labels['aclwrite'] = '寫入';
-$labels['shortaclw'] = '寫入';
-$labels['shortaclwrite'] = '寫入';
 $labels['acldelete'] = '刪除';
-$labels['shortacld'] = '刪除';
-$labels['shortaclt'] = '刪除';
-$labels['shortacldelete'] = '刪除';
+
+$labels['shortacll'] = '尋找';
+$labels['shortaclr'] = '讀取';
 $labels['shortacls'] = '保存';
+$labels['shortaclw'] = '寫入';
 $labels['shortacli'] = '插入';
+$labels['shortaclp'] = '發表';
 $labels['shortaclc'] = '建立';
 $labels['shortaclk'] = '建立';
+$labels['shortacld'] = '刪除';
+$labels['shortaclt'] = '刪除';
+$labels['shortacle'] = '刪去';
 $labels['shortaclx'] = '資料夾刪除';
+$labels['shortacla'] = '管理者';
+
+$labels['shortaclother'] = '其它';
+$labels['shortaclread'] = '讀取';
+$labels['shortaclwrite'] = '寫入';
+$labels['shortacldelete'] = '刪除';
+
+$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
 $labels['longaclr'] = '資料夾能被打開與讀取';
-$labels['longaclread'] = '資料夾能被打開與讀取';
 $labels['longacls'] = '能修改訊息標幟';
+$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
 $labels['longacli'] = '訊息能寫入或複製到資料夾';
 $labels['longaclp'] = '訊息能被投遞到這個資料夾';
 $labels['longaclc'] = '這個資料夾之下可以建子資料夾(或重新命名)';
@@ -70,18 +78,22 @@ $labels['longaclt'] = '能修改訊息刪除標幟';
 $labels['longacle'] = '能抹除訊息';
 $labels['longaclx'] = '資料夾能被刪除或重新命名';
 $labels['longacla'] = '能變更資料夾權限';
+
 $labels['longaclfull'] = '完全控制包含資料夾管理';
+$labels['longaclread'] = '資料夾能被打開與讀取';
 $labels['longaclwrite'] = '信件可以被標記、編寫或複製到資料夾';
 $labels['longacldelete'] = '訊息能被刪除';
-$labels['deleting'] = '刪除權限...';
-$labels['saving'] = '儲存權限...';
-$labels['updatesuccess'] = '權限變更完成';
-$labels['deletesuccess'] = '權限刪除完成';
-$labels['createsuccess'] = '權限新增完成';
-$labels['updateerror'] = '無法更新權限';
-$labels['deleteerror'] = '無法刪除權限';
-$labels['createerror'] = '無法新增權限';
-$labels['deleteconfirm'] = '您確定要刪除所選取使用者的權限嗎?';
-$labels['norights'] = '沒有指定任何權限';
-$labels['nouser'] = '沒有指定用戶名稱';
 
+$messages['deleting'] = '刪除權限...';
+$messages['saving'] = '儲存權限...';
+$messages['updatesuccess'] = '權限變更完成';
+$messages['deletesuccess'] = '權限刪除完成';
+$messages['createsuccess'] = '權限新增完成';
+$messages['updateerror'] = '無法更新權限';
+$messages['deleteerror'] = '無法刪除權限';
+$messages['createerror'] = '無法新增權限';
+$messages['deleteconfirm'] = '您確定要刪除所選取使用者的權限嗎?';
+$messages['norights'] = '沒有指定任何權限';
+$messages['nouser'] = '沒有指定用戶名稱';
+
+?>
diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
index e5d411e..52e234f 100644
--- a/plugins/acl/package.xml
+++ b/plugins/acl/package.xml
@@ -13,9 +13,9 @@
 		<email>alec at alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-06-28</date>
+	<date>2013-03-01</date>
 	<version>
-		<release>1.0</release>
+		<release>1.2</release>
 		<api>0.7</api>
 	</version>
 	<stability>
diff --git a/plugins/acl/tests/Acl.php b/plugins/acl/tests/Acl.php
new file mode 100644
index 0000000..e752ac9
--- /dev/null
+++ b/plugins/acl/tests/Acl.php
@@ -0,0 +1,23 @@
+<?php
+
+class Acl_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../acl.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new acl($rcube->api);
+
+        $this->assertInstanceOf('acl', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php b/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
new file mode 100644
index 0000000..1c54ffc
--- /dev/null
+++ b/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
@@ -0,0 +1,23 @@
+<?php
+
+class AdditionalMessageHeaders_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../additional_message_headers.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new additional_message_headers($rcube->api);
+
+        $this->assertInstanceOf('additional_message_headers', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/archive/localization/ar_SA.inc b/plugins/archive/localization/ar_SA.inc
index 053891f..33e15c5 100644
--- a/plugins/archive/localization/ar_SA.inc
+++ b/plugins/archive/localization/ar_SA.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ossama M. Khayat <okhayat at yahoo.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'الأرشيف';
-$labels['archivefolder'] = 'الأرشيف';
 $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/az_AZ.inc b/plugins/archive/localization/az_AZ.inc
index a4f3bff..8aab6f2 100644
--- a/plugins/archive/localization/az_AZ.inc
+++ b/plugins/archive/localization/az_AZ.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger at box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arxiv';
-$labels['archivefolder'] = 'Arxiv';
 $labels['buttontitle'] = 'Mesajı arxivə göndər';
 $labels['archived'] = 'Arxivə göndərildi';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arxiv';
+$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/be_BE.inc b/plugins/archive/localization/be_BE.inc
index 7e56c3b..ab78b29 100644
--- a/plugins/archive/localization/be_BE.inc
+++ b/plugins/archive/localization/be_BE.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <alex.nehaichik at gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Архіў';
-$labels['archivefolder'] = 'Архіў';
 $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/bg_BG.inc b/plugins/archive/localization/bg_BG.inc
index 1e19af3..fd32931 100644
--- a/plugins/archive/localization/bg_BG.inc
+++ b/plugins/archive/localization/bg_BG.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nikolai Nikolov <nick at kytex.bg>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Архивиране';
-$labels['archivefolder'] = 'Архивиране';
 $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/br.inc b/plugins/archive/localization/br.inc
index ce9e3d9..6b78599 100644
--- a/plugins/archive/localization/br.inc
+++ b/plugins/archive/localization/br.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Diell';
-$labels['archivefolder'] = '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 ec795e2..06a5999 100644
--- a/plugins/archive/localization/bs_BA.inc
+++ b/plugins/archive/localization/bs_BA.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008 at gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiva';
-$labels['archivefolder'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhiviraj ovu poruku';
 $labels['archived'] = 'Arhiviranje uspješno';
+$labels['archivedreload'] = 'Uspješno arhivirano. Ponovo učitajte stranicu da biste vidjeli nove foldere za arhiviranje.';
+$labels['archiveerror'] = 'Neke poruke nisu mogle biti arhivirane';
+$labels['archivefolder'] = 'Arhiva';
+$labels['settingstitle'] = 'Arhiva';
+$labels['archivetype'] = 'Podijeli arhivu po';
+$labels['archivetypeyear'] = 'Godinama (npr. Arhiva/2012)';
+$labels['archivetypemonth'] = 'Mjesecima (npr Arhiva/2012/06)';
+$labels['archivetypefolder'] = 'Originalni folder';
+$labels['archivetypesender'] = 'Email pošiljaoca';
+$labels['unkownsender'] = 'nepoznato';
 
+?>
diff --git a/plugins/archive/localization/ca_ES.inc b/plugins/archive/localization/ca_ES.inc
index 22502f0..fde7d35 100644
--- a/plugins/archive/localization/ca_ES.inc
+++ b/plugins/archive/localization/ca_ES.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn                                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arxiva';
-$labels['archivefolder'] = 'Arxiva';
 $labels['buttontitle'] = 'Arxiva aquest missatge';
 $labels['archived'] = 'Arxivat correctament';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arxiva';
+$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/cs_CZ.inc b/plugins/archive/localization/cs_CZ.inc
index 28a4191..2f2fd95 100644
--- a/plugins/archive/localization/cs_CZ.inc
+++ b/plugins/archive/localization/cs_CZ.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archiv';
-$labels['archivefolder'] = 'Archiv';
 $labels['buttontitle'] = 'Archivovat zprávu';
 $labels['archived'] = 'Úspěšně vloženo do archivu';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archiv';
+$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/cy_GB.inc b/plugins/archive/localization/cy_GB.inc
index 579c5b1..fa8e197 100644
--- a/plugins/archive/localization/cy_GB.inc
+++ b/plugins/archive/localization/cy_GB.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archif';
-$labels['archivefolder'] = 'Archif';
 $labels['buttontitle'] = 'Archifo\'r neges hwn';
 $labels['archived'] = 'Archifwyd yn llwyddiannus';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archif';
+$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/da_DK.inc b/plugins/archive/localization/da_DK.inc
index 936c05c..d4a88ca 100644
--- a/plugins/archive/localization/da_DK.inc
+++ b/plugins/archive/localization/da_DK.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos at openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arkiv';
-$labels['archivefolder'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkivér denne besked';
 $labels['archived'] = 'Succesfuldt arkiveret.';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arkiv';
+$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/de_CH.inc b/plugins/archive/localization/de_CH.inc
index 654f5a1..65cf6ef 100644
--- a/plugins/archive/localization/de_CH.inc
+++ b/plugins/archive/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
  | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | 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.                |
@@ -18,8 +18,17 @@
 
 $labels = array();
 $labels['buttontext'] = 'Archiv';
-$labels['buttontitle'] = 'Nachricht archivieren';
-$labels['archived'] = 'Nachricht erfolgreich archiviert';
+$labels['buttontitle'] = 'Nachricht(en) archivieren';
+$labels['archived'] = 'Nachricht(en) erfolgreich archiviert';
+$labels['archivedreload'] = 'Nachrichten wurden archiviert. Laden Sie die Seite neu, um die neuen Archivordner zu sehen.';
+$labels['archiveerror'] = 'Einige Nachrichten konnten nicht archiviert werden';
 $labels['archivefolder'] = 'Archiv';
+$labels['settingstitle'] = 'Archiv';
+$labels['archivetype'] = 'Erstelle Unterordner nach';
+$labels['archivetypeyear'] = 'Jahr (z.B. Archiv/2012)';
+$labels['archivetypemonth'] = 'Monat (z.B. Archiv/2012/06)';
+$labels['archivetypefolder'] = 'Originalordner';
+$labels['archivetypesender'] = 'Absender';
+$labels['unkownsender'] = 'unbekannt';
 
 ?>
diff --git a/plugins/archive/localization/de_DE.inc b/plugins/archive/localization/de_DE.inc
index c525837..8d4f9e3 100644
--- a/plugins/archive/localization/de_DE.inc
+++ b/plugins/archive/localization/de_DE.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archiv';
-$labels['archivefolder'] = 'Archiv';
 $labels['buttontitle'] = 'Nachricht archivieren';
 $labels['archived'] = 'Nachricht erfolgreich archiviert';
+$labels['archivedreload'] = 'Erfolgreich archiviert. Seite aktualisieren um die neuen Archiv-Ordner zu sehen';
+$labels['archiveerror'] = 'Einige Nachrichten konnten nicht archiviert werden';
+$labels['archivefolder'] = 'Archiv';
+$labels['settingstitle'] = 'Archiv';
+$labels['archivetype'] = 'Archiv aufteilen nach';
+$labels['archivetypeyear'] = 'Jahr (z.B. Archiv/2012)';
+$labels['archivetypemonth'] = 'Monat (z.B. Archiv/2012/06)';
+$labels['archivetypefolder'] = 'Originalordner';
+$labels['archivetypesender'] = 'Absender E-Mail';
+$labels['unkownsender'] = 'unbekannt';
 
+?>
diff --git a/plugins/archive/localization/el_GR.inc b/plugins/archive/localization/el_GR.inc
index a06372c..57a98ab 100644
--- a/plugins/archive/localization/el_GR.inc
+++ b/plugins/archive/localization/el_GR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nikos Keramidis <info at torus.gr>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Αρχειοθέτηση';
-$labels['archivefolder'] = 'Αρχειοθέτηση';
 $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/en_GB.inc b/plugins/archive/localization/en_GB.inc
index c65672e..d3714c1 100644
--- a/plugins/archive/localization/en_GB.inc
+++ b/plugins/archive/localization/en_GB.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Chris January                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archive';
-$labels['archivefolder'] = '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 e878635..fa323ef 100644
--- a/plugins/archive/localization/eo.inc
+++ b/plugins/archive/localization/eo.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni at mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
-$labels['buttontext'] = 'Arkivo';
-$labels['archivefolder'] = 'Arkivo';
+$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 39466a9..ad9e84a 100644
--- a/plugins/archive/localization/es_AR.inc
+++ b/plugins/archive/localization/es_AR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archivo';
-$labels['archivefolder'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archivo';
+$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_ES.inc b/plugins/archive/localization/es_ES.inc
index 7cd5917..44b2769 100644
--- a/plugins/archive/localization/es_ES.inc
+++ b/plugins/archive/localization/es_ES.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archivo';
-$labels['archivefolder'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
+$labels['archivedreload'] = 'Archivado con éxito. Recargue la página para ver las nuevas carpetas de archivo.';
+$labels['archiveerror'] = 'No se ha podido archivar algunos mensajes';
+$labels['archivefolder'] = 'Archivo';
+$labels['settingstitle'] = 'Archivo';
+$labels['archivetype'] = 'Dividir el archivo por';
+$labels['archivetypeyear'] = 'Año (p.ej. Archivo/2012)';
+$labels['archivetypemonth'] = 'Mes (p.ej. Archivo/2012/06)';
+$labels['archivetypefolder'] = 'Bandeja original';
+$labels['archivetypesender'] = 'Email del remitente';
+$labels['unkownsender'] = 'desconocido';
 
+?>
diff --git a/plugins/archive/localization/et_EE.inc b/plugins/archive/localization/et_EE.inc
index 53e9b25..55cdbc9 100644
--- a/plugins/archive/localization/et_EE.inc
+++ b/plugins/archive/localization/et_EE.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiveeri';
-$labels['archivefolder'] = 'Arhiveeri';
 $labels['buttontitle'] = 'Arhiveeri see kiri';
 $labels['archived'] = 'Edukalt arhiveeritud';
+$labels['archivedreload'] = 'Arhiveerimine õnnestus. Uute arhiivi kaustada nägemiseks laadi leht uuesti.';
+$labels['archiveerror'] = 'Mõnda kirja ei õnnestusnud arhiveerida';
+$labels['archivefolder'] = 'Arhiiv';
+$labels['settingstitle'] = 'Arhiiv';
+$labels['archivetype'] = 'Jaga arhiiv';
+$labels['archivetypeyear'] = 'Aasta (nt. Arhiiv/2012)';
+$labels['archivetypemonth'] = 'Kuu (nt. Arhiiv/2012/06)';
+$labels['archivetypefolder'] = 'Esialgne kaust';
+$labels['archivetypesender'] = 'Saatja e-post';
+$labels['unkownsender'] = 'teadmata';
 
+?>
diff --git a/plugins/archive/localization/fa_IR.inc b/plugins/archive/localization/fa_IR.inc
index c3f2368..9df31ed 100644
--- a/plugins/archive/localization/fa_IR.inc
+++ b/plugins/archive/localization/fa_IR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h at gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'بایگانی';
-$labels['archivefolder'] = 'بایگانی';
 $labels['buttontitle'] = 'بایگانی این پیغام';
 $labels['archived'] = 'با موفقیت بایگانی شد';
+$labels['archivedreload'] = 'با موفقیت بایگانی شد، بارگذاری مجدد صفحه برای دیدن پوشه‌های بایگانی جدید.';
+$labels['archiveerror'] = 'برخی پیغام‌ها بایگانی نخواهند شد';
+$labels['archivefolder'] = 'بایگانی';
+$labels['settingstitle'] = 'بایگانی';
+$labels['archivetype'] = 'جدا کردن بایگانی با';
+$labels['archivetypeyear'] = 'سال (به عنوان مثال بایگانی/۲۰۱۲)';
+$labels['archivetypemonth'] = 'ماه (به عنوان مثال بایگانی/۲۰۱۲/۰۶)';
+$labels['archivetypefolder'] = 'پوشه اصلی';
+$labels['archivetypesender'] = 'ایمیل فرستنده';
+$labels['unkownsender'] = 'ناشناخته';
 
+?>
diff --git a/plugins/archive/localization/fi_FI.inc b/plugins/archive/localization/fi_FI.inc
index f2b6932..9dda46e 100644
--- a/plugins/archive/localization/fi_FI.inc
+++ b/plugins/archive/localization/fi_FI.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arkistoi';
-$labels['archivefolder'] = 'Arkistoi';
 $labels['buttontitle'] = 'Arkistoi viesti';
 $labels['archived'] = 'Arkistoitu onnistuneesti';
+$labels['archivedreload'] = 'Arkistointi onnistui. Päivitä sivu nähdäksesi uudet arkistokansiot.';
+$labels['archiveerror'] = 'Joidenkin viestien arkistointi epäonnistui';
+$labels['archivefolder'] = 'Arkistoi';
+$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 35434da..fbed872 100644
--- a/plugins/archive/localization/fr_FR.inc
+++ b/plugins/archive/localization/fr_FR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archive';
-$labels['archivefolder'] = 'Archive';
 $labels['buttontitle'] = 'Archiver ce message';
 $labels['archived'] = 'Message archivé avec success';
+$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['archivetypeyear'] = 'Année (ex Archives/2012)';
+$labels['archivetypemonth'] = 'Mois (ex Archives/2012/06)';
+$labels['archivetypefolder'] = 'Dossier original';
+$labels['archivetypesender'] = 'Email de l\'émetteur';
+$labels['unkownsender'] = 'inconnu';
 
+?>
diff --git a/plugins/archive/localization/gl_ES.inc b/plugins/archive/localization/gl_ES.inc
index 1e6c620..09b64b2 100644
--- a/plugins/archive/localization/gl_ES.inc
+++ b/plugins/archive/localization/gl_ES.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arquivo';
-$labels['archivefolder'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensaxe';
 $labels['archived'] = 'Aquivouse a mensaxe';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$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';
 
+?>
diff --git a/plugins/archive/localization/he_IL.inc b/plugins/archive/localization/he_IL.inc
index 2243bea..834e467 100644
--- a/plugins/archive/localization/he_IL.inc
+++ b/plugins/archive/localization/he_IL.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish at mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'ארכיון';
-$labels['archivefolder'] = 'ארכיון';
 $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/hr_HR.inc b/plugins/archive/localization/hr_HR.inc
index 3ef79d4..86ef2a9 100644
--- a/plugins/archive/localization/hr_HR.inc
+++ b/plugins/archive/localization/hr_HR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Svebor Prstačić <svebor.prstacic at gmail.com>                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiva';
-$labels['archivefolder'] = '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 edc9151..e95c2d0 100644
--- a/plugins/archive/localization/hu_HU.inc
+++ b/plugins/archive/localization/hu_HU.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Droszler Gabor <droszler at datatrans.hu>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archiválás';
-$labels['archivefolder'] = 'Archiválás';
 $labels['buttontitle'] = 'Üzenet archiválása';
 $labels['archived'] = 'Sikeres archiválás';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archiválás';
+$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'] = 'ismeretlen';
 
+?>
diff --git a/plugins/archive/localization/hy_AM.inc b/plugins/archive/localization/hy_AM.inc
index ff29d19..d807ae5 100644
--- a/plugins/archive/localization/hy_AM.inc
+++ b/plugins/archive/localization/hy_AM.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan at yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Ô±Ö€Õ­Õ«Õ¾';
-$labels['archivefolder'] = 'Ô±Ö€Õ­Õ«Õ¾';
 $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/id_ID.inc b/plugins/archive/localization/id_ID.inc
index aee53a5..09b5ed5 100644
--- a/plugins/archive/localization/id_ID.inc
+++ b/plugins/archive/localization/id_ID.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arsip';
-$labels['archivefolder'] = 'Arsip';
 $labels['buttontitle'] = 'Arsipkan pesan ini';
 $labels['archived'] = 'Berhasil mengarsipkan';
+$labels['archivedreload'] = 'Berhasil diarsipkan. Reload halaman untuk melihat folder arsip baru.';
+$labels['archiveerror'] = 'Beberapa pesan tidak dapat diarsipkan';
+$labels['archivefolder'] = 'Arsip';
+$labels['settingstitle'] = 'Arsip';
+$labels['archivetype'] = 'Pisah arsip berdasarkan';
+$labels['archivetypeyear'] = 'Tahun (contoh: Arsip/2012)';
+$labels['archivetypemonth'] = 'Bulan (contoh: Arsip/2012/06)';
+$labels['archivetypefolder'] = 'Folder asli';
+$labels['archivetypesender'] = 'Email pengirim';
+$labels['unkownsender'] = 'Tidak dikenal';
 
+?>
diff --git a/plugins/archive/localization/it_IT.inc b/plugins/archive/localization/it_IT.inc
index 636965d..66092f8 100644
--- a/plugins/archive/localization/it_IT.inc
+++ b/plugins/archive/localization/it_IT.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: emilio brambilla                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archivio';
-$labels['archivefolder'] = 'Archivio';
 $labels['buttontitle'] = 'Archivia questo messaggio';
 $labels['archived'] = 'Archiviato correttamente';
+$labels['archivedreload'] = 'Archiviata con successo. Ricarica la pagina per visualizzare le nuove cartelle.';
+$labels['archiveerror'] = 'Alcuni messaggi non possono essere archiviati';
+$labels['archivefolder'] = 'Archivio';
+$labels['settingstitle'] = 'Archivio';
+$labels['archivetype'] = 'Dividi archivio per';
+$labels['archivetypeyear'] = 'Anno (es. Archivio/2012)';
+$labels['archivetypemonth'] = 'Mese (es. Archivio/2012/06)';
+$labels['archivetypefolder'] = 'Cartella originale';
+$labels['archivetypesender'] = 'Mittente email';
+$labels['unkownsender'] = 'sconosciuto';
 
+?>
diff --git a/plugins/archive/localization/ja_JP.inc b/plugins/archive/localization/ja_JP.inc
index 1de4de0..b260e24 100644
--- a/plugins/archive/localization/ja_JP.inc
+++ b/plugins/archive/localization/ja_JP.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'アーカイブ';
-$labels['archivefolder'] = 'アーカイブ';
 $labels['buttontitle'] = 'このメッセージをアーカイブ';
 $labels['archived'] = 'アーカイブしました。';
+$labels['archivedreload'] = 'アーカイブしました。ページを再読み込みすると、新しいアーカイブのフォルダーを表示します。';
+$labels['archiveerror'] = 'アーカイブできないメッセージがありました';
+$labels['archivefolder'] = 'アーカイブ';
+$labels['settingstitle'] = 'アーカイブ';
+$labels['archivetype'] = 'アーカイブを分割: ';
+$labels['archivetypeyear'] = '年 (例: アーカイブ/2012)';
+$labels['archivetypemonth'] = '月 (e.g. アーカイブ/2012/06)';
+$labels['archivetypefolder'] = '元のフォルダー';
+$labels['archivetypesender'] = '電子メールの送信者';
+$labels['unkownsender'] = '不明';
 
+?>
diff --git a/plugins/archive/localization/km_KH.inc b/plugins/archive/localization/km_KH.inc
index 3e880dc..6872026 100644
--- a/plugins/archive/localization/km_KH.inc
+++ b/plugins/archive/localization/km_KH.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'ប័ណ្ណសារ';
-$labels['archivefolder'] = 'ប័ណ្ណសារ';
 $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 b067356..96a7ac4 100644
--- a/plugins/archive/localization/ko_KR.inc
+++ b/plugins/archive/localization/ko_KR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim at gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'ë³´ê´€';
-$labels['archivefolder'] = 'ë³´ê´€';
 $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/ku.inc b/plugins/archive/localization/ku.inc
index 235eedf..15a7c61 100644
--- a/plugins/archive/localization/ku.inc
+++ b/plugins/archive/localization/ku.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: david absalan <absalan at live.com>                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arşîv';
-$labels['archivefolder'] = 'Arşîv';
 $labels['buttontitle'] = 'am masaja bxa arÅŸiv';
 $labels['archived'] = 'ba gÅŸti ArÅŸiv kra';
+$labels['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/lt_LT.inc b/plugins/archive/localization/lt_LT.inc
index 2beb031..3604627 100644
--- a/plugins/archive/localization/lt_LT.inc
+++ b/plugins/archive/localization/lt_LT.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq at akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archyvuoti';
-$labels['archivefolder'] = 'Archyvuoti';
 $labels['buttontitle'] = 'Perkelti šį laišką į archyvą';
 $labels['archived'] = 'Laiškas sėkmingai perkeltas į archyvą';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archyvuoti';
+$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/lv_LV.inc b/plugins/archive/localization/lv_LV.inc
index d806fcf..ad2812f 100644
--- a/plugins/archive/localization/lv_LV.inc
+++ b/plugins/archive/localization/lv_LV.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ivars Strazdiņš                                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhīvs';
-$labels['archivefolder'] = 'Arhīvs';
 $labels['buttontitle'] = 'Arhivēt vēstuli';
 $labels['archived'] = 'Vēstule sekmīgi arhivēta';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arhīvs';
+$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/ml_IN.inc b/plugins/archive/localization/ml_IN.inc
index 13569bf..097ea14 100644
--- a/plugins/archive/localization/ml_IN.inc
+++ b/plugins/archive/localization/ml_IN.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl at gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'ശേഖരം';
-$labels['archivefolder'] = 'ശേഖരം';
 $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/mr_IN.inc b/plugins/archive/localization/mr_IN.inc
index 5b66f43..8b23979 100644
--- a/plugins/archive/localization/mr_IN.inc
+++ b/plugins/archive/localization/mr_IN.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb at rediffmail.com>                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'जतन केलेला';
-$labels['archivefolder'] = 'जतन केलेला';
 $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/nb_NO.inc b/plugins/archive/localization/nb_NO.inc
index 46e49ab..accad4e 100644
--- a/plugins/archive/localization/nb_NO.inc
+++ b/plugins/archive/localization/nb_NO.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug at thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arkiv';
-$labels['archivefolder'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkiver meldingen';
 $labels['archived'] = 'Arkivert';
+$labels['archivedreload'] = 'Arkivering vellykket. Last inn siden på nytt for å se de nye arkivmappene.';
+$labels['archiveerror'] = 'Noen meldinger kunne ikke arkiveres';
+$labels['archivefolder'] = 'Arkiv';
+$labels['settingstitle'] = 'Arkiv';
+$labels['archivetype'] = 'Del arkiv etter';
+$labels['archivetypeyear'] = 'Ã…r (f.eks. Arkiv/2012)';
+$labels['archivetypemonth'] = 'MÃ¥ned (f.eks. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Opprinnelig mappe';
+$labels['archivetypesender'] = 'Avsender';
+$labels['unkownsender'] = 'ukjent';
 
+?>
diff --git a/plugins/archive/localization/nl_NL.inc b/plugins/archive/localization/nl_NL.inc
index 44f6712..2638742 100644
--- a/plugins/archive/localization/nl_NL.inc
+++ b/plugins/archive/localization/nl_NL.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archief';
-$labels['archivefolder'] = 'Archief';
 $labels['buttontitle'] = 'Archiveer dit bericht';
 $labels['archived'] = 'Succesvol gearchiveerd';
+$labels['archivedreload'] = 'Succesvol gearchiveerd. Herlaad de pagina om de nieuwe archiefmappen te bekijken.';
+$labels['archiveerror'] = 'Sommige berichten kunnen niet gearchiveerd worden';
+$labels['archivefolder'] = 'Archief';
+$labels['settingstitle'] = 'Archiveren';
+$labels['archivetype'] = 'Archief opdelen in';
+$labels['archivetypeyear'] = 'Jaar (bijv. Archief/2012)';
+$labels['archivetypemonth'] = 'Maand (bijv. Archief/2012/06)';
+$labels['archivetypefolder'] = 'Originele map';
+$labels['archivetypesender'] = 'Afzender e-mail';
+$labels['unkownsender'] = 'onbekend';
 
+?>
diff --git a/plugins/archive/localization/nn_NO.inc b/plugins/archive/localization/nn_NO.inc
index d870f1f..4b28016 100644
--- a/plugins/archive/localization/nn_NO.inc
+++ b/plugins/archive/localization/nn_NO.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen at gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arkiver';
-$labels['archivefolder'] = 'Arkiver';
 $labels['buttontitle'] = 'Arkiver meldinga';
 $labels['archived'] = 'Arkivert';
+$labels['archivedreload'] = 'Arkivering vellukka. Last inn sida på nytt for å sjå dei nye arkivmappene.';
+$labels['archiveerror'] = 'Nokre meldingar kunne ikkje arkiverast';
+$labels['archivefolder'] = 'Arkiver';
+$labels['settingstitle'] = 'Arkiv';
+$labels['archivetype'] = 'Del arkiv etter';
+$labels['archivetypeyear'] = 'Ã…r (f.eks. Arkiv/2012)';
+$labels['archivetypemonth'] = 'MÃ¥nad (f.eks. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Opprinneleg mappe';
+$labels['archivetypesender'] = 'Avsendar';
+$labels['unkownsender'] = 'ukjent';
 
+?>
diff --git a/plugins/archive/localization/pl_PL.inc b/plugins/archive/localization/pl_PL.inc
index 1e6ff0b..316ca70 100644
--- a/plugins/archive/localization/pl_PL.inc
+++ b/plugins/archive/localization/pl_PL.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archiwum';
-$labels['archivefolder'] = 'Archiwum';
 $labels['buttontitle'] = 'PrzenieÅ› do archiwum';
 $labels['archived'] = 'Pomyślnie zarchiwizowano';
+$labels['archivedreload'] = 'Pomyślnie zarchiwizowano. Odśwież stronę aby zobaczyć nowe foldery.';
+$labels['archiveerror'] = 'Nie można zarchiwizować niektórych wiadomości';
+$labels['archivefolder'] = 'Archiwum';
+$labels['settingstitle'] = 'Archiwum';
+$labels['archivetype'] = 'Podziel archiwum wg';
+$labels['archivetypeyear'] = 'Roku (np. Archiwum/2012)';
+$labels['archivetypemonth'] = 'MiesiÄ…ca (np. Archiwum/2012/06)';
+$labels['archivetypefolder'] = 'Oryginalny folder';
+$labels['archivetypesender'] = 'E-mail nadawcy';
+$labels['unkownsender'] = 'nieznany';
 
+?>
diff --git a/plugins/archive/localization/pt_BR.inc b/plugins/archive/localization/pt_BR.inc
index 1991290..6439780 100644
--- a/plugins/archive/localization/pt_BR.inc
+++ b/plugins/archive/localization/pt_BR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arquivo';
-$labels['archivefolder'] = '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'] = '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'] = '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 712e05b..b932022 100644
--- a/plugins/archive/localization/pt_PT.inc
+++ b/plugins/archive/localization/pt_PT.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arquivo';
-$labels['archivefolder'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensagem';
 $labels['archived'] = 'Arquivada com sucesso';
+$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'] = 'Arquivo';
+$labels['archivetype'] = 'Dividir arquivo por';
+$labels['archivetypeyear'] = 'Ano (ex. Arquivo/2012)';
+$labels['archivetypemonth'] = 'Mês (ex. Arquivo/2012/06)';
+$labels['archivetypefolder'] = 'Pasta original';
+$labels['archivetypesender'] = 'E-mail do remetente';
+$labels['unkownsender'] = 'desconhecido';
 
+?>
diff --git a/plugins/archive/localization/ro_RO.inc b/plugins/archive/localization/ro_RO.inc
index 1d3c6e4..e88e918 100644
--- a/plugins/archive/localization/ro_RO.inc
+++ b/plugins/archive/localization/ro_RO.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: tudor <tudor at starnet-alba.ro>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhivă';
-$labels['archivefolder'] = 'Arhivă';
 $labels['buttontitle'] = 'Arhivează acest mesaj.';
 $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['archivefolder'] = 'Arhivă';
+$labels['settingstitle'] = 'Arhivă';
+$labels['archivetype'] = 'Divide arhiva pe';
+$labels['archivetypeyear'] = 'Ani (ex. Arhiva/2013)';
+$labels['archivetypemonth'] = 'Luni (ex. Arhiva/2013/06)';
+$labels['archivetypefolder'] = 'Dosar original';
+$labels['archivetypesender'] = 'E-mail expeditor';
+$labels['unkownsender'] = 'necunoscut';
 
+?>
diff --git a/plugins/archive/localization/ru_RU.inc b/plugins/archive/localization/ru_RU.inc
index 6fd1dab..9a18981 100644
--- a/plugins/archive/localization/ru_RU.inc
+++ b/plugins/archive/localization/ru_RU.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Архив';
-$labels['archivefolder'] = 'Архив';
 $labels['buttontitle'] = 'Переместить выбранное в архив';
 $labels['archived'] = 'Перенесено в Архив';
+$labels['archivedreload'] = 'Успешно заархивировано. Обновите страницу, чтобы увидеть новые папки архива.';
+$labels['archiveerror'] = 'Некоторые сообщения не могут быть заархивированы';
+$labels['archivefolder'] = 'Архив';
+$labels['settingstitle'] = 'Архив';
+$labels['archivetype'] = 'Разделить архив по';
+$labels['archivetypeyear'] = 'Год (например, Архив/2012)';
+$labels['archivetypemonth'] = 'Месяц (например, Архив/2012/06)';
+$labels['archivetypefolder'] = 'Исходная папка';
+$labels['archivetypesender'] = 'Адрес отправителя';
+$labels['unkownsender'] = 'неизвестно';
 
+?>
diff --git a/plugins/archive/localization/si_LK.inc b/plugins/archive/localization/si_LK.inc
index 46acc19..91e47ae 100644
--- a/plugins/archive/localization/si_LK.inc
+++ b/plugins/archive/localization/si_LK.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'සංරක්‍ෂණය';
-$labels['archivefolder'] = 'සංරක්‍ෂණය';
 $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 d531079..ce7f63e 100644
--- a/plugins/archive/localization/sk_SK.inc
+++ b/plugins/archive/localization/sk_SK.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archivovať';
-$labels['archivefolder'] = 'Archivovať';
 $labels['buttontitle'] = 'Archivovať túto správu';
 $labels['archived'] = 'Úspešne archivované';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archivovať';
+$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/sl_SI.inc b/plugins/archive/localization/sl_SI.inc
index 9a50bb5..94d1f68 100644
--- a/plugins/archive/localization/sl_SI.inc
+++ b/plugins/archive/localization/sl_SI.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak at arnes.si>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiv';
-$labels['archivefolder'] = 'Arhiv';
 $labels['buttontitle'] = 'Arhiviraj to sporočilo';
 $labels['archived'] = 'Sporočilo je bilo uspeš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'] = 'Arhiv';
+$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/sr_CS.inc b/plugins/archive/localization/sr_CS.inc
index 81128c4..686038d 100644
--- a/plugins/archive/localization/sr_CS.inc
+++ b/plugins/archive/localization/sr_CS.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils at gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiva';
-$labels['archivefolder'] = '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 13d0cf0..49ab093 100644
--- a/plugins/archive/localization/sv_SE.inc
+++ b/plugins/archive/localization/sv_SE.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
-$labels['buttontext'] = 'Arkiv';
-$labels['archivefolder'] = 'Arkiv';
+$labels['buttontext'] = 'Arkivera';
 $labels['buttontitle'] = 'Arkivera meddelande';
 $labels['archived'] = 'Meddelandet är arkiverat';
+$labels['archivedreload'] = 'Meddelandet är arkiverat. Ladda om sidan för att se de nya arkivkatalogerna.';
+$labels['archiveerror'] = 'NÃ¥gra meddelanden kunde inte arkiveras';
+$labels['archivefolder'] = 'Arkiv';
+$labels['settingstitle'] = 'Arkiv';
+$labels['archivetype'] = 'Uppdelning av arkiv';
+$labels['archivetypeyear'] = 'Ã…r (ex. Arkiv/2012)';
+$labels['archivetypemonth'] = 'MÃ¥nad (ex. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Ursprunglig katalog';
+$labels['archivetypesender'] = 'Avsändaradress';
+$labels['unkownsender'] = 'Okänd';
 
+?>
diff --git a/plugins/archive/localization/tr_TR.inc b/plugins/archive/localization/tr_TR.inc
index 6b63dc8..7654983 100644
--- a/plugins/archive/localization/tr_TR.inc
+++ b/plugins/archive/localization/tr_TR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'ArÅŸiv';
-$labels['archivefolder'] = 'ArÅŸiv';
 $labels['buttontitle'] = 'Bu postayı arşivle';
 $labels['archived'] = 'Başarıyla arşivlendi';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'ArÅŸiv';
+$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/uk_UA.inc b/plugins/archive/localization/uk_UA.inc
index 18d5f93..777be61 100644
--- a/plugins/archive/localization/uk_UA.inc
+++ b/plugins/archive/localization/uk_UA.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anton Gladky                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Архів';
-$labels['archivefolder'] = 'Архів';
 $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/vi_VN.inc b/plugins/archive/localization/vi_VN.inc
index 07775c9..fa2be98 100644
--- a/plugins/archive/localization/vi_VN.inc
+++ b/plugins/archive/localization/vi_VN.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh at gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Lưu trữ';
-$labels['archivefolder'] = 'Lưu trữ';
 $labels['buttontitle'] = 'Lưu lại bức thư này';
 $labels['archived'] = 'Lưu lại thành công';
+$labels['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 a9eca45..f0e2d42 100644
--- a/plugins/archive/localization/zh_CN.inc
+++ b/plugins/archive/localization/zh_CN.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: waring_id                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = '存档';
-$labels['archivefolder'] = '存档';
 $labels['buttontitle'] = '将该信息存档';
 $labels['archived'] = '存档成功';
+$labels['archivedreload'] = '存档成功。刷新本页来查看新的存档文件夹。';
+$labels['archiveerror'] = '部分信息无法存档';
+$labels['archivefolder'] = '存档';
+$labels['settingstitle'] = '存档';
+$labels['archivetype'] = 'Divide archive by';
+$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 0f6e9b9..a434f31 100644
--- a/plugins/archive/localization/zh_TW.inc
+++ b/plugins/archive/localization/zh_TW.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | 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.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = '封存';
-$labels['archivefolder'] = '封存';
 $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/tests/Archive.php b/plugins/archive/tests/Archive.php
new file mode 100644
index 0000000..0a1eeae
--- /dev/null
+++ b/plugins/archive/tests/Archive.php
@@ -0,0 +1,23 @@
+<?php
+
+class Archive_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../archive.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new archive($rcube->api);
+
+        $this->assertInstanceOf('archive', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/autologon/tests/Autologon.php b/plugins/autologon/tests/Autologon.php
new file mode 100644
index 0000000..0de193e
--- /dev/null
+++ b/plugins/autologon/tests/Autologon.php
@@ -0,0 +1,23 @@
+<?php
+
+class Autologon_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../autologon.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new autologon($rcube->api);
+
+        $this->assertInstanceOf('autologon', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/database_attachments/tests/DatabaseAttachments.php b/plugins/database_attachments/tests/DatabaseAttachments.php
new file mode 100644
index 0000000..f260737
--- /dev/null
+++ b/plugins/database_attachments/tests/DatabaseAttachments.php
@@ -0,0 +1,23 @@
+<?php
+
+class DatabaseAttachments_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../database_attachments.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new database_attachments($rcube->api);
+
+        $this->assertInstanceOf('database_attachments', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php
index 1e015c2..87a1637 100644
--- a/plugins/debug_logger/debug_logger.php
+++ b/plugins/debug_logger/debug_logger.php
@@ -142,8 +142,9 @@ class debug_logger extends rcube_plugin
         return $args;
     }
 
-    function __destruct(){
-                $this->runlog->end();
+    function __destruct()
+    {
+        if ($this->runlog)
+            $this->runlog->end();
     }
 }
-?>
diff --git a/plugins/debug_logger/tests/DebugLogger.php b/plugins/debug_logger/tests/DebugLogger.php
new file mode 100644
index 0000000..de20a06
--- /dev/null
+++ b/plugins/debug_logger/tests/DebugLogger.php
@@ -0,0 +1,23 @@
+<?php
+
+class DebugLogger_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../debug_logger.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new debug_logger($rcube->api);
+
+        $this->assertInstanceOf('debug_logger', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/emoticons/tests/Emoticons.php b/plugins/emoticons/tests/Emoticons.php
new file mode 100644
index 0000000..4b6c303
--- /dev/null
+++ b/plugins/emoticons/tests/Emoticons.php
@@ -0,0 +1,23 @@
+<?php
+
+class Emoticons_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../emoticons.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new emoticons($rcube->api);
+
+        $this->assertInstanceOf('emoticons', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/enigma/tests/Enigma.php b/plugins/enigma/tests/Enigma.php
new file mode 100644
index 0000000..0d0d8f8
--- /dev/null
+++ b/plugins/enigma/tests/Enigma.php
@@ -0,0 +1,23 @@
+<?php
+
+class Enigma_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../enigma.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new enigma($rcube->api);
+
+        $this->assertInstanceOf('enigma', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/example_addressbook/tests/ExampleAddressbook.php b/plugins/example_addressbook/tests/ExampleAddressbook.php
new file mode 100644
index 0000000..4a54bd9
--- /dev/null
+++ b/plugins/example_addressbook/tests/ExampleAddressbook.php
@@ -0,0 +1,23 @@
+<?php
+
+class ExampleAddressbook_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../example_addressbook.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new example_addressbook($rcube->api);
+
+        $this->assertInstanceOf('example_addressbook', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/filesystem_attachments/tests/FilesystemAttachments.php b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
new file mode 100644
index 0000000..dcab315
--- /dev/null
+++ b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
@@ -0,0 +1,23 @@
+<?php
+
+class FilesystemAttachments_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../filesystem_attachments.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new filesystem_attachments($rcube->api);
+
+        $this->assertInstanceOf('filesystem_attachments', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/help/localization/ar_SA.inc b/plugins/help/localization/ar_SA.inc
index 574ea64..c92f79f 100644
--- a/plugins/help/localization/ar_SA.inc
+++ b/plugins/help/localization/ar_SA.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Benfarhat Elyes <benfarhat.elyes at gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'مساعدة';
 $labels['about'] = 'حوْل';
 $labels['license'] = 'الرخصة';
 
+?>
diff --git a/plugins/help/localization/az_AZ.inc b/plugins/help/localization/az_AZ.inc
index 80a46a7..73fc365 100644
--- a/plugins/help/localization/az_AZ.inc
+++ b/plugins/help/localization/az_AZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger at box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Kömək';
 $labels['about'] = 'Haqqında';
 $labels['license'] = 'Lisenziya';
 
+?>
diff --git a/plugins/help/localization/br.inc b/plugins/help/localization/br.inc
index 8182657..3ea6c02 100644
--- a/plugins/help/localization/br.inc
+++ b/plugins/help/localization/br.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 714d4e7..2b502d1 100644
--- a/plugins/help/localization/bs_BA.inc
+++ b/plugins/help/localization/bs_BA.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008 at gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 bd45469..f2630d8 100644
--- a/plugins/help/localization/ca_ES.inc
+++ b/plugins/help/localization/ca_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi at fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 ae8b39a..6147c0a 100644
--- a/plugins/help/localization/cs_CZ.inc
+++ b/plugins/help/localization/cs_CZ.inc
@@ -1,20 +1,19 @@
 <?php
 
 /*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
 
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube help plugin                            |
-| Copyright (C) 2005-2009, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza at hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
- at version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
diff --git a/plugins/help/localization/cy_GB.inc b/plugins/help/localization/cy_GB.inc
index 78969b9..a2decbb 100644
--- a/plugins/help/localization/cy_GB.inc
+++ b/plugins/help/localization/cy_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 7533012..bbb3f61 100644
--- a/plugins/help/localization/da_DK.inc
+++ b/plugins/help/localization/da_DK.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Hjælp';
 $labels['about'] = 'Om';
diff --git a/plugins/help/localization/de_CH.inc b/plugins/help/localization/de_CH.inc
index c7c030b..9647239 100644
--- a/plugins/help/localization/de_CH.inc
+++ b/plugins/help/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/help/localization/<lang>.inc                                   |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
  | Localization file of the Roundcube Webmail Help plugin                |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/help/localization/de_DE.inc b/plugins/help/localization/de_DE.inc
index 55d75e2..70c5064 100644
--- a/plugins/help/localization/de_DE.inc
+++ b/plugins/help/localization/de_DE.inc
@@ -1,5 +1,21 @@
 <?php
-// translation done by Ulli Heist - http://heist.hobby-site.org/
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Hilfe';
 $labels['about'] = '&Uuml;ber';
diff --git a/plugins/help/localization/en_GB.inc b/plugins/help/localization/en_GB.inc
index 206856a..df8bff2 100644
--- a/plugins/help/localization/en_GB.inc
+++ b/plugins/help/localization/en_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anthony Harrington <untaintableangel at ubuntu.com>              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Help';
 $labels['about'] = 'About';
 $labels['license'] = 'Licence';
 
+?>
diff --git a/plugins/help/localization/eo.inc b/plugins/help/localization/eo.inc
index 0347b77..c496c96 100644
--- a/plugins/help/localization/eo.inc
+++ b/plugins/help/localization/eo.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni at mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Helpo';
 $labels['about'] = 'Pri';
 $labels['license'] = 'Permesilo';
 
+?>
diff --git a/plugins/help/localization/es_ES.inc b/plugins/help/localization/es_ES.inc
index 1d92185..446172f 100644
--- a/plugins/help/localization/es_ES.inc
+++ b/plugins/help/localization/es_ES.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Ayuda';
 $labels['about'] = 'Acerca de';
diff --git a/plugins/help/localization/et_EE.inc b/plugins/help/localization/et_EE.inc
index f95f098..a55348a 100644
--- a/plugins/help/localization/et_EE.inc
+++ b/plugins/help/localization/et_EE.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Abi';
 $labels['about'] = 'Roundcube info';
diff --git a/plugins/help/localization/fa_IR.inc b/plugins/help/localization/fa_IR.inc
index 5635d70..016d548 100644
--- a/plugins/help/localization/fa_IR.inc
+++ b/plugins/help/localization/fa_IR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h at gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'راهنما';
 $labels['about'] = 'درباره';
 $labels['license'] = 'گواهینامه';
 
+?>
diff --git a/plugins/help/localization/fi_FI.inc b/plugins/help/localization/fi_FI.inc
index 3ca3da3..1803a6c 100644
--- a/plugins/help/localization/fi_FI.inc
+++ b/plugins/help/localization/fi_FI.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 2697239..16a3369 100644
--- a/plugins/help/localization/fr_FR.inc
+++ b/plugins/help/localization/fr_FR.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Aide';
 $labels['about'] = 'A propos';
diff --git a/plugins/help/localization/gl_ES.inc b/plugins/help/localization/gl_ES.inc
index 2895dad..4326237 100644
--- a/plugins/help/localization/gl_ES.inc
+++ b/plugins/help/localization/gl_ES.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Axuda';
 $labels['about'] = 'Acerca de';
diff --git a/plugins/help/localization/he_IL.inc b/plugins/help/localization/he_IL.inc
index 105acbd..3c56ca1 100644
--- a/plugins/help/localization/he_IL.inc
+++ b/plugins/help/localization/he_IL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish at mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'עזרה';
 $labels['about'] = 'אודות';
 $labels['license'] = 'רשיון';
 
+?>
diff --git a/plugins/help/localization/hu_HU.inc b/plugins/help/localization/hu_HU.inc
index 6ff4f24..8ea50b6 100644
--- a/plugins/help/localization/hu_HU.inc
+++ b/plugins/help/localization/hu_HU.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Segítség';
 $labels['about'] = 'Névjegy';
diff --git a/plugins/help/localization/hy_AM.inc b/plugins/help/localization/hy_AM.inc
index 7e56fda..daf8916 100644
--- a/plugins/help/localization/hy_AM.inc
+++ b/plugins/help/localization/hy_AM.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan at yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Õ•Õ£Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶';
 $labels['about'] = 'Õ†Õ¯Õ¡Ö€Õ¡Õ£Õ«Ö€';
 $labels['license'] = 'Ô±Ö€Õ¿Õ¸Õ¶Õ¡Õ£Õ«Ö€';
 
+?>
diff --git a/plugins/help/localization/id_ID.inc b/plugins/help/localization/id_ID.inc
index 9066c09..d4bc3d9 100644
--- a/plugins/help/localization/id_ID.inc
+++ b/plugins/help/localization/id_ID.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
-$labels['help'] = 'Panduan';
+$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 b81904d..18e1cc9 100644
--- a/plugins/help/localization/it_IT.inc
+++ b/plugins/help/localization/it_IT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini at gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 a41a3b1..4b91c6d 100644
--- a/plugins/help/localization/ja_JP.inc
+++ b/plugins/help/localization/ja_JP.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'ヘルプ';
 $labels['about'] = 'このプログラムについて';
 $labels['license'] = 'ライセンス';
 
+?>
diff --git a/plugins/help/localization/km_KH.inc b/plugins/help/localization/km_KH.inc
index 3a62f93..4cc29ca 100644
--- a/plugins/help/localization/km_KH.inc
+++ b/plugins/help/localization/km_KH.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'ជំនួយ';
 $labels['about'] = 'អំពី';
 $labels['license'] = 'អាជ្ញាប័ណ្ណ';
 
+?>
diff --git a/plugins/help/localization/ko_KR.inc b/plugins/help/localization/ko_KR.inc
index c57dfa0..a589d0c 100644
--- a/plugins/help/localization/ko_KR.inc
+++ b/plugins/help/localization/ko_KR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim at gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = '도움말';
 $labels['about'] = 'ì •ë³´';
 $labels['license'] = '라이센스';
 
+?>
diff --git a/plugins/help/localization/lt_LT.inc b/plugins/help/localization/lt_LT.inc
index a7a2b82..6f615bd 100644
--- a/plugins/help/localization/lt_LT.inc
+++ b/plugins/help/localization/lt_LT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq at akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Žinynas';
 $labels['about'] = 'Apie';
 $labels['license'] = 'Licencija';
 
+?>
diff --git a/plugins/help/localization/nb_NO.inc b/plugins/help/localization/nb_NO.inc
index 34881d6..7024894 100644
--- a/plugins/help/localization/nb_NO.inc
+++ b/plugins/help/localization/nb_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug at thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Hjelp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Lisensvilkår';
 
+?>
diff --git a/plugins/help/localization/nl_NL.inc b/plugins/help/localization/nl_NL.inc
index 6fdf8d4..e0e7bcc 100644
--- a/plugins/help/localization/nl_NL.inc
+++ b/plugins/help/localization/nl_NL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 223df0d..17a694d 100644
--- a/plugins/help/localization/nn_NO.inc
+++ b/plugins/help/localization/nn_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds at ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Hjelp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Lisens';
 
+?>
diff --git a/plugins/help/localization/pl_PL.inc b/plugins/help/localization/pl_PL.inc
index 087bc07..4884ac6 100644
--- a/plugins/help/localization/pl_PL.inc
+++ b/plugins/help/localization/pl_PL.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Pomoc';
 $labels['about'] = 'O programie';
diff --git a/plugins/help/localization/pt_BR.inc b/plugins/help/localization/pt_BR.inc
index f557ad2..79746bd 100644
--- a/plugins/help/localization/pt_BR.inc
+++ b/plugins/help/localization/pt_BR.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Ajuda';
 $labels['about'] = 'Sobre';
diff --git a/plugins/help/localization/pt_PT.inc b/plugins/help/localization/pt_PT.inc
index c28503b..657c33a 100644
--- a/plugins/help/localization/pt_PT.inc
+++ b/plugins/help/localization/pt_PT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Ajuda';
 $labels['about'] = 'Sobre...';
 $labels['license'] = 'Licença';
 
+?>
diff --git a/plugins/help/localization/ru_RU.inc b/plugins/help/localization/ru_RU.inc
index 9f1de41..c1d2e07 100644
--- a/plugins/help/localization/ru_RU.inc
+++ b/plugins/help/localization/ru_RU.inc
@@ -1,18 +1,19 @@
 <?php
 
 /*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
 
-+-----------------------------------------------------------------------+
-| plugins/help/localization/ru_RU.inc                                   |
-|                                                                       |
-| Language file of the Roundcube help plugin                            |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Sergey Dukachev <iam at dukess.ru>                               |
-+-----------------------------------------------------------------------+
-
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
diff --git a/plugins/help/localization/sk_SK.inc b/plugins/help/localization/sk_SK.inc
index 6fdacd1..99d3082 100644
--- a/plugins/help/localization/sk_SK.inc
+++ b/plugins/help/localization/sk_SK.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 d72cd18..9e84d4c 100644
--- a/plugins/help/localization/sl_SI.inc
+++ b/plugins/help/localization/sl_SI.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak at arnes.si>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 b0499f0..a514c1c 100644
--- a/plugins/help/localization/sr_CS.inc
+++ b/plugins/help/localization/sr_CS.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils at gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 8b0d487..ab23f8c 100644
--- a/plugins/help/localization/sv_SE.inc
+++ b/plugins/help/localization/sv_SE.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Hjälp';
 $labels['about'] = 'Om';
diff --git a/plugins/help/localization/tr_TR.inc b/plugins/help/localization/tr_TR.inc
index 306c1c4..cad2574 100644
--- a/plugins/help/localization/tr_TR.inc
+++ b/plugins/help/localization/tr_TR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Yardım';
 $labels['about'] = 'Hakkında';
 $labels['license'] = 'Lisans';
 
+?>
diff --git a/plugins/help/localization/vi_VN.inc b/plugins/help/localization/vi_VN.inc
index 9d0f1e4..bd5fa57 100644
--- a/plugins/help/localization/vi_VN.inc
+++ b/plugins/help/localization/vi_VN.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh at gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
 $labels['help'] = 'Trợ giúp';
-$labels['about'] = 'Lời ngõ';
+$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 da7b7a8..5d6272e 100644
--- a/plugins/help/localization/zh_CN.inc
+++ b/plugins/help/localization/zh_CN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt at gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = '帮助';
 $labels['about'] = '关于';
 $labels['license'] = '许可协议';
 
+?>
diff --git a/plugins/help/localization/zh_TW.inc b/plugins/help/localization/zh_TW.inc
index 6032837..9fc68e4 100644
--- a/plugins/help/localization/zh_TW.inc
+++ b/plugins/help/localization/zh_TW.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = '說明';
 $labels['about'] = '關於';
diff --git a/plugins/help/tests/Help.php b/plugins/help/tests/Help.php
new file mode 100644
index 0000000..baba492
--- /dev/null
+++ b/plugins/help/tests/Help.php
@@ -0,0 +1,23 @@
+<?php
+
+class Help_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../help.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new help($rcube->api);
+
+        $this->assertInstanceOf('help', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/hide_blockquote/localization/az_AZ.inc b/plugins/hide_blockquote/localization/az_AZ.inc
index 6d1563f..e0c6007 100644
--- a/plugins/hide_blockquote/localization/az_AZ.inc
+++ b/plugins/hide_blockquote/localization/az_AZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger at box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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/bs_BA.inc b/plugins/hide_blockquote/localization/bs_BA.inc
index ae9bda5..0b8075b 100644
--- a/plugins/hide_blockquote/localization/bs_BA.inc
+++ b/plugins/hide_blockquote/localization/bs_BA.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008 at gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 d8ca7c9..9a0fc3c 100644
--- a/plugins/hide_blockquote/localization/ca_ES.inc
+++ b/plugins/hide_blockquote/localization/ca_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi at fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 22b2e87..5e3cd65 100644
--- a/plugins/hide_blockquote/localization/cs_CZ.inc
+++ b/plugins/hide_blockquote/localization/cs_CZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tomáš Kyzlink                                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 40b0ec2..f55fab4 100644
--- a/plugins/hide_blockquote/localization/cy_GB.inc
+++ b/plugins/hide_blockquote/localization/cy_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 50fbc71..a807cc3 100644
--- a/plugins/hide_blockquote/localization/da_DK.inc
+++ b/plugins/hide_blockquote/localization/da_DK.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos at openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 28802df..66c9e48 100644
--- a/plugins/hide_blockquote/localization/de_CH.inc
+++ b/plugins/hide_blockquote/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/hide_blockquote/localization/<lang>.inc                        |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
  | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/hide_blockquote/localization/de_DE.inc b/plugins/hide_blockquote/localization/de_DE.inc
index 4ae3b96..66c9e48 100644
--- a/plugins/hide_blockquote/localization/de_DE.inc
+++ b/plugins/hide_blockquote/localization/de_DE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'ausblenden';
 $labels['show'] = 'einblenden';
 $labels['quotelimit'] = 'Zitate verbergen ab einer Zeilenlänge von';
 
+?>
diff --git a/plugins/hide_blockquote/localization/en_GB.inc b/plugins/hide_blockquote/localization/en_GB.inc
index 68f634e..90dd289 100644
--- a/plugins/hide_blockquote/localization/en_GB.inc
+++ b/plugins/hide_blockquote/localization/en_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec at alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 81628a3..5ffaaad 100644
--- a/plugins/hide_blockquote/localization/eo.inc
+++ b/plugins/hide_blockquote/localization/eo.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni at mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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_ES.inc b/plugins/hide_blockquote/localization/es_ES.inc
index 485fef5..b596294 100644
--- a/plugins/hide_blockquote/localization/es_ES.inc
+++ b/plugins/hide_blockquote/localization/es_ES.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Eduardo Alberto Calvo                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
 $labels['hide'] = 'Ocultar';
 $labels['show'] = 'Mostrar';
-$labels['quotelimit'] = 'Ocultar la cita cuando el numero de lineas es mayor que';
+$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 ae426f9..e49dbfb 100644
--- a/plugins/hide_blockquote/localization/et_EE.inc
+++ b/plugins/hide_blockquote/localization/et_EE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Peida';
 $labels['show'] = 'Näita';
 $labels['quotelimit'] = 'Peida tsitaat kui ridade arv on suurem kui';
 
+?>
diff --git a/plugins/hide_blockquote/localization/fa_IR.inc b/plugins/hide_blockquote/localization/fa_IR.inc
index 02934f1..8edc7ae 100644
--- a/plugins/hide_blockquote/localization/fa_IR.inc
+++ b/plugins/hide_blockquote/localization/fa_IR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h at gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 ada6d75..9521498 100644
--- a/plugins/hide_blockquote/localization/fi_FI.inc
+++ b/plugins/hide_blockquote/localization/fi_FI.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
 $labels['hide'] = 'Piilota';
 $labels['show'] = 'Näytä';
-$labels['quotelimit'] = 'Piilota lainaus, kun rivien lukumäärä on suurempi kuin';
+$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 5964186..e789fb8 100644
--- a/plugins/hide_blockquote/localization/fr_FR.inc
+++ b/plugins/hide_blockquote/localization/fr_FR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Patrick Fiquet                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 bb45812..37a81e4 100644
--- a/plugins/hide_blockquote/localization/gl_ES.inc
+++ b/plugins/hide_blockquote/localization/gl_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: oterobueu <oterobueu at gmail.com>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 9ddc6bd..edcba50 100644
--- a/plugins/hide_blockquote/localization/he_IL.inc
+++ b/plugins/hide_blockquote/localization/he_IL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish at mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'הסתר';
 $labels['show'] = 'הצג';
 $labels['quotelimit'] = 'הסתר ציטוט כאשר מספר השורות גדול מ-';
 
+?>
diff --git a/plugins/hide_blockquote/localization/hu_HU.inc b/plugins/hide_blockquote/localization/hu_HU.inc
index a3418f4..964d1ae 100644
--- a/plugins/hide_blockquote/localization/hu_HU.inc
+++ b/plugins/hide_blockquote/localization/hu_HU.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 8aa5f2d..5ad32d8 100644
--- a/plugins/hide_blockquote/localization/hy_AM.inc
+++ b/plugins/hide_blockquote/localization/hy_AM.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan at yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Թաքցնել';
 $labels['show'] = 'Ցուցադրել';
 $labels['quotelimit'] = 'Թաքցնել ցիտումը երբ տողերի քանակը գերազանցում է';
 
+?>
diff --git a/plugins/hide_blockquote/localization/id_ID.inc b/plugins/hide_blockquote/localization/id_ID.inc
index 8be79a6..5b3785d 100644
--- a/plugins/hide_blockquote/localization/id_ID.inc
+++ b/plugins/hide_blockquote/localization/id_ID.inc
@@ -2,18 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
 $labels['hide'] = 'Sembunyi';
-$labels['show'] = 'Tampak';
+$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 6ae2b6e..40a93a9 100644
--- a/plugins/hide_blockquote/localization/it_IT.inc
+++ b/plugins/hide_blockquote/localization/it_IT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini at gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 3fbbb28..b300699 100644
--- a/plugins/hide_blockquote/localization/ja_JP.inc
+++ b/plugins/hide_blockquote/localization/ja_JP.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 d83dd8b..73895d1 100644
--- a/plugins/hide_blockquote/localization/ko_KR.inc
+++ b/plugins/hide_blockquote/localization/ko_KR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim at gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = '숨기기';
 $labels['show'] = '보이기';
 $labels['quotelimit'] = '라인 개수가 정해진 개수보다 클 때 인용구 감추기';
 
+?>
diff --git a/plugins/hide_blockquote/localization/lt_LT.inc b/plugins/hide_blockquote/localization/lt_LT.inc
index 159f174..931c2ee 100644
--- a/plugins/hide_blockquote/localization/lt_LT.inc
+++ b/plugins/hide_blockquote/localization/lt_LT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq at akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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/nb_NO.inc b/plugins/hide_blockquote/localization/nb_NO.inc
index da50e85..5dafd7f 100644
--- a/plugins/hide_blockquote/localization/nb_NO.inc
+++ b/plugins/hide_blockquote/localization/nb_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug at thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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_NL.inc b/plugins/hide_blockquote/localization/nl_NL.inc
index 1e14835..a684b63 100644
--- a/plugins/hide_blockquote/localization/nl_NL.inc
+++ b/plugins/hide_blockquote/localization/nl_NL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 32085ca..fd7b49d 100644
--- a/plugins/hide_blockquote/localization/nn_NO.inc
+++ b/plugins/hide_blockquote/localization/nn_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds at ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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/pl_PL.inc b/plugins/hide_blockquote/localization/pl_PL.inc
index 0a83391..dbca969 100644
--- a/plugins/hide_blockquote/localization/pl_PL.inc
+++ b/plugins/hide_blockquote/localization/pl_PL.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+*/
+
 $labels = array();
 $labels['hide'] = 'Ukryj';
 $labels['show'] = 'Pokaż';
diff --git a/plugins/hide_blockquote/localization/pt_BR.inc b/plugins/hide_blockquote/localization/pt_BR.inc
index 3acdd45..76c856a 100644
--- a/plugins/hide_blockquote/localization/pt_BR.inc
+++ b/plugins/hide_blockquote/localization/pt_BR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Victor Benincasa <vbenincasa at gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 8afa6d5..0ccfbe5 100644
--- a/plugins/hide_blockquote/localization/pt_PT.inc
+++ b/plugins/hide_blockquote/localization/pt_PT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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/ru_RU.inc b/plugins/hide_blockquote/localization/ru_RU.inc
index ab7733e..657548a 100644
--- a/plugins/hide_blockquote/localization/ru_RU.inc
+++ b/plugins/hide_blockquote/localization/ru_RU.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Sergey Dukachev <admin at mfitness.ru>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 e926383..9a00836 100644
--- a/plugins/hide_blockquote/localization/sk_SK.inc
+++ b/plugins/hide_blockquote/localization/sk_SK.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 31cfc3c..66e4b4e 100644
--- a/plugins/hide_blockquote/localization/sl_SI.inc
+++ b/plugins/hide_blockquote/localization/sl_SI.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak at arnes.si>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 485ef59..5df13d3 100644
--- a/plugins/hide_blockquote/localization/sr_CS.inc
+++ b/plugins/hide_blockquote/localization/sr_CS.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils at gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 c6abb48..a6e43f6 100644
--- a/plugins/hide_blockquote/localization/sv_SE.inc
+++ b/plugins/hide_blockquote/localization/sv_SE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Dölj';
 $labels['show'] = 'Visa';
 $labels['quotelimit'] = 'Dölj citat när antalet rader överstiger';
 
+?>
diff --git a/plugins/hide_blockquote/localization/tr_TR.inc b/plugins/hide_blockquote/localization/tr_TR.inc
index 525ec50..350ccb2 100644
--- a/plugins/hide_blockquote/localization/tr_TR.inc
+++ b/plugins/hide_blockquote/localization/tr_TR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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/vi_VN.inc b/plugins/hide_blockquote/localization/vi_VN.inc
index fc2cb50..9d46737 100644
--- a/plugins/hide_blockquote/localization/vi_VN.inc
+++ b/plugins/hide_blockquote/localization/vi_VN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77 at gmail.com>                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 5d66f4d..1450dd6 100644
--- a/plugins/hide_blockquote/localization/zh_CN.inc
+++ b/plugins/hide_blockquote/localization/zh_CN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt at gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $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 c3a5fe5..22ea645 100644
--- a/plugins/hide_blockquote/localization/zh_TW.inc
+++ b/plugins/hide_blockquote/localization/zh_TW.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: 林子忠                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = '隱藏';
 $labels['show'] = '顯示';
 $labels['quotelimit'] = '隱藏引文當行數大於';
 
+?>
diff --git a/plugins/hide_blockquote/tests/HideBlockquote.php b/plugins/hide_blockquote/tests/HideBlockquote.php
new file mode 100644
index 0000000..030c053
--- /dev/null
+++ b/plugins/hide_blockquote/tests/HideBlockquote.php
@@ -0,0 +1,23 @@
+<?php
+
+class HideBlockquote_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../hide_blockquote.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new hide_blockquote($rcube->api);
+
+        $this->assertInstanceOf('hide_blockquote', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/http_authentication/tests/HttpAuthentication.php b/plugins/http_authentication/tests/HttpAuthentication.php
new file mode 100644
index 0000000..c172368
--- /dev/null
+++ b/plugins/http_authentication/tests/HttpAuthentication.php
@@ -0,0 +1,23 @@
+<?php
+
+class HttpAuthentication_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../http_authentication.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new http_authentication($rcube->api);
+
+        $this->assertInstanceOf('http_authentication', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/jqueryui/tests/Jqueryui.php b/plugins/jqueryui/tests/Jqueryui.php
new file mode 100644
index 0000000..3bcd27c
--- /dev/null
+++ b/plugins/jqueryui/tests/Jqueryui.php
@@ -0,0 +1,23 @@
+<?php
+
+class Jqueryui_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../jqueryui.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new jqueryui($rcube->api);
+
+        $this->assertInstanceOf('jqueryui', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 19799a3..5f31d31 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,4 +1,8 @@
+* version 6.2 [2013-02-17]
+-----------------------------------------------------------
 - Support tls:// prefix in managesieve_host option
+- Removed depracated functions usage
+- Don't trim whitespace in folder names (#1488955)
 
 * version 6.1 [2012-12-21]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index cc025b5..35ca871 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger at box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $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ı';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Silindi';
 $labels['flaganswered'] = 'Cavab verilmiÅŸ';
 $labels['flagflagged'] = 'İşarəlilər';
 $labels['flagdraft'] = 'Qaralama';
+$labels['setvariable'] = 'Set variable';
+$labels['setvarname'] = 'Variable name:';
+$labels['setvarvalue'] = 'Variable value:';
+$labels['setvarmodifiers'] = 'Modifikatorlar';
+$labels['varlower'] = 'aşağı registr';
+$labels['varupper'] = 'yuxarı registr';
+$labels['varlowerfirst'] = 'aşağı registrdə birinci simvol';
+$labels['varupperfirst'] = 'yuxarı registrdə birinci simvol';
+$labels['varquotewildcard'] = 'dırnaq simvolu';
+$labels['varlength'] = 'uzunluq';
+$labels['notify'] = 'Bildiriş göndər';
+$labels['notifyaddress'] = 'Poçt ünvanı:';
+$labels['notifybody'] = 'Bildiriş mətni';
+$labels['notifysubject'] = 'Bildiriş mövzusu';
+$labels['notifyfrom'] = 'BildiriÅŸi yolla:';
+$labels['notifyimportance'] = 'Vaciblik';
+$labels['notifyimportancelow'] = 'aşağı';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'yuxarı';
 $labels['filtercreate'] = 'Süzgəc yarat';
 $labels['usedata'] = 'Süzgəcdə bu məlumatları istifadə et:';
 $labels['nextstep'] = 'Sonrakı';
@@ -115,35 +137,38 @@ $labels['default'] = 'ön qurğulu';
 $labels['octet'] = 'ciddi (oktet)';
 $labels['asciicasemap'] = 'qeydiyyat üzrə müstəqil (ascii-casemap)';
 $labels['asciinumeric'] = 'ədədi (ascii-numeric)';
-$labels['filterunknownerror'] = 'Serverin naməlum xətası.';
-$labels['filterconnerror'] = 'Serverə qoşulmaq alınmır';
-$labels['filterdeleteerror'] = 'Süzgəci silmək mümkün deyil. Server xətası.';
-$labels['filterdeleted'] = 'Süzgəc uğurla silindi.';
-$labels['filtersaved'] = 'Süzgəc uğurla saxlanıldı.';
-$labels['filtersaveerror'] = 'Süzgəci saxlamaq mümkün deyil. Server xətası.';
-$labels['filterdeleteconfirm'] = 'Siz həqiqətən süzgəci silmək istəyirsiniz?';
-$labels['ruledeleteconfirm'] = 'Bu qaydanı silməkdə əminsiniz?';
-$labels['actiondeleteconfirm'] = 'Bu hərəkəti silməkdə əminsiniz?';
-$labels['forbiddenchars'] = 'Sahədə qadağan edilən işarələr.';
-$labels['cannotbeempty'] = 'Sahə boş ola bilməz.';
-$labels['ruleexist'] = 'Bu adla süzgəc artıq mövcuddur.';
-$labels['setactivateerror'] = 'Seçilmiş süzgəc dəstini yandırmaq mümkün deyil. Server xətası.';
-$labels['setdeactivateerror'] = 'Seçilmiş süzgəc dəstini söndürmək mümkün deyil. Server xətası.';
-$labels['setdeleteerror'] = 'Seçilmiş süzgəc dəstini silmək mümkün deyil. Server xətası.';
-$labels['setactivated'] = 'Süzgəc dəsti yandırıldı.';
-$labels['setdeactivated'] = 'Süzgəc dəsti söndürüldü.';
-$labels['setdeleted'] = 'Süzgəc dəsti silindi.';
-$labels['setdeleteconfirm'] = 'Bu süzgəc dəstini silməkdə əminsiniz?';
-$labels['setcreateerror'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Server xərası.';
-$labels['setcreated'] = 'Süzgəc dəsti uğurla yaradıldı.';
-$labels['activateerror'] = 'Seçilmiş süzgəc(lər)i yandırmaq mümkün deyil. Server xətası.';
-$labels['deactivateerror'] = 'Seçilmiş süzgəc(lər)i söndürmək mümkün deyil. Server xətası.';
-$labels['activated'] = 'Süzgəc(lər) uğurla söndürüldü.';
-$labels['deactivated'] = 'Süzgəc(lər) uğurla yandırıldı.';
-$labels['moved'] = 'Süzgəc uğurla köçürüldü.';
-$labels['moveerror'] = 'Süzgəci köçürmək mümkün deyil. Server xətası.';
-$labels['nametoolong'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Ad çox uzundur.';
-$labels['namereserved'] = 'Rezerv edilmiÅŸ ad.';
-$labels['setexist'] = 'Dəst artıq mövcuddur.';
-$labels['nodata'] = 'Heç olmasa bir mövqe tutmaq lazımdır!';
 
+$messages = array();
+$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!';
+
+?>
diff --git a/plugins/managesieve/localization/be_BE.inc b/plugins/managesieve/localization/be_BE.inc
index 00a409c..47719e8 100644
--- a/plugins/managesieve/localization/be_BE.inc
+++ b/plugins/managesieve/localization/be_BE.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab at mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Фільтры';
 $labels['managefilters'] = 'Кіраваць фільтрамі ўваходнае пошты';
 $labels['filtername'] = 'Назва фільтра';
@@ -36,6 +38,8 @@ $labels['filtermatches'] = 'супадае з выразам';
 $labels['filternotmatches'] = 'не супадае з выразам';
 $labels['filterregex'] = 'супадае са сталым выразам';
 $labels['filternotregex'] = 'не супадае са сталым выразам';
+$labels['filterunder'] = 'under';
+$labels['filterover'] = 'over';
 $labels['addrule'] = 'Дадаць правіла';
 $labels['delrule'] = 'Выдаліць правіла';
 $labels['messagemoveto'] = 'Перамясціць паведамленне ў';
@@ -44,10 +48,127 @@ $labels['messagecopyto'] = 'Скапіяваць паведамленне ў';
 $labels['messagesendcopy'] = 'Даслаць копію на';
 $labels['messagereply'] = 'Адказаць наступнае';
 $labels['messagedelete'] = 'Выдаліць паведамленне';
+$labels['messagediscard'] = 'Discard with message';
+$labels['messagesrules'] = 'For incoming mail:';
+$labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'Дадаць';
 $labels['del'] = 'Выдаліць';
 $labels['sender'] = 'Ад каго';
 $labels['recipient'] = 'Каму';
 $labels['vacationaddresses'] = 'Дадатковы спіс атрымальнікаў (праз коску):';
 $labels['vacationdays'] = 'Як часта дасылаць паведамленні (ў днях):';
+$labels['vacationreason'] = 'Message body (vacation reason):';
+$labels['vacationsubject'] = 'Message subject:';
+$labels['rulestop'] = 'Stop evaluating rules';
+$labels['enable'] = 'Enable/Disable';
+$labels['filterset'] = 'Filters set';
+$labels['filtersets'] = 'Filter sets';
+$labels['filtersetadd'] = 'Add filters set';
+$labels['filtersetdel'] = 'Delete current filters set';
+$labels['filtersetact'] = 'Activate current filters set';
+$labels['filtersetdeact'] = 'Deactivate current filters set';
+$labels['filterdef'] = 'Filter definition';
+$labels['filtersetname'] = 'Filters set name';
+$labels['newfilterset'] = 'New filters set';
+$labels['active'] = 'active';
+$labels['none'] = 'none';
+$labels['fromset'] = 'from set';
+$labels['fromfile'] = 'from file';
+$labels['filterdisabled'] = 'Filter disabled';
+$labels['countisgreaterthan'] = 'count is greater than';
+$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
+$labels['countislessthan'] = 'count is less than';
+$labels['countislessthanequal'] = 'count is less than or equal to';
+$labels['countequals'] = 'count is equal to';
+$labels['countnotequals'] = 'count does not equal';
+$labels['valueisgreaterthan'] = 'value is greater than';
+$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
+$labels['valueislessthan'] = 'value is less than';
+$labels['valueislessthanequal'] = 'value is less than or equal to';
+$labels['valueequals'] = 'value is equal to';
+$labels['valuenotequals'] = 'value does not equal';
+$labels['setflags'] = 'Set flags to the message';
+$labels['addflags'] = 'Add flags to the message';
+$labels['removeflags'] = 'Remove flags from the message';
+$labels['flagread'] = 'Read';
+$labels['flagdeleted'] = 'Deleted';
+$labels['flaganswered'] = 'Answered';
+$labels['flagflagged'] = 'Flagged';
+$labels['flagdraft'] = 'Draft';
+$labels['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['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)';
+
+$messages = array();
+$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!';
 
+?>
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index 785ac7b..f718e3d 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Филтри';
 $labels['managefilters'] = 'Управление на филтри за входяща поща';
 $labels['filtername'] = 'Име на филтър';
@@ -32,30 +34,141 @@ $labels['filteris'] = 'е равно на';
 $labels['filterisnot'] = 'не е равно на';
 $labels['filterexists'] = 'съществува';
 $labels['filternotexists'] = 'не съществува';
+$labels['filtermatches'] = 'съответствия при израз';
+$labels['filternotmatches'] = 'няма съвпадения при израз';
+$labels['filterregex'] = 'съвпадения при обикновен израз';
+$labels['filternotregex'] = 'няма съвпадения при обикновен израз';
 $labels['filterunder'] = 'под';
 $labels['filterover'] = 'над';
 $labels['addrule'] = 'Добавяне на правило';
 $labels['delrule'] = 'Изтриване на правило';
 $labels['messagemoveto'] = 'Преместване на съобщението в';
 $labels['messageredirect'] = 'Пренасочване на съобщението до';
+$labels['messagecopyto'] = 'Копиране на съобщенията в';
+$labels['messagesendcopy'] = 'Изпращане на копие до';
 $labels['messagereply'] = 'Отговор със съобщение';
 $labels['messagedelete'] = 'Изтриване на съобщение';
 $labels['messagediscard'] = 'Отхвърляне със съобщение';
 $labels['messagesrules'] = 'За входящата поща:';
-$labels['messagesactions'] = '...изпълнение на следните действия';
+$labels['messagesactions'] = '... изпълнение на следните действия:';
 $labels['add'] = 'Добавяне';
 $labels['del'] = 'Изтриване';
 $labels['sender'] = 'Подател';
 $labels['recipient'] = 'Получател';
-$labels['filterunknownerror'] = 'Неизвестна грешка на сървъра';
-$labels['filterconnerror'] = 'Невъзможност за свързване с managesieve сървъра';
-$labels['filterdeleteerror'] = 'Невъзможност за изтриване на филтър. Сървър грешка';
-$labels['filterdeleted'] = 'Филтърът е изтрит успешно';
-$labels['filtersaved'] = 'Филтърът е записан успешно';
-$labels['filtersaveerror'] = 'Филтърът не може да бъде записан. Сървър грешка.';
-$labels['filterdeleteconfirm'] = 'Наистина ли искате да изтриете избрания филтър?';
-$labels['ruledeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното правило?';
-$labels['actiondeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното действие?';
-$labels['forbiddenchars'] = 'Забранени символи в полето';
-$labels['cannotbeempty'] = 'Полето не може да бъде празно';
+$labels['vacationaddresses'] = 'Допълнителни e-mail адреси (разделени със запетая):';
+$labels['vacationdays'] = 'Колко често пращате съобщения (в дни):';
+$labels['vacationreason'] = 'Текст на съобщението (причина за ваканцията)';
+$labels['vacationsubject'] = 'Тема на съобщението';
+$labels['rulestop'] = 'Правила за спиране';
+$labels['enable'] = 'Включено/Изключено';
+$labels['filterset'] = 'Избрани филтри';
+$labels['filtersets'] = 'Избрани филтри';
+$labels['filtersetadd'] = 'Добавяне на избран филтър';
+$labels['filtersetdel'] = 'Изтриване на текущ филтър';
+$labels['filtersetact'] = 'Активиране на текущи филтри';
+$labels['filtersetdeact'] = 'Деактивиране на текущи филтри';
+$labels['filterdef'] = 'Дефиниране на филтър';
+$labels['filtersetname'] = 'Име на филтър';
+$labels['newfilterset'] = 'Нов филтър';
+$labels['active'] = 'активен';
+$labels['none'] = 'няма';
+$labels['fromset'] = 'от набор';
+$labels['fromfile'] = 'от файл';
+$labels['filterdisabled'] = 'Изключен филтър';
+$labels['countisgreaterthan'] = 'отброявай като по-висок от';
+$labels['countisgreaterthanequal'] = 'отброявай като по-висок или равен на';
+$labels['countislessthan'] = 'отброявай като по-малък';
+$labels['countislessthanequal'] = 'отброявай като по-малък или равен на';
+$labels['countequals'] = 'отброявай като равен на';
+$labels['countnotequals'] = 'отброявай неравните';
+$labels['valueisgreaterthan'] = 'стойността е по-висока от';
+$labels['valueisgreaterthanequal'] = 'стойността е по-висока от или равна на';
+$labels['valueislessthan'] = 'стойността е по-ниска от';
+$labels['valueislessthanequal'] = 'стойността е по-ниска или равна на';
+$labels['valueequals'] = 'стойността е равна на';
+$labels['valuenotequals'] = 'стойността не е равна';
+$labels['setflags'] = 'Избор на флагове за съобщенията';
+$labels['addflags'] = 'Добавяне на флагове за съобщенията';
+$labels['removeflags'] = 'Премахване на флагове от съобщенията';
+$labels['flagread'] = 'Четене';
+$labels['flagdeleted'] = 'Изтрито';
+$labels['flaganswered'] = 'Отговорено';
+$labels['flagflagged'] = 'Отбелязано';
+$labels['flagdraft'] = 'Чернова';
+$labels['setvariable'] = 'Въвеждане на променлива';
+$labels['setvarname'] = 'Име на променлива:';
+$labels['setvarvalue'] = 'Стойност на променлива:';
+$labels['setvarmodifiers'] = 'Промени:';
+$labels['varlower'] = 'малки букви';
+$labels['varupper'] = 'главни букви';
+$labels['varlowerfirst'] = 'първи знак с малка буква';
+$labels['varupperfirst'] = 'първи знак с главна буква';
+$labels['varquotewildcard'] = 'цитиране на специални знаци';
+$labels['varlength'] = 'дължина';
+$labels['notify'] = 'Известие за изпращане';
+$labels['notifyaddress'] = 'До e-mail адреси:';
+$labels['notifybody'] = 'Известие:';
+$labels['notifysubject'] = 'Тема на известието';
+$labels['notifyfrom'] = 'Подател на известието';
+$labels['notifyimportance'] = 'Важност:';
+$labels['notifyimportancelow'] = 'ниска';
+$labels['notifyimportancenormal'] = 'нормална';
+$labels['notifyimportancehigh'] = 'висока';
+$labels['filtercreate'] = 'Нов филтър';
+$labels['usedata'] = 'Ползват се следните данни във филтъра:';
+$labels['nextstep'] = 'Следваща стъпка';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Разширени настройки';
+$labels['body'] = 'Основа';
+$labels['address'] = 'адрес';
+$labels['envelope'] = 'плик';
+$labels['modifier'] = 'промени:';
+$labels['text'] = 'текст';
+$labels['undecoded'] = 'без кодиране';
+$labels['contenttype'] = 'тип на съдържанието';
+$labels['modtype'] = 'тип:';
+$labels['allparts'] = 'всичко';
+$labels['domain'] = 'домейн';
+$labels['localpart'] = 'локална част';
+$labels['user'] = 'потребител';
+$labels['detail'] = 'данни';
+$labels['comparator'] = 'за сравнение:';
+$labels['default'] = 'по подразбиране';
+$labels['octet'] = 'стриктно';
+$labels['asciicasemap'] = 'без значение от малки/големи букви';
+$labels['asciinumeric'] = 'цифрово';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Неизвестна грешка на сървъра';
+$messages['filterconnerror'] = 'Невъзможност за свързване с managesieve сървъра';
+$messages['filterdeleteerror'] = 'Невъзможност за изтриване на филтър. Сървър грешка';
+$messages['filterdeleted'] = 'Филтърът е изтрит успешно';
+$messages['filtersaved'] = 'Филтърът е записан успешно';
+$messages['filtersaveerror'] = 'Филтърът не може да бъде записан. Сървър грешка.';
+$messages['filterdeleteconfirm'] = 'Наистина ли искате да изтриете избрания филтър?';
+$messages['ruledeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното правило?';
+$messages['actiondeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното действие?';
+$messages['forbiddenchars'] = 'Забранени символи в полето';
+$messages['cannotbeempty'] = 'Полето не може да бъде празно';
+$messages['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'] = 'Поне една позиция трябва да е избрана!';
 
+?>
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index 438d99e..e12886f 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008 at gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filteri';
 $labels['managefilters'] = 'Upravljanje dolaznim email filterima';
 $labels['filtername'] = 'Naziv filtera';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Obrisano';
 $labels['flaganswered'] = 'Odgovoreno';
 $labels['flagflagged'] = 'Važno';
 $labels['flagdraft'] = 'Skica';
+$labels['setvariable'] = 'Postavi promjenjivu';
+$labels['setvarname'] = 'Naziv promjenjive:';
+$labels['setvarvalue'] = 'Vrijednost promjenjive:';
+$labels['setvarmodifiers'] = 'Parametri:';
+$labels['varlower'] = 'mala slova';
+$labels['varupper'] = 'velika slova';
+$labels['varlowerfirst'] = 'prvi znak malim slovom';
+$labels['varupperfirst'] = 'prvi znak velikim slovom';
+$labels['varquotewildcard'] = 'citiraj specijalne znakove';
+$labels['varlength'] = 'dužina';
+$labels['notify'] = 'Pošalji napomenu';
+$labels['notifyaddress'] = 'Na email adresu:';
+$labels['notifybody'] = 'Sadržaj napomene:';
+$labels['notifysubject'] = 'Naslov napomene:';
+$labels['notifyfrom'] = 'Pošiljalac napomene:';
+$labels['notifyimportance'] = 'Prioritet:';
+$labels['notifyimportancelow'] = 'mali';
+$labels['notifyimportancenormal'] = 'obični';
+$labels['notifyimportancehigh'] = 'veliki';
 $labels['filtercreate'] = 'Kreiraj filter';
 $labels['usedata'] = 'Koristite sljedeće podatke u filteru:';
 $labels['nextstep'] = 'Sljedeći korak';
@@ -115,35 +137,38 @@ $labels['default'] = 'početno';
 $labels['octet'] = 'striktno (oktet)';
 $labels['asciicasemap'] = 'osjetljivo na velika/mala slova (ascii-casemap)';
 $labels['asciinumeric'] = 'numerički (ascii-numeric)';
-$labels['filterunknownerror'] = 'Nepoznata serverska greška.';
-$labels['filterconnerror'] = 'Nije se moguće povezati na server.';
-$labels['filterdeleteerror'] = 'Nije moguće obrisati filter. Desila se serverska greška.';
-$labels['filterdeleted'] = 'Filter je uspješno obrisan.';
-$labels['filtersaved'] = 'Filter je uspješno sačuvan.';
-$labels['filtersaveerror'] = 'Nije moguće sačuvati filter. Desila se serverska greška.';
-$labels['filterdeleteconfirm'] = 'Da li zaista želite obrisati označeni filter?';
-$labels['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati označeno pravilo?';
-$labels['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati označenu akciju?';
-$labels['forbiddenchars'] = 'U polje su uneseni nedozvoljeni znakovi.';
-$labels['cannotbeempty'] = 'Polje ne može biti prazno.';
-$labels['ruleexist'] = 'Filter s tim imenom već postoji.';
-$labels['setactivateerror'] = 'Nije moguće aktivirati označeni set filtera. Desila se serverska greška.';
-$labels['setdeactivateerror'] = 'Nije moguće deaktivirati označeni set filtera. Desila se serverska greška.';
-$labels['setdeleteerror'] = 'Nije moguće obrisati označeni set filtera. Desila se serverska greška.';
-$labels['setactivated'] = 'Set filtera je uspješno aktiviran.';
-$labels['setdeactivated'] = 'Set filtera je uspješno deaktiviran.';
-$labels['setdeleted'] = 'Set filtera je uspješno obrisan.';
-$labels['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati označeni set filtera?';
-$labels['setcreateerror'] = 'Nije moguće kreirati se filtera. Desila se serverska greška.';
-$labels['setcreated'] = 'Set filtera je uspješno kreiran.';
-$labels['activateerror'] = 'Nije moguće omogućiti označene filtere. Desila se serverska greška.';
-$labels['deactivateerror'] = 'Nije moguće onemogućiti označene filtere. Desila se serverska greška.';
-$labels['activated'] = 'Filteri su uspješno onemogućeni.';
-$labels['deactivated'] = 'Filteri su uspješno omogućeni.';
-$labels['moved'] = 'Filteri su uspješno premješteni.';
-$labels['moveerror'] = 'Nije moguće premjestiti označeni filter. Desila se serverska greška.';
-$labels['nametoolong'] = 'Ime je predugo.';
-$labels['namereserved'] = 'Ime je rezervisano.';
-$labels['setexist'] = 'Set već postoji.';
-$labels['nodata'] = 'Morate označiti barem jednu poziciju!';
 
+$messages = array();
+$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.';
+$messages['nodata'] = 'Morate označiti barem jednu poziciju!';
+
+?>
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index d7e8b67..2320dfe 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi at fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtres';
 $labels['managefilters'] = 'Gestiona els filtres dels missatges d\'entrada';
 $labels['filtername'] = 'Nom del filtre';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Suprimit';
 $labels['flaganswered'] = 'Respost';
 $labels['flagflagged'] = 'Marcat';
 $labels['flagdraft'] = 'Esborrany';
+$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'] = 'Crea filtre';
 $labels['usedata'] = 'Fes servir les següents dades al filtre:';
 $labels['nextstep'] = 'Següent pas';
@@ -115,35 +137,38 @@ $labels['default'] = 'per omissió';
 $labels['octet'] = 'estricte (octet)';
 $labels['asciicasemap'] = 'No distingeix entre majúscules i minúscules  (ascii-casemap)';
 $labels['asciinumeric'] = 'numèric (ascii-numeric)';
-$labels['filterunknownerror'] = 'Error desconegut al servidor.';
-$labels['filterconnerror'] = 'No s\'ha pogut connectar al servidor.';
-$labels['filterdeleteerror'] = 'No s\'ha pogut suprimir el filtre. Hi ha hagut un error al servidor.';
-$labels['filterdeleted'] = 'El filtre s\'ha suprimit correctament.';
-$labels['filtersaved'] = 'Filtre desat correctament.';
-$labels['filtersaveerror'] = 'No s\'ha pogut desar el filtre. Hi ha hagut un error al servidor.';
-$labels['filterdeleteconfirm'] = 'Realment voleu suprimit el filtre seleccionat?';
-$labels['ruledeleteconfirm'] = 'Esteu segur que voleu suprimir la norma seleccionada?';
-$labels['actiondeleteconfirm'] = 'Esteu segur que voleu suprimir l\'acció seleccionada?';
-$labels['forbiddenchars'] = 'El camp conté caràcters prohibits.';
-$labels['cannotbeempty'] = 'El camp no pot estar buit.';
-$labels['ruleexist'] = 'Ja existeix un filtre amb aquest nom';
-$labels['setactivateerror'] = 'No s\'ha pogut activar el fitlre seleccionat. Hi ha hagut un error al servidor.';
-$labels['setdeactivateerror'] = 'No s\'ha pogut desactivar el fitlre seleccionat. Hi ha hagut un error al servidor.';
-$labels['setdeleteerror'] = 'No s\'ha pogut suprimir el conjunt de filtres seleccionats. Hi ha hagut un error al servidor.';
-$labels['setactivated'] = 'El conjunt de filtres s\'ha activat correctament.';
-$labels['setdeactivated'] = 'El conjunt de filtres s\'ha desactivat correctament.';
-$labels['setdeleted'] = 'El conjunt de filtres s\'ha suprimit correctament.';
-$labels['setdeleteconfirm'] = 'Esteu segurs que voleu suprimir el conjunt de filtres seleccionats?';
-$labels['setcreateerror'] = 'No s\'ha pogut crear el conjunt de filtres. Hi ha hagut un error al servidor.';
-$labels['setcreated'] = 'S\'ha creat correctament el conjunt de filtres.';
-$labels['activateerror'] = 'No s\'ha pogut habilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
-$labels['deactivateerror'] = 'No s\'ha pogut deshabilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
-$labels['activated'] = 'Filtre(s) deshabilitat(s) correctament.';
-$labels['deactivated'] = 'Filtre(s) habilitat(s) correctament.';
-$labels['moved'] = 'S\'ha mogut correctament el filtre.';
-$labels['moveerror'] = 'No s\'ha pogut moure el filtre seleccionat. Hi ha hagut un error al servidor.';
-$labels['nametoolong'] = 'El nom és massa llarg.';
-$labels['namereserved'] = 'Nom reservat.';
-$labels['setexist'] = 'El conjunt ja existeix.';
-$labels['nodata'] = 'S\'ha de seleccionar com a mínim una posició!';
 
+$messages = array();
+$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.';
+$messages['nodata'] = 'S\'ha de seleccionar com a mínim una posició!';
+
+?>
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index 7239454..0d7dfb2 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtry';
 $labels['managefilters'] = 'Nastavení filtrů';
 $labels['filtername'] = 'Název filtru';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Smazáno';
 $labels['flaganswered'] = 'Odpovězené';
 $labels['flagflagged'] = 'Označeno';
 $labels['flagdraft'] = 'Koncept';
+$labels['setvariable'] = 'Nastavit proměnnou';
+$labels['setvarname'] = 'Název proměnné:';
+$labels['setvarvalue'] = 'Hodnota proměnné:';
+$labels['setvarmodifiers'] = 'Modifikátory:';
+$labels['varlower'] = 'malá písmena';
+$labels['varupper'] = 'velká písmena';
+$labels['varlowerfirst'] = 'první písmeno malé';
+$labels['varupperfirst'] = 'první písmeno velké';
+$labels['varquotewildcard'] = 'uvodit speciální znaky uvozovkama';
+$labels['varlength'] = 'délka';
+$labels['notify'] = 'Odeslat oznámení';
+$labels['notifyaddress'] = 'Na emailovou adresu:';
+$labels['notifybody'] = 'Zpráva oznámení:';
+$labels['notifysubject'] = 'Předmět oznámení:';
+$labels['notifyfrom'] = 'Odesílatel oznámení:';
+$labels['notifyimportance'] = 'Důležitost:';
+$labels['notifyimportancelow'] = 'nízká';
+$labels['notifyimportancenormal'] = 'normální';
+$labels['notifyimportancehigh'] = 'vysoká';
 $labels['filtercreate'] = 'Vytvořit filtr';
 $labels['usedata'] = 'Použít následující údaje ve filtru:';
 $labels['nextstep'] = 'Další krok';
@@ -115,35 +137,38 @@ $labels['default'] = 'výchozí';
 $labels['octet'] = 'striktní (oktet)';
 $labels['asciicasemap'] = 'necitlivé na velikost písmen (ascii-casemap)';
 $labels['asciinumeric'] = 'číslené (ascii-numeric)';
-$labels['filterunknownerror'] = 'Neznámá chyba serveru';
-$labels['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
-$labels['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
-$labels['filterdeleted'] = 'Filtr byl smazán';
-$labels['filtersaved'] = 'Filtr byl uložen';
-$labels['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
-$labels['filterdeleteconfirm'] = 'Opravdu chcete smazat vybraný filtr?';
-$labels['ruledeleteconfirm'] = 'Jste si jisti, že chcete smazat vybrané pravidlo?';
-$labels['actiondeleteconfirm'] = 'Jste si jisti, že chcete smazat vybranou akci?';
-$labels['forbiddenchars'] = 'Zakázané znaky v poli';
-$labels['cannotbeempty'] = 'Pole nemůže být prázdné';
-$labels['ruleexist'] = 'Filtr s uvedeným názvem již existuje.';
-$labels['setactivateerror'] = 'Nelze zapnout vybranou sadu filtrů. Došlo k chybě serveru.';
-$labels['setdeactivateerror'] = 'Nelze vypnout vybranou sadu filtrů. Došlo k chybě serveru.';
-$labels['setdeleteerror'] = 'Nelze odstranit vybranou sadu filtrů. Došlo k chybě serveru.';
-$labels['setactivated'] = 'Sada filtrů úspěšně zapnuta.';
-$labels['setdeactivated'] = 'Sada filtrů úspěšně vypnuta.';
-$labels['setdeleted'] = 'Sada filtrů úspěšně odstraněna.';
-$labels['setdeleteconfirm'] = 'Opravdu si přejete odebrat vybranou sadu filtrů.';
-$labels['setcreateerror'] = 'Nelze vytvořit sadu filtrů. Došlo k chybě serveru.';
-$labels['setcreated'] = 'Sada filtrů úspěšně vytvořena.';
-$labels['activateerror'] = 'Nelze zapnout vybrané filtr/y. Došlo k chybě serveru.';
-$labels['deactivateerror'] = 'Nelze vypnout vybrané filtr/y. Došlo k chybě serveru.';
-$labels['activated'] = 'Filtr/y úspěšne vypnuty.';
-$labels['deactivated'] = 'Filtr/y úspěšně zapnuty.';
-$labels['moved'] = 'Filtr byl úspěšně přesunut.';
-$labels['moveerror'] = 'Nelze přesunout vybraný filtr. Došlo k chybě na serveru.';
-$labels['nametoolong'] = 'Příliš dlouhý název.';
-$labels['namereserved'] = 'Vyhrazený název.';
-$labels['setexist'] = 'Sada již existuje.';
-$labels['nodata'] = 'Musí být vybrána minimálně jedna pozice!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Neznámá chyba serveru';
+$messages['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
+$messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
+$messages['filterdeleted'] = 'Filtr byl smazán';
+$messages['filtersaved'] = 'Filtr byl uložen';
+$messages['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
+$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?';
+$messages['forbiddenchars'] = 'Zakázané znaky v poli';
+$messages['cannotbeempty'] = 'Pole nemůže být prázdné';
+$messages['ruleexist'] = 'Filtr s uvedeným názvem již existuje.';
+$messages['setactivateerror'] = 'Nelze zapnout vybranou sadu filtrů. Došlo k chybě serveru.';
+$messages['setdeactivateerror'] = 'Nelze vypnout vybranou sadu filtrů. Došlo k chybě serveru.';
+$messages['setdeleteerror'] = 'Nelze odstranit vybranou sadu filtrů. Došlo k chybě serveru.';
+$messages['setactivated'] = 'Sada filtrů úspěšně zapnuta.';
+$messages['setdeactivated'] = 'Sada filtrů úspěšně vypnuta.';
+$messages['setdeleted'] = 'Sada filtrů úspěšně odstraněna.';
+$messages['setdeleteconfirm'] = 'Opravdu si přejete odebrat vybranou sadu filtrů.';
+$messages['setcreateerror'] = 'Nelze vytvořit sadu filtrů. Došlo k chybě serveru.';
+$messages['setcreated'] = 'Sada filtrů úspěšně vytvořena.';
+$messages['activateerror'] = 'Nelze zapnout vybrané filtr/y. Došlo k chybě serveru.';
+$messages['deactivateerror'] = 'Nelze vypnout vybrané filtr/y. Došlo k chybě serveru.';
+$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['nametoolong'] = 'Příliš dlouhý název.';
+$messages['namereserved'] = 'Vyhrazený název.';
+$messages['setexist'] = 'Sada již existuje.';
+$messages['nodata'] = 'Musí být vybrána minimálně jedna pozice!';
+
+?>
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index bace9be..81f2ca2 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Hidlyddion';
 $labels['managefilters'] = 'Rheoli hidlyddion ebost i fewn';
 $labels['filtername'] = 'Enw hidlydd';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Dilewyd';
 $labels['flaganswered'] = 'Atebwyd';
 $labels['flagflagged'] = 'Nodwyd';
 $labels['flagdraft'] = 'Drafft';
+$labels['setvariable'] = 'Gosod newidyn';
+$labels['setvarname'] = 'Enw newidyn:';
+$labels['setvarvalue'] = 'Gwerth newidyn:';
+$labels['setvarmodifiers'] = 'Addasydd:';
+$labels['varlower'] = 'llythrennau bychain';
+$labels['varupper'] = 'priflythrennau';
+$labels['varlowerfirst'] = 'llythyren gyntaf yn fach';
+$labels['varupperfirst'] = 'llythyren gyntaf yn briflythyren';
+$labels['varquotewildcard'] = 'dyfynnu nodau arbennig';
+$labels['varlength'] = 'hyd';
+$labels['notify'] = 'Anfon hysbysiad';
+$labels['notifyaddress'] = 'I gyfeiriad ebost:';
+$labels['notifybody'] = 'Corff hysbysiad:';
+$labels['notifysubject'] = 'Pwnc hysbysiad:';
+$labels['notifyfrom'] = 'Anfonwr hysbysiad:';
+$labels['notifyimportance'] = 'Pwysigrwydd:';
+$labels['notifyimportancelow'] = 'isel';
+$labels['notifyimportancenormal'] = 'arferol';
+$labels['notifyimportancehigh'] = 'uchel';
 $labels['filtercreate'] = 'Creu hidlydd';
 $labels['usedata'] = 'Defnyddio\'r wybodaeth ganlynol yn yr hidlydd:';
 $labels['nextstep'] = 'Cam nesaf';
@@ -115,35 +137,38 @@ $labels['default'] = 'rhagosodiad';
 $labels['octet'] = 'llym (octet)';
 $labels['asciicasemap'] = 'maint llythrennau (ascii-casemap)';
 $labels['asciinumeric'] = 'rhifau (ascii-numeric)';
-$labels['filterunknownerror'] = 'Gwall gweinydd anhysbys.';
-$labels['filterconnerror'] = 'Methwyd cysylltu a\'r gweinydd.';
-$labels['filterdeleteerror'] = 'Methwyd dileu hidlydd. Cafwydd gwall gweinydd.';
-$labels['filterdeleted'] = 'Dilëuwyd hidlydd yn llwyddiannus.';
-$labels['filtersaved'] = 'Cadwyd hidlydd yn llwyddiannus.';
-$labels['filtersaveerror'] = 'Methwyd cadw hidlydd. Cafwyd gwall gweinydd.';
-$labels['filterdeleteconfirm'] = 'Ydych chi wir am ddileu yr hidlydd ddewiswyd?';
-$labels['ruledeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r rheol ddewiswyd?';
-$labels['actiondeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r weithred ddewiswyd?';
-$labels['forbiddenchars'] = 'Llythrennau gwaharddedig yn y maes.';
-$labels['cannotbeempty'] = 'Ni all y maes fod yn wag.';
-$labels['ruleexist'] = 'Mae hidlydd gyda\'r enw yma yn bodoli\'n barod.';
-$labels['setactivateerror'] = 'Methwyd bywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$labels['setdeactivateerror'] = 'Methwyd dadfywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$labels['setdeleteerror'] = 'Methwyd dileu y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$labels['setactivated'] = 'Bywiogwyd y set hidlydd yn llwyddiannus.';
-$labels['setdeactivated'] = 'Dadfywiogwyd y set hidlydd yn llwyddiannus.';
-$labels['setdeleted'] = 'Dilëuwyd y set hidlydd yn llwyddiannus.';
-$labels['setdeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r set hidlydd ddewiswyd?';
-$labels['setcreateerror'] = 'Methwyd creu set hidlydd. Cafwyd gwall gweinydd.';
-$labels['setcreated'] = 'Crëuwyd y set hidlydd yn llwyddiannus.';
-$labels['activateerror'] = 'Methwyd galluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
-$labels['deactivateerror'] = 'Methwyd analluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
-$labels['activated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.';
-$labels['deactivated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.';
-$labels['moved'] = 'Symudwyd y hidlydd yn llwyddiannus.';
-$labels['moveerror'] = 'Methwyd symud y hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$labels['nametoolong'] = 'Enw yn rhy hir.';
-$labels['namereserved'] = 'Enw neilltuedig.';
-$labels['setexist'] = 'Mae\'r set yn bodoli\'n barod.';
-$labels['nodata'] = 'Rhaid dewis o leia un safle!';
 
+$messages = array();
+$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.';
+$messages['nodata'] = 'Rhaid dewis o leia un safle!';
+
+?>
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index 91bc18d..02aaa1b 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos at openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Ændre indgående mail filtreing';
 $labels['filtername'] = 'Filter navn';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Slettede';
 $labels['flaganswered'] = 'Besvaret';
 $labels['flagflagged'] = 'Markeret';
 $labels['flagdraft'] = 'Kladde';
+$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'] = 'længde';
+$labels['notify'] = 'Send notification';
+$labels['notifyaddress'] = 'Til e-mail adresse:';
+$labels['notifybody'] = 'Notification body:';
+$labels['notifysubject'] = 'Notification subject:';
+$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifyimportance'] = 'Importance:';
+$labels['notifyimportancelow'] = 'lav';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'høj';
 $labels['filtercreate'] = 'Opret filter';
 $labels['usedata'] = 'Brug følgende data i filteret:';
 $labels['nextstep'] = 'Næste trin';
@@ -115,35 +137,38 @@ $labels['default'] = 'standard';
 $labels['octet'] = 'præcis (oktet)';
 $labels['asciicasemap'] = 'store og små bogstaver (ascii-bogstaver)';
 $labels['asciinumeric'] = 'numerisk (ascii-numerisk)';
-$labels['filterunknownerror'] = 'Ukendt server fejl.';
-$labels['filterconnerror'] = 'Kan ikke forbinde til server.';
-$labels['filterdeleteerror'] = 'Kan ikke slette filter. Server fejl.';
-$labels['filterdeleted'] = 'Filter slettet.';
-$labels['filtersaved'] = 'Filter gemt.';
-$labels['filtersaveerror'] = 'Kan ikke gemme filter. Server fejl.';
-$labels['filterdeleteconfirm'] = 'Vil du slette det valgte filter?';
-$labels['ruledeleteconfirm'] = 'Er du sikker på at du vil slette den valgte regel?';
-$labels['actiondeleteconfirm'] = 'Er du sikker på du vil slette den valgte handling?';
-$labels['forbiddenchars'] = 'Ulovlige tegn i feltet';
-$labels['cannotbeempty'] = 'Feltet kan ikke være tomt.';
-$labels['ruleexist'] = 'Filter med dette navn eksisterer allerede.';
-$labels['setactivateerror'] = 'Kan ikke aktiverer valgt filter sæt. Server fejl.';
-$labels['setdeactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
-$labels['setdeleteerror'] = 'Kan ikke slette valgt filter sæt. Server fejl.';
-$labels['setactivated'] = 'Filter sæt aktiveret.';
-$labels['setdeactivated'] = 'Filter sæt deaktiveret.';
-$labels['setdeleted'] = 'Filter sæt slettet.';
-$labels['setdeleteconfirm'] = 'Er du sikker på du vil slette valgt filter sæt?';
-$labels['setcreateerror'] = 'Kan ikke oprette filter sæt. Server fejl.';
-$labels['setcreated'] = 'Filter sæt oprettet.';
-$labels['activateerror'] = 'Kan ikek aktivere valgt filter sæt. Server fejl.';
-$labels['deactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
-$labels['activated'] = 'Filter(filtre) deaktiveret.';
-$labels['deactivated'] = 'Filter(filtre) aktiveret.';
-$labels['moved'] = 'Filter flyttet.';
-$labels['moveerror'] = 'Kan ikke flytte valgt filter. Server fejl.';
-$labels['nametoolong'] = 'Navn er for langt.';
-$labels['namereserved'] = 'Reserveret navn.';
-$labels['setexist'] = 'Filterv sæt eksisterer allerede';
-$labels['nodata'] = 'Mindst en position skal vælges!';
 
+$messages = array();
+$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';
+$messages['nodata'] = 'Mindst en position skal vælges!';
+
+?>
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index 2ce0305..2074758 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/managesieve/localization/<lang>.inc                            |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Managesieve plugin         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index 2b42917..6bd9046 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: SimonFS <simonschuette at arcor.de>                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Filter für eingehende Nachrichten verwalten';
 $labels['filtername'] = 'Filtername';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Gelöscht';
 $labels['flaganswered'] = 'Beantwortet';
 $labels['flagflagged'] = 'Markiert';
 $labels['flagdraft'] = 'Entwurf';
+$labels['setvariable'] = 'Variable setzen';
+$labels['setvarname'] = 'Name der Variable:';
+$labels['setvarvalue'] = 'Wert der Variable:';
+$labels['setvarmodifiers'] = 'Modifikatoren:';
+$labels['varlower'] = 'Kleinschreibung';
+$labels['varupper'] = 'Großschreibung';
+$labels['varlowerfirst'] = 'Erster Buchstabe kleingeschrieben';
+$labels['varupperfirst'] = 'Erster Buchstabe großgeschrieben';
+$labels['varquotewildcard'] = 'maskiere Sonderzeichen';
+$labels['varlength'] = 'Länge';
+$labels['notify'] = 'Sende Benachrichtigung';
+$labels['notifyaddress'] = 'An Email Adresse:';
+$labels['notifybody'] = 'Benachrichtigungs-Text:';
+$labels['notifysubject'] = 'Benachrichtigungs-Betreff:';
+$labels['notifyfrom'] = 'Benachrichtigungs-Absender:';
+$labels['notifyimportance'] = 'Priorität:';
+$labels['notifyimportancelow'] = 'niedrig';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'hoch';
 $labels['filtercreate'] = 'Filter erstellen';
 $labels['usedata'] = 'Die folgenden Daten im Filter benutzen:';
 $labels['nextstep'] = 'Nächster Schritt';
@@ -115,35 +137,38 @@ $labels['default'] = 'Vorgabewert';
 $labels['octet'] = 'strikt (Oktett)';
 $labels['asciicasemap'] = 'Groß-/Kleinschreibung ignorieren';
 $labels['asciinumeric'] = 'numerisch (ascii-numeric)';
-$labels['filterunknownerror'] = 'Unbekannter Serverfehler';
-$labels['filterconnerror'] = 'Kann keine Verbindung mit Managesieve-Server herstellen';
-$labels['filterdeleteerror'] = 'Fehler beim Löschen des Filters. Serverfehler';
-$labels['filterdeleted'] = 'Filter erfolgreich gelöscht';
-$labels['filtersaved'] = 'Filter erfolgreich gespeichert';
-$labels['filtersaveerror'] = 'Fehler beim Speichern des Filters. Serverfehler';
-$labels['filterdeleteconfirm'] = 'Möchten Sie den ausgewählten Filter wirklich löschen?';
-$labels['ruledeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Regel löschen möchten?';
-$labels['actiondeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Aktion löschen möchten?';
-$labels['forbiddenchars'] = 'Unzulässige Zeichen im Eingabefeld';
-$labels['cannotbeempty'] = 'Eingabefeld darf nicht leer sein';
-$labels['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
-$labels['setactivateerror'] = 'Kann ausgewählten Filtersatz nicht aktivieren. Serverfehler';
-$labels['setdeactivateerror'] = 'Kann ausgewählten Filtersatz nicht deaktivieren. Serverfehler';
-$labels['setdeleteerror'] = 'Kann ausgewählten Filtersatz nicht löschen. Serverfehler';
-$labels['setactivated'] = 'Filtersatz wurde erfolgreich aktiviert';
-$labels['setdeactivated'] = 'Filtersatz wurde erfolgreich deaktiviert';
-$labels['setdeleted'] = 'Filtersatz wurde erfolgreich gelöscht';
-$labels['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
-$labels['setcreateerror'] = 'Erstellen von Filter Sätzen nicht möglich. Es ist ein Server Fehler aufgetreten.';
-$labels['setcreated'] = 'Filtersatz wurde erfolgreich erstellt';
-$labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
-$labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
-$labels['activated'] = 'Filter erfolgreich aktiviert.';
-$labels['deactivated'] = 'Filter erfolgreich deaktiviert.';
-$labels['moved'] = 'Filter erfolgreich verschoben.';
-$labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
-$labels['nametoolong'] = 'Kann Filtersatz nicht erstellen. Name zu lang';
-$labels['namereserved'] = 'Reservierter Name.';
-$labels['setexist'] = 'Filtersatz existiert bereits.';
-$labels['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
 
+$messages = array();
+$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.';
+$messages['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
+
+?>
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index dada982..8504f77 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Φίλτρα';
 $labels['managefilters'] = 'Διαχείριση φίλτρων εισερχόμενων';
 $labels['filtername'] = 'Ονομασία φίλτρου';
@@ -32,12 +34,18 @@ $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'] = 'Προσθήκη κανόνα';
 $labels['delrule'] = 'Διαγραφή κανόνα';
 $labels['messagemoveto'] = 'Μετακίνηση μηνύματος στο';
 $labels['messageredirect'] = 'Προώθηση μηνύματος στο';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
 $labels['messagereply'] = 'Απάντηση με μήνυμα';
 $labels['messagedelete'] = 'Διαγραφή μηνύματος';
 $labels['messagediscard'] = 'Απόρριψη με μήνυμα';
@@ -50,15 +58,117 @@ $labels['recipient'] = 'Παραλήπτης';
 $labels['vacationaddresses'] = 'Πρόσθετη λίστα email παραληπτών (διαχωρισμένη με κόμματα):';
 $labels['vacationdays'] = 'Συχνότητα αποστολής μηνυμάτων (σε ημέρες):';
 $labels['vacationreason'] = 'Σώμα μηνύματÎ