diff --git a/addressbook/setup/egw_bg.lang b/addressbook/lang/egw_bg.lang
similarity index 100%
rename from addressbook/setup/egw_bg.lang
rename to addressbook/lang/egw_bg.lang
diff --git a/addressbook/setup/egw_ca.lang b/addressbook/lang/egw_ca.lang
similarity index 100%
rename from addressbook/setup/egw_ca.lang
rename to addressbook/lang/egw_ca.lang
diff --git a/addressbook/setup/egw_cs.lang b/addressbook/lang/egw_cs.lang
similarity index 100%
rename from addressbook/setup/egw_cs.lang
rename to addressbook/lang/egw_cs.lang
diff --git a/addressbook/setup/egw_da.lang b/addressbook/lang/egw_da.lang
similarity index 100%
rename from addressbook/setup/egw_da.lang
rename to addressbook/lang/egw_da.lang
diff --git a/addressbook/setup/egw_de.lang b/addressbook/lang/egw_de.lang
similarity index 100%
rename from addressbook/setup/egw_de.lang
rename to addressbook/lang/egw_de.lang
diff --git a/addressbook/setup/egw_el.lang b/addressbook/lang/egw_el.lang
similarity index 100%
rename from addressbook/setup/egw_el.lang
rename to addressbook/lang/egw_el.lang
diff --git a/addressbook/setup/egw_en.lang b/addressbook/lang/egw_en.lang
similarity index 100%
rename from addressbook/setup/egw_en.lang
rename to addressbook/lang/egw_en.lang
diff --git a/addressbook/setup/egw_es-es.lang b/addressbook/lang/egw_es-es.lang
similarity index 97%
rename from addressbook/setup/egw_es-es.lang
rename to addressbook/lang/egw_es-es.lang
index 254a8fe25e..4dbf642af5 100644
--- a/addressbook/setup/egw_es-es.lang
+++ b/addressbook/lang/egw_es-es.lang
@@ -3,6 +3,7 @@
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	es-es	%1 contactos %2, %3 fallaron debido a privilegios insuficientes.
 %1 contacts updated (%2 errors).	addressbook	es-es	Se han actualizado %1 contactos (%2 errores).
 %1 fields in %2 other organisation member(s) changed	addressbook	es-es	%1 campos en %2 miembros de otra organización cambiados
+%1 not implemented for %2!	addressbook	es-es	%1 no está implementado para %2!
 %1 records imported	addressbook	es-es	Se han importado %1 registros
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	es-es	Se han leído %1 registros (no importados todavía, puede volver %2atrás%3 y desmarcar la prueba de importación)
 %1 starts with '%2'	addressbook	es-es	%1 empieza por '%2'
@@ -87,6 +88,7 @@ choose owner of imported data	addressbook	es-es	Elija el propietario de los dato
 choose seperator and charset	addressbook	es-es	Elija el separador y el juego de caracteres
 chosse an etemplate for this contact type	admin	es-es	Elija una plantilla para este tipo de contacto
 city	common	es-es	Ciudad
+cleanup addressbook fields (apply if synchronization creates duplicates)	addressbook	es-es	Limpiar los campos de la libreta de direcciones (aplicar si la sincronización crea duplicados)
 company	common	es-es	Empresa
 company name	addressbook	es-es	Nombre de la empresa
 configuration	common	es-es	Configuración
@@ -286,6 +288,7 @@ new contact submitted by %1 at %2	addressbook	es-es	Nuevo contacto enviado por %
 new window opened to edit infolog for your selection	addressbook	es-es	Se ha abierto una ventana nueva para editar la nota para su selección
 next date	addressbook	es-es	Fecha siguiente
 no categories selected	addressbook	es-es	no se seleccionaron categorías
+no fallback	addressbook	es-es	Sin respaldo
 no vcard	addressbook	es-es	Sin VCard
 number	addressbook	es-es	Número
 number of records to read (%1)	addressbook	es-es	Número de registros a leer (%1)
@@ -353,6 +356,7 @@ show birthday reminders on main screen	addressbook	es-es	Mostrar recordatorios d
 show infolog entries for this organisation	addressbook	es-es	Mostrar las entradas del Registro de notas y tareas para esta organización
 show the contacts of this organisation	addressbook	es-es	Mostrar los contactos de esta organización
 size of popup (wxh, eg.400x300, if a popup should be used)	admin	es-es	Tamaño de la ventana (ancho x alto, p.ej. 400x300, si se usa una ventana emergente)
+stadt	addressbook	es-es	Estado
 start	admin	es-es	Empezar
 startrecord	addressbook	es-es	Registro inicial
 state	common	es-es	Provincia
@@ -360,6 +364,7 @@ street	common	es-es	Calle
 subject for email	addressbook	es-es	Asunto para el correo electrónico
 successfully imported %1 records into your addressbook.	addressbook	es-es	Se han importado correctamnte %1 registros en la libreta de direcciones.
 suffix	addressbook	es-es	Sufijo
+tag to mark positions for address labels	addressbook	es-es	Etiqueta para marcar las posiciones para las etiquetas de direcciones
 tel home	addressbook	es-es	teléfono particular
 telephony integration	admin	es-es	Integración con telefonía
 test import (show importable records <u>only</u> in browser)	addressbook	es-es	Test de Importación (mostrar los registros que se pueden importar <b>sólo</b> en el navegador)
@@ -379,7 +384,10 @@ to many might exceed your execution-time-limit	addressbook	es-es	a cuánto puede
 today is %1's birthday!	common	es-es	¡Hoy es el cumpleaños de %1!
 tomorrow is %1's birthday.	common	es-es	¡Mañana es el cumpleaños de %1!
 translation	addressbook	es-es	Traducción
+two of: %1	addressbook	es-es	dos de: %1
 type	addressbook	es-es	Tipo
+unique id (uid)	addressbook	es-es	ID único (UID)
+unique id<br />(to update existing records)	addressbook	es-es	ID único<br />(para actualizar los registros existentes)
 update a single entry by passing the fields.	addressbook	es-es	Actualizar una única entrada pasando los campos
 update fields by edited organisations?	admin	es-es	¿Actualizar los campos por organizaciones editadas?
 updated	addressbook	es-es	Actualizado
@@ -389,6 +397,7 @@ use an extra category tab?	addressbook	es-es	¿Usar una pestaña extra para cate
 use an extra tab for private custom fields?	admin	es-es	¿Usar una pestaña extra para campos personalizados privados?
 use country list	addressbook	es-es	Utilizar lista de países
 use setup for a full account-migration	admin	es-es	Use la instalación para una migración completa de las cuentas
+use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	es-es	Usar esta etiqueta para las etiquetas de direcciones. Ponga el contenido que quiera repetir entre dos etiquetas.
 used for links and for the own sorting of the list	addressbook	es-es	utilizado para los enlaces y para el orden propio de la lista
 vcard	common	es-es	Tarjeta de visita
 vcards require a first name entry.	addressbook	es-es	Las tarjetas de visita requieren el primer nombre.
