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

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Browse Source 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
This commit is contained in:
Crack
2010-08-01 23:19:21 +02:00
parent 279724d6f8 887e2be664
commit 53e8d75c0f
81 changed files with 11031 additions and 7877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/display_export.lib.php
View File

@@ -144,7 +144,7 @@ echo PMA_pluginGetJavascript($export_list);
$trans->addMessage('@SERVER@/');
$trans->addString(__('server name'));
if ($export_type == 'database' || $export_type == 'table') {
$trans->addMessage('@DB@/');
$trans->addMessage('@DATABASE@/');
$trans->addString(__('database name'));
if ($export_type == 'table') {
$trans->addMessage('@TABLE@/');