More language strings renamed (better naming convention)

diff --git a/.gitattributes b/.gitattributes
index 4df353b271e3ad708f53711bef4403dffadc01d4..5f9de8ded5a73fac50025a073fbadf78cd0ea1d3 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -267,6 +267,7 @@ inc/language/theme_de.php -text svneol=unset#text/plain
 inc/language/timezone_de.php -text svneol=unset#text/plain
 inc/language/top10_de.php -text svneol=unset#text/plain
 inc/language/transfer_de.php -text svneol=unset#text/plain
+inc/language/update_de.php svneol=native#text/plain
 inc/language/usage_de.php -text svneol=unset#text/plain
 inc/language/user_de.php -text svneol=unset#text/plain
 inc/language/validator_de.php -text svneol=unset#text/plain

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 3290830a29b8610ce598b2dc2c75e2d6fc2a6c3c..02d154db50f4e57aaee3ab0aa6112006d068dbb4 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -49,10 +49,10 @@
 ./inc/functions.php:2251:      // @TODO This is still very static, rewrite it somehow
 ./inc/gen_sql_patches.php:96:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:59:        // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1127:// @TODO Rewrite these two constants
-./inc/language/de.php:1142:// @TODO Rewrite these three constants
+./inc/language/de.php:1119:// @TODO Rewrite these two constants
+./inc/language/de.php:1134:// @TODO Rewrite these three constants
 ./inc/language/de.php:301:     // @TODO Following two are unused?
-./inc/language/de.php:819:// @TODO Are these constants longer used?
+./inc/language/de.php:811:// @TODO Are these constants longer used?
 ./inc/language-functions.php:234:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:46:// @TODO Rewrite all language constants to this function.
 ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *

