nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #2067462 [lang] link FAQ references in messages

Browse Source
This commit is contained in:
Marc Delisle
2008-08-26 16:50:07 +00:00
parent a7fd8bc128
commit 179279f08e
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
3.1.0.0 (not yet released) 3.1.0.0 (not yet released)
- bug #2046883 [core] Notices about deprecated dl() (so stop using it) - bug #2046883 [core] Notices about deprecated dl() (so stop using it)
+ BLOBstreaming support, thanks to Raj Kissu Rajandran (work in progress) + BLOBstreaming support, thanks to Raj Kissu Rajandran (work in progress)
+ patch #2067462 [lang] link FAQ references in messages,
thanks to Thijs Kinkhorst - kink
3.0.0.0 (not yet released) 3.0.0.0 (not yet released)
+ [export] properly handle line breaks for YAML, thanks to Dan Barry - + [export] properly handle line breaks for YAML, thanks to Dan Barry -

2
db_structure.php
View File

@@ -96,7 +96,7 @@ function PMA_TableHeader($db_is_information_schema = false)
.' ' . $GLOBALS['strAction'] . "\n" .' ' . $GLOBALS['strAction'] . "\n"
.' </th>' .' </th>'
.' <th>' . $GLOBALS['strRecords'] .' <th>' . $GLOBALS['strRecords']
.PMA_showHint($GLOBALS['strApproximateCount']) . "\n" .PMA_showHint(PMA_sanitize($GLOBALS['strApproximateCount'])) . "\n"
.' </th>' . "\n"; .' </th>' . "\n";
if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) { if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
echo ' <th>' . $GLOBALS['strType'] . '</th>' . "\n"; echo ' <th>' . $GLOBALS['strType'] . '</th>' . "\n";

6
lang/english-utf-8.inc.php
View File

@@ -62,7 +62,7 @@ $strAnIndex = 'An index has been added on %s';
$strAny = 'Any'; $strAny = 'Any';
$strAnyHost = 'Any host'; $strAnyHost = 'Any host';
$strAnyUser = 'Any user'; $strAnyUser = 'Any user';
$strApproximateCount = 'May be approximate. See FAQ 3.11'; $strApproximateCount = 'May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]';
$strAPrimaryKey = 'A primary key has been added on %s'; $strAPrimaryKey = 'A primary key has been added on %s';
$strArabic = 'Arabic'; $strArabic = 'Arabic';
$strArmenian = 'Armenian'; $strArmenian = 'Armenian';
@@ -304,7 +304,7 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Failed attempts'; $strFailedAttempts = 'Failed attempts';
$strField = 'Field'; $strField = 'Field';
$strFieldHasBeenDropped = 'Field %s has been dropped'; $strFieldHasBeenDropped = 'Field %s has been dropped';
$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; $strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see [a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]';
$strFieldsEnclosedBy = 'Fields enclosed by'; $strFieldsEnclosedBy = 'Fields enclosed by';
$strFieldsEscapedBy = 'Fields escaped by'; $strFieldsEscapedBy = 'Fields escaped by';
$strFields = 'Fields'; $strFields = 'Fields';
@@ -510,7 +510,7 @@ $strNext = 'Next';
$strNoActivity = 'No activity within %s seconds; please log in again'; $strNoActivity = 'No activity within %s seconds; please log in again';
$strNoDatabases = 'No databases'; $strNoDatabases = 'No databases';
$strNoDatabasesSelected = 'No databases selected.'; $strNoDatabasesSelected = 'No databases selected.';
$strNoDataReceived = 'No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See FAQ 1.16.'; $strNoDataReceived = 'No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].';
$strNoDescription = 'no description'; $strNoDescription = 'no description';
$strNoDetailsForEngine = 'There is no detailed status information available for this storage engine.'; $strNoDetailsForEngine = 'There is no detailed status information available for this storage engine.';
$strNoDropDatabases = '"DROP DATABASE" statements are disabled.'; $strNoDropDatabases = '"DROP DATABASE" statements are disabled.';

2
libraries/display_tbl.lib.php
View File

@@ -1759,7 +1759,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
|| $analyzed_sql[0]['where_clause'] == '1 ')) { || $analyzed_sql[0]['where_clause'] == '1 ')) {
// "j u s t b r o w s i n g" // "j u s t b r o w s i n g"
$pre_count = '~'; $pre_count = '~';
$after_count = PMA_showHint($GLOBALS['strApproximateCount'], true); $after_count = PMA_showHint(PMA_sanitize($GLOBALS['strApproximateCount']), true);
} else { } else {
$pre_count = ''; $pre_count = '';
$after_count = ''; $after_count = '';