Switching to 1.1beta5.

git-svn-id: svn://svn.zabbix.com/trunk@2479 97f52cf1-0a1b-0410-bd0e-c28be96e8082

11 files changed, 27 insertions, 27 deletions

diff --git a/TODO b/TODO
index 983b4530..915ef3a5 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-1.1beta5:
+1.1beta6:
 
  - execution of commands on monitored hosts in case of pre-defined events
  - document UserParameters $1,...,$9
diff --git a/frontends/php/include/locales/cn_zh.inc.php b/frontends/php/include/locales/cn_zh.inc.php
index 1adc5d6f..4c211be4 100644
--- a/frontends/php/include/locales/cn_zh.inc.php
+++ b/frontends/php/include/locales/cn_zh.inc.php
@@ -29,7 +29,7 @@
 
 //	about.php
 	"S_ABOUT_ZABBIX"=>			"¹ØÓÚZABBIX",
-	"S_INFORMATION_ABOUT_ZABBIX"=>		"ZABBIX (v1.1beta4)µÄÏêϸÐÅÏ¢",
+	"S_INFORMATION_ABOUT_ZABBIX"=>		"ZABBIX (v1.1beta5)µÄÏêϸÐÅÏ¢",
 	"S_HOMEPAGE_OF_ZABBIX"=>		"ZABBIXµÄÊ×Ò³",
 	"S_HOMEPAGE_OF_ZABBIX_DETAILS"=>	"This is home page of ZABBIX.",
 	"S_LATEST_ZABBIX_MANUAL"=>		"Latest ZABBIX Manual",
@@ -242,10 +242,10 @@
 	"S_COMPARE"=>				"¶Ô±È",
 
 //	Footer
-	"S_ZABBIX_VER"=>			"ZABBIX 1.1b4 Modified",
-	"S_COPYRIGHT_BY"=>			" ",
-	"S_CONNECTED_AS"=>			"Óû§",
-	"S_SIA_ZABBIX"=>			"Zabbix",
+	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta5",
+	"S_COPYRIGHT_BY"=>			"Copyright 2001-2006 by ",
+	"S_CONNECTED_AS"=>			"Connected as",
+	"S_SIA_ZABBIX"=>			"SIA Zabbix",
 
 //	graph.php
 	"S_CONFIGURATION_OF_GRAPH"=>		"ͼ±íÏÔʾÅäÖÃ",
diff --git a/frontends/php/include/locales/de_de.inc.php b/frontends/php/include/locales/de_de.inc.php
index fe9bef4b..e5f890dc 100644
--- a/frontends/php/include/locales/de_de.inc.php
+++ b/frontends/php/include/locales/de_de.inc.php
@@ -246,8 +246,8 @@
         "S_COMPARE"=>	"vergleichen",
 
 //	Footer
-	"S_ZABBIX_VER"=>	"ZABBIX 1.1beta2",
-	"S_COPYRIGHT_BY"=>	"Copyright 2001-2005 by ",
+	"S_ZABBIX_VER"=>	"ZABBIX 1.1beta5",
+	"S_COPYRIGHT_BY"=>	"Copyright 2001-2006 by ",
 	"S_CONNECTED_AS"=>	"Angemeldet:",
 	"S_SIA_ZABBIX"=>	"SIA Zabbix",
 
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 7d6d90a8..9e4806bd 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -29,7 +29,7 @@
 
 //	about.php
 	"S_ABOUT_ZABBIX"=>			"About ZABBIX",
-	"S_INFORMATION_ABOUT_ZABBIX"=>		"Information about ZABBIX (v1.1beta4)",
+	"S_INFORMATION_ABOUT_ZABBIX"=>		"Information about ZABBIX (v1.1beta5)",
 	"S_HOMEPAGE_OF_ZABBIX"=>		"Homepage of ZABBIX",
 	"S_HOMEPAGE_OF_ZABBIX_DETAILS"=>	"This is home page of ZABBIX.",
 	"S_LATEST_ZABBIX_MANUAL"=>		"Latest ZABBIX Manual",
@@ -261,8 +261,8 @@
 	"S_COMPARE"=>				"Compare",
 
 //	Footer
