changeset
merge of 'f59ef4108e6750cb33ccca0158177cff8e54c60a'
Fri, 23 Nov 2007 04:06:23 +0000
- author
- Sadrul Habib Chowdhury <sadrul@pidgin.im>
- date
- Fri, 23 Nov 2007 04:06:23 +0000
- changeset 21709
- c42b2b239966
- parent 21708
- f59ef4108e67 (current diff)
- parent 21706
- c5b4e7f850e3 (diff)
- child 21710
- 8c086dc0a431
- child 21754
- 31bb981715e4
merge of 'f59ef4108e6750cb33ccca0158177cff8e54c60a'
and 'c5b4e7f850e380cd3329a8005972648829ba220f'
--- a/pidgin/gtkblist.c Fri Nov 23 04:04:33 2007 +0000 +++ b/pidgin/gtkblist.c Fri Nov 23 04:06:23 2007 +0000 @@ -4445,7 +4445,7 @@ GtkWidget *ret = NULL; /* XXX: Workaround for the currently incomplete implementation of PidginScrollBook */ if (PIDGIN_IS_SCROLL_BOOK(container)) - container = PIDGIN_SCROLL_BOOK(container)->notebook; + container = GTK_CONTAINER(PIDGIN_SCROLL_BOOK(container)->notebook); children = gtk_container_get_children(container); l = g_list_find_custom(children, account, (GCompareFunc) find_account_widget); if (l)
--- a/po/de.po Fri Nov 23 04:04:33 2007 +0000 +++ b/po/de.po Fri Nov 23 04:06:23 2007 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-17 16:16+0100\n" +"POT-Creation-Date: 2007-11-22 21:19+0100\n" "PO-Revision-Date: 2007-11-17 16:14+0100\n" "Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n" "Language-Team: Deutsch <de@li.org>\n" @@ -4301,6 +4301,9 @@ msgid "Connect server" msgstr "Verbindungsserver" +msgid "File transfer proxies" +msgstr "Proxys für Dateiübertragungen" + #, c-format msgid "%s has left the conversation." msgstr "%s hat das Gespräch verlassen."
