diff --git a/admin/lang/egw_de.lang b/admin/lang/egw_de.lang
index 88d9a1f7cf..91432de63b 100644
--- a/admin/lang/egw_de.lang
+++ b/admin/lang/egw_de.lang
@@ -128,6 +128,8 @@ country selection	admin	de	Länderauswahl
 create group	admin	de	Erstelle Gruppe
 created	admin	de	Erstellt
 created with id #%1	admin	de	erstellt mit der ID #%1
+creates / updates user accounts from csv file	admin	de	Erstellt / aktualisiert Benutzerkonten durch Import von Daten aus einer CSV Datei
+creates / updates user groups from csv file	admin	de	Erstellt / aktualisiert Benutzergruppen durch Import von Daten aus einer CSV Datei
 creates a new field	admin	de	erstellt ein neues Feld
 crontab only (recomended)	admin	de	nur Crontab (empfohlen)
 custom fields	admin	de	Benutzerdefinierte Felder
@@ -175,6 +177,7 @@ deny all users access to grant other users access to their entries ?	admin	de	Al
 deny all users access to preferences ?	admin	de	Allen Benutzer Zugriff auf die Einstellungen verbieten?
 description can not exceed 255 characters in length !	admin	de	Die Beschreibung darf nicht länger als 255 Zeichen sein!
 determines the order the fields are displayed	admin	de	bestimmt die Reihenfolge der angezeigten Felder
+disable	admin	de	abschalten
 disable "auto completion" of the login form	admin	de	Automatisches Vervollständigen der Logindaten abschalten
 disable wysiwyg-editor	admin	de	WYSIWYG Editor (formatierter Text) abschalten
 disabled (not recomended)	admin	de	abgeschaltet (nicht empfohlen)
@@ -208,6 +211,7 @@ egroupware version	admin	de	EGroupware Version
 either install id and config password needed or the remote hash!	admin	de	Sie benötigen entweder die Install ID UND das Konfigurationspasswort ODER den Remote Hash!
 email account active	admin	de	E-Mail-Konto aktiv
 email address	admin	de	E-Mail-Adresse
+enable	admin	de	einschalten
 enable debug-messages	admin	de	Debug-Meldungen einschalten
 enable the soap service	admin	de	soap Service einschalten
 enable the spellcheck in the ritch text editor ?	admin	de	Aktiviere die Rechtschreibprüfung im RichText Editor
@@ -250,6 +254,7 @@ error saving to db:	admin	de	Fehler beim Speichern in der Datenbank:
 error setting timer, wrong syntax or maybe there's one already running !!!	admin	de	Fehler beim Starten des Test-Jobs, falsche Syntax oder es läuft schon einer!!!
 error! no appname found	admin	de	Fehler: Kein Anwendungsname gefunden
 error: %1 not found or other error !!!	admin	de	Fehler: %1 nicht gefunden oder anderer Fehler!!!
+exists	admin	de	existiert
 expires	admin	de	abgelaufen
 explanation of ldapman	admin	de	Dieses Modul ist derzeit nur für folgende Konfiguration getestet: Postfix, LDAP, Courier-Imap, Procmail und erfordert die Schemas: core und qmail(OID 7914). Weitere Konfigurationshinweise sind im README.ldapman im DOC Verzeichnis des Moduls ADMIN zu finden.
 fallback (after each pageview)	admin	de	Ausweichmöglichkeit (nach jedem Seitenaufbau)
@@ -271,6 +276,7 @@ go directly to admin menu, returning here the next time you click on administrat
 governmental: incl. state or municipal authorities or services	admin	de	Öffentlicher Dienst: Bundes-, Länder- oder stättische Behörden und Dienstleistungen
 grant	admin	de	Berechtigungen
 group ?	admin	de	Gruppe ?
+group csv import	admin	de	CSV Import von Gruppen
 group has been added	common	de	Gruppe wurde hinzugefügt
 group has been deleted	common	de	Gruppe wurde gelöscht
 group has been updated	common	de	Gruppe wurde aktualisiert
@@ -348,10 +354,12 @@ logoutime	admin	de	Abmeldezeit
 mail settings	admin	de	E-Mail-Einstellungen
 main email-address	admin	de	Stamm-E-Mail-Adresse
 main screen message	admin	de	Nachricht der Startseite