-	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta4",
-	"S_COPYRIGHT_BY"=>			"Copyright 2001-2005 by ",
+	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta5",
+	"S_COPYRIGHT_BY"=>			"Copyright 2001-2006 by ",
 	"S_CONNECTED_AS"=>			"Connected as",
 	"S_SIA_ZABBIX"=>			"SIA Zabbix",
 
diff --git a/frontends/php/include/locales/it_it.inc.php b/frontends/php/include/locales/it_it.inc.php
index 4e1c10dd..5db2cb86 100644
--- a/frontends/php/include/locales/it_it.inc.php
+++ b/frontends/php/include/locales/it_it.inc.php
@@ -31,7 +31,7 @@
 
 //	about.php
 	"S_ABOUT_ZABBIX"=>			"Cos'è ZABBIX",
-	"S_INFORMATION_ABOUT_ZABBIX"=>		"Informazioni su ZABBIX (v1.1beta4)",
+	"S_INFORMATION_ABOUT_ZABBIX"=>		"Informazioni su ZABBIX (v1.1beta5)",
 	"S_HOMEPAGE_OF_ZABBIX"=>		"Questa è la homepage di ZABBIX",
 	"S_HOMEPAGE_OF_ZABBIX_DETAILS"=>	"Questa è la homepage di ZABBIX.",
 	"S_LATEST_ZABBIX_MANUAL"=>		"Il manuale più recente di ZABBIX",
@@ -220,8 +220,8 @@
 	"S_COMPARE"=>				"Compara",
 
 //	Footer
-	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta4",
-	"S_COPYRIGHT_BY"=>			"Copyright 2001-2005 by ",
+	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta5",
+	"S_COPYRIGHT_BY"=>			"Copyright 2001-2006 by ",
 	"S_CONNECTED_AS"=>			"Connesso come utente: ",
 	"S_SIA_ZABBIX"=>			"SIA Zabbix",
 
diff --git a/frontends/php/include/locales/ja_jp.inc.php b/frontends/php/include/locales/ja_jp.inc.php
index 15dafcec..a203c8ea 100644
--- a/frontends/php/include/locales/ja_jp.inc.php
+++ b/frontends/php/include/locales/ja_jp.inc.php
@@ -239,8 +239,8 @@
 	"S_COMPARE"=>				"Compare",
 
 //	Footer
-	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta4",
-	"S_COPYRIGHT_BY"=>			"Copyright 2001-2005 by ",
+	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta5",
+	"S_COPYRIGHT_BY"=>			"Copyright 2001-2006 by ",
 	"S_CONNECTED_AS"=>			"Connected as",
 	"S_SIA_ZABBIX"=>			"SIA Zabbix",
 
diff --git a/frontends/php/include/locales/lv_lv.inc.php b/frontends/php/include/locales/lv_lv.inc.php
index cd5837bc..f006f804 100644
--- a/frontends/php/include/locales/lv_lv.inc.php
+++ b/frontends/php/include/locales/lv_lv.inc.php
@@ -29,7 +29,7 @@
 
 //	about.php
 	"S_ABOUT_ZABBIX"=>			"About ZABBIX",
-	"S_INFORMATION_ABOUT_ZABBIX"=>		"Information about ZABBIX (v1.1beta4)",
+	"S_INFORMATION_ABOUT_ZABBIX"=>		"Information about ZABBIX (v1.1beta5)",
 	"S_HOMEPAGE_OF_ZABBIX"=>		"Homepage of ZABBIX",
 	"S_HOMEPAGE_OF_ZABBIX_DETAILS"=>	"This is home page of ZABBIX.",
 	"S_LATEST_ZABBIX_MANUAL"=>		"Latest ZABBIX Manual",
@@ -218,8 +218,8 @@
 	"S_COMPARE"=>				"Compare",
 
 //	Footer
-	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta4",
-	"S_COPYRIGHT_BY"=>			"Copyright 2001-2005 by ",
+	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta5",
+	"S_COPYRIGHT_BY"=>			"Copyright 2001-2006 by ",
 	"S_CONNECTED_AS"=>			"Connected as",
 	"S_SIA_ZABBIX"=>			"SIA Zabbix",
 
