# HG changeset patch # User Paul Aurich # Date 1259613341 0 # Node ID 295d814b76ac048157b89adf0eb496f96619c6bd # Parent 51d82a66e24762d4cc68e2c594179e096932bb2d# Parent 464d022d7d6e9aac1f60d9c50172ca218abd3591 propagate from branch 'im.pidgin.pidgin' (head 00b667d9b2d5b9909693bc8c364232732b8fad0f) to branch 'im.pidgin.cpw.darkrain42.xmpp.scram' (head a6243850821f40a77b12227baeb436de03896abe) diff -r 464d022d7d6e -r 295d814b76ac ChangeLog --- a/ChangeLog Mon Nov 30 20:34:54 2009 +0000 +++ b/ChangeLog Mon Nov 30 20:35:41 2009 +0000 @@ -1,9 +1,12 @@ - Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.6.4 (??/??/20??): +version 2.6.5 (??/??/20??): + +version 2.6.4 (11/29/2009): libpurple: * Actually emit the hold signal for media calls. + * Fix building the GnuTLS plugin with older versions of GnuTLS. + * Fix DNS TXT query resolution. * Don't send Proxy-Authorization headers to HTTP proxy servers until we've received a "407 Proxy Authentication Required" response from the server. (thecrux) @@ -13,8 +16,6 @@ General: * New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins') to announce the list of loaded plugins (in both Finch and Pidgin). - * Fix building the GnuTLS plugin with older versions of GnuTLS. - * Fix DNS TXT query resolution. * Always rejoin open chats after an account reconnects. AIM and ICQ: diff -r 464d022d7d6e -r 295d814b76ac ChangeLog.API --- a/ChangeLog.API Mon Nov 30 20:34:54 2009 +0000 +++ b/ChangeLog.API Mon Nov 30 20:35:41 2009 +0000 @@ -1,5 +1,10 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.6.5 (??/??/20??): + +version 2.6.4 (11/29/2009): + No changes + version 2.6.3 (10/16/2009): No changes diff -r 464d022d7d6e -r 295d814b76ac ChangeLog.win32 --- a/ChangeLog.win32 Mon Nov 30 20:34:54 2009 +0000 +++ b/ChangeLog.win32 Mon Nov 30 20:35:41 2009 +0000 @@ -1,3 +1,9 @@ +version 2.6.5 (??/??/20??): + +version 2.6.4 (11/29/2009): + * Register URL handlers for everything that Windows knows about. Still + use the HTTP "open" handler for security reasons. + version 2.6.3 (10/16/2009): * No changes diff -r 464d022d7d6e -r 295d814b76ac NEWS --- a/NEWS Mon Nov 30 20:34:54 2009 +0000 +++ b/NEWS Mon Nov 30 20:35:41 2009 +0000 @@ -2,6 +2,26 @@ Our development blog is available at: http://planet.pidgin.im +2.6.5 (??/??/20??): + +2.6.4 (11/29/2009): + John: It's release time again. Lots of bug fixes this time around, as + well as a new protocol plugin developed and maintained by the MXit folks + folks. Elliott and I also did a ton of work on the Preferences window, + which will now hopefully fit on most people's small screens. Enjoy! + + Elliott: This release has been in the works for so long, I don't really + remember doing any work on it. But I do know the MSN servers gave us a + little bit of trouble this time around, forgetting people's friendly + names. Nothing too problematic, just a touch annoying. Also, we've got + a nice new Preferences dialog. You can thank John for that mostly, with + a couple of tweaks by me. + + Sadrul: A lot of little fixes for a lot of things! Among them, a fix + for a long standing issue with displaying unicode in non-utf8 locale in + finch. We also have a new prpl for MXit. This release is very very cool + altogether. Enjoy! + 2.6.3 (10/16/2009): Mark: Someone reported a fairly serious bug in our AIM/ICQ code so we're releasing a special "severe bug fix only" build. See the diff -r 464d022d7d6e -r 295d814b76ac configure.ac --- a/configure.ac Mon Nov 30 20:34:54 2009 +0000 +++ b/configure.ac Mon Nov 30 20:35:41 2009 +0000 @@ -46,7 +46,7 @@ m4_define([purple_lt_current], [6]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [6]) -m4_define([purple_micro_version], [4]) +m4_define([purple_micro_version], [5]) m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) @@ -55,7 +55,7 @@ m4_define([gnt_lt_current], [6]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [6]) -m4_define([gnt_micro_version], [4]) +m4_define([gnt_micro_version], [5]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) diff -r 464d022d7d6e -r 295d814b76ac po/de.po --- a/po/de.po Mon Nov 30 20:34:54 2009 +0000 +++ b/po/de.po Mon Nov 30 20:35:41 2009 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-26 22:45+0100\n" -"PO-Revision-Date: 2009-11-26 22:44+0100\n" +"POT-Creation-Date: 2009-11-30 11:50+0100\n" +"PO-Revision-Date: 2009-11-30 11:45+0100\n" "Last-Translator: Björn Voigt \n" "Language-Team: Deutsch \n" "MIME-Version: 1.0\n" @@ -1564,6 +1564,7 @@ msgid "Online" msgstr "Online" +#. primative, no, id, name msgid "Offline" msgstr "Offline" @@ -2516,7 +2517,7 @@ msgstr "Wenn Benutzer so viele Minuten nicht gesprochen hat" msgid "Apply hiding rules to buddies" -msgstr "Regeln zum Verstecken auf Buddies anwenden" +msgstr "Regeln zum Verstecken auf Buddys anwenden" #. *< type #. *< ui_requirement @@ -3106,7 +3107,7 @@ msgstr "Passwort (nochmal)" msgid "Enter captcha text" -msgstr "Captcha-Text eigeben" +msgstr "Captcha-Text eingeben" msgid "Captcha" msgstr "Captcha" @@ -3187,10 +3188,12 @@ msgid "Add to chat..." msgstr "Zum Chat hinzufügen..." +#. 0 #. Global msgid "Available" msgstr "Verfügbar" +#. 1 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message #. Away stuff @@ -4011,9 +4014,6 @@ msgid "Log Out" msgstr "Abmelden" -#. primative, no, id, name -#. 0 -#. 1 #. 2 msgid "Chatty" msgstr "Gesprächig" @@ -4021,6 +4021,7 @@ msgid "Extended Away" msgstr "Abwesend (erweitert)" +#. 3 msgid "Do Not Disturb" msgstr "Nicht stören" @@ -4161,7 +4162,7 @@ "Unable to find alternative XMPP connection methods after failing to connect " "directly." msgstr "" -"Nach dem Fehlschlagen einer direkten XMPP-Verbindung konnen keine " +"Nach dem Fehlschlagen einer direkten XMPP-Verbindung können keine " "alternativen Verbindungsmethoden gefunden werden." msgid "Invalid XMPP ID" @@ -4459,7 +4460,7 @@ msgstr "Ungültige ID" msgid "Invalid Namespace" -msgstr "Ungültiger Namenraum" +msgstr "Ungültiger Namensraum" msgid "Invalid XML" msgstr "Ungültiges XML" @@ -5875,7 +5876,7 @@ msgstr "Hier können Sie Ihr MXit-Profil aktualisieren" msgid "View Splash" -msgstr "Startbildschirn anschauen" +msgstr "Startbildschirm anschauen" msgid "There is no splash-screen currently available" msgstr "Es gibt gerade keinen Startbildschirm" @@ -6315,7 +6316,7 @@ msgstr "Bildschirmauflösung (dpi)" msgid "Base font size (points)" -msgstr "Basis-Schriftgrüße (Punkt)" +msgstr "Basis-Schriftgröße (Punkt)" msgid "User" msgstr "Benutzer" @@ -6888,7 +6889,7 @@ msgstr "Dienst nicht definiert" msgid "Obsolete SNAC" -msgstr "Obsoleteter SNAC" +msgstr "Obsoleter SNAC" msgid "Not supported by host" msgstr "Nicht unterstützt vom Host" @@ -7993,7 +7994,7 @@ #, c-format msgid "%u needs authorization" -msgstr "%u benötigt Authorisierung" +msgstr "%u benötigt Autorisierung" msgid "Add buddy authorize" msgstr "Buddy-Autorisierung hinzufügen" @@ -8678,8 +8679,8 @@ "The identifier '%s' may possibly refer to any of the following users. Please " "select the correct user from the list below to add them to your buddy list." msgstr "" -"Der Bezeichner '%s' kann sich vielleicht zu einem der folgenden Benutzer " -"beziehen. Bitte wählen Sie den korrekten Benutzer vor der untenstehenden " +"Der Bezeichner '%s' kann sich vielleicht auf einen der folgenden Benutzer " +"beziehen. Bitte wählen Sie den korrekten Benutzer aus der untenstehenden " "Liste, um ihn zu Ihrer Buddy-Liste hinzuzufügen." msgid "Select User" @@ -8923,7 +8924,7 @@ #, c-format msgid "The %s buddy is not trusted" -msgstr "Dem Buddy %s wird nicht (kryptografisch) vertraut" +msgstr "Dem Buddy %s wird nicht (kryptographisch) vertraut" msgid "" "You cannot receive buddy notifications until you import his/her public key. " @@ -9902,7 +9903,7 @@ #, c-format msgid "Failure: Remote does not support proposed cipher" msgstr "" -"Fehler: Entferntes Programm unterstützt die vorgeschlagene Cipher nicht" +"Fehler: Entferntes Programm unterstützt die vorgeschlagene Chiffre nicht" #, c-format msgid "Failure: Remote does not support proposed PKCS" @@ -14326,17 +14327,17 @@ "haben." msgid "Markerline" -msgstr "Markierunglinie" +msgstr "Markierungslinie" msgid "Draw a line to indicate new messages in a conversation." msgstr "" "Eine Linie zeichnen um neue Nachrichten in einer Unterhaltung anzuzeigen." msgid "Jump to markerline" -msgstr "Springen zur Markierunglinie" +msgstr "Springen zur Markierungslinie" msgid "Draw Markerline in " -msgstr "Zeichne eine Markierunglinie in " +msgstr "Zeichne eine Markierungslinie in " msgid "_IM windows" msgstr "_IM-Fenster" @@ -14816,7 +14817,7 @@ msgstr "Zeigt die Buddy-Liste als tickerähnliche Laufschrift." msgid "Display Timestamps Every" -msgstr "Zeige Zeitstemple alle" +msgstr "Zeige Zeitstempel alle" #. *< type #. *< ui_requirement