diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-18 18:18:32 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-18 18:18:32 +0000 |
| commit | 7e25c8d9cc255fbe460c2a970ad7da241c0880bb (patch) | |
| tree | 89bb537574b06359d58f515a07fa6e37b6c63cf9 /phpBB/language | |
| parent | f15d6862ae4a62421da83e10dfdeb7153756af1a (diff) | |
| download | forums-7e25c8d9cc255fbe460c2a970ad7da241c0880bb.tar forums-7e25c8d9cc255fbe460c2a970ad7da241c0880bb.tar.gz forums-7e25c8d9cc255fbe460c2a970ad7da241c0880bb.tar.bz2 forums-7e25c8d9cc255fbe460c2a970ad7da241c0880bb.tar.xz forums-7e25c8d9cc255fbe460c2a970ad7da241c0880bb.zip | |
- added a few missing log variables
- include acp/common.php language file if displaying logs (LOG_ variables should be stored there only now)
- added check to cron.php
- added database_gc config variable
- recalculate binary trees every once a week ;)
git-svn-id: file:///svn/phpbb/trunk@5929 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 39 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 10 | ||||
| -rw-r--r-- | phpBB/language/en/groups.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 20 |
4 files changed, 39 insertions, 32 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 14d0ed952f..a4507e0e10 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -350,6 +350,9 @@ $lang = array_merge($lang, array( 'LOG_ACL_TRANSFER_PERMISSIONS' => '<b>Permissions transfered from</b><br />» %s', 'LOG_ACL_RESTORE_PERMISSIONS' => '<b>Own permissions restored after using permissions from</b><br />» %s', + 'LOG_ADMIN_AUTH_FAIL' => '<b>Failed administration login attempt</b>', + 'LOG_ADMIN_AUTH_SUCCESS' => '<b>Sucessful administration login</b>', + 'LOG_ATTACH_EXT_ADD' => '<b>Added or edited attachment extension</b><br />» %s', 'LOG_ATTACH_EXT_DEL' => '<b>Removed attachment extension</b><br />» %s', 'LOG_ATTACH_EXT_UPDATE' => '<b>Updated attachment extension</b><br />» %s', @@ -400,6 +403,20 @@ $lang = array_merge($lang, array( 'LOG_CONFIG_SIGNATURE' => '<b>Altered signature settings</b>', 'LOG_CONFIG_VISUAL' => '<b>Altered visual confirmation settings</b>', + 'LOG_APPROVE_TOPIC' => '<b>Approved topic</b><br />» %s', + 'LOG_DELETE_POST' => '<b>Deleted post</b><br />» %s', + 'LOG_DELETE_TOPIC' => '<b>Deleted topic</b><br />» %s', + 'LOG_FORK' => '<b>Copied topic</b><br />» from %s', + 'LOG_LOCK' => '<b>Locked topic</b><br />» %s', + 'LOG_LOCK_POST' => '<b>Locked post</b><br />» %s', + 'LOG_MERGE' => '<b>Merged posts</b> into topic<br />»%s', + 'LOG_MOVE' => '<b>Moved topic</b><br />» from %s', + 'LOG_TOPIC_DELETED' => '<b>Deleted topic</b><br />» %s', + 'LOG_TOPIC_RESYNC' => '<b>Resynchronised topic counters</b><br />» %s', + 'LOG_TOPIC_TYPE_CHANGED' => '<b>Changed topic type</b><br />» %s', + 'LOG_UNLOCK' => '<b>Unlocked topic</b><br />» %s', + 'LOG_UNLOCK_POST' => '<b>Unlocked post</b><br />» %s', + 'LOG_DISALLOW_ADD' => '<b>Added disallowed username</b><br />» %s', 'LOG_DISALLOW_DELETE' => '<b>Deleted disallowed username</b>', @@ -451,6 +468,8 @@ $lang = array_merge($lang, array( 'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />» %s', 'LOG_INSTALL_INSTALLED' => '<b>Installed phpBB %s</b>', + 'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />»User IP "<i>%s</i>" checked against session IP "<i>%s</i>" and user browser string "<i>%s</i>" checked against session browser string "<i>%s</i>".', + 'LOG_JAB_CHANGED' => '<b>Jabber account changed</b>', 'LOG_JAB_PASSCHG' => '<b>Jabber password changed</b>', 'LOG_JAB_REGISTER' => '<b>Jabber account registered</b>', @@ -531,7 +550,6 @@ $lang = array_merge($lang, array( 'LOG_USER_DEL_AVATAR' => '<b>Removed user avatar</b><br />» %s', 'LOG_USER_DEL_POSTS' => '<b>Removed all posts made by the user</b><br />» %s', 'LOG_USER_DEL_SIG' => '<b>Removed user signature</b><br />» %s', - 'LOG_USER_GROUP_CHANGE' => '<b>User changed default group</b><br />» %s', 'LOG_USER_INACTIVE' => '<b>User deactivated</b><br />» %s', 'LOG_USER_MOVE_POSTS' => '<b>Moved user posts</b><br />» posts by "%s" to forum "%s"', 'LOG_USER_NEW_PASSWORD' => '<b>Changed user password</b><br />» %s', @@ -540,6 +558,25 @@ $lang = array_merge($lang, array( 'LOG_USER_UPDATE_NAME' => '<b>Changed username</b><br />» from "%s" to "%s"', 'LOG_USER_USER_UPDATE' => '<b>Updated user details</b><br />» %s', + 'LOG_USER_ACTIVE_USER' => '<b>User account activated</b>', + 'LOG_USER_DEL_AVATAR_USER' => '<b>User avatar removed</b>', + 'LOG_USER_DEL_SIG_USER' => '<b>User signature removed</b>', + 'LOG_USER_FEEDBACK' => '<b>Added user feedback</b><br />» %s', + 'LOG_USER_GENERAL' => '%s', + 'LOG_USER_INACTIVE_USER' => '<b>User account de-activated</b>', + 'LOG_USER_LOCK' => '<b>User locked own topic</b><br />» %s', + 'LOG_USER_MOVE_POSTS_USER' => '<b>Moved all posts to forum "%s"</b>', + 'LOG_USER_REACTIVATE_USER' => '<b>Forced user account re-activation</b>', + 'LOG_USER_UNLOCK' => '<b>User unlocked own topic</b><br />» %s', + 'LOG_USER_WARNING' => '<b>Added user warning</b><br />»%s', + 'LOG_USER_WARNING_BODY' => '<b>The following warning was issued to this user</b><br />»%s', + + 'LOG_USER_GROUP_CHANGE' => '<b>User changed default group</b><br />» %s', + 'LOG_USER_GROUP_DEMOTE' => '<b>User demoted as leaders from usergroup</b><br />» %s', + 'LOG_USER_GROUP_JOIN' => '<b>User joined group</b><br />» %s', + 'LOG_USER_GROUP_JOIN_PENDING' => '<b>User joined group and needs to be approved</b><br />» %s', + 'LOG_USER_GROUP_RESIGN' => '<b>User resigned membership from group</b><br />» %s', + 'LOG_WORD_ADD' => '<b>Added word censor</b><br />» %s', 'LOG_WORD_DELETE' => '<b>Deleted word censor</b><br />» %s', 'LOG_WORD_EDIT' => '<b>Edited word censor</b><br />» %s', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 483e797666..2e547f745a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -238,17 +238,7 @@ $lang = array_merge($lang, array( 'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.', 'LOGOUT' => 'Logout', 'LOGOUT_USER' => 'Logout [ %s ]', - 'LOG_ADMIN_AUTH_FAIL' => '<b>Failed administration login attempt</b>', - 'LOG_ADMIN_AUTH_SUCCESS'=> '<b>Sucessful administration login</b>', - 'LOG_DELETE_POST' => '<b>Deleted post</b><br />» %s', - 'LOG_DELETE_TOPIC' => '<b>Deleted topic</b><br />» %s', 'LOG_ME_IN' => 'Log me on automatically each visit', - 'LOG_USER_FEEDBACK' => '<b>Added user feedback</b><br />» %s', - 'LOG_USER_GENERAL' => '%s', - 'LOG_USER_WARNING' => '<b>Added user warning</b><br />»%s', - 'LOG_USER_WARNING_BODY' => '<b>The following warning was issued to this user</b><br />»%s', - - 'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />»User IP "<i>%s</i>" checked against session IP "<i>%s</i>" and user browser string "<i>%s</i>" checked against session browser string "<i>%s</i>".', 'MARK' => 'Mark', 'MARK_ALL' => 'Mark all', diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php index fb4fac6d54..aad97a25e5 100644 --- a/phpBB/language/en/groups.php +++ b/phpBB/language/en/groups.php @@ -66,7 +66,7 @@ $lang = array_merge($lang, array( 'GROUP_LIST' => 'Manage Users', 'LOGIN_EXPLAIN_GROUP' => 'You need to login to view group details', - + 'NOT_LEADER_OF_GROUP' => 'The requested operation cannot be taken because you are not a leader of the selected group.', 'NOT_MEMBER_OF_GROUP' => 'The requested operation cannot be taken because you are not a member of the selected group.', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 13a5d75278..fe05644539 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -111,26 +111,6 @@ $lang = array_merge($lang, array( 'LOCK_TOPICS' => 'Lock selected topics', 'LOCK_TOPICS_CONFIRM' => 'Are you sure you want to lock all selected topics?', 'LOGS_CURRENT_TOPIC' => 'Currently viewing logs of:', - 'LOG_APPROVE_TOPIC' => '<b>Approved topic</b><br />» %s', - 'LOG_FORK' => '<b>Copied topic</b><br />» from %s', - 'LOG_LOCK' => '<b>Locked topic</b><br />» %s', - 'LOG_LOCK_POST' => '<b>Locked post</b><br />» %s', - 'LOG_MERGE' => '<b>Merged posts</b> into topic<br />»%s', - 'LOG_MOVE' => '<b>Moved topic</b><br />» from %s', - 'LOG_TOPIC_DELETED' => '<b>Deleted topic</b><br />» %s', - 'LOG_TOPIC_RESYNC' => '<b>Resynchronised topic counters</b><br />» %s', - 'LOG_TOPIC_TYPE_CHANGED' => '<b>Changed topic type</b><br />» %s', - 'LOG_UNLOCK' => '<b>Unlocked topic</b><br />» %s', - 'LOG_UNLOCK_POST' => '<b>Unlocked post</b><br />» %s', - 'LOG_UNRATE' => '<b>Unrated post</b><br />» %s', - 'LOG_USER_ACTIVE_USER' => '<b>User account activated</b>', - 'LOG_USER_DEL_AVATAR_USER' => '<b>User avatar removed</b>', - 'LOG_USER_DEL_SIG_USER' => '<b>User signature removed</b>', - 'LOG_USER_INACTIVE_USER' => '<b>User account de-activated</b>', - 'LOG_USER_LOCK' => '<b>User locked own topic</b><br />» %s', - 'LOG_USER_MOVE_POSTS_USER' => '<b>Moved all posts to forum "%s"</b>', - 'LOG_USER_REACTIVATE_USER' => '<b>Forced user account re-activation</b>', - 'LOG_USER_UNLOCK' => '<b>User unlocked own topic</b><br />» %s', 'LOGIN_EXPLAIN_MCP' => 'To moderate this forum you must login.', 'LOGVIEW_VIEWTOPIC' => 'View Topic', 'LOGVIEW_VIEWLOGS' => 'View Topic Log', |