+manage mapping	admin	de	Feldzuordnung verwalten
 manager	admin	de	Manager
 max length of the input [, length of the inputfield (optional)]	admin	de	maximale Länge für die Ausgabe [. Länge des Feldes (optional)]
 maximum account id (e.g. 65535 or 1000000)	admin	de	Maximum für Benutzer-ID (z.B. 65535 oder 1000000)
 maximum entries in click path history	admin	de	Max. Anzahl Einträge in der Click-Path-Historie
+members	admin	de	Mitglieder
 message has been updated	admin	de	Nachricht wurde geändert
 method	admin	de	Methode
 minimum account id (e.g. 500 or 100, etc.)	admin	de	Minimum für Benutzer ID (z.B. 500 oder 100)
@@ -534,6 +542,7 @@ under windows you need to install the asyncservice %1manually%2 or use the fallb
 unknown account: %1 !!!	admin	de	Unbekanntes Benutzerkonto: %1 !!!
 unknown command %1!	admin	de	Unbekannter Befehl %1 !
 unknown option %1	admin	de	Unbekannte Option %1
+unwilling to save category with current settings. check for inconsistency:	admin	de	Kategorie kann mit den aktuellen Einstellungen nicht gespeichert werden. Bitte überprüfen sie die Einstellungen auf Ungereimtheiten
 updated	admin	de	aktualisiert
 url of the egroupware installation, eg. http://domain.com/egroupware	admin	de	URL der EGroupware Installation, z.B. http://domain.com/egroupware
 usage	admin	de	Einsatz
@@ -541,6 +550,7 @@ use cookies to pass sessionid	admin	de	Sitzungs-ID in einem Cookie speichern
 use pure html compliant code (not fully working yet)	admin	de	Vollständig HTML kompatiblen Code verwenden (nicht vollständig implementiert)
 use theme	admin	de	Benutztes Farbschema
 user accounts	admin	de	Benutzerkonten
+user csv import	admin	de	CSV Import von Benutzern
 user data	common	de	Benutzerdaten
 user for smtp-authentication (leave it empty if no auth required)	admin	de	Benutzer für SMTP Authentifizierung (leer lassen falls keine Authentifizierung nötig)
 user groups	admin	de	Benutzergruppen
@@ -554,6 +564,7 @@ view error log	admin	de	Fehlerprotokoll anzeigen
 view sessions	admin	de	Sitzungen anzeigen
 view this user	admin	de	Diesen Benutzer anzeigen
 view user account	admin	de	Benutzerkonto anzeigen
+warn users about the need to change their password? the number set here should be lower than the value used to enforce the change of passwords every x days. only effective when enforcing of password change is enabled. (empty for no,number for number of days before they must change)	admin	de	Warne Benutzer, dass Ihr Passwort in X Tagen abläuft? Der Wert hier gibt an, ab wieviel Tagen vorher die Benutzer einmal pro Sitzung gewarnt werden. Die hier eingetragene Zahl sollte kleiner sein, als der Wert der für das Erzwingen des Änderns von Passwörtern alle Y Tage verwendet wird. Diese Option ist nur wirksam, wenn das Erzwingen von Passwortänderungen alle Y Tage aktiviert ist. (leer für nein, eine positive Zahl für Warnung ab X Tagen bevor das Passwort abläuft)
 we ask for the data to improve our profile in the press and to get a better understanding of egroupware's user base and it's needs.	admin	de	Wir erheben diese Daten zu auschliesslich statistischen Zwecken, um einen Überblick über den weltweiten Einsatz von EGroupware zu gewinnen.
 we hope you understand the importance for this voluntary statistic and not deny it lightly.	admin	de	Wir speichern keine Herkunftsdaten oder Informationen, die einen Rückschluss auf Ihre Identität ermöglichen würden.
 who would you like to transfer all records owned by the deleted user to?	admin	de	Wem sollen alle Datensätze, die dem zu löschenden Benutzer gehören, übertragen werden?
diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang
index 637281c556..817fdc20f1 100644
--- a/admin/lang/egw_en.lang
+++ b/admin/lang/egw_en.lang
@@ -19,6 +19,7 @@ account active	admin	en	Account active
 account has been created	common	en	Account has been created
 account has been deleted	common	en	Account has been deleted
 account has been updated	common	en	Account has been updated
