[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[30760] branches/6.x/lib/prefs

[<ri...@us...>]

Revision: 30760
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30760&view=rev
Author:   ricks99
Date:     2010-11-17 21:28:19 +0000 (Wed, 17 Nov 2010)

Log Message:
-----------
[TYPO]Assorted corrections for magic admin 

Modified Paths:
--------------
    branches/6.x/lib/prefs/feature.php
    branches/6.x/lib/prefs/global.php
    branches/6.x/lib/prefs/url.php

Modified: branches/6.x/lib/prefs/feature.php
===================================================================
--- branches/6.x/lib/prefs/feature.php	2010-11-17 20:55:26 UTC (rev 30759)
+++ branches/6.x/lib/prefs/feature.php	2010-11-17 21:28:19 UTC (rev 30760)
@@ -311,8 +311,8 @@
 			'type' => 'flag',
 		),
 		'feature_cssmenus' => array(
-			'name' => tra('Css Menus'),
-			'description' => tra('Css Menus (suckerfish).'),
+			'name' => tra('CSS Menus'),
+			'description' => tra('CSS Menus (suckerfish).'),
 			'help' => 'Menus',
 			'type' => 'flag',
 		),
@@ -776,10 +776,16 @@
 		'feature_poll_comments' => array(
 			'name' => tra('Comments for polls'),
 			'type' => 'flag',
+			'dependencies' => array(
+				'feature_polls',
+			),
 		),	
 		'feature_faq_comments' => array(
 			'name' => tra('Comments for FAQs'),
 			'type' => 'flag',
+			'dependencies' => array(
+				'feature_faqs',
+			),
 		),	
 		'feature_sefurl' => array(
 			'name' => tra('Search engine friendly url'),
@@ -846,6 +852,9 @@
 		'feature_article_comments' => array(
 			'name' => tra('Comments for articles'),
 			'type' => 'flag',
+			'dependencies' => array(
+				'feature_articles',
+			),
 		),
 		'feature_cms_templates' => array(
 			'name' => tra('Content Templates'),
@@ -960,6 +969,9 @@
 		'feature_blogposts_comments' => array(
 			'name' => tra('Comments on blog posts'),
 			'type' => 'flag',
+			'dependencies' => array(
+				'feature_blogs',
+			),
 		),
 		'feature_blog_sharethis' => array(
 			'name' => tra('ShareThis buttons'),
@@ -1435,6 +1447,9 @@
 			'type' => 'flag',
 			'help' => 'Comments',
 			'description' => tra('Allow users (with permission) to post threaded comments to a page.'),
+			'dependencies' => array(
+				'feature_wiki',
+			),
 		),
 		'feature_wiki_pictures' => array(
 			'name' => tra('Pictures'),

Modified: branches/6.x/lib/prefs/global.php
===================================================================
--- branches/6.x/lib/prefs/global.php	2010-11-17 20:55:26 UTC (rev 30759)
+++ branches/6.x/lib/prefs/global.php	2010-11-17 21:28:19 UTC (rev 30760)
@@ -158,9 +158,9 @@
 			'size' => '5',
 		),
 		'urlOnUsername' => array(
-			'name' => tra('Url to go to when clicking on a username'),
+			'name' => tra('URL to go to when clicking on a username'),
 			'type' => 'text',
-			'description' => tra('Url to go to when clicking on a username.').' '.tra('Default').': tiki-user_information.php?userId=%userId% <em>('.tra('Use %user% for login name and %userId% for userId)').')</em>',
+			'description' => tra('URL to go to when clicking on a username.').' '.tra('Default').': tiki-user_information.php?userId=%userId% <em>('.tra('Use %user% for login name and %userId% for userId)').')</em>',
 		),
 		'forgotPass' => array(
 			'name' => tra('Remind/forgot password'),

Modified: branches/6.x/lib/prefs/url.php
===================================================================
--- branches/6.x/lib/prefs/url.php	2010-11-17 20:55:26 UTC (rev 30759)
+++ branches/6.x/lib/prefs/url.php	2010-11-17 21:28:19 UTC (rev 30760)
@@ -8,7 +8,7 @@
 function prefs_url_list() {
 	return array(
 		'url_after_validation' => array(
-			'name' => tra('Url a user is redirected to after account validation'),
+			'name' => tra('URL a user is redirected to after account validation'),
 			'hint' => tra('Default').': tiki-information.php?msg='.tra('Account validated successfully.'),
 			'type' => 'text',
 			'dependencies' => array(
@@ -16,7 +16,7 @@
 			),
 		),
 		'url_anonymous_page_not_found' => array(
-			'name' => tra('Url an anonymous is redirected when page not found'),
+			'name' => tra('URL an anonymous is redirected when page not found'),
 			'type' => 'text',
 		),
 	);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.