From 93b3103c317979879e5738bbc60e5d466d7f8300 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 17 Apr 2009 13:05:11 +0000 Subject: [PATCH] Use L_EMAIL variants consistently... also added comments for translators to indicate where which variant is used (Bug #39495) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9452 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_email.html | 2 +- phpBB/language/en/common.php | 4 ++-- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 +- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index b1d9b4af11..885809ffe2 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -44,7 +44,7 @@

-   +  

{S_FORM_TOKEN} diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 7e889db7d8..f603506b40 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -158,7 +158,7 @@ $lang = array_merge($lang, array( 'VIEWED_COUNT_NONE' => 'Not viewed yet', 'EDIT_POST' => 'Edit post', - 'EMAIL' => 'E-mail', + 'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS 'EMAIL_ADDRESS' => 'E-mail address', 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending e-mail at Line %1$s. Response: %2$s.', 'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.', @@ -520,7 +520,7 @@ $lang = array_merge($lang, array( 'SELECT_ALL_CODE' => 'Select all', 'SELECT_DESTINATION_FORUM' => 'Please select a destination forum', 'SELECT_FORUM' => 'Select a forum', - 'SEND_EMAIL' => 'E-mail', + 'SEND_EMAIL' => 'E-mail', // Used for submit buttons 'SEND_EMAIL_USER' => 'E-mail', // Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX 'SEND_PRIVATE_MESSAGE' => 'Send private message', 'SETTINGS' => 'Settings', diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 535641f33b..ef9807f88a 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -75,7 +75,7 @@