+account id	admin	en	Account ID
 account list	admin	en	Account list
 account permissions	admin	en	Account permissions
 account preferences	admin	en	Account Preferences
@@ -128,6 +129,8 @@ country selection	admin	en	Country Selection
 create group	admin	en	Create Group
 created	admin	en	Created
 created with id #%1	admin	en	created with id #%1
+creates / updates user accounts from csv file	admin	en	Creates / updates user accounts from CSV file
+creates / updates user groups from csv file	admin	en	Creates / updates user groups from CSV file
 creates a new field	admin	en	creates a new field
 crontab only (recomended)	admin	en	crontab only (recomended)
 custom fields	admin	en	Custom fields
@@ -175,6 +178,7 @@ deny all users access to grant other users access to their entries ?	admin	en	De
 deny all users access to preferences ?	admin	en	Deny all users access to preferences ?
 description can not exceed 255 characters in length !	admin	en	Description can not exceed 255 characters in length !
 determines the order the fields are displayed	admin	en	determines the order the fields are displayed
+disable	admin	en	disable
 disable "auto completion" of the login form	admin	en	Disable "auto completion" of the login form
 disable wysiwyg-editor	admin	en	disable WYSIWYG-editor
 disabled (not recomended)	admin	en	disabled (not recomended)
@@ -208,6 +212,7 @@ egroupware version	admin	en	EGroupware Version
 either install id and config password needed or the remote hash!	admin	en	Either Install ID AND config password needed OR the remote hash!
 email account active	admin	en	email account active
 email address	admin	en	email address
+enable	admin	en	enable
 enable debug-messages	admin	en	Enable debug-messages
 enable the soap service	admin	en	Enable the soap service
 enable the spellcheck in the ritch text editor ?	admin	en	Enable the spellcheck in the ritch text editor ?
@@ -250,6 +255,7 @@ error saving to db:	admin	en	Error saving to db:
 error setting timer, wrong syntax or maybe there's one already running !!!	admin	en	Error setting timer, wrong syntax or maybe there's one already running !!!
 error! no appname found	admin	en	Error! No appname found
 error: %1 not found or other error !!!	admin	en	Error: %1 not found or other error !!!
+exists	admin	en	exists
 expires	admin	en	Expires
 explanation of ldapman	admin	en	This module has been tested so far for POSTFIX,LDAP,Courier-IMAP and need the schemas  CORE and QMAIL (OID7914). More details about using and configuring this systrem can be found in README.ldapman in the doc folder of ADMIN.
 fallback (after each pageview)	admin	en	fallback (after each pageview)
@@ -271,6 +277,7 @@ go directly to admin menu, returning here the next time you click on administrat
 governmental: incl. state or municipal authorities or services	admin	en	Governmental: incl. state or municipal authorities or services
 grant	admin	en	Grant
 group ?	admin	en	group ?
+group csv import	admin	en	Group CSV import
 group has been added	common	en	Group has been added
 group has been deleted	common	en	Group has been deleted
 group has been updated	common	en	Group has been updated
@@ -348,10 +355,12 @@ logoutime	admin	en	Logoutime
 mail settings	admin	en	Mail settings
 main email-address	admin	en	Main Email-Address
 main screen message	admin	en	Main screen message
+manage mapping	admin	en	Manage mapping
 manager	admin	en	Manager
 max length of the input [, length of the inputfield (optional)]	admin	en	max length of the input [, length of the inputfield (optional)]
 maximum account id (e.g. 65535 or 1000000)	admin	en	Maximum account id (e.g. 65535 or 1000000)
 maximum entries in click path history	admin	en	Maximum entries in click path history
+members	admin	en	Members
 message has been updated	admin	en	message has been updated
 method	admin	en	Method
 minimum account id (e.g. 500 or 100, etc.)	admin	en	Minimum account id (e.g. 500 or 100, etc.)
@@ -534,6 +543,7 @@ under windows you need to install the asyncservice %1manually%2 or use the fallb
 unknown account: %1 !!!	admin	en	Unknown account: %1 !!!
 unknown command %1!	admin	en	Unknown command %1!
 unknown option %1	admin	en	Unknown option %1
