Commit 7d6b43d9 authored by Daniel Haag's avatar Daniel Haag
Browse files

Merge remote-tracking branch 'origin/master' into uibk

parents 4c7f5953 14f648b9
......@@ -29082,7 +29082,7 @@ Statistiques des questions et des réponses peuvent non seulement être consult
<seg>user</seg>
</tuv>
<tuv xml:lang="DE">
<seg>Benutzerverwaltung</seg>
<seg>Benutzer</seg>
</tuv>
<tuv xml:lang="FR">
<seg>utilisateur</seg>
......@@ -41375,7 +41375,7 @@ YYYYMMDDhhmmss_tcexam_backup.sql.gz
<seg>With this form you can manage multimedia files.</seg>
</tuv>
<tuv xml:lang="DE">
<seg>Mit diesem Forumlar können Sie Ihre Multimedia-Dateien verwalten.</seg>
<seg>Mit diesem Formular können Sie Ihre Multimedia-Dateien verwalten.</seg>
</tuv>
<tuv xml:lang="FR">
<seg>With this form you can manage multimedia files.</seg>
......@@ -37,7 +37,7 @@ define ('K_TCEXAM_VERSION', '12.1.026');
/**
* 2-letters code for default language.
*/
define ('K_LANGUAGE', 'en');
define ('K_LANGUAGE', 'de');
/**
* If true, display a language selector.
......@@ -48,6 +48,7 @@ define ('K_LANGUAGE_SELECTOR', true);
* Defines a serialized array of available languages.
* Each language is indexed using a 2-letters code (ISO 639).
*/
/*
define ('K_AVAILABLE_LANGUAGES', serialize(array(
'ar' => 'Arabian',
'az' => 'Azerbaijani',
......@@ -75,6 +76,14 @@ define ('K_AVAILABLE_LANGUAGES', serialize(array(
'tr' => 'Turkish',
'vn' => 'Vietnamese'
)));
*/
define ('K_AVAILABLE_LANGUAGES', serialize(array(
'de' => 'Deutsch',
'en' => 'English',
'it' => 'Italiano'
)));
ini_set('zend.ze1_compatibility_mode', false); // disable PHP4 compatibility mode
......@@ -208,7 +217,7 @@ define ('K_REDIRECT_LOGIN_MODE', 4);
/**
* If true enable password reset feature.
*/
define ('K_PASSWORD_RESET', TRUE);
define ('K_PASSWORD_RESET', FALSE);
/**
* URL to be redirected at logout (leave empty for default).
......
......@@ -32,7 +32,7 @@
/**
* If true enable USER REGISTRATION.
*/
define ('K_USRREG_ENABLED', true);
define ('K_USRREG_ENABLED', false);
/**
* If true requires email confirmation.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment