Updated localizations from Transifex

111 files changed, 1226 insertions, 970 deletions

diff --git a/plugins/acl/localization/ca_ES.inc b/plugins/acl/localization/ca_ES.inc
index d238524b3..56012f457 100644
--- a/plugins/acl/localization/ca_ES.inc
+++ b/plugins/acl/localization/ca_ES.inc
@@ -18,17 +18,17 @@
 $labels['sharing'] = 'Comparteix';
 $labels['myrights'] = 'Permisos d\'accés';
 $labels['username'] = 'Usuari:';
-$labels['advanced'] = 'Mode avançat';
+$labels['advanced'] = 'mode avançat';
 $labels['newuser'] = 'Afegeix una entrada';
-$labels['actions'] = 'Accions dels permisos d\'accés';
-$labels['anyone'] = 'Tots els usuaris';
-$labels['anonymous'] = 'Convidats';
+$labels['actions'] = 'Accions dels permisos d\'accés...';
+$labels['anyone'] = 'Tots els usuaris (qualsevol)';
+$labels['anonymous'] = 'Convidats (anònim)';
 $labels['identifier'] = 'Identificador';
 $labels['acll'] = 'Cerca';
 $labels['aclr'] = 'Llegeix missatges';
 $labels['acls'] = 'Conserva\'l com a llegit';
-$labels['aclw'] = 'Escriu marques';
-$labels['acli'] = 'Insereix (copia dins)';
+$labels['aclw'] = 'Marques d\'escriptura';
+$labels['acli'] = 'Insereix (Copia dins)';
 $labels['aclp'] = 'Envia l\'entrada';
 $labels['aclc'] = 'Crea subcarpetes';
 $labels['aclk'] = 'Crea subcarpetes';
@@ -67,8 +67,8 @@ $labels['longacli'] = 'Els missatges poden ser escrits i copiats a la carpeta';
 $labels['longaclp'] = 'Els missatges poden ser enviats a aquesta carpeta';
 $labels['longaclc'] = 'Es poden crear (or reanomenar) carpetes directament sota aquesta carpeta';
 $labels['longaclk'] = 'Es poden crear (or reanomenar) carpetes directament sota aquesta carpeta';
-$labels['longacld'] = 'Poden ser canviats els missatges amb l\'indicador Suprimit';
-$labels['longaclt'] = 'Poden ser canviats els missatges amb l\'indicador Suprimit';
+$labels['longacld'] = 'Els missatges amb l\'indicador Suprimit poden ser canviats';
+$labels['longaclt'] = 'Els missatges amb l\'indicador Suprimit poden ser canviats';
 $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';
@@ -76,14 +76,14 @@ $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';
-$messages['deleting'] = 'Suprimint els permisos d\'accés...';
-$messages['saving'] = 'Desant els permisos d\'accés...';
+$messages['deleting'] = 'S\'estan suprimint els permisos d\'accés...';
+$messages['saving'] = 'S\'estan 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['createsuccess'] = 'Els permisos d\'accés han estat afegits correctament';
+$messages['updateerror'] = 'No s\'han pogut actualitzar els permisos d\'accés';
+$messages['deleteerror'] = 'No s\'han pogut suprimir els permisos d\'accés';
+$messages['createerror'] = 'No s\'han 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/en_CA.inc b/plugins/acl/localization/en_CA.inc
new file mode 100644
index 000000000..2dd7e4ec0
--- /dev/null
+++ b/plugins/acl/localization/en_CA.inc
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'Sharing';
+$labels['myrights'] = 'Access Rights';
+$labels['username'] = 'User:';
+$labels['advanced'] = 'advanced mode';
+$labels['newuser'] = 'Add entry';
+$labels['actions'] = 'Access right actions...';
+$labels['anyone'] = 'All users (anyone)';
+$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'] = 'Unable 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_419.inc b/plugins/acl/localization/es_419.inc
new file mode 100644
index 000000000..f83196175
--- /dev/null
+++ b/plugins/acl/localization/es_419.inc
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['username'] = 'Usuario:';
+$labels['advanced'] = 'modo avanzado';
+$labels['newuser'] = 'Agregar entrada';
+$labels['anyone'] = 'Todos los usuarios ';
+$labels['anonymous'] = 'Invitados (anonimos)';
+$labels['identifier'] = 'Identificador';
+$labels['acll'] = 'Busqueda';
+$labels['aclr'] = 'Leer mensajes';
+$labels['acli'] = 'Insertar (copiar a)';
+$labels['aclc'] = 'Crear subcarpetas';
+$labels['aclk'] = 'crear subcarpetas';
+$labels['acld'] = 'Eliminar mensaje';
+$labels['aclt'] = 'Eliminar mensajes';
+$labels['aclx'] = 'Eliminar carpeta';
+$labels['aclother'] = 'Otro';
+$labels['aclread'] = 'Leer';
+$labels['aclwrite'] = 'Escribir';
+$labels['acldelete'] = 'Eliminar';
+$labels['shortacll'] = 'Busqueda';
+$labels['shortaclr'] = 'Leer';
+$labels['shortaclw'] = 'Escribir';
+$labels['shortacli'] = 'Insertar';
+$labels['shortaclc'] = 'Crear';
+$labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Eliminar';
+$labels['shortaclt'] = 'Eliminar';
+$labels['shortaclother'] = 'Otro';
+$labels['shortaclread'] = 'Leer';
+$labels['shortaclwrite'] = 'Escribir';
+$labels['shortacldelete'] = 'Eliminar';
+$labels['longaclr'] = 'La carpeta puede ser abierta para lectura';
+$labels['longacli'] = 'Se pueden escribir o copiar mensajes a la carpeta';
+?>
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index 17aaf2599..cd8f9a47a 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -16,17 +16,17 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['sharing'] = 'Compartindo';
-$labels['myrights'] = 'Dereitos de acceso';
-$labels['username'] = 'Usuario:';
+$labels['myrights'] = 'Permisos de acceso';
+$labels['username'] = 'Utente:';
 $labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Engadir entrada';
-$labels['actions'] = 'Accións sobre os dereitos de acceso...';
-$labels['anyone'] = 'Tódolos usuarios (calquera)';
-$labels['anonymous'] = 'Invitados (anónimo)';
+$labels['actions'] = 'Accións sobre os Permisos de acceso...';
+$labels['anyone'] = 'Todas as persoas usuarias (calquera)';
+$labels['anonymous'] = 'Persoas convidadas (anónimo)';
 $labels['identifier'] = 'Identificador';
 $labels['acll'] = 'Bloquear';
 $labels['aclr'] = 'Ler mensaxes';
-$labels['acls'] = 'Manter o estado coma visto';
+$labels['acls'] = 'Manter estado actividade';
 $labels['aclw'] = 'Marcas de lectura';
 $labels['acli'] = 'Engadir (Copiar en)';
 $labels['aclp'] = 'Envío';
@@ -35,56 +35,56 @@ $labels['aclk'] = 'Crear subcartafoles';
 $labels['acld'] = 'Borrar mensaxes';
 $labels['aclt'] = 'Borrar mensaxes';
 $labels['acle'] = 'Expurga';
-$labels['aclx'] = 'Eliminar carpeta';
+$labels['aclx'] = 'Eliminar cartafol';
 $labels['acla'] = 'Administrar';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Outros';
 $labels['aclread'] = 'Lectura';
 $labels['aclwrite'] = 'Escritura';
 $labels['acldelete'] = 'Borrado';
-$labels['shortacll'] = 'Busca';
+$labels['shortacll'] = 'Buscar';
 $labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
 $labels['shortaclw'] = 'Escribir';
-$labels['shortacli'] = 'Insertar';
-$labels['shortaclp'] = 'Envío';
+$labels['shortacli'] = 'Inserir';
+$labels['shortaclp'] = 'Publicar';
 $labels['shortaclc'] = 'Crear';
 $labels['shortaclk'] = 'Crear';
-$labels['shortacld'] = 'Borrar';
-$labels['shortaclt'] = 'Borrar';
+$labels['shortacld'] = 'Eliminar';
+$labels['shortaclt'] = 'Eliminar';
 $labels['shortacle'] = 'Expurga';
-$labels['shortaclx'] = 'Borrar cartafol';
+$labels['shortaclx'] = 'Eliminar cartafol';
 $labels['shortacla'] = 'Administrar';
 $labels['shortaclother'] = 'Outros';
 $labels['shortaclread'] = 'Lectura';
 $labels['shortaclwrite'] = 'Escritura';
-$labels['shortacldelete'] = 'Borrado';
-$labels['longacll'] = 'O cartafol é visible e pode ser suscrito';
+$labels['shortacldelete'] = 'Eliminar';
+$labels['longacll'] = 'O cartafol é visíbel e pode ser subscrito';
 $labels['longaclr'] = 'Pódese abrir o cartafol para lectura';
 $labels['longacls'] = 'Pódese mudar o marcador de Mensaxes Enviadas';
-$labels['longaclw'] = 'Pódense mudar marcadores e palabras chave agás Olladas e Borradas';
+$labels['longaclw'] = 'Pódense mudar marcadores e palabras chave agás Vistas e Borradas';
 $labels['longacli'] = 'Pódense escreber ou copiar as mensaxes a este cartafol';
 $labels['longaclp'] = 'Pódense enviar as mensaxes a este cartafol';
-$labels['longaclc'] = 'Pódense crear (ou renomear) os cartafois directamente baixo deste cartafol';
-$labels['longaclk'] = 'Pódense crear (ou renomear) os cartafois directamente baixo deste cartafol';
-$labels['longacld'] = 'Pódense mudar as mensaxes coa marca de Borrado';
-$labels['longaclt'] = 'Pódense mudar as mensaxes coa marca de Borrado';
-$labels['longacle'] = 'Pódense eliminar as mensaxes';
+$labels['longaclc'] = 'Pódense crear (ou renomear) os cartafoles directamente baixo deste cartafol';
+$labels['longaclk'] = 'Pódense crear (ou renomear) os cartafoles directamente baixo deste cartafol';
+$labels['longacld'] = 'Pódense mudar as mensaxes coa marca Eliminar';
+$labels['longaclt'] = 'Pódense mudar as mensaxes coa marca Eliminar';
+$labels['longacle'] = 'As mensaxes poden ser expurgadas';
 $labels['longaclx'] = 'Pódese borrar ou renomear o cartafol';
-$labels['longacla'] = 'Pódense mudar os dereitos de acceso ao cartafol';
-$labels['longaclfull'] = 'Control total inclúe administración de cartafois';
+$labels['longacla'] = 'Pódense mudar os permisos de acceso ao cartafol';
+$labels['longaclfull'] = 'Control total inclúe administración de cartafoles';
 $labels['longaclread'] = 'Pódese abrir o cartafol para lectura';
 $labels['longaclwrite'] = 'Pódense marcar, escribir ou copiar as mensaxes no cartafol';
 $labels['longacldelete'] = 'Pódense borrar as mensaxes';
-$messages['deleting'] = 'Borrando dereitos de acceso...';
-$messages['saving'] = 'Gardando dereitos de acceso...';
-$messages['updatesuccess'] = 'Mudados con éxito os dereitos de acceso';
-$messages['deletesuccess'] = 'Borrados con éxito os dereitos de acceso';
-$messages['createsuccess'] = 'Engadidos con éxito os dereitos de acceso';
-$messages['updateerror'] = 'Non se poden actualizar os dereitos de acceso';
-$messages['deleteerror'] = 'Non se poden borrar os dereitos de acceso';
-$messages['createerror'] = 'Non se poden engadir dereitos de acceso';
-$messages['deleteconfirm'] = 'De certo quere eliminar os dereitos de acceso do usuario(s) escollido?';
+$messages['deleting'] = 'Borrando permisos de acceso...';
+$messages['saving'] = 'Gardando permisos de acceso...';
+$messages['updatesuccess'] = 'Mudados con éxito os permisos de acceso';
+$messages['deletesuccess'] = 'Borrados con éxito os permisos de acceso';
+$messages['createsuccess'] = 'Engadidos con éxito os permisos de acceso';
+$messages['updateerror'] = 'Non se poden actualizar os permisos de acceso';
+$messages['deleteerror'] = 'Non se poden borrar os permisos de acceso';
+$messages['createerror'] = 'Non se poden engadir permisos de acceso';
+$messages['deleteconfirm'] = 'De certo que queres eliminar os permisos de acceso da(s) persoa(s) usuaria(s) escollida(s)?';
 $messages['norights'] = 'Non se especificaron permisos!';
-$messages['nouser'] = 'Non se especificou o nome de usuario!';
+$messages['nouser'] = 'Non se especificou o nome da persoa usuaria!';
 ?>
diff --git a/plugins/acl/localization/sk_SK.inc b/plugins/acl/localization/sk_SK.inc
index eb410f119..c4ea0e53c 100644
--- a/plugins/acl/localization/sk_SK.inc
+++ b/plugins/acl/localization/sk_SK.inc
@@ -16,32 +16,32 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['sharing'] = 'Zdieľanie';
-$labels['myrights'] = 'Prístupové práva';
+$labels['myrights'] = 'Prístupové oprávnenia';
 $labels['username'] = 'Používateľ:';
-$labels['advanced'] = 'režim pre pokročilých';
-$labels['newuser'] = 'Pridať údaj';
-$labels['actions'] = 'Prístupové práva činností...';
+$labels['advanced'] = 'pokročilý režim';
+$labels['newuser'] = 'Pridať záznam';
+$labels['actions'] = 'Prístupové práva pre akcie...';
 $labels['anyone'] = 'Všetci užívatelia (ktokoľvek)';
-$labels['anonymous'] = 'Hostia (anonymne)';
+$labels['anonymous'] = 'Hostia (anonymní)';
 $labels['identifier'] = 'Identifikátor';
 $labels['acll'] = 'Vyhľadať';
 $labels['aclr'] = 'Čítať správy';
 $labels['acls'] = 'Ponechať ako prečítané';
-$labels['aclw'] = 'Príznaky na zapisovanie';
+$labels['aclw'] = 'Príznaky pre zápis';
 $labels['acli'] = 'Vložiť (Skopírovať do)';
 $labels['aclp'] = 'Odoslať na';
 $labels['aclc'] = 'Vytvoriť podpriečinky';
 $labels['aclk'] = 'Vytvoriť podpriečinky';
-$labels['acld'] = 'Zmazať správy';
-$labels['aclt'] = 'Zmazať správy';
+$labels['acld'] = 'Vymazať správy';
+$labels['aclt'] = 'Vymazať správy';
 $labels['acle'] = 'Vyčistiť';
-$labels['aclx'] = 'Zmazať priečinok';
+$labels['aclx'] = 'Vymazať priečinok';
 $labels['acla'] = 'Spravovať';
-$labels['aclfull'] = 'Plný prístup';
-$labels['aclother'] = 'Ostatné';
+$labels['aclfull'] = 'Úplný prístup';
+$labels['aclother'] = 'Iné';
 $labels['aclread'] = 'Čítanie';
 $labels['aclwrite'] = 'Zápis';
-$labels['acldelete'] = 'Odstrániť';
+$labels['acldelete'] = 'Odstránenie';
 $labels['shortacll'] = 'Vyhľadať';
 $labels['shortaclr'] = 'Čítanie';
 $labels['shortacls'] = 'Ponechať';
@@ -50,41 +50,41 @@ $labels['shortacli'] = 'Vložiť';
 $labels['shortaclp'] = 'Odoslať na';
 $labels['shortaclc'] = 'Vytvoriť';
 $labels['shortaclk'] = 'Vytvoriť';
