Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1398) +++ branches/2.8.x/CHANGELOG (revision 1399) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +21 Jan-2011 Build 1399 Dietmar Woellbrink (Luisehahne) +# Ticket 1090 fix wrong translation 20 Jan-2011 Build 1398 Frank Heyne (FrankH) # Security fix in admin/admintools and admin/groups 20 Jan-2011 Build 1397 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1398) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1399) @@ -52,6 +52,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2.RC5'); -if(!defined('REVISION')) define('REVISION', '1398'); +if(!defined('REVISION')) define('REVISION', '1399'); ?> Index: branches/2.8.x/wb/languages/FI.php =================================================================== --- branches/2.8.x/wb/languages/FI.php (revision 1398) +++ branches/2.8.x/wb/languages/FI.php (revision 1399) @@ -346,7 +346,7 @@ $TEXT['UNLIMITED'] = 'Rajaton'; $TEXT['UNZIP_FILE'] = 'Upload and unpack a zip archive'; $TEXT['UP'] = 'Ylös'; -$TEXT['UPGRADE'] = 'Aktualisieren'; +$TEXT['UPGRADE'] = 'Upgrade'; $TEXT['UPLOAD_FILES'] = 'Lataa palvelimelle'; $TEXT['URL'] = 'URL'; $TEXT['USER'] = 'Käyttäjä'; @@ -579,54 +579,54 @@ $MESSAGE['SETTINGS_UNABLE_OPEN_CONFIG'] = 'Konfigurointitiedostoa ei voi vavata'; $MESSAGE['SETTINGS_UNABLE_WRITE_CONFIG'] = 'Konfiguraation kirjoitus ei onnistu'; $MESSAGE['SETTINGS_WORLD_WRITEABLE_WARNING'] = 'Susitellaan ainoastaan testitarkoituksiin'; -$MESSAGE['SIGNUP2_ADMIN_INFO'] = ' -A new user was registered. - -Username: {LOGIN_NAME} -UserId: {LOGIN_ID} -E-Mail: {LOGIN_EMAIL} -IP-Adress: {LOGIN_IP} -Registration date: {SIGNUP_DATE} ----------------------------------------- -This message was automatic generated! - +$MESSAGE['SIGNUP2_ADMIN_INFO'] = ' +A new user was registered. + +Username: {LOGIN_NAME} +UserId: {LOGIN_ID} +E-Mail: {LOGIN_EMAIL} +IP-Adress: {LOGIN_IP} +Registration date: {SIGNUP_DATE} +---------------------------------------- +This message was automatic generated! + '; -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = ' -Hello {LOGIN_DISPLAY_NAME}, - -This mail was sent because the \'forgot password\' function has been applied to your account. - -Your new \'{LOGIN_WEBSITE_TITLE}\' login details are: - -Username: {LOGIN_NAME} -Password: {LOGIN_PASSWORD} - -Your password has been reset to the one above. -This means that your old password will no longer work anymore! -If you\'ve got any questions or problems within the new login-data -you should contact the website-team or the admin of \'{LOGIN_WEBSITE_TITLE}\'. -Please remember to clean you browser-cache before using the new one to avoid unexpected fails. - -Regards ------------------------------------- -This message was automatic generated - +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = ' +Hello {LOGIN_DISPLAY_NAME}, + +This mail was sent because the \'forgot password\' function has been applied to your account. + +Your new \'{LOGIN_WEBSITE_TITLE}\' login details are: + +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you\'ve got any questions or problems within the new login-data +you should contact the website-team or the admin of \'{LOGIN_WEBSITE_TITLE}\'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. + +Regards +------------------------------------ +This message was automatic generated + '; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = ' -Hello {LOGIN_DISPLAY_NAME}, - -Welcome to our \'{LOGIN_WEBSITE_TITLE}\'. - -Your \'{LOGIN_WEBSITE_TITLE}\' login details are: -Username: {LOGIN_NAME} -Password: {LOGIN_PASSWORD} - -Regards - -Please: -if you have received this message by an error, please delete it immediately! -------------------------------------- -This message was automatic generated! +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = ' +Hello {LOGIN_DISPLAY_NAME}, + +Welcome to our \'{LOGIN_WEBSITE_TITLE}\'. + +Your \'{LOGIN_WEBSITE_TITLE}\' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Regards + +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! '; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; $MESSAGE['SIGNUP_NO_EMAIL'] = 'Anna sähköpostiosoite'; Index: branches/2.8.x/wb/languages/EN.php =================================================================== --- branches/2.8.x/wb/languages/EN.php (revision 1398) +++ branches/2.8.x/wb/languages/EN.php (revision 1399) @@ -346,7 +346,7 @@ $TEXT['UNLIMITED'] = 'Unlimited'; $TEXT['UNZIP_FILE'] = 'Upload and unpack a zip archive'; $TEXT['UP'] = 'Up'; -$TEXT['UPGRADE'] = 'Aktualisieren'; +$TEXT['UPGRADE'] = 'Upgrade'; $TEXT['UPLOAD_FILES'] = 'Upload File(s)'; $TEXT['URL'] = 'URL'; $TEXT['USER'] = 'User'; Index: branches/2.8.x/wb/languages/CS.php =================================================================== --- branches/2.8.x/wb/languages/CS.php (revision 1398) +++ branches/2.8.x/wb/languages/CS.php (revision 1399) @@ -346,7 +346,7 @@ $TEXT['UNLIMITED'] = 'Neomezený'; $TEXT['UNZIP_FILE'] = 'Upload and unpack a zip archive'; $TEXT['UP'] = 'Nahoru'; -$TEXT['UPGRADE'] = 'Aktualisieren'; +$TEXT['UPGRADE'] = 'Upgrade'; $TEXT['UPLOAD_FILES'] = 'Nahrát soubor(y)'; $TEXT['URL'] = 'URL'; $TEXT['USER'] = 'Uživatel'; @@ -579,54 +579,54 @@ $MESSAGE['SETTINGS_UNABLE_OPEN_CONFIG'] = 'Nelze otevřít soubor s konfigurací'; $MESSAGE['SETTINGS_UNABLE_WRITE_CONFIG'] = 'Nelze zapisovat do souboru s konfigurací'; $MESSAGE['SETTINGS_WORLD_WRITEABLE_WARNING'] = 'Pozn.: zapnutí této volby se doporučuje jen v testovacím prostředí'; -$MESSAGE['SIGNUP2_ADMIN_INFO'] = ' -A new user was registered. - -Username: {LOGIN_NAME} -UserId: {LOGIN_ID} -E-Mail: {LOGIN_EMAIL} -IP-Adress: {LOGIN_IP} -Registration date: {SIGNUP_DATE} ----------------------------------------- -This message was automatic generated! - +$MESSAGE['SIGNUP2_ADMIN_INFO'] = ' +A new user was registered. + +Username: {LOGIN_NAME} +UserId: {LOGIN_ID} +E-Mail: {LOGIN_EMAIL} +IP-Adress: {LOGIN_IP} +Registration date: {SIGNUP_DATE} +---------------------------------------- +This message was automatic generated! + '; -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = ' -Hello {LOGIN_DISPLAY_NAME}, - -This mail was sent because the \'forgot password\' function has been applied to your account. - -Your new \'{LOGIN_WEBSITE_TITLE}\' login details are: - -Username: {LOGIN_NAME} -Password: {LOGIN_PASSWORD} - -Your password has been reset to the one above. -This means that your old password will no longer work anymore! -If you\'ve got any questions or problems within the new login-data -you should contact the website-team or the admin of \'{LOGIN_WEBSITE_TITLE}\'. -Please remember to clean you browser-cache before using the new one to avoid unexpected fails. - -Regards ------------------------------------- -This message was automatic generated - +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = ' +Hello {LOGIN_DISPLAY_NAME}, + +This mail was sent because the \'forgot password\' function has been applied to your account. + +Your new \'{LOGIN_WEBSITE_TITLE}\' login details are: + +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you\'ve got any questions or problems within the new login-data +you should contact the website-team or the admin of \'{LOGIN_WEBSITE_TITLE}\'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. + +Regards +------------------------------------ +This message was automatic generated + '; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = ' -Hello {LOGIN_DISPLAY_NAME}, - -Welcome to our \'{LOGIN_WEBSITE_TITLE}\'. - -Your \'{LOGIN_WEBSITE_TITLE}\' login details are: -Username: {LOGIN_NAME} -Password: {LOGIN_PASSWORD} - -Regards - -Please: -if you have received this message by an error, please delete it immediately! -------------------------------------- -This message was automatic generated! +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = ' +Hello {LOGIN_DISPLAY_NAME}, + +Welcome to our \'{LOGIN_WEBSITE_TITLE}\'. + +Your \'{LOGIN_WEBSITE_TITLE}\' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Regards + +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! '; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; $MESSAGE['SIGNUP_NO_EMAIL'] = 'Musíte zadat e-mailovou adresu'; Index: branches/2.8.x/wb/languages/index.php =================================================================== --- branches/2.8.x/wb/languages/index.php (revision 1398) +++ branches/2.8.x/wb/languages/index.php (revision 1399) @@ -1,21 +1,21 @@ -