merge of '346b13a7c448a4526e5fdbd279df981177d8fc3a'v2.2.2

     and 'cee31fa8fd13b3f88735053590bbd67f1cbedfd7'

3 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 098f73fc16..f44f446bf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,15 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.2.2 (10/23/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.2
-		NOTE: Due to the backporting that has happened for the actual
-			  release, it is possible that bugs marked as fixed in
-			  2.2.1 or 2.2.2 will not be fixed until the next release
-			  from the im.pidgin.pidgin branch.
+		NOTE: Due to the way this release was made, it is possible that
+			  bugs marked as fixed in 2.2.1 or 2.2.2 will not be fixed
+			  until the next release.
+
+	* Various bug and memory leak fixes
+	* Look for a default prefs.xml in the CSIDL_COMMON_APPDATA directory
+	  (e.g. c:\Documents and Settings\All Users\
+	        Application Data\purple\prefs.xml) on Windows, similarly to
+	  how this is done on other platforms.
 
 version 2.2.1 (09/29/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
diff --git a/po/ChangeLog b/po/ChangeLog
index 8d2c98ca03..9bc938ac49 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,4 +1,4 @@
-idgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
+Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.2.2
 	* Catalan translation updated (Josep Puigdemont)
diff --git a/po/it.po b/po/it.po
index 6e232f339a..39cc4781a8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -437,7 +437,7 @@ msgstr "Informazione"
 
 #: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
-msgstr "Sacaricamento in corso..."
+msgstr "Scaricamento in corso..."
 
 #: ../finch/gntblist.c:904 ../finch/gntconv.c:507
 #: ../libpurple/protocols/silc/chat.c:899