diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-06-02 07:26:48 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-06-02 07:26:48 +0000 |
| commit | 718006b053768538623b9753a889a8735ec5c2c3 (patch) | |
| tree | 0e2c7a972cf5c4510ae07c516f88b765e69e53d6 /frontends/php | |
| parent | 30d240478b994affeecc3f5fcc446a0cec41bfc4 (diff) | |
| download | zabbix-718006b053768538623b9753a889a8735ec5c2c3.tar.gz zabbix-718006b053768538623b9753a889a8735ec5c2c3.tar.xz zabbix-718006b053768538623b9753a889a8735ec5c2c3.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2941 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php')
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/db.inc.php | 3 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 24bc3147..6339201f 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -894,7 +894,7 @@ COpt::profiling_start("page"); ) ), "cm"=>array( - "label"=>S_CONFIGURATION_MANAGEMENT, + "label"=>S_INVENTORY, "pages"=>array("hostprofiles.php"), "level2"=>array( array("label"=>S_HOSTS,"url"=>"hostprofiles.php") diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php index 3d315f17..8a5b4b37 100644 --- a/frontends/php/include/db.inc.php +++ b/frontends/php/include/db.inc.php @@ -26,12 +26,11 @@ // $DB_TYPE ="POSTGRESQL"; $DB_TYPE ="MYSQL"; $DB_SERVER ="localhost"; - $DB_DATABASE ="osmiy"; + $DB_DATABASE ="zabbix"; $DB_USER ="root"; $DB_PASSWORD =""; // END OF DATABASE CONFIGURATION -// $USER_DETAILS =""; global $USER_DETAILS; if($DB_TYPE == "MYSQL") diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 2d2e3b2f..1142a08e 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -993,7 +993,7 @@ "S_HELP"=> "Help", "S_PROFILE"=> "Profile", "S_MONITORING"=> "Monitoring", - "S_CONFIGURATION_MANAGEMENT"=> "Configuration management", + "S_INVENTORY"=> "Inventory", "S_QUEUE"=> "Queue", "S_EVENTS"=> "Events", "S_MAPS"=> "Maps", |