From d2f80cf8dc00ed4bf9ce247b446abaa0ff85987e Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 17 May 2007 08:35:35 +0000
Subject: [PATCH] fixed SiteMgr session-problems by making the cookie
 path/domain configurable with more reasonable defaults then 1.4 has at the
 moment, making the display of * behind untranslated phrases an option which
 is by default off (as it anoyes users) and added a few more explenations to
 Admin >> Site configuration (plus removing not used ones)

---
 admin/setup/phpgw_ca.lang              |  1 +
 admin/setup/phpgw_cs.lang              |  1 +
 admin/setup/phpgw_da.lang              |  1 +
 admin/setup/phpgw_de.lang              | 11 +++++
 admin/setup/phpgw_el.lang              |  1 +
 admin/setup/phpgw_en.lang              | 10 +++-
 admin/setup/phpgw_es-es.lang           |  3 +-
 admin/setup/phpgw_eu.lang              |  1 +
 admin/setup/phpgw_fi.lang              |  3 +-
 admin/setup/phpgw_fr.lang              |  3 +-
 admin/setup/phpgw_hr.lang              |  1 +
 admin/setup/phpgw_hu.lang              |  1 +
 admin/setup/phpgw_it.lang              |  1 +
 admin/setup/phpgw_iw.lang              |  1 +
 admin/setup/phpgw_ja.lang              |  1 +
 admin/setup/phpgw_ko.lang              |  1 +
 admin/setup/phpgw_lv.lang              |  1 +
 admin/setup/phpgw_nl.lang              |  1 +
 admin/setup/phpgw_no.lang              |  1 +
 admin/setup/phpgw_pl.lang              |  3 +-
 admin/setup/phpgw_pt-br.lang           |  3 +-
 admin/setup/phpgw_pt.lang              |  1 +
 admin/setup/phpgw_ru.lang              |  1 +
 admin/setup/phpgw_sk.lang              |  3 +-
 admin/setup/phpgw_sl.lang              |  3 +-
 admin/setup/phpgw_sv.lang              |  1 +
 admin/setup/phpgw_uk.lang              |  1 +
 admin/setup/phpgw_zh-tw.lang           |  3 +-
 admin/setup/phpgw_zh.lang              |  1 +
 admin/templates/default/config.tpl     | 64 +++++++++++---------------
 phpgwapi/inc/class.sessions.inc.php    | 23 +++++++--
 phpgwapi/inc/class.translation.inc.php | 16 ++++++-
 32 files changed, 118 insertions(+), 49 deletions(-)

diff --git a/admin/setup/phpgw_ca.lang b/admin/setup/phpgw_ca.lang
index c446f05fa3..a8fffe6032 100644
--- a/admin/setup/phpgw_ca.lang
+++ b/admin/setup/phpgw_ca.lang
@@ -435,3 +435,4 @@ you must enter an application title.	admin	ca	Heu d'introdu
 you must select a file type	admin	ca	Heu de seleccionar un tipus d'arxiu
 you will need to remove the subcategories before you can delete this category	admin	ca	Heu d'esborrar les subcategories abans de poder esborrar aquesta categoria !
 
+your session could not be verified.	admin	ca	La vostra sessi� no s'ha pogut verificar.
diff --git a/admin/setup/phpgw_cs.lang b/admin/setup/phpgw_cs.lang
index ad0180d916..2847705fe5 100644
--- a/admin/setup/phpgw_cs.lang
+++ b/admin/setup/phpgw_cs.lang
@@ -359,3 +359,4 @@ you must enter an application name.	admin	cs	Mus
 you must enter an application title.	admin	cs	Mus�te vlo�it titulek aplikace.
 you must select a file type	admin	cs	Mus�te vybrat typ souboru
 you will need to remove the subcategories before you can delete this category	admin	cs	Mus�te odstranit podkategorie p�edt�m, ne� m��ete smazat tuto kategorii !
+your session could not be verified.	admin	cs	Va�e sezen� nen� platn�.
diff --git a/admin/setup/phpgw_da.lang b/admin/setup/phpgw_da.lang
index 450990ac1b..c048b9606e 100644
--- a/admin/setup/phpgw_da.lang
+++ b/admin/setup/phpgw_da.lang
@@ -354,3 +354,4 @@ you must enter an application name.	admin	da	Du skal indtaste et applikations na
 you must enter an application title.	admin	da	Du skal indtaste en applikations titel
 you must select a file type	admin	da	Du skal v�lge en type
 you will need to remove the subcategories before you can delete this category	admin	da	Du blive n�d til at fjerne underkategorierne for du kan slette denne kategori!
+your session could not be verified.	admin	da	Din session kunne ikke verificeres
diff --git a/admin/setup/phpgw_de.lang b/admin/setup/phpgw_de.lang
index 3f13ec26de..fe59223e61 100644
--- a/admin/setup/phpgw_de.lang
+++ b/admin/setup/phpgw_de.lang
@@ -92,6 +92,8 @@ check ip address of all sessions	admin	de	IP-Adresse f
 check items to <b>%1</b> to %2 for %3	admin	de	Durch Abhaken %3 in %2 <b>%1</b>
 click to select a color	admin	de	Anclicken um eine Farbe auszuw�hlen
 color	admin	de	Farbe
+cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com)	admin	de	Cookie Domain (Vorgabe leer bedeutet den kompletten Domainnamen, f�r SiteMgr erlaubt zB. ".domain.com" das gleiche Cookie f�r egw.domain.com und www.domain.com zu verwenden)
+cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!)	admin	de	Cookie Pfad (erlaubt mehrere eGW Sitzungen mit unterschiedlichen Verzeichnissen, hat Probleme mit SiteMgr!)
 country selection	admin	de	L�nderauswahl
 create group	admin	de	Erstelle Gruppe
 creates a new field	admin	de	erstellt ein neues Feld
@@ -144,6 +146,7 @@ do not delete the category and return back to the list	admin	de	Kategorie NICHT
 do you also want to delete all global subcategories ?	admin	de	wollen Sie auch alle globalen Unterkategorien l&ouml;schen?
 do you want to delete all global subcategories ?	admin	de	M�chten Sie alle Globale Unterkategorien l�schen?
 do you want to move all global subcategories one level down ?	admin	de	Wollen sie alle globalen Unterkategorien eine Ebene nach unten verschieben?
+document root (default)	admin	de	Wurzelverzeichnis des Webservers (Vorgabe)
 each value is a line like <id>[=<label>]	admin	de	jeder Wert ist ein Zeile <id>[=<label>]
 each value is a line like id[=label]	admin	de	jeder Wert ist eine Zeile id[=label]
 edit account	admin	de	Benutzerkonto bearbeiten
@@ -162,6 +165,7 @@ edit this group	admin	de	Diese Gruppe bearbeiten
 edit this user	admin	de	Diesen Benutzer bearbeiten
 edit user	admin	de	Benutzer bearbeiten
 edit user account	admin	de	Benutzerkonto bearbeiten
+egroupware directory	admin	de	eGroupWare Verzeichnis
 email account active	admin	de	E-Mail-Konto aktiv
 email address	admin	de	E-Mail-Adresse
 enable debug-messages	admin	de	Debug-Meldungen einschalten
@@ -174,7 +178,9 @@ enter some random text for app_session <br>encryption (requires mcrypt)	admin	de
 enter the background color for the login page	admin	de	Hintergrundfarbe f�r die Anmeldeseite
 enter the background color for the site title	admin	de	Hintergrundfarbe f�r den Titel der Installation
 enter the full path for temporary files.<br>examples: /tmp, c:\temp	admin	de	Vollst�ndiger Pfad f�r tempor�re Dateien.<br>Beispiel: /tmp, C:\TEMP
+enter the full path for temporary files.<br>examples: /tmp, c:temp	admin	de	Vollst�ndiger Pfad f�r tempor�re Dateien.<br>Beispiel: /tmp, C:\TEMP
 enter the full path for users and group files.<br>examples: /files, e:\files	admin	de	Vollst�ndiger Pfad f�r Benutzer- und Gruppendateien.<br>Beispiel: /files, E:\Files
+enter the full path for users and group files.<br>examples: /files, e:files	admin	de	Vollst�ndiger Pfad f�r Benutzer- und Gruppendateien.<br>Beispiel: /files, E:\Files
 enter the hostname of the machine on which this server is running	admin	de	Hostname des Computers auf dem der Server l�uft
 enter the location of egroupware's url.<br>example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br><b>no trailing slash</b>	admin	de	URL zur eGroupWare-Installation.<br>Beispiel: http://www.domain.com/egroupware   or   /egroupware<br><b>keinen nachfolgenden Slash /</b>
 enter the search string. to show all entries, empty this field and press the submit button again	admin	de	Geben Sie Ihren Suchbegriff ein. Um alle Eintr�ge anzuzeigen, geben Sie keinen Begriff ein und dr�cken Sie den Suchen-Knopf nochmal
@@ -277,6 +283,7 @@ minimum account id (e.g. 500 or 100, etc.)	admin	de	Minimum f
 minute	admin	de	Minute
 mode	admin	de	Modus
 month	admin	de	Monat
+more secure	admin	de	sicherer
 name must not be empty !!!	admin	de	Name darf nicht leer sein !!!
 new group name	admin	de	Neuer Gruppenname
 new name	admin	de	neuer Name
@@ -352,6 +359,7 @@ set preference values.	admin	de	Einstellungswert wurde ge
 should the login page include a language selectbox (useful for demo-sites) ?	admin	de	Soll die Anmeldeseite eine Sprachauswahl beinhalten (n�tzlich f�r Demosites) ?
 show 'powered by' logo on	admin	de	Zeige "powered by" Logo
 show access log	admin	de	Zugangsprotokoll anzeigen
+show an asterisk (*) to mark untranslated strings	admin	de	Zeige einen Stern (*) um nicht �bersetzte Texte zu markieren
 show current action	admin	de	aktuelle Aktion anzeigen
 show error log	admin	de	Fehlerprotokoll anzeigen
 show phpinfo()	admin	de	phpinfo() anzeigen
@@ -372,6 +380,7 @@ start testjob!	admin	de	Testjob starten!
 submit changes	admin	de	�nderungen speichern
 submit the search string	admin	de	Geben Sie Ihren Suchbegriff ein
 subtype	admin	de	Untertyp
+switch it off, if users are randomly thrown out	admin	de	schalten Sie es aus, wenn Benutzer immer wieder zuf�llig rausgeworfen werden
 template selection	admin	de	Auswahl der Benutzeroberfl�che
 text entry	admin	de	Texteingabe
 that application name already exists.	admin	de	Diesen Anwendungsname gibt es bereits.
@@ -438,4 +447,6 @@ you must enter an application name and title.	admin	de	Sie m
 you must enter an application name.	admin	de	Sie m�ssen der Anwendung einen Namen geben.
 you must enter an application title.	admin	de	Sie m�ssen der Anwendung einen Titel geben.
 you must select a file type	admin	de	Sie m�ssen einen Dateityp ausw�hlen