+unwilling to save category with current settings. check for inconsistency:	admin	en	Unwilling to save category with current settings. Check for inconsistency:
 updated	admin	en	updated
 url of the egroupware installation, eg. http://domain.com/egroupware	admin	en	URL of the eGroupWare installation, eg. http://domain.com/egroupware
 usage	admin	en	Usage
@@ -541,6 +551,7 @@ use cookies to pass sessionid	admin	en	Use cookies to pass sessionid
 use pure html compliant code (not fully working yet)	admin	en	Use pure HTML compliant code (not fully working yet)
 use theme	admin	en	Use theme
 user accounts	admin	en	User accounts
+user csv import	admin	en	User CSV import
 user data	common	en	User Data
 user for smtp-authentication (leave it empty if no auth required)	admin	en	User for SMTP-authentication (leave it empty if no auth required)
 user groups	admin	en	User groups
@@ -554,6 +565,7 @@ view error log	admin	en	View error log
 view sessions	admin	en	View sessions
 view this user	admin	en	view this user
 view user account	admin	en	View user account
+warn users about the need to change their password? the number set here should be lower than the value used to enforce the change of passwords every x days. only effective when enforcing of password change is enabled. (empty for no,number for number of days before they must change)	admin	en	Warn users about the need to change their password? The number set here should be lower than the value used to enforce the change of passwords every X days. Only effective when enforcing of password change is enabled. (empty for no,number for number of days before they must change)
 we ask for the data to improve our profile in the press and to get a better understanding of egroupware's user base and it's needs.	admin	en	We ask those data for statistical purpose only to get an general overview about the use of EGroupware worldwide.
 we hope you understand the importance for this voluntary statistic and not deny it lightly.	admin	en	We're not saving any data regarding your identity.
 who would you like to transfer all records owned by the deleted user to?	admin	en	Who would you like to transfer ALL records owned by the deleted user to?
diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl
index 12f3a2fb71..1d8632b839 100644
--- a/admin/templates/default/config.tpl
+++ b/admin/templates/default/config.tpl
@@ -239,13 +239,20 @@
    </tr>
 
    <tr class="row_on">
+    <td>{lang_Warn_users_about_the_need_to_change_their_password?_The_number_set_here_should_be_lower_than_the_value_used_to_enforce_the_change_of_passwords_every_X_days._Only_effective_when_enforcing_of_password_change_is_enabled._(empty_for_no,number_for_number_of_days_before_they_must_change)}:</td>
+    <td>
+     <input name="newsettings[warn_about_upcoming_pwd_change]" value="{value_warn_about_upcoming_pwd_change}" size="5">
+    </td>
+   </tr>
+
+   <tr class="row_off">
     <td>{lang_Force_password_strength_(1-5,_default_empty: no check against rules for a strong password)?}:</td>
     <td>
      <input name="newsettings[force_pwd_strength]" value="{value_force_pwd_strength}" size="5">
     </td>
    </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
     <td>
      <input name="newsettings[admin_mails]" value="{value_admin_mails}" size="40">
@@ -262,7 +269,7 @@
     </td>
    </tr>
 -->
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_Enable_the_xmlrpc_service} {lang_(default_No,_leave_it_off_if_you_dont_use_it)}:</td>
     <td>
       <select name="newsettings[xmlrpc_enabled]">
@@ -272,7 +279,7 @@
     </td>
    </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_Enable_the_soap_service} {lang_(default_No,_leave_it_off_if_you_dont_use_it)}:</td>
     <td>
       <select name="newsettings[soap_enabled]">
@@ -281,16 +288,16 @@
        </select>
     </td>
    </tr>
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_How_many_entries_should_non-admins_be_able_to_export_(empty_=_no_limit,_no_=_no_export)}:</td>
     <td><input name="newsettings[export_limit]" value="{value_export_limit}" size="5"></td>
    </tr>
    </tr>
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_Allow_remote_administration_from_following_install_ID's_(comma_separated)}:<br />{lang_Own_install_ID:_}{value_install_id}</td>
     <td><input name="newsettings[allow_remote_admin]" value="{value_allow_remote_admin}" size="40"></td>
    </tr>
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_Should_exceptions_contain_a_trace_(including_function_arguments)}:</td>
     <td>
       <select name="newsettings[exception_show_trace]">
