The branch, master has been updated
       via  6756d536f37df7cf204fb6005eb8e85a7c3e46f8 (commit)
       via  963e909afc567df371219809b60b952e67bfa3ca (commit)
      from  61571b8e9a94ff6d254e3170e9b85c6036dec643 (commit)


- Log -----------------------------------------------------------------
commit 6756d536f37df7cf204fb6005eb8e85a7c3e46f8
Author: Marc Delisle <[email protected]>
Date:   Wed Aug 10 10:11:10 2011 -0400

    Unused message

commit 963e909afc567df371219809b60b952e67bfa3ca
Author: Marc Delisle <[email protected]>
Date:   Wed Aug 10 10:05:23 2011 -0400

    Improve message

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

Summary of changes:
 js/messages.php |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/messages.php b/js/messages.php
index 5f4e12b..c941b1c 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -227,12 +227,13 @@ $js_messages['strImportCSV'] = __('Note: If the file 
contains multiple tables, t
 $js_messages['strHideQueryBox'] = __('Hide query box');
 $js_messages['strShowQueryBox'] = __('Show query box');
 $js_messages['strEdit'] = __('Edit');
-$js_messages['strSave'] = __('Save');
-$js_messages['strHide'] = __('Hide');
 $js_messages['strNoRowSelected'] = __('No rows selected');
 $js_messages['strChangeTbl'] = __('Change');
 $js_messages['strQueryExecutionTime'] = __('Query execution time');
 
+/* For server_variables.js */
+$js_messages['strSave'] = __('Save');
+
 /* For tbl_select.js */
 $js_messages['strHideSearchCriteria'] = __('Hide search criteria');
 $js_messages['strShowSearchCriteria'] = __('Show search criteria');
@@ -261,7 +262,7 @@ $js_messages['strSortHint'] = __('Click to sort');
 $js_messages['strColMarkHint'] = __('Click to mark/unmark');
 $js_messages['strColVisibHint'] = __('Click the drop-down arrow<br />to toggle 
column\'s visibility');
 $js_messages['strShowAllCol'] = __('Show all');
-$js_messages['strAlertNonUnique'] = __('This table contains no unique field. 
Features related to the grid edit, checkbox, Edit, Copy and Delete links may 
not work after saving.');
+$js_messages['strAlertNonUnique'] = __('This table does not contain a unique 
column. Features related to the grid edit, checkbox, Edit, Copy and Delete 
links may not work after saving.');
 
 /* password generation */
 $js_messages['strGeneratePassword'] = __('Generate password');


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model 
configuration take the hassle out of deploying and managing Subversion and 
the tools developers use with it. Learn more about uberSVN and get a free 
download at:  http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to