+you must select at least one group member.	admin	de	Sie m�ssen mindestens ein Gruppenmitglied ausw�hlen.
 you will need to remove the subcategories before you can delete this category	admin	de	Sie m�ssen erst die Unterkategorien l�schen bevor Sie diese Kategorie l�schen k�nnen!
+your session could not be verified.	admin	de	Ihre Sitzung konnte nicht verifiziert werden.
diff --git a/admin/setup/phpgw_el.lang b/admin/setup/phpgw_el.lang
index 892436c549..5d00c7e1da 100644
--- a/admin/setup/phpgw_el.lang
+++ b/admin/setup/phpgw_el.lang
@@ -361,3 +361,4 @@ enter your default mail domain ( from: user@domain )	admin	el	
 enter your smtp server hostname or ip address	admin	el	�������� ��� �������� � ��� IP ��� SMTP server
 enter your smtp server port	admin	el	�������� ��� SMTP server port
 mail settings	admin	el	
+your session could not be verified.	admin	el	� �������� �������� ��� ������� �� �����������
diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang
index 26a0365288..fb8330bc31 100644
--- a/admin/setup/phpgw_en.lang
+++ b/admin/setup/phpgw_en.lang
@@ -92,6 +92,8 @@ check ip address of all sessions	admin	en	Check IP address of all sessions
 check items to <b>%1</b> to %2 for %3	admin	en	Check items to <b>%1</b> to %2 for %3
 click to select a color	admin	en	Click to select a color
 color	admin	en	Color
+cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com)	admin	en	Cookie domain (default empty means use full domain name, for SiteMgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com)
+cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!)	admin	en	Cookie path (allows multiple eGW sessions with different directories, has problemes with SiteMgr!)
 country selection	admin	en	Country Selection
 create group	admin	en	Create Group
 creates a new field	admin	en	creates a new field
@@ -144,6 +146,7 @@ do not delete the category and return back to the list	admin	en	do NOT delete th
 do you also want to delete all global subcategories ?	admin	en	Do you also want to delete all global subcategories ?
 do you want to delete all global subcategories ?	admin	en	Do you want to delete all global subcategories ?
 do you want to move all global subcategories one level down ?	admin	en	Do you want to move all global subcategories one level down ?
+document root (default)	admin	en	Document root (default)
 each value is a line like <id>[=<label>]	admin	en	each value is a line like <id>[=<label>]
 each value is a line like id[=label]	admin	en	each value is a line like id[=label]
 edit account	admin	en	Edit account
@@ -162,6 +165,7 @@ edit this group	admin	en	edit this group
 edit this user	admin	en	edit this user
 edit user	admin	en	edit user
 edit user account	admin	en	Edit user account
+egroupware directory	admin	en	eGroupWare directory
 email account active	admin	en	email account active
 email address	admin	en	email address
 enable debug-messages	admin	en	Enable debug-messages
