merge r4851 from branch 2.0 to trunk

"s" removed in name, comments and translation Not done on keys, and directory git-svn-id: http://piwigo.org/svn/trunk@4852 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Feb 8, 2010 · 85c73d0 · 85c73d0
1 parent e1de0d6
commit 85c73d0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/plugins/admin_advices/admin_advices.php b/plugins/admin_advices/admin_advices.php
@@ -40,13 +40,13 @@ function set_admin_advice_add_css()
   }
 }
 
-// Build an advice on the Admin Intro page
+// Build advice on the Admin Intro page
 function set_admin_advice()
 {
   global $page, $user, $template, $conf, $prefixeTable, $lang;
   $my_path = dirname(__FILE__).'/';
 
-//  Include language advices
+//  Include language advice
   foreach ($conf as $key => $value)
   {
     if ( is_string($value) )
@@ -134,7 +134,7 @@ function set_admin_advice()
       )
     );
 
-//  If there is an advice
+//  If there is advice
   if ( $cond )
   {
 

diff --git a/plugins/admin_advices/adv_set.php b/plugins/admin_advices/adv_set.php
@@ -23,7 +23,7 @@
 
 
 //
-// A new advices needs:
+// New advice needs:
 //    $lang['Adv_case'][xx] = 'Text' ==> in all plugin.lang
 //    $adv['c'][xx] = Condition (default true)
 //    $adv['v'][xx] = Value (if there is one (facultative))

diff --git a/plugins/admin_advices/language/en_UK/plugin.lang.php b/plugins/admin_advices/language/en_UK/plugin.lang.php
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['An_advice_about'] = 'A new advice about';
+$lang['An_advice_about'] = 'New advice about';
 $lang['contribute'] = 'how you can contribute'; 
 $lang['navigation'] = 'navigation';
 $lang['Metadata'] = 'Metadata';

diff --git a/plugins/admin_advices/main.inc.php b/plugins/admin_advices/main.inc.php
@@ -22,8 +22,8 @@
 // +-----------------------------------------------------------------------+
 
 /*
-Plugin Name: Admin Advices
-Version: 2.0.2
+Plugin Name: Admin Advice
+Version: Auto
 Description: Give you an advice on the administration page.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=285
 Author: Piwigo team