The branch, master has been updated via 304273961ec0b26dbb58c5e879a0354670255879 (commit) via 9c7eea8aeb5df7d55389363a778a93e3717ae530 (commit) via 81aadb883f0c9cd5ad1b5be45e0f25342c092506 (commit) via 95b0af8892bdc790936bd0c0bf0f534e299dbeed (commit) from 654228e09104f92b318d60bf511b0050cb9f3b6c (commit)

- Log ----------------------------------------------------------------- commit 304273961ec0b26dbb58c5e879a0354670255879 Author: Michal Čihař mcihar@suse.cz Date: Fri Aug 5 10:52:03 2011 +0200

Avoid composite messages

commit 9c7eea8aeb5df7d55389363a778a93e3717ae530 Author: Michal Čihař mcihar@suse.cz Date: Fri Aug 5 10:50:58 2011 +0200

Better error message

commit 81aadb883f0c9cd5ad1b5be45e0f25342c092506 Author: Michal Čihař mcihar@suse.cz Date: Fri Aug 5 10:49:49 2011 +0200

Better error message

commit 95b0af8892bdc790936bd0c0bf0f534e299dbeed Author: Michal Čihař mcihar@suse.cz Date: Fri Aug 5 10:47:03 2011 +0200

Avoid composite messages

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

Summary of changes: db_qbe.php | 2 +- libraries/blobstreaming.lib.php | 2 +- libraries/export/sql.php | 2 +- libraries/import.lib.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/db_qbe.php b/db_qbe.php index 93c5b40..fe1456e 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -183,7 +183,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '') ?> <div id="visual_builder_anchor" class="notice hide"> <span id="footnote_1"> -<?php echo __('Switch to') . ' <a href="' . $tab_designer['link'] . PMA_get_arg_separator('html') . 'query=1">' . __('visual builder') . '</a>'; ?> +<?php printf(__('Switch to %svisual builder%s'), ' <a href="' . $tab_designer['link'] . PMA_get_arg_separator('html') . 'query=1">', '</a>'); ?> </span> </div> <?php diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index 1eeaae2..5cfae23 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -329,7 +329,7 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) $content_type = pbms_get_metadata_value("Content-Type"); if ($content_type == false) { $br = trim($bs_reference); - PMA_BS_ReportPBMSError("PMA_BS_CreateReferenceLink('$br', '$db_name'): " . __('get BLOB Content-Type failed')); + PMA_BS_ReportPBMSError("PMA_BS_CreateReferenceLink('$br', '$db_name'): " . __('PBMS get BLOB Content-Type failed')); }

PMA_do_disconnect(); diff --git a/libraries/export/sql.php b/libraries/export/sql.php index f0f6f15..a561bb6 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -1068,7 +1068,7 @@ if (isset($plugin_list)) { // a possible error: the table has crashed $tmp_error = PMA_DBI_getError(); if ($tmp_error) { - return PMA_exportOutputHandler(PMA_exportComment(__('in use') . ' (' . $tmp_error . ')')); + return PMA_exportOutputHandler(PMA_exportComment(__('Error reading data:') . ' (' . $tmp_error . ')')); }

if ($result != false) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 8ef09eb..0ab9d5a 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1096,7 +1096,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = __('Go to table') . ': ' . htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME])), htmlspecialchars($tables[$i][TBL_NAME]), $tbl_struct_url, - htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME])) . ' ' . __('structure'), + sprintf(__('Structure of %s'), htmlspecialchars(PMA_backquote($tables[$i][TBL_NAME]))), $tbl_ops_url, sprintf(__('Edit settings for %s'), htmlspecialchars(PMA_backquote($db_name)))); } else {

hooks/post-receive