@@ -277,6 +281,7 @@ minimum account id (e.g. 500 or 100, etc.)	admin	en	Minimum account id (e.g. 500
 minute	admin	en	Minute
 mode	admin	en	Mode
 month	admin	en	Month
+more secure	admin	en	more secure
 name must not be empty !!!	admin	en	Name must not be empty !!!
 new group name	admin	en	New group name
 new name	admin	en	new name
@@ -352,6 +357,7 @@ set preference values.	admin	en	Set preference values.
 should the login page include a language selectbox (useful for demo-sites) ?	admin	en	Should the login page include a language selectbox (useful for demo-sites) ?
 show 'powered by' logo on	admin	en	Show 'powered by' logo on
 show access log	admin	en	Show access log
+show an asterisk (*) to mark untranslated strings	admin	en	Show an asterisk (*) to mark untranslated strings
 show current action	admin	en	Show current action
 show error log	admin	en	Show error log
 show phpinfo()	admin	en	Show phpinfo()
@@ -372,6 +378,7 @@ start testjob!	admin	en	Start TestJob!
 submit changes	admin	en	Submit Changes
 submit the search string	admin	en	Submit the search string
 subtype	admin	en	Subtype
+switch it off, if users are randomly thrown out	admin	en	switch it off, if users are randomly thrown out
 template selection	admin	en	Template Selection
 text entry	admin	en	Text Entry
 that application name already exists.	admin	en	That application name already exists.
@@ -438,5 +445,6 @@ you must enter an application name and title.	admin	en	You must enter an applica
 you must enter an application name.	admin	en	You must enter an application name.
 you must enter an application title.	admin	en	You must enter an application title.
 you must select a file type	admin	en	You must select a file type
-you must select at least one group member	admin	en	You must select at least one group member.
+you must select at least one group member.	admin	en	You must select at least one group member.
 you will need to remove the subcategories before you can delete this category	admin	en	You will need to remove the subcategories before you can delete this category !
+your session could not be verified.	admin	en	Your session could not be verified.
diff --git a/admin/setup/phpgw_es-es.lang b/admin/setup/phpgw_es-es.lang
index 5bc204e5c0..69f3baef54 100644
--- a/admin/setup/phpgw_es-es.lang
+++ b/admin/setup/phpgw_es-es.lang
@@ -440,5 +440,6 @@ you must enter an application name and title.	admin	es-es	Debe introducir nombre
 you must enter an application name.	admin	es-es	Debe introducir un nombre de aplicaci�n
 you must enter an application title.	admin	es-es	Debe introducir un t�tulo para la aplicaci�n
 you must select a file type	admin	es-es	Debe seleccionar un tipo de archivo
-you must select at least one group member	admin	es-es	Debe seleccionar al menos un miembro del grupo
+you must select at least one group member.	admin	es-es	Debe seleccionar al menos un miembro del grupo.
 you will need to remove the subcategories before you can delete this category	admin	es-es	Deber� eliminar las subcategor�as antes de poder borrar esta categor�a
+your session could not be verified.	admin	es-es	Su sesi�n no pudo ser verificada.
diff --git a/admin/setup/phpgw_eu.lang b/admin/setup/phpgw_eu.lang
index 7d51e2a3f7..7d678e5287 100644
--- a/admin/setup/phpgw_eu.lang
+++ b/admin/setup/phpgw_eu.lang
@@ -331,3 +331,4 @@ you must enter an application name and title.	admin	eu	Izen eta izenburu bat jar
 you must enter an application name.	admin	eu	Aplikazioari izen bat eman behar diozu.
 you must enter an application title.	admin	eu	Aplikazioari izenburu bat jarri behar diozu.
 you must select a file type	admin	eu	Fitxategi mota bat aukeratu behar duzu
+your session could not be verified.	admin	eu	Zure saioa ezin izan da egiaztatu
diff --git a/admin/setup/phpgw_fi.lang b/admin/setup/phpgw_fi.lang
index 33ffa769e5..53ba5b428f 100644
--- a/admin/setup/phpgw_fi.lang
+++ b/admin/setup/phpgw_fi.lang
@@ -432,5 +432,6 @@ you must enter an application name and title.	admin	fi	Anna sovelluksen nimi ja
 you must enter an application name.	admin	fi	Anna sovelluksen nimi.
 you must enter an application title.	admin	fi	Anna sovelluksen otsikko.
 you must select a file type	admin	fi	Anna tiedostotyyppi
-you must select at least one group member	admin	fi	Valitse v�hint�� yksi ryhm�n j�sen.
+your session could not be verified.	admin	fi	Istuntoasi ei voitu varmentaa.
+you must select at least one group member.	admin	fi	Valitse v�hint�� yksi ryhm�n j�sen.
 you will need to remove the subcategories before you can delete this category	admin	fi	Alikategoriat on poistettava ennen kuin voit poistaa luokan!
diff --git a/admin/setup/phpgw_fr.lang b/admin/setup/phpgw_fr.lang
index 5b2a7fce29..96b91001e9 100644
--- a/admin/setup/phpgw_fr.lang
+++ b/admin/setup/phpgw_fr.lang
@@ -440,5 +440,6 @@ you must enter an application name and title.	admin	fr	Vous devez entrer un nom
 you must enter an application name.	admin	fr	Vous devez entrer un nom d'application.
 you must enter an application title.	admin	fr	Vous devez entrer un titre d'application.
 you must select a file type	admin	fr	Vous devez choisir un type de fichier
-you must select at least one group member	admin	fr	Vous devez s�lectionner au moins un membre de groupe.
+you must select at least one group member.	admin	fr	Vous devez s�lectionner au moins un membre de groupe.
 you will need to remove the subcategories before you can delete this category	admin	fr	Vous allez devoir enlever les sous-cat�gories avant de pouvoir effacer cette cat�gorie !
+your session could not be verified.	admin	fr	Votre session n'a pas pu �tre v�rifi�e.
diff --git a/admin/setup/phpgw_hr.lang b/admin/setup/phpgw_hr.lang
index 446beb055e..607b1906db 100644
--- a/admin/setup/phpgw_hr.lang
+++ b/admin/setup/phpgw_hr.lang
@@ -376,3 +376,4 @@ you must enter an application name.	admin	hr	Morate unijeti ime aplikacije.
 you must enter an application title.	admin	hr	Morate unijeti naslov aplikacije.
 you must select a file type	admin	hr	Morate izabrati vrstu datoteke.
 you will need to remove the subcategories before you can delete this category	admin	hr	Morate obrisati sve podkategorije prije noego što obrišete ovu kategoriju !
+your session could not be verified.	admin	hr	Vašu sesiju nije moguće potvrditi.
diff --git a/admin/setup/phpgw_hu.lang b/admin/setup/phpgw_hu.lang
index 7f12e9b031..d3bbcf84cd 100644
--- a/admin/setup/phpgw_hu.lang
+++ b/admin/setup/phpgw_hu.lang
@@ -274,3 +274,4 @@ view this user	admin	hu	felhaszn
 xml-rpc	admin	hu	XML-RPC
 you must enter an application name and title.	admin	hu	K�telez� megadni az alkalmaz�s nev�t �s c�m�t!
 you must select a file type	admin	hu	K�telez� f�jlt�pust v�lasztani
+your session could not be verified.	admin	hu	A hozz�f�r�se nem ellen�rizhet�.
diff --git a/admin/setup/phpgw_it.lang b/admin/setup/phpgw_it.lang
index daf613bba3..2aaa639761 100644
--- a/admin/setup/phpgw_it.lang
+++ b/admin/setup/phpgw_it.lang
@@ -436,3 +436,4 @@ you must enter an application name.	admin	it	Devi inserire un nome per l'applica
 you must enter an application title.	admin	it	Devi inserire un titolo per l'applicazione
 you must select a file type	admin	it	Devi selezionare un tipo di file
 you will need to remove the subcategories before you can delete this category	admin	it	E' necessario rimuovere le sotto-categorie prima di cancellare questa categoria
+your session could not be verified.	admin	it	La sessione non pu� essere verificata.
diff --git a/admin/setup/phpgw_iw.lang b/admin/setup/phpgw_iw.lang
index a54e571d9c..412222bb43 100755
--- a/admin/setup/phpgw_iw.lang
+++ b/admin/setup/phpgw_iw.lang
@@ -785,3 +785,4 @@ your php installation does not have appropriate gd support. you need gd library
 your tables are current	setup	iw	הטבלאות שלך מעודכנות
 your tables may be altered and you may lose data	setup	iw	יתכן שישתנו הטבלאות שלך ויתכן שתאבד מידע
 your tables will be dropped and you will lose data	setup	iw	!! הטבלאות שלך ייופלו ותאבד מידע
+your session could not be verified.	admin	iw	.לא הצלחתי לשחזר את המושב
diff --git a/admin/setup/phpgw_ja.lang b/admin/setup/phpgw_ja.lang
index da2d7fc9ee..dbdc2083ef 100644
--- a/admin/setup/phpgw_ja.lang
+++ b/admin/setup/phpgw_ja.lang
@@ -203,3 +203,4 @@ enter your default mail domain ( from: user@domain )	admin	ja	
 enter your smtp server hostname or ip address	admin	ja	SMTP ������̾�ޤ��� IP ���ɥ쥹
 enter your smtp server port	admin	ja	SMTP �ݡ����ֹ�
 mail settings	admin	ja	�Żҥ᡼������
+your session could not be verified.	admin	ja	Your session could not be verified.
diff --git a/admin/setup/phpgw_ko.lang b/admin/setup/phpgw_ko.lang
index 1017b188cd..8139fd3b3d 100644
--- a/admin/setup/phpgw_ko.lang
+++ b/admin/setup/phpgw_ko.lang
@@ -378,3 +378,4 @@ you must enter an application name.	admin	ko	
 you must enter an application title.	admin	ko	�������α׷� ������ �Է��ؾ� �մϴ�
 you must select a file type	admin	ko	���� Ÿ���� �����ؾ� �մϴ�.
 you will need to remove the subcategories before you can delete this category	admin	ko	�� ī�װ����� �����ϱ� ���� ����ī�װ����� �����ؾ� �մϴ�!
+your session could not be verified.	admin	ko	������ �������� �ʾҽ��ϴ�
diff --git a/admin/setup/phpgw_lv.lang b/admin/setup/phpgw_lv.lang
index bbc800cd15..62ff95ada9 100644
--- a/admin/setup/phpgw_lv.lang
+++ b/admin/setup/phpgw_lv.lang
@@ -363,3 +363,4 @@ you must enter an application name.	admin	lv	Jums jāievada aplikācijas nosauku
 you must enter an application title.	admin	lv	Jums jāievada aplikācijas virsraksts
 you must select a file type	admin	lv	Jums jāizvēlas faila tips
 you will need to remove the subcategories before you can delete this category	admin	lv	Tev vajadzēs izdzēst apakšgrpu pirms tu varēsi izdzēst šo kategoriju!
+your session could not be verified.	admin	lv	Nevarēju Jūs pārbaudīt. Mēģiniet pēc 30sek. vēlreiz.
diff --git a/admin/setup/phpgw_nl.lang b/admin/setup/phpgw_nl.lang
index 382266a497..1215540af8 100644
--- a/admin/setup/phpgw_nl.lang
+++ b/admin/setup/phpgw_nl.lang
@@ -441,3 +441,4 @@ you must enter an application name.	admin	nl	U moet een toepassingsnaam invoeren
 you must enter an application title.	admin	nl	U moet een toepassingstitel invoeren.
 you must select a file type	admin	nl	U moet een bestandstype invoeren
 you will need to remove the subcategories before you can delete this category	admin	nl	U moet eerst de subcategorie�n verwijderen voordat u deze bovenliggende categorie kunt verwijderen!
+your session could not be verified.	admin	nl	Uw sessie kon niet geverifieerd worden
diff --git a/admin/setup/phpgw_no.lang b/admin/setup/phpgw_no.lang
index 913aa79c73..922dca2d09 100644
--- a/admin/setup/phpgw_no.lang
+++ b/admin/setup/phpgw_no.lang
@@ -399,3 +399,4 @@ you must enter an application name.	admin	no	Du m
 you must enter an application title.	admin	no	Du m� registrere et programtittel
 you must select a file type	admin	no	Du m� velge en filtype
 you will need to remove the subcategories before you can delete this category	admin	no	Du m� f�rst fjerne underkategorier f�r du kan slette denne kategorien!
+your session could not be verified.	admin	no	Din sesjon kunne ikke bekreftes
diff --git a/admin/setup/phpgw_pl.lang b/admin/setup/phpgw_pl.lang
index 5acfc18db0..ecac2765de 100755
--- a/admin/setup/phpgw_pl.lang
+++ b/admin/setup/phpgw_pl.lang
@@ -438,5 +438,6 @@ you must enter an application name and title.	admin	pl	Musisz poda
 you must enter an application name.	admin	pl	Musisz poda� nazw� aplikacji
 you must enter an application title.	admin	pl	Musisz poda� tytu� aplikacji
 you must select a file type	admin	pl	Musisz wybra� typ pliku
-you must select at least one group member	admin	pl	Musisz wybra� przynajmniej jednego cz�onka grupy.
+your session could not be verified.	admin	pl	Nie mo�na zweryfikowa� sesji.
+you must select at least one group member.	admin	pl	Musisz wybra� przynajmniej jednego cz�onka grupy.
 you will need to remove the subcategories before you can delete this category	admin	pl	Nale�y usun�� kategorie podrz�dne przed skasowaniem tej kategorii !
diff --git a/admin/setup/phpgw_pt-br.lang b/admin/setup/phpgw_pt-br.lang
index a694ad2cc2..016efd6bde 100644
--- a/admin/setup/phpgw_pt-br.lang
+++ b/admin/setup/phpgw_pt-br.lang
@@ -440,5 +440,6 @@ you must enter an application name and title.	admin	pt-br	Voc
 you must enter an application name.	admin	pt-br	Voc� deve digitar um nome para a aplica��o.
 you must enter an application title.	admin	pt-br	Voc� deve digitar um t�tulo para a aplica��o.
 you must select a file type	admin	pt-br	Voc� deve selecionar um tipo de arquivo.
-you must select at least one group member	admin	pt-br	Voc� deve selecionar ao menos um membro.
+you must select at least one group member.	admin	pt-br	Voc� deve selecionar ao menos um membro.
 you will need to remove the subcategories before you can delete this category	admin	pt-br	Voc� dever� remover as subcategorias antes de remover esta categoria !
+your session could not be verified.	admin	pt-br	Sua sess�o n�o p�de ser verificada
diff --git a/admin/setup/phpgw_pt.lang b/admin/setup/phpgw_pt.lang
index eb3e7229e9..d4001a3662 100644
--- a/admin/setup/phpgw_pt.lang
+++ b/admin/setup/phpgw_pt.lang
@@ -437,3 +437,4 @@ you must enter an application name.	admin	pt	
 you must enter an application title.	admin	pt	� necess�rio atribuir um t�tulo � aplica��o.
 you must select a file type	admin	pt	� necess�rio seleccionar um tipo de ficheiro
 you will need to remove the subcategories before you can delete this category	admin	pt	� necess�rio remover as subcategorias para poder eliminar esta categoria !
+your session could not be verified.	admin	pt	A sua sess�o expirou
diff --git a/admin/setup/phpgw_ru.lang b/admin/setup/phpgw_ru.lang
index 517520aa8b..06ccdf4888 100644
--- a/admin/setup/phpgw_ru.lang
+++ b/admin/setup/phpgw_ru.lang
@@ -437,3 +437,4 @@ you must enter an application name.	admin	ru	
 you must enter an application title.	admin	ru	�� ������ ������ ��������� ����������.
 you must select a file type	admin	ru	�� ������ ������� ��� �����
 you will need to remove the subcategories before you can delete this category	admin	ru	��� ����� ������� ��� ������������ ������, ��� �� ������� ������� ������ ��������� !
+your session could not be verified.	admin	ru	��� ����� �� ����� ���� �����������
diff --git a/admin/setup/phpgw_sk.lang b/admin/setup/phpgw_sk.lang
index 84a06034c0..33d68efc9f 100644
--- a/admin/setup/phpgw_sk.lang
+++ b/admin/setup/phpgw_sk.lang
@@ -433,5 +433,6 @@ you must enter an application name and title.	admin	sk	Mus
 you must enter an application name.	admin	sk	Mus�te zada� n�zov aplik�cie.
 you must enter an application title.	admin	sk	Mus�te zada� titulok aplik�cie.
 you must select a file type	admin	sk	Mus�te zada� typ s�boru
-you must select at least one group member	admin	sk	Mus�te zada� aspo� jedn�ho �lena skupiny.
+your session could not be verified.	admin	sk	Va�e sedenie nie je platn�.
+you must select at least one group member.	admin	sk	Mus�te zada� aspo� jedn�ho �lena skupiny.
 you will need to remove the subcategories before you can delete this category	admin	sk	Ne� odstr�nite t�to kateg�riu, mus�te odstr�ni� v�etky podkateg�rie !
diff --git a/admin/setup/phpgw_sl.lang b/admin/setup/phpgw_sl.lang
index 9a572fe834..9b2625d2db 100644
--- a/admin/setup/phpgw_sl.lang
+++ b/admin/setup/phpgw_sl.lang
@@ -440,5 +440,6 @@ you must enter an application name and title.	admin	sl	Vnesti morate ime in nazi
 you must enter an application name.	admin	sl	Vnesti morate ime aplikacije.
 you must enter an application title.	admin	sl	Vnesti morate naslov aplikacije.
 you must select a file type	admin	sl	Izbrati morate tip datoteke
-you must select at least one group member	admin	sl	Izbrati morate najmanj enega člana skupine.
+you must select at least one group member.	admin	sl	Izbrati morate najmanj enega člana skupine.
 you will need to remove the subcategories before you can delete this category	admin	sl	Preden lahko izbrišete to kategorijo, morate izbrisati vse podkategorije!
+your session could not be verified.	admin	sl	Vaša seja ne more biti preverjena.
diff --git a/admin/setup/phpgw_sv.lang b/admin/setup/phpgw_sv.lang
index 7fa8331545..0dd99ad230 100644
--- a/admin/setup/phpgw_sv.lang
+++ b/admin/setup/phpgw_sv.lang
@@ -441,3 +441,4 @@ you must enter an application name.	admin	sv	Du m
 you must enter an application title.	admin	sv	Du m�ste ange en titel f�r applikationen
 you must select a file type	admin	sv	Du m�ste v�lja en filtyp
 you will need to remove the subcategories before you can delete this category	admin	sv	Du m�ste ta bort underkategorierna innan du kan ta bort denna kategori
+your session could not be verified.	admin	sv	Din session kunde inte verifieras
diff --git a/admin/setup/phpgw_uk.lang b/admin/setup/phpgw_uk.lang
index a0daac8f92..462c266866 100644
--- a/admin/setup/phpgw_uk.lang
+++ b/admin/setup/phpgw_uk.lang
@@ -357,3 +357,4 @@ you must enter an application name.	admin	uk	Необхідно ввести н
 you must enter an application title.	admin	uk	Необхідно ввести найменування приложення
 you must select a file type	admin	uk	Необхідно визначити тип файлу
 you will need to remove the subcategories before you can delete this category	admin	uk	Необхідно видалити підкатегорії перед тим, як Ви зможете видалити цю категорію !
+your session could not be verified.	admin	uk	Неможливо перевірити Ваш вхід
diff --git a/admin/setup/phpgw_zh-tw.lang b/admin/setup/phpgw_zh-tw.lang
index 89b1c7d5f7..334cee0a04 100644
--- a/admin/setup/phpgw_zh-tw.lang
+++ b/admin/setup/phpgw_zh-tw.lang
@@ -440,5 +440,6 @@ you must enter an application name and title.	admin	zh-tw	您必須輸入應用
 you must enter an application name.	admin	zh-tw	您必須輸入應用程式名稱
 you must enter an application title.	admin	zh-tw	您必須輸入應用程式標題
 you must select a file type	admin	zh-tw	您必須選擇一種檔案型態。
-you must select at least one group member	admin	zh-tw	您必須選擇至少一個群組成員。
+you must select at least one group member.	admin	zh-tw	您必須選擇至少一個群組成員。
 you will need to remove the subcategories before you can delete this category	admin	zh-tw	您必須在刪除這個類別前刪除所有的子類別！
+your session could not be verified.	admin	zh-tw	您的連線不合法。
diff --git a/admin/setup/phpgw_zh.lang b/admin/setup/phpgw_zh.lang
index 6401791329..5131f684f2 100644
--- a/admin/setup/phpgw_zh.lang
+++ b/admin/setup/phpgw_zh.lang
@@ -371,3 +371,4 @@ enter your default mail domain ( from: user@domain )	admin	zh	输入默认邮件
 enter your smtp server hostname or ip address	admin	zh	输入SMTP服务器的主机名或IP地址
 enter your smtp server port	admin	zh	输入SMTP服务器的端口号
 mail settings	admin	zh	邮件配置
+your session could not be verified.	admin	zh	本次会话无法校验.
diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl
index 6e44644110..d43fcfc8ea 100644
--- a/admin/templates/default/config.tpl
+++ b/admin/templates/default/config.tpl
@@ -35,22 +35,7 @@
      </select>
     </td>
    </tr>
-<!--
-   <tr class="row_on">
-    <td>{lang_Would_you_like_eGroupWare_to_cache_the_phpgw_info_array_?}:</td>
-    <td>
-     <select name="newsettings[cache_phpgw_info]">
-      <option value="">{lang_No}</option>
-      <option value="True"{selected_cache_phpgw_info_True}>{lang_Yes}</option>
-     </select>
-    </td>
-   </tr>
 
-   <tr class="row_off">
-    <td>{lang_Maximum_entries_in_click_path_history}:</td>
-    <td><input size="8" name="newsettings[max_history]" value="{value_max_history}"></td>
-   </tr>
--->
    <tr class="row_on">
     <td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
     <td>
@@ -98,17 +83,7 @@
     <td>{lang_Enter_the_title_for_your_site}:</td>
     <td><input name="newsettings[site_title]" value="{value_site_title}"></td>
    </tr>
-<!-- This is not used / working at the moment, RalfBecker 21.03.2004
-   <tr class="row_off">
-    <td>{lang_Enter_the_background_color_for_the_site_title}:</td>
-    <td>#<input name="newsettings[login_bg_color_title]" value="{value_login_bg_color_title}"></td>
-   </tr>
 
-   <tr class="row_on">
-    <td>{lang_Enter_the_background_color_for_the_login_page}:</td>
-    <td>#<input name="newsettings[login_bg_color]" value="{value_login_bg_color}"></td>
-   </tr>
--->
    <tr class="row_off">
     <td>{lang_Enter_the_URL_or_filename_(in_phpgwapi/templates/default/images)_of_your_logo}:</td>
     <td><input name="newsettings[login_logo_file]" value="{value_login_logo_file}"></td>
@@ -125,11 +100,11 @@
    </tr>
 
    <tr class="row_on">
-    <td>{lang_Show_'powered_by'_logo_on}:</td>
+    <td>{lang_Show_an_asterisk_(*)_to_mark_untranslated_strings}:</td>
     <td>
-     <select name="newsettings[showpoweredbyon]">
-      <option value="bottom" {selected_showpoweredbyon_bottom}>{lang_bottom}</option>
-      <option value="top" {selected_showpoweredbyon_top}>{lang_top}</option>
+     <select name="newsettings[markuntranslated]">
+      <option value="">{lang_No}</option>
+      <option value="yes" {selected_markuntranslated_yes}>{lang_Yes}</option>
      </select>
     </td>
    </tr>
@@ -142,18 +117,35 @@
     <td>{lang_Use_cookies_to_pass_sessionid}:</td>
     <td>
      <select name="newsettings[usecookies]">
+      <option value="True"{selected_usecookies_True}>{lang_Yes} - {lang_more_secure}</option>
       <option value="">{lang_No}</option>
-      <option value="True"{selected_usecookies_True}>{lang_Yes}</option>
      </select>
     </td>
    </tr>
 
    <tr class="row_off">
-    <td>{lang_check_ip_address_of_all_sessions}:</td>
+    <td>{lang_Cookie_path_(allows_multiple_eGW_sessions_with_different_directories,_has_problemes_with_SiteMgr!)}:</td>
+    <td>
+     <select name="newsettings[cookiepath]">
+      <option value="">{lang_Document_root_(default)}</option>
+      <option value="egroupware"{selected_cookiepath_egroupware}>{lang_eGroupWare_directory}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_Cookie_domain_(default_empty_means_use_full_domain_name,_for_SiteMgr_eg._".domain.com"_allows_to_use_the_same_cookie_for_egw.domain.com_and_www.domain.com)}:</td>
+    <td>
+     <input name="newsettings[cookiedomain]" value="{value_cookiedomain}" />
+    </td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_check_ip_address_of_all_sessions} ({lang_switch_it_off,_if_users_are_randomly_thrown_out}: "{lang_Your_session_could_not_be_verified.}")</td>
     <td>
      <select name="newsettings[sessions_checkip]">
