Even more language strings renamed

diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php
index 16ef3fd9eb08eabf1c933c45dc2cf3d285c9ee63..dc291b2b15f54439c0c177917863960f3e0e288d 100644 (file)
--- a/inc/language/bonus_de.php
+++ b/inc/language/bonus_de.php
@@ -57,26 +57,26 @@ addMessages(array(
        'ADMIN_CONFIG_LOGIN_TIMEOUT' => "Zeitspanne zwischen zwei Logins",
        'ADMIN_BONUS_TURBO_RANKS' => "Wie viele Mitglieder sollen die monatliche Auszahlung der Aktiv-Vergütung gewinnen können?",
        'ADMIN_BONUS_NO_ACTIVE_RALLYE' => "Niemand nimmt an der Aktiv-Rallye dran teil.",
-       'BONUS_SHOW_TURBO_BONUS' => "Sehen Sie hier nach, wer alles schon bestätigt hat...",
+       'MEMBER_SHOW_TURBO_BONUS_LINK' => "Sehen Sie hier nach, wer alles schon bestätigt hat...",
        'BONUS_SHOW_WRONG_CALL' => "Falscher Aufruf des Scriptes, bitte nur aus dem Bestätigungsframe aufrufen.",
        'BONUS_SHOW_WRONG_TYPE' => "Falscher Typ an das Script &uuml;bergeben! Bitte melden Sie sich <a href=\"mailto:{?WEBMASTER?}\">beim Webmaster</a> .",
        'BONUS_SHOW_NO_DATA' => "Entweder haben Sie f&uuml;r diese Mail keine Aktiv-Verg&uuml;tung erhalten oder der Link ist nicht mehr g&uuml;ltig.",
-       'BONUS_NO_RANKS' => "Es hat noch niemand {?POINTS?} zur Mail <span class=\"data\">%s</span> gewonnen! Sie k&ouml;nnten der erste sein! :-)",
-       'BONUS_LOGIN_TURBO_NOTE' => "Der Login-, Referal-, Klickrate-, Mailbuchungs-  und Best&auml;tigungsbonus wird Ihnen nicht sofort verg&uuml;tet, sondern erst am Ende jeden Monats in Form einer Aktiv-Rallye. Den Mailbuchungsbonus erhalten Sie erst bei Freischaltung Ihrer Mail auf das Bonus-Konto gutgeschrieben.",
-       'BONUS_POINTS_TITLE' => "Sonderbonus-{?POINTS?}",
-       'BONUS_RANK_YOU_ARE_404' => "Sie haben bis jetzt noch keine Aktiv-Verg&uuml;tung erhalten.",
+       'MEMBER_BONUS_NO_RANKS' => "Es hat noch niemand {?POINTS?} zur Mail <span class=\"data\">%s</span> gewonnen! Sie k&ouml;nnten der erste sein! :-)",
+       'MEMBER_BONUS_LOGIN_TURBO_NOTE' => "Der Login-, Referal-, Klickrate-, Mailbuchungs-  und Best&auml;tigungsbonus wird Ihnen nicht sofort verg&uuml;tet, sondern erst am Ende jeden Monats in Form einer Aktiv-Rallye. Den Mailbuchungsbonus erhalten Sie erst bei Freischaltung Ihrer Mail auf das Bonus-Konto gutgeschrieben.",
+       'MEMBER_BONUS_POINTS_TITLE' => "Sonderbonus-{?POINTS?}",
+       'MEMBER_BONUS_RANK_YOU_ARE_404' => "Sie haben bis jetzt noch keine Aktiv-Verg&uuml;tung erhalten.",
        'BONUS_RANK' => "Platz",
-       'BONUS_SHOW_HEADER_LINE' => "Hier sehen Sie eine &Uuml;bersicht, wer alles <strong>{?POINTS?}</strong> f&uuml;r die Mail %s erhalten hat",
-       'BONUS_SHOW_YOU_HAVE_CONFIRMED' => "Sie haben diese Mail am",
-       'BONUS_SHOW_CONFIRMED_BONUS_IS' => "Stelle best&auml;tigt. Ihre Zusatz-Gutschrift f&uuml;r diese Mail",
-       'BONUS_TOTAL' => "Gesamtbonus",
-       'BONUS_RALLYE_NO_ONE_JOINED' => "Niemand nimmt an unserer Aktiv-Rallye dran teil. :-(",
-       'BONUS_RALLYE_NOTE' => "Bitte beachten Sie, dass Ihr Login-Bonus hier nicht mit angezeigt wird. Bei der monatlichen Auswertung wird er Ihnen jedoch gutgeschrieben.",
-       'BONUS_RALLYE_CONDITIONS' => "Wer alles an der Aktiv-Rallye teilnehmen kann",
-       'BONUS_START_CONFIRMING_MAILS' => "Hier sind Ihre unbest&auml;tigten Mails...",
-       'BONUS_MEMBER_HERE_IS_THE_LIST' => "Hier finden Sie die aktuelle Liste mit den m&ouml;glichen Gewinnern.",
-       'BONUS_MONTHLY_ONLINE_BONUS' => "Gewonnen: Monatliche Aktiv-Rallye",
-       'BONUS_TURBO_TOTAL2' => "Aktiv-Bonus",
+       'MEMBER_BONUS_SHOW_TITLE' => "Hier sehen Sie eine &Uuml;bersicht, wer alles <strong>{?POINTS?}</strong> f&uuml;r die Mail %s erhalten hat",
+       'MEMBER_BONUS_SHOW_YOU_HAVE_CONFIRMED' => "Sie haben diese Mail am",
+       'MEMBER_BONUS_SHOW_CONFIRMED_BONUS_IS' => "Stelle best&auml;tigt. Ihre Zusatz-Gutschrift f&uuml;r diese Mail",
+       'MEMBER_BONUS_TOTAL' => "Gesamtbonus",
+       'MEMBER_BONUS_RALLYE_NO_ONE_JOINED' => "Niemand nimmt an unserer Aktiv-Rallye dran teil. :-(",
+       'MEMBER_BONUS_RALLYE_NOTE' => "Bitte beachten Sie, dass Ihr Login-Bonus hier nicht mit angezeigt wird. Bei der monatlichen Auswertung wird er Ihnen jedoch gutgeschrieben.",
+       'MEMBER_BONUS_RALLYE_CONDITIONS' => "Wer alles an der Aktiv-Rallye teilnehmen kann",
+       'MEMBER_BONUS_START_CONFIRMING_MAILS' => "Hier sind Ihre unbest&auml;tigten Mails...",
+       'MEMBER_BONUS_HERE_IS_THE_LIST' => "Hier finden Sie die aktuelle Liste mit den m&ouml;glichen Gewinnern.",
+       'MEMBER_MONTHLY_BONUS_WON_SUBJECT' => "Gewonnen: Monatliche Aktiv-Rallye",
+       'ADMIN_BONUS_TURBO_TOTAL' => "Aktiv-Bonus",
        'ADMIN_BONUS_WITHDRAW_NOW' => "Jetzt Aktiv-Bonus verg&uuml;ten",
        'ADMIN_BONUS_WITHDRAW_NOTE' => "Es wird nur die Verg&uuml;tung vorbereitet. Die eigentliche Verg&uuml;tung erfolgt beim T&auml;glichen Reset um 00:00 Uhr.",
        'ADMIN_BONUS_WITHDRAW_PREPARED' => "Verg&uuml;tung des Aktiv-Bonuses vorbereitet.",
@@ -97,17 +97,17 @@ addMessages(array(
        'ADMIN_BONUS_TURBO_BONUS_TITLE' => "Bonus-{?POINTS?} f&uuml;r best&auml;tigte Mails",
        'ADMIN_BONUS_TURBO_TIMEOUT_TITLE' => "Zeitabst&auml;nde und Aufbewahrungszeiten",
        'ADMIN_BONUS_TURBO_MISC_TITLE' => "Sonstige Einstellungen zur Bonus-Erweiterung",
-       'BONUS_REFERAL_TOTAL' => "Referal-Bonus",
-       'BONUS_ORDER_TOTAL' => "Mailbestellungsbonus",
-       'BONUS_STATS_TOTAL' => "100%-Klickratebonus",
-       'BONUS_POINTS_DISABLED' => "Aktiv-Rallye derzeit nicht aktiv.",
-       'BONUS_MEMBER_STATS_SUBJECT' => "Ihr Aktiv-Bonus wegen 100% Klickrate",
-       'BONUS_LOGIN_BONUS_ADDED' => "Login-Bonus mit <strong>{%config,translateComma=login_bonus%} {?POINTS?}</strong> verg&uuml;tet.",
-       'BONUS_LOGIN_BONUS_NOT_ADDED' => "Login-Bonus nicht verg&uuml;tet.",
-       'LIST_UNCONFIRMED_BONUS_LINKS' => "Unbest. Bonus-Mail",
+       'MEMBER_BONUS_REFERAL_TOTAL' => "Referal-Bonus",
+       'MEMBER_BONUS_ORDER_TOTAL' => "Mailbestellungsbonus",
+       'MEMBER_BONUS_STATS_TOTAL' => "100%-Klickratebonus",
+       'MEMBER_BONUS_RALLYE_DISABLED' => "Aktiv-Rallye derzeit nicht aktiv.",
+       'MEMBER_BONUS_STATS_SUBJECT' => "Ihr Aktiv-Bonus wegen 100% Klickrate",
+       'MEMBER_BONUS_LOGIN_BONUS_ADDED' => "Login-Bonus mit <strong>{%config,translateComma=login_bonus%} {?POINTS?}</strong> verg&uuml;tet.",
+       'MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED' => "Login-Bonus nicht verg&uuml;tet.",
+       'ADMIN_LIST_UNCONFIRMED_BONUS_LINKS' => "Unbest. Bonus-Mail",
        'ADMIN_BONUS_MAIL_ALREADY_DELETED' => "Bonus-Mail bereits gel&ouml;scht.",
        'ADMIN_ACTIVATE_BONUS_SETTINGS' => "Einstellungen an der Aktiv-Rallye",
-       'BONUS_MEMBER_TOTAL' => "Gesamtbonus aller teilnehmenden Mitglieder",
+       'ADMIN_TOTAL_MEMBER_BONUS' => "Gesamtbonus aller teilnehmenden Mitglieder",
        'ADMIN_BONUS_RALLYE_DEACTIVATED' => "Aktiv-Rallye deaktiviert.",
        'ADMIN_BONUS_RALLYE_NOTIFTICATIONS' => "Benachrichtigungen per Mail &uuml;ber Bonus-Rallye",
        'ADMIN_BONUS_RALLYE_ENABLE_NOTIFY' => "Sollen die Mitglieder bei Aktivierung benachtichtigt werden?",
@@ -134,8 +134,8 @@ addMessages(array(
        'MEMBER_MAIL_BONUS_DETAILS_TITLE' => "Details zur Bonusmail <span class=\"data\">%s</span>:",
 
 // Subject lines
-       'BONUS_RALLYE_DISABLE_NOTIFY' => "HINWEIS: Aktiv-Rallye gestoppt.",
-       'BONUS_RALLYE_ENABLE_NOTIFY' => "HINWEIS: Aktiv-Rallye ist am Laufen.",
+       'MEMBER_BONUS_RALLYE_DISABLE_SUBJECT' => "HINWEIS: Aktiv-Rallye gestoppt.",
+       'MEMBER_BONUS_RALLYE_ENABLE_SUBJECT' => "HINWEIS: Aktiv-Rallye ist am Laufen.",
 ));
 
 // [EOF]

diff --git a/inc/language/country_de.php b/inc/language/country_de.php
index e8c44ff6a92fa5306e6410197bfb78035766213b..c126466ed9bd0266d1f7fa77965af0bb67157ed7 100644 (file)
--- a/inc/language/country_de.php
+++ b/inc/language/country_de.php
@@ -44,13 +44,13 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'ADMIN_ADD_COUNTRY_CODE' => "Ländercode hinzufügen",
+       'ADMIN_ADD_COUNTRY_CODE_TITLE' => "Ländercode hinzufügen",
        'ADMIN_ENTER_COUNTRY_CODE' => "Zweistelligen Lädercode eingeben (z.B. PL)",
        'ADMIN_ENTER_COUNTRY_NAME' => "Ländernamen eingeben (z.B. Polen)",
        'ADMIN_COUNTRY_CODE_ACTIVE' => "Soll der Ländercode angezeigt werden?",
-       'ADD_COUNTRY' => "Land hinzufügen",
+       'ADMIN_ADD_COUNTRY' => "Land hinzufügen",
        'ADMIN_COUNTRY_NO_CODES_SETUP' => "Noch keine Ländercodes eingerichtet.",
-       'ADMIN_LIST_COUNTRIES' => "Ländercodes auflisten",
+       'ADMIN_LIST_COUNTRIES_TITLE' => "Ländercodes auflisten",
        'ADMIN_COUNTRY_CODE' => "Code",
        'ADMIN_COUNTRY_NAME' => "Name",
        'ADMIN_COUNTRY_STATUS' => "Anzeigen?",
@@ -63,7 +63,7 @@ addMessages(array(
        'ADMIN_COUNTRIES_MODIFIED' => "Ländercode(s) geändert.",
        'ADMIN_COUNTRIES_REMOVED' => "Ländercode(s) gelöscht.",
        'ADMIN_COUNTRY_ACTIVATION_NEXT_LINK' => "Weiter zur Länderauflistung...",
-       'COUNTRY_404' => "Land nicht gefunden.",
+       'COUNTRY_CODE_404' => "Land nicht gefunden.",
 ));
 
 // [EOF]

diff --git a/inc/language/de.php b/inc/language/de.php
index 1b3fbe6d26112ecca2015e3d56342026f19c1ee5..7d6ba87703beee66801a4c9fd43a5c62f9318432 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -492,7 +492,7 @@ addMessages(array(
        'ADMIN_ALL_ACCOUNTS' => "Alle Mitglieder-Accounts auflisten",
        'ADMIN_NO_NONE_REGISTERED' => "Ihre Suchkriterieren ergaben keine Treffer in der Mitgliederliste. ",
        'ADMIN_MEMBER_404' => "Mitglieds-Account <span class=\"data\">%s</span> existiert nicht.",
-       'ADMIN_LAST_ONLINE' => "Zuletzt aktiv",
+       'LAST_ONLINE_SHORT' => "Zuletzt Online",
        'ADMIN_LAST_MODULE' => "Letzte Aktion",
        'RECEIVE_MAILS' => "Kann Mails empfangen",
        'REFERAL_CLICKS' => "Klicks auf Ref-Link",
@@ -797,7 +797,6 @@ addMessages(array(
        'ADMIN_CONFIG_POINTS_MAILS' => "Anzahl zu best. Mails ber&uuml;cksichtigen.",
        'MEMBER_MORE_POINTS_NEEDED' => "Sie haben nicht ausreichend {?POINTS?} &uuml;brig, um die Buchung durchzuf&uuml;hren! Bitte stellen Sie weniger Empf&auml;nger oder eine kleinere Mailart ein.",
        'CANNOT_SEND_ADMIN_MAILS' => "Fehler bei Mailversand an Admin.",
-       'MAILID_CLICK_BUTTON' => "Einmal den Button anklicken",
        'ADMIN_ADD_POINTS_TO_ALL' => "Allen Mitgliedern {?POINTS?} gutschreiben",
        'ADMIN_ALL_POINTS_ADDED' => "Allen Mitgliedern wurden die {?POINTS?} gutgeschrieben.",
        'EMAILS_PAGENAV' => "Seite",

diff --git a/inc/language/install_de.php b/inc/language/install_de.php
index 5eef531fcd78dd94dac1bcaaaa41f7ff698bef23..19676e5966158724d75cb1741170284d26971c82 100644 (file)
--- a/inc/language/install_de.php
+++ b/inc/language/install_de.php
@@ -45,8 +45,8 @@ if (!defined('__SECURITY')) {
 // Language definitions
 addMessages(array(
        'ALREADY_INSTALLED' => "{?TITLE?} ist bereits auf diesem Server installiert worden Bitte löschen Sie install.php, inc/install-inc.php und das Verzeichnis install/ von Ihrem Server! (Keine Sorge, Sie können es tun...)",
-       'INSTALLATION_OF_MAILER' => "Installation von {?mt_word?}-Projekt-Script",
-       'SETUP_OF_MAILER' => "Installation von {?mt_word?}-Projekt-Script - {?MAIN_TITLE?}",
+       'INSTALLER_OF_MAILER' => "Installation von {?mt_word?}-Projekt-Script",
+       'INSTALLER_OF_MAILER_NO_ADMIN' => "Installation von {?mt_word?}-Projekt-Script - {?MAIN_TITLE?}",
        'INSTALLER_MISSING_DUMPS' => "Die SQL-Dumps wurden nicht gefunden! Diese sollten auch mit hochgeladen werden und lesbar sein (CHMOD 644).",
        'INSTALLER_ENABLE_BACKLINK' => "Backlink (=R&uuml;ckverlinkung zu mxchange.org setzen?) <em>rel=&quot;external&quot;</em> ist gesetzt. Bitte nicht den Backlink einbauen, und <strong>nofollow</strong> verwenden! Das schadet allen.",
        'INSTALLER_WRONG_PAGE' => "Sie oder dieses Script haben eine falsche Seite ausgew&auml;hlt.",

diff --git a/inc/language/mailid_de.php b/inc/language/mailid_de.php
index 26202122c603fb370f076a48588da2916e52b4aa..ec54cec70ac1543b3093537fb551deea9de0cfe9 100644 (file)
--- a/inc/language/mailid_de.php
+++ b/inc/language/mailid_de.php
@@ -46,13 +46,14 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'MAIL_DATA_INVALID' => "Daten der Mailbuchung sind fehlerhaft.",
        'ERROR_CONFIRMING_MAIL' => "Bitte klicken Sie nur Links aus Ihrem Mitgliedsbereich oder aus den Mails an.",
-       'THANX_POINTS_ADDED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"member_done\">%s</span> {?POINTS?} wurden Ihnen gerade gutgeschrieben.",
-       'THANX_POINTS_LOCKED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"member_done\">%s</span> {?POINTS?} werden Ihnen bald gutgeschrieben.",
-       'POINTS_NOT_ADDED' => "Falscher Best&auml;tigungscode eingegeben! Die <span class=\"member_failed\">%s</span> {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
-       'ENTER_CODE' => "Code eingeben",
+       'MEMBER_THANX_POINTS_ADDED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"member_done\">%s</span> {?POINTS?} wurden Ihnen gerade gutgeschrieben.",
+       'MEMBER_THANX_POINTS_LOCKED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"member_done\">%s</span> {?POINTS?} werden Ihnen bald gutgeschrieben.",
+       'MEMBER_POINTS_NOT_ADDED' => "Falscher Best&auml;tigungscode eingegeben! Die <span class=\"member_failed\">%s</span> {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
+       'MEMBER_ENTER_CODE' => "Code eingeben",
        'MEMBER_TIME_COUNTER' => "Gutschrift der {?POINTS?} erfolgt in <span class=\"data\">%s</span> ...",
-       'SUBMIT_CODE' => "Abschicken",
-       'MAILID_TOTAL_POINTS' => "Ihr Kontostand betr&auml;gt jetzt <span class=\"member_done\">%s {?POINTS?}</span>.",
+       'MEMBER_SUBMIT_CODE' => "Abschicken",
+       'MEMBER_MAILID_TOTAL_POINTS' => "Ihr Kontostand betr&auml;gt jetzt <span class=\"member_done\">%s {?POINTS?}</span>.",
+       'MEMBER_MAILID_CLICK_BUTTON' => "Einmal den Button anklicken",
 ));
 
 // [EOF]

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 88f6d00262012987d1f95aa1104931ebedd1e717..fae8d5f93f7497ba7b524e315922c80cffef51fc 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -197,14 +197,14 @@ LIMIT 1",
 
                if ($self === false) {
                        // If current user was not found set constant
-                       $GLOBALS['ranking_content']['rankings'] = '{--BONUS_RANK_YOU_ARE_404--}';
+                       $GLOBALS['ranking_content']['rankings'] = '{--MEMBER_BONUS_RANK_YOU_ARE_404--}';
                } // END - if
        } else {
                // No entries found!
                // @TODO Move this HTML to a template
                $OUT = '<tr>
   <td colspan="3" align="center" height="30" class="bottom">
-    <div class="guest_failed">' . getMaskedMessage('BONUS_NO_RANKS', $data) . '</div>
+    <div class="guest_failed">' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '</div>
   </td>
 </tr>';
        }
@@ -305,10 +305,10 @@ LIMIT 1',
 
        if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
                // Output message with added points
-               $GLOBALS['message'] .= '<div class="tiny">{--BONUS_LOGIN_BONUS_ADDED--}</div>';
+               $GLOBALS['message'] .= '<div class="tiny">{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}</div>';
        } elseif (isExtensionActive('bonus')) {
                // No login bonus added!
-               $GLOBALS['message'] .= '<div class="member_failed">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>';
+               $GLOBALS['message'] .= '<div class="member_failed">{--MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED--}</div>';
        }
 }
 

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index b02728ab8afc455a703309f6c2166684cfcbc662..747513d63bb5c7999e03d5d5af00762e3f6369c0 100644 (file)
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Generate a human-readable country description with code
 function generateCountryInfo ($id) {
        // Not found is the default
-       $ret = '{--COUNTRY_404--}';
+       $ret = '{--COUNTRY_CODE_404--}';
 
        // Load code and description
        $result = SQL_QUERY_ESC("SELECT `code`, `descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 5f486b5d2a8ff4fa5bfaf552a536a840f1bd9807..2b9ff117c477fa7130f3fc476e62017a78633f18 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -85,7 +85,7 @@ if (!empty($sql)) {
        $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
        // Generate subject line
-       $subject = '{--BONUS_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
+       $subject = '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}';
 
        // Load message body for bonus mails
        $message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index f4cc43fd957374cd535d1d23c0151fa6c2dde71b..4a587650fef264db9ac372ae78d4a9823add474f 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -76,7 +76,7 @@ LIMIT 1",
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
 } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
-       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
+       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
        $sql = sprintf("SELECT

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index ed263737850bcc6cfdc8ed967e072c92a092f531..0210ff69b6937235db61045d930546db0e8bf4d6 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -100,7 +100,7 @@ LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
 
                                // Load email template and email it away
                                $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
-                               sendEmail($content['email'], '{--BONUS_MONTHLY_ONLINE_BONUS--}', $message);
+                               sendEmail($content['email'], '{--MEMBER_MONTHLY_BONUS_WON_SUBJECT--}', $message);
                        } // END - if
                } // END - while
 

diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index 523df6bf0da1311a84118daca1706cf5c8840407..87c197c2daf42757154e4c81d1793600c43ca509 100644 (file)
--- a/inc/reset/reset_100_bonus.php
+++ b/inc/reset/reset_100_bonus.php
@@ -72,7 +72,7 @@ if (SQL_NUMROWS($result_bonus) > 0) {
 
                // Load email template and send email
                $message = loadEmailTemplate('member_stats_bonus', $content, bigintval($content['userid']));
-               sendEmail($content['userid'], '{--BONUS_MEMBER_STATS_SUBJECT--}', $message);
+               sendEmail($content['userid'], '{--MEMBER_BONUS_STATS_SUBJECT--}', $message);
 
                // Update database
                $result_update = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `bonus_stats_active`='Y' WHERE `id`=%s LIMIT 1",

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 3ff65a4540d57640da39e5997ec75acb992546c7..77fb6bf78bc63c109768aa342147cb5d52b8df1c 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -1379,10 +1379,10 @@ function determinePageTitle () {
                $pageTitle = '[-- ' . getMainTitle() . ' - ' . getModuleTitle(getModule()) . ' --]';
        } elseif ((isInstalled()) && (!isAdminRegistered())) {
                // Installed but no admin registered
-               $pageTitle = '{--SETUP_OF_MAILER--}';
+               $pageTitle = '{--INSTALLER_OF_MAILER_NO_ADMIN--}';
        } elseif ((!isInstalled()) || (!isAdminRegistered())) {
                // Installation mode
-               $pageTitle = '{--INSTALLATION_OF_MAILER--}';
+               $pageTitle = '{--INSTALLER_OF_MAILER--}';
        } else {
                // Configuration not found!
                $pageTitle = '{--NO_CONFIG_FOUND_TITLE--}';

diff --git a/templates/de/html/admin/admin_add_country.tpl b/templates/de/html/admin/admin_add_country.tpl
index c6b0c1cd50c4e3402b53bccec2fd0c29e26d1aa3..758d0d7feedae981509b5d6d3ef2abe395a0a0b6 100644 (file)
--- a/templates/de/html/admin/admin_add_country.tpl
+++ b/templates/de/html/admin/admin_add_country.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="430">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_ADD_COUNTRY_CODE--}</strong>
+                       <strong>{--ADMIN_ADD_COUNTRY_CODE_TITLE--}</strong>
                </td>
        </tr>
        <tr>
@@ -30,7 +30,7 @@
        <tr>
                <td class="admin_footer" colspan="2" align="center">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="add" class="admin_submit" value="{--ADD_COUNTRY--}" />
+                       <input type="submit" name="add" class="admin_submit" value="{--ADMIN_ADD_COUNTRY--}" />
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl
index d49b69d4eb7285beb8725b68acfd6fb2517def6b..f047babd7931cf74e367d6d1cd4121834cc6f3b4 100644 (file)
--- a/templates/de/html/admin/admin_list_beg.tpl
+++ b/templates/de/html/admin/admin_list_beg.tpl
@@ -15,7 +15,7 @@
                        <strong>{--BEG_TOTAL--}:</strong>
                </td>
                <td class="header_column bottom" align="center>
-                       <strong>{--ADMIN_LAST_ONLINE--}:</strong>
+                       <strong>{--LAST_ONLINE_SHORT--}:</strong>
                </td>
        </tr>
        $content[rows]

diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl
index 1b66d348f4b586012fe964c87a9ccde9cbff942a..c62d6097b3b5c9caedff763acb62fb37e1660213 100644 (file)
--- a/templates/de/html/admin/admin_list_bonus.tpl
+++ b/templates/de/html/admin/admin_list_bonus.tpl
@@ -12,16 +12,16 @@
                        <strong>{--SURNAME_FAMILY--}:</strong>
                </td>
                <td class="header_column bottom right" align="center">
-                       <strong>{--BONUS_TURBO_TOTAL2--}:</strong>
+                       <strong>{--ADMIN_BONUS_TURBO_TOTAL--}:</strong>
                </td>
                <td class="header_column bottom" align="center">
-                       <strong>{--ADMIN_LAST_ONLINE--}:</strong>
+                       <strong>{--LAST_ONLINE_SHORT--}:</strong>
                </td>
        </tr>
        $content[rows]
        <tr>
                <td colspan="3" class="header_column bottom right" align="right">
-                       <u>{--BONUS_MEMBER_TOTAL--}:</u>&nbsp;
+                       <u>{--ADMIN_TOTAL_MEMBER_BONUS--}:</u>&nbsp;
                </td>
                <td class="header_column bottom right">
                        <u>$content[total] {?POINTS?}</u>

diff --git a/templates/de/html/admin/admin_list_country.tpl b/templates/de/html/admin/admin_list_country.tpl
index 70eee16be4754d5d4efefdf09e77b23886d963e1..87ece152313fdee72e61102d7cb7970f3088ba16 100644 (file)
--- a/templates/de/html/admin/admin_list_country.tpl
+++ b/templates/de/html/admin/admin_list_country.tpl
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="4" align="center" class="admin_title">
-                       <strong>{--ADMIN_LIST_COUNTRIES--}:</strong>
+                       <strong>{--ADMIN_LIST_COUNTRIES_TITLE--}:</strong>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_list_holiday.tpl b/templates/de/html/admin/admin_list_holiday.tpl
index a89f6d066ae6fa3b2bfde53f527d20a0aa8f6707..967f6440488008fcf2d212faef4a2416c4895df8 100644 (file)
--- a/templates/de/html/admin/admin_list_holiday.tpl
+++ b/templates/de/html/admin/admin_list_holiday.tpl
@@ -8,7 +8,7 @@
                <td width="80" class="header_column bottom right" align="center"><strong>{--ADMIN_HOLIDAY_TEND--}:</strong></td>
                <td width="100" class="header_column bottom right" align="center"><strong>{--ADMIN_HOLIDAY_COMMENTS--}:</strong></td>
                <td width="100" class="header_column bottom right" align="center"><strong>{--ACCOUNT_STATUS--}:</strong></td>
-               <td width="160" class="header_column bottom" align="center"><strong>{--ADMIN_LAST_ONLINE--}:</strong></td>
+               <td width="160" class="header_column bottom" align="center"><strong>{--LAST_ONLINE_SHORT--}:</strong></td>
        </tr>
        $content
        <tr>

diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl
index c7d486fe3aa5f3e6fa39cd8e6ff2410421b16b11..88d05decae372a60ff5f270a6d37be4e6926860a 100644 (file)
--- a/templates/de/html/admin/admin_list_sponsor_details.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_details.tpl
@@ -98,7 +98,7 @@
        <td align="center" class="bottom">$content[sponsor_created]</td>
 </tr>
 <tr>
-       <td align="right" class="bottom right">{--ADMIN_LAST_ONLINE--}:</td>
+       <td align="right" class="bottom right">{--LAST_ONLINE_SHORT--}:</td>
        <td align="center" class="bottom">$content[last_online]</td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl
index 2588a4c109a53d409649e25b9cc98eca890f4e14..7b42c5fa80d788d2406d4efbd72502da43d91403 100644 (file)
--- a/templates/de/html/admin/admin_list_sponsor_row.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_row.tpl
@@ -19,7 +19,7 @@
     <strong>{--_STATUS--}</strong>:
   </td>
   <td align="center" class="{%template,ColorSwitch%} bottom right" width="160"><strong>{--SPONSOR_CREATED--}:</strong></td>
-  <td align="center" class="{%template,ColorSwitch%} bottom right" width="160"><strong>{--ADMIN_LAST_ONLINE--}:</strong></td>
+  <td align="center" class="{%template,ColorSwitch%} bottom right" width="160"><strong>{--LAST_ONLINE_SHORT--}:</strong></td>
   <td align="center" class="{%template,ColorSwitch%} bottom" width="160"><strong>{--REMOTE_IP--}:</strong></td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl
index 0bf68c86e3c944a0924399f52e9f0afde73d0120..43b32c969de32fdca886e4a1708122e0d7cbdeef 100644 (file)
--- a/templates/de/html/admin/admin_user_details.tpl
+++ b/templates/de/html/admin/admin_user_details.tpl
@@ -79,7 +79,7 @@
        </tr>
        <tr>
                <td align="center" class="top right">
-                       {--ADMIN_LAST_ONLINE--}:<br />
+                       {--LAST_ONLINE_SHORT--}:<br />
                        <strong>$content[last_online]</strong>
                </td>
                <td align="center" class="top right">

diff --git a/templates/de/html/guest/guest_active_table.tpl b/templates/de/html/guest/guest_active_table.tpl
index 57a6404db95e8797f301b32d1b64df18d9a21e54..d0a7e5b241f34a866d242b8fd21d71b7621a3cf6 100644 (file)
--- a/templates/de/html/guest/guest_active_table.tpl
+++ b/templates/de/html/guest/guest_active_table.tpl
@@ -13,7 +13,7 @@
                        <strong>{--TOTAL_POINTS--}:</strong>
                </td>
                <td class="header_column bottom">
-                       <strong>{--ADMIN_LAST_ONLINE--}:</strong>
+                       <strong>{--LAST_ONLINE_SHORT--}:</strong>
                </td>
        </tr>
        $content

diff --git a/templates/de/html/guest/guest_top10.tpl b/templates/de/html/guest/guest_top10.tpl
index c31c7a342359c5676b32f8e561de8c027e0e95fb..547b647b609f6f237a5e03f056bcee55bc688e7a 100644 (file)
--- a/templates/de/html/guest/guest_top10.tpl
+++ b/templates/de/html/guest/guest_top10.tpl
@@ -20,7 +20,7 @@
                        <strong>{--TOTAL_POINTS--}:</strong>
                </td>
                <td class="header_column bottom">
-                       <strong>{--ADMIN_LAST_ONLINE--}:</strong>
+                       <strong>{--LAST_ONLINE_SHORT--}:</strong>
                </td>
        </tr>
        $content[logins_out]
@@ -53,7 +53,7 @@
                        <strong>{--TOTAL_POINTS--}:</strong>
                </td>
                <td class="header_column bottom">
-                       <strong>{--ADMIN_LAST_ONLINE--}:</strong>
+                       <strong>{--LAST_ONLINE_SHORT--}:</strong>
                </td>
        </tr>
        $content[points_out]
@@ -89,7 +89,7 @@
                        <strong>{--TOTAL_POINTS--}:</strong>
                </td>
                <td class="header_column bottom">
-                       <strong>{--ADMIN_LAST_ONLINE--}:</strong>
+                       <strong>{--LAST_ONLINE_SHORT--}:</strong>
                </td>
        </tr>
        $content[referals_out]

diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl
index 829e830688809cba94c084be0d4edc622f5838bc..931d72d4d18606a9f1d8ba7018dad46a2d2fdc51 100644 (file)
--- a/templates/de/html/mailid/mailid_confirm_buttom.tpl
+++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl
@@ -1,10 +1,11 @@
+<div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
                        <form accept-charset="utf-8" action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;mode=add&amp;code=$content[code]%}" method="post">
-                               {--MAILID_CLICK_BUTTON--}:<br />
+                               {--MEMBER_MAILID_CLICK_BUTTON--}:<br />
                                <input type="hidden" name="gfx_check" value="$content[gfx]" />
-                               <input type="submit" class="member_submit" name="ok" value="{--SUBMIT_CODE--}" />
+                               <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SUBMIT_CODE--}" />
                        </form>
                </td>
                <td align="center">
@@ -16,3 +17,4 @@
                </td>
        </tr>
 </table>
+</div>

diff --git a/templates/de/html/mailid/mailid_enter_code.tpl b/templates/de/html/mailid/mailid_enter_code.tpl
index d0df8ab82f3903f1b42797685874ca6fd363d513..5c23ccbc8d89c89410dd1a31358dddc1b18243ac 100644 (file)
--- a/templates/de/html/mailid/mailid_enter_code.tpl
+++ b/templates/de/html/mailid/mailid_enter_code.tpl
@@ -1,3 +1,4 @@
+<div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
@@ -5,10 +6,10 @@
                                accept-charset="utf-8"
                                action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;mode=add&amp;code=$content[code]%}"
                                method="post">
-                                       {--ENTER_CODE--}:
+                                       {--MEMBER_ENTER_CODE--}:
                                        $content[image]<br />
                                        <input type="text" name="gfx_check" class="member_normal" size="5" maxlength="45" />
-                                       <input type="submit" class="member_submit" name="ok" value="{--SUBMIT_CODE--}" />
+                                       <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SUBMIT_CODE--}" />
                        </form>
                </td>
                <td align="center">
@@ -20,3 +21,4 @@
                </td>
        </tr>
 </table>
+</div>

diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl
index 98bb7c3bfe2438810120fa56f36f1be334bfe2f2..b2e2d1be1d737028b1d9b4af42e780b952610b95 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done.tpl
+++ b/templates/de/html/mailid/mailid_points_done.tpl
@@ -2,8 +2,8 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
-                       {%message,THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}<br />
-                       {%message,MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}
+                       {%message,MEMBER_THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}<br />
+                       {%message,MEMBER_MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}
                </td>
                <td align="center">
                        <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl
index 05ce6f42a25caca37d0b7052ad3d1820792f9ea8..adc734da7b01ba785fc610f902c713903560e132 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done2.tpl
+++ b/templates/de/html/mailid/mailid_points_done2.tpl
@@ -3,10 +3,10 @@
        <tr>
                <td width="220" align="center">
                        <div class="tiny">
-                       {%message,THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}<br />
-                       {%message,MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}<br />
+                       {%message,MEMBER_THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}<br />
+                       {%message,MEMBER_MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}<br />
                        <br />
-                       <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
+                       <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--MEMBER_SHOW_TURBO_BONUS_LINK--}
                        </div>
                </td>
                <td align="center">

diff --git a/templates/de/html/mailid/mailid_points_locked.tpl b/templates/de/html/mailid/mailid_points_locked.tpl
index 856f69dc408d96eed842b8555d2f7a06ea289854..519448a7f0eef212c7dfb882a4d3ae076a716318 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked.tpl
+++ b/templates/de/html/mailid/mailid_points_locked.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
-                       {%message,THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%}
+                       {%message,MEMBER_THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%}
                </td>
                <td align="center">
                        <div class="member_banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_locked2.tpl b/templates/de/html/mailid/mailid_points_locked2.tpl
index ecddad00b58907ef5b57bd25a276e4e978173800..ed1fd8ef5ddc539f61a582104eb981b53ff93f6c 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked2.tpl
+++ b/templates/de/html/mailid/mailid_points_locked2.tpl
@@ -3,9 +3,9 @@
        <tr>
                <td width="220" align="center">
                        <div class="tiny">
-                               {%message,THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%}<br />
+                               {%message,MEMBER_THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%}<br />
                                <br />
-                               <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
+                               <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--MEMBER_SHOW_TURBO_BONUS_LINK--}
                        </div>
                </td>
                <td align="center">

diff --git a/templates/de/html/member/member_bonus.tpl b/templates/de/html/member/member_bonus.tpl
index bf4bb081d2eb06d14ecc58efe081020ed9d3365a..b31149f752c547a9b8eed4b384fabc2cc10981eb 100644 (file)
--- a/templates/de/html/member/member_bonus.tpl
+++ b/templates/de/html/member/member_bonus.tpl
@@ -1,7 +1,7 @@
 <div align="center">
 
 <div class="para">
-<strong>{--BONUS_MEMBER_HERE_IS_THE_LIST--}</strong>
+<strong>{--MEMBER_BONUS_HERE_IS_THE_LIST--}</strong>
 </div>
 
 <div class="para">
@@ -11,13 +11,13 @@
                <td width="120" align="center" class="header_column bottom"><strong>{--_UID--}:</strong></td>
 
                <td width="100" align="center" class="header_column bottom"><strong>{?POINTS?}:</strong></td>
-               <td width="220" align="center" class="header_column bottom"><strong>{--ADMIN_LAST_ONLINE--}:</strong></td>
+               <td width="220" align="center" class="header_column bottom"><strong>{--LAST_ONLINE_SHORT--}:</strong></td>
        </tr>
        $content[rows]
        <tr>
                <td colspan="4" class="member_footer" align="center"
                        style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-               <div class="tiny member_note">{--BONUS_RALLYE_NOTE--}</div></td>
+               <div class="tiny member_note">{--MEMBER_BONUS_RALLYE_NOTE--}</div></td>
        </tr>
 </table>
 </div>
@@ -27,7 +27,7 @@
        <tr>
                <td class="header_column bottom"
                        style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px"
-                       align="center"><strong>{--BONUS_RALLYE_CONDITIONS--}:</strong>
+                       align="center"><strong>{--MEMBER_BONUS_RALLYE_CONDITIONS--}:</strong>
                </td>
        </tr>
        <tr>
@@ -44,7 +44,7 @@
        <tr>
                <td colspan="4" class="member_footer" align="center"
                        style="padding-left: 5px; padding-right: 5px; padding-top: 5px; padding-bottom: 5px">
-               <a href="{%url=modules.php?module=login&amp;what=unconfirmed%}">{--BONUS_START_CONFIRMING_MAILS--}</a>
+               <a href="{%url=modules.php?module=login&amp;what=unconfirmed%}">{--MEMBER_BONUS_START_CONFIRMING_MAILS--}</a>
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/member/member_bonus_404.tpl b/templates/de/html/member/member_bonus_404.tpl
index 4bac22466e8305d748c9ae4e8b4adda240ee9f7e..487abb2a789bca0b971da3f41cf8933a6a31d2fe 100644 (file)
--- a/templates/de/html/member/member_bonus_404.tpl
+++ b/templates/de/html/member/member_bonus_404.tpl
@@ -1,4 +1,5 @@
 <tr>
        <td colspan="4" align="center" class="member_data bottom" height="40">
-       {--BONUS_RALLYE_NO_ONE_JOINED--}</td>
+               {--MEMBER_BONUS_RALLYE_NO_ONE_JOINED--}
+       </td>
 </tr>

diff --git a/templates/de/html/member/member_list_beg.tpl b/templates/de/html/member/member_list_beg.tpl
index f9797bd2e8961b50baf4ab4907d1616371048241..fe30668aae1e27445ede1aab52f5f65241e54613 100644 (file)
--- a/templates/de/html/member/member_list_beg.tpl
+++ b/templates/de/html/member/member_list_beg.tpl
@@ -5,7 +5,7 @@
                <td width="80" align="center" class="header_column bottom"><strong>{--BEG_RANK--}:</strong></td>
                <td width="120" align="center" class="header_column bottom"><strong>{--_UID--}:</strong></td>
                <td width="100" align="center" class="header_column bottom"><strong>{--BEG_POINTS--}:</strong></td>
-               <td width="220" align="center" class="header_column bottom"><strong>{--ADMIN_LAST_ONLINE--}:</strong></td>
+               <td width="220" align="center" class="header_column bottom"><strong>{--LAST_ONLINE_SHORT--}:</strong></td>
        </tr>
        $content[rows]
        <tr>

diff --git a/templates/de/html/member/member_points_bonus_disabled.tpl b/templates/de/html/member/member_points_bonus_disabled.tpl
index 5e85cd6226ea844e2b7375eb55c5400b86c317ae..d23aa2f5ceba66ea8e4570e297b130f33206e092 100644 (file)
--- a/templates/de/html/member/member_points_bonus_disabled.tpl
+++ b/templates/de/html/member/member_points_bonus_disabled.tpl
@@ -1,5 +1,5 @@
 <tr>
        <td colspan="3" align="center" class="header_column">
-               <strong>{--BONUS_POINTS_DISABLED--}</strong>
+               <strong>{--MEMBER_BONUS_RALLYE_DISABLED--}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl
index 49ca71485583cbb8a30c3cbdf87566037a17eb46..35ed22891b29a7a3d6dcdd8ab105b8fc511f0b12 100644 (file)
--- a/templates/de/html/member/member_points_bonus_rows.tpl
+++ b/templates/de/html/member/member_points_bonus_rows.tpl
@@ -1,40 +1,40 @@
 <tr>
        <td colspan="5" align="center" class="header_column bottom top">
-               <strong>{--BONUS_POINTS_TITLE--}</strong>
+               <strong>{--MEMBER_BONUS_POINTS_TITLE--}</strong>
        </td>
 </tr>
 <tr>
        <td colspan="5" class="member_data bottom">
-               <div align="center" class="member_note">{--BONUS_LOGIN_TURBO_NOTE--}</div>
+               <div align="center" class="member_note">{--MEMBER_BONUS_LOGIN_TURBO_NOTE--}</div>
        </td>
 </tr>
 <tr>
-       <td class="member_data">{--BONUS_LOGIN_TOTAL--}</td>
+       <td class="member_data">{--MEMBER_BONUS_LOGIN_TOTAL--}</td>
        <td class="member_data">{%user,login_bonus,translateComma%} {?POINTS?}</td>
        <td class="member_data">-</td>
 </tr>
 <tr>
-       <td class="member_data">{--BONUS_TURBO_TOTAL--}</td>
+       <td class="member_data">{--MEMBER_BONUS_TURBO_TOTAL--}</td>
        <td class="member_data">{%user,turbo_bonus,translateComma%} {?POINTS?}</td>
        <td class="member_data">-</td>
 </tr>
 <tr>
-       <td class="member_data">{--BONUS_REFERAL_TOTAL--}</td>
+       <td class="member_data">{--MEMBER_BONUS_REFERAL_TOTAL--}</td>
        <td class="member_data">{%user,bonus_ref,translateComma%} {?POINTS?}</td>
        <td class="member_data">-</td>
 </tr>
 <tr>
-       <td class="member_data">{--BONUS_ORDER_TOTAL--}</td>
+       <td class="member_data">{--MEMBER_BONUS_ORDER_TOTAL--}</td>
        <td class="member_data">{%user,bonus_order,translateComma%} {?POINTS?}</td>
        <td class="member_data">-</td>
 </tr>
 <tr>
-       <td class="member_data bottom">{--BONUS_STATS_TOTAL--}</td>
+       <td class="member_data bottom">{--MEMBER_BONUS_STATS_TOTAL--}</td>
        <td class="member_data bottom">{%user,bonus_stats,translateComma%} {?POINTS?}</td>
        <td class="member_data bottom">-</td>
 </tr>
 <tr>
-       <td class="member_data"><strong>{--BONUS_TOTAL--}</strong></td>
+       <td class="member_data"><strong>{--MEMBER_BONUS_TOTAL--}</strong></td>
        <td class="member_data"><strong>{%pipe,translateComma=$content[total]%} {?POINTS?}</strong></td>
        <td class="member_data">-</td>
 </tr>

diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl
index d774f05614d2649ace0b7e8f016e87d06f38c982..2e325ca26095530d46594d2c82ab26b00e6f3892 100644 (file)
--- a/templates/de/html/show_bonus_msg.tpl
+++ b/templates/de/html/show_bonus_msg.tpl
@@ -2,7 +2,7 @@
        {--HELLO--} {%pipe,translateGender=$content[gender]%} $content[surname] $content[family]!
 </div>
 <div>
-       {%message,BONUS_SHOW_HEADER_LINE=$content[mailid]%}:
+       {%message,MEMBER_BONUS_SHOW_TITLE=$content[mailid]%}:
 </div>
 <table border="0" cellspacing="0" cellpadding="0" width="300" class="member_table dashed">
        <tr>

diff --git a/templates/de/html/show_bonus_yr.tpl b/templates/de/html/show_bonus_yr.tpl
index 1ff2789518a03a099f9aa55136958cd523640e12..b067908c823642c1e17465e5b450480175fff077 100644 (file)
--- a/templates/de/html/show_bonus_yr.tpl
+++ b/templates/de/html/show_bonus_yr.tpl
@@ -1,10 +1,10 @@
 <table border="0" cellspacing="0" cellpadding="0" width="300" class="member_table">
 <tr>
        <td align="center">
-               {--BONUS_SHOW_YOU_HAVE_CONFIRMED--}
+               {--MEMBER_BONUS_SHOW_YOU_HAVE_CONFIRMED--}
                <strong class="nobr">$content[timemark]</strong>
                {--_ON--} <strong>$content[level].</strong>
-               {--BONUS_SHOW_CONFIRMED_BONUS_IS--}:
+               {--MEMBER_BONUS_SHOW_CONFIRMED_BONUS_IS--}:
                <strong class="nobr">{%pipe,translateComma=$content[points]%} {?POINTS?}</strong>
        </td>
 </tr>