diff --git a/setup/lang/egw_de.lang b/setup/lang/egw_de.lang
index b0e10eb368..8a75cb3324 100644
--- a/setup/lang/egw_de.lang
+++ b/setup/lang/egw_de.lang
@@ -50,6 +50,7 @@ all languages (incl. not listed ones)	setup	de	alle Sprachen (einschl. nicht auf
 all users	setup	de	Alle Benutzer
 allow authentication via cookie	setup	de	Erlaube Benutzerauthentifizierung über ein Cookie
 allow password migration	setup	de	Erlaube Password Migration
+allow usernames identical to system users?	setup	de	Erlaube Benutzernamen identisch zu denen von Systembenutzern?
 allowed migration types (comma-separated)	setup	de	Erlauber Migrationstypen (Komma separiert)
 alternatively domains can be accessed by logging in with <i>username@domain</i>.	setup	de	Auf Domains kann alternative auch durch Anmelden als <i>benutzer@domain</i> zugegriffen werden.
 and is up to date	setup	de	und ist aktuell
@@ -141,6 +142,7 @@ click <a href="index.php">here</a> to return to setup.	setup	de	<a href="index.p
 click here	setup	de	Hier klicken
 click here to re-run the installation tests	setup	de	zum Wiederholen der Installationstests hier klicken
 comma separated ip-addresses or host-names, default access to setup from everywhere	setup	de	Komma getrennte IP-Adressen oder Hostnamen, Vorgabe Zugriff von überall
+complete path to aspell program	setup	de	Vollständiger Pfad zum Programm ASPELL
 completed	setup	de	Abgeschlossen
 config password	setup	de	Konfigurationspasswort
 config username	setup	de	Konfigurationsbenutzername
@@ -241,6 +243,7 @@ egroupware configuration file header.inc.php already exists, you need to use --e
 egroupware domain/instance %1(%2):	setup	de	eGroupWare Domain/Instanz %1(%2):
 egroupware is already installed!	setup	de	eGroupWare ist bereits installiert!
 egroupware sources in '%1' are not complete, file '%2' missing !!!	setup	de	eGroupWare Quellen in '%1' sind nicht komplett, Datei '%2' fehlt !!!
+email (standard maildomain should be set)	setup	de	email (Standard Maildomaine muss gesetzt sein)
 emailadmin profile updated:	setup	de	EMailAdmin Profil aktualisiert:
 enable for extra debug-messages	setup	de	ankreuzen für zusätzliche Diagnosemeldungen
 enable mcrypt	setup	de	MCrypt einschalten
@@ -547,6 +550,7 @@ tcp port number of database server	setup	de	TCP-Port des Datenbank-Servers
 text entry	setup	de	Texteingabe
 the %1 extension is needed from: %2.	setup	de	Die %1 Erweiterung (php-extension) wird benötigt von: %2.
 the %1 extension is needed, if you plan to use a %2 database.	setup	de	Die %1 Erweiterung (php extension) wird benötigt, wenn Sie die %2 Datenbank einsetzen wollen.
+the ctype extension is needed by htmlpurifier to check content of fckeditor agains cross site skripting.	setup	de	Die ctype PHP Erweiterung wird von HTMLpurifier benutzt um FCKeditor Inhalte auf Cross Site Skripting zu überprüfen.
 the db_type in defaults (%1) is not supported on this server. using first supported type.	setup	de	Der Datenbanktyp in den Vorgaben (%1) wird von diesem Server nicht unterstützt, verwende ersten unterstützten Typ.
 the file	setup	de	der Datei
 the first step in installing egroupware is to ensure your environment has the necessary settings to correctly run the application.	setup	de	Der erste Schritt bei Installation von eGroupWare ist sicherzustellen, dass Ihre Umgebung die notwendigen Einstellungen hat, um die Anwendung korrekt auszuführen.
@@ -557,6 +561,7 @@ the imagecreatefromjpeg function is supplied by the gd extension (complied with
 the ldap extension is needed, if you use ldap as account or contact storage, authenticate against ldap or active directory. it's not needed for a standard sql installation.	setup	de	Die ldap Erweiterung (php extension) wird benötigt für LDAP as Benutzer oder Addressen Speicher, um gegen LDAP oder Aktive Directory zu authetifizieren. Es wird nicht benötigt für eine standard SQL Installation.
 the mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets.	setup	de	Die mbstring Erweiterung (php extension) ist notwendig um Unicode (utf-8) oder andere mehr-byte (multibyte) Zeichensätze vollständig zu unterstützen.
 the mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.	setup	de	Die Einstellung mbstring.func_overload = 7 ist notwendig um Unicode (utf-8) oder andere mehr-byte (multibyte) Zeichensätze vollständig zu unterstützen.
+the mcrypt extension is used, to store etemplate form state on the client, which is the prefered way to store it.	setup	de	Die mycrypt PHP Erweiterung wird benötigt um den Zustand von eTemplate Formularen sicher auf dem Klient zu speichern. Das ist die empfohlene Art sie zu speichern.
 the pdo extension plus a database specific driver is needed by the vfs (virtual file system)!	setup	de	Die PDO Erweiterung plus ein Datenbank spezifischer Treiber werden vom VFS (virtuelem Datei System) benötigt!
 the session extension is needed to use php sessions (db-sessions work without).	setup	de	Die session Erweiterung (php extension) ist notwendig für PHP Sessions (Datenbank Sessions arbeiten ohne diese).
 the session extension is required!	setup	de	Die SESSION Erweiterung wird unbedingt benötigt!
@@ -681,4 +686,3 @@ your tables will be dropped and you will lose data	setup	de	Ihre Tabellen werden
 your temporary directory '%1' %2	setup	de	Ihr temporäres Verzeichnis '%1' %2
 {db | php(default) | php-restore}	setup	de	{db | php(Vorgabe) | php-restore}
 {off(default) | on}	setup	de	{off(Vorgabe) | on}
-complete path to aspell program	setup	de	Vollständiger Pfad zum Programm ASPELL
diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang
index 6a6191dacf..511a5e61b8 100644
--- a/setup/lang/egw_en.lang
+++ b/setup/lang/egw_en.lang
@@ -50,6 +50,7 @@ all languages (incl. not listed ones)	setup	en	all languages (incl. not listed o
 all users	setup	en	All Users
 allow authentication via cookie	setup	en	Allow authentication via cookie
 allow password migration	setup	en	Allow password migration
+allow usernames identical to system users?	setup	en	Allow usernames identical to system users?
 allowed migration types (comma-separated)	setup	en	Allowed migration types (comma-separated)
 alternatively domains can be accessed by logging in with <i>username@domain</i>.	setup	en	Alternatively domains can be accessed by logging in with <i>username@domain</i>.
 and is up to date	setup	en	and is up to date
@@ -141,6 +142,7 @@ click <a href="index.php">here</a> to return to setup.	setup	en	click <a href="i
 click here	setup	en	Click Here
 click here to re-run the installation tests	setup	en	Click here to re-run the installation tests
 comma separated ip-addresses or host-names, default access to setup from everywhere	setup	en	comma separated ip-addresses or host-names, default access to setup from everywhere
+complete path to aspell program	setup	en	Complete path to aspell program
 completed	setup	en	Completed
 config password	setup	en	Config Password
 config username	setup	en	Config Username
@@ -241,16 +243,19 @@ egroupware configuration file header.inc.php already exists, you need to use --e
 egroupware domain/instance %1(%2):	setup	en	eGroupWare domain/instance %1(%2):
 egroupware is already installed!	setup	en	eGroupWare is already installed!
 egroupware sources in '%1' are not complete, file '%2' missing !!!	setup	en	eGroupWare sources in '%1' are not complete, file '%2' missing !!!
+email (standard maildomain should be set)	setup	en	email (Standard Maildomain should be set)
 emailadmin profile updated:	setup	en	EMailAdmin profile updated:
 enable for extra debug-messages	setup	en	enable for extra debug-messages
 enable mcrypt	setup	en	Enable MCrypt
 enter some random text for app session encryption	setup	en	Enter some random text for app session encryption
 enter some random text for app_session <br />encryption (requires mcrypt)	setup	en	Enter some random text for app_session <br />encryption (requires mcrypt)
 enter the full path for temporary files.<br />examples: /tmp, c:\temp	setup	en	Enter the full path for temporary files.<br />Examples: /tmp, C:\TEMP
+enter the full path for temporary files.<br />examples: /tmp, c:temp	setup	en	Enter the full path for temporary files.<br />Examples: /tmp, C:\TEMP
 enter the full path for users and group files.<br />examples: /files, e:\files	setup	en	Enter the full path for users and group files.<br />Examples: /files, E:\FILES
+enter the full path for users and group files.<br />examples: /files, e:files	setup	en	Enter the full path for users and group files.<br />Examples: /files, E:\FILES
 enter the full path to the backup directory.<br />if empty: files directory	setup	en	Enter the full path to the backup directory.<br />if empty: files directory
 enter the hostname of the machine on which this server is running	setup	en	Enter the hostname of the machine on which this server is running
-enter the location of egroupware's url.<br />example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br /><b>no trailing slash</b>	setup	en	Enter the location of eGroupWare's URL.<br />Example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br /><b>No trailing slash</b>
+enter the location of egroupware's url.<br />example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br /><b>no trailing slash</b>	setup	en	Enter the location of eGroupWare's URL.<br />Example: http://www.domain.com/egroupware   or   /egroupware<br /><b>No trailing slash</b>
 enter the site password for peer servers	setup	en	Enter the site password for peer servers
 enter the site username for peer servers	setup	en	Enter the site username for peer servers
 enter the title for your site	setup	en	Enter the title for your site
@@ -545,6 +550,7 @@ tcp port number of database server	setup	en	TCP port number of database server
 text entry	setup	en	Text Entry
 the %1 extension is needed from: %2.	setup	en	The %1 extension is needed from: %2.
 the %1 extension is needed, if you plan to use a %2 database.	setup	en	The %1 extension is needed, if you plan to use a %2 database.
+the ctype extension is needed by htmlpurifier to check content of fckeditor agains cross site skripting.	setup	en	The ctype extension is needed by HTMLpurifier to check content of FCKeditor agains Cross Site Skripting.
 the db_type in defaults (%1) is not supported on this server. using first supported type.	setup	en	The db_type in defaults (%1) is not supported on this server. using first supported type.
 the file	setup	en	the file
 the first step in installing egroupware is to ensure your environment has the necessary settings to correctly run the application.	setup	en	The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.
@@ -555,6 +561,7 @@ the imagecreatefromjpeg function is supplied by the gd extension (complied with
 the ldap extension is needed, if you use ldap as account or contact storage, authenticate against ldap or active directory. it's not needed for a standard sql installation.	setup	en	The ldap extension is needed, if you use ldap as account or contact storage, authenticate against ldap or active directory. It's not needed for a standard SQL installation.
 the mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets.	setup	en	The mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets.
 the mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.	setup	en	The mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.
+the mcrypt extension is used, to store etemplate form state on the client, which is the prefered way to store it.	setup	en	The mcrypt extension is used, to store eTemplate form state on the client, which is the prefered way to store it.
 the pdo extension plus a database specific driver is needed by the vfs (virtual file system)!	setup	en	The PDO extension plus a database specific driver is needed by the VFS (virtual file system)!
 the session extension is needed to use php sessions (db-sessions work without).	setup	en	The session extension is needed to use php sessions (db-sessions work without).
 the session extension is required!	setup	en	The session extension is required!
@@ -679,4 +686,3 @@ your tables will be dropped and you will lose data	setup	en	Your tables will be
 your temporary directory '%1' %2	setup	en	Your temporary directory '%1' %2
 {db | php(default) | php-restore}	setup	en	{db | php(default) | php-restore}
 {off(default) | on}	setup	en	{off(default) | on}
-complete path to aspell program	setup	en	Complete path to aspell program