# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1336284311 0
# Node ID 670296a688dc408ccc4e52697b77911cbd64a9be
# Parent  c18caa631628a64d73ab3be980118dc1493f6154# Parent  9fb1aec171774df0f7f99b2a49c309e5d8cec43a
merge of '19d8fa4275ceeb945882502e55b5c9581d1646da'
     and '4efee4948f792833531b79dfc45a885b483cb09d'

diff -r c18caa631628 -r 670296a688dc po/ChangeLog
--- a/po/ChangeLog	Sat May 05 17:13:30 2012 +0000
+++ b/po/ChangeLog	Sun May 06 06:05:11 2012 +0000
@@ -1,5 +1,8 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.4
+	* German translation updated (Björn Voigt, Jochen Kemnade)
+
 version 2.10.3
 	* Dutch translation updated (Gideon van Melle)
 	* Polish translation updated (Piotr Drąg)
diff -r c18caa631628 -r 670296a688dc po/pl.po
--- a/po/pl.po	Sat May 05 17:13:30 2012 +0000
+++ b/po/pl.po	Sun May 06 06:05:11 2012 +0000
@@ -15,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 20:20-0700\n"
-"PO-Revision-Date: 2012-03-23 16:04+0000\n"
+"POT-Creation-Date: 2012-05-05 22:52-0700\n"
+"PO-Revision-Date: 2012-04-07 13:40+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/pidgin/language/"
 "pl/)\n"
@@ -2277,6 +2277,9 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Wystąpił nieodwracalny błąd biblioteki Farsight2."
 
+msgid "A non-recoverable Farstream error has occurred."
+msgstr "Wystąpił błąd systemu Farstream, z którego nie można przywrócić."
+
 msgid "Error with your microphone"
 msgstr "Błąd mikrofonu"