diff --git a/frontends/php/include/locales/ru_ru.inc.php b/frontends/php/include/locales/ru_ru.inc.php
index bcbd23fa..9134d713 100644
--- a/frontends/php/include/locales/ru_ru.inc.php
+++ b/frontends/php/include/locales/ru_ru.inc.php
@@ -29,7 +29,7 @@
 
 //	about.php
 	"S_ABOUT_ZABBIX"=>			"About ZABBIX",
-	"S_INFORMATION_ABOUT_ZABBIX"=>		"Information about ZABBIX (v1.1beta4)",
+	"S_INFORMATION_ABOUT_ZABBIX"=>		"Information about ZABBIX (v1.1beta5)",
 	"S_HOMEPAGE_OF_ZABBIX"=>		"Homepage of ZABBIX",
 	"S_HOMEPAGE_OF_ZABBIX_DETAILS"=>	"This is home page of ZABBIX.",
 	"S_LATEST_ZABBIX_MANUAL"=>		"Latest ZABBIX Manual",
@@ -218,8 +218,8 @@
 	"S_COMPARE"=>				"Compare",
 
 //	Footer
-	"S_ZABBIX_VER"=>			"ZABBIX 1.1alpha11",
-	"S_COPYRIGHT_BY"=>			"Copyright 2001-2005 by ",
+	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta5",
+	"S_COPYRIGHT_BY"=>			"Copyright 2001-2006 by ",
 	"S_CONNECTED_AS"=>			"Connected as",
 	"S_SIA_ZABBIX"=>			"SIA Zabbix",
 
diff --git a/frontends/php/include/locales/sp_sp.inc.php b/frontends/php/include/locales/sp_sp.inc.php
index 8eb0df0e..59e1832e 100644
--- a/frontends/php/include/locales/sp_sp.inc.php
+++ b/frontends/php/include/locales/sp_sp.inc.php
@@ -29,7 +29,7 @@
 
 //	about.php
 	"S_ABOUT_ZABBIX"=>			"Acerca de ZABBIX",
-	"S_INFORMATION_ABOUT_ZABBIX"=>		"Información acerca de ZABBIX (v1.1beta34",
+	"S_INFORMATION_ABOUT_ZABBIX"=>		"Información acerca de ZABBIX (v1.1beta35)",
 	"S_HOMEPAGE_OF_ZABBIX"=>		"Página home de ZABBIX",
 	"S_HOMEPAGE_OF_ZABBIX_DETAILS"=>	"Esta es la página principal de ZABBIX.",
 	"S_LATEST_ZABBIX_MANUAL"=>		"Ultima versión del Manual de ZABBIX",
@@ -218,8 +218,8 @@
 	"S_COMPARE"=>				"Comparar",
 
 //	Footer
-	"S_ZABBIX_VER"=>			"ZABBIX 1.1alpha11",
-	"S_COPYRIGHT_BY"=>			"Copyright 2001-2005 by ",
+	"S_ZABBIX_VER"=>			"ZABBIX 1.1beta5",
+	"S_COPYRIGHT_BY"=>			"Copyright 2001-2006 by ",
 	"S_CONNECTED_AS"=>			"Conectado como",
 	"S_SIA_ZABBIX"=>			"SIA Zabbix",
 
diff --git a/include/common.h b/include/common.h
index 75e83935..ba92c602 100644
--- a/include/common.h
+++ b/include/common.h
@@ -98,7 +98,7 @@
 
 #define	ZBX_FS_DBL	"%f"
 
-#define	ZABBIX_VERSION	"1.1beta4"
+#define	ZABBIX_VERSION	"1.1beta5"
 
 #define MAX_LOG_FILE_LEN (1024*1024)
 
diff --git a/src/zabbix_agent_win32/zabbixw32.h b/src/zabbix_agent_win32/zabbixw32.h
index 09a9dd68..bc21b7e8 100644
--- a/src/zabbix_agent_win32/zabbixw32.h
+++ b/src/zabbix_agent_win32/zabbixw32.h
@@ -43,7 +43,7 @@
 #else
 #define DEBUG_SUFFIX
 #endif
-#define AGENT_VERSION         "1.1beta4" DEBUG_SUFFIX
+#define AGENT_VERSION         "1.1beta5" DEBUG_SUFFIX
 
 #define ZABBIX_SERVICE_NAME   "ZabbixAgentdW32"
 #define ZABBIX_EVENT_SOURCE   "Zabbix Win32 Agent"