diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2011-09-14 00:28:52 +0200 |
---|---|---|
committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-25 15:10:44 -0500 |
commit | 88ae40a4b19360645d5e5a614cc378e7cce4afe3 (patch) | |
tree | 057ddd8d25a1ec8b943b8f95cab9c861a385285b /phpBB/language | |
parent | 0734dd3c42f573d819c058cd6c6b55d035d1836d (diff) | |
download | forums-88ae40a4b19360645d5e5a614cc378e7cce4afe3.tar forums-88ae40a4b19360645d5e5a614cc378e7cce4afe3.tar.gz forums-88ae40a4b19360645d5e5a614cc378e7cce4afe3.tar.bz2 forums-88ae40a4b19360645d5e5a614cc378e7cce4afe3.tar.xz forums-88ae40a4b19360645d5e5a614cc378e7cce4afe3.zip |
[ticket/10345] Make use of the plural function in some basic places
PHPBB3-10345
Diffstat (limited to 'phpBB/language')
-rw-r--r-- | phpBB/language/en/acp/posting.php | 6 | ||||
-rw-r--r-- | phpBB/language/en/common.php | 159 | ||||
-rw-r--r-- | phpBB/language/en/mcp.php | 31 | ||||
-rw-r--r-- | phpBB/language/en/memberlist.php | 8 | ||||
-rw-r--r-- | phpBB/language/en/posting.php | 18 | ||||
-rw-r--r-- | phpBB/language/en/search.php | 19 | ||||
-rw-r--r-- | phpBB/language/en/ucp.php | 33 | ||||
-rw-r--r-- | phpBB/language/en/viewforum.php | 7 | ||||
-rw-r--r-- | phpBB/language/en/viewtopic.php | 21 |
9 files changed, 209 insertions, 93 deletions
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 16e1aaca66..7aa01469b7 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -185,7 +185,11 @@ $lang = array_merge($lang, array( 'SMILIES_URL' => 'Smiley image file', 'SMILIES_WIDTH' => 'Smiley width', - 'TOO_MANY_SMILIES' => 'Limit of %d smilies reached.', + 'TOO_MANY_SMILIES' => array( + 0 => 'Limit of %d smilies reached.', + 1 => 'Limit of %d smiley reached.', + 2 => 'Limit of %d smilies reached.', + ), 'WRONG_PAK_TYPE' => 'The specified package does not contain the appropriate data.', )); diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index b57c2d9747..6fcef11852 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -113,8 +113,11 @@ $lang = array_merge($lang, array( 'BOARD_DISABLED' => 'This board is currently disabled.', 'BOARD_UNAVAILABLE' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes.', 'BROWSING_FORUM' => 'Users browsing this forum: %1$s', - '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', + 'BROWSING_FORUM_GUESTS' => array( + 0 => 'Users browsing this forum: %2$s and 0 guests', + 1 => 'Users browsing this forum: %2$s and %1$d guest', + 2 => 'Users browsing this forum: %2$s and %1$d guests', + ), 'BYTES' => 'Bytes', 'CANCEL' => 'Cancel', @@ -155,12 +158,11 @@ $lang = array_merge($lang, array( 'DISPLAY_TOPICS' => 'Display topics from previous', 'DOWNLOADED' => 'Downloaded', 'DOWNLOADING_FILE' => 'Downloading file', - 'DOWNLOAD_COUNT' => 'Downloaded %d time', - 'DOWNLOAD_COUNTS' => 'Downloaded %d times', - 'DOWNLOAD_COUNT_NONE' => 'Not downloaded yet', - 'VIEWED_COUNT' => 'Viewed %d time', - 'VIEWED_COUNTS' => 'Viewed %d times', - 'VIEWED_COUNT_NONE' => 'Not viewed yet', + 'DOWNLOAD_COUNTS' => array( + 0 => 'Not downloaded yet', + 1 => 'Downloaded %d time', + 2 => 'Downloaded %d times', + ), 'EDIT_POST' => 'Edit post', 'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS @@ -245,12 +247,16 @@ $lang = array_merge($lang, array( 'GROUP_ERR_USERNAME' => 'No group name specified.', 'GROUP_ERR_USER_LONG' => 'Group names cannot exceed 60 characters. The specified group name is too long.', 'GUEST' => 'Guest', - 'GUEST_USERS_ONLINE' => 'There are %d guest users online', - 'GUEST_USERS_TOTAL' => '%d guests', - 'GUEST_USERS_ZERO_ONLINE' => 'There are 0 guest users online', - 'GUEST_USERS_ZERO_TOTAL' => '0 guests', - 'GUEST_USER_ONLINE' => 'There is %d guest user online', - 'GUEST_USER_TOTAL' => '%d guest', + 'GUEST_USERS_ONLINE' => array( + 0 => 'There are 0 guest users online', + 1 => 'There is %d guest user online', + 2 => 'There are %d guest users online', + ), + 'GUEST_USERS_TOTAL' => array( + 0 => '0 guests', + 1 => '%d guest', + 2 => '%d guests', + ), 'G_ADMINISTRATORS' => 'Administrators', 'G_BOTS' => 'Bots', 'G_GUESTS' => 'Guests', @@ -259,15 +265,16 @@ $lang = array_merge($lang, array( 'G_GLOBAL_MODERATORS' => 'Global moderators', 'G_NEWLY_REGISTERED' => 'Newly registered users', - 'HIDDEN_USERS_ONLINE' => '%d hidden users online', - 'HIDDEN_USERS_TOTAL' => '%d hidden', - 'HIDDEN_USERS_TOTAL_AND' => '%d hidden and ', - 'HIDDEN_USERS_ZERO_ONLINE' => '0 hidden users online', - 'HIDDEN_USERS_ZERO_TOTAL' => '0 hidden', - 'HIDDEN_USERS_ZERO_TOTAL_AND' => '0 hidden and ', - 'HIDDEN_USER_ONLINE' => '%d hidden user online', - 'HIDDEN_USER_TOTAL' => '%d hidden', - 'HIDDEN_USER_TOTAL_AND' => '%d hidden and ', + 'HIDDEN_USERS_ONLINE' => array( + 0 => '0 hidden users', + 1 => '%d hidden user', + 2 => '%d hidden users', + ), + 'HIDDEN_USERS_TOTAL' => array( + 0 => '0 hidden', + 1 => '%d hidden', + 2 => '%d hidden', + ), 'HIDE_GUESTS' => 'Hide guests', 'HIDE_ME' => 'Hide my online status this session', 'HOURS' => 'Hours', @@ -354,8 +361,11 @@ $lang = array_merge($lang, array( 'NEWEST_USER' => 'Our newest member <strong>%s</strong>', 'NEW_MESSAGE' => 'New message', 'NEW_MESSAGES' => 'New messages', - 'NEW_PM' => '<strong>%d</strong> new message', - 'NEW_PMS' => '<strong>%d</strong> new messages', + 'NEW_PMS' => array( + 0 => '<strong>0</strong> new messages', + 1 => '<strong>%d</strong> new message', + 2 => '<strong>%d</strong> new messages', + ), 'NEW_POST' => 'New post', // Not used anymore 'NEW_POSTS' => 'New posts', // Not used anymore 'NEXT' => 'Next', // Used in pagination @@ -389,7 +399,6 @@ $lang = array_merge($lang, array( 'NO_MODE' => 'No mode specified.', 'NO_MODERATORS' => 'There are no moderators.', 'NO_NEW_MESSAGES' => 'No new messages', - 'NO_NEW_PM' => '<strong>0</strong> new messages', 'NO_NEW_POSTS' => 'No new posts', // Not used anymore 'NO_ONLINE_USERS' => 'No registered users', 'NO_POSTS' => 'No posts', @@ -403,7 +412,6 @@ $lang = array_merge($lang, array( 'NO_TOPIC_FORUM' => 'The topic or forum no longer exists.', 'NO_TOPICS' => 'There are no topics or posts in this forum.', 'NO_TOPICS_TIME_FRAME' => 'No topics exist inside this forum for the selected time frame.', - 'NO_UNREAD_PM' => '<strong>0</strong> unread messages', 'NO_UNREAD_POSTS' => 'No unread posts', 'NO_UPLOAD_FORM_FOUND' => 'Upload initiated but no valid file upload form found.', 'NO_USER' => 'The requested user does not exist.', @@ -421,9 +429,18 @@ $lang = array_merge($lang, array( 'OFFLINE' => 'Offline', 'ONLINE' => 'Online', 'ONLINE_BUDDIES' => 'Online friends', - 'ONLINE_USERS_TOTAL' => 'In total there are <strong>%d</strong> users online :: ', - 'ONLINE_USERS_ZERO_TOTAL' => 'In total there are <strong>0</strong> users online :: ', - 'ONLINE_USER_TOTAL' => 'In total there is <strong>%d</strong> user online :: ', + // "... :: x registered and y hidden" + 'ONLINE_USERS_TOTAL' => array( + 0 => 'In total there are <strong>0</strong> users online :: %2$s and %3$s', + 1 => 'In total there is <strong>%1$d</strong> user online :: %2$s and %3$s', + 2 => 'In total there are <strong>%1$d</strong> users online :: %2$s and %3$s', + ), + // "... :: x registered, y hidden and z guests" + 'ONLINE_USERS_TOTAL_GUESTS' => array( + 0 => 'In total there are <strong>0</strong> users online :: %2$s, %3$s and %4$s', + 1 => 'In total there is <strong>%1$d</strong> user online :: %2$s, %3$s and %4$s', + 2 => 'In total there are <strong>%1$d</strong> users online :: %2$s, %3$s and %4$s', + ), 'OPTIONS' => 'Options', 'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>', @@ -477,15 +494,17 @@ $lang = array_merge($lang, array( 'REDIRECTS' => 'Total redirects', 'REGISTER' => 'Register', 'REGISTERED_USERS' => 'Registered users:', - 'REG_USERS_ONLINE' => 'There are %d registered users and ', - 'REG_USERS_TOTAL' => '%d registered, ', - 'REG_USERS_TOTAL_AND' => '%d registered and ', - 'REG_USERS_ZERO_ONLINE' => 'There are 0 registered users and ', - 'REG_USERS_ZERO_TOTAL' => '0 registered, ', - 'REG_USERS_ZERO_TOTAL_AND' => '0 registered and ', - 'REG_USER_ONLINE' => 'There is %d registered user and ', - 'REG_USER_TOTAL' => '%d registered, ', - 'REG_USER_TOTAL_AND' => '%d registered and ', + // "... and 2 hidden users online" + 'REG_USERS_ONLINE' => array( + 0 => 'There are 0 registered users and %2$s online', + 1 => 'There is %1$d registered user and %2$s online', + 2 => 'There are %1$d registered users and %2$s online', + ), + 'REG_USERS_TOTAL' => array( + 0 => '0 registered', + 1 => '%d registered', + 2 => '%d registered', + ), 'REMOVE' => 'Remove', 'REMOVE_INSTALL' => 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.', 'REPLIES' => 'Replies', @@ -637,19 +656,33 @@ $lang = array_merge($lang, array( 'TOPIC_TITLE' => 'Topic title', 'TOPIC_UNAPPROVED' => 'This topic has not been approved', 'TOTAL_ATTACHMENTS' => 'Attachment(s)', - 'TOTAL_LOG' => '1 log', - 'TOTAL_LOGS' => '%d logs', - 'TOTAL_NO_PM' => '0 private messages in total', - 'TOTAL_PM' => '1 private message in total', - 'TOTAL_PMS' => '%d private messages in total', + 'TOTAL_LOGS' => array( + 0 => '0 logs', + 1 => '%d log', + 2 => '%d logs', + ), + 'TOTAL_PMS' => array( + 0 => '0 private messages in total', + 1 => '%d private message in total', + 2 => '%d private messages in total', + ), 'TOTAL_POSTS' => 'Total posts', - 'TOTAL_POSTS_OTHER' => 'Total posts <strong>%d</strong>', - 'TOTAL_POSTS_ZERO' => 'Total posts <strong>0</strong>', + 'TOTAL_POSTS_COUNT' => array( + 0 => 'Total posts <strong>0</strong>', + 1 => 'Total posts <strong>%d</strong>', + 2 => 'Total posts <strong>%d</strong>', + ), 'TOPIC_REPORTED' => 'This topic has been reported', - 'TOTAL_TOPICS_OTHER'=> 'Total topics <strong>%d</strong>', - 'TOTAL_TOPICS_ZERO' => 'Total topics <strong>0</strong>', - 'TOTAL_USERS_OTHER' => 'Total members <strong>%d</strong>', - 'TOTAL_USERS_ZERO' => 'Total members <strong>0</strong>', + 'TOTAL_TOPICS' => array( + 0 => 'Total topics <strong>0</strong>', + 1 => 'Total topics <strong>%d</strong>', + 2 => 'Total topics <strong>%d</strong>', + ), + 'TOTAL_USERS' => array( + 0 => 'Total members <strong>0</strong>', + 1 => 'Total members <strong>%d</strong>', + 2 => 'Total members <strong>%d</strong>', + ), 'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s', 'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image.', @@ -657,8 +690,11 @@ $lang = array_merge($lang, array( 'UNKNOWN_BROWSER' => 'Unknown browser', 'UNMARK_ALL' => 'Unmark all', 'UNREAD_MESSAGES' => 'Unread messages', - 'UNREAD_PM' => '<strong>%d</strong> unread message', - 'UNREAD_PMS' => '<strong>%d</strong> unread messages', + 'UNREAD_PMS' => array( + 0 => '<strong>0</strong> unread messages', + 1 => '<strong>%d</strong> unread message', + 2 => '<strong>%d</strong> unread messages', + ), 'UNREAD_POST' => 'Unread post', 'UNREAD_POSTS' => 'Unread posts', 'UNWATCH_FORUM_CONFIRM' => 'Are you sure you wish to unsubscribe from this forum?', @@ -676,8 +712,11 @@ $lang = array_merge($lang, array( 'USERNAMES' => 'Usernames', 'USER_AVATAR' => 'User avatar', 'USER_CANNOT_READ' => 'You cannot read posts in this forum.', - 'USER_POST' => '%d Post', - 'USER_POSTS' => '%d Posts', + 'USER_POSTS' => array( + 0 => '0 Posts', + 1 => '%d Post', + 2 => '%d Posts', + ), 'USERS' => 'Users', 'USE_PERMISSIONS' => 'Test out user’s permissions', @@ -685,6 +724,11 @@ $lang = array_merge($lang, array( 'VARIANT_DATE_SEPARATOR' => ' / ', // Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date 'VIEWED' => 'Viewed', + 'VIEWED_COUNTS' => array( + 0 => 'Not viewed yet', + 1 => 'Viewed %d time', + 2 => 'Viewed %d times', + ), 'VIEWING_FAQ' => 'Viewing FAQ', 'VIEWING_MEMBERS' => 'Viewing member details', 'VIEWING_ONLINE' => 'Viewing who is online', @@ -699,8 +743,11 @@ $lang = array_merge($lang, array( 'VIEW_LATEST_POST' => 'View the latest post', 'VIEW_NEWEST_POST' => 'View first unread post', 'VIEW_NOTES' => 'View user notes', - 'VIEW_ONLINE_TIME' => 'based on users active over the past %d minute', - 'VIEW_ONLINE_TIMES' => 'based on users active over the past %d minutes', + 'VIEW_ONLINE_TIMES' => array( + 0 => 'based on users active over the past %d minutes', + 1 => 'based on users active over the past %d minute', + 2 => 'based on users active over the past %d minutes', + ), 'VIEW_TOPIC' => 'View topic', 'VIEW_TOPIC_ANNOUNCEMENT' => 'Announcement: ', 'VIEW_TOPIC_GLOBAL' => 'Global Announcement: ', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 16d6db061e..2d351eb9e0 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -120,8 +120,11 @@ $lang = array_merge($lang, array( 'LATEST_WARNING_TIME' => 'Latest warning issued', 'LATEST_WARNINGS' => 'Latest 5 warnings', 'LEAVE_SHADOW' => 'Leave shadow topic in place', - 'LIST_REPORT' => '1 report', - 'LIST_REPORTS' => '%d reports', + 'LIST_REPORTS' => array( + 0 => '%d reports', + 1 => '%d report', + 2 => '%d reports', + ), 'LOCK' => 'Lock', 'LOCK_POST_POST' => 'Lock post', 'LOCK_POST_POST_CONFIRM' => 'Are you sure you want to prevent editing this post?', @@ -251,11 +254,13 @@ $lang = array_merge($lang, array( 'PM_REPORT_CLOSED_SUCCESS' => 'The selected PM report has been closed successfully.', 'PM_REPORT_DELETED_SUCCESS' => 'The selected PM report has been deleted successfully.', 'PM_REPORTED_SUCCESS' => 'This private message has been successfully reported.', - 'PM_REPORT_TOTAL' => 'In total there is <strong>1</strong> PM report to review.', 'PM_REPORTS_CLOSED_SUCCESS' => 'The selected PM reports have been closed successfully.', 'PM_REPORTS_DELETED_SUCCESS'=> 'The selected PM reports have been deleted successfully.', - 'PM_REPORTS_TOTAL' => 'In total there are <strong>%d</strong> PM reports to review.', - 'PM_REPORTS_ZERO_TOTAL' => 'There are no PM reports to review.', + 'PM_REPORTS_TOTAL' => array( + 0 => 'There are no PM reports to review.', + 1 => 'In total there is <strong>1</strong> PM report to review.', + 2 => 'In total there are <strong>%d</strong> PM reports to review.', + ), 'PM_REPORT_DETAILS' => 'Private message report details', 'POSTER' => 'Poster', 'POSTS_APPROVED_SUCCESS' => 'The selected posts have been approved.', @@ -282,8 +287,11 @@ $lang = array_merge($lang, array( 'REPORTED_ON_DATE' => 'on', 'REPORTS_CLOSED_SUCCESS' => 'The selected reports have been closed successfully.', 'REPORTS_DELETED_SUCCESS' => 'The selected reports have been deleted successfully.', - 'REPORTS_TOTAL' => 'In total there are <strong>%d</strong> reports to review.', - 'REPORTS_ZERO_TOTAL' => 'There are no reports to review.', + 'REPORTS_TOTAL' => array( + 0 => 'There are no reports to review.', + 1 => 'In total there is <strong>1</strong> report to review.', + 2 => 'In total there are <strong>%d</strong> reports to review.', + ), 'REPORT_CLOSED' => 'This report has already been closed.', 'REPORT_CLOSED_SUCCESS' => 'The selected report has been closed successfully.', 'REPORT_DELETED_SUCCESS' => 'The selected report has been deleted successfully.', @@ -295,7 +303,6 @@ $lang = array_merge($lang, array( 'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.', 'REPORT_REASON' => 'Report reason', 'REPORT_TIME' => 'Report time', - 'REPORT_TOTAL' => 'In total there is <strong>1</strong> report to review.', 'RESYNC' => 'Resync', 'RETURN_MESSAGE' => '%sReturn to the message%s', 'RETURN_NEW_FORUM' => '%sGo to the new forum%s', @@ -353,9 +360,11 @@ $lang = array_merge($lang, array( 'TOPIC_UNLOCKED_SUCCESS' => 'The selected topic has been unlocked.', 'TOTAL_WARNINGS' => 'Total Warnings', - 'UNAPPROVED_POSTS_TOTAL' => 'In total there are <strong>%d</strong> posts waiting for approval.', - 'UNAPPROVED_POSTS_ZERO_TOTAL' => 'There are no posts waiting for approval.', - 'UNAPPROVED_POST_TOTAL' => 'In total there is <strong>1</strong> post waiting for approval.', + 'UNAPPROVED_POSTS_TOTAL' => array( + 0 => 'There are no posts waiting for approval.', + 1 => 'In total there is <strong>1</strong> post waiting for approval.', + 2 => 'In total there are <strong>%d</strong> posts waiting for approval.', + ), 'UNLOCK' => 'Unlock', 'UNLOCK_POST' => 'Unlock post', 'UNLOCK_POST_EXPLAIN' => 'Allow editing', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 75c375d9eb..8138b61ae2 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -93,8 +93,11 @@ $lang = array_merge($lang, array( 'LAST_ACTIVE' => 'Last active', 'LESS_THAN' => 'Less than', - 'LIST_USER' => '1 user', - 'LIST_USERS' => '%d users', + 'LIST_USERS' => array( + 0 => '0 users', + 1 => '%d user', + 2 => '%d users', + ), 'LOGIN_EXPLAIN_LEADERS' => 'The board requires you to be registered and logged in to view the team listing.', 'LOGIN_EXPLAIN_MEMBERLIST' => 'The board requires you to be registered and logged in to access the memberlist.', 'LOGIN_EXPLAIN_SEARCHUSER' => 'The board requires you to be registered and logged in to search users.', @@ -136,6 +139,7 @@ $lang = array_merge($lang, array( 'USER_LAST_REMINDED' => array( 0 => 'No reminder sent at this time', 1 => '%1$d reminder sent<br />» %2$s', + 2 => '%1$d reminder sent<br />» %2$s', ), 'USER_ONLINE' => 'Online', 'USER_PRESENCE' => 'Board presence', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 887b9c57dc..01b1b3a9e1 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -149,8 +149,16 @@ $lang = array_merge($lang, array( 'POLL_MAX_OPTIONS' => 'Options per user', 'POLL_MAX_OPTIONS_EXPLAIN' => 'This is the number of options each user may select when voting.', 'POLL_OPTIONS' => 'Poll options', - 'POLL_OPTIONS_EXPLAIN' => 'Place each option on a new line. You may enter up to <strong>%d</strong> options.', - 'POLL_OPTIONS_EDIT_EXPLAIN' => 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.', + 'POLL_OPTIONS_EXPLAIN' => array( + 0 => 'Place each option on a new line. You may enter up to <strong>%d</strong> options.', + 1 => 'Place each option on a new line. You may enter <strong>%d</strong> option.', + 2 => 'Place each option on a new line. You may enter up to <strong>%d</strong> options.', + ), + 'POLL_OPTIONS_EDIT_EXPLAIN' => array( + 0 => 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.', + 1 => 'Place each option on a new line. You may enter <strong>%d</strong> option. If you remove or add options all previous votes will be reset.', + 2 => 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.', + ), 'POLL_QUESTION' => 'Poll question', 'POLL_TITLE_TOO_LONG' => 'The poll title must contain fewer than 100 characters.', 'POLL_TITLE_COMP_TOO_LONG' => 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.', @@ -175,7 +183,11 @@ $lang = array_merge($lang, array( 'POST_TOPIC_AS' => 'Post topic as', 'PROGRESS_BAR' => 'Progress bar', - 'QUOTE_DEPTH_EXCEEDED' => 'You may embed only %1$d quotes within each other.', + 'QUOTE_DEPTH_EXCEEDED' => array( + 0 => 'You may embed only %d quotes within each other.', + 1 => 'You may embed only %d quote within each other.', + 2 => 'You may embed only %d quotes within each other.', + ), 'SAVE' => 'Save', 'SAVE_DATE' => 'Saved at', diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index 6d3a94667a..734b65e575 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -41,9 +41,16 @@ $lang = array_merge($lang, array( 'DISPLAY_RESULTS' => 'Display results as', - 'FOUND_SEARCH_MATCH' => 'Search found %d match', - 'FOUND_SEARCH_MATCHES' => 'Search found %d matches', - 'FOUND_MORE_SEARCH_MATCHES' => 'Search found more than %d matches', + 'FOUND_SEARCH_MATCHES' => array( + 0 => 'Search found %d matches', + 1 => 'Search found %d match', + 2 => 'Search found %d matches', + ), + 'FOUND_MORE_SEARCH_MATCHES' => array( + 0 => 'Search found more than %d matches', + 1 => 'Search found more than %d match', + 2 => 'Search found more than %d matches', + ), 'GLOBAL' => 'Global announcement', @@ -100,5 +107,9 @@ $lang = array_merge($lang, array( 'SORT_POST_SUBJECT' => 'Post subject', 'SORT_TIME' => 'Post time', - 'TOO_FEW_AUTHOR_CHARS' => 'You must specify at least %d characters of the authors name.', + 'TOO_FEW_AUTHOR_CHARS' => array( + 0 => 'You must specify at least %d characters of the authors name.', + 1 => 'You must specify at least %d character of the authors name.', + 2 => 'You must specify at least %d characters of the authors name.', + ), )); diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index c8ffbf31c0..fb26c2f8e1 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -202,13 +202,21 @@ $lang = array_merge($lang, array( 'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.', 'FOES_UPDATED' => 'Your foes list has been updated successfully.', 'FOLDER_ADDED' => 'Folder successfully added.', - 'FOLDER_MESSAGE_STATUS' => '%1$d from %2$d messages stored', + 'FOLDER_MESSAGE_STATUS' => array( + 0 => '%2$d from %1$d messages stored', + 1 => '%2$d from %1$d message stored', + 2 => '%2$d from %1$d messages stored', + ), 'FOLDER_NAME_EMPTY' => 'You must enter a name for this folder.', 'FOLDER_NAME_EXIST' => 'Folder <strong>%s</strong> already exists.', 'FOLDER_OPTIONS' => 'Folder options', 'FOLDER_RENAMED' => 'Folder successfully renamed.', 'FOLDER_REMOVED' => 'Folder successfully removed.', - 'FOLDER_STATUS_MSG' => 'Folder is %1$d%% full (%2$d from %3$d messages stored)', + 'FOLDER_STATUS_MSG' => array( + 0 => 'Folder is %3$d%% full (%2$d from %1$d messages stored)', + 1 => 'Folder is %3$d%% full (%2$d from %1$d message stored)', + 2 => 'Folder is %3$d%% full (%2$d from %1$d messages stored)', + ), 'FORWARD_PM' => 'Forward PM', 'FORCE_PASSWORD_EXPLAIN' => 'Before you may continue browsing the board you are required to change your password.', 'FRIEND_MESSAGE' => 'Message from friend', @@ -292,8 +300,11 @@ $lang = array_merge($lang, array( 'NOT_ADDED_FOES_SELF' => 'You cannot add yourself to the foes list.', 'NOT_AGREE' => 'I do not agree to these terms', 'NOT_ENOUGH_SPACE_FOLDER' => 'The destination folder “%s” seems to be full. The requested action has not been taken.', - 'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.', - 'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.', + 'NOT_MOVED_MESSAGES' => array( + 0 => 'You have %d private messages currently on hold because of full folder.', + 1 => 'You have %d private message currently on hold because of full folder.', + 2 => 'You have %d private messages currently on hold because of full folder.', + ), 'NO_ACTION_MODE' => 'No message action specified.', 'NO_AUTHOR' => 'No author defined for this message', 'NO_AVATAR_CATEGORY' => 'None', @@ -388,8 +399,11 @@ $lang = array_merge($lang, array( 'RULE_ALREADY_DEFINED' => 'This rule was defined previously.', 'RULE_DELETED' => 'Rule successfully removed.', 'RULE_NOT_DEFINED' => 'Rule not correctly specified.', - 'RULE_REMOVED_MESSAGE' => 'One private message had been removed due to private message filters.', - 'RULE_REMOVED_MESSAGES' => '%d private messages were removed due to private message filters.', + 'RULE_REMOVED_MESSAGES' => array( + 0 => '%d private messages were removed due to private message filters.', + 1 => '%d private message was removed due to private message filters.', + 2 => '%d private messages were removed due to private message filters.', + ), 'SAME_PASSWORD_ERROR' => 'The new password you entered is the same as your current password.', 'SEARCH_YOUR_POSTS' => 'Show your posts', @@ -489,8 +503,11 @@ $lang = array_merge($lang, array( '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_PM_MESSAGES' => array( + 0 => '%d messages', + 1 => '%d message', + 2 => '%d messages', + ), 'VIEW_PREVIOUS_HISTORY' => 'Previous PM in history', 'VIEW_PREVIOUS_PM' => 'Previous PM', 'VIEW_SIGS' => 'Display signatures', diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php index 6905a7a629..d5eea0f4e3 100644 --- a/phpBB/language/en/viewforum.php +++ b/phpBB/language/en/viewforum.php @@ -64,6 +64,9 @@ $lang = array_merge($lang, array( 'UNREAD_POSTS_LOCKED' => 'Unread posts [ Locked ]', 'VIEW_FORUM' => 'View forum', - 'VIEW_FORUM_TOPIC' => '1 topic', - 'VIEW_FORUM_TOPICS' => '%d topics', + 'VIEW_FORUM_TOPICS' => array( + 0 => '%d topics', + 1 => '%d topic', + 2 => '%d topics', + ), )); diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 9e69d657b7..1e686b69ab 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -53,8 +53,11 @@ $lang = array_merge($lang, array( 'DELETE_TOPIC' => 'Delete topic', 'DOWNLOAD_NOTICE' => 'You do not have the required permissions to view the files attached to this post.', - 'EDITED_TIMES_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d times in total.', - 'EDITED_TIME_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d time in total.', + 'EDITED_TIMES_TOTAL' => array( + 0 => 'Last edited by %2$s on %3$s, edited %1$d times in total.', + 1 => 'Last edited by %2$s on %3$s, edited %1$d time in total.', + 2 => 'Last edited by %2$s on %3$s, edited %1$d times in total.', + ) 'EMAIL_TOPIC' => 'E-mail friend', 'ERROR_NO_ATTACHMENT' => 'The selected attachment does not exist anymore.', @@ -70,8 +73,11 @@ $lang = array_merge($lang, array( 'MAKE_GLOBAL' => 'Change to “Global”', 'MAKE_NORMAL' => 'Change to “Standard Topic”', 'MAKE_STICKY' => 'Change to “Sticky”', - 'MAX_OPTIONS_SELECT' => 'You may select up to <strong>%d</strong> options', - 'MAX_OPTION_SELECT' => 'You may select <strong>1</strong> option', + 'MAX_OPTIONS_SELECT' => array( + 0 => 'You may select up to <strong>%d</strong> options', + 1 => 'You may select <strong>%d</strong> option', + 2 => 'You may select up to <strong>%d</strong> options', + ), 'MISSING_INLINE_ATTACHMENT' => 'The attachment <strong>%s</strong> is no longer available', 'MOVE_TOPIC' => 'Move topic', @@ -105,8 +111,11 @@ $lang = array_merge($lang, array( 'VIEW_NEXT_TOPIC' => 'Next topic', 'VIEW_PREVIOUS_TOPIC' => 'Previous topic', 'VIEW_RESULTS' => 'View results', - 'VIEW_TOPIC_POST' => '1 post', - 'VIEW_TOPIC_POSTS' => '%d posts', + 'VIEW_TOPIC_POSTS' => array( + 0 => '%d posts', + 1 => '%d post', + 2 => '%d posts', + ), 'VIEW_UNREAD_POST' => 'First unread post', 'VISIT_WEBSITE' => 'WWW', 'VOTE_SUBMITTED' => 'Your vote has been cast.', |