diff --git a/inc/language/de.php b/inc/language/de.php
index 090e8ec2960d5bd3977d6839b6569d0884cdad2c..151fc874059085e7f295b87517e23dcf36d159c9 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -371,8 +371,9 @@ addMessages(array(
        'VIEWS' => "Views",
        'REFERAL_URL' => "Banner",
        'REFERAL_TITLE' => "Alternativer Text",
-       'REFERAL_CNTR' => "Views",
-       'REFERAL_VIS' => "Aktiv?",
+       'REFERAL_CLICKS_SHORT' => "Klicks",
+       'REFERAL_VIEWS' => "Views",
+       'REFERAL_IS_ACTIVE' => "Aktiv?",
        'POINTS_USED' => "Verbrauchte {?POINTS?}",
        'MEMBER_NO_POINTS' => "Sie haben keine {?POINTS?} mehr zum Versenden übrig.",
        'MEMBER_NO_PAYMENTS' => "Der Admin diesen {?mt_word?} hat noch keine Mailarten definiert.",
@@ -599,14 +600,7 @@ addMessages(array(
        'ADMIN_CHANGE_PAYMENT' => "Mailvergütungen ändern",
        'ADMIN_REMOVE_PAYMENT' => "Mailvergütungen löschen",
        'REFERALS' => "Referals",
-       'POINTS_SUM' => "Gesamtsumme",
-       'ADMIN_NEW_VERSION_AVAILABLE' => "Neue Version verfügbar.",
-       'ADMIN_YOUR_VERSION_IS' => "Installierte Version",
-       'ADMIN_ONLINE_VERSION_IS' => "Verfügbare Version",
-       'ADMIN_UPDATE_CREATE_TIME' => "Update wurde erstellt",
-       'ADMIN_DOWNLOAD_NEW_VERSION' => "Jetzt neue Version herunterladen.",
-       'ADMIN_NO_UPDATES_AVAILABLE' => "Keine neuen Updates verfügbar.",
-       'ADMIN_NEW_PATCHES_AVAILABLE' => "Neue Entwickler-Patches verfügbar.",
+       'MEMBER_TOTAL_POINTS' => "Gesamtsumme",
        'KBYTES' => "KBytes",
        'DEFAULT_SUBJECT_LINE' => "Klick-Mail von {?MAIN_TITLE?}",
        'MEBER_UPDATE_PWD_WRONG' => "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen.",
@@ -623,8 +617,6 @@ addMessages(array(
        'TODAY' => "Heute",
        'MEMBER_PROFILE_LOCKED' => "Sie k&ouml;nnen Ihren Account erst am <span class=\"data\">%s</span> wieder &auml;ndern.",
        'MEMBER_HAS_ZERO_MMAILS' => "Sie haben Ihren Empfang auf <strong>Urlaub</strong> stehen! Bitte stellen Sie unter &quot;Profildaten &auml;ndern&quot; den Empfang h&ouml;her ein.",
-       'REFERAL_CLIX' => "Clicks",
-       'REFERAL_VIEWS' => "Views",
        'REFBANNER_TOTALS' => "Gesamt",
        'DAYS' => "Tage",
        'USER_NOW_ONLINE' => "User Online",

diff --git a/inc/language/mods_de.php b/inc/language/mods_de.php
index 8c689875a6c560770ca90d7a23caa8a8fac6b8b8..df352140835661d4018a8655c3bb1d9b6aa02082 100644 (file)
--- a/inc/language/mods_de.php
+++ b/inc/language/mods_de.php
@@ -50,7 +50,7 @@ addMessages(array(
        'ADMIN_MODS_IS_HIDDEN' => "Verdeckt",
        'ADMIN_MODS_IS_ADMIN' => "Nur Admin",
        'ADMIN_MODS_IS_MEMBER' => "Nur Mitglied",
-       'ADMIN_MODS_CLICKS' => "Klicks",
+       'ADMIN_MODS_CLICKS' => "Modulklicks",
        'ADMIN_MODS_EDIT' => "Module ändern",
        'ADMIN_MODS_EDIT_NOTE' => "Klicken Sie auf den Modulnamen, um Statistiken zu den verknüpften Menüpunkten zu erhalten.",
        'ADMIN_MODS_NOTHING_SELECTED' => "Bitte mindestens ein Modul auswählen.",

diff --git a/inc/language/update_de.php b/inc/language/update_de.php
new file mode 100644 (file)
index 0000000..2912792
--- /dev/null
+++ b/inc/language/update_de.php
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 08/26/2003 *
+ * ===================                          Last change: 12/13/2004 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : de.php                                           *
+ * -------------------------------------------------------------------- *
+ * Short description : German langugage support                         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Deutsche Sprachunterst&uuml;tzung                *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Installation/setup
+addMessages(array(
+       'ADMIN_NEW_VERSION_AVAILABLE' => "Neue Version verf&uuml;gbar.",
+       'ADMIN_YOUR_VERSION_IS' => "Installierte Version",
+       'ADMIN_ONLINE_VERSION_IS' => "Verf&uuml;gbare Version",
+       'ADMIN_UPDATE_CREATE_TIME' => "Update wurde erstellt",
+       'ADMIN_DOWNLOAD_NEW_VERSION' => "Jetzt neue Version herunterladen.",
+       'ADMIN_CANNOT_CHECK_VERSION' => "Konnte Versionsnummer nicht abgleichen! (Fehlende Internet-Verbindung? Server ist down?)",
+));
+
+// [EOF]
+?>

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 733327beeba47653b71eaaceb1b70f322d2a8cdc..7cbfc56f2f3c4ffd60207874d30648218c861980 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -126,7 +126,7 @@ $content['user_links'] = abs($sent - $clicks);
 
 $clr = '0.00000';
 if ($sent > 0) $clr = $clicks / $sent * 100;
-$content['_clr'] = translateComma($clr) . '%';
+$content['_clr'] = $clr;
 
 // Load jackpot
 $jackpot = '0';
@@ -150,7 +150,7 @@ if (empty($points)) $points = '0';
 if (empty($ref))    $ref    = '0';
 if (empty($logins)) $logins = '0';
 
-$content['total_points']    = translateComma($points);
+$content['total_points']    = $points;
 $content['total_refclicks'] = $ref;
 $content['total_logins']    = $logins;
 
@@ -188,7 +188,7 @@ if (isExtensionActive('beg')) {
                'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, ' AND `beg_clicks` > 0')
        );
        $OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data);
-}
+} // END - if
 
 if (isExtensionActive('doubler')) {
        // Add header
@@ -217,7 +217,7 @@ if (isExtensionActive('doubler')) {
                'value' => countSumTotalData('N','doubler','id','completed', false, ' AND `points` > 0')
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
-}
+} // END - if
 
 if (isExtensionActive('holiday')) {
        // Total holiday requests
@@ -240,7 +240,7 @@ WHERE
                'value' => $holiday
        );
        $OUT_USER .= loadTemplate('mediadata_extra_row', true, $data);
-}
+} // END - if
 
 if (isExtensionActive('transfer')) {
        // Statistics for points transfers

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index b9fffa4cf1abaa0c533d631cac26ec90cb9562fd..10d1780feab69f43aeaf6e11b146f190abd1772f 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Don't run on daily reset
 if (isResetModeEnabled()) {

diff --git a/templates/de/html/admin/admin_list_refbanner.tpl b/templates/de/html/admin/admin_list_refbanner.tpl
index 2bd25976cdbcacf8a462973559ddc65eaa49c89b..91743a68f819b7411f6ce0e41e9db8b1c3447b29 100644 (file)
--- a/templates/de/html/admin/admin_list_refbanner.tpl
+++ b/templates/de/html/admin/admin_list_refbanner.tpl
@@ -10,9 +10,9 @@
                <td class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
                <td class="header_column bottom right" align="center"><strong>{--REFERAL_URL--}:</strong></td>
                <td class="header_column bottom right" align="center"><strong>{--REFERAL_TITLE--}:</strong></td>
-               <td class="header_column bottom right" align="center"><strong>{--REFERAL_CNTR--}:</strong></td>
-               <td class="header_column bottom right" align="center"><strong>{--REFERAL_CLIX--}</strong></td>
-               <td class="header_column bottom" align="center"><strong>{--REFERAL_VIS--}:</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--REFERAL_VIEWS--}:</strong></td>
+               <td class="header_column bottom right" align="center"><strong>{--REFERAL_CLICKS_SHORT--}</strong></td>
+               <td class="header_column bottom" align="center"><strong>{--REFERAL_IS_ACTIVE--}:</strong></td>
        </tr>
        $content
        <tr>

diff --git a/templates/de/html/mediadata.tpl b/templates/de/html/mediadata.tpl
index b32f52f9ea88ece74643aea7dc49865495cf04c7..32775fcabfa6218947bec8e9eea7185785c6b5a4 100644 (file)
--- a/templates/de/html/mediadata.tpl
+++ b/templates/de/html/mediadata.tpl
@@ -17,27 +17,27 @@
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_TOTAL--}:</td>
-               <td class="bottom media_right">$content[user_count]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[user_count]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_CONFIRMED--}:</td>
-               <td class="bottom media_right">$content[user_confirmed]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[user_confirmed]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_UNCONFIRMED--}:</td>
-               <td class="bottom media_right">$content[user_unconfirmed]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[user_unconfirmed]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_LOCKED--}:</td>
-               <td class="bottom media_right">$content[user_locked]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[user_locked]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_MAX_MAILS--}:</td>
-               <td class="bottom media_right">$content[user_max_mails]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[user_max_mails]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_REC_PER_DAY--}:</td>
-               <td class="bottom media_right">$content[user_max_rec]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[user_max_rec]%}</td>
        </tr>
        $content[out_user]
        <tr>
