Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-03-26 11:57:43 +01:00
commit 09dd84e09a
2 changed files with 3 additions and 3 deletions

View File

@ -382,7 +382,7 @@ class PMA_Table
if (!array_key_exists($info, PMA_Table::$cache[$db][$table])) {
if (! $disable_error) {
trigger_error(
__('unknown table status: ') . $info,
__('Unknown table status:') . ' ' . $info,
E_USER_WARNING
);
}

View File

@ -1472,9 +1472,9 @@ function PMA_RTN_handleExecute()
// output from the routine
$message .= sprintf(
_ngettext(
'%d row affected by the last statement inside the procedure',
'%d row affected by the last statement inside the procedure.',
'%d rows affected by the last statement inside the '
. 'procedure',
. 'procedure.',
$affected
),
$affected