diff --git a/phpgwapi/inc/class.auth.inc.php b/phpgwapi/inc/class.auth.inc.php
index 4624e2640d..8d5299ec65 100644
--- a/phpgwapi/inc/class.auth.inc.php
+++ b/phpgwapi/inc/class.auth.inc.php
@@ -67,38 +67,85 @@ class auth
 	 */
 	static function check_password_age($app='', $class='', $method='')
 	{
-		//echo egw_time::to('now','ts').'<br>';
-		//echo $GLOBALS['egw_info']['user']['account_lastpwd_change'].'<br>';
-		//echo ($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400).'<br>';
-		//echo egw_time::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400).'<br>';
+		// dont check anything for anonymous sessions/ users that are flagged as anonymous
+		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A') return true;
+		static $UserKnowsAboutPwdChange;
+		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange =& egw_cache::getSession('auth_UserKnowsAboutPwdChange','phpgwapi');
+		// some statics to make information and timecalculation a) more readable in conditions b) persistent per  request
+		static $alpwchange_val;
+		static $passwordAgeBorder;
+		static $daysLeftUntilChangeReq;
+		// current style name for account last password change timestamp
 		$alpwchange='account_lastpwd_change';
-		// if nether timestamp isset return true, nothing to do (exept this means the password is too old)
+		// some debug output and develop options to move the horizons and warn levels around
+		//$GLOBALS['egw_info']['server']['change_pwd_every_x_days'] = 30;
+		//$GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change']=43;
+		//echo egw_time::to('now','ts').'<br>';
+		//echo "User changed password at:".egw_time::to($GLOBALS['egw_info']['user'][$alpwchange]).'<br>';
+		//echo "User password is ".((egw_time::to('now','ts')-$GLOBALS['egw_info']['user'][$alpwchange])/86400)." days old<br>";
+		//echo "Users must change passwords every ".$GLOBALS['egw_info']['server']['change_pwd_every_x_days'].' days ('.($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400).') seconds.<br>';
+		//echo egw_time::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400).'<br>';
+
+		// if neither timestamp isset return true, nothing to do (exept this means the password is too old)
 		if (!isset($GLOBALS['egw_info']['user']['account_lastpasswd_change']) && 
 			!isset($GLOBALS['egw_info']['user'][$alpwchange]) &&
 			empty($GLOBALS['egw_info']['server']['change_pwd_every_x_days'])
 		) return true;
 		if ($GLOBALS['egw_info']['user']['account_lastpasswd_change'] && !$GLOBALS['egw_info']['user'][$alpwchange])
 		{
-			// old style names
-			$alpwchange='account_lastpasswd_change';
+			// use old style names, as the cuurent one seems not to be set.
+			$alpwchange = 'account_lastpasswd_change';
 		}
+		// initalize statics - better readability of conditions
+		if (is_null($alpwchange_val)) $alpwchange_val = $GLOBALS['egw_info']['user'][$alpwchange];
+		if (is_null($passwordAgeBorder) && $GLOBALS['egw_info']['server']['change_pwd_every_x_days']) 
+		{
+			$passwordAgeBorder = (egw_time::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400));
+		}
+		if (is_null($daysLeftUntilChangeReq) && $GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'])
+		{
+			// maxage - passwordage = days left until change is required
+			$daysLeftUntilChangeReq = ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] - ((egw_time::to('now','ts')-$alpwchange_val)/86400));
+		}
+		//echo "Warn about the upcomming change ".$GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'].' days before that time is reached<br>';
+		//$result = $GLOBALS['egw_info']['server']['change_pwd_every_x_days'] - $daysLeftUntilChangeReq;
+		//echo $GLOBALS['egw_info']['server']['change_pwd_every_x_days'].' - '.$daysLeftUntilChangeReq.'='. $result.'<br>';
 		if  (!($app == 'preferences' && $class == 'uipassword' && $method=='change') &&
-			 (($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] &&
+			 (
+			  ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] &&
 			   ($GLOBALS['egw_info']['user']['apps']['preferences'] || $GLOBALS['egw_info']['user']['apps']['password']) &&
-			   egw_time::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400)>$GLOBALS['egw_info']['user'][$alpwchange]
-			  ) || $GLOBALS['egw_info']['user'][$alpwchange]==0) 
+			   (
+				($passwordAgeBorder > $alpwchange_val) ||
+				(
+				 $GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'] && 
+				 $GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'] > $daysLeftUntilChangeReq 
+				)
+			   )
+			  ) || $alpwchange_val==0
+			 ) 
 			)
 		{
 			if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences')) return true; // user has no rights to change password
-			error_log(__METHOD__.' Password of '.$GLOBALS['egw_info']['user']['account_lid'].' ('.$GLOBALS['egw_info']['user']['account_fullname'].') is of old age.'.array2string(array(
-				'ts'=>$GLOBALS['egw_info']['user']['account_lastpwd_change'],
-				'date'=>egw_time::to($GLOBALS['egw_info']['user']['account_lastpwd_change']))));
-			if ($GLOBALS['egw_info']['user']['account_lastpwd_change']==0) 
+			if ($UserKnowsAboutPwdChange === true && !($passwordAgeBorder > $alpwchange_val || $alpwchange_val==0)) return true; // user has already been informed about the upcomming password expiration
+			if ($alpwchange_val == 0) 
 			{
 				$message = lang('an admin required that you must change your password upon login.');
 			}
-			else
+			elseif (($passwordAgeBorder < $alpwchange_val) ||
+					(
+					 $GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'] &&
+					 $GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'] > $daysLeftUntilChangeReq
+					)
+				   )
 			{
+				$UserKnowsAboutPwdChange = true;
+				$message = lang('your password is about to expire in %1 days, you may change your password now',round($daysLeftUntilChangeReq));
+			}
+			elseif ($passwordAgeBorder > $alpwchange_val && $alpwchange_val > 0)
+			{
+				error_log(__METHOD__.' Password of '.$GLOBALS['egw_info']['user']['account_lid'].' ('.$GLOBALS['egw_info']['user']['account_fullname'].') is of old age.'.array2string(array(
+					'ts'=>$GLOBALS['egw_info']['user']['account_lastpwd_change'],
+					'date'=>egw_time::to($GLOBALS['egw_info']['user']['account_lastpwd_change']))));
 				$message = lang('it has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
 			}
 			if ($GLOBALS['egw_info']['user']['apps']['password']) egw::redirect_link('/preferences/password.php',array('message'=>$message));
diff --git a/phpgwapi/lang/egw_de.lang b/phpgwapi/lang/egw_de.lang
index 9983e6d118..1ddb8f6378 100644
--- a/phpgwapi/lang/egw_de.lang
+++ b/phpgwapi/lang/egw_de.lang
@@ -117,6 +117,8 @@ cameroon	common	de	KAMERUN
 canada	common	de	KANADA
 cancel	common	de	Abbrechen
 cannot replace %1 because it is a directory	common	de	Kann %1 nicht ersetzen, da es ein Verzeichnis ist
+cannot set a category as parent, which is part of this categorys subtree!	common	de	Eine Kategorie, die ein Element der eignen Unterelemente ist, kann nicht als neues Elternelement ausgewählt werden.
+cannot set this cat as its own parent!	common	de	Eine Kategorie kann nicht als Ihr eigenes Elternelement ausgewählt werden.
 cant open %1, needs ziparchive	common	de	Kann die %1 nicht öffnen, benötigt ZipAchive
 cant open '%1' for %2	common	de	Kann '%1' nicht zum %2 öffnen
 cape verde	common	de	KAP VERDE
@@ -144,6 +146,7 @@ choose a background style.	common	de	Wählen Sie einen Hintergrundstil.
 choose a text color for the icons	common	de	Wählen Sie eine Textfarbe für die Symbole
 choose the category	common	de	Kategorie auswählen
 choose the parent category	common	de	Wählen der übergeordneten Kategorie
+chosen parent category no longer exists	common	de	Die ausgewählte Elternkategorie existiert nicht (mehr).
 christmas island	common	de	WEIHNACHTS INSEL
 clear	common	de	Zurücksetzen
 clear form	common	de	Eingaben löschen
@@ -541,6 +544,7 @@ preferences for the %1 template set	preferences	de	Einstellungen für das %1 Tem
 prev. month (hold for menu)	jscalendar	de	Vorheriger Monat (halten für Menü)
 prev. year (hold for menu)	jscalendar	de	Vorheriges Jahr (halten für Menü)
 previous page	common	de	Vorherige Seite
+primary group	common	de	Hauptgruppe
 primary style-sheet:	common	de	Haupt-Stylesheet:
 print	common	de	Drucken
 priority	common	de	Priorität
@@ -778,6 +782,7 @@ you've tried to open the egroupware application: %1, but you have no permission
 your message could <b>not</b> be sent!<br>	common	de	Ihre Nachricht konnte <b>nicht</b> gesendet werden!<br>
 your message has been sent	common	de	Ihre Nachricht wurde versendet
 your password does not meet the required strength.<br> you must meet %1 criteria. you met only %2 criteria. <br>your password failed the following criteria:	common	de	Ihr gewähltes Passwort genügt nicht unseren Qualitätsansprüchen an ein Passwort <br> Sie müssen %1 Kriterien  erfüllen. Sie haben nur %2 Kriterien erfüllt.<br> Folgende Kriterien haben Sie nicht erfüllt. Erweitern Sie Ihr neues Passwort entsprechend.
+your password is about to expire in %1 days, you may change your password now	common	de	Ihr Passwort läuft in %1 Tagen ab. Sie können nun hier Ihr Passwort ändern, oder warten bis Sie es ändern müssen.
 your search returned %1 matchs	common	de	Ihre Suche ergab %1 Treffer
 your search returned 1 match	common	de	Ihre Suche ergab einen Treffer
 your session could not be verified.	login	de	Ihre Sitzung konnte nicht verifiziert werden.
diff --git a/phpgwapi/lang/egw_en.lang b/phpgwapi/lang/egw_en.lang
index b3cd7e1617..c4d3f780b3 100644
--- a/phpgwapi/lang/egw_en.lang
+++ b/phpgwapi/lang/egw_en.lang
@@ -49,6 +49,7 @@ albania	common	en	ALBANIA
 algeria	common	en	ALGERIA
 all	common	en	All
 all fields	common	en	all fields
+all in one	common	en	All in one
 all languages	common	en	all languages
 alphabet	common	en	a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z
 alternate style-sheet:	common	en	Alternate style-sheet:
@@ -117,6 +118,8 @@ cameroon	common	en	CAMEROON
 canada	common	en	CANADA
 cancel	common	en	Cancel
 cannot replace %1 because it is a directory	common	en	Cannot replace %1 because it is a directory
+cannot set a category as parent, which is part of this categorys subtree!	common	en	Cannot set a category as parent, which is part of this categorys subtree!
+cannot set this cat as its own parent!	common	en	Cannot set this cat as its own parent!
 cant open %1, needs ziparchive	common	en	Cant open %1, needs ZipArchive
 cant open '%1' for %2	common	en	Cant open '%1' for %2
 cape verde	common	en	CAPE VERDE
@@ -144,6 +147,7 @@ choose a background style.	common	en	Choose a background style.
 choose a text color for the icons	common	en	Choose a text color for the icons
 choose the category	common	en	Choose the category
 choose the parent category	common	en	Choose the parent category
+chosen parent category no longer exists	common	en	Chosen parent category no longer exists
 christmas island	common	en	CHRISTMAS ISLAND
 clear	common	en	Clear
 clear form	common	en	Clear Form
@@ -542,6 +546,7 @@ preferences for the %1 template set	preferences	en	Preferences for the %1 templa
 prev. month (hold for menu)	jscalendar	en	Prev. month (hold for menu)
 prev. year (hold for menu)	jscalendar	en	Prev. year (hold for menu)
 previous page	common	en	Previous page
+primary group	common	en	Primary Group
 primary style-sheet:	common	en	Primary style-sheet:
 print	common	en	Print
 priority	common	en	Priority
@@ -779,6 +784,7 @@ you've tried to open the egroupware application: %1, but you have no permission
 your message could <b>not</b> be sent!<br>	common	en	Your message could <b>not</b> be sent!<br>
 your message has been sent	common	en	Your message has been sent
 your password does not meet the required strength.<br> you must meet %1 criteria. you met only %2 criteria. <br>your password failed the following criteria:	common	en	Your Password does not meet the required strength.<br> You must meet %1 criteria. You met only %2 criteria. <br>Your Password failed the following criteria:
+your password is about to expire in %1 days, you may change your password now	common	en	your password is about to expire in %1 days, you may change your password now
 your search returned %1 matchs	common	en	your search returned %1 matches
 your search returned 1 match	common	en	your search returned 1 match
 your session could not be verified.	login	en	Your session could not be verified.