@@ -45,38 +45,38 @@
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_STATS--}:</td>
-               <td class="bottom media_right">$content[user_stats]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[user_stats]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_MAX_PER_DAY--}:</td>
-               <td class="bottom media_right">$content[max]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[max]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_MAX_REC--}:</td>
-               <td class="bottom media_right">$content[rec]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[rec]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_SENT_MAILS--}:</td>
-               <td class="bottom media_right">$content[sent]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[sent]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--USERS_LINKS--}:</td>
-               <td class="bottom media_right">$content[user_links]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[user_links]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--CLICK_RATE--}:</td>
-               <td class="bottom media_right">$content[_clr]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[_clr]%}</td>
        </tr>
        <tr>
                <td class="media_header bottom" colspan="2" align="center">{--MEDIA_DATA_POINTS--}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--JACKPOT_POINTS--}:</td>
-               <td class="bottom media_right">$content[jackpot]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[jackpot]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--TOTAL_POINTS--}:</td>
-               <td class="bottom media_right">$content[total_points]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[total_points]%}</td>
        </tr>
        $content[out_points]
        <tr>
@@ -84,26 +84,26 @@
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--TOTAL_REFERAL_BANNER--}:</td>
-               <td class="bottom media_right">$content[ref_total]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[ref_total]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--TOTAL_REFERAL_VIEWS--}:</td>
-               <td class="bottom media_right">$content[ref_views]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[ref_views]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--TOTAL_REFERAL_CLICKS--}:</td>
-               <td class="bottom media_right">$content[ref_clicks]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[ref_clicks]%}</td>
        </tr>
        <tr>
                <td class="media_header bottom" colspan="2" align="center">{--MEDIA_DATA_MISC--}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--TOTAL_REFCLICKS--}:</td>