diff --git a/addressbook/setup/egw_et.lang b/addressbook/lang/egw_et.lang
old mode 100755
new mode 100644
similarity index 100%
rename from addressbook/setup/egw_et.lang
rename to addressbook/lang/egw_et.lang
diff --git a/addressbook/setup/egw_eu.lang b/addressbook/lang/egw_eu.lang
similarity index 100%
rename from addressbook/setup/egw_eu.lang
rename to addressbook/lang/egw_eu.lang
diff --git a/addressbook/setup/egw_fa.lang b/addressbook/lang/egw_fa.lang
similarity index 100%
rename from addressbook/setup/egw_fa.lang
rename to addressbook/lang/egw_fa.lang
diff --git a/addressbook/setup/egw_fi.lang b/addressbook/lang/egw_fi.lang
similarity index 100%
rename from addressbook/setup/egw_fi.lang
rename to addressbook/lang/egw_fi.lang
diff --git a/addressbook/setup/egw_fr.lang b/addressbook/lang/egw_fr.lang
similarity index 100%
rename from addressbook/setup/egw_fr.lang
rename to addressbook/lang/egw_fr.lang
diff --git a/addressbook/setup/egw_hi.lang b/addressbook/lang/egw_hi.lang
similarity index 100%
rename from addressbook/setup/egw_hi.lang
rename to addressbook/lang/egw_hi.lang
diff --git a/addressbook/setup/egw_hr.lang b/addressbook/lang/egw_hr.lang
similarity index 100%
rename from addressbook/setup/egw_hr.lang
rename to addressbook/lang/egw_hr.lang
diff --git a/addressbook/setup/egw_hu.lang b/addressbook/lang/egw_hu.lang
similarity index 100%
rename from addressbook/setup/egw_hu.lang
rename to addressbook/lang/egw_hu.lang
diff --git a/addressbook/setup/egw_it.lang b/addressbook/lang/egw_it.lang
similarity index 100%
rename from addressbook/setup/egw_it.lang
rename to addressbook/lang/egw_it.lang
diff --git a/addressbook/setup/egw_iw.lang b/addressbook/lang/egw_iw.lang
old mode 100755
new mode 100644
similarity index 100%
rename from addressbook/setup/egw_iw.lang
rename to addressbook/lang/egw_iw.lang
diff --git a/addressbook/setup/egw_ja.lang b/addressbook/lang/egw_ja.lang
similarity index 100%
rename from addressbook/setup/egw_ja.lang
rename to addressbook/lang/egw_ja.lang
diff --git a/addressbook/setup/egw_ko.lang b/addressbook/lang/egw_ko.lang
similarity index 100%
rename from addressbook/setup/egw_ko.lang
rename to addressbook/lang/egw_ko.lang
diff --git a/addressbook/setup/egw_lt.lang b/addressbook/lang/egw_lt.lang
similarity index 100%
rename from addressbook/setup/egw_lt.lang
rename to addressbook/lang/egw_lt.lang
diff --git a/addressbook/setup/egw_lv.lang b/addressbook/lang/egw_lv.lang
similarity index 100%
rename from addressbook/setup/egw_lv.lang
rename to addressbook/lang/egw_lv.lang
diff --git a/addressbook/setup/egw_nl.lang b/addressbook/lang/egw_nl.lang
similarity index 100%
rename from addressbook/setup/egw_nl.lang
rename to addressbook/lang/egw_nl.lang
diff --git a/addressbook/setup/egw_no.lang b/addressbook/lang/egw_no.lang
similarity index 100%
rename from addressbook/setup/egw_no.lang
rename to addressbook/lang/egw_no.lang
diff --git a/addressbook/setup/egw_pl.lang b/addressbook/lang/egw_pl.lang
old mode 100755
new mode 100644
similarity index 100%
rename from addressbook/setup/egw_pl.lang
rename to addressbook/lang/egw_pl.lang
diff --git a/addressbook/setup/egw_pt-br.lang b/addressbook/lang/egw_pt-br.lang
similarity index 100%
rename from addressbook/setup/egw_pt-br.lang
rename to addressbook/lang/egw_pt-br.lang
diff --git a/addressbook/setup/egw_pt.lang b/addressbook/lang/egw_pt.lang
similarity index 100%
rename from addressbook/setup/egw_pt.lang
rename to addressbook/lang/egw_pt.lang
diff --git a/addressbook/setup/egw_ru.lang b/addressbook/lang/egw_ru.lang
similarity index 100%
rename from addressbook/setup/egw_ru.lang
rename to addressbook/lang/egw_ru.lang
diff --git a/addressbook/setup/egw_rw.lang b/addressbook/lang/egw_rw.lang
similarity index 100%
rename from addressbook/setup/egw_rw.lang
rename to addressbook/lang/egw_rw.lang
diff --git a/addressbook/setup/egw_sk.lang b/addressbook/lang/egw_sk.lang
similarity index 100%
rename from addressbook/setup/egw_sk.lang
rename to addressbook/lang/egw_sk.lang
diff --git a/addressbook/setup/egw_sl.lang b/addressbook/lang/egw_sl.lang
similarity index 100%
rename from addressbook/setup/egw_sl.lang
rename to addressbook/lang/egw_sl.lang
diff --git a/addressbook/setup/egw_sv.lang b/addressbook/lang/egw_sv.lang
similarity index 100%
rename from addressbook/setup/egw_sv.lang
rename to addressbook/lang/egw_sv.lang
diff --git a/addressbook/setup/egw_tr.lang b/addressbook/lang/egw_tr.lang
similarity index 100%
rename from addressbook/setup/egw_tr.lang
rename to addressbook/lang/egw_tr.lang
diff --git a/addressbook/setup/egw_uk.lang b/addressbook/lang/egw_uk.lang
similarity index 100%
rename from addressbook/setup/egw_uk.lang
rename to addressbook/lang/egw_uk.lang
diff --git a/addressbook/setup/egw_zh-tw.lang b/addressbook/lang/egw_zh-tw.lang
similarity index 100%
rename from addressbook/setup/egw_zh-tw.lang
rename to addressbook/lang/egw_zh-tw.lang
diff --git a/addressbook/setup/egw_zh.lang b/addressbook/lang/egw_zh.lang
similarity index 100%
rename from addressbook/setup/egw_zh.lang
rename to addressbook/lang/egw_zh.lang