The branch, master has been updated via 0a345d8ee1ae4fc7ad0043ec3ee60b5d66fb4d68 (commit) via 81f939f5df5f710f2c8b3c1d9870af7bc532b306 (commit) from 0af856e3a51963abf1a23d09c69e4fc07e4f3fca (commit)

- Log ----------------------------------------------------------------- commit 0a345d8ee1ae4fc7ad0043ec3ee60b5d66fb4d68 Merge: 0af856e3a51963abf1a23d09c69e4fc07e4f3fca 81f939f5df5f710f2c8b3c1d9870af7bc532b306 Author: Marc Delisle marc@infomarc.info Date: Wed May 18 08:07:06 2011 -0400

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 1 + libraries/config/messages.inc.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 3578aaa..7f90d9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label - bug #3303869 [interface] Unnecessary scrolling on Databases page +- patch #3303813 [setup] Define a label that was missing

3.4.1.0 (not yet released) - bug #3301108 [interface] Synchronize and already configured host diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 9ebbfea..8ea3cef 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -127,6 +127,7 @@ $strConfigExport_sql_hex_for_blob_name = __('Use hexadecimal for BLOB'); $strConfigExport_sql_if_not_exists_name = sprintf(__('Add %s'), 'IF NOT EXISTS'); $strConfigExport_sql_ignore_name = __('Use ignore inserts'); $strConfigExport_sql_include_comments_name = __('Comments'); +$strConfigExport_sql_insert_syntax_name = __('Syntax to use when inserting data'); $strConfigExport_sql_max_query_size_name = __('Maximal length of created query'); $strConfigExport_sql_mime_name = __('MIME type'); $strConfigExport_sql_procedure_function_name = sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');

hooks/post-receive