Mercurial > pidgin.yaz
changeset 22152:6e2dc21a33cb
merge of '2ab65ec8302949b83f1a2ce4fd9abfef611e3690'
and '85849a5088e71543d1c0b6bc621d4cf16967495f'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 18 Jan 2008 15:26:59 +0000 |
| parents | 68f8adb67470 (current diff) 4a391a6945fb (diff) |
| children | 8f78d223d24e |
| files | |
| diffstat | 2 files changed, 14 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c Fri Jan 18 15:13:20 2008 +0000 +++ b/pidgin/gtkimhtml.c Fri Jan 18 15:26:59 2008 +0000 @@ -1455,9 +1455,6 @@ gtk_text_buffer_create_tag(imhtml->text_buffer, "SUP", "rise", 5000, NULL); gtk_text_buffer_create_tag(imhtml->text_buffer, "PRE", "family", "Monospace", NULL); gtk_text_buffer_create_tag(imhtml->text_buffer, "search", "background", "#22ff00", "weight", "bold", NULL); -#if GTK_CHECK_VERSION(2,8,0) - gtk_text_buffer_create_tag(imhtml->text_buffer, "comment", "invisible", FALSE, NULL); -#endif /* When hovering over a link, we show the hand cursor--elsewhere we show the plain ol' pointer cursor */ imhtml->hand_cursor = gdk_cursor_new (GDK_HAND2); @@ -2984,15 +2981,10 @@ gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos); -#if GTK_CHECK_VERSION(2,8,0) - wpos = g_snprintf (ws, len, "%s", tag); - gtk_text_buffer_insert_with_tags_by_name(imhtml->text_buffer, iter, ws, wpos, "comment", NULL); -#else if (imhtml->show_comments && !(options & GTK_IMHTML_NO_COMMENTS)) { wpos = g_snprintf (ws, len, "%s", tag); gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos); } -#endif ws[0] = '\0'; wpos = 0; /* NEW_BIT (NEW_COMMENT_BIT); */ @@ -3138,12 +3130,6 @@ void gtk_imhtml_show_comments (GtkIMHtml *imhtml, gboolean show) { -#if GTK_CHECK_VERSION(2,8,0) - GtkTextTag *tag; - tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(imhtml->text_buffer), "comment"); - if (tag) - g_object_set(G_OBJECT(tag), "invisible", !show, NULL); -#endif imhtml->show_comments = show; }
--- a/po/de.po Fri Jan 18 15:13:20 2008 +0000 +++ b/po/de.po Fri Jan 18 15:26:59 2008 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-08 11:16+0100\n" -"PO-Revision-Date: 2008-01-08 11:15+0100\n" +"POT-Creation-Date: 2008-01-17 22:50+0100\n" +"PO-Revision-Date: 2008-01-17 22:50+0100\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -2688,6 +2688,9 @@ msgid "Could not listen on socket" msgstr "Kann nicht an der Socket hören" +msgid "Error communicating with local mDNSResponder." +msgstr "Fehler bei der Kommunikation mit lokalem mDNSResponder." + msgid "Invalid proxy settings" msgstr "Falsche Proxy-Einstellungen" @@ -4237,6 +4240,8 @@ msgid "Unable to buzz, because the user %s does not support it." msgstr "Kann nicht anklopfen, da der Benutzer %s dies nicht unterstützt." +#. Yahoo only supports one attention command: the 'buzz'. +#. This is index number YAHOO_BUZZ. msgid "Buzz" msgstr "Anklopfen" @@ -9151,6 +9156,10 @@ msgid "Unable to establish file descriptor." msgstr "Konnte Dateibeschreibung nicht erstellen." +#, c-format +msgid "%s is trying to send you a group of %d files.\n" +msgstr "%s versucht, Ihnen eine Gruppe von %d Dateien zu senden.\n" + msgid "Write Error" msgstr "Schreibfehler" @@ -12295,6 +12304,9 @@ msgid "_Open Mail" msgstr "Mail ö_ffnen" +msgid "Pidgin Tooltip" +msgstr "Pidgin-Tooltip" + msgid "Pidgin smileys" msgstr "Pidgin-Smileys"