projects
/
mailer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a071135
)
Rewrite of language strings
author
Roland Häder
<roland@mxchange.org>
Sun, 22 Nov 2009 12:44:35 +0000
(12:44 +0000)
committer
Roland Häder
<roland@mxchange.org>
Sun, 22 Nov 2009 12:44:35 +0000
(12:44 +0000)
18 files changed:
inc/language/de.php
patch
|
blob
|
history
inc/language/register_de.php
patch
|
blob
|
history
inc/libs/user_functions.php
patch
|
blob
|
history
inc/modules/guest/what-confirm.php
patch
|
blob
|
history
inc/modules/member/what-mydata.php
patch
|
blob
|
history
templates/de/emails/admin/admin_mydata_notify.tpl
patch
|
blob
|
history
templates/de/emails/member/member_mydata_notify.tpl
patch
|
blob
|
history
templates/de/html/admin/admin_edit_sponsor_edit.tpl
patch
|
blob
|
history
templates/de/html/admin/admin_edit_user.tpl
patch
|
blob
|
history
templates/de/html/admin/admin_list_autopurge.tpl
patch
|
blob
|
history
templates/de/html/admin/admin_list_chk_reg.tpl
patch
|
blob
|
history
templates/de/html/admin/admin_list_refs.tpl
patch
|
blob
|
history
templates/de/html/admin/admin_list_refs_level.tpl
patch
|
blob
|
history
templates/de/html/admin/admin_list_user_row.tpl
patch
|
blob
|
history
templates/de/html/admin/admin_user_details.tpl
patch
|
blob
|
history
templates/de/html/guest/guest_register.tpl
patch
|
blob
|
history
templates/de/html/member/member_mydata_edit.tpl
patch
|
blob
|
history
templates/de/html/member/member_mydata_overview.tpl
patch
|
blob
|
history
diff --git
a/inc/language/de.php
b/inc/language/de.php
index ea24dda61ec240923c9f6913136708863bceef0e..64594a311f8ba105adc6e5b10003bd476d153faf 100644
(file)
--- a/
inc/language/de.php
+++ b/
inc/language/de.php
@@
-179,12
+179,13
@@
addMessages(array(
'REGISTER_CATEGORIES' => "Interessengebiete",
'REGISTER_MISC' => "Passwort, maximale Mails pro Tag etc.",
'SURNAME' => "Vorname",
'REGISTER_CATEGORIES' => "Interessengebiete",
'REGISTER_MISC' => "Passwort, maximale Mails pro Tag etc.",
'SURNAME' => "Vorname",
- 'FAMILY
_NAME
' => "Nachname",
+ 'FAMILY' => "Nachname",
'STREET_NR' => "Straße + Hausnummer",
'COUNTRY' => "Land",
'ZIP' => "Postleitzahl",
'CITY' => "Wohnort",
'STREET_NR' => "Straße + Hausnummer",
'COUNTRY' => "Land",
'ZIP' => "Postleitzahl",
'CITY' => "Wohnort",
- 'EMAIL_ADDRESS' => "Email-Adresse",
+ 'EMAIL' => "Email-Adresse",
+ 'MARKER' => "Markierer (keine Daten)",
'BIRTHDAY' => "Geburtstag (TT.MM.JJJJ)",
'PASS_1' => "Passwort",
'PASS_2' => "Passwortbestätigung",
'BIRTHDAY' => "Geburtstag (TT.MM.JJJJ)",
'PASS_1' => "Passwort",
'PASS_2' => "Passwortbestätigung",
@@
-264,7
+265,7
@@
addMessages(array(
'GUEST_COUNTRY' => "Ländercode",
'GUEST_ZIPCODE' => "Postleitzahl",
'GUEST_CITY' => "Wohnort",
'GUEST_COUNTRY' => "Ländercode",
'GUEST_ZIPCODE' => "Postleitzahl",
'GUEST_CITY' => "Wohnort",
- 'GUEST_EMAIL
_ADDRESS
' => "Email-Adresse",
+ 'GUEST_EMAIL' => "Email-Adresse",
'GUEST_BIRTHDAY' => "Geburtsdatum",
'GUEST_REF' => "Geworben von",
'GUEST_YOUR_REFLINK' => "Hier ist Ihr persönlicher Referal-Link, mit dem Sie bereits jetzt schon neue Mitglieder werben können:",
'GUEST_BIRTHDAY' => "Geburtsdatum",
'GUEST_REF' => "Geworben von",
'GUEST_YOUR_REFLINK' => "Hier ist Ihr persönlicher Referal-Link, mit dem Sie bereits jetzt schon neue Mitglieder werben können:",
@@
-763,7
+764,7
@@
addMessages(array(
'LOGIN_ID_CONFIRMED' => "Sie haben bereits Ihre E-Mail Adresse bestätigt.",
'CONFIRM_LINK_SENT' => "Der Bestätigungslink wurde an Ihre E-Mail Adresse ausgesandt.",
'REQUEST_CONFIRM_LINK_SUBJ' => "Anforderung Ihres Bestätigunglinkes",
'LOGIN_ID_CONFIRMED' => "Sie haben bereits Ihre E-Mail Adresse bestätigt.",
'CONFIRM_LINK_SENT' => "Der Bestätigungslink wurde an Ihre E-Mail Adresse ausgesandt.",
'REQUEST_CONFIRM_LINK_SUBJ' => "Anforderung Ihres Bestätigunglinkes",
- 'EMAIL_
ADDRESS_
404' => "Unter der angegebenen E-Mail Adresse konnten wir keinen Account finden! Bitte versuchen Sie es erneut.",
+ 'EMAIL_404' => "Unter der angegebenen E-Mail Adresse konnten wir keinen Account finden! Bitte versuchen Sie es erneut.",
'SELECT_NONE' => "Keine/s/r",
'ADMIN_SETUP_STATS_TITLE' => "Einstellungen an den Gast-Statistiken",
'ADMIN_GSTATS_MEMBERS' => "Mitglieder-Statistik zuerst",
'SELECT_NONE' => "Keine/s/r",
'ADMIN_SETUP_STATS_TITLE' => "Einstellungen an den Gast-Statistiken",
'ADMIN_GSTATS_MEMBERS' => "Mitglieder-Statistik zuerst",
@@
-960,7
+961,7
@@
addMessages(array(
'_SECONDS' => "Sekunden",
'SORT_ASCENDING' => "Aufsteigend",
'SORT_DESCENDING' => "Absteigend",
'_SECONDS' => "Sekunden",
'SORT_ASCENDING' => "Aufsteigend",
'SORT_DESCENDING' => "Absteigend",
- 'INVALID_EMAIL_
ADDRESS_
ENTERED' => "Ungütige EMail-Adresse eingegeben.",
+ 'INVALID_EMAIL_ENTERED' => "Ungütige EMail-Adresse eingegeben.",
'NEVER_HAPPENED' => "Nie",
'WRONG_DB_SELECTED' => "Falsche oder fehlende Datenbank ausgewählt.",
'NO_CONFIG_FOUND' => "Keine Konfigurationsdaten gefunden! (Leere Datenbank? Oder haben Sie die SQL-Dateien in andere Datenbank eingespielt?)",
'NEVER_HAPPENED' => "Nie",
'WRONG_DB_SELECTED' => "Falsche oder fehlende Datenbank ausgewählt.",
'NO_CONFIG_FOUND' => "Keine Konfigurationsdaten gefunden! (Leere Datenbank? Oder haben Sie die SQL-Dateien in andere Datenbank eingespielt?)",
diff --git
a/inc/language/register_de.php
b/inc/language/register_de.php
index 4ff292adc5fe6f7b240d4b1b562289e1618f672c..b7167746b92a597a6831733322d5ec15470c7b49 100644
(file)
--- a/
inc/language/register_de.php
+++ b/
inc/language/register_de.php
@@
-50,7
+50,7
@@
addMessages(array(
'REGISTER_FIELD_REQUIRED' => "Pflichtfeld?",
'REGISTER_ADMIN_CHANGES_SAVED' => "Änderungen gespeichert.",
'REGISTER_SURNAME_REQUIRED' => "Bitte geben Sie Ihren Vornamen ein.",
'REGISTER_FIELD_REQUIRED' => "Pflichtfeld?",
'REGISTER_ADMIN_CHANGES_SAVED' => "Änderungen gespeichert.",
'REGISTER_SURNAME_REQUIRED' => "Bitte geben Sie Ihren Vornamen ein.",
- 'REGISTER_FAMILY_
NAME_
REQUIRED' => "Bitte geben Sie Ihren Nachnamen ein.",
+ 'REGISTER_FAMILY_REQUIRED' => "Bitte geben Sie Ihren Nachnamen ein.",
'REGISTER_STREET_NR_REQUIRED' => "Bitte geben Sie Straße und Hausnummer ein.",
'REGISTER_CNTRY_REQUIRED' => "Bitte geben Sie den zweistelligen Ländercode ein.",
'REGISTER_ZIP_REQUIRED' => "Bitte geben Sie die Postleitzahl ein.",
'REGISTER_STREET_NR_REQUIRED' => "Bitte geben Sie Straße und Hausnummer ein.",
'REGISTER_CNTRY_REQUIRED' => "Bitte geben Sie den zweistelligen Ländercode ein.",
'REGISTER_ZIP_REQUIRED' => "Bitte geben Sie die Postleitzahl ein.",
diff --git
a/inc/libs/user_functions.php
b/inc/libs/user_functions.php
index ef117260fb334bb61239644b6b3acb072696cf80..d837789fe8b07b16b95e17c368fd1c8e3056abbc 100644
(file)
--- a/
inc/libs/user_functions.php
+++ b/
inc/libs/user_functions.php
@@
-99,8
+99,8
@@
function addSortLinks ($letter, $sortby, $colspan, $return=false) {
// Prepare array with all possible sorters
$list = array(
'userid' => getMessage('_UID'),
// Prepare array with all possible sorters
$list = array(
'userid' => getMessage('_UID'),
- 'family' => getMessage('FAMILY
_NAME
'),
- 'email' => getMessage('EMAIL
_ADDRESS
'),
+ 'family' => getMessage('FAMILY'),
+ 'email' => getMessage('EMAIL'),
'REMOTE_ADDR' => getMessage('REMOTE_IP')
);
'REMOTE_ADDR' => getMessage('REMOTE_IP')
);
diff --git
a/inc/modules/guest/what-confirm.php
b/inc/modules/guest/what-confirm.php
index 730e78dcace4c74cd04b3c7c7354273376921a41..dc271286bfa0667c53db25de1a80843f05493050 100644
(file)
--- a/
inc/modules/guest/what-confirm.php
+++ b/
inc/modules/guest/what-confirm.php
@@
-177,7
+177,7
@@
if (isGetRequestElementSet('hash')) {
} // END - switch
} else {
// Email address not registered
} // END - switch
} else {
// Email address not registered
- $content['message'] = getMessage('EMAIL_
ADDRESS_
404');
+ $content['message'] = getMessage('EMAIL_404');
}
// Load template
}
// Load template
diff --git
a/inc/modules/member/what-mydata.php
b/inc/modules/member/what-mydata.php
index 3390b853bbb840b22d613c567d13715829c2be92..799efbc9109816279258892fd5ddea69c8425c9a 100644
(file)
--- a/
inc/modules/member/what-mydata.php
+++ b/
inc/modules/member/what-mydata.php
@@
-203,7
+203,7
@@
LIMIT 1",
loadTemplate('admin_settings_saved', false, $content['update_check']);
} elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
// Invalid email address!
loadTemplate('admin_settings_saved', false, $content['update_check']);
} elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
// Invalid email address!
- loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_
ADDRESS_
ENTERED'));
+ loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ENTERED'));
} else {
// Generate hash
$hash = generateHash(postRequestElement('pass1'), substr($content['password'], 0, -40));
} else {
// Generate hash
$hash = generateHash(postRequestElement('pass1'), substr($content['password'], 0, -40));
diff --git
a/templates/de/emails/admin/admin_mydata_notify.tpl
b/templates/de/emails/admin/admin_mydata_notify.tpl
index 2af2a21d21107e1882a8b1b635a00bdfc5c67f4f..76a2b1764c66da3160090f2c1e0c13d97cfd7db0 100644
(file)
--- a/
templates/de/emails/admin/admin_mydata_notify.tpl
+++ b/
templates/de/emails/admin/admin_mydata_notify.tpl
@@
-7,12
+7,12
@@
Hallo Administrator,
------------------------------------------
{--GENDER--}: {%user,gender,translateGender=$userid%}
{--SURNAME--}: {%user,surname=$userid%}
------------------------------------------
{--GENDER--}: {%user,gender,translateGender=$userid%}
{--SURNAME--}: {%user,surname=$userid%}
-{--FAMILY
_NAME
--}: {%user,family=$userid%}
+{--FAMILY--}: {%user,family=$userid%}
{--STREET_NR--}: {%user,street_nr=$userid%}
{--COUNTRY--}: $content[country]
{--ZIP--}: {%user,zip,bigintval=$userid%}
{--CITY--}: {%user,city=$userid%}
{--STREET_NR--}: {%user,street_nr=$userid%}
{--COUNTRY--}: $content[country]
{--ZIP--}: {%user,zip,bigintval=$userid%}
{--CITY--}: {%user,city=$userid%}
-{--EMAIL
_ADDRESS
--}: {%user,email=$userid%}
+{--EMAIL--}: {%user,email=$userid%}
------------------------------------------
$content[message]
------------------------------------------
------------------------------------------
$content[message]
------------------------------------------
diff --git
a/templates/de/emails/member/member_mydata_notify.tpl
b/templates/de/emails/member/member_mydata_notify.tpl
index 2f6f8b7665809449b9ffd115fc553d57816c1981..5e69269da0d02a3991c8c2611bf11b0e7d96cc71 100644
(file)
--- a/
templates/de/emails/member/member_mydata_notify.tpl
+++ b/
templates/de/emails/member/member_mydata_notify.tpl
@@
-6,12
+6,12
@@
Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa
------------------------------------------
{--GENDER--}: {%user,gender,translateGender=$userid%}
{--SURNAME--}: {%user,surname=$userid%}
------------------------------------------
{--GENDER--}: {%user,gender,translateGender=$userid%}
{--SURNAME--}: {%user,surname=$userid%}
-{--FAMILY
_NAME
--}: {%user,family=$userid%}
+{--FAMILY--}: {%user,family=$userid%}
{--STREET_NR--}: {%user,street_nr=$userid%}
{--COUNTRY--}: $content[country]
{--ZIP--}: {%user,zip,bigintval=$userid%}
{--CITY--}: {%user,city=$userid%}
{--STREET_NR--}: {%user,street_nr=$userid%}
{--COUNTRY--}: $content[country]
{--ZIP--}: {%user,zip,bigintval=$userid%}
{--CITY--}: {%user,city=$userid%}
-{--EMAIL
_ADDRESS
--}: {%user,email=$userid%}
+{--EMAIL--}: {%user,email=$userid%}
{--PASS_1--}: $content[pass1]
------------------------------------------
IP-Nummer: {%server,remote_addr%}
{--PASS_1--}: $content[pass1]
------------------------------------------
IP-Nummer: {%server,remote_addr%}
diff --git
a/templates/de/html/admin/admin_edit_sponsor_edit.tpl
b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
index b7180e93ce2cf03fb10bc77aa8a2f2234609654d..cb3d0ebf5f7be166894b102395afdaa1d6c4fbb7 100644
(file)
--- a/
templates/de/html/admin/admin_edit_sponsor_edit.tpl
+++ b/
templates/de/html/admin/admin_edit_sponsor_edit.tpl
@@
-157,7
+157,7
@@
<tr>
<td width="10"> </td>
<td align="right">
<tr>
<td width="10"> </td>
<td align="right">
- {--EMAIL
_ADDRESS
--}:
+ {--EMAIL--}:
</td>
<td class="seperator" width="10"> </td>
<td>
</td>
<td class="seperator" width="10"> </td>
<td>
diff --git
a/templates/de/html/admin/admin_edit_user.tpl
b/templates/de/html/admin/admin_edit_user.tpl
index 73de5cdc52c2d4fca7033a0e01952c2561b14a31..a051ad2985bd79427d7cdb6b25dc7dd51be49646 100644
(file)
--- a/
templates/de/html/admin/admin_edit_user.tpl
+++ b/
templates/de/html/admin/admin_edit_user.tpl
@@
-24,7
+24,7
@@
</td>
</tr>
<tr>
</td>
</tr>
<tr>
- <td align="right">{--FAMILY
_NAME
--}:</td>
+ <td align="right">{--FAMILY--}:</td>
<td class="seperator" width="10"> </td>
<td>
<input type="text" name="family" class="admin_normal" size="15" maxlength="255" value="$content[family]" />
<td class="seperator" width="10"> </td>
<td>
<input type="text" name="family" class="admin_normal" size="15" maxlength="255" value="$content[family]" />
@@
-59,7
+59,7
@@
</td>
</tr>
<tr>
</td>
</tr>
<tr>
- <td class="bottom" align="right">{--EMAIL
_ADDRESS
--}:</td>
+ <td class="bottom" align="right">{--EMAIL--}:</td>
<td class="bottom seperator" width="10"> </td>
<td class="bottom">
<input type="text" name="email" class="admin_normal" size="20" maxlength="255" value="$content[email]" />
<td class="bottom seperator" width="10"> </td>
<td class="bottom">
<input type="text" name="email" class="admin_normal" size="20" maxlength="255" value="$content[email]" />
diff --git
a/templates/de/html/admin/admin_list_autopurge.tpl
b/templates/de/html/admin/admin_list_autopurge.tpl
index 138800cbc4b146d9439bd8e880a26bc379852357..8ac265926ea3f921c200802eeb12a84f3666bce6 100644
(file)
--- a/
templates/de/html/admin/admin_list_autopurge.tpl
+++ b/
templates/de/html/admin/admin_list_autopurge.tpl
@@
-4,8
+4,8
@@
<td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--GENDER--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--SURNAME--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--_UID--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--GENDER--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--SURNAME--}</strong></td>
- <td class="header_column bottom right" align="center"><strong>{--FAMILY
_NAME
--}</strong></td>
- <td class="header_column bottom right" align="center"><strong>{--EMAIL
_ADDRESS
--}</strong></td>
+ <td class="header_column bottom right" align="center"><strong>{--FAMILY--}</strong></td>
+ <td class="header_column bottom right" align="center"><strong>{--EMAIL--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--MEMBER_JOINED--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--LAST_SEEN--}</strong></td>
<td class="header_column bottom" align="center"><strong>{--AUTOPURGE_NOTIFIED--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--MEMBER_JOINED--}</strong></td>
<td class="header_column bottom right" align="center"><strong>{--LAST_SEEN--}</strong></td>
<td class="header_column bottom" align="center"><strong>{--AUTOPURGE_NOTIFIED--}</strong></td>
diff --git
a/templates/de/html/admin/admin_list_chk_reg.tpl
b/templates/de/html/admin/admin_list_chk_reg.tpl
index 1609befcf6cb6e7878ffc5360947c8c245ce72f6..64c4f83c37d0768ae9fb2174d9bb794e52a799bb 100644
(file)
--- a/
templates/de/html/admin/admin_list_chk_reg.tpl
+++ b/
templates/de/html/admin/admin_list_chk_reg.tpl
@@
-9,8
+9,8
@@
<td class="header_column right" align="center" width="20">{--_UID--}</td>
<td class="header_column right" align="center">{--GENDER--}</td>
<td class="header_column right" align="center">{--SURNAME--}</td>
<td class="header_column right" align="center" width="20">{--_UID--}</td>
<td class="header_column right" align="center">{--GENDER--}</td>
<td class="header_column right" align="center">{--SURNAME--}</td>
- <td class="header_column right" align="center">{--FAMILY
_NAME
--}</td>
- <td class="header_column right" align="center">{--EMAIL
_ADDRESS
--}</td>
+ <td class="header_column right" align="center">{--FAMILY--}</td>
+ <td class="header_column right" align="center">{--EMAIL--}</td>
<td class="header_column right" align="center">{--REMOTE_IP--}</td>
<td class="header_column right" align="center" width="20">{--REF_UID--}</td>
<td class="header_column" align="center">{--CONFIRM_ACCOUNT--}</td>
<td class="header_column right" align="center">{--REMOTE_IP--}</td>
<td class="header_column right" align="center" width="20">{--REF_UID--}</td>
<td class="header_column" align="center">{--CONFIRM_ACCOUNT--}</td>
diff --git
a/templates/de/html/admin/admin_list_refs.tpl
b/templates/de/html/admin/admin_list_refs.tpl
index c6c71e878a1a44d382ba8b05ab4ab5d8be3f2996..5ff36e25c6ee2b5156d6d1f4b6377d4f6778b180 100644
(file)
--- a/
templates/de/html/admin/admin_list_refs.tpl
+++ b/
templates/de/html/admin/admin_list_refs.tpl
@@
-8,7
+8,7
@@
<td width="5%" align="center" class="header_column bottom right"><strong>{--_UID--}</strong></td>
<td width="5%" align="center" class="header_column bottom right"><strong>{--REFS_COUNT--}</strong></td>
<td width="35%" align="center" class="header_column bottom right"><strong>{--SURNAME_FAMILY--}</strong></td>
<td width="5%" align="center" class="header_column bottom right"><strong>{--_UID--}</strong></td>
<td width="5%" align="center" class="header_column bottom right"><strong>{--REFS_COUNT--}</strong></td>
<td width="35%" align="center" class="header_column bottom right"><strong>{--SURNAME_FAMILY--}</strong></td>
- <td width="35%" align="center" class="header_column bottom right"><strong>{--EMAIL
_ADDRESS
--}</strong></td>
+ <td width="35%" align="center" class="header_column bottom right"><strong>{--EMAIL--}</strong></td>
<td width="10%" align="center" class="header_column bottom right"><strong>{--ACCOUNT_STATUS--}</strong></td>
<td width="10%" align="center" class="header_column bottom"><strong>{--MEMBER_JOINED--}</strong></td>
</tr>
<td width="10%" align="center" class="header_column bottom right"><strong>{--ACCOUNT_STATUS--}</strong></td>
<td width="10%" align="center" class="header_column bottom"><strong>{--MEMBER_JOINED--}</strong></td>
</tr>
diff --git
a/templates/de/html/admin/admin_list_refs_level.tpl
b/templates/de/html/admin/admin_list_refs_level.tpl
index 2d3c4744c6210cf4962bd4e3c9f483a2c82d0979..c1af1b3787c733a9c92b040db611d4c4f8fdc28f 100644
(file)
--- a/
templates/de/html/admin/admin_list_refs_level.tpl
+++ b/
templates/de/html/admin/admin_list_refs_level.tpl
@@
-11,7
+11,7
@@
<td width="5%" align="center" class="header_column bottom right"><strong>{--_UID--}</strong></td>
<td width="5%" align="center" class="header_column bottom right"><strong>{--REFS_COUNT--}</strong></td>
<td width="35%" align="center" class="header_column bottom right"><strong>{--SURNAME_FAMILY--}</strong></td>
<td width="5%" align="center" class="header_column bottom right"><strong>{--_UID--}</strong></td>
<td width="5%" align="center" class="header_column bottom right"><strong>{--REFS_COUNT--}</strong></td>
<td width="35%" align="center" class="header_column bottom right"><strong>{--SURNAME_FAMILY--}</strong></td>
- <td width="35%" align="center" class="header_column bottom right"><strong>{--EMAIL
_ADDRESS
--}</strong></td>
+ <td width="35%" align="center" class="header_column bottom right"><strong>{--EMAIL--}</strong></td>
<td width="10%" align="center" class="header_column bottom right"><strong>{--ACCOUNT_STATUS--}</strong></td>
<td width="10%" align="center" class="header_column bottom"><strong>{--MEMBER_JOINED--}</strong></td>
</tr>
<td width="10%" align="center" class="header_column bottom right"><strong>{--ACCOUNT_STATUS--}</strong></td>
<td width="10%" align="center" class="header_column bottom"><strong>{--MEMBER_JOINED--}</strong></td>
</tr>
diff --git
a/templates/de/html/admin/admin_list_user_row.tpl
b/templates/de/html/admin/admin_list_user_row.tpl
index 7a0d0ce2c224276c0c6feb1fc05ba37263b2116b..d7ab83eb7dd602469e65707c085e74d35dce28b3 100644
(file)
--- a/
templates/de/html/admin/admin_list_user_row.tpl
+++ b/
templates/de/html/admin/admin_list_user_row.tpl
@@
-3,7
+3,7
@@
<td width="20%" align="center" class="right top switch_sw$content[sw]"><strong>{--_UID--}:</strong></td>
<td width="20%" align="center" class="right top switch_sw$content[sw]"><strong>{--GENDER--}:</strong></td>
<td width="20%" align="center" class="right top switch_sw$content[sw]"><strong>{--SURNAME--}:</strong></td>
<td width="20%" align="center" class="right top switch_sw$content[sw]"><strong>{--_UID--}:</strong></td>
<td width="20%" align="center" class="right top switch_sw$content[sw]"><strong>{--GENDER--}:</strong></td>
<td width="20%" align="center" class="right top switch_sw$content[sw]"><strong>{--SURNAME--}:</strong></td>
- <td width="20%" align="center" class="right top switch_sw$content[sw]"><strong>{--FAMILY
_NAME
--}:</strong></td>
+ <td width="20%" align="center" class="right top switch_sw$content[sw]"><strong>{--FAMILY--}:</strong></td>
<td width="20%" align="center" class="switch_sw$content[sw] top"><strong>{--USER_NICKNAME--}:</strong></td>
</tr>
<tr>
<td width="20%" align="center" class="switch_sw$content[sw] top"><strong>{--USER_NICKNAME--}:</strong></td>
</tr>
<tr>
@@
-16,7
+16,7
@@
</tr>
<tr>
<td width="5" class="switch_sw$content[sw] seperator"> </td>
</tr>
<tr>
<td width="5" class="switch_sw$content[sw] seperator"> </td>
- <td align="center" class="right switch_sw$content[sw]"><strong>{--EMAIL
_ADDRESS
--}:</strong></td>
+ <td align="center" class="right switch_sw$content[sw]"><strong>{--EMAIL--}:</strong></td>
<td align="center" class="right switch_sw$content[sw]"><strong>{--REMOTE_IP--}:</strong></td>
<td align="center" class="right switch_sw$content[sw]"><strong>{--REF_UID--}:</strong></td>
<td align="center" class="right switch_sw$content[sw]"><strong>{--ACCOUNT_STATUS--}:</strong></td>
<td align="center" class="right switch_sw$content[sw]"><strong>{--REMOTE_IP--}:</strong></td>
<td align="center" class="right switch_sw$content[sw]"><strong>{--REF_UID--}:</strong></td>
<td align="center" class="right switch_sw$content[sw]"><strong>{--ACCOUNT_STATUS--}:</strong></td>
diff --git
a/templates/de/html/admin/admin_user_details.tpl
b/templates/de/html/admin/admin_user_details.tpl
index b2dc4b3b6b89ed313893fbae137b6c29769ca4f8..410d777e02a8f7743e66288c631c2c03e309fe20 100644
(file)
--- a/
templates/de/html/admin/admin_user_details.tpl
+++ b/
templates/de/html/admin/admin_user_details.tpl
@@
-14,7
+14,7
@@
<strong>$content[surname]</strong>
</td>
<td align="center" width="25%" class="top right">
<strong>$content[surname]</strong>
</td>
<td align="center" width="25%" class="top right">
- {--FAMILY
_NAME
--}:<br />
+ {--FAMILY--}:<br />
<strong>$content[family]</strong>
</td>
<td align="center" width="25%" class="top">
<strong>$content[family]</strong>
</td>
<td align="center" width="25%" class="top">
@@
-42,7
+42,7
@@
</tr>
<tr>
<td align="center" class="top right">
</tr>
<tr>
<td align="center" class="top right">
- {--EMAIL
_ADDRESS
--}:<br />
+ {--EMAIL--}:<br />
<strong><a href="$content[email_link]">$content[email]</a></strong>
</td>
<td align="center" class="top right">
<strong><a href="$content[email_link]">$content[email]</a></strong>
</td>
<td align="center" class="top right">
diff --git
a/templates/de/html/guest/guest_register.tpl
b/templates/de/html/guest/guest_register.tpl
index 8053e937ca03a21b2dea2f309196e7549a7703c0..33982461a4ff9c53fd7d957cae36774cc21c600d 100644
(file)
--- a/
templates/de/html/guest/guest_register.tpl
+++ b/
templates/de/html/guest/guest_register.tpl
@@
-32,7
+32,7
@@
</tr>
<tr>
<td class="register_left">{--SURNAME--}$content[must_fillout_surname],
</tr>
<tr>
<td class="register_left">{--SURNAME--}$content[must_fillout_surname],
- {--FAMILY
_NAME
--}$content[must_fillout_family]: </td>
+ {--FAMILY--}$content[must_fillout_family]: </td>
<td class="register_right">
<input type="text" name="surname" lass="guest_normal" size="15" maxlength="255" value="$content[surname]" />
<input type="text" name="family" class="guest_normal" size="15" maxlength="255" value="$content[family]" />
<td class="register_right">
<input type="text" name="surname" lass="guest_normal" size="15" maxlength="255" value="$content[surname]" />
<input type="text" name="family" class="guest_normal" size="15" maxlength="255" value="$content[family]" />
@@
-66,7
+66,7
@@
</tr>
<tr>
<td align="right" width="50%" class="register_left">
</tr>
<tr>
<td align="right" width="50%" class="register_left">
- {--EMAIL
_ADDRESS
--}$content[must_fillout_email]:
+ {--EMAIL--}$content[must_fillout_email]:
</td>
<td width="50%" class="register_right">
<input type="text" name="email" class="guest_normal" size="30" maxlength="255" value="$content[email]" />
</td>
<td width="50%" class="register_right">
<input type="text" name="email" class="guest_normal" size="30" maxlength="255" value="$content[email]" />
diff --git
a/templates/de/html/member/member_mydata_edit.tpl
b/templates/de/html/member/member_mydata_edit.tpl
index 6cb78c890cd789766976badc6759b3c8a742e275..d1c92387431180d85cb9ef6b87d1aac46118e28b 100644
(file)
--- a/
templates/de/html/member/member_mydata_edit.tpl
+++ b/
templates/de/html/member/member_mydata_edit.tpl
@@
-17,7
+17,7
@@
</td>
</tr>
<tr>
</td>
</tr>
<tr>
- <td align="right">{--SURNAME--}, {--FAMILY
_NAME
--}:</td>
+ <td align="right">{--SURNAME--}, {--FAMILY--}:</td>
<td>
<input type="text" name="surname" class="member_normal" size="15" maxlength="255" value="$content[surname]" />
<input type="text" name="family" class="member_normal" size="15" maxlength="255" value="$content[family]" />
<td>
<input type="text" name="surname" class="member_normal" size="15" maxlength="255" value="$content[surname]" />
<input type="text" name="family" class="member_normal" size="15" maxlength="255" value="$content[family]" />
@@
-38,7
+38,7
@@
</td>
</tr>
<tr>
</td>
</tr>
<tr>
- <td align="right">{--EMAIL
_ADDRESS
--}:</td>
+ <td align="right">{--EMAIL--}:</td>
<td>
<input type="text" name="email" class="member_normal" size="30" maxlength="255" value="$content[email]" />
</td>
<td>
<input type="text" name="email" class="member_normal" size="30" maxlength="255" value="$content[email]" />
</td>
diff --git
a/templates/de/html/member/member_mydata_overview.tpl
b/templates/de/html/member/member_mydata_overview.tpl
index ef50459f7c32227229d8bbb22b461a515febb79f..55664920115b953e32ecd90cdcb88f1e058148c5 100644
(file)
--- a/
templates/de/html/member/member_mydata_overview.tpl
+++ b/
templates/de/html/member/member_mydata_overview.tpl
@@
-35,7
+35,7
@@
<td colspan="3" height="3" class="seperator"> </td>
</tr>
<tr>
<td colspan="3" height="3" class="seperator"> </td>
</tr>
<tr>
- <td align="right">{--FAMILY
_NAME
--}:</td>
+ <td align="right">{--FAMILY--}:</td>
<td width="10" class="seperator"> </td>
<td><strong>$content[family]</strong></td>
</tr>
<td width="10" class="seperator"> </td>
<td><strong>$content[family]</strong></td>
</tr>
@@
-75,7
+75,7
@@
<td colspan="3" height="3" class="seperator"> </td>
</tr>
<tr>
<td colspan="3" height="3" class="seperator"> </td>
</tr>
<tr>
- <td align="right">{--EMAIL
_ADDRESS
--}:</td>
+ <td align="right">{--EMAIL--}:</td>
<td width="10" class="seperator"> </td>
<td><strong>$content[email]</strong></td>
</tr>
<td width="10" class="seperator"> </td>
<td><strong>$content[email]</strong></td>
</tr>