From 2a95647df632f06a67d1b87ecbfa56b346f0034d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 21 Mar 2004 15:01:28 +0000 Subject: [PATCH] fixed: - logo can be given now as URL or filename (in phpgwapi/templates/default/images) - the logo url dont need a leading http://, if its not present, it will be added automaticaly (you can enter a https url) - commented the not working bg-colors and the pure html complilans out --- admin/setup/phpgw_de.lang | 10 ++++++---- admin/setup/phpgw_en.lang | 6 ++++-- admin/templates/default/config.tpl | 20 +++++--------------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/admin/setup/phpgw_de.lang b/admin/setup/phpgw_de.lang index e16f72a3ff..82d3259465 100644 --- a/admin/setup/phpgw_de.lang +++ b/admin/setup/phpgw_de.lang @@ -139,10 +139,11 @@ enabled - hidden from navbar admin de Verf enter a description for the category admin de Geben Sie eine Beschreibung für diese Kategorie ein enter some random text for app_session
encryption (requires mcrypt) admin de Zufälligen Text für app_session
Verschlüsselung (braucht mcrypt) 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 Title der phpGroupWare installation -enter the file name of your logo admin de Dateiname ihres Logos +enter the background color for the site title admin de Hintergrundfarbe für den Title der Installation enter the full path for temporary files.
examples: /tmp, c:\temp admin de Vollständiger Pfad für temporäre Dateien.
Beispiel: /tmp, C:\TEMP +enter the full path for temporary files.
examples: /tmp, c:temp admin de Vollständiger Pfad für temporäre Dateien.
Beispiel: /tmp, C:\TEMP enter the full path for users and group files.
examples: /files, e:\files admin de Vollständiger Pfad für Benutzer- und Gruppendateien.
Beispiel: /files, E:\Files +enter the full path for users and group files.
examples: /files, e:files admin de Vollständiger Pfad für Benutzer- und Gruppendateien.
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 phpgroupware's url.
example: http://www.domain.com/phpgroupware   or   /phpgroupware
no trailing slash admin de URL zur phpGroupWare Installation.
Beispiel: http://www.domain.com/phpgroupware   or   /phpgroupware
keinen nachfolgenden Slash / 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 nochmals @@ -150,6 +151,7 @@ enter the site password for peer servers admin de Site Passwort f enter the site username for peer servers admin de Site Benutzername für Peer Server enter the title for your site admin de Titel der phpGroupWare Installation enter the title of your logo admin de Titel Ihres Logos +enter the url or filename (in phpgwapi/templates/default/images) of your logo admin de URL oder Dateiname (in phpgwapi/templates/default/images) ihres Logos enter the url where your logo should link to admin de URL mit der das Logo verlinkt werden soll enter your default ftp server admin de Default FTP Server enter your http proxy server admin de HTTP Proxy Server @@ -347,9 +349,9 @@ view sessions admin de Sitzungen anzeigen view this user admin de Diesen Benutzer anzeigen view user account admin de Benutzerkonto anzeigen 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? +would you like egroupware to check for a new version
when admins login ? admin de Soll eGroupWare prüfen ob eine neue Version vorhanden ist,
wenn sich ein Administrator anmeldet ? +would you like egroupware to check for new application versions when admins login ? admin de Soll eGroupWare auf neue Versionen der Anwendungen prüfen, wenn sich ein Administrator anmeldet ? would you like phpgroupware to cache the phpgw info array ? admin de Soll phpGroupWare das phpgw info Array cachen ? -would you like phpgroupware to check for a new version
when admins login ? admin de Soll phpGroupWare prüfen ob eine neue Version vorhanden ist,
wenn sich der Administrator einlogt ? -would you like phpgroupware to check for new application versions when admins login ? admin de Soll phpGroupWare auf neue Programm-Versionen prüfen, wenn sich ein Administrator anmeldet ? would you like to automaticaly load new langfiles (at login-time) ? admin de Sollen neue Sprachdateien automatisch gelanden werden (beim Login) ? would you like to show each application's upgrade status ? admin de Soll der Upgrade-Status aller Anwendungen angezeigt werden ? xml-rpc admin de XML-RPC diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang index eed9ca3618..e9e25219d2 100644 --- a/admin/setup/phpgw_en.lang +++ b/admin/setup/phpgw_en.lang @@ -139,9 +139,10 @@ enter a description for the category admin en enter a description for the catego enter some random text for app_session
encryption (requires mcrypt) admin en Enter some random text for app_session
encryption (requires mcrypt) enter the background color for the login page admin en Enter the background color for the login page enter the background color for the site title admin en Enter the background color for the site title -enter the file name of your logo admin en Enter the file name of your logo enter the full path for temporary files.
examples: /tmp, c:\temp admin en Enter the full path for temporary files.
Examples: /tmp, C:\TEMP +enter the full path for temporary files.
examples: /tmp, c:temp admin en enter the full path for users and group files.
examples: /files, e:\files admin en Enter the full path for users and group files.
Examples: /files, E:\FILES +enter the full path for users and group files.
examples: /files, e:files admin en enter the hostname of the machine on which this server is running admin en Enter the hostname of the machine on which this server is running enter the location of phpgroupware's url.
example: http://www.domain.com/phpgroupware   or   /phpgroupware
no trailing slash admin en Enter the location of phpGroupWare's URL.
Example: http://www.domain.com/phpgroupware   or   /phpgroupware
No trailing slash enter the search string. to show all entries, empty this field and press the submit button again admin en Enter the search string. To show all entries, empty this field and press the SUBMIT button again @@ -149,6 +150,7 @@ enter the site password for peer servers admin en Enter the site password for pe enter the site username for peer servers admin en Enter the site username for peer servers enter the title for your site admin en Enter the title for your site enter the title of your logo admin en Enter the title of your logo +enter the url or filename (in phpgwapi/templates/default/images) of your logo admin en Enter the URL or filename (in phpgwapi/templates/default/images) of your logo enter the url where your logo should link to admin en Enter the url where your logo should link to enter your default ftp server admin en Enter your default FTP server enter your http proxy server admin en Enter your HTTP proxy server @@ -342,9 +344,9 @@ view sessions admin en View sessions view this user admin en view this user view user account admin en View user account 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? -would you like phpgroupware to cache the phpgw info array ? admin en Would you like phpGroupWare to cache the phpgw info array ? would you like egroupware to check for a new version
when admins login ? admin en Would you like eGroupWare to check for a new version
when admins login ? would you like egroupware to check for new application versions when admins login ? admin en Would you like eGroupWare to check for new application versions when admins login ? +would you like phpgroupware to cache the phpgw info array ? admin en Would you like phpGroupWare to cache the phpgw info array ? would you like to automaticaly load new langfiles (at login-time) ? admin en Would you like to automatically load new langfiles (at login-time) ? would you like to show each application's upgrade status ? admin en Would you like to show each application's upgrade status ? xml-rpc admin en XML-RPC diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl index c291093d2c..b4a76785ae 100644 --- a/admin/templates/default/config.tpl +++ b/admin/templates/default/config.tpl @@ -7,7 +7,7 @@ - {lang_Would_you_like_phpGroupWare_to_check_for_a_new_version
when_admins_login_?}: + {lang_Would_you_like_eGroupWare_to_check_for_a_new_version
when_admins_login_?}: - + - {lang_Enter_the_file_name_of_your_logo}: + {lang_Enter_the_URL_or_filename_(in_phpgwapi/templates/default/images)_of_your_logo}: {lang_Enter_the_url_where_your_logo_should_link_to}: - http:// + @@ -105,16 +105,6 @@ - - {lang_Use_pure_HTML_compliant_code_(not_fully_working_yet)}: - - - - -  {lang_security}