-               <td class="bottom media_right">$content[total_refclicks]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[total_refclicks]%}</td>
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--TOTAL_LOGINS--}:</td>
-               <td class="bottom media_right">$content[total_logins]</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[total_logins]%}</td>
        </tr>
        $content[out_extra]
        $content[out_special]

diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl
index 83b064d4f199ae03d713520b6e511fe68fcb1dd7..d435034821e9310b9a94b19c7b94da4d5b0b374b 100644 (file)
--- a/templates/de/html/member/member_points.tpl
+++ b/templates/de/html/member/member_points.tpl
@@ -12,7 +12,7 @@
                <td class="member_data bottom">&nbsp;</td>
        </tr>
        <tr>
-               <td class="member_data bottom"><strong>{--POINTS_SUM--}</strong></td>
+               <td class="member_data bottom"><strong>{--MEMBER_TOTAL_POINTS--}</strong></td>
                <td class="member_data bottom">
                        <strong>{%pipe,translateComma=$content[total_points]%} {?POINTS?}</strong>
                </td>

diff --git a/templates/de/html/member/member_reflinks_row.tpl b/templates/de/html/member/member_reflinks_row.tpl
index f01295feb18fd743af3df328061669f868993b34..1b6d0980657f650c0fc3bc54db865b616ba30f0a 100644 (file)
--- a/templates/de/html/member/member_reflinks_row.tpl
+++ b/templates/de/html/member/member_reflinks_row.tpl
@@ -4,8 +4,8 @@
                        <img src="$content[url]" alt="$content[alternate]" title="$content[alternate]" border="0" />
                </div>
                <div class="tiny">{--REFBANNER_TOTALS--}:
-                       <strong>$content[counter]</strong>&nbsp;{--REFERAL_VIEWS--} /
-                       <strong>$content[clicks]</strong>&nbsp;{--REFERAL_CLIX--}
+                       <strong>$content[counter]</strong> {--REFERAL_VIEWS--} /
+                       <strong>$content[clicks]</strong> {--REFERAL_CLICKS--}
                </div>
        </td>
 </tr>

diff --git a/templates/de/html/member/member_unconfirmed_table.tpl b/templates/de/html/member/member_unconfirmed_table.tpl
index 77af034249e244fc3cbce66f0e84b5051ec4147b..4ff1367da508cb633ef4c2181c760c9323f0be55 100644 (file)
--- a/templates/de/html/member/member_unconfirmed_table.tpl
+++ b/templates/de/html/member/member_unconfirmed_table.tpl
@@ -9,7 +9,7 @@
 $content[rows]
 <tr>
        <td align="right" class="member_footer right" colspan="4" style="padding-right:5px">
-               <strong>{--POINTS_SUM--}:</strong>
+               <strong>{--MEMBER_TOTAL_POINTS--}:</strong>
        </td>
        <td align="right" class="member_footer" style="padding-right:5px">
                <strong>{%pipe,translateComma=$content[total_points]%} {?POINTS?}</strong>