Various updated lang strings

git-svn-id: file:///svn/phpbb/trunk@3755 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/en/lang_admin.php

@@ -32,6 +32,7 @@ $lang = array_merge($lang, array(
 	'MANAGE'		=> 'Manage',
 	'ADD'			=> 'Add', 
 	'PERMISSIONS'	=> 'Permissions', 
+	'UPDATE'		=> 'Update',
 
 	'DB_CAT'		=> 'Database', 
 	'DB_BACKUP'		=> 'DB Backup',
@@ -209,35 +210,32 @@ $lang = array_merge($lang, array(
 	'USER_PERMISSIONS_EXPLAIN'	=> 'Here you can set user based permissions. These include capabilities such as the use of avatars, sending private messages, etc. To alter these settings for large numbers of users the Group permissions system is the prefered method.', 
 	'GROUP_PERMISSIONS'			=> 'Group Permissions', 
 	'GROUP_PERMISSIONS_EXPLAIN' => 'Here you can set usergroup based permissions. These include capabilities such as the use of avatars, sending private messages, etc. To alter these settings for single users the User permissions system is the prefered method.', 
+	'DEPENDENCIES'			=>	'Dependencies', 
+	'DEPENDENCIES_EXPLAIN'	=>	'Here you can define relationships between administrator or moderator permission options and forum options. Using this you can automatically update forum permissions based on setting admin or moderator options. While this can save time care should be taken in defining these dependencies.', 
+
 	'LOOK_UP_GROUP'		=> 'Look up Usergroup', 
-	'Manage_users' => 'Manage Users',
+	'MANAGE_USERS'		=> 'Manage Users',
 	'ADD_USERS'			=> 'Add Users',
-	'Manage_groups' => 'Manage Groups',
-	'Add_groups' => 'Add Groups',
-	'Admin_group' => 'Administrators',
-	'Reg_group' => 'All registered',
-	'Allowed_users' => 'Allowed users',
-	'Disallowed_users' => 'Disallowed users',
-	'Allowed_groups' => 'Allowed groups',
-	'Disallowed_groups' => 'Disallowed groups',
-	'Remove_selected' => 'Remove selected',
-	'Advanced' => 'Advanced',
-	'USER_CAN' => 'User can ... ',
-	'GROUP_CAN' => 'Group can ... ',
+	'MANAGE_GROUPS'		=> 'Manage Groups',
+	'ADD_GROUPS'		=> 'Add Groups',
+	'ALLOWED_USERS'		=> 'Allowed users',
+	'DISALLOWED_USERS'	=> 'Disallowed users',
+	'ALLOWED_GROUPS'	=> 'Allowed groups',
+	'DISALLOWED_GROUPS' => 'Disallowed groups',
+	'REMOVE_SELECTED'	=> 'Remove selected',
+	'SET_OPTIONS'	=> 'Set Options',
 	'OPTION'		=> 'Option',
 	'ALLOW'			=> 'Allow',
 	'INHERIT'		=> 'Inherit',
 	'DENY'			=> 'Deny',
-	'BASIC' => 'Basic',
-	'USER_PRESETS' => 'User presets', 
+	'PRESETS'		=> 'Presets', 
 	'ALL_ALLOW'		=> 'All Allow',
 	'ALL_DENY'		=> 'All Deny',
 	'ALL_INHERIT'	=> 'All Inherit',
-	'INHERIT_PARENT' => 'From Parent', 
-	'ACL_PRESET' => 'Preset', 
+	'USER_PRESETS'	=> 'User presets', 
+	'INHERIT_PARENT'=> 'From Parent', 
 	'INHERITANCE'			=> 'Inheritance',
 	'INHERITANCE_EXPLAIN'	=> 'Select the subforums you want to inherit these permissions',
-	'PRESETS' => 'Presets', 
 	'PRESETS_EXPLAIN'		=> 'To update or delete an existing preset select it from the list.', 
 	'SELECT_PRESET'			=> 'Select preset', 
 	'PRESET_NAME'			=> 'Preset name', 
@@ -256,7 +254,7 @@ $lang = array_merge($lang, array(
 	'acl_a_bbcode' 		=> 'Define BBCode Tags',
 	'acl_a_attach' 		=> 'Manage Attachments',
 	'acl_a_events' 		=> 'Manage User/Group Events',
-	'acl_a_ranks'		=> 'Manage User Ranks',
+	'acl_a_ranks'		=> 'Manage Ranks',
 	'acl_a_user' 		=> 'Manage Users',
 	'acl_a_userdel' 	=> 'Delete/Prune Users',
 	'acl_a_useradd' 	=> 'Add New Users',
@@ -270,11 +268,16 @@ $lang = array_merge($lang, array(
 	'acl_a_auth' 		=> 'Alter Forum Permissions',
 	'acl_a_authmods' 	=> 'Alter Moderator Permissions',
 	'acl_a_authadmins' 	=> 'Alter Admin Permissions',
+	'acl_a_authusers' 	=> 'Alter User Permissions',
+	'acl_a_authgroups' 	=> 'Alter Group Permissions',
 	'acl_a_email' 		=> 'Mass Email',
 	'acl_a_styles' 		=> 'Manage Styles',
 	'acl_a_backup' 		=> 'Backup Database',
 	'acl_a_restore' 	=> 'Restore Database',
 	'acl_a_clearlogs' 	=> 'Clear Admin/Mod Logs',
+	'acl_a_events' 		=> 'Use Event system',
+	'acl_a_cron' 		=> 'Use Cron system',
+	'acl_a_authdeps'	=> 'Set ACL Dependencies', 
 
 	'acl_m_edit'	=> 'Edit posts',
 	'acl_m_delete'	=> 'Delete posts',
@@ -552,7 +555,9 @@ $lang = array_merge($lang, array(
 	'prune_days' => 'Remove topics that have not been posted to in',
 	'SET_NON_POSTABLE' => 'Set this forum as non-postable and',
 	'Forum_delete' => 'Delete Forum',
+
 	'UPDATE' => 'Update',
+
 	'Forum_delete_explain' => 'The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained.',
 	'Move_and_Delete' => 'Move and Delete',
 	'Move_posts_to' => 'Move posts to',

phpBB/language/en/lang_main.php

@@ -229,10 +229,11 @@ $lang = array(
 	'DISPLAY_TOPICS' => 'Display topics from previous',
 	'ALL_TOPICS' => 'All Topics',
 
-	'TOPIC_ANNOUNCEMENT' => '<b>Announcement:</b>',
+	'TOPIC_ANNOUNCEMENT'=> '<b>Announcement:</b>',
 	'TOPIC_STICKY'		=> '<b>Sticky:</b>',
 	'TOPIC_MOVED'		=> '<b>Moved:</b>',
-	'TOPIC_POLL' => '<b>[ Poll ]</b>',
+	'TOPIC_POLL'		=> '<b>Poll:</b>',
+	'TOPIC_LOCKED'		=> '<b>Locked:</b>',
 
 	'MARK_TOPICS_READ' => 'Mark all topics read',
 	'Topics_marked_read' => 'The topics for this forum have now been marked read',
@@ -281,6 +282,7 @@ $lang = array(
 	'VIEW_TOPIC'			=> 'View topic',
 	'LOGIN_VIEWTOPIC'		=> 'The board administrator requires you to be registered and logged in to view this topic.', 
 	'PRINT_TOPIC'			=> 'Printable version', 
+	'EMAIL_TOPIC'			=> 'Email to friend', 
 	'VIEW_NEXT_TOPIC'		=> 'View next topic',
 	'VIEW_PREVIOUS_TOPIC'	=> 'View previous topic',
 
@@ -318,13 +320,16 @@ $lang = array(
 	'CODE'	=> 'Code',
 
 	'QUICK_MOD' => 'Quick-mod tools',
-	'LOCK_TOPIC' => 'Lock topic',
-	'UNLOCK_TOPIC' => 'Unlock topic',
-	'MOVE_TOPIC' => 'Move topic',
-	'DELETE_TOPIC' => 'Delete topic',
-	'SPLIT_TOPIC' => 'Split topic',
-	'MERGE_TOPIC' => 'Merge topic',
-	'CHANGE_TOPIC_TYPE'	=> 'Change topic type to: ',
+	'LOCK_TOPIC' => 'Lock Topic',
+	'UNLOCK_TOPIC' => 'Unlock Topic',
+	'MOVE_TOPIC' => 'Move Topic',
+	'DELETE_TOPIC' => 'Delete Topic',
+	'SPLIT_TOPIC' => 'Split Topic',
+	'MERGE_TOPIC' => 'Merge Topic',
+	'MAKE_NORMAL'	=> 'Make Normal',
+	'MAKE_STICKY'	=> 'Make Sticky',
+	'MAKE_ANNOUNCE'	=> 'Make Announce',
+	'MAKE_GLOBAL'	=> 'Make Global',
 
 	'STOP_WATCHING_TOPIC'	=> 'Stop watching this topic',
 	'START_WATCHING_TOPIC'	=> 'Watch this topic for replies',
@@ -705,6 +710,10 @@ $lang = array(
 	'USER_ONLINE'	=> 'Online', 
 	'USER_OFFLINE'	=> 'Offline', 
 
+	'SEND_IM'			=> 'Instant Messaging', 
+	'SEND_IM_EXPLAIN'	=> 'Please note that users may have elected to not receive unsolicited instant messages.', 
+	'SEND_MSN'		=> 'Please note that you need Microsoft (or MSN) Messenger installed to use this.', 
+	'SEND_AIM'		=> 'Please note that you need AOL Instant Messenger installed to use this.', 
 
 	'Group_Control_Panel' => 'Group Control Panel',
 	'Group_member_details' => 'Group Membership Details',