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

Resolve merge conflicts for upstream merge

Browse Source
This commit is contained in:
ninadsp
2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/lib/config_info.inc.php
View File

@@ -15,11 +15,6 @@ if (!defined('PHPMYADMIN')) {
exit;
}
/**
* Load paths.
*/
require_once('./libraries/vendor_config.php');
$cfg_db = array();
// path to config file, relative to phpMyAdmin's root path

5
setup/lib/index.lib.php
View File

@@ -15,11 +15,6 @@ if (!defined('PHPMYADMIN')) {
exit;
}
/**
* Load vendor config.
*/
require_once('./libraries/vendor_config.php');
/**
* Initializes message list
*/

2
setup/lib/messages.inc.php
View File

@@ -125,7 +125,7 @@ $strSetupForm_Server_config = __('Server configuration');
$strSetupForm_Server_desc = __('Enter server connection parameters');
$strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
$strSetupForm_Server_login_options = __('Signon login options');
$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation');
$strSetupForm_Server_pmadb = __('PMA database');
$strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
$strSetupForm_Server_tracking = __('Changes tracking');