+      <option value="True"{selected_sessions_checkip_True}>{lang_Yes} - {lang_more_secure}</option>
       <option value="">{lang_No}</option>
-      <option value="True"{selected_sessions_checkip_True}>{lang_Yes}</option>
      </select>
     </td>
    </tr>
@@ -218,7 +210,7 @@
      <input name="newsettings[admin_mails]" value="{value_admin_mails}" size="40">
     </td>
    </tr>
-
+<!-- not used at the moment RalfBecker 2007/05/17
    <tr class="row_on">
     <td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
     <td>
@@ -228,8 +220,8 @@
        </select>
     </td>
    </tr>
-
-   <tr class="row_off">
+-->
+   <tr class="row_on">
     <td>{lang_Enable_the_xmlrpc_service} {lang_(default_No,_leave_it_off_if_you_dont_use_it)}:</td>
     <td>
       <select name="newsettings[xmlrpc_enabled]">
@@ -239,7 +231,7 @@
     </td>
    </tr>
 
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_Enable_the_soap_service} {lang_(default_No,_leave_it_off_if_you_dont_use_it)}:</td>
     <td>
       <select name="newsettings[soap_enabled]">
diff --git a/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php
index 400d8128ee..3d792dba5a 100644
--- a/phpgwapi/inc/class.sessions.inc.php
+++ b/phpgwapi/inc/class.sessions.inc.php
@@ -475,9 +475,16 @@
 		*/
 		function egw_set_cookiedomain()
 		{
-			// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
-			$this->cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ?  $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
-
+			if ($GLOBALS['egw_info']['server']['cookiedomain'])
+			{
+				// Admin set domain, eg. .domain.com to allow egw.domain.com and www.domain.com
+				$this->cookie_domain = $GLOBALS['egw_info']['server']['cookiedomain'];
+			}
+			else
+			{
+				// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
+				$this->cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ?  $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
+			}
 			// remove port from HTTP_HOST
 			if (preg_match("/^(.*):(.*)$/",$this->cookie_domain,$arr))
 			{
@@ -492,6 +499,16 @@
 
 			$url_parts = parse_url($GLOBALS['egw_info']['server']['webserver_url']);
 			if (!($this->cookie_path = $url_parts['path'])) $this->cookie_path = '/';
+			// if the cookiepath should be / and it's not, delete evtl. existing cookies and set '/'
+			if (!$GLOBALS['egw_info']['server']['cookiepath'] && $this->cookie_path != '/')
+			{
+				foreach(array('sessionid','kp3','domain','last_domain','last_loginid') as $name)
+				{
+					setcookie($name,false,0,$this->cookie_path,$this->cookie_domain);
+				}
+				$this->cookie_path = '/';
+			}
+			//echo "<p>cookie_path='$this->cookie_path', cookie_domain='$this->cookie_domain'</p>\n";
 
 			$this->set_cookie_params($this->cookie_domain,$this->cookie_path);	// for php4 sessions necessary
 		}
diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php
index 69436580a8..2aa93e7b34 100644
--- a/phpgwapi/inc/class.translation.inc.php
+++ b/phpgwapi/inc/class.translation.inc.php
@@ -49,7 +49,18 @@
 		var $lang_table = 'egw_lang';
 		var $languages_table = 'egw_languages';
 		var $config_table = 'egw_config';
+		/**
+		 * Instance of the db-class
+		 *
+		 * @var egw_db
+		 */
 		var $db;
+		/**
+		 * Mark untranslated strings with an asterisk (*), values '' or 'yes'
+		 *
+		 * @var string
+		 */
+		var $markunstranslated;
 
 		/**
 		 * Constructor, sets up a copy of the db-object, gets the system-charset and tries to load the mbstring extension
@@ -145,6 +156,8 @@
 				$this->add_app('common');
 			}
 			$this->add_app($GLOBALS['egw_info']['flags']['currentapp']);
+			
+			$this->markunstranslated = $GLOBALS['egw_info']['server']['markuntranslated'];
 		}
 
 		/**
@@ -161,7 +174,8 @@
 			{
 				$this->init();
 			}
-			$ret = $key.$not_found;	// save key if we dont find a translation
+			$ret = $key;				// save key if we dont find a translation
+			if ($not_found && $this->markunstranslated) $ret .= $not_found;
 
 			if (isset($this->lang_arr[$key]))
 			{