diff options
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 7 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 5 |
4 files changed, 12 insertions, 6 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 6f6a5f901f..8014ee64f1 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -777,4 +777,8 @@ $lang = array_merge($lang, array( 'LOG_WORD_ADD' => '<strong>Added word censor</strong><br />» %s', 'LOG_WORD_DELETE' => '<strong>Deleted word censor</strong><br />» %s', 'LOG_WORD_EDIT' => '<strong>Edited word censor</strong><br />» %s', + + 'LOG_EXT_ENABLE' => '<strong>Extension enabled</strong><br />» %s', + 'LOG_EXT_DISABLE' => '<strong>Extension disabled</strong><br />» %s', + 'LOG_EXT_PURGE' => '<strong>Extension’s data deleted</strong><br />» %s', )); diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 5ea151f6ea..2082d7c89d 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -142,7 +142,7 @@ $lang = array_merge($lang, array( 'ACL_M_EDIT' => 'Can edit posts', 'ACL_M_DELETE' => 'Can permanently delete posts', 'ACL_M_SOFTDELETE' => 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', - 'ACL_M_APPROVE' => 'Can approve posts', + 'ACL_M_APPROVE' => 'Can approve and restore posts', 'ACL_M_REPORT' => 'Can close and delete reports', 'ACL_M_CHGPOSTER' => 'Can change post author', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 7026e60911..30b3078a41 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -109,7 +109,7 @@ $lang = array_merge($lang, array( 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.', 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', 'AVATAR_URL_NOT_FOUND' => 'The file specified could not be found.', - 'AVATAR_WRONG_FILESIZE' => 'The avatar’s filesize must be between 0 and %1d %2s.', + 'AVATAR_WRONG_FILESIZE' => 'The avatar’s filesize must be between 0 and %1$d %2$s.', 'AVATAR_WRONG_SIZE' => 'The submitted avatar is %5$s wide and %6$s high. Avatars must be at least %1$s wide and %2$s high, but no larger than %3$s wide and %4$s high.', 'BACK_TO_TOP' => 'Top', @@ -167,7 +167,8 @@ $lang = array_merge($lang, array( 'CONGRATULATIONS' => 'Congratulations to', 'CONNECTION_FAILED' => 'Connection failed.', 'CONNECTION_SUCCESS' => 'Connection was successful!', - 'CONTACT_USER' => 'Contact', + 'CONTACT' => 'Contact', + 'CONTACT_USER' => 'Contact %s', 'COOKIES_DELETED' => 'All board cookies successfully deleted.', 'CURRENT_TIME' => 'It is currently %s', @@ -664,7 +665,7 @@ $lang = array_merge($lang, array( 'SELECT_DESTINATION_FORUM' => 'Please select a destination forum', 'SELECT_FORUM' => 'Select a forum', 'SEND_EMAIL' => 'Email', // Used for submit buttons - 'SEND_EMAIL_USER' => 'Email', // Used as: {L_SEND_EMAIL_USER} {USERNAME} -> Email UserX + 'SEND_EMAIL_USER' => 'Email %s', 'SEND_PRIVATE_MESSAGE' => 'Send private message', 'SETTINGS' => 'Settings', 'SIGNATURE' => 'Signature', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 5068f60573..59d22aae23 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -72,7 +72,7 @@ $lang = array_merge($lang, array( 'CHANGE_TOPIC_TO' => 'Change topic type to', 'CHARS_POST_CONTAINS' => array( 1 => 'Your message contains %1$d character.', - 2 => 'Your message contains %1$d characters.', + 2 => 'Your message contains %1$d characters.', ), 'CHARS_SIG_CONTAINS' => array( 1 => 'Your signature contains %1$d character.', @@ -221,6 +221,7 @@ $lang = array_merge($lang, array( 1 => 'You may embed only %d quote within each other.', 2 => 'You may embed only %d quotes within each other.', ), + 'QUOTE_NO_NESTING' => 'You may not embed quotes within each other.', 'SAVE' => 'Save', 'SAVE_DATE' => 'Saved at', @@ -267,6 +268,6 @@ $lang = array_merge($lang, array( 'VIEW_MESSAGE' => '%sView your submitted message%s', 'VIEW_PRIVATE_MESSAGE' => '%sView your submitted private message%s', - 'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1d %2s.', + 'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1$d %2$s.', 'WRONG_SIZE' => 'The image must be at least %1$s wide, %2$s high and at most %3$s wide and %4$s high. The submitted image is %5$s wide and %6$s high.', )); |