-$labels['shortacld'] = 'Odstrániť';
-$labels['shortaclt'] = 'Odstrániť';
+$labels['shortacld'] = 'Vymazať';
+$labels['shortaclt'] = 'Vymazať';
 $labels['shortacle'] = 'Vyčistiť';
-$labels['shortaclx'] = 'Odstrániť priečinok';
+$labels['shortaclx'] = 'Vymazať priečinok';
 $labels['shortacla'] = 'Spravovať';
-$labels['shortaclother'] = 'Ostatné';
+$labels['shortaclother'] = 'Iné';
 $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['shortacldelete'] = 'Odstránenie';
+$labels['longacll'] = 'Priečinok je v zoznamoch viditeľný a dá sa k nemu prihlásiť';
 $labels['longaclr'] = '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['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';
 $labels['longaclp'] = 'Do tohto priečinka je možné publikovať správy';
-$labels['longaclc'] = 'Priečinky je možné vytvárať (alebo premenúvať) priamo v tomto priečinku';
-$labels['longaclk'] = 'Priečinky je možné vytvárať (alebo premenúvať) priamo v tomto priečinku';
+$labels['longaclc'] = 'Priečinky je možné vytvárať (alebo premenovávať) priamo v tomto priečinku';
+$labels['longaclk'] = 'Priečinky je možné vytvárať (alebo premenovávať) priamo v tomto priečinku';
 $labels['longacld'] = 'Príznak správ "Vymazané" je možné zmeniť';
 $labels['longaclt'] = 'Príznak správ "Vymazané" je možné zmeniť';
-$labels['longacle'] = 'Správy je možné vymazať';
+$labels['longacle'] = 'Správy je možné vyčistiť';
 $labels['longaclx'] = 'Priečinok je možné vymazať alebo premenovať';
-$labels['longacla'] = 'Je možné zmeniť prístupové práva k priečinku';
+$labels['longacla'] = 'Prístupové oprávnenia k tomuto priečinku je možné zmeniť';
 $labels['longaclfull'] = 'Úplný prístup, vrátane správy priečinka';
 $labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longaclwrite'] = 'Správy je možné označiť, zapísať alebo skopírovať do prečinka';
 $labels['longacldelete'] = 'Správy je možné vymazať';
-$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'] = 'Nemožno aktualizovať prístupové práva';
-$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['deleting'] = 'Odstraňovanie prístupových oprávnení...';
+$messages['saving'] = 'Ukladanie prístupových oprávnení...';
+$messages['updatesuccess'] = 'Prístupové oprávnenia boli úspešne zmenené';
+$messages['deletesuccess'] = 'Prístupové oprávnenia boli úspešne vymazané';
+$messages['createsuccess'] = 'Prístupové oprávnenia boli úspešne pridané';
+$messages['updateerror'] = 'Nemožno aktualizovať prístupové oprávnenia';
+$messages['deleteerror'] = 'Prístupové oprávnenia sa nepodarilo vymazať';
+$messages['createerror'] = 'Prístupové oprávnenia sa nepodarilo pridať';
+$messages['deleteconfirm'] = 'Naozaj chcete odstrániť prístupové oprávnenia vybraného používateľa?';
+$messages['norights'] = 'Neboli určené žiadne oprávnenia!';
 $messages['nouser'] = 'Nebolo určené žiadne meno používateľa!';
 ?>
diff --git a/plugins/archive/localization/ca_ES.inc b/plugins/archive/localization/ca_ES.inc
index bce2c202a..2fc7e5dbe 100644
--- a/plugins/archive/localization/ca_ES.inc
+++ b/plugins/archive/localization/ca_ES.inc
@@ -19,10 +19,10 @@ $labels['buttontext'] = 'Arxiva';
 $labels['buttontitle'] = 'Arxiva aquest missatge';
 $labels['archived'] = 'Arxivat correctament';
 $labels['archivedreload'] = 'Arxivat correctament. Recarregueu la pàgina per veure les noves carpetes de l\'arxiu.';
-$labels['archiveerror'] = 'Alguns missatges no han pogut ser arxivats';
-$labels['archivefolder'] = 'Arxiva';
+$labels['archiveerror'] = 'Alguns missatges no s\'han pogut arxivar';
+$labels['archivefolder'] = 'Arxiu';
 $labels['settingstitle'] = 'Arxiu';
-$labels['archivetype'] = 'Dividir arxiu per';
+$labels['archivetype'] = 'Divideix arxiu per';
 $labels['archivetypeyear'] = 'Any (p.ex. Arxiu/2012)';
 $labels['archivetypemonth'] = 'Mes (p.ex. Arxiu/2012/06)';
 $labels['archivetypefolder'] = 'Carpeta original';
diff --git a/plugins/archive/localization/en_CA.inc b/plugins/archive/localization/en_CA.inc
new file mode 100644
index 000000000..58cb7f439
--- /dev/null
+++ b/plugins/archive/localization/en_CA.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/archive/localization/<lang>.inc                                |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
+*/
+$labels['buttontext'] = 'Archive';
+$labels['buttontitle'] = 'Archive this message';
+$labels['archived'] = 'Successfully archived';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archive';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
+?>
diff --git a/plugins/archive/localization/ia.inc b/plugins/archive/localization/es_419.inc
index 8e95162d5..3f26a018e 100644
--- a/plugins/archive/localization/ia.inc
+++ b/plugins/archive/localization/es_419.inc
@@ -15,4 +15,15 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
+$labels['buttontext'] = 'Archivo';
+$labels['buttontitle'] = 'Archivar este mensaje';
+$labels['archived'] = 'Archivado exitosamente';
+$labels['archivedreload'] = 'Achivado exitosamente. ';
+$labels['archiveerror'] = 'Algunos mensajes no pudieron ser archivados';
+$labels['archivefolder'] = 'Archivo';
+$labels['archivetype'] = 'Dividir archivo por';
+$labels['archivetypeyear'] = 'Año (ej. Archivo/2012)';
+$labels['archivetypemonth'] = 'Mes (ej. Archivo/2012/06)';
+$labels['archivetypefolder'] = 'Carpeta original';
+$labels['unkownsender'] = 'desconocido';
 ?>
