prepare 2.31.2 release

diff --git a/NEWS b/NEWS
index 81332ef0542babc8966a1534ff13dca3056089bd..9fcf465cbab2101a1e10f3be408f762b699b58b6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,29 @@
+NEW in 2.31.2 (24/05/2010)
+=============
+
+The "brand-new Telepathy store: http://is.gd/cjoQ8" release.
+
+Empathy now uses icons from gnome-icon-theme 2.30. You should consider
+to upgrade to this version if needed.
+
+Bugs fixed:
+ - Fixed #606738, empathy_dispatcher_join_muc: assertion failed: (connection_data != NULL) when joining favorites rooms while account is connecting (Guillaume Desmottes)
+ - Fixed #617909, Should call gtk_builder_set_translation_domain on GtkBuilder UI components (Rob Bradford)
+ - Fixed #618401, Empathy should use port 8001 to connect to freenode irc (Brian Curtis)
+ - Fixed #618753, In the preference dialog, "Automatically _connect..." and  the "_Close" button conflict. (ekspiulo)
+ - Fixed #618883, IRC account: don't allow to save changes when editing network details (Guillaume Desmottes)
+ - Fixed #618969, Incomplete localisation of g-c-c module (Rob Bradford)
+
+Translations:
+ - Updated cs Translation (Petr Kovar)
+ - Updated en@shaw Translation (Thomas Thurman)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated id Translation (Andika Triwidada)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated si Translation (Danishka Navin)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
 NEW in 2.31.1 (04/05/2010)
 =============
 

diff --git a/configure.ac b/configure.ac
index 0673f8863e1dd4c750e941667b1dd7e2ca84cdd4..b7badb3d306c900271f70a17cacf01fdf5178f29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [31])
-m4_define([empathy_micro_version], [1])
+m4_define([empathy_micro_version], [2])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'