aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-09-05 15:45:50 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-09-05 15:45:50 +0000
commite593bcf3d7ff2636b9e0ea578cbd7b795e135a38 (patch)
tree86e5fef9d7f2b7fd3f184c5dbdd6f8b8e521010c /phpBB/language
parent76f9c1bdad31500ac0e87c7b8560352f39b0857a (diff)
downloadforums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.tar
forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.tar.gz
forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.tar.bz2
forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.tar.xz
forums-e593bcf3d7ff2636b9e0ea578cbd7b795e135a38.zip
- re-enable polls (user is now able to decide if users are able to change votes if this feature is enabled within the given forum)
git-svn-id: file:///svn/phpbb/trunk@4981 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/common.php1
-rw-r--r--phpBB/language/en/posting.php2
-rw-r--r--phpBB/language/en/ucp.php3
3 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6a72d8d651..83f0d2f30f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -333,6 +333,7 @@ $lang += array(
'SORT_BY' => 'Sort by',
'SORT_JOINED' => 'Joined Date',
'SORT_LOCATION' => 'Location',
+ 'SORT_RANK' => 'Rank',
'SORT_TOPIC_TITLE' => 'Topic Title',
'SORT_USERNAME' => 'Username',
'SPLIT_TOPIC' => 'Split Topic',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index c22261b3e0..e6c86acdee 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -136,6 +136,8 @@ $lang += array(
'POLL_OPTIONS' => 'Poll options',
'POLL_OPTIONS_EXPLAIN' => 'Place each option on a new line. You may enter up to <b>%d</b> options',
'POLL_QUESTION' => 'Poll question',
+ 'POLL_VOTE_CHANGE' => 'Allow Vote Change',
+ 'POLL_VOTE_CHANGE_EXPLAIN' => 'If enabled users are able to change their vote.',
'POSTED_ATTACHMENTS' => 'Posted attachments',
'POST_ANNOUNCEMENT' => 'Announce',
'POST_DELETED' => 'Your message has been deleted successfully',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7a90e242cd..6a4ad557ac 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -119,6 +119,7 @@ $lang += array(
'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft.',
'EMAIL_REMIND' => 'This must be the email address you supplied when registering.',
+ 'EMAIL_PM' => 'Email PM',
'EMPTY_DRAFT' => 'You must enter a message to submit your changes',
'EMPTY_DRAFT_TITLE' => 'You must enter a draft title',
'EXPORT_AS_XML' => 'Export as XML',
@@ -168,6 +169,7 @@ $lang += array(
'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folder reached',
'MESSAGE_COLOURS' => 'Message Colours',
'MESSAGE_HISTORY' => 'Message History',
+ 'MESSAGE_REPORTED' => 'Click to view reports',
'MESSAGE_REPORTED_MESSAGE' => 'Reported Message',
'MESSAGE_STORED' => 'The message has been send successfully',
'MINIMUM_KARMA' => 'Minimum User Karma',
@@ -319,6 +321,7 @@ $lang += array(
'VIEW_NEXT_HISTORY' => 'Next PM in history',
'VIEW_NEXT_PM' => 'Next PM',
'VIEW_PM' => 'View Message',
+ 'VIEW_PM_INFO' => 'Message Details',
'VIEW_PM_MESSAGE' => '1 Message',
'VIEW_PM_MESSAGES' => '%d Messages',
'VIEW_PREVIOUS_HISTORY' => 'Previous PM in history',