removed the warning from the system-charset and added some more explenatory text

This commit is contained in:
Ralf Becker 2004-05-02 12:41:19 +00:00
parent 1e5602a350
commit 612398cd08
3 changed files with 6 additions and 1 deletions

View File

@ -183,6 +183,7 @@ if using ldap, do you want to manage homedirectory and loginshell attributes? se
if you did not receive any errors, your applications have been setup de Wenn Sie keine Fehlermeldungen erhalten, wurden Ihre Anwendungen
if you did not receive any errors, your tables have been setup de Wenn Sie keine Fehlermeldungen erhalten, wurden Ihre Tabellen
if you running this the first time, don't forget to manualy %1 !!! setup de Wenn Sie das zum ersten Mal ausführen, vergessen Sie nicht manuell die %1 !!!
if you use only languages of the same charset (eg. western european ones) you dont need to set a system-charset! setup de Wenn Sie nur Sprachen des gleichen Zeichensatzes (zB. westeuropäische) benützen, brauchen Sie keinen Systemzeichensatz zu setzten!
image type selection order setup de Auswahlreihenfolge der Bilddateitypen
import accounts from ldap to the egroupware accounts table (for a new install using sql accounts) setup de Benutzerkonton von LDAP in die eGroupWare Kontentabelle importieren (für eine neue Installation mit SQL Konten)
import has been completed! setup de Import ist beendet!
@ -334,6 +335,7 @@ server root setup de Server-Root
sessions type setup de Session-Typ
set setup de gesetzt
set this to "old" for versions &lt; 2.4, otherwise the exact mcrypt version you use. setup de Setzen Sie dies auf "old" für Versionen < 2.4, ansonsten auf die exakte MCrypt Version die Sie benutzen.
setting the system-charset to utf-8 (unicode) allows the coexistens of data from languages of different charsets. setup de Den Systemzeichensatz auf UTF-8 (unicode) zu setzten, erlaubt die Koexistenz von Daten in Sprachen mit verschiedenen Zeichensätzen.
settings setup de Einstellungen
setup setup de Einrichtung
setup demo accounts in ldap setup de Demo-Benutzer in LDAP einrichten

View File

@ -179,6 +179,7 @@ if using ldap, do you want to manage homedirectory and loginshell attributes? se
if you did not receive any errors, your applications have been setup en If you did not receive any errors, your applications have been
if you did not receive any errors, your tables have been setup en If you did not receive any errors, your tables have been
if you running this the first time, don't forget to manualy %1 !!! setup en If you running this the first time, don't forget to manualy %1 !!!
if you use only languages of the same charset (eg. western european ones) you dont need to set a system-charset! setup en If you use only languages of the same charset (eg. western european ones) you dont need to set a system-charset!
image type selection order setup en Image type selection order
import accounts from ldap to the egroupware accounts table (for a new install using sql accounts) setup en Import accounts from LDAP to the eGroupWare accounts table (for a new install using SQL accounts)
import has been completed! setup en Import has been completed!
@ -330,6 +331,7 @@ server root setup en Server Root
sessions type setup en Sessions Type
set setup en set
set this to "old" for versions &lt; 2.4, otherwise the exact mcrypt version you use. setup en Set this to "old" for versions &lt; 2.4, otherwise the exact mcrypt version you use.
setting the system-charset to utf-8 (unicode) allows the coexistens of data from languages of different charsets. setup en Setting the system-charset to UTF-8 (unicode) allows the coexistens of data from languages of different charsets.
settings setup en Settings
setup setup en Setup
setup demo accounts in ldap setup en Setup demo accounts in LDAP

View File

@ -156,7 +156,8 @@
$setup_tpl->set_var('lang_cancel',lang('Cancel'));
$setup_tpl->set_var('lang_current',lang('Current system-charset'));
$setup_tpl->set_var('lang_convert_to',lang('Charset to convert to'));
$setup_tpl->set_var('lang_warning','<b>Warning</b>: <font color="red">This feature is still experimental. <b>DO NOT USE IT ON A PRODUCTION SYSTEM.</b></font><br>Hopefully you know what you do ;-)');
$setup_tpl->set_var('lang_warning','<b>'.lang('Setting the system-charset to UTF-8 (unicode) allows the coexistens of data from languages of different charsets.').'</b><br>'.
lang('If you use only languages of the same charset (eg. western european ones) you dont need to set a system-charset!'));
$installed_charsets = $translation->get_installed_charsets();
if ($translation->system_charset || count($installed_charsets) == 1)