summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-23 16:13:47 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-23 16:13:47 +0000
commitcc70c7497afb092f535091b8a44d375b241c21a1 (patch)
tree0eb0939515a7c7a8bc2d2bf861e78ea91406f907
parentd3fa1cb7b782c6f36434eec7ae3a5d848b4602cf (diff)
downloadzabbix-cc70c7497afb092f535091b8a44d375b241c21a1.tar.gz
zabbix-cc70c7497afb092f535091b8a44d375b241c21a1.tar.xz
zabbix-cc70c7497afb092f535091b8a44d375b241c21a1.zip
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2684 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--frontends/php/include/db.inc.php4
-rw-r--r--frontends/php/include/locales/en_gb.inc.php1
-rw-r--r--frontends/php/triggers.php4
3 files changed, 5 insertions, 4 deletions
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index b32e5338..058a2a73 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -25,8 +25,8 @@
// $DB_TYPE ="POSTGRESQL";
$DB_TYPE ="MYSQL";
$DB_SERVER ="localhost";
-// $DB_DATABASE ="zabbix";
- $DB_DATABASE ="osmiy";
+ $DB_DATABASE ="zabbix";
+// $DB_DATABASE ="osmiy";
$DB_USER ="root";
$DB_PASSWORD ="";
// END OF DATABASE CONFIGURATION
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index ffa74c0f..434b6f43 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -736,6 +736,7 @@
"S_ENABLED"=> "Enabled",
"S_ENABLE_SELECTED_TRIGGERS_Q"=> "Enable selected triggers?",
"S_DISABLE_SELECTED_TRIGGERS_Q"=> "Disable selected triggers?",
+ "S_DELETE_SELECTED_TRIGGERS_Q"=> "Delete selected triggers?",
"S_CHANGE"=> "Change",
"S_TRIGGER_UPDATED"=> "Trigger updated",
"S_CANNOT_UPDATE_TRIGGER"=> "Cannot update trigger",
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php
index 08266e43..d5eb36e3 100644
--- a/frontends/php/triggers.php
+++ b/frontends/php/triggers.php
@@ -408,10 +408,10 @@
"return Confirm('".S_ENABLE_SELECTED_TRIGGERS_Q."');"));
array_push($footerButtons, SPACE);
array_push($footerButtons, new CButton('group_disable','Disable selected',
- "return Confirm('Disable selected triggers?');"));
+ "return Confirm('".S_DISABLE_SELECTED_TRIGGERS_Q."');"));
array_push($footerButtons, SPACE);
array_push($footerButtons, new CButton('group_delete','Delete selected',
- "return Confirm('Delete selected triggers?');"));
+ "return Confirm('".S_DELETE_SELECTED_TRIGGERS_Q."');"));
$table->SetFooter(new CCol($footerButtons),'table_footer');
$form->AddItem($table);