diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang index ee781c48ca..1eff286e8f 100644 --- a/setup/lang/phpgw_de.lang +++ b/setup/lang/phpgw_de.lang @@ -220,6 +220,7 @@ no mysql support found. disabling setup de Keine Unterst no oracle-db support found. disabling setup de Keine Unterstützung für Oracle gefunden. Abgeschaltet no postgres-db support found. disabling setup de Keine Unterstützung für Postgres gefunden. Abgeschaltet no xml support found. disabling setup de Keine Unterstützung für XML gefunden. Abgeschaltet +not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off. setup de Nicht alle mcrypt Algorithmen und Modi funktionieren mit eGroupWare. Wenn sie Probleme feststellen, versuchen sie es abzuschalten. not complete setup de nicht komplett not completed setup de Nicht komplett not ready for this stage yet setup de Noch nicht fertig für diesen Schritt @@ -246,7 +247,7 @@ please check for sql scripts within the application's directory setup de Bitte s please check read/write permissions on directories, or back up and use another option. setup de Bitte überprüfen sie die lese/schreib Rechte der Verzeichnisse oder gehen sie zurück und benutzen eine andere Option. please configure phpgroupware for your environment setup de Bitte konfigurieren Sie phpGroupWare für Ihre Umgebung please consult the %1. setup de Bitte konsultieren sie das %1. -please fix the above errors (***) and %1continue to the header admin%2 setup de Bitte beheben sie die obigen Fehler (***) und machen Sie %1weiter mit dem Header Admin%2 +please fix the above errors (%1) and warnings(%2) and %3continue to the header admin%4 setup de Bitte beheben sie die obigen Fehler (%1) und Warnungen (%2) und machen Sie %3weiter mit dem Header Admin%4 please install setup de Bitte installieren please login setup de Bitte einlogen please login to phpgroupware and run the admin application for additional site configuration setup de Bitte in phpGroupWare einloggen und die Administration für weitere Konfigurationen aufrufen. diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang index fa0422183c..cfd41a6d03 100644 --- a/setup/lang/phpgw_en.lang +++ b/setup/lang/phpgw_en.lang @@ -218,6 +218,7 @@ no mysql support found. disabling setup en No MySQL support found. Disabling no oracle-db support found. disabling setup en No Oracle-DB support found. Disabling no postgres-db support found. disabling setup en No Postgres-DB support found. Disabling no xml support found. disabling setup en No XML support found. Disabling +not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off. setup en Not all mcrypt algorithms and modes work with eGroupWare. If you experience problems try switching it off. not complete setup en not complete not completed setup en Not Completed not ready for this stage yet setup en Not ready for this stage yet @@ -244,7 +245,7 @@ please check for sql scripts within the application's directory setup en Please please check read/write permissions on directories, or back up and use another option. setup en Please check read/write permissions on directories, or back up and use another option. please configure phpgroupware for your environment setup en Please configure phpGroupWare for your environment please consult the %1. setup en Please consult the %1. -please fix the above errors (***) and %1continue to the header admin%2 setup en Please fix the above errors (***) and %1continue to the Header Admin%2 +please fix the above errors (%1) and warnings(%2) and %3continue to the header admin%4 setup en Please fix the above errors (%1) and warnings(%2) and %3continue to the Header Admin%4 please install setup en Please install please login setup en Please login please login to phpgroupware and run the admin application for additional site configuration setup en Please login to phpgroupware and run the admin application for additional site configuration diff --git a/setup/manageheader.php b/setup/manageheader.php index 26cc04036f..8f6a13a6fb 100644 --- a/setup/manageheader.php +++ b/setup/manageheader.php @@ -572,6 +572,7 @@ $setup_tpl->set_var('lang_sesstype',lang('Sessions Type')); $setup_tpl->set_var('lang_sesstypedescr',lang('What type of sessions management do you want to use (PHP4 session management may perform better)?')); $setup_tpl->set_var('lang_enablemcrypt',lang('Enable MCrypt')); + $setup_tpl->set_var('lang_mcrypt_warning',lang('Not all mcrypt algorithms and modes work with eGroupWare. If you experience problems try switching it off.')); $setup_tpl->set_var('lang_mcryptversion',lang('MCrypt version')); $setup_tpl->set_var('lang_mcryptversiondescr',lang('Set this to "old" for versions < 2.4, otherwise the exact mcrypt version you use.')); $setup_tpl->set_var('lang_mcryptiv',lang('MCrypt initialization vector')); diff --git a/setup/templates/default/manageheader.tpl b/setup/templates/default/manageheader.tpl index 5e590b8db8..f44bb3f352 100644 --- a/setup/templates/default/manageheader.tpl +++ b/setup/templates/default/manageheader.tpl @@ -40,12 +40,13 @@