diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-22 15:14:03 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-22 15:14:03 +0000 |
| commit | 725b21f2d206efb4b34eb95ec3329bc81f66b805 (patch) | |
| tree | 7de41ee058c21e1884bc5d2292f5e7014a587890 /phpBB/language | |
| parent | daa0435614af7bed95e71f3b11aa2c372df3958d (diff) | |
| download | forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.tar forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.tar.gz forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.tar.bz2 forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.tar.xz forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.zip | |
time to squash some bugs
git-svn-id: file:///svn/phpbb/trunk@6114 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/ban.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/acp/modules.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 14 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 2 |
6 files changed, 16 insertions, 13 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 683baf03c1..51df843158 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -47,7 +47,7 @@ $lang = array_merge($lang, array( 'EMAIL_BAN_EXPLAIN' => 'To specify more than one email address enter each on a new line. To match partial addresses use * as the wildcard, e.g. *@hotmail.com, *@*.domain.tld, etc.', 'EMAIL_NO_BANNED' => 'No banned email addresses', 'EMAIL_UNBAN' => 'Un-ban or Un-exclude Emails', - 'EMAIL_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded email addresses have a grey background.', + 'EMAIL_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded email addresses have a marked background.', 'IP_BAN' => 'Ban one or more ips', 'IP_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered IP from all current bans.', @@ -55,7 +55,7 @@ $lang = array_merge($lang, array( 'IP_HOSTNAME' => 'IP addresses or hostnames', 'IP_NO_BANNED' => 'No banned IP addresses', 'IP_UNBAN' => 'Un-ban or Un-exclude IPs', - 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IP\'s have a grey background.', + 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IP\'s have a marked background.', 'PERMANENT' => 'Permanent', @@ -65,7 +65,7 @@ $lang = array_merge($lang, array( 'USER_BAN_EXPLAIN' => 'You can ban multiple users in one go by entering each name on a new line. Use the <u>Find a Username</u> facility to look up and add one or more users automatically.', 'USER_NO_BANNED' => 'No banned usernames', 'USER_UNBAN' => 'Un-ban or Un-exclude usernames', - 'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a grey background.', + 'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a marked background.', )); ?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php index 0dd8fe62d3..b5055570c1 100644 --- a/phpBB/language/en/acp/modules.php +++ b/phpBB/language/en/acp/modules.php @@ -55,7 +55,7 @@ $lang = array_merge($lang, array( 'MODULE_ADDED' => 'Module successfully added', 'MODULE_DELETED' => 'Module successfully removed', 'MODULE_DISPLAYED' => 'Module displayed', - 'MODULE_DISPLAYED_EXPLAIN' => 'If you do not whish to display this module, but want to use it, set this to no.', + 'MODULE_DISPLAYED_EXPLAIN' => 'If you do not wish to display this module, but want to use it, set this to no.', 'MODULE_EDITED' => 'Module successfully edited', 'MODULE_ENABLED' => 'Module enabled', 'MODULE_LANGNAME' => 'Module Language Name', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 5c326810f7..52bff60476 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -30,7 +30,8 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ADMIN_SIG_PREVIEW' => 'Signature preview', - + 'AT_LEAST_ONE_FOUNDER' => 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status promote another user to be a founder first.', + 'BAN_SUCCESSFUL' => 'Ban entered successfully', 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 3b5f6a796f..e310e5c12d 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -29,12 +29,12 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( - 'TRANSLATION_INFO' => 'blah', - 'ENCODING' => 'iso-8859-1', - 'DIRECTION' => 'ltr', - 'LEFT' => 'left', - 'RIGHT' => 'right', - 'DATE_FORMAT' => '|d M Y|', + 'TRANSLATION_INFO' => '', + 'ENCODING' => 'iso-8859-1', + 'DIRECTION' => 'ltr', + 'LEFT' => 'left', + 'RIGHT' => 'right', + 'DATE_FORMAT' => '|d M Y|', '1_DAY' => '1 day', '1_MONTH' => '1 month', @@ -431,6 +431,7 @@ $lang = array_merge($lang, array( 'SKIP' => 'Skip to content', 'SMTP_NO_AUTH_SUPPORT' => 'SMTP server does not support authentication', 'SORRY_AUTH_READ' => 'You are not authorised to read this forum', + 'SORRY_AUTH_VIEW_ATTACH' => 'You are not authorised to download this attachment', 'SORT_BY' => 'Sort by', 'SORT_JOINED' => 'Joined date', 'SORT_LOCATION' => 'Location', @@ -611,6 +612,7 @@ $lang = array_merge($lang, array( 'Feb' => 'Feb', 'Mar' => 'Mar', 'Apr' => 'Apr', + 'May_short' => 'May', // Short representation of "May". May_short used because in english the short and long date are the same for May. 'Jun' => 'Jun', 'Jul' => 'Jul', 'Aug' => 'Aug', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index b963c0b6e8..95c5b1976b 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -55,7 +55,7 @@ $lang = array_merge($lang, array( 'EMPTY_SUBJECT_EMAIL' => 'You must specify a subject for the email.', 'EQUAL_TO' => 'Equal to', - 'FIND_USERNAME_EXPLAIN' => 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format yyyy-mm-dd, e.g. 2002-01-01. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself). Alternatively you can mark the users required and click the Insert Marked button.', + 'FIND_USERNAME_EXPLAIN' => 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format yyyy-mm-dd, e.g. 2002-01-01. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself). Alternatively you can mark the users required and click the Select Marked button.', 'FLOOD_EMAIL_LIMIT' => 'You cannot send another email at this time. Please try again later.', 'GROUP_LEADER' => 'Group leader', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index dc63fc41ff..817019c9c6 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -182,7 +182,7 @@ $lang = array_merge($lang, array( 'UNABLE_GET_IMAGE_SIZE' => 'Accessing the image was impossible or file isn\'t a valid picture.', 'UNAUTHORISED_BBCODE' => 'You cannot use certain bbcodes: ', - 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you whish this topic to be displayed', + 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.', 'UPDATE_COMMENT' => 'Update comment', 'URL_INVALID' => 'The URL you specified is invalid.', 'URL_NOT_FOUND' => 'The file specified could not be found.', |