Some uncommitted till now changes

git-svn-id: file:///svn/phpbb/trunk@5056 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2005-01-12 18:46:48 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2005-01-12 18:46:48 +0000
commit: 676ca63ef0c56caaa6fa498911aa3b299db8d5b5 (patch)
tree: c96c0fa4de8b2e1fc708ea1dcafa30a3f7dfd251 /phpBB
parent: 0b91fffe8b49454399eb1bb647f8c1d1bfb99f62 (diff)
download: forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.tar
forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.tar.gz
forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.tar.bz2
forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.tar.xz
forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.zip
3 files changed, 60 insertions, 45 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php
index cb3693a3ff..30aec56bb2 100644
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -41,6 +41,21 @@ $lang += array(
 	'FORUM_INDEX'	=> 'Forum Index',
 	'ADMIN_INDEX'	=> 'Admin Index',
 
+	'ACP_INDEX'				=> 'Admin index',
+
+	'ACP_CAT_GENERAL'		=> 'General',
+	'ACP_CAT_FORUM'			=> 'Forum',
+	'ACP_BOARD_SETTINGS'	=> 'Board settings',
+	'ACP_BOARD_DEFAULTS'	=> 'Board defaults',
+	'ACP_CAT_SERVER'		=> 'Server',
+	'ACP_BOARD_SERVER'		=> 'Server settings',
+
+	'ACP_CAT_USERGROUP'		=> 'Users &amp; Groups',
+	'ACP_USERS_MANAGE'		=> 'Edit user data',
+
+
+
+
 	'DB_CAT'		=> 'Database',
 	'DB_BACKUP'		=> 'Backup Database',
 	'DB_RESTORE'	=> 'Restore Database',
@@ -2040,7 +2055,7 @@ $lang += array(
 	'PROFILE_BASIC_OPTIONS'		=> 'Basic Options',
 	'PROFILE_TYPE_OPTIONS'		=> 'Profile type specific options',
 	'PROFILE_LANG_OPTIONS'		=> 'Language specific options',
-	
+
 	'STEP_1_TITLE_CREATE'		=> 'Add Profile Field',
 	'STEP_1_TITLE_EDIT'			=> 'Edit Profile Field',
 
@@ -2052,7 +2067,7 @@ $lang += array(
 
 	'STEP_2_EXPLAIN_CREATE'		=> 'Here you are able to define some common options. Further you are able to preview the field you generated, as the user will see it. Play around with it until you are satisfied as how the field behaves.',
 	'STEP_2_EXPLAIN_EDIT'		=> 'Here you are able to change some common options. Further you are able to preview the changed field, as the user will see it. Play around with it until you are satisfied as how the field behaves.<br /><b>Please note that changes to profile fields will not affect existing profile fields entered by your users.</b>',
-	
+
 	'STEP_3_TITLE_CREATE'		=> 'Remaining Language Definitions',
 	'STEP_3_TITLE_EDIT'			=> 'Language Definitions',
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 3c3dddf337..d1d5ccb622 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -7,8 +7,8 @@
 // STARTED   : Sat Dec 16, 2000
 // COPYRIGHT : © 2001, 2003 phpBB Group
 // WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
+//
 // -------------------------------------------------------------
 
 // DO NOT CHANGE
@@ -17,7 +17,7 @@ if (empty($lang) || !is_array($lang))
 	$lang = array();
 }
 
-// DEVELOPERS PLEASE NOTE 
+// DEVELOPERS PLEASE NOTE
 //
 // Placeholders can now contain order information, e.g. instead of
 // 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -34,7 +34,7 @@ $lang += array(
 	'RIGHT'			=> 'right',
 	'DATE_FORMAT'	=> '|d M Y|',
 
-	
+
 	'1_DAY'					=> '1 Day',
 	'1_MONTH'				=> '1 Month',
 	'1_YEAR'				=> '1 Year',
@@ -167,15 +167,15 @@ $lang += array(
 
 	'KARMA'					=> array(
 		'-5'	=> 'Extremely Bad',
-		'-4'	=> 'Very Bad', 
-		'-3'	=> 'Very Poor', 
+		'-4'	=> 'Very Bad',
+		'-3'	=> 'Very Poor',
 		'-2'	=> 'Bad',
-		'-1'	=> 'Poor', 
-		'0'		=> 'Neutral', 
+		'-1'	=> 'Poor',
+		'0'		=> 'Neutral',
 		'1'		=> 'Positive',
 		'2'		=> 'Good',
-		'3'		=> 'Very Good', 
-		'4'		=> 'Extremely good', 
+		'3'		=> 'Very Good',
+		'4'		=> 'Extremely good',
 		'5'		=> 'Excellent'
 	),
 	'KB'				=> 'KB',
@@ -425,7 +425,7 @@ $lang += array(
 
 	'YEAR'				=> 'Year',
 	'YES'				=> 'Yes',
-	'YOU_LAST_VISIT'	=> 'Last visit on %s',
+	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
 	'YOU_NEW_PM'		=> 'A new private message is waiting for you in your Inbox',
 	'YOU_NEW_PMS'		=> 'New private messages are waiting for you in your Inbox',
 	'YOU_NO_NEW_PM'		=> 'No new private messages are waiting for you',
@@ -441,7 +441,7 @@ $lang += array(
 		'Thursday'	=> 'Thursday',
 		'Friday'	=> 'Friday',
 		'Saturday'	=> 'Saturday',
-		
+
 		'Sun'		=> 'Sun',
 		'Mon'		=> 'Mon',
 		'Tue'		=> 'Tue',
@@ -478,7 +478,7 @@ $lang += array(
 		'TODAY'		=> 'Today',
 		'YESTERDAY'	=> 'Yesterday',
 	),
-	
+
 	'tz'				=> array(
 		'-13'	=> 'GMT - 13 Hours',
 		'-12'	=> 'GMT - 12 Hours',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index a58fcc3616..f6638d1d43 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -7,8 +7,8 @@
 // STARTED   : Sat Dec 16, 2000
 // COPYRIGHT : © 2001, 2003 phpBB Group
 // WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
+//
 // -------------------------------------------------------------
 
 // DO NOT CHANGE
@@ -17,7 +17,7 @@ if (empty($lang) || !is_array($lang))
 	$lang = array();
 }
 
-// DEVELOPERS PLEASE NOTE 
+// DEVELOPERS PLEASE NOTE
 //
 // Placeholders can now contain order information, e.g. instead of
 // 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -216,7 +216,7 @@ $lang += array(
 	'NOT_MOVED_MESSAGES'		=> 'You have %d private messages currently on hold because of full folder.',
 	'NO_ACTION_MODE'			=> 'No message action specified',
 	'NO_AUTHOR'					=> 'No author defined for this message',
-	
+
 	'NO_AUTH_DELETE_MESSAGE'	=> 'You are not authorized to delete private messages.',
 	'NO_AUTH_EDIT_MESSAGE'		=> 'You are not authorized to edit private messages.',
 	'NO_AUTH_FORWARD_MESSAGE'	=> 'You are not authorized to forward private messages.',
@@ -322,16 +322,16 @@ $lang += array(
 	'UCP_ICQ'					=> 'ICQ Number',
 	'UCP_JABBER'				=> 'Jabber Address',
 	'UCP_MAIN'					=> 'Overview',
-	'UCP_MAIN_BOOKMARKS'		=> 'Bookmarks',
-	'UCP_MAIN_DRAFTS'			=> 'Saved drafts',
-	'UCP_MAIN_FRONT'			=> 'Front page',
-	'UCP_MAIN_SUBSCRIBED'		=> 'Subscribed',
+	'UCP_BOOKMARKS'				=> 'Bookmarks',
+	'UCP_DRAFTS'				=> 'Saved drafts',
+	'UCP_FRONT'					=> 'Front page',
+	'UCP_SUBSCRIBED'			=> 'Subscribed',
 	'UCP_MSNM'					=> 'MSN Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files',
 	'UCP_PREFS'					=> 'Preferences',
-	'UCP_PREFS_PERSONAL'		=> 'Personal Settings',
-	'UCP_PREFS_POST'			=> 'Posting Messages',
-	'UCP_PREFS_VIEW'			=> 'Viewing Posts',
+	'UCP_PERSONAL'				=> 'Personal Settings',
+	'UCP_POST'					=> 'Posting Messages',
+	'UCP_VIEW'					=> 'Viewing Posts',
 	'UCP_PM'					=> 'Private Messages',
 	'UCP_PM_COMPOSE'			=> 'Compose Message',
 	'UCP_PM_DRAFTS'				=> 'PM Drafts',
@@ -339,10 +339,10 @@ $lang += array(
 	'UCP_PM_UNREAD'				=> 'Unread Messages',
 	'UCP_PM_VIEW_MESSAGES'		=> 'View Messages',
 	'UCP_PROFILE'				=> 'Profile',
-	'UCP_PROFILE_AVATAR'		=> 'Your avatar',
-	'UCP_PROFILE_PROFILE_INFO'	=> 'Your Profile',
-	'UCP_PROFILE_REG_DETAILS'	=> 'Registration details',
-	'UCP_PROFILE_SIGNATURE'		=> 'Your signature',
+	'UCP_AVATAR'				=> 'Your avatar',
+	'UCP_PROFILE_INFO'			=> 'Your Profile',
+	'UCP_REG_DETAILS'			=> 'Registration details',
+	'UCP_SIGNATURE'				=> 'Your signature',
 	'UCP_REMIND'				=> 'Send password',
 	'UCP_WATCHED'				=> 'Watched items',
 	'UCP_WELCOME'				=> 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
@@ -424,24 +424,24 @@ $lang += array(
 	),
 
 
-	'UCP_GROUPS_MEMBERSHIP'	=> 'Memberships', 
-	'UCP_GROUPS_MANAGE'		=> 'Manage groups', 
-	'GROUPS_EXPLAIN'		=> 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you extra rights to view content or increase your capabilities in other areas.', 
-	'GROUP_LEADER'		=> 'Leaderships', 
-	'GROUP_MEMBER'		=> 'Memberships', 
-	'GROUP_PENDING'		=> 'Pending memberships', 
-	'GROUP_NONMEMBER'	=> 'Non-memberships', 
-	'GROUP_DETAILS'		=> 'Group details', 
+	'UCP_GROUPS_MEMBERSHIP'	=> 'Memberships',
+	'UCP_GROUPS_MANAGE'		=> 'Manage groups',
+	'GROUPS_EXPLAIN'		=> 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you extra rights to view content or increase your capabilities in other areas.',
+	'GROUP_LEADER'		=> 'Leaderships',
+	'GROUP_MEMBER'		=> 'Memberships',
+	'GROUP_PENDING'		=> 'Pending memberships',
+	'GROUP_NONMEMBER'	=> 'Non-memberships',
+	'GROUP_DETAILS'		=> 'Group details',
 
 	'NO_LEADER'		=> 'No group leaderships',
-	'NO_MEMBER'		=> 'No group memberships', 
-	'NO_PENDING'	=> 'No pending memberships', 
-	'NO_NONMEMBER'	=> 'No non-member groups', 
+	'NO_MEMBER'		=> 'No group memberships',
+	'NO_PENDING'	=> 'No pending memberships',
+	'NO_NONMEMBER'	=> 'No non-member groups',
 
-	'QUIT_ALL'		=> 'Quit all', 
-	'QUIT_MARKED'	=> 'Quit marked', 
-	'JOIN_ALL'		=> 'Join all', 
-	'JOIN_MARKED'	=> 'Join marked', 
+	'QUIT_ALL'		=> 'Quit all',
+	'QUIT_MARKED'	=> 'Quit marked',
+	'JOIN_ALL'		=> 'Join all',
+	'JOIN_MARKED'	=> 'Join marked',
 );
 
 ?>
 \ No newline at end of file
author	Paul S. Owen <psotfx@users.sourceforge.net>	2005-01-12 18:46:48 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2005-01-12 18:46:48 +0000
commit	676ca63ef0c56caaa6fa498911aa3b299db8d5b5 (patch)
tree	c96c0fa4de8b2e1fc708ea1dcafa30a3f7dfd251 /phpBB
parent	0b91fffe8b49454399eb1bb647f8c1d1bfb99f62 (diff)
download	forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.tar forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.tar.gz forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.tar.bz2 forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.tar.xz forums-676ca63ef0c56caaa6fa498911aa3b299db8d5b5.zip