[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-2072-g67d23c0

[Marc Delisle]

The branch, master has been updated
       via  67d23c0c160b6087ff1546725b61c5bdca4930d2 (commit)
      from  0004198bca8147c751c08638c9927e9794e6b099 (commit)


- Log -----------------------------------------------------------------
commit 67d23c0c160b6087ff1546725b61c5bdca4930d2
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Feb 9 07:55:38 2011 -0500

    Clarify the meaning of these directives

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html                |    3 ++-
 libraries/config/messages.inc.php |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 58e1f92..fc374d0 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1884,7 +1884,8 @@ $cfg['TrustedProxies'] =
     <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean
         <span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight'] </span>boolean
     </dt>
-    <dd>Defines the place where modify and delete links would be put when
+    <dd>Defines the place where table row links (Edit, Inline edit, Copy,
+        Delete) would be put when
         tables contents are displayed (you may have them displayed both at the
         left and at the right).
         "Left" and "right" are parsed as "top"
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index b2363c1..9ebbfea 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -311,8 +311,9 @@ $strConfigMcryptDisableWarning_desc = __('Disable the default warning that is di
 $strConfigMcryptDisableWarning_name = __('mcrypt warning');
 $strConfigMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
 $strConfigMemoryLimit_name = __('Memory limit');
-$strConfigModifyDeleteAtLeft_name = __('Show left delete link');
-$strConfigModifyDeleteAtRight_name = __('Show right delete link');
+$strConfigModifyDeleteAtLeft_desc = __('These are Edit, Inline edit, Copy and Delete links');
+$strConfigModifyDeleteAtLeft_name = __('Show table row links on left side');
+$strConfigModifyDeleteAtRight_name = __('Show table row links on right side');
 $strConfigNaturalOrder_desc = __('Use natural order for sorting table and database names');
 $strConfigNaturalOrder_name = __('Natural order');
 $strConfigNavigationBarIconic_desc = __('Use only icons, only text or both');


hooks/post-receive
-- 
phpMyAdmin