changeset 32792:670296a688dc

merge of '19d8fa4275ceeb945882502e55b5c9581d1646da' and '4efee4948f792833531b79dfc45a885b483cb09d'
author Mark Doliner <mark@kingant.net>
date Sun, 06 May 2012 06:05:11 +0000
parents c18caa631628 (current diff) 9fb1aec17177 (diff)
children b4c2802af7f8 9350878c0b38
files
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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"