From fcec5b61daecb4a0174418d3851ee1e0e8a0d93c Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 8 Mar 2007 15:49:13 +0000 Subject: again... some more fixes. git-svn-id: file:///svn/phpbb/trunk@7150 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/acp/common.php | 38 +++++++++++++++++++------------------- phpBB/language/en/ucp.php | 2 ++ 2 files changed, 21 insertions(+), 19 deletions(-) (limited to 'phpBB/language') diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index d1b5af4df3..a75a965dcb 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -205,9 +205,9 @@ $lang = array_merge($lang, array( 'DEACTIVATE' => 'Deactivate', 'DIMENSIONS' => 'Dimensions', - 'DIRECTORY_DOES_NOT_EXIST' => 'The entered path "%s" does not exist.', - 'DIRECTORY_NOT_DIR' => 'The entered path "%s" is not a directory.', - 'DIRECTORY_NOT_WRITEABLE' => 'The entered path "%s" is not writeable.', + 'DIRECTORY_DOES_NOT_EXIST' => 'The entered path “%s” does not exist.', + 'DIRECTORY_NOT_DIR' => 'The entered path “%s” is not a directory.', + 'DIRECTORY_NOT_WRITEABLE' => 'The entered path “%s” is not writeable.', 'DISABLE' => 'Disable', 'DOWNLOAD' => 'Download', 'DOWNLOAD_AS' => 'Download as', @@ -411,12 +411,12 @@ $lang = array_merge($lang, array( 'LOG_ATTACH_FILEUPLOAD' => 'Orphan File uploaded to Post
» ID %1$d - %2$s', 'LOG_ATTACH_ORPHAN_DEL' => 'Orphan Files deleted
» %s', - 'LOG_BAN_EXCLUDE_USER' => 'Excluded user from ban for reason "%1$s"
» %2$s ', - 'LOG_BAN_EXCLUDE_IP' => 'Excluded IP from ban for reason "%1$s"
» %2$s ', - 'LOG_BAN_EXCLUDE_EMAIL' => 'Excluded email from ban for reason "%1$s"
» %2$s ', - 'LOG_BAN_USER' => 'Banned user for reason "%1$s"
» %2$s ', - 'LOG_BAN_IP' => 'Banned IP for reason "%1$s"
» %2$s', - 'LOG_BAN_EMAIL' => 'Banned email for reason "%1$s"
» %2$s', + 'LOG_BAN_EXCLUDE_USER' => 'Excluded user from ban for reason “%1$s”
» %2$s ', + 'LOG_BAN_EXCLUDE_IP' => 'Excluded IP from ban for reason “%1$s”
» %2$s ', + 'LOG_BAN_EXCLUDE_EMAIL' => 'Excluded email from ban for reason “%1$s”
» %2$s ', + 'LOG_BAN_USER' => 'Banned user for reason “%1$s”
» %2$s ', + 'LOG_BAN_IP' => 'Banned IP for reason “%1$s”
» %2$s', + 'LOG_BAN_EMAIL' => 'Banned email for reason “%1$s”
» %2$s', 'LOG_UNBAN_USER' => 'Unbanned user
» %s', 'LOG_UNBAN_IP' => 'Unbanned IP
» %s', 'LOG_UNBAN_EMAIL' => 'Unbanned email
» %s', @@ -499,7 +499,7 @@ $lang = array_merge($lang, array( 'LOG_FORUM_SYNC' => 'Re-synchronised forum
» %s', 'LOG_GROUP_CREATED' => 'New usergroup created
» %s', - 'LOG_GROUP_DEFAULTS' => 'Group made default for members
» %s', + 'LOG_GROUP_DEFAULTS' => 'Group “%1$s” made default for members
» %2$s', 'LOG_GROUP_DELETE' => 'Usergroup deleted
» %s', 'LOG_GROUP_DEMOTED' => 'Leaders demoted in usergroup %1$s
» %2$s', 'LOG_GROUP_PROMOTED' => 'Members promoted to leader in usergroup %1$s
» %2$s', @@ -523,7 +523,7 @@ $lang = array_merge($lang, array( 'LOG_INSTALL_CONVERTED' => 'Converted from %1$s to phpBB %2$s', 'LOG_INSTALL_INSTALLED' => 'Installed phpBB %s', - 'LOG_IP_BROWSER_FORWARDED_CHECK' => 'Session IP/browser/X_FORWARDED_FOR check failed
»User IP "%1$s" checked against session IP "%2$s", user browser string "%3$s" checked against session browser string "%4$s" and user X_FORWARDED_FOR string "%5$s" checked against session X_FORWARDED_FOR string "%6$s".', + 'LOG_IP_BROWSER_FORWARDED_CHECK' => 'Session IP/browser/X_FORWARDED_FOR check failed
»User IP “%1$s” checked against session IP “%2$s”, user browser string “%3$s” checked against session browser string “%4$s” and user X_FORWARDED_FOR string “%5$s” checked against session X_FORWARDED_FOR string “%6$s”.', 'LOG_JAB_CHANGED' => 'Jabber account changed', 'LOG_JAB_PASSCHG' => 'Jabber password changed', @@ -538,7 +538,7 @@ $lang = array_merge($lang, array( 'LOG_MASS_EMAIL' => 'Sent mass email
» %s', - 'LOG_MCP_CHANGE_POSTER' => 'Changed poster in topic "%1$s"
» from %2$s to %3$s', + 'LOG_MCP_CHANGE_POSTER' => 'Changed poster in topic “%1$s”
» from %2$s to %3$s', 'LOG_MODULE_DISABLE' => 'Module disabled', 'LOG_MODULE_ENABLE' => 'Module enabled', @@ -616,20 +616,20 @@ $lang = array_merge($lang, array( 'LOG_UPDATE_PHPBB' => 'Updated phpBB from version %1$s to version %2$s', 'LOG_USER_ACTIVE' => 'User activated
» %s', - 'LOG_USER_BAN_USER' => 'Banned User via user management for reason "%1$s"
» %2$s', - 'LOG_USER_BAN_IP' => 'Banned IP via user management for reason "%1$s"
» %2$s', - 'LOG_USER_BAN_EMAIL' => 'Banned email via user management for reason "%1$s"
» %2$s', + 'LOG_USER_BAN_USER' => 'Banned User via user management for reason “%1$s”
» %2$s', + 'LOG_USER_BAN_IP' => 'Banned IP via user management for reason “%1$s”
» %2$s', + 'LOG_USER_BAN_EMAIL' => 'Banned email via user management for reason “%1$s”
» %2$s', 'LOG_USER_DELETED' => 'Deleted user
» %s', 'LOG_USER_DEL_ATTACH' => 'Removed all attachments made by the user
» %s', 'LOG_USER_DEL_AVATAR' => 'Removed user avatar
» %s', 'LOG_USER_DEL_POSTS' => 'Removed all posts made by the user
» %s', 'LOG_USER_DEL_SIG' => 'Removed user signature
» %s', 'LOG_USER_INACTIVE' => 'User deactivated
» %s', - 'LOG_USER_MOVE_POSTS' => 'Moved user posts
» posts by "%1$s" to forum "%2$s"', + 'LOG_USER_MOVE_POSTS' => 'Moved user posts
» posts by “%1$s” to forum “%2$s”', 'LOG_USER_NEW_PASSWORD' => 'Changed user password
» %s', 'LOG_USER_REACTIVATE' => 'Forced user account re-activation
» %s', - 'LOG_USER_UPDATE_EMAIL' => 'User "%1$s" changed email
» from "%2$s" to "%3$s"', - 'LOG_USER_UPDATE_NAME' => 'Changed username
» from "%1$s" to "%2$s"', + 'LOG_USER_UPDATE_EMAIL' => 'User “%1$s” changed email
» from “%2$s” to “%3$s”', + 'LOG_USER_UPDATE_NAME' => 'Changed username
» from “%1$s” to “%2$s”', 'LOG_USER_USER_UPDATE' => 'Updated user details
» %s', 'LOG_USER_ACTIVE_USER' => 'User account activated', @@ -639,7 +639,7 @@ $lang = array_merge($lang, array( 'LOG_USER_GENERAL' => '%s', 'LOG_USER_INACTIVE_USER' => 'User account de-activated', 'LOG_USER_LOCK' => 'User locked own topic
» %s', - 'LOG_USER_MOVE_POSTS_USER' => 'Moved all posts to forum "%s"', + 'LOG_USER_MOVE_POSTS_USER' => 'Moved all posts to forum» %s', 'LOG_USER_REACTIVATE_USER' => 'Forced user account re-activation', 'LOG_USER_UNLOCK' => 'User unlocked own topic
» %s', 'LOG_USER_WARNING' => 'Added user warning
» %s', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 459565c7a5..0ed68da8fe 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -315,10 +315,12 @@ $lang = array_merge($lang, array( 'PM_FROM_REMOVED_AUTHOR' => 'This message was sent by a user no longer registered.', 'PM_ICON' => 'PM icon', 'PM_INBOX' => 'Inbox', + 'PM_NO_USERS' => 'The requested users to be added do not exist.', 'PM_OUTBOX' => 'Outbox', 'PM_SENTBOX' => 'Sent messages', 'PM_SUBJECT' => 'Message subject', 'PM_TO' => 'Send to', + 'PM_USERS_REMOVED_NO_PM' => 'Some users couldn’t be added as they have disabled private message receipt.', 'POPUP_ON_PM' => 'Pop up window on new private message', 'POST_EDIT_PM' => 'Edit message', 'POST_FORWARD_PM' => 'Forward message', -- cgit v1.2.1