diff --git a/plugins/archive/localization/gl_ES.inc b/plugins/archive/localization/gl_ES.inc
index 1eda2542b..7ce96a0df 100644
--- a/plugins/archive/localization/gl_ES.inc
+++ b/plugins/archive/localization/gl_ES.inc
@@ -18,7 +18,7 @@
 $labels['buttontext'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensaxe';
 $labels['archived'] = 'Aquivouse a mensaxe';
-$labels['archivedreload'] = 'Arquivado correctamente. Recargue a páxina para ver os novos cartafoles de arquivado.';
+$labels['archivedreload'] = 'Arquivado correctamente. Recargua a páxina para ver os novos cartafoles de arquivado.';
 $labels['archiveerror'] = 'Non se puideron arquivar algunhas mensaxes';
 $labels['archivefolder'] = 'Arquivo';
 $labels['settingstitle'] = 'Arquivar';
@@ -26,6 +26,6 @@ $labels['archivetype'] = 'Dividir o arquivo por';
 $labels['archivetypeyear'] = 'Ano (p.ex. Arquivo/2012)';
 $labels['archivetypemonth'] = 'Mes (p.ex. Arquivo/2012/06)';
 $labels['archivetypefolder'] = 'Cartafol orixe';
-$labels['archivetypesender'] = 'Enderezo do remitente';
+$labels['archivetypesender'] = 'Enderezo da persoa remitente';
 $labels['unkownsender'] = 'descoñecido';
 ?>
diff --git a/plugins/archive/localization/mn_MN.inc b/plugins/archive/localization/mn_MN.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/mn_MN.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/ms_MY.inc b/plugins/archive/localization/ms_MY.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/ms_MY.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/my_MM.inc b/plugins/archive/localization/my_MM.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/my_MM.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/nl_BE.inc b/plugins/archive/localization/nl_BE.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/nl_BE.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/nqo.inc b/plugins/archive/localization/nqo.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/nqo.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/om.inc b/plugins/archive/localization/om.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/om.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/sk_SK.inc b/plugins/archive/localization/sk_SK.inc
index f3f447b90..79506f650 100644
--- a/plugins/archive/localization/sk_SK.inc
+++ b/plugins/archive/localization/sk_SK.inc
@@ -17,14 +17,14 @@
 */
 $labels['buttontext'] = 'Archivovať';
 $labels['buttontitle'] = 'Archivovať túto správu';
-$labels['archived'] = 'Úspešne archivované';
+$labels['archived'] = 'Úspešne uložené do archívu';
 $labels['archivedreload'] = 'Archivovanie bolo úspešne dokončené. Ak si chcete prezrieť nové archívne priečinky, obnovte stránku.';
 $labels['archiveerror'] = 'Niektoré správy nebolo možné archivovať';
 $labels['archivefolder'] = 'Archivovať';
 $labels['settingstitle'] = 'Archív';
 $labels['archivetype'] = 'Rozdeliť archív po';
-$labels['archivetypeyear'] = 'Rok (napríklad Archív/2012)';
-$labels['archivetypemonth'] = 'Mesiac (napríklad Archív/2012/06)';
+$labels['archivetypeyear'] = 'rokoch (napríklad Archív/2012)';
+$labels['archivetypemonth'] = 'mesiacoch (napríklad Archív/2012/06)';
 $labels['archivetypefolder'] = 'Pôvodný priečinok';
 $labels['archivetypesender'] = 'E-mailová adresa odosielateľa';
 $labels['unkownsender'] = 'neznámy';
diff --git a/plugins/archive/localization/te_IN.inc b/plugins/archive/localization/te_IN.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/te_IN.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/th_TH.inc b/plugins/archive/localization/th_TH.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/th_TH.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/ti.inc b/plugins/archive/localization/ti.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/ti.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/tzm.inc b/plugins/archive/localization/tzm.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/tzm.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/archive/localization/uk_UA.inc b/plugins/archive/localization/uk_UA.inc
index d2b461fca..48cbf00f8 100644
--- a/plugins/archive/localization/uk_UA.inc
+++ b/plugins/archive/localization/uk_UA.inc
@@ -18,5 +18,11 @@
 $labels['buttontext'] = 'Архів';
 $labels['buttontitle'] = 'Архівувати це повідомлення';
 $labels['archived'] = 'Перенесено в архів';
+$labels['archivedreload'] = 'Архівацію успішно завершено. Перезавантажте сторінку щоб побачити теку з архівами.';
+$labels['archiveerror'] = 'Деякі повідомлення неможуть бути зархівованими';
 $labels['archivefolder'] = 'Архів';
+$labels['settingstitle'] = 'Архів';
+$labels['archivetypeyear'] = 'Рік (наприклад Архів/2012)';
+$labels['archivetypemonth'] = 'Місяць (наприклад Архів/2012/06)';
+$labels['unkownsender'] = 'невідомо';
 ?>
diff --git a/plugins/archive/localization/ur_PK.inc b/plugins/archive/localization/ur_PK.inc
deleted file mode 100644
index 8e95162d5..000000000
--- a/plugins/archive/localization/ur_PK.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
-*/
-?>
diff --git a/plugins/attachment_reminder/localization/ca_ES.inc b/plugins/attachment_reminder/localization/ca_ES.inc
index 957548bfb..ca22fbd41 100644
--- a/plugins/attachment_reminder/localization/ca_ES.inc
+++ b/plugins/attachment_reminder/localization/ca_ES.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "Heu oblidat afegir un fitxer?";
-$messages['reminderoption'] = "Avís de fitxers adjunts oblidats";
+$messages['forgotattachment'] = "Us heu oblidat afegir un fitxer?";
+$messages['reminderoption'] = "Recordatori de fitxers adjunts oblidats";
 $messages['keywords'] = "adjunt,fitxer,adjuntar,adjuntat,adjuntant,CV,carta";
diff --git a/plugins/archive/localization/bn_BD.inc b/plugins/attachment_reminder/localization/en_CA.inc
index 8e95162d5..730e206f7 100644
--- a/plugins/archive/localization/bn_BD.inc
+++ b/plugins/attachment_reminder/localization/en_CA.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
  |                                                                       |
  | Localization file of the Roundcube Webmail Archive plugin             |
  | Copyright (C) 2013, The Roundcube Dev Team                            |
@@ -13,6 +13,8 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
 
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-?>
+$messages['forgotattachment'] = "Did you forget to attach a file?";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/archive/localization/hi_IN.inc b/plugins/attachment_reminder/localization/es_419.inc
index 8e95162d5..0c9a33bfe 100644
--- a/plugins/archive/localization/hi_IN.inc
+++ b/plugins/attachment_reminder/localization/es_419.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
  |                                                                       |
  | Localization file of the Roundcube Webmail Archive plugin             |
  | Copyright (C) 2013, The Roundcube Dev Team                            |
@@ -13,6 +13,8 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
 
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-?>
+$messages['forgotattachment'] = "¿Has olvidado adjuntar un archivo?";
+$messages['reminderoption'] = "Recordar si olvido adjuntar archivos";
+$messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/fi_FI.inc b/plugins/attachment_reminder/localization/fi_FI.inc
index 53d2a9abb..a39d8b28d 100644
--- a/plugins/attachment_reminder/localization/fi_FI.inc
+++ b/plugins/attachment_reminder/localization/fi_FI.inc
@@ -17,4 +17,4 @@
 */
 $messages['forgotattachment'] = "Unohditko liittää tiedoston?";
 $messages['reminderoption'] = "Muistuta mahdollisesti unohtuneista liitteistä";
-$messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter,liite,tiedosto,liitteenä,liitetiedosto";
+$messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter,liite,tiedosto,liitteenä,liitetiedosto,ansioluettelo";
diff --git a/plugins/attachment_reminder/localization/gl_ES.inc b/plugins/attachment_reminder/localization/gl_ES.inc
index bd126b2af..a45f63bd1 100644
--- a/plugins/attachment_reminder/localization/gl_ES.inc
+++ b/plugins/attachment_reminder/localization/gl_ES.inc
@@ -17,4 +17,4 @@
 */
 $messages['forgotattachment'] = "Esqueceches adxuntar un ficheiro?";
 $messages['reminderoption'] = "Lembrete de adxuntos esquecidos";
-$messages['keywords'] = "adxunto,ficheiro,engádega, engadido,engadindo,anexo,CV,cuberta,carta";
+$messages['keywords'] = "anexo, arquivo, engadir, anexo, anexando, pechado, CV, carta de presentación";
diff --git a/plugins/archive/localization/ar.inc b/plugins/attachment_reminder/localization/kn_IN.inc
index 8e95162d5..9783afa97 100644
--- a/plugins/archive/localization/ar.inc
+++ b/plugins/attachment_reminder/localization/kn_IN.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/archive/localization/<lang>.inc                                |
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
  |                                                                       |
  | Localization file of the Roundcube Webmail Archive plugin             |
  | Copyright (C) 2013, The Roundcube Dev Team                            |
@@ -13,6 +13,8 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
 
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-?>
+$messages['forgotattachment'] = "ನೀವು ಫೈಲ್ ಅಟ್ಯಾಚ್ ಮಾಡಲು ಮರೆತಿರುವಿರಾ?";
+$messages['reminderoption'] = "";
+$messages['keywords'] = "";
diff --git a/plugins/help/localization/ber.inc b/plugins/help/localization/ber.inc
deleted file mode 100644
index 046e45733..000000000
--- a/plugins/help/localization/ber.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization//labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: FULL NAME <EMAIL@ADDRESS>                                     |
- +-----------------------------------------------------------------------+
-*/
-
-
diff --git a/plugins/help/localization/bn_BD.inc b/plugins/help/localization/en_CA.inc
index 46160477e..11a282f10 100644
--- a/plugins/help/localization/bn_BD.inc
+++ b/plugins/help/localization/en_CA.inc
@@ -15,4 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
+$labels['help'] = 'Help';
+$labels['about'] = 'About';
+$labels['license'] = 'License';
 ?>
diff --git a/plugins/help/localization/hi_IN.inc b/plugins/help/localization/es_419.inc
index 46160477e..5567c924a 100644
--- a/plugins/help/localization/hi_IN.inc
+++ b/plugins/help/localization/es_419.inc
@@ -15,4 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
+$labels['help'] = 'Ayuda';
+$labels['about'] = 'Sobre';
+$labels['license'] = 'Licencia';
 ?>
diff --git a/plugins/help/localization/ar.inc b/plugins/help/localization/kn_IN.inc
index 46160477e..ce852d7e8 100644
--- a/plugins/help/localization/ar.inc
+++ b/plugins/help/localization/kn_IN.inc
@@ -15,4 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
+$labels['help'] = 'ಸಹಾಯ';
+$labels['license'] = 'ಪರವಾನಗಿ';
 ?>
diff --git a/plugins/help/localization/ml_IN.inc b/plugins/help/localization/ml_IN.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/ml_IN.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/mn_MN.inc b/plugins/help/localization/mn_MN.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/mn_MN.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/ms_MY.inc b/plugins/help/localization/ms_MY.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/ms_MY.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/my_MM.inc b/plugins/help/localization/my_MM.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/my_MM.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/nl_BE.inc b/plugins/help/localization/nl_BE.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/nl_BE.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/nqo.inc b/plugins/help/localization/nqo.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/nqo.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/om.inc b/plugins/help/localization/om.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/om.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/sk_SK.inc b/plugins/help/localization/sk_SK.inc
index ca88dbbe0..cead6f58a 100644
--- a/plugins/help/localization/sk_SK.inc
+++ b/plugins/help/localization/sk_SK.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-$labels['help'] = 'Nápoveda';
+$labels['help'] = 'Pomocník';
 $labels['about'] = 'O aplikácii';
 $labels['license'] = 'Licencia';
 ?>
diff --git a/plugins/help/localization/te_IN.inc b/plugins/help/localization/te_IN.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/te_IN.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/th_TH.inc b/plugins/help/localization/th_TH.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/th_TH.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/tzm.inc b/plugins/help/localization/tzm.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/tzm.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/help/localization/ur_PK.inc b/plugins/help/localization/ur_PK.inc
deleted file mode 100644
index 46160477e..000000000
--- a/plugins/help/localization/ur_PK.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/az_AZ.inc b/plugins/hide_blockquote/localization/az_AZ.inc
index b4ae17129..6fdd4410b 100644
--- a/plugins/hide_blockquote/localization/az_AZ.inc
+++ b/plugins/hide_blockquote/localization/az_AZ.inc
@@ -17,5 +17,5 @@
 */
 $labels['hide'] = 'Gizlət';
 $labels['show'] = 'Göstər';
-$labels['quotelimit'] = 'Sətr saytı göstəriləndən çoxdursa sitatı gizlə:';
+$labels['quotelimit'] = 'Sayğac xətti çoxdursa sitatı gizlə';
 ?>
diff --git a/plugins/hide_blockquote/localization/ar.inc b/plugins/hide_blockquote/localization/en_CA.inc
index 83c0e3cb6..0256e712a 100644
--- a/plugins/hide_blockquote/localization/ar.inc
+++ b/plugins/hide_blockquote/localization/en_CA.inc
@@ -15,4 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
+$labels['hide'] = 'Hide';
+$labels['show'] = 'Show';
+$labels['quotelimit'] = 'Hide citation when lines count is greater than';
 ?>
diff --git a/plugins/hide_blockquote/localization/bn_BD.inc b/plugins/hide_blockquote/localization/es_419.inc
index 83c0e3cb6..8a6f06cd8 100644
--- a/plugins/hide_blockquote/localization/bn_BD.inc
+++ b/plugins/hide_blockquote/localization/es_419.inc
@@ -15,4 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
+$labels['hide'] = 'Ocultar';
+$labels['show'] = 'Mostrar';
+$labels['quotelimit'] = 'Ocultar la cita cuando el número de lineas sea mayor a ';
 ?>
diff --git a/plugins/hide_blockquote/localization/ia.inc b/plugins/hide_blockquote/localization/ia.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/ia.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/ml_IN.inc b/plugins/hide_blockquote/localization/ml_IN.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/ml_IN.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/mn_MN.inc b/plugins/hide_blockquote/localization/mn_MN.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/mn_MN.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/ms_MY.inc b/plugins/hide_blockquote/localization/ms_MY.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/ms_MY.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/my_MM.inc b/plugins/hide_blockquote/localization/my_MM.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/my_MM.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/nl_BE.inc b/plugins/hide_blockquote/localization/nl_BE.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/nl_BE.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/nqo.inc b/plugins/hide_blockquote/localization/nqo.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/nqo.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/om.inc b/plugins/hide_blockquote/localization/om.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/om.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/sk_SK.inc b/plugins/hide_blockquote/localization/sk_SK.inc
index 2a41c1ec6..c5fe73f9a 100644
--- a/plugins/hide_blockquote/localization/sk_SK.inc
+++ b/plugins/hide_blockquote/localization/sk_SK.inc
@@ -17,5 +17,5 @@
 */
 $labels['hide'] = 'Skryť';
 $labels['show'] = 'Zobraziť';
-$labels['quotelimit'] = 'Skryť citáciu pokiaľ je počet riadkov väčší než';
+$labels['quotelimit'] = 'Skryť citovaný text, ak je počet riadkov väčší než';
 ?>
diff --git a/plugins/hide_blockquote/localization/te_IN.inc b/plugins/hide_blockquote/localization/te_IN.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/te_IN.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/th_TH.inc b/plugins/hide_blockquote/localization/th_TH.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/th_TH.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/ti.inc b/plugins/hide_blockquote/localization/ti.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/ti.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/tzm.inc b/plugins/hide_blockquote/localization/tzm.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/tzm.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/hide_blockquote/localization/ur_PK.inc b/plugins/hide_blockquote/localization/ur_PK.inc
deleted file mode 100644
index 83c0e3cb6..000000000
--- a/plugins/hide_blockquote/localization/ur_PK.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/
-*/
-?>
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index e9c60e493..d692b9620 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -47,12 +47,14 @@ $labels['messagesendcopy'] = 'Məktubun kopyasını göndər';
 $labels['messagereply'] = 'Məktubla cavab ver';
 $labels['messagedelete'] = 'Sil';
 $labels['messagediscard'] = 'Məktubla rədd et';
+$labels['messagekeep'] = 'Məktubu gələnlərdə saxla';
 $labels['messagesrules'] = 'Daxil olan məktub üçün:';
 $labels['messagesactions'] = '...növbəti hərəkəti yerinə yetir:';
 $labels['add'] = 'Əlavə et';
 $labels['del'] = 'Sil';
 $labels['sender'] = 'Göndərən';
 $labels['recipient'] = 'Qəbul edən';
+$labels['vacationaddr'] = 'Mənim əlavə e-poçt ünvan(lar)ım: ';
 $labels['vacationdays'] = 'Məktub neçə müddətdən bir göndərilsin (gündə):';
 $labels['vacationinterval'] = 'Məktublar nə qədər sıx göndərilsin:';
 $labels['days'] = 'günlər';
@@ -80,11 +82,13 @@ $labels['countisgreaterthanequal'] = 'say çox və ya bərabərdir';
 $labels['countislessthan'] = 'say buradan azdır';
 $labels['countislessthanequal'] = 'say azdır və ya bərabərdir';
 $labels['countequals'] = 'say bərabərdir';
+$labels['countnotequals'] = 'say bərabər deyil';
 $labels['valueisgreaterthan'] = 'dəyər buradan daha böyükdür';
 $labels['valueisgreaterthanequal'] = 'dəyər çoxdur və ya bərabərdir';
 $labels['valueislessthan'] = 'dəyər buradan azdır';
 $labels['valueislessthanequal'] = 'dəyər azdır və ya bərabərdir';
 $labels['valueequals'] = 'dəyər bərabərdir';
+$labels['valuenotequals'] = 'dəyər bərabər deyil';
 $labels['setflags'] = 'Məktublara flaq quraşdır';
 $labels['addflags'] = 'Məktuba flaq əlavə et';
 $labels['removeflags'] = 'Məktubdan flaqları sil';
@@ -116,6 +120,22 @@ $labels['filtercreate'] = 'Süzgəc yarat';
 $labels['usedata'] = 'Süzgəcdə bu məlumatları istifadə et:';
 $labels['nextstep'] = 'Sonrakı';
 $labels['...'] = '...';
+$labels['currdate'] = 'İndiki tarix';
+$labels['datetest'] = 'Tarix';
+$labels['dateheader'] = 'başlıq:';
+$labels['year'] = 'il';
+$labels['month'] = 'ay';
+$labels['day'] = 'gün';
+$labels['date'] = 'tarix (iiii-aa-gg)';
+$labels['julian'] = 'tarix (yulian)';
+$labels['hour'] = 'saat';
+$labels['minute'] = 'dəqiqə';
+$labels['second'] = 'saniyə';
+$labels['time'] = 'saat (sa:dd:sn)';
+$labels['iso8601'] = 'tarix (ISO8601)';
+$labels['std11'] = 'tarix (RFC2822)';
+$labels['zone'] = 'saat-zona';
+$labels['weekday'] = 'həftənin günü (0-6)';
 $labels['advancedopts'] = 'Əlavə ayarlar';
 $labels['body'] = 'Məzmun';
 $labels['address'] = 'ünvan';
@@ -135,26 +155,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['index'] = 'indeks:';
+$labels['indexlast'] = 'arxaya';
 $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əcləri aktiv etmək mümkün deyil. Server xətası.';
+$messages['setdeactivateerror'] = 'Seçilmiş süzgəcləri deaktiv mümkün deyil. Server xətası.';
+$messages['setdeleteerror'] = 'Seçilmiş süzgəcləri 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əcləri yaratmaq mümkün deyil. Server xətası.';
 $messages['setcreated'] = 'Süzgəc dəsti uğurla yaradıldı.';
+$messages['activateerror'] = 'Seçilmiş süzgəc(lər)i yandırmaq mümkün deyil. Server xətası.';
+$messages['deactivateerror'] = 'Seçilmiş süzgəc(lər)i söndürmək mümkün deyil. Server xətası.';
 $messages['deactivated'] = 'Süzgəc(lər) uğurla yandırıldı.';
 $messages['activated'] = 'Süzgəc(lər) uğurla söndürüldü.';
 $messages['moved'] = 'Süzgəc uğurla köçürüldü.';
+$messages['moveerror'] = 'Süzgəci köçürmək mümkün deyil. Server xətası.';
 $messages['nametoolong'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Ad çox uzundur.';
 $messages['namereserved'] = 'Rezerv edilmiş ad.';
 $messages['setexist'] = 'Dəst artıq mövcuddur.';
 $messages['nodata'] = 'Heç olmasa bir mövqe tutmaq lazımdır!';
+$messages['invaliddateformat'] = 'Tarix və ya tarix formatının bir hissəsi səhvdir';
 ?>
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index dae49397a..5e54c6a7b 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -53,19 +53,19 @@ $labels['messagesactions'] = '..executa les següents accions:';
 $labels['add'] = 'Afegeix';
 $labels['del'] = 'Suprimeix';
 $labels['sender'] = 'Remitent';
-$labels['recipient'] = 'Destinatari/a';
+$labels['recipient'] = 'Destinatari';
 $labels['vacationaddr'] = 'Les meves adreces de correu addicionals:';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
 $labels['vacationinterval'] = 'Amb quina freqüència s\'han d\'enviar els missatges:';
 $labels['days'] = 'dies';
 $labels['seconds'] = 'segons';
-$labels['vacationreason'] = 'Cos del missatge (raó de les vacances):';
+$labels['vacationreason'] = 'Cos del missatge (raó de l\'absència):';
 $labels['vacationsubject'] = 'Assumpte del missatge:';
 $labels['rulestop'] = 'Deixa d\'avaluar regles';
-$labels['enable'] = 'Habilita/deshabilita';
+$labels['enable'] = 'Habilita/Deshabilita';
 $labels['filterset'] = 'Conjunt de filtres';
 $labels['filtersets'] = 'Conjunts de filtres';
-$labels['filtersetadd'] = 'Afegeix conjunts de filtres';
+$labels['filtersetadd'] = 'Afegeix un conjunt de filtres';
 $labels['filtersetdel'] = 'Suprimeix el conjunt de filtres actual';
 $labels['filtersetact'] = 'Activa el conjunt de filtres actual';
 $labels['filtersetdeact'] = 'Desactiva el conjunt de filtres actual';
@@ -77,17 +77,17 @@ $labels['none'] = 'cap';
 $labels['fromset'] = 'des del conjunt';
 $labels['fromfile'] = 'des del fitxer';
 $labels['filterdisabled'] = 'Filtre deshabilitat';
-$labels['countisgreaterthan'] = 'el recompte és major que';
-$labels['countisgreaterthanequal'] = 'el recompte és major o igual a';
-$labels['countislessthan'] = 'el recompte és menor que';
+$labels['countisgreaterthan'] = 'el recompte és més gran de';
+$labels['countisgreaterthanequal'] = 'el recompte és més gran o igual a';
+$labels['countislessthan'] = 'el recompte és menor de';
 $labels['countislessthanequal'] = 'el recompte és menor o igual a';
 $labels['countequals'] = 'el recompte és igual que';
 $labels['countnotequals'] = 'el recompte és diferent de';
-$labels['valueisgreaterthan'] = 'el valor és major que';
+$labels['valueisgreaterthan'] = 'el valor és més gran de';
 $labels['valueisgreaterthanequal'] = 'el valor és major o igual que';
 $labels['valueislessthan'] = 'el valor és menor que';
-$labels['valueislessthanequal'] = 'el valor és menor o igual que';
-$labels['valueequals'] = 'el valor és igual que';
+$labels['valueislessthanequal'] = 'el valor és menor o igual de';
+$labels['valueequals'] = 'el valor és igual a';
 $labels['valuenotequals'] = 'el valor és diferent de';
 $labels['setflags'] = 'Posa indicadors al missatge';
 $labels['addflags'] = 'Afegeix indicadors al missatge';
@@ -108,8 +108,8 @@ $labels['varupperfirst'] = 'el primer caràcter en majúscula';
 $labels['varquotewildcard'] = 'engloba els caràcters especials amb cometes';
 $labels['varlength'] = 'llargada';
 $labels['notify'] = 'Envia notificació';
-$labels['notifyaddress'] = 'Per a adreça de correu electrònic:';
-$labels['notifybody'] = 'Cos de la notificació';
+$labels['notifyaddress'] = 'A l\'adreça de correu electrònic:';
+$labels['notifybody'] = 'Cos de la notificació:';
 $labels['notifysubject'] = 'Assumpte de la notificació:';
 $labels['notifyfrom'] = 'Remitent de la notificació:';
 $labels['notifyimportance'] = 'Importància:';
@@ -148,7 +148,7 @@ $labels['modtype'] = 'tipus:';
 $labels['allparts'] = 'tots';
 $labels['domain'] = 'domini';
 $labels['localpart'] = 'part local';
-$labels['user'] = 'usuari/a';
+$labels['user'] = 'usuari';
 $labels['detail'] = 'detall';
 $labels['comparator'] = 'comparador:';
 $labels['default'] = 'per defecte';
@@ -161,11 +161,11 @@ $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['filtersaved'] = 'El filtre s\'ha 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['filterdeleteconfirm'] = 'Esteu segurs de voler suprimir el filtre seleccionat?';
+$messages['ruledeleteconfirm'] = 'Esteu segurs que voleu suprimir la regla seleccionada?';
+$messages['actiondeleteconfirm'] = 'Esteu segurs 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.';
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index f12b20f3a..b67c50786 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -162,6 +162,7 @@ $messages['filterconnerror'] = 'Kan ikke forbinde til server.';
 $messages['filterdeleteerror'] = 'Kunne ikke slette filter. Serverfejl opstod.';
 $messages['filterdeleted'] = 'Filter slettet.';
 $messages['filtersaved'] = 'Filter gemt.';
+$messages['filtersaveerror'] = 'Kunne ikke gemme filter. Serverfejl.';
 $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?';
diff --git a/plugins/managesieve/localization/en_CA.inc b/plugins/managesieve/localization/en_CA.inc
new file mode 100644
index 000000000..311e5953e
--- /dev/null
+++ b/plugins/managesieve/localization/en_CA.inc
@@ -0,0 +1,192 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
+*/
+$labels['filters'] = 'Filters';
+$labels['managefilters'] = 'Manage incoming mail filters';
+$labels['filtername'] = 'Filter name';
+$labels['newfilter'] = 'New filter';
+$labels['filteradd'] = 'Add filter';
+$labels['filterdel'] = 'Delete filter';
+$labels['moveup'] = 'Move up';
+$labels['movedown'] = 'Move down';
+$labels['filterallof'] = 'matching all of the following rules';
+$labels['filteranyof'] = 'matching any of the following rules';
+$labels['filterany'] = 'all messages';
+$labels['filtercontains'] = 'contains';
+$labels['filternotcontains'] = 'not contains';
+$labels['filteris'] = 'is equal to';
+$labels['filterisnot'] = 'is not equal to';
+$labels['filterexists'] = 'exists';
+$labels['filternotexists'] = 'not exists';
+$labels['filtermatches'] = 'matches expression';
+$labels['filternotmatches'] = 'not matches expression';
+$labels['filterregex'] = 'matches regular expression';
+$labels['filternotregex'] = 'not matches regular expression';
+$labels['filterunder'] = 'under';
+$labels['filterover'] = 'over';
+$labels['addrule'] = 'Add rule';
+$labels['delrule'] = 'Delete rule';
+$labels['messagemoveto'] = 'Move message to';
+$labels['messageredirect'] = 'Redirect message to';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
+$labels['messagereply'] = 'Reply with message';
+$labels['messagedelete'] = 'Delete message';
+$labels['messagediscard'] = 'Discard with message';
+$labels['messagekeep'] = 'Keep message in Inbox';
+$labels['messagesrules'] = 'For incoming mail:';
+$labels['messagesactions'] = '...execute the following actions:';
+$labels['add'] = 'Add';
+$labels['del'] = 'Delete';
+$labels['sender'] = 'Sender';
+$labels['recipient'] = 'Recipient';
+$labels['vacationaddr'] = 'My additional e-mail address(es):';
+$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = 'Message body (vacation reason):';
+$labels['vacationsubject'] = 'Message subject:';
+$labels['rulestop'] = 'Stop evaluating rules';
+$labels['enable'] = 'Enable/Disable';
+$labels['filterset'] = 'Filters set';
+$labels['filtersets'] = 'Filter sets';
+$labels['filtersetadd'] = 'Add filters set';
+$labels['filtersetdel'] = 'Delete current filters set';
+$labels['filtersetact'] = 'Activate current filters set';
+$labels['filtersetdeact'] = 'Deactivate current filters set';
+$labels['filterdef'] = 'Filter definition';
+$labels['filtersetname'] = 'Filters set name';
+$labels['newfilterset'] = 'New filters set';
+$labels['active'] = 'active';
+$labels['none'] = 'none';
+$labels['fromset'] = 'from set';
+$labels['fromfile'] = 'from file';
+$labels['filterdisabled'] = 'Filter disabled';
+$labels['countisgreaterthan'] = 'count is greater than';
+$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
+$labels['countislessthan'] = 'count is less than';
+$labels['countislessthanequal'] = 'count is less than or equal to';
+$labels['countequals'] = 'count is equal to';
+$labels['countnotequals'] = 'count is not equal to';
+$labels['valueisgreaterthan'] = 'value is greater than';
+$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
+$labels['valueislessthan'] = 'value is less than';
+$labels['valueislessthanequal'] = 'value is less than or equal to';
+$labels['valueequals'] = 'value is equal to';
+$labels['valuenotequals'] = 'value is not equal to';
+$labels['setflags'] = 'Set flags to the message';
+$labels['addflags'] = 'Add flags to the message';
+$labels['removeflags'] = 'Remove flags from the message';
+$labels['flagread'] = 'Read';
+$labels['flagdeleted'] = 'Deleted';
+$labels['flaganswered'] = 'Answered';
+$labels['flagflagged'] = 'Flagged';
+$labels['flagdraft'] = 'Draft';
+$labels['setvariable'] = 'Set variable';
+$labels['setvarname'] = 'Variable name:';
+$labels['setvarvalue'] = 'Variable value:';
+$labels['setvarmodifiers'] = 'Modifiers:';
+$labels['varlower'] = 'lower-case';
+$labels['varupper'] = 'upper-case';
+$labels['varlowerfirst'] = 'first character lower-case';
+$labels['varupperfirst'] = 'first character upper-case';
+$labels['varquotewildcard'] = 'quote special characters';
+$labels['varlength'] = 'length';
+$labels['notify'] = 'Send notification';
+$labels['notifyaddress'] = 'To e-mail address:';
+$labels['notifybody'] = 'Notification body:';
+$labels['notifysubject'] = 'Notification subject:';
+$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifyimportance'] = 'Importance:';
+$labels['notifyimportancelow'] = 'low';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'high';
+$labels['filtercreate'] = 'Create filter';
+$labels['usedata'] = 'Use following data in the filter:';
+$labels['nextstep'] = 'Next Step';
+$labels['...'] = '...';
+$labels['currdate'] = 'Current date';
+$labels['datetest'] = 'Date';
+$labels['dateheader'] = 'header:';
+$labels['year'] = 'year';
+$labels['month'] = 'month';
+$labels['day'] = 'day';
+$labels['date'] = 'date (yyyy-mm-dd)';
+$labels['julian'] = 'date (julian)';
+$labels['hour'] = 'hour';
+$labels['minute'] = 'minute';
+$labels['second'] = 'second';
+$labels['time'] = 'time (hh:mm:ss)';
+$labels['iso8601'] = 'date (ISO8601)';
+$labels['std11'] = 'date (RFC2822)';
+$labels['zone'] = 'time-zone';
+$labels['weekday'] = 'weekday (0-6)';
+$labels['advancedopts'] = 'Advanced options';
+$labels['body'] = 'Body';
+$labels['address'] = 'address';
+$labels['envelope'] = 'envelope';
+$labels['modifier'] = 'modifier:';
+$labels['text'] = 'text';
+$labels['undecoded'] = 'undecoded (raw)';
+$labels['contenttype'] = 'content type';
+$labels['modtype'] = 'type:';
+$labels['allparts'] = 'all';
+$labels['domain'] = 'domain';
+$labels['localpart'] = 'local part';
+$labels['user'] = 'user';
+$labels['detail'] = 'detail';
+$labels['comparator'] = 'comparator:';
+$labels['default'] = 'default';
+$labels['octet'] = 'strict (octet)';
+$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
+$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['index'] = 'index:';
+$labels['indexlast'] = 'backwards';
+$messages['filterunknownerror'] = 'Unknown server error.';
+$messages['filterconnerror'] = 'Unable to connect to server.';
+$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occurred.';
+$messages['filterdeleted'] = 'Filter deleted successfully.';
+$messages['filtersaved'] = 'Filter saved successfully.';
+$messages['filtersaveerror'] = 'Unable to save filter. Server error occurred.';
+$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 occurred.';
+$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occurred.';
+$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occurred.';
+$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 occurred.';
+$messages['setcreated'] = 'Filters set created successfully.';
+$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occurred.';
+$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occurred.';
+$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 occurred.';
+$messages['nametoolong'] = 'Name too long.';
+$messages['namereserved'] = 'Reserved name.';
+$messages['setexist'] = 'Set already exists.';
+$messages['nodata'] = 'At least one position must be selected!';
+$messages['invaliddateformat'] = 'Invalid date or date part format';
+?>
diff --git a/plugins/managesieve/localization/es_419.inc b/plugins/managesieve/localization/es_419.inc
new file mode 100644
index 000000000..f459bdb67
--- /dev/null
+++ b/plugins/managesieve/localization/es_419.inc
@@ -0,0 +1,153 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
+*/
+$labels['filters'] = 'Filtros';
+$labels['managefilters'] = 'Administrar filtros de correos entrantes';
+$labels['filtername'] = 'Nombre del filtro';
+$labels['newfilter'] = 'Filtro nuevo';
+$labels['filteradd'] = 'Agregar filtro';
+$labels['filterdel'] = 'Eliminar filtro';
+$labels['moveup'] = 'Mover hacia arriba';
+$labels['movedown'] = 'Mover hacia abajo';
+$labels['filterallof'] = 'coincide con todas las reglas siguientes';
+$labels['filteranyof'] = 'coincide con cualquiera de las reglas siguientes';
+$labels['filterany'] = 'todos los mensajes';
+$labels['filtercontains'] = 'contiene';
+$labels['filternotcontains'] = 'no contiene';
+$labels['filteris'] = 'es igual a';
+$labels['filterisnot'] = 'no es igual a';
+$labels['filterexists'] = 'existe';
+$labels['filternotexists'] = 'no existe';
+$labels['filtermatches'] = 'coincide con la expresión';
+$labels['filternotmatches'] = 'no coincide con la expresión';
+$labels['filterregex'] = 'coincide con la expresión regular';
+$labels['filternotregex'] = 'no coincide con la expresión regular';
+$labels['filterunder'] = 'bajo';
+$labels['filterover'] = 'sobre';
+$labels['addrule'] = 'Agregar regla';
+$labels['delrule'] = 'Eliminar regla';
+$labels['messagemoveto'] = 'Mover mensaje a';
+$labels['messageredirect'] = 'Redireccionar mensaje a';
+$labels['messagecopyto'] = 'Copiar mensaje a';
+$labels['messagesendcopy'] = 'Enviar una copia del mensaje a ';
+$labels['messagereply'] = 'Responder con el mensaje';
+$labels['messagedelete'] = 'Eliminar mensaje';
+$labels['messagediscard'] = 'Descartar el mensaje';
+$labels['messagekeep'] = 'Mantener mensaje en la bandeja de entrada';
+$labels['messagesrules'] = 'Para correo entrante:';
+$labels['messagesactions'] = '... ejecutar las siguientes acciones:';
+$labels['add'] = 'Agregar';
+$labels['del'] = 'Eliminar';
+$labels['sender'] = 'Remitente';
+$labels['recipient'] = 'Destinatario';
+$labels['vacationdays'] = '¿Cada cuánto enviar mensajes (en días)?';
+$labels['vacationinterval'] = '¿Con que frecuencia enviar mensajes?';
+$labels['days'] = 'días';
+$labels['seconds'] = 'segundos';
+$labels['vacationreason'] = 'Cuerpo del mensaje (motivo de las vacaciones):';
+$labels['vacationsubject'] = 'Título del mensaje:';
+$labels['rulestop'] = 'Detener la evaluación de reglas';
+$labels['enable'] = 'Habilitar/Deshabilitar';
+$labels['filterdef'] = 'Definición del filtro';
+$labels['active'] = 'activo';
+$labels['none'] = 'ninguno';
+$labels['fromfile'] = 'desde archivo';
+$labels['filterdisabled'] = 'filtro deshabilitado';
+$labels['countisgreaterthan'] = 'la cuenta es mayor a';
+$labels['countisgreaterthanequal'] = 'la cuenta es mayor o igual a ';
+$labels['countislessthan'] = 'la cuenta es menor que';
+$labels['countislessthanequal'] = 'la cuenta es menor o igual que';
+$labels['countequals'] = 'la cuenta es igual a ';
+$labels['valueisgreaterthan'] = 'el valor es mayor que';
+$labels['valueisgreaterthanequal'] = 'el balor es mayor o igual que ';
+$labels['valueislessthan'] = 'el valor es menor que ';
+$labels['valueislessthanequal'] = 'el valor es menor o igual que ';
+$labels['valueequals'] = 'el valor es igual a ';
+$labels['flagread'] = 'Leido';
+$labels['flagdeleted'] = 'Eliminado';
+$labels['flaganswered'] = 'Respondido';
+$labels['flagdraft'] = 'Borrador';
+$labels['setvarname'] = 'Nombre de la variable:';
+$labels['setvarvalue'] = 'Valor de la variable:';
+$labels['setvarmodifiers'] = 'Modificadores:';
+$labels['varlower'] = 'minúscula';
+$labels['varupper'] = 'mayúscula';
+$labels['varlowerfirst'] = 'primer carácter en minúscula';
+$labels['varupperfirst'] = 'primer carácter en mayúscula';
+$labels['varquotewildcard'] = 'citar carácteres especiales';
+$labels['varlength'] = 'largo';
+$labels['notify'] = 'Enviar notificación';
+$labels['notifyaddress'] = 'A la direccion de correo:';
+$labels['notifybody'] = 'Cuerpo de la notificación:';
+$labels['notifysubject'] = 'Tema de la notificación:';
+$labels['notifyfrom'] = 'Remitente de la notificación: ';
+$labels['notifyimportance'] = 'Importantcia:';
+$labels['notifyimportancelow'] = 'baja';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'alta';
+$labels['filtercreate'] = 'Crear filtro';
+$labels['usedata'] = 'Usar los datos siguientes en el filtro:';
+$labels['nextstep'] = 'Paso siguiente';
+$labels['...'] = '...';
+$labels['currdate'] = 'Fecha actual';
+$labels['datetest'] = 'Fecha';
+$labels['year'] = 'Año';
+$labels['month'] = 'mes';
+$labels['day'] = 'día';
+$labels['date'] = 'fecha(aaaa-mm-dd)';
+$labels['hour'] = 'hora';
+$labels['minute'] = 'minuto';
+$labels['second'] = 'segundo';
+$labels['time'] = 'hora (hh:mm:ss)';
+$labels['iso8601'] = 'fecha (ISO8601)';
+$labels['std11'] = 'fecha (RFC2822)';
+$labels['weekday'] = 'día de la semana (0-6)';
+$labels['advancedopts'] = 'Opciones avanzadas';
+$labels['body'] = 'Cuerpo';
+$labels['address'] = 'dirección';
+$labels['envelope'] = 'sobre';
+$labels['modifier'] = 'modificador:';
+$labels['text'] = 'texto';
+$labels['undecoded'] = 'decodificado (crudo)';
+$labels['contenttype'] = 'tipo de contenido';
+$labels['modtype'] = 'tipo:';
+$labels['allparts'] = 'todo';
+$labels['domain'] = 'dominio';
+$labels['localpart'] = 'parte local';
+$labels['user'] = 'usuario';
+$labels['detail'] = 'detalle';
+$labels['comparator'] = 'comparador:';
+$labels['default'] = 'predeterminado';
+$labels['octet'] = 'estricto';
+$labels['asciinumeric'] = 'numérico (ascii-numeric)';
+$messages['filterunknownerror'] = 'Error del servidor desconocido.';
+$messages['filterconnerror'] = 'Incapaz de conectarse al servidor.';
+$messages['filterdeleted'] = 'Filtro eliminado exitosamente.';
+$messages['filtersaved'] = 'Filtro guardado exitosamente.';
+$messages['filterdeleteconfirm'] = '¿Estás seguro que quieres eliminar el filtro seleccionado?';
+$messages['ruledeleteconfirm'] = '¿Estás seguro que quieres eliminar la regla seleccionada?';
+$messages['actiondeleteconfirm'] = '¿Estás seguro que queires eliminar la acción seleccionada?';
+$messages['forbiddenchars'] = 'Carácteres ilegales en el campo.';
+$messages['cannotbeempty'] = 'El campo no puede estar vacio.';
+$messages['ruleexist'] = 'Ya existe un filtro con el nombre especificado.';
+$messages['deactivated'] = 'Filtro(s) deshabilitado(s) exitosamente.';
+$messages['activated'] = 'Filtro(s) habilitado(s) exitosamente.';
+$messages['moved'] = 'Filtro movido exitosamente.';
+$messages['nametoolong'] = 'Nombre demasiado largo.';
+$messages['namereserved'] = 'Nombre reservado.';
+$messages['nodata'] = 'Debes seleccionar al menos una posición.';
+?>
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index 0e9549b58..67a73a9aa 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -159,22 +159,31 @@ $labels['index'] = 'index:';
 $labels['indexlast'] = 'retour arrière';
 $messages['filterunknownerror'] = 'Erreur du serveur inconnue';
 $messages['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
+$messages['filterdeleteerror'] = 'Impossible de supprimer le filtre. Une erreur serveur est survenue.';
 $messages['filterdeleted'] = 'Le filtre a bien été supprimé';
 $messages['filtersaved'] = 'Le filtre a bien été enregistré';
+$messages['filtersaveerror'] = 'Impossible de sauvegarder le filtre. Une erreur serveur est survenue.';
 $messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
 $messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';
 $messages['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée?';
 $messages['forbiddenchars'] = 'Caractères interdits dans le champ';
 $messages['cannotbeempty'] = 'Le champ ne peut pas être vide';
 $messages['ruleexist'] = 'Un filtre existe déjà avec ce nom.';
+$messages['setactivateerror'] = 'Impossible d\'activer le set de filtres sélectionné. Une erreur serveur est survenue.';
+$messages['setdeactivateerror'] = 'Impossible de désactiver le set de filtres sélectionné. Une erreur serveur est survenue.';
+$messages['setdeleteerror'] = 'Impossible de supprimer les set de filtres sélectionné. Une erreur serveur est survenue.';
 $messages['setactivated'] = 'Le groupe de filtres a bien été activé.';
 $messages['setdeactivated'] = 'Le groupe de filtres a bien été désactivé.';
 $messages['setdeleted'] = 'Le groupe de filtres a bien été supprimé.';
 $messages['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le groupe de filtres sélectionné ?';
+$messages['setcreateerror'] = 'Impossible de créer un set de filtres. Une erreur serveur est survenue.';
 $messages['setcreated'] = 'Le groupe de filtres a bien été créé.';
+$messages['activateerror'] = 'Impossible d\'activer le ou les filtres sélectionné(s). Une erreur serveur est survenue.';
+$messages['deactivateerror'] = 'Impossible de désactiver le ou les filtres sélectionné(s). Une erreur serveur est survenue.';
 $messages['deactivated'] = 'Filtre(s) désactivé(s) avec succès.';
 $messages['activated'] = 'Filtre(s) activé(s) avec succès.';
 $messages['moved'] = 'Filtre déplacé avec succès.';
+$messages['moveerror'] = 'Impossible de déplacer le filtre sélectionné. Une erreur serveur est survenue.';
 $messages['nametoolong'] = 'Nom trop long.';
 $messages['namereserved'] = 'Nom réservé.';
 $messages['setexist'] = 'Ce groupe existe déjà.';
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index e588ef571..6686ddcb4 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -23,9 +23,9 @@ $labels['filteradd'] = 'Engadir filtro';
 $labels['filterdel'] = 'Eliminar filtro';
 $labels['moveup'] = 'Mover arriba';
 $labels['movedown'] = 'Mover abaixo';
-$labels['filterallof'] = 'coincidir con tódalas regras siguientes';
+$labels['filterallof'] = 'coincidir con todas as regras seguintes';
 $labels['filteranyof'] = 'coincidir con algunha das regras seguintes';
-$labels['filterany'] = 'tódalas mensaxes';
+$labels['filterany'] = 'todas as mensaxes';
 $labels['filtercontains'] = 'contén';
 $labels['filternotcontains'] = 'non contén';
 $labels['filteris'] = 'é igual a';
@@ -47,17 +47,19 @@ $labels['messagesendcopy'] = 'Enviar copia da mensaxe a';
 $labels['messagereply'] = 'Respostar con unha mensaxe';
 $labels['messagedelete'] = 'Eliminar a mensaxe';
 $labels['messagediscard'] = 'Descartar con unha mensaxe';
+$labels['messagekeep'] = 'Manter mensaxe na caixa de entrada';
 $labels['messagesrules'] = 'Para o correo entrante:';
 $labels['messagesactions'] = '... executar as seguintes accións:';
 $labels['add'] = 'Engadir';
 $labels['del'] = 'Eliminar';
-$labels['sender'] = 'Remitente';
-$labels['recipient'] = 'Destinatario';
+$labels['sender'] = 'Remite';
+$labels['recipient'] = 'Persoa destinataria';
+$labels['vacationaddr'] = 'O(s) meu(s) outro (s) enderezo(s) de correo:';
 $labels['vacationdays'] = 'Cada canto enviar mensaxes (en días):';
-$labels['vacationinterval'] = 'Con qué frecuencia vanse enviar mensaxes:';
+$labels['vacationinterval'] = 'Con que frecuencia se van enviar mensaxes:';
 $labels['days'] = 'días';
 $labels['seconds'] = 'segundos';
-$labels['vacationreason'] = 'Corpo da mensaxe (razón de vacacións):';
+$labels['vacationreason'] = 'Corpo da mensaxe (por vacacións):';
 $labels['vacationsubject'] = 'Asunto da mensaxe:';
 $labels['rulestop'] = 'Parar de avaliar regras';
 $labels['enable'] = 'Activar/Desactivar';
@@ -75,14 +77,14 @@ $labels['none'] = 'ningún';
 $labels['fromset'] = 'de conxunto';
 $labels['fromfile'] = 'de arquivo';
 $labels['filterdisabled'] = 'Filtro desactivado';
-$labels['countisgreaterthan'] = 'a conta é meirande que';
-$labels['countisgreaterthanequal'] = 'a conta é meirande ou igual a';
+$labels['countisgreaterthan'] = 'a conta é maior que';
+$labels['countisgreaterthanequal'] = 'a conta é maior ou igual a';
 $labels['countislessthan'] = 'a conta é menor que';
 $labels['countislessthanequal'] = 'a conta é menor ou igual a';
 $labels['countequals'] = 'a conta é igual a';
 $labels['countnotequals'] = 'a conta non é igual a';
-$labels['valueisgreaterthan'] = 'o valor é meirande que ';
-$labels['valueisgreaterthanequal'] = 'o valor é meirande ou igual a';
+$labels['valueisgreaterthan'] = 'o valor é maior que ';
+$labels['valueisgreaterthanequal'] = 'o valor é maior ou igual a';
 $labels['valueislessthan'] = 'o valor é menor que';
 $labels['valueislessthanequal'] = 'o valor é menor ou igual a';
 $labels['valueequals'] = 'o valor é igual a';
@@ -95,9 +97,9 @@ $labels['flagdeleted'] = 'Eliminadas';
 $labels['flaganswered'] = 'Respostadas';
 $labels['flagflagged'] = 'Marcadas';
 $labels['flagdraft'] = 'Borrador';
-$labels['setvariable'] = 'Establecer variable';
-$labels['setvarname'] = 'Nome da variable:';
-$labels['setvarvalue'] = 'Valor da variable:';
+$labels['setvariable'] = 'Estabelecer variábel';
+$labels['setvarname'] = 'Nome da variábel:';
+$labels['setvarvalue'] = 'Valor da variábel:';
 $labels['setvarmodifiers'] = 'Modificadores:';
 $labels['varlower'] = 'minúscula';
 $labels['varupper'] = 'maiúscula';
@@ -106,10 +108,10 @@ $labels['varupperfirst'] = 'primeira letra maiúscula';
 $labels['varquotewildcard'] = 'poñer entre aspas caracteres especiais';
 $labels['varlength'] = 'lonxitude';
 $labels['notify'] = 'Enviar notificación';
-$labels['notifyaddress'] = 'Destinatario:';
+$labels['notifyaddress'] = 'A este enderezo de correo:';
 $labels['notifybody'] = 'Corpo da notificación:';
 $labels['notifysubject'] = 'Asunto da notificación:';
-$labels['notifyfrom'] = 'Remitente da notificación:';
+$labels['notifyfrom'] = 'Remite da notificación:';
 $labels['notifyimportance'] = 'Importancia:';
 $labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
@@ -146,36 +148,45 @@ $labels['modtype'] = 'tipo:';
 $labels['allparts'] = 'todos';
 $labels['domain'] = 'dominio';
 $labels['localpart'] = 'parte local';
-$labels['user'] = 'usuario';
+$labels['user'] = 'utente';
 $labels['detail'] = 'detalle';
-$labels['comparator'] = 'comparador';
-$labels['default'] = 'defecto';
+$labels['comparator'] = 'comparador:';
+$labels['default'] = 'predeterminado';
 $labels['octet'] = 'estricto (octeto)';
-$labels['asciicasemap'] = 'non sensible a maiúsculas/minúsculas (ascii-casemap)';
+$labels['asciicasemap'] = 'non sensíbel a maiúsculas/minúsculas (ascii-casemap)';
 $labels['asciinumeric'] = 'numérico (ascii-numerico)';
 $labels['index'] = 'índice:';
-$labels['indexlast'] = 'cara atrás';
-$messages['filterunknownerror'] = 'Erro descoñecido servidor';
-$messages['filterconnerror'] = 'Imposible conectar co servidor managesieve';
+$labels['indexlast'] = 'atrás';
+$messages['filterunknownerror'] = 'Erro descoñecido do servidor';
+$messages['filterconnerror'] = 'Imposíbel conectar co servidor.';
+$messages['filterdeleteerror'] = 'Non se pode eliminar filtro. Produciuse un erro de servidor.';
 $messages['filterdeleted'] = 'Filtro borrado con éxito';
 $messages['filtersaved'] = 'Filtro gardado con éxito';
-$messages['filterdeleteconfirm'] = 'Realmente desexa eliminar o filtro seleccionado?';
-$messages['ruledeleteconfirm'] = 'Está seguro de que desexa eliminar a regra seleccionada?';
-$messages['actiondeleteconfirm'] = 'Está seguro de que desexa eliminar a acción seleccionada?';
+$messages['filtersaveerror'] = 'Non se puido gardar filtro. Produciuse un erro de servidor.';
+$messages['filterdeleteconfirm'] = 'Realmente queres eliminar o filtro seleccionado?';
+$messages['ruledeleteconfirm'] = 'Seguro que queres eliminar a regra seleccionada?';
+$messages['actiondeleteconfirm'] = 'Seguro que queres eliminar a acción seleccionada?';
 $messages['forbiddenchars'] = 'Caracteres non permitidos no campo';
 $messages['cannotbeempty'] = 'O campo non pode estar baleiro';
-$messages['ruleexist'] = 'Xa existe un filtro con nome especificado.';
+$messages['ruleexist'] = 'Xa existe un filtro co nome especificado.';
+$messages['setactivateerror'] = 'Non se poden activar os filtros seleccionados. Produciuse un erro de servidor.';
+$messages['setdeactivateerror'] = 'Non foi posíbel desactivar os filtros seleccionados. Produciuse un erro de servidor.';
+$messages['setdeleteerror'] = 'Non é posíbel eliminar os filtros seleccionados. Produciuse un erro de servidor.';
 $messages['setactivated'] = 'O conxunto de filtros activouse con éxito';
 $messages['setdeactivated'] = 'O conxunto de filtros desactivouse con éxito';
 $messages['setdeleted'] = 'O Conxunto de filtros borrouse con éxito';
-$messages['setdeleteconfirm'] = 'Está seguro de que desexa eliminar o conxunto de filtros seleccionado?';
+$messages['setdeleteconfirm'] = 'Seguro que queres eliminar o conxunto de filtros seleccionado?';
+$messages['setcreateerror'] = 'Non é posíbel crear filtros. Produciuse un erro de servidor.';
 $messages['setcreated'] = 'Conxunto de filtros creado con éxito';
+$messages['activateerror'] = 'Non é posíbel activar o(s) filtro(s) seleccionado(s). Produciuse un erro de servidor.';
+$messages['deactivateerror'] = 'Incapaz de desactivar filtro(s) seleccionado(s). Produciuse un erro de servidor.';
 $messages['deactivated'] = 'Desactiváronse os filtros correctamente.';
 $messages['activated'] = 'Activáronse os filtros correctamente';
 $messages['moved'] = 'Moveuse correctamente o filtro.';
-$messages['nametoolong'] = 'Imposible crear o conxunto de filtros. O nome é longo de máis';
+$messages['moveerror'] = 'Non se pode mover o filtro seleccionado. Produciuse un erro de servidor.';
+$messages['nametoolong'] = 'Imposíbel crear o conxunto de filtros. O nome é longo de máis';
 $messages['namereserved'] = 'Nome reservado';
 $messages['setexist'] = 'Xa existe o conxunto';
 $messages['nodata'] = 'É preciso seleccionar polo menos unha posición!';
-$messages['invaliddateformat'] = 'Formato de data ou parte dos datos inválidos';
+$messages['invaliddateformat'] = 'Formato de data ou parte dos datos non válidos';
 ?>
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index 8a9e01708..9a75586fa 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -16,20 +16,20 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 $labels['filters'] = 'Filtre';
-$labels['managefilters'] = 'Správa filtrov príchádzajúcej pošty';
+$labels['managefilters'] = 'Správa filtrov prichádzajúcej pošty';
 $labels['filtername'] = 'Názov filtra';
 $labels['newfilter'] = 'Nový filter';
-$labels['filteradd'] = 'Pridaj filter';
-$labels['filterdel'] = 'Zmaž filter';
-$labels['moveup'] = 'Presuň vyššie';
-$labels['movedown'] = 'Presuň nižšie';
+$labels['filteradd'] = 'Pridať filter';
+$labels['filterdel'] = 'Vymazať filter';
+$labels['moveup'] = 'Presunúť nahor';
+$labels['movedown'] = 'Presunúť nadol';
 $labels['filterallof'] = 'vyhovujúca všetkým z nasledujúcich pravidiel';
 $labels['filteranyof'] = 'vyhovujúca ľubovoľnému z nasledujúcich pravidiel';
 $labels['filterany'] = 'všetky správy';
 $labels['filtercontains'] = 'obsahuje';
 $labels['filternotcontains'] = 'neobsahuje';
-$labels['filteris'] = 'rovná sa';
-$labels['filterisnot'] = 'nerovná sa';
+$labels['filteris'] = 'sa rovná';
+$labels['filterisnot'] = 'sa nerovná';
 $labels['filterexists'] = 'existuje';
 $labels['filternotexists'] = 'neexistuje';
 $labels['filtermatches'] = 'vyhovuje výrazu';
@@ -38,45 +38,45 @@ $labels['filterregex'] = 'vyhovuje regulárnemu výrazu';
 $labels['filternotregex'] = 'nevyhovuje regulárnemu výrazu';
 $labels['filterunder'] = 'pod';
 $labels['filterover'] = 'nad';
-$labels['addrule'] = 'Pridaj pravidlo';
-$labels['delrule'] = 'Zmaž pravidlo';
-$labels['messagemoveto'] = 'Presuň správu do';
-$labels['messageredirect'] = 'Presmeruj správu na';
+$labels['addrule'] = 'Pridať pravidlo';
+$labels['delrule'] = 'Vymazať pravidlo';
+$labels['messagemoveto'] = 'Presunúť správu do';
+$labels['messageredirect'] = 'Presmerovať správu na';
 $labels['messagecopyto'] = 'Kopírovať správu do';
-$labels['messagesendcopy'] = 'Poslať kópiu správy';
-$labels['messagereply'] = 'Pošli automatickú odpoveď';
-$labels['messagedelete'] = 'Zmaž správu';
-$labels['messagediscard'] = 'Zmaž a pošli správu na';
-$labels['messagekeep'] = 'Ponechať správy v Doručenej pošte';
-$labels['messagesrules'] = 'Pre prichádzajúcu poštu';
-$labels['messagesactions'] = 'vykonaj nasledovné akcie';
-$labels['add'] = 'Pridaj';
-$labels['del'] = 'Zmaž';
+$labels['messagesendcopy'] = 'Poslať kópiu správy na adresu';
+$labels['messagereply'] = 'Odpovedať správou';
+$labels['messagedelete'] = 'Vymazať správu';
+$labels['messagediscard'] = 'Vymazať a poslať správu na';
+$labels['messagekeep'] = 'Ponechať správu v Doručenej pošte';
+$labels['messagesrules'] = 'Pre prichádzajúcu poštu:';
+$labels['messagesactions'] = '...vykonať tieto akcie:';
+$labels['add'] = 'Pridať';
+$labels['del'] = 'Vymazať';
 $labels['sender'] = 'Odosielateľ';
-$labels['recipient'] = 'Adresát';
+$labels['recipient'] = 'Príjemca';
 $labels['vacationaddr'] = 'Iná moja e-mailová adresa (adresy):';
-$labels['vacationdays'] = 'Počet dní medzi odoslaním správy:';
+$labels['vacationdays'] = 'Ako často odosielať správy (v dňoch):';
 $labels['vacationinterval'] = 'Ako často odosielať správy:';
 $labels['days'] = 'dní';
 $labels['seconds'] = 'sekúnd';
-$labels['vacationreason'] = 'Dôvod neprítomnosti:';
+$labels['vacationreason'] = 'Telo správy (dôvod neprítomnosti):';
 $labels['vacationsubject'] = 'Predmet správy:';
 $labels['rulestop'] = 'Koniec pravidiel';
-$labels['enable'] = 'Povoliť/Zakázať';
-$labels['filterset'] = 'Sada filtrov';
-$labels['filtersets'] = 'Množiny filtrov';
-$labels['filtersetadd'] = 'Pridaj sadu filtrov';
-$labels['filtersetdel'] = 'Zmaž túto sadu filtrov';
-$labels['filtersetact'] = 'Aktivuj túto sadu filtrov';
-$labels['filtersetdeact'] = 'Deaktivuj túto sadu filtrov';
+$labels['enable'] = 'Zapnúť/vypnúť';
+$labels['filterset'] = 'Súprava filtrov';
+$labels['filtersets'] = 'Súpravy filtrov';
+$labels['filtersetadd'] = 'Pridať súpravu filtrov';
+$labels['filtersetdel'] = 'Vymazať aktuálnu súpravu filtrov';
+$labels['filtersetact'] = 'Aktivovať aktuálnu súpravu filtrov';
+$labels['filtersetdeact'] = 'Deaktivovať aktuálnu súpravu filtrov';
 $labels['filterdef'] = 'Definícia filtra';
-$labels['filtersetname'] = 'Názov sady filtrov';
-$labels['newfilterset'] = 'Nová sada filtrov';
+$labels['filtersetname'] = 'Názov súpravy filtrov';
+$labels['newfilterset'] = 'Nová súprava filtrov';
 $labels['active'] = 'aktívna';
 $labels['none'] = 'žiadne';
-$labels['fromset'] = 'zo sady';
+$labels['fromset'] = 'zo súpravy';
 $labels['fromfile'] = 'zo súboru';
-$labels['filterdisabled'] = 'Filter zakázaný';
+$labels['filterdisabled'] = 'Filter vypnutý';
 $labels['countisgreaterthan'] = 'počet je väčší ako';
 $labels['countisgreaterthanequal'] = 'počet je väčší alebo rovný ako';
 $labels['countislessthan'] = 'počet je menší ako';
@@ -86,16 +86,16 @@ $labels['countnotequals'] = 'počet sa nerovná';
 $labels['valueisgreaterthan'] = 'hodnota je väčšia ako';
 $labels['valueisgreaterthanequal'] = 'hodnota je väčšia alebo rovná ako';
 $labels['valueislessthan'] = 'hodnota je menšia ako';
-$labels['valueislessthanequal'] = 'hodnota je menšia alebo rovná';
-$labels['valueequals'] = 'hodnota je rovná';
+$labels['valueislessthanequal'] = 'hodnota je menšia alebo rovná ako';
+$labels['valueequals'] = 'hodnota je rovná ako';
 $labels['valuenotequals'] = 'hodnota sa nerovná';
 $labels['setflags'] = 'Nastaviť príznaky správy';
-$labels['addflags'] = 'Pridať príznak správy';
-$labels['removeflags'] = 'odstrániť príznaky zo správy';
-$labels['flagread'] = 'Prečítaný';
-$labels['flagdeleted'] = 'Zmazané';
+$labels['addflags'] = 'Pridať príznaky správy';
+$labels['removeflags'] = 'Odstrániť príznaky zo správy';
+$labels['flagread'] = 'Prečítané';
+$labels['flagdeleted'] = 'Vymazané';
 $labels['flaganswered'] = 'Odpovedané';
-$labels['flagflagged'] = 'Označené';
+$labels['flagflagged'] = 'Označené príznakom';
 $labels['flagdraft'] = 'Koncept';
 $labels['setvariable'] = 'Nastaviť premennú';
 $labels['setvarname'] = 'Názov premennej:';
@@ -148,45 +148,45 @@ $labels['modtype'] = 'typ:';
 $labels['allparts'] = 'všetko';
 $labels['domain'] = 'doména';
 $labels['localpart'] = 'lokálna časť';
-$labels['user'] = 'užívateľ';
+$labels['user'] = 'používateľ';
 $labels['detail'] = 'detail';
 $labels['comparator'] = 'porovnávač:';
 $labels['default'] = 'predvolené';
-$labels['octet'] = 'striktný (osmičkovo)';
+$labels['octet'] = 'striktný (osmičkový)';
 $labels['asciicasemap'] = 'nerozlišuje veľké a malé písmená (ascii tabuľka znakov)';
 $labels['asciinumeric'] = 'numerické (ascii čísla)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'dozadu';
-$messages['filterunknownerror'] = 'Neznáma chyba serveru';
-$messages['filterconnerror'] = 'Nepodarilo sa pripojiť k managesieve serveru';
+$messages['filterunknownerror'] = 'Neznáma chyba servera.';
+$messages['filterconnerror'] = 'Nepodarilo sa pripojiť k serveru.';
 $messages['filterdeleteerror'] = 'Nemožno vymazať filter. Nastala chyba servera.';
-$messages['filterdeleted'] = 'Filter bol zmazaný';
-$messages['filtersaved'] = 'Filter bol uložený';
+$messages['filterdeleted'] = 'Filter bol úspešne vymazaný.';
+$messages['filtersaved'] = 'Filter bol úspešne uložený.';
 $messages['filtersaveerror'] = 'Nemožno uložiť filter. Nastala chyba servera.';
-$messages['filterdeleteconfirm'] = 'Naozaj si prajete zmazať tento filter?';
-$messages['ruledeleteconfirm'] = 'Naozaj si prajete zamzať toto pravidlo?';
-$messages['actiondeleteconfirm'] = 'Naozaj si prajete zmazať túto akciu?';
-$messages['forbiddenchars'] = 'Pole obsahuje nepovolené znaky';
-$messages['cannotbeempty'] = 'Pole nemôže byť prázdne';
-$messages['ruleexist'] = 'Filter so zadaným menom už existuje.';
+$messages['filterdeleteconfirm'] = 'Naozaj chcete vymazať vybraný filter?';
+$messages['ruledeleteconfirm'] = 'Naozaj chcete vymazať vybrané pravidlo?';
+$messages['actiondeleteconfirm'] = 'Naozaj chcete vymazať vybranú akciu?';
+$messages['forbiddenchars'] = 'Pole obsahuje nepovolené znaky.';
+$messages['cannotbeempty'] = 'Pole nemôže byť prázdne.';
+$messages['ruleexist'] = 'Filter so zadaným názvom už existuje.';
 $messages['setactivateerror'] = 'Nemožno aktivovať vybranú súpravu filtrov. Nastala chyba servera.';
 $messages['setdeactivateerror'] = 'Nemožno deaktivovať vybranú súpravu filtrov. Nastala chyba servera.';
 $messages['setdeleteerror'] = 'Nemožno vymazať vybranú súpravu filtrov. Nastala chyba servera.';
-$messages['setactivated'] = 'Sada filtrov bola aktivovaná';
-$messages['setdeactivated'] = 'Sada filtrov bola deaktivovaná';
-$messages['setdeleted'] = 'Sada filtrov bola zmazaná';
-$messages['setdeleteconfirm'] = 'Naozaj si prajete zmazať túto sadu filtrov?';
+$messages['setactivated'] = 'Súprava filtrov bola úspešne aktivovaná.';
+$messages['setdeactivated'] = 'Súprava filtrov bola úspešne deaktivovaná.';
+$messages['setdeleted'] = 'Súprava filtrov bola úspešne vymazaná.';
+$messages['setdeleteconfirm'] = 'Naozaj chcete vymazať vybranú súpravu filtrov?';
 $messages['setcreateerror'] = 'Nemožno vytvoriť súpravu filtrov. Nastala chyba servera.';
-$messages['setcreated'] = 'Sada filtrov bola vytvorená';
+$messages['setcreated'] = 'Súprava filtrov bola úspešne vytvorená.';
 $messages['activateerror'] = 'Nemožno aktivovať vybraný filter (vybrané filtre). Nastala chyba servera.';
-$messages['deactivateerror'] = 'Nemožno deaktivovať vybraný filter (vybrané filtre). Nastala chyba servera.';
-$messages['deactivated'] = 'Filter(e) povolený.';
-$messages['activated'] = 'Filter(e) úspešne vypnutý.';
-$messages['moved'] = 'Filter presunutý.';
+$messages['deactivateerror'] = 'Nemožno vypnúť vybraný filter (vybrané filtre). Nastala chyba servera.';
+$messages['deactivated'] = 'Filtre boli úspešne vypnuté.';
+$messages['activated'] = 'Filtre boli úspešne zapnuté.';
+$messages['moved'] = 'Filter bol úspešne presunutý.';
 $messages['moveerror'] = 'Nemožno presunúť vybraný filter. Nastala chyba servera.';
-$messages['nametoolong'] = 'Názov sady filtrov je príliš dlhý';
+$messages['nametoolong'] = 'Názov je príliš dlhý.';
 $messages['namereserved'] = 'Rezervovaný názov.';
-$messages['setexist'] = 'Množina už existuje.';
-$messages['nodata'] = 'Aspoň jedna pozícia musí byť zvolená.';
+$messages['setexist'] = 'Súprava už existuje.';
+$messages['nodata'] = 'Aspoň jedna pozícia musí byť zvolená!';
 $messages['invaliddateformat'] = 'Neplatný formát dátumu alebo časti dátumu';
 ?>
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index a0e7b6ad0..9dc0bd3cd 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -38,6 +38,8 @@ $labels['addrule'] = 'Додати правило';
 $labels['delrule'] = 'Видалити правило';
 $labels['messagemoveto'] = 'Пересунути повідомлення до';
 $labels['messageredirect'] = 'Перенаправити повідомлення до';
+$labels['messagecopyto'] = 'Копіювати листа до';
+$labels['messagesendcopy'] = 'Надсилати копію листа на';
 $labels['messagereply'] = 'Автовідповідач';
 $labels['messagedelete'] = 'Видалити повідомлення';
 $labels['messagediscard'] = 'Відхилити з повідомленням';
@@ -48,8 +50,12 @@ $labels['del'] = 'Видалити';
 $labels['sender'] = 'Відправник';
 $labels['recipient'] = 'Отримувач';
 $labels['vacationdays'] = 'Як часто повторювати (у днях):';
+$labels['days'] = 'днів';
+$labels['seconds'] = 'секунд';
 $labels['vacationreason'] = 'Текст повідомлення:';
+$labels['vacationsubject'] = 'Тема листа:';
 $labels['rulestop'] = 'Зупинити перевірку правил';
+$labels['enable'] = 'Увімкнути/Вимкнуни';
 $labels['filterset'] = 'Набір фільтрів';
 $labels['filtersetadd'] = 'Додати набір фільтрів';
 $labels['filtersetdel'] = 'Видалити поточний набір';
@@ -62,6 +68,40 @@ $labels['none'] = 'нічого';
 $labels['fromset'] = 'з набору';
 $labels['fromfile'] = 'з файлу';
 $labels['filterdisabled'] = 'Фільтр вимкнено';
+$labels['valueislessthan'] = 'значення менше за';
+$labels['valueislessthanequal'] = 'значення менше або рівне';
+$labels['flagdraft'] = 'Чернетка';
+$labels['setvariable'] = 'Встановити змінну';
+$labels['setvarname'] = 'Назва змінної:';
+$labels['setvarvalue'] = 'Значення змінної:';
+$labels['setvarmodifiers'] = 'Модифікатори:';
+$labels['varlower'] = 'нижній регістр';
+$labels['varupper'] = 'верхній регістр';
+$labels['varlowerfirst'] = 'перший символ в нижньому регістрі';
+$labels['varupperfirst'] = 'перший символ в верхньому регістрі';
+$labels['varlength'] = 'довжина';
+$labels['notifyaddress'] = 'На електронну адресу:';
+$labels['filtercreate'] = 'Створити фільтр';
+$labels['nextstep'] = 'Наступний крок';
+$labels['...'] = '...';
+$labels['currdate'] = 'Поточна дата';
+$labels['datetest'] = 'Дата';
+$labels['year'] = 'рік';
+$labels['month'] = 'місяць';
+$labels['day'] = 'день';
+$labels['date'] = 'дата (рррр-мм-дд)';
+$labels['hour'] = 'година';
+$labels['minute'] = 'хвилина';
+$labels['second'] = 'секунда';
+$labels['time'] = 'час (гг:хх:сс)';
+$labels['iso8601'] = 'дата (ISO8601)';
+$labels['std11'] = 'дата (RFC2822)';
+$labels['zone'] = 'часовий пояс';
+$labels['advancedopts'] = 'Розширені параметри';
+$labels['address'] = 'адреса';
+$labels['text'] = 'текст';
+$labels['modtype'] = 'тип:';
+$labels['allparts'] = 'все';
 $messages['filterunknownerror'] = 'Невідома помилка сервера';
 $messages['filterconnerror'] = 'Неможливо з\'єднатися з сервером';
 $messages['filterdeleted'] = 'Фільтр успішно видалено';
diff --git a/plugins/markasjunk/localization/ber.inc b/plugins/markasjunk/localization/ber.inc
deleted file mode 100644
index 046e45733..000000000
--- a/plugins/markasjunk/localization/ber.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization//labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: FULL NAME <EMAIL@ADDRESS>                                     |
- +-----------------------------------------------------------------------+
-*/
-
-
diff --git a/plugins/markasjunk/localization/ca_ES.inc b/plugins/markasjunk/localization/ca_ES.inc
index 18fef58a8..1a77aaff2 100644
--- a/plugins/markasjunk/localization/ca_ES.inc
+++ b/plugins/markasjunk/localization/ca_ES.inc
@@ -16,6 +16,6 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
 $labels['buttontext'] = 'Correu brossa';
-$labels['buttontitle'] = 'Marca com a Spam';
-$labels['reportedasjunk'] = 'S\'ha reportat correctament com a Spam';
+$labels['buttontitle'] = 'Marca com a correu brossa';
+$labels['reportedasjunk'] = 'S\'ha reportat correctament com a correu brossa';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/en_CA.inc b/plugins/markasjunk/localization/en_CA.inc
new file mode 100644
index 000000000..92c041948
--- /dev/null
+++ b/plugins/markasjunk/localization/en_CA.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/markasjunk/localization/<lang>.inc                            |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
+*/
+$labels['buttontext'] = 'Junk';
+$labels['buttontitle'] = 'Mark as Junk';
+$labels['reportedasjunk'] = 'Successfully reported as Junk';
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/es_419.inc b/plugins/markasjunk/localization/es_419.inc
new file mode 100644
index 000000000..e9bc14bc4
--- /dev/null
+++ b/plugins/markasjunk/localization/es_419.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/markasjunk/localization/<lang>.inc                            |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
+*/
+$labels['buttontext'] = 'Basura';
+$labels['buttontitle'] = 'Marcar como basura';
+$labels['reportedasjunk'] = 'Reportado como basura exitosamente';
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/sk_SK.inc b/plugins/markasjunk/localization/sk_SK.inc
index 101b57ab7..25afe6cf2 100644
--- a/plugins/markasjunk/localization/sk_SK.inc
+++ b/plugins/markasjunk/localization/sk_SK.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-$labels['buttontext'] = 'Spam';
-$labels['buttontitle'] = 'Označiť ako Spam';
-$labels['reportedasjunk'] = 'Úspešne nahlásené ako Spam';
+$labels['buttontext'] = 'Nevyžiadaná pošta';
+$labels['buttontitle'] = 'Označiť ako nevyžiadané';
+$labels['reportedasjunk'] = 'Úspešne nahlásené ako nevyžiadaná pošta';
 ?>
\ No newline at end of file
diff --git a/plugins/hide_blockquote/localization/fa_AF.inc b/plugins/new_user_dialog/localization/en_CA.inc
index 83c0e3cb6..4b4e48b30 100644
--- a/plugins/hide_blockquote/localization/fa_AF.inc
+++ b/plugins/new_user_dialog/localization/en_CA.inc
@@ -2,9 +2,9 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/hide_blockquote/localization/<lang>.inc                       |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
  | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
@@ -13,6 +13,8 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
 
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-?>
+$labels['identitydialogtitle'] = 'Please complete your sender identity';
+$labels['identitydialoghint'] = 'This box only appears once at the first login.';
+?>
\ No newline at end of file
diff --git a/plugins/hide_blockquote/localization/hi_IN.inc b/plugins/new_user_dialog/localization/es_419.inc
index 83c0e3cb6..145c5d5ca 100644
--- a/plugins/hide_blockquote/localization/hi_IN.inc
+++ b/plugins/new_user_dialog/localization/es_419.inc
@@ -2,9 +2,9 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/hide_blockquote/localization/<lang>.inc                       |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
  | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
@@ -13,6 +13,8 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
 
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-?>
+$labels['identitydialogtitle'] = 'Por favor completa tu información de remitente';
+$labels['identitydialoghint'] = 'Esta sección solo aparece un vez en el primer login.';
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/gl_ES.inc b/plugins/new_user_dialog/localization/gl_ES.inc
index 83c73b90d..859855ea2 100644
--- a/plugins/new_user_dialog/localization/gl_ES.inc
+++ b/plugins/new_user_dialog/localization/gl_ES.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-$labels['identitydialogtitle'] = 'Por favor, complete os seus datos persoais';
-$labels['identitydialoghint'] = 'Este diálogo só aparecerá a primera vez que se conecte ao correo.';
+$labels['identitydialogtitle'] = 'Por favor, completa os teus datos persoais';
+$labels['identitydialoghint'] = 'Este diálogo só aparecerá a primera vez que te conectes ao correo.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sk_SK.inc b/plugins/new_user_dialog/localization/sk_SK.inc
index 236c1d893..32feebc00 100644
--- a/plugins/new_user_dialog/localization/sk_SK.inc
+++ b/plugins/new_user_dialog/localization/sk_SK.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-$labels['identitydialogtitle'] = 'Doplňte prosím Vašu identifikáciu odosielateľa';
-$labels['identitydialoghint'] = 'Toto okno sa objaví len pri prvom prihlásení.';
+$labels['identitydialogtitle'] = 'Doplňte prosím svoju identifikáciu odosielateľa';
+$labels['identitydialoghint'] = 'Toto okno sa zobrazí len raz, pri prvom prihlásení.';
 ?>
\ No newline at end of file
diff --git a/plugins/newmail_notifier/localization/az_AZ.inc b/plugins/newmail_notifier/localization/az_AZ.inc
index 94283f9dc..355c30f0a 100644
--- a/plugins/newmail_notifier/localization/az_AZ.inc
+++ b/plugins/newmail_notifier/localization/az_AZ.inc
@@ -24,4 +24,5 @@ $labels['body'] = 'Sizə məktub gəldi';
 $labels['testbody'] = 'Bu sınaq bildirişidir';
 $labels['desktopdisabled'] = 'Sizin brauzerdə iş masasında bildiriş söndürülüb';
 $labels['desktopunsupported'] = 'Sizin brauzer iş masasında bildiriş funksiyasını dəstəkləmir';
+$labels['desktoptimeout'] = 'Masaüstü bildirişi bağla';
 ?>
diff --git a/plugins/newmail_notifier/localization/ca_ES.inc b/plugins/newmail_notifier/localization/ca_ES.inc
index 1ae40d158..37359de61 100644
--- a/plugins/newmail_notifier/localization/ca_ES.inc
+++ b/plugins/newmail_notifier/localization/ca_ES.inc
@@ -18,11 +18,11 @@
 $labels['basic'] = 'Mostra notificacions del navegador quan hi hagi un missatge nou';
 $labels['desktop'] = 'Mostra notificacions de l\'escriptori quan hi hagi un missatge nou';
 $labels['sound'] = 'Reprodueix el so quan hi hagi un missatge nou';
-$labels['test'] = 'Comprova';
+$labels['test'] = 'Prova';
 $labels['title'] = 'Missatge nou!';
 $labels['body'] = 'Heu rebut un missatge nou.';
 $labels['testbody'] = 'Això és una notificació de prova.';
 $labels['desktopdisabled'] = 'Les notificacions d\'escriptori estan deshabilitades al vostre navegador.';
 $labels['desktopunsupported'] = 'El vostre navegador no permet les notificacions d\'escriptori.';
-$labels['desktoptimeout'] = 'Tancar notificació de l\'escriptori';
+$labels['desktoptimeout'] = 'Tanca la notificació de l\'escriptori';
 ?>
diff --git a/plugins/newmail_notifier/localization/en_CA.inc b/plugins/newmail_notifier/localization/en_CA.inc
new file mode 100644
index 000000000..ce3b5b0b3
--- /dev/null
+++ b/plugins/newmail_notifier/localization/en_CA.inc
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail New Mail Notifier 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-newmail_notifier/
+*/
+$labels['basic'] = 'Display browser notifications on new message';
+$labels['desktop'] = 'Display desktop notifications on new message';
+$labels['sound'] = 'Play the sound on new message';
+$labels['test'] = 'Test';
+$labels['title'] = 'New Email!';
+$labels['body'] = 'You\'ve received a new message.';
+$labels['testbody'] = 'This is a test notification.';
+$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
+$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
+$labels['desktoptimeout'] = 'Close desktop notification';
+?>
diff --git a/plugins/newmail_notifier/localization/gl_ES.inc b/plugins/newmail_notifier/localization/gl_ES.inc
index 1dae35297..154a8cbb9 100644
--- a/plugins/newmail_notifier/localization/gl_ES.inc
+++ b/plugins/newmail_notifier/localization/gl_ES.inc
@@ -17,11 +17,12 @@
 */
 $labels['basic'] = 'Amosar notificacións no navegador cando entre unha mensaxe nova';
 $labels['desktop'] = 'Amosar notificacións no escritorio cando chegue unha mensaxe nova';
-$labels['sound'] = 'Tocar un son cando chegue unha mensaxe nova';
+$labels['sound'] = 'Reproducir un son cando chegue unha nova mensaxe';
 $labels['test'] = 'Proba';
 $labels['title'] = 'Novo Correo!';
-$labels['body'] = 'Recibiu unha mensaxe nova';
+$labels['body'] = 'Recibiches unha nova mensaxe';
 $labels['testbody'] = 'Esta é unha notificación de proba';
-$labels['desktopdisabled'] = 'As notificacións de escritorio están desactivadas no seu navegador';
+$labels['desktopdisabled'] = 'As notificacións de escritorio están desactivadas no teu navegador';
 $labels['desktopunsupported'] = 'O teu navegador non soporta notificacións de escritorio.';
+$labels['desktoptimeout'] = 'Pechar notificación de escritorio';
 ?>
diff --git a/plugins/newmail_notifier/localization/lt_LT.inc b/plugins/newmail_notifier/localization/lt_LT.inc
index 6db304f90..e97a6cfea 100644
--- a/plugins/newmail_notifier/localization/lt_LT.inc
+++ b/plugins/newmail_notifier/localization/lt_LT.inc
@@ -24,4 +24,5 @@ $labels['body'] = 'Jūs gavote naują laišką.';
 $labels['testbody'] = 'Tai – bandomasis pranešimas.';
 $labels['desktopdisabled'] = 'Jūsų naršyklėje sistemos pranešimai išjungti.';
 $labels['desktopunsupported'] = 'Jūsų naršyklėje sistemos pranešimai nepalaikomi.';
+$labels['desktoptimeout'] = 'Užverti sistemos pranešimą';
 ?>
diff --git a/plugins/newmail_notifier/localization/sk_SK.inc b/plugins/newmail_notifier/localization/sk_SK.inc
index b60447c36..fa206ba7d 100644
--- a/plugins/newmail_notifier/localization/sk_SK.inc
+++ b/plugins/newmail_notifier/localization/sk_SK.inc
@@ -18,11 +18,11 @@
 $labels['basic'] = 'Zobraziť upozornenie v prehliadači pri novej správe';
 $labels['desktop'] = 'Zobraziť upozornenie na ploche pri novej správe';
 $labels['sound'] = 'Prehrať zvuk pri novej správe';
-$labels['test'] = 'Skúška';
-$labels['title'] = 'Nová správa';
+$labels['test'] = 'Otestovať';
+$labels['title'] = 'Nová správa!';
 $labels['body'] = 'Máte novú správu.';
 $labels['testbody'] = 'Toto je skúšobné upozornenie.';
 $labels['desktopdisabled'] = 'Upozornenia na ploche sú vo vašom prehliadači vypnuté.';
-$labels['desktopunsupported'] = 'Váč prehliadač nepodporuje upozornenia na ploche.';
+$labels['desktopunsupported'] = 'Váš prehliadač nepodporuje upozornenia na ploche.';
 $labels['desktoptimeout'] = 'Zatvoriť notifikáciu na ploche';
 ?>
diff --git a/plugins/password/localization/ber.inc b/plugins/password/localization/ber.inc
deleted file mode 100644
index 046e45733..000000000
--- a/plugins/password/localization/ber.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization//labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: FULL NAME <EMAIL@ADDRESS>                                     |
- +-----------------------------------------------------------------------+
-*/
-
-
diff --git a/plugins/password/localization/ca_ES.inc b/plugins/password/localization/ca_ES.inc
index 3ab4ed1ad..8e367155f 100644
--- a/plugins/password/localization/ca_ES.inc
+++ b/plugins/password/localization/ca_ES.inc
@@ -23,10 +23,10 @@ $messages['nopassword'] = 'Si us plau, introduïu la nova contrasenya.';
 $messages['nocurpassword'] = 'Si us plau, introduïu la contrasenya actual.';
 $messages['passwordincorrect'] = 'Contrasenya actual incorrecta.';
 $messages['passwordinconsistency'] = 'La contrasenya nova no coincideix, torneu-ho a provar.';
-$messages['crypterror'] = 'No es pot desar la nova contrasenya. No existeix la funció d\'encriptació.';
-$messages['connecterror'] = 'No es pot desar la nova contrasenya. Error de connexió.';
-$messages['internalerror'] = 'No es pot desar la nova contrasenya.';
-$messages['passwordshort'] = 'La nova contrasenya ha de tenir com a mínim $length caràcters de llarg.';
+$messages['crypterror'] = 'No s\'ha pogut desar la nova contrasenya. No existeix la funció d\'encriptació.';
+$messages['connecterror'] = 'No s\'ha pogut desar la nova contrasenya. Error de connexió.';
+$messages['internalerror'] = 'No s\'ha pogut desar la nova contrasenya.';
+$messages['passwordshort'] = 'La nova contrasenya ha de tenir com a mínim $length caràcters.';
 $messages['passwordweak'] = 'La nova contrasenya ha d\'incloure com a mínim un nombre i un caràcter de puntuació.';
 $messages['passwordforbidden'] = 'La contrasenya conté caràcters no permesos.';
 ?>
diff --git a/plugins/password/localization/en_CA.inc b/plugins/password/localization/en_CA.inc
new file mode 100644
index 000000000..6206b5923
--- /dev/null
+++ b/plugins/password/localization/en_CA.inc
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Password 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-password/
+*/
+$labels['changepasswd']  = 'Change Password';
+$labels['curpasswd']  = 'Current Password:';
+$labels['newpasswd']  = 'New Password:';
+$labels['confpasswd']  = 'Confirm New Password:';
+$messages['nopassword'] = 'Please input new password.';
+$messages['nocurpassword'] = 'Please input current password.';
+$messages['passwordincorrect'] = 'Current password incorrect.';
+$messages['passwordinconsistency'] = 'Passwords do not match, please try again.';
+$messages['crypterror'] = 'Could not save new password. Encryption function missing.';
+$messages['connecterror'] = 'Could not save new password. Connection error.';
+$messages['internalerror'] = 'Could not save new password.';
+$messages['passwordshort'] = 'Password must be at least $length characters long.';
+$messages['passwordweak'] = 'Password must include at least one number and one punctuation character.';
+$messages['passwordforbidden'] = 'Password contains forbidden characters.';
+?>
diff --git a/plugins/password/localization/es_419.inc b/plugins/password/localization/es_419.inc
new file mode 100644
index 000000000..3d99b561c
--- /dev/null
+++ b/plugins/password/localization/es_419.inc
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Password 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-password/
+*/
+$labels['changepasswd']  = 'Cambiar contraseña';
+$labels['curpasswd']  = 'Contraseña actual: ';
+$labels['newpasswd']  = 'Contraseña nueva:';
+$labels['confpasswd']  = 'Confirmar contraseña nueva:';
+$messages['nopassword'] = 'Por favor, ingresa la nueva contraseña.';
+$messages['nocurpassword'] = 'Por favor, ingresa la contraseña actual.';
+$messages['passwordincorrect'] = 'Contraseña actual incorrecta.';
+$messages['passwordinconsistency'] = 'Las contraseñas no concuerdan, por favor intenta nuevamente.';
+$messages['crypterror'] = 'No se puedo guardar la nueva contraseña. No se encuentra la función de encriptación.';
+$messages['connecterror'] = 'No se puedo guardar la nueva contraseña. Error de conexión.';
+$messages['internalerror'] = 'No se puedo guardar la nueva contraseña.';
+$messages['passwordshort'] = 'La contraseña debe tener al menos $length carácteres.';
+$messages['passwordweak'] = 'La contraseña debe incluir por lo menos un número y un signo de puntuación.';
+$messages['passwordforbidden'] = 'La contraseña contiene carácteres ilegales.';
+?>
diff --git a/plugins/password/localization/gl_ES.inc b/plugins/password/localization/gl_ES.inc
index f738c62a0..1415366a3 100644
--- a/plugins/password/localization/gl_ES.inc
+++ b/plugins/password/localization/gl_ES.inc
@@ -19,13 +19,13 @@ $labels['changepasswd']  = 'Cambiar contrasinal';
 $labels['curpasswd']  = 'Contrasinal actual:';
 $labels['newpasswd']  = 'Contrasinal novo:';
 $labels['confpasswd']  = 'Confirmar contrasinal:';
-$messages['nopassword'] = 'Por favor, introduza un contrasinal novo.';
-$messages['nocurpassword'] = 'Por favor, introduza o contrasinal actual.';
+$messages['nopassword'] = 'Por favor, introduce un contrasinal novo.';
+$messages['nocurpassword'] = 'Por favor, introduce o contrasinal actual.';
 $messages['passwordincorrect'] = 'O contrasinal actual é incorrecto.';
-$messages['passwordinconsistency'] = 'Os contrasinais non cadran. Por favor, inténteo outra vez.';
-$messages['crypterror'] = 'Non foi posible gardar o contrasinal novo. Falta a función de cifrado.';
-$messages['connecterror'] = 'Non foi posible gardar o contrasinal novo. Erro de conexión';
-$messages['internalerror'] = 'Non foi posible gardar o contrasinal novo.';
+$messages['passwordinconsistency'] = 'Os contrasinais non cadran. Por favor, inténtao outra vez.';
+$messages['crypterror'] = 'Non foi posíbel gardar o contrasinal novo. Falta a función de cifrado.';
+$messages['connecterror'] = 'Non foi posíbel gardar o contrasinal novo. Erro de conexión';
+$messages['internalerror'] = 'Non foi posíbel gardar o contrasinal novo.';
 $messages['passwordshort'] = 'O contrasinal debe ter polo menos $length caracteres.';
 $messages['passwordweak'] = 'O contrasinal debe incluir polo menos un número e un signo de puntuación.';
 $messages['passwordforbidden'] = 'O contrasinal contén caracteres non permitidos.';
diff --git a/plugins/password/localization/sk_SK.inc b/plugins/password/localization/sk_SK.inc
index fd0210285..51339bb7b 100644
--- a/plugins/password/localization/sk_SK.inc
+++ b/plugins/password/localization/sk_SK.inc
@@ -16,16 +16,16 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 $labels['changepasswd']  = 'Zmeniť heslo';
-$labels['curpasswd']  = 'Súčasné heslo:';
+$labels['curpasswd']  = 'Aktuálne heslo:';
 $labels['newpasswd']  = 'Nové heslo:';
-$labels['confpasswd']  = 'Potvrď nové heslo:';
-$messages['nopassword'] = 'Prosím zadaj nové heslo.';
-$messages['nocurpassword'] = 'Prosím zadaj súčasné heslo.';
-$messages['passwordincorrect'] = 'Súčasné heslo je nesprávne.';
-$messages['passwordinconsistency'] = 'Heslá nie sú rovnaké, skús znova.';
-$messages['crypterror'] = 'Nemôžem uložiť nové heslo. Chýba šifrovacia funkcia.';
-$messages['connecterror'] = 'Nemôžem uložiť nové heslo. Chyba spojenia.';
-$messages['internalerror'] = 'Nemôžem uložiť nové heslo.';
+$labels['confpasswd']  = 'Potvrďte nové heslo:';
+$messages['nopassword'] = 'Prosím zadajte nové heslo.';
+$messages['nocurpassword'] = 'Prosím zadajte aktuálne heslo.';
+$messages['passwordincorrect'] = 'Aktuálne heslo je nesprávne.';
+$messages['passwordinconsistency'] = 'Heslá nie sú rovnaké, skúste to znova.';
+$messages['crypterror'] = 'Nové heslo nemožno uložiť. Chýba šifrovacia funkcia.';
+$messages['connecterror'] = 'Nové heslo nemožno uložiť. Chyba spojenia.';
+$messages['internalerror'] = 'Nové heslo nemožno uložiť.';
 $messages['passwordshort'] = 'Heslo musí mať najmenej $length znakov.';
 $messages['passwordweak'] = 'Heslo musí obsahovať aspoň jedno číslo a jedno interpunkčné znamienko.';
 $messages['passwordforbidden'] = 'Heslo obsahuje nepovolené znaky.';
diff --git a/plugins/subscriptions_option/localization/ca_ES.inc b/plugins/subscriptions_option/localization/ca_ES.inc
index 3a723968b..b2f4ddb50 100644
--- a/plugins/subscriptions_option/localization/ca_ES.inc
+++ b/plugins/subscriptions_option/localization/ca_ES.inc
@@ -15,5 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-$labels['useimapsubscriptions']  = 'Fes servir subscripcions IMAP';
+$labels['useimapsubscriptions']  = 'Fes servir Subscripcions IMAP';
 ?>
diff --git a/plugins/help/localization/ia.inc b/plugins/subscriptions_option/localization/en_CA.inc
index 46160477e..4895fdd30 100644
--- a/plugins/help/localization/ia.inc
+++ b/plugins/subscriptions_option/localization/en_CA.inc
@@ -2,9 +2,9 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/help/localization/<lang>.inc                                  |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Localization file of the Roundcube Webmail Help plugin                |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
  | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
@@ -13,6 +13,7 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
 
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
+$labels['useimapsubscriptions']  = 'Use IMAP Subscriptions';
 ?>
diff --git a/plugins/subscriptions_option/localization/es_419.inc b/plugins/subscriptions_option/localization/es_419.inc
new file mode 100644
index 000000000..ae8c72474
--- /dev/null
+++ b/plugins/subscriptions_option/localization/es_419.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
+*/
+$labels['useimapsubscriptions']  = 'Usar subscripciones IMAP';
+?>
diff --git a/plugins/subscriptions_option/localization/sk_SK.inc b/plugins/subscriptions_option/localization/sk_SK.inc
index f65a508d4..9f9634bdf 100644
--- a/plugins/subscriptions_option/localization/sk_SK.inc
+++ b/plugins/subscriptions_option/localization/sk_SK.inc
@@ -15,5 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-$labels['useimapsubscriptions']  = 'Použi IMAP nastavenia';
+$labels['useimapsubscriptions']  = 'Použiť prihlásenia IMAP';
 ?>
diff --git a/plugins/subscriptions_option/localization/uk_UA.inc b/plugins/subscriptions_option/localization/uk_UA.inc
new file mode 100644
index 000000000..8b3564008
--- /dev/null
+++ b/plugins/subscriptions_option/localization/uk_UA.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
+*/
+$labels['useimapsubscriptions']  = 'Використовувати IMAP Підписки';
+?>
diff --git a/plugins/userinfo/localization/ber.inc b/plugins/userinfo/localization/ber.inc
deleted file mode 100644
index 046e45733..000000000
--- a/plugins/userinfo/localization/ber.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization//labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: FULL NAME <EMAIL@ADDRESS>                                     |
- +-----------------------------------------------------------------------+
-*/
-
-
diff --git a/plugins/userinfo/localization/ca_ES.inc b/plugins/userinfo/localization/ca_ES.inc
index 8c82c52a2..155ae6bdb 100644
--- a/plugins/userinfo/localization/ca_ES.inc
+++ b/plugins/userinfo/localization/ca_ES.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-$labels['userinfo'] = 'Informació de l\'usuari/a';
+$labels['userinfo'] = 'Informació de l\'usuari';
 $labels['created'] = 'Creat';
 $labels['lastlogin'] = 'Última connexió';
 $labels['defaultidentity'] = 'Identitat per defecte';
diff --git a/plugins/userinfo/localization/en_CA.inc b/plugins/userinfo/localization/en_CA.inc
new file mode 100644
index 000000000..d2951a984
--- /dev/null
+++ b/plugins/userinfo/localization/en_CA.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/userinfo/localization/<lang>.inc                              |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Userinfo 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-userinfo/
+*/
+$labels['userinfo'] = 'User info';
+$labels['created'] = 'Created';
+$labels['lastlogin'] = 'Last Login';
+$labels['defaultidentity'] = 'Default Identity';
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/es_419.inc b/plugins/userinfo/localization/es_419.inc
new file mode 100644
index 000000000..e3274539d
--- /dev/null
+++ b/plugins/userinfo/localization/es_419.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/userinfo/localization/<lang>.inc                              |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Userinfo 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-userinfo/
+*/
+$labels['userinfo'] = 'Información de usuario';
+$labels['created'] = 'Creado';
+$labels['lastlogin'] = 'Último login';
+$labels['defaultidentity'] = 'Identidad predetermidada';
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/gl_ES.inc b/plugins/userinfo/localization/gl_ES.inc
index 860c92673..8dbbfd699 100644
--- a/plugins/userinfo/localization/gl_ES.inc
+++ b/plugins/userinfo/localization/gl_ES.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-$labels['userinfo'] = 'Información do usuario';
+$labels['userinfo'] = 'Información de persoa usuaria';
 $labels['created'] = 'Creado';
 $labels['lastlogin'] = 'Última conexión';
 $labels['defaultidentity'] = 'Identidade predeterminada';
diff --git a/plugins/userinfo/localization/sk_SK.inc b/plugins/userinfo/localization/sk_SK.inc
index f6b0c63d2..95deee14e 100644
--- a/plugins/userinfo/localization/sk_SK.inc
+++ b/plugins/userinfo/localization/sk_SK.inc
@@ -15,8 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-$labels['userinfo'] = 'Užívateľské informácie';
+$labels['userinfo'] = 'Informácie o používateľovi';
 $labels['created'] = 'Vytvorené';
 $labels['lastlogin'] = 'Posledné prihlásenie';
-$labels['defaultidentity'] = 'Štandardná identita';
+$labels['defaultidentity'] = 'Predvolená identita';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/en_CA.inc b/plugins/vcard_attachments/localization/en_CA.inc
new file mode 100644
index 000000000..ac21ef96b
--- /dev/null
+++ b/plugins/vcard_attachments/localization/en_CA.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Vcard Attachments 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-vcard_attachments/
+*/
+$labels['addvcardmsg'] = 'Add vCard to addressbook';
+$labels['vcardsavefailed'] = 'Unable to save vCard';
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/es_419.inc b/plugins/vcard_attachments/localization/es_419.inc
new file mode 100644
index 000000000..3d56d761b
--- /dev/null
+++ b/plugins/vcard_attachments/localization/es_419.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Vcard Attachments 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-vcard_attachments/
+*/
+$labels['addvcardmsg'] = 'Agregar vCard a la libreta de direcciones';
+$labels['vcardsavefailed'] = 'No se puede guardar la vCard';
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/gl_ES.inc b/plugins/vcard_attachments/localization/gl_ES.inc
index af6f2842e..55792ee01 100644
--- a/plugins/vcard_attachments/localization/gl_ES.inc
+++ b/plugins/vcard_attachments/localization/gl_ES.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-$labels['addvcardmsg'] = 'Engadir vCard ao caderno de enderezos';
-$labels['vcardsavefailed'] = 'Non foi posible gardar a vCard';
+$labels['addvcardmsg'] = 'Engadir vCard á Axenda de enderezos';
+$labels['vcardsavefailed'] = 'Non foi posíbel gardar a vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sk_SK.inc b/plugins/vcard_attachments/localization/sk_SK.inc
index 17aecb261..ecbaac834 100644
--- a/plugins/vcard_attachments/localization/sk_SK.inc
+++ b/plugins/vcard_attachments/localization/sk_SK.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-$labels['addvcardmsg'] = 'Pridať vCard do adresára';
-$labels['vcardsavefailed'] = 'Nemôžem uložiť vCard';
+$labels['addvcardmsg'] = 'Pridať vizitku vCard do adresára';
+$labels['vcardsavefailed'] = 'Vizitku vCard nemožno uložiť';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ca_ES.inc b/plugins/zipdownload/localization/ca_ES.inc
index 665c53ad8..bf5640ec6 100644
--- a/plugins/zipdownload/localization/ca_ES.inc
+++ b/plugins/zipdownload/localization/ca_ES.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-$labels['downloadall'] = 'Descarregar tots els adjunts';
-$labels['downloadfolder'] = 'Descarregar carpeta';
+$labels['downloadall'] = 'Descarrega tots els adjunts';
+$labels['downloadfolder'] = 'Descarrega la carpeta';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/en_CA.inc b/plugins/zipdownload/localization/en_CA.inc
new file mode 100644
index 000000000..48a8d9bcb
--- /dev/null
+++ b/plugins/zipdownload/localization/en_CA.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload 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-zipdownload/
+*/
+$labels['downloadall'] = 'Download all attachments';
+$labels['downloadfolder'] = 'Download folder';
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/es_419.inc b/plugins/zipdownload/localization/es_419.inc
new file mode 100644
index 000000000..a25e34266
--- /dev/null
+++ b/plugins/zipdownload/localization/es_419.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload 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-zipdownload/
+*/
+$labels['downloadall'] = 'Descargar todos los archivos adjuntos';
+$labels['downloadfolder'] = 'Descargar carpeta';
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/gl_ES.inc b/plugins/zipdownload/localization/gl_ES.inc
index 599c8ffcb..91fc14651 100644
--- a/plugins/zipdownload/localization/gl_ES.inc
+++ b/plugins/zipdownload/localization/gl_ES.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-$labels['downloadall'] = 'Descargar tódolos adxuntos';
+$labels['downloadall'] = 'Descargar todos os adxuntos';
 $labels['downloadfolder'] = 'Descargar o cartafol';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sk_SK.inc b/plugins/zipdownload/localization/sk_SK.inc
index 86c2b9a5f..4c918528f 100644
--- a/plugins/zipdownload/localization/sk_SK.inc
+++ b/plugins/zipdownload/localization/sk_SK.inc
@@ -16,5 +16,5 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Stiahnuť všetky prílohy';
-$labels['downloadfolder'] = 'Priečinok na sťahovanie';
+$labels['downloadfolder'] = 'Priečinok pre stiahnuté súbory';
 ?>
\ No newline at end of file