From 8cc6cedf8deccade0ab0320d0cc1461f359b72b3 Mon Sep 17 00:00:00 2001
From: pier11 <pier11@operamail.com>
Date: Tue, 16 Feb 2010 14:50:11 +0000
Subject: [PATCH] set 1.9 milestone not to rush things, but to define target.
 Shall be tested extensively first of course.

---
 ChangeLog       | 6 ++++++
 VERSION         | 2 +-
 src/core/sipe.c | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fee1c72..2b502d51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+version 1.9.0 "File transfer" (2010-02-XX)
+	- Contributed File transfer functionality. File encryption is supported. (Jakub Adam, Tomáš Hrabčík)
+	- Windows build preparation. (pier11)
+	- Code analysis with Coverity Prevent. (Stefan Becker)
+	- Updated translations: 'ru' (100%, pier11), 'de' (100%, Stefan Becker).
+
 version 1.8.1 "Exchange/Calendar crash fixes" (2010-02-16)
 	- many crash fixes for error or corner cases in calendar integration (pier11, Stefan Becker)
 	- more detailed code analysis with Coverity Prevent (Stefan Becker)
diff --git a/VERSION b/VERSION
index a8fdfda1..f8e233b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.1
+1.9.0
diff --git a/src/core/sipe.c b/src/core/sipe.c
index 37066460..1637ab57 100644
--- a/src/core/sipe.c
+++ b/src/core/sipe.c
@@ -5513,7 +5513,7 @@ gboolean process_register_response(struct sipe_account_data *sip, struct sipmsg
 				if (warning != NULL) {
 					reason = sipmsg_find_part_of_header(warning, "reason=\"", "\"", NULL);
 				}
-				warning = g_strdup_printf(_("Service unavailable: %s"), reason ? reason : "<a href=\"http://www.reuters.com\">http://www.reuters.com</a>"/*_("no reason given")*/);
+				warning = g_strdup_printf(_("Service unavailable: %s"), reason ? reason : _("no reason given"));
 				g_free(reason);
 
 				sip->gc->wants_to_die = TRUE;
@@ -8827,6 +8827,7 @@ static void sipe_show_about_plugin(PurplePluginAction *action)
 		" - Intel<br/>"
 		" - Nokia<br/>"
 		" - HP<br/>"
+		" - Symantec<br/>"
 		" - Accenture<br/>"
 		" - Siemens<br/>"
 		" - Alcatel-Lucent<br/>"
-- 
2.11.4.GIT