aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/lang_admin.php1
-rw-r--r--phpBB/language/en/lang_main.php146
2 files changed, 78 insertions, 69 deletions
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 7663920180..fe41659f18 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -22,6 +22,7 @@
$lang = array_merge($lang, array(
'ADMIN_TITLE' => 'Administration Panel',
'ADMIN' => 'Administration',
+ 'LOGIN_ADMIN' => 'You must be a registered, logged in user before attempting to administer the board.',
'NO_ADMIN' => 'You are not authorised to administer this board.',
'NO_FRAMES' => 'Sorry, your browser does not support frames.',
'RETURN_TO' => 'Return to ...',
diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 77422c0ca5..e0bb5b76b4 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -156,33 +156,33 @@ $lang = array(
'You_new_pms' => 'New private messages are waiting for you in your Inbox',
'You_no_new_pm' => 'No new private messages are waiting for you',
- 'LEGEND' => 'Legend',
- 'RECORD_ONLINE_USERS' => 'Most users ever online was <b>%1$s</b> on %2$s',
- 'Registered_users' => 'Registered Users:',
- 'Browsing_forum_guest' => 'Users browsing this forum: %1$s and %2$d guest',
- 'Browsing_forum_guests' => 'Users browsing this forum: %1$s and %2$d guests',
- 'Online_users_zero_total' => 'In total there are <b>0</b> users online :: ',
- 'Online_users_total' => 'In total there are <b>%d</b> users online :: ',
- 'Online_user_total' => 'In total there is <b>%d</b> user online :: ',
- 'Reg_users_zero_total' => '0 Registered, ',
- 'Reg_users_total' => '%d Registered, ',
- 'Reg_user_total' => '%d Registered, ',
- 'Hidden_users_zero_total' => '0 Hidden and ',
- 'Hidden_user_total' => '%d Hidden and ',
- 'Hidden_users_total' => '%d Hidden and ',
- 'Guest_users_zero_total' => '0 Guests',
- 'Guest_users_total' => '%d Guests',
- 'Guest_user_total' => '%d Guest',
- 'Posted_articles_zero_total' => 'Our users have posted a total of <b>0</b> article',
- 'Posted_articles_total' => 'Our users have posted a total of <b>%d</b> articles',
- 'Posted_article_total' => 'Our users have posted a total of <b>%d</b> article',
- 'Posted_topics_zero_total' => 'Our users have posted a total of <b>0</b> topic',
- 'Posted_topics_total' => 'Our users have posted a total of <b>%d</b> topics',
- 'Posted_topic_total' => 'Our users have posted a total of <b>%d</b> topic',
- 'Registered_users_zero_total' => 'We have <b>0</b> registered users',
- 'Registered_users_total' => 'We have <b>%d</b> registered users',
- 'Registered_user_total' => 'We have <b>%d</b> registered user',
- 'Newest_user' => 'The newest registered user is <b>%s%s%s</b>',
+ 'LEGEND' => 'Legend',
+ 'RECORD_ONLINE_USERS' => 'Most users ever online was <b>%1$s</b> on %2$s',
+ 'Registered_users' => 'Registered Users:',
+ 'Browsing_forum_guest' => 'Users browsing this forum: %1$s and %2$d guest',
+ 'Browsing_forum_guests' => 'Users browsing this forum: %1$s and %2$d guests',
+ 'Online_users_zero_total' => 'In total there are <b>0</b> users online :: ',
+ 'Online_users_total' => 'In total there are <b>%d</b> users online :: ',
+ 'Online_user_total' => 'In total there is <b>%d</b> user online :: ',
+ 'Reg_users_zero_total' => '0 Registered, ',
+ 'Reg_users_total' => '%d Registered, ',
+ 'Reg_user_total' => '%d Registered, ',
+ 'Hidden_users_zero_total' => '0 Hidden and ',
+ 'Hidden_user_total' => '%d Hidden and ',
+ 'Hidden_users_total' => '%d Hidden and ',
+ 'Guest_users_zero_total'=> '0 Guests',
+ 'Guest_users_total' => '%d Guests',
+ 'Guest_user_total' => '%d Guest',
+ 'Posted_articles_zero_total'=> 'Our users have posted a total of <b>0</b> article',
+ 'Posted_articles_total' => 'Our users have posted a total of <b>%d</b> articles',
+ 'Posted_article_total' => 'Our users have posted a total of <b>%d</b> article',
+ 'Posted_topics_zero_total' => 'Our users have posted a total of <b>0</b> topic',
+ 'Posted_topics_total' => 'Our users have posted a total of <b>%d</b> topics',
+ 'Posted_topic_total' => 'Our users have posted a total of <b>%d</b> topic',
+ 'Registered_users_zero_total' => 'We have <b>0</b> registered users',
+ 'Registered_users_total' => 'We have <b>%d</b> registered users',
+ 'Registered_user_total' => 'We have <b>%d</b> registered user',
+ 'Newest_user' => 'The newest registered user is <b>%s%s%s</b>',
'No_new_posts_last_visit' => 'No new posts since your last visit',
@@ -201,6 +201,11 @@ $lang = array(
'POST_TOPIC_LOCKED' => 'Topic is locked',
+ 'FOUND_USERS_TOTAL' => '%s Users',
+ 'FOUND_TOPIC_TOTAL' => '%s Topics',
+ 'FOUND_POSTS_TOTAL' => '%s Posts',
+
+
'LOGIN' => 'Login',
'TERMS_USE' => 'Terms of Use',
'PRIVACY' => 'Privacy Policy',
@@ -258,50 +263,52 @@ $lang = array(
'NO_POST' => 'The requested post does not exist.',
'NO_USER' => 'The requested user does not exist.',
- 'Stop_watching_forum' => 'Stop watching this forum',
- 'Start_watching_forum' => 'Watch this forum for new posts',
- 'No_longer_watching_forum' => 'You are no longer watching this forum',
- 'You_are_watching_forum' => 'You are now watching this forum',
- 'View_topic' => 'View topic',
+ 'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.',
+ 'STOP_WATCHING_FORUM' => 'Stop watching this forum',
+ 'START_WATCHING_FORUM' => 'Watch this forum for new posts',
+ 'NOT_WATCHING_FORUM' => 'You are no longer watching this forum',
+ 'ARE_WATCHING_FORUM' => 'You are now watching this forum',
+
- 'POST_SUBJECT' => 'Post subject',
+ 'VIEW_TOPIC' => 'View topic',
+ 'LOGIN_VIEWTOPIC' => 'The board administrator requires you to be registered and logged in to view this topic.',
+ 'PRINT_TOPIC' => 'Printable version',
+ 'VIEW_NEXT_TOPIC' => 'View next topic',
+ 'VIEW_PREVIOUS_TOPIC' => 'View previous topic',
- 'PRINT_TOPIC' => 'Printable version',
- 'VIEW_NEXT_TOPIC' => 'View next topic',
- 'VIEW_PREVIOUS_TOPIC' => 'View previous topic',
'NO_NEWER_TOPICS' => 'There are no newer topics in this forum',
'NO_OLDER_TOPICS' => 'There are no older topics in this forum',
'POST_IGNORE' => 'This post was made by <b>%1$s</b> who is on your ignore list. To display this post click %sHERE%s.',
'POST_BELOW_KARMA' => 'This post was made by <b>%1$s</b> whose karma rating of <b>%2$d</b> is below your desired minimum. To display this post click %3$sHERE%4$s.',
'POST_ENCODING' => 'This post by <b>%1$s</b> was made in a character set different to yours. To view this post in its proper encoding click %2$sHERE%3$s.',
- 'DISPLAY_POSTS' => 'Display posts from previous',
- 'ALL_POSTS' => 'All Posts',
-
- 'BACK_TO_TOP' => 'Back to top',
- 'READ_PROFILE' => 'Profile',
- 'SEND_EMAIL' => 'Email',
- 'VISIT_WEBSITE' => 'WWW',
- 'ICQ_STATUS' => 'ICQ Status',
- 'EDIT_POST' => 'Edit',
- 'VIEW_IP' => 'IP',
- 'DELETE_POST' => 'Delete',
- 'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered',
- 'REPORT_TO_ADMIN' => 'Report this post',
-
- 'POST_BEEN_REPORTED' => 'This post has been reported',
- 'POST_NOT_BEEN_APPROVED' => 'This post has not been approved',
- 'TOPIC_BEEN_REPORTED' => 'This topic has been reported',
- 'TOPIC_NOT_BEEN_APPROVED' => 'This topic has not been approved',
-
- 'APPROVE_POST' => 'Approve this post',
- 'READ_REPORTS' => 'Read post reports',
-
- 'wrote' => 'wrote',
- 'Quote' => 'Quote',
- 'Code' => 'Code',
- 'EDITED_TIME_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d time in total',
- 'EDITED_TIMES_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d times in total',
+ 'DISPLAY_POSTS' => 'Display posts from previous',
+ 'ALL_POSTS' => 'All Posts',
+
+ 'BACK_TO_TOP' => 'Back to top',
+ 'POST_SUBJECT' => 'Post subject',
+ 'READ_PROFILE' => 'Profile',
+ 'SEND_EMAIL' => 'Email',
+ 'VISIT_WEBSITE' => 'WWW',
+ 'ICQ_STATUS' => 'ICQ Status',
+ 'EDIT_POST' => 'Edit',
+ 'VIEW_IP' => 'IP',
+ 'DELETE_POST' => 'Delete',
+ 'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered',
+ 'REPORT_TO_ADMIN' => 'Report this post',
+ 'EDITED_TIME_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d time in total',
+ 'EDITED_TIMES_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d times in total',
+
+ 'POST_BEEN_REPORTED' => 'This post has been reported',
+ 'POST_NOT_BEEN_APPROVED' => 'This post has not been approved',
+ 'TOPIC_BEEN_REPORTED' => 'This topic has been reported',
+ 'TOPIC_NOT_BEEN_APPROVED' => 'This topic has not been approved',
+ 'APPROVE_POST' => 'Approve this post',
+ 'READ_REPORTS' => 'Read post reports',
+
+ 'WROTE' => 'wrote',
+ 'QUOTE' => 'Quote',
+ 'CODE' => 'Code',
'QUICK_MOD' => 'Quick-mod tools',
'LOCK_TOPIC' => 'Lock topic',
@@ -312,12 +319,12 @@ $lang = array(
'MERGE_TOPIC' => 'Merge topic',
'CHANGE_TOPIC_TYPE' => 'Change topic type to: ',
- 'Stop_watching_topic' => 'Stop watching this topic',
- 'Start_watching_topic' => 'Watch this topic for replies',
- 'No_longer_watching_topic' => 'You are no longer watching this topic',
- 'You_are_watching_topic' => 'You are now watching this topic',
+ 'STOP_WATCHING_TOPIC' => 'Stop watching this topic',
+ 'START_WATCHING_TOPIC' => 'Watch this topic for replies',
+ 'NOT_WATCHING_TOPIC' => 'You are no longer watching this topic',
+ 'NOW_WATCHING_TOPIC' => 'You are now watching this topic',
- 'Total_votes' => 'Total Votes',
+ 'TOTAL_VOTES' => 'Total Votes',
'VIEW_RESULTS' => 'View Results',
@@ -624,6 +631,7 @@ $lang = array(
'NO_MEMBERS' => 'No members found for this search criteria',
'SEND_MESSAGE' => 'Message',
'POST_IP' => 'Posted from IP/domain',
+ 'LAST_ACTIVE' => 'Last active',
'SELECT_SORT_METHOD'=> 'Select sort method',
'SORT' => 'Sort',
'ORDER' => 'Order',
@@ -735,7 +743,7 @@ $lang = array(
'Search_author' => 'Search for Author',
'Search_author_explain' => 'Use * as a wildcard for partial matches',
'Last_active' => 'Last active',
- 'Select_marked' => 'Select Marked',
+ 'SELECT_MARKED' => 'Select Marked',
'Search_for_any' => 'Search for any terms or use query as entered',
'Search_for_all' => 'Search for all terms',
'Search_title_msg' => 'Search topic title and message text',