The branch, master has been updated
via 8ae25cd89a1f0836c5ad5c4e642ee8ecc9dc06ba (commit)
via 2bdfe069826caf9d4f5c82cfbb2a71b6990b976d (commit)
from 75091e52fde4633f990a60a5f70ffa58aeb623da (commit)
- Log -----------------------------------------------------------------
commit 8ae25cd89a1f0836c5ad5c4e642ee8ecc9dc06ba
Merge: 75091e52fde4633f990a60a5f70ffa58aeb623da
2bdfe069826caf9d4f5c82cfbb2a71b6990b976d
Author: Marc Delisle <[email protected]>
Date: Sat Jun 4 05:59:55 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/config/messages.inc.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f6cea74..be1d37d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@
3.4.3.0 (not yet released)
- bug #3311170 [sync] Missing helper icons in Synchronize
+- patch #3304473 [setup] Redefine a lable that was wrong
3.4.2.0 (not yet released)
- bug #3301249 [interface] Iconic table operations does not remove inline edit
label
diff --git a/libraries/config/messages.inc.php
b/libraries/config/messages.inc.php
index e76b52e..1b8cbf3 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -117,7 +117,7 @@ $strConfigExport_remember_file_template_name = __('Remember
file name template')
$strConfigExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
$strConfigExport_sql_backquotes_name = __('Enclose table and column names with
backquotes');
$strConfigExport_sql_compatibility_name = __('SQL compatibility mode');
-$strConfigExport_sql_create_table_statements_name = __('Syntax to use when
inserting data');
+$strConfigExport_sql_create_table_statements_name = __('<code>CREATE
TABLE</code> options:');
$strConfigExport_sql_dates_name = __('Creation/Update/Check dates');
$strConfigExport_sql_delayed_name = __('Use delayed inserts');
$strConfigExport_sql_disable_fk_name = __('Disable foreign key checks');
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today.
http://p.sf.net/sfu/quest-dev2dev2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
