From d897dae9f3b01f17fb59f2b96ba067b1a0f417b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 22 Nov 2009 12:44:35 +0000 Subject: [PATCH] Rewrite of language strings --- inc/language/de.php | 11 ++++++----- inc/language/register_de.php | 2 +- inc/libs/user_functions.php | 4 ++-- inc/modules/guest/what-confirm.php | 2 +- inc/modules/member/what-mydata.php | 2 +- templates/de/emails/admin/admin_mydata_notify.tpl | 4 ++-- templates/de/emails/member/member_mydata_notify.tpl | 4 ++-- templates/de/html/admin/admin_edit_sponsor_edit.tpl | 2 +- templates/de/html/admin/admin_edit_user.tpl | 4 ++-- templates/de/html/admin/admin_list_autopurge.tpl | 4 ++-- templates/de/html/admin/admin_list_chk_reg.tpl | 4 ++-- templates/de/html/admin/admin_list_refs.tpl | 2 +- templates/de/html/admin/admin_list_refs_level.tpl | 2 +- templates/de/html/admin/admin_list_user_row.tpl | 4 ++-- templates/de/html/admin/admin_user_details.tpl | 4 ++-- templates/de/html/guest/guest_register.tpl | 4 ++-- templates/de/html/member/member_mydata_edit.tpl | 4 ++-- templates/de/html/member/member_mydata_overview.tpl | 4 ++-- 18 files changed, 34 insertions(+), 33 deletions(-) diff --git a/inc/language/de.php b/inc/language/de.php index ea24dda61e..64594a311f 100644 --- 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", - 'FAMILY_NAME' => "Nachname", + 'FAMILY' => "Nachname", '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", @@ -264,7 +265,7 @@ addMessages(array( '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:", @@ -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", - '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", @@ -960,7 +961,7 @@ addMessages(array( '_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?)", diff --git a/inc/language/register_de.php b/inc/language/register_de.php index 4ff292adc5..b7167746b9 100644 --- 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_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.", diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index ef117260fb..d837789fe8 100644 --- 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'), - 'family' => getMessage('FAMILY_NAME'), - 'email' => getMessage('EMAIL_ADDRESS'), + 'family' => getMessage('FAMILY'), + 'email' => getMessage('EMAIL'), 'REMOTE_ADDR' => getMessage('REMOTE_IP') ); diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php index 730e78dcac..dc271286bf 100644 --- 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 - $content['message'] = getMessage('EMAIL_ADDRESS_404'); + $content['message'] = getMessage('EMAIL_404'); } // Load template diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 3390b853bb..799efbc910 100644 --- 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, 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)); diff --git a/templates/de/emails/admin/admin_mydata_notify.tpl b/templates/de/emails/admin/admin_mydata_notify.tpl index 2af2a21d21..76a2b1764c 100644 --- 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%} -{--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%} -{--EMAIL_ADDRESS--}: {%user,email=$userid%} +{--EMAIL--}: {%user,email=$userid%} ------------------------------------------ $content[message] ------------------------------------------ diff --git a/templates/de/emails/member/member_mydata_notify.tpl b/templates/de/emails/member/member_mydata_notify.tpl index 2f6f8b7665..5e69269da0 100644 --- 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%} -{--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%} -{--EMAIL_ADDRESS--}: {%user,email=$userid%} +{--EMAIL--}: {%user,email=$userid%} {--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 b7180e93ce..cb3d0ebf5f 100644 --- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl @@ -157,7 +157,7 @@   - {--EMAIL_ADDRESS--}: + {--EMAIL--}:   diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl index 73de5cdc52..a051ad2985 100644 --- a/templates/de/html/admin/admin_edit_user.tpl +++ b/templates/de/html/admin/admin_edit_user.tpl @@ -24,7 +24,7 @@ - {--FAMILY_NAME--}: + {--FAMILY--}:   @@ -59,7 +59,7 @@ - {--EMAIL_ADDRESS--}: + {--EMAIL--}:   diff --git a/templates/de/html/admin/admin_list_autopurge.tpl b/templates/de/html/admin/admin_list_autopurge.tpl index 138800cbc4..8ac265926e 100644 --- a/templates/de/html/admin/admin_list_autopurge.tpl +++ b/templates/de/html/admin/admin_list_autopurge.tpl @@ -4,8 +4,8 @@ {--_UID--} {--GENDER--} {--SURNAME--} - {--FAMILY_NAME--} - {--EMAIL_ADDRESS--} + {--FAMILY--} + {--EMAIL--} {--MEMBER_JOINED--} {--LAST_SEEN--} {--AUTOPURGE_NOTIFIED--} diff --git a/templates/de/html/admin/admin_list_chk_reg.tpl b/templates/de/html/admin/admin_list_chk_reg.tpl index 1609befcf6..64c4f83c37 100644 --- a/templates/de/html/admin/admin_list_chk_reg.tpl +++ b/templates/de/html/admin/admin_list_chk_reg.tpl @@ -9,8 +9,8 @@ {--_UID--} {--GENDER--} {--SURNAME--} - {--FAMILY_NAME--} - {--EMAIL_ADDRESS--} + {--FAMILY--} + {--EMAIL--} {--REMOTE_IP--} {--REF_UID--} {--CONFIRM_ACCOUNT--} diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl index c6c71e878a..5ff36e25c6 100644 --- a/templates/de/html/admin/admin_list_refs.tpl +++ b/templates/de/html/admin/admin_list_refs.tpl @@ -8,7 +8,7 @@ {--_UID--} {--REFS_COUNT--} {--SURNAME_FAMILY--} - {--EMAIL_ADDRESS--} + {--EMAIL--} {--ACCOUNT_STATUS--} {--MEMBER_JOINED--} diff --git a/templates/de/html/admin/admin_list_refs_level.tpl b/templates/de/html/admin/admin_list_refs_level.tpl index 2d3c4744c6..c1af1b3787 100644 --- a/templates/de/html/admin/admin_list_refs_level.tpl +++ b/templates/de/html/admin/admin_list_refs_level.tpl @@ -11,7 +11,7 @@ {--_UID--} {--REFS_COUNT--} {--SURNAME_FAMILY--} - {--EMAIL_ADDRESS--} + {--EMAIL--} {--ACCOUNT_STATUS--} {--MEMBER_JOINED--} diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index 7a0d0ce2c2..d7ab83eb7d 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -3,7 +3,7 @@ {--_UID--}: {--GENDER--}: {--SURNAME--}: - {--FAMILY_NAME--}: + {--FAMILY--}: {--USER_NICKNAME--}: @@ -16,7 +16,7 @@   - {--EMAIL_ADDRESS--}: + {--EMAIL--}: {--REMOTE_IP--}: {--REF_UID--}: {--ACCOUNT_STATUS--}: diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index b2dc4b3b6b..410d777e02 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -14,7 +14,7 @@ $content[surname] - {--FAMILY_NAME--}:
+ {--FAMILY--}:
$content[family] @@ -42,7 +42,7 @@ - {--EMAIL_ADDRESS--}:
+ {--EMAIL--}:
$content[email] diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index 8053e937ca..33982461a4 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -32,7 +32,7 @@ {--SURNAME--}$content[must_fillout_surname], - {--FAMILY_NAME--}$content[must_fillout_family]:   + {--FAMILY--}$content[must_fillout_family]:   @@ -66,7 +66,7 @@ - {--EMAIL_ADDRESS--}$content[must_fillout_email]:   + {--EMAIL--}$content[must_fillout_email]:   diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl index 6cb78c890c..d1c9238743 100644 --- a/templates/de/html/member/member_mydata_edit.tpl +++ b/templates/de/html/member/member_mydata_edit.tpl @@ -17,7 +17,7 @@ - {--SURNAME--}, {--FAMILY_NAME--}: + {--SURNAME--}, {--FAMILY--}: @@ -38,7 +38,7 @@ - {--EMAIL_ADDRESS--}: + {--EMAIL--}: diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl index ef50459f7c..5566492011 100644 --- a/templates/de/html/member/member_mydata_overview.tpl +++ b/templates/de/html/member/member_mydata_overview.tpl @@ -35,7 +35,7 @@   - {--FAMILY_NAME--}: + {--FAMILY--}:   $content[family] @@ -75,7 +75,7 @@   - {--EMAIL_ADDRESS--}: + {--EMAIL--}:   $content[email] -- 2.39.5