changeset 9709:4d05b6e9e9cd

[gaim-migrate @ 10570] This patch is freaking massive. Renamed ui.h to gtkdialogs.h Renamed dialogs.c to gtkdialogs.c sed'ed the hell out of the .po files These files are similar to gtkutil.c/.h. They are meant to contain dialogs such as the "New Instant Message" window, which does not belong in gtkblist.c or gtkconv.c, and is called from both places. Eventually the functions in gtkdialogs.c/.h should be changed to conform to Gaim's naming convention. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 08 Aug 2004 00:48:19 +0000
parents d49a19e8320c
children 4d2eba0e14ee
files HACKING plugins/docklet/docklet-win32.c plugins/docklet/docklet-x11.c plugins/docklet/docklet.c plugins/gaim-remote/remote.c plugins/gaiminc.c po/POTFILES.in po/am.po po/bg.po po/ca.po po/cs.po po/da.po po/de.po po/en_CA.po po/en_GB.po po/es.po po/fi.po po/fr.po po/he.po po/hi.po po/hu.po po/it.po po/ja.po po/ko.po po/lt.po po/mk.po po/nl.po po/no.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sr.po po/sr@Latn.po po/sv.po po/vi.po po/zh_CN.po po/zh_TW.po src/Makefile.am src/Makefile.mingw src/about.c src/away.c src/dialogs.c src/gtkaccount.c src/gtkblist.c src/gtkconn.c src/gtkconv.c src/gtkconv.h src/gtkdebug.c src/gtkdialogs.c src/gtkdialogs.h src/gtkimhtml.c src/gtkimhtmltoolbar.c src/gtknotify.c src/gtkplugin.h src/gtkpluginpref.h src/gtkpounce.c src/gtkprefs.c src/gtkrequest.c src/gtkutils.c src/gtkutils.h src/idle.c src/main.c src/protocols/jabber/iq.c src/server.c src/sound.c src/status.c src/themes.c src/ui.h
diffstat 72 files changed, 2458 insertions(+), 2463 deletions(-) [+]
line wrap: on
line diff
--- a/HACKING	Sun Aug 08 00:03:12 2004 +0000
+++ b/HACKING	Sun Aug 08 00:48:19 2004 +0000
@@ -184,7 +184,7 @@
 core.c:
   This is the start of what will become the main() for gaim-core.
 
-dialogs.c:
+gtkdialogs.c:
   A massive file with a lot of little utility functions. This is where all
   of those little dialog windows are created. Things like the warn dialog
   and the add buddy dialog are here. Not all of the dialogs in gaim are in
--- a/plugins/docklet/docklet-win32.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/plugins/docklet/docklet-win32.c	Sun Aug 08 00:48:19 2004 +0000
@@ -32,7 +32,7 @@
 #include "debug.h"
 
 #include "gaim.h"
-#include "ui.h"
+#include "gtkdialogs.h"
 
 #include "resource.h"
 #include "MinimizeToTray.h"
--- a/plugins/docklet/docklet-x11.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/plugins/docklet/docklet-x11.c	Sun Aug 08 00:48:19 2004 +0000
@@ -28,7 +28,7 @@
 #include "stock.h"
 
 #include "gaim.h"
-#include "ui.h"
+#include "gtkdialogs.h"
 
 #include "eggtrayicon.h"
 #include "docklet.h"
--- a/plugins/docklet/docklet.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/plugins/docklet/docklet.c	Sun Aug 08 00:48:19 2004 +0000
@@ -49,7 +49,7 @@
 #include "docklet.h"
 
 #include "gaim.h"
-#include "ui.h"
+#include "gtkdialogs.h"
 
 /* globals */
 
--- a/plugins/gaim-remote/remote.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/plugins/gaim-remote/remote.c	Sun Aug 08 00:48:19 2004 +0000
@@ -39,9 +39,9 @@
 
 /* XXX */
 #include "gtkconv.h"
+#include "gtkdialogs.h"
 #include "gtkplugin.h"
 #include "gaim.h"
-#include "ui.h"
 #include "prefs.h"
 
 #include <gaim-remote/remote.h>
--- a/plugins/gaiminc.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/plugins/gaiminc.c	Sun Aug 08 00:48:19 2004 +0000
@@ -7,7 +7,7 @@
 
 /* include UI for show_about() */
 #include "gtkplugin.h"
-#include "ui.h"
+#include "gtkdialogs.h"
 
 #define GAIMINC_PLUGIN_ID "core-gaiminc"
 
--- a/po/POTFILES.in	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/POTFILES.in	Sun Aug 08 00:48:19 2004 +0000
@@ -41,7 +41,6 @@
 src/blist.c
 src/connection.c
 src/conversation.c
-src/dialogs.c
 src/ft.c
 src/gaim-disclosure.c
 src/gaim-remote.c
@@ -50,6 +49,7 @@
 src/gtkconn.c
 src/gtkconv.c
 src/gtkdebug.c
+src/gtkdialogs.c
 src/gtkft.c
 src/gtkimhtml.c
 src/gtkimhtmltoolbar.c
--- a/po/am.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/am.po	Sun Aug 08 00:48:19 2004 +0000
@@ -643,7 +643,7 @@
 msgid "_Set"
 msgstr "አድርግ (_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "ተወው"
@@ -1488,8 +1488,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1506,9 +1506,9 @@
 msgstr "እሺ"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1694,11 +1694,11 @@
 msgid "By account"
 msgstr ""
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr ""
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1707,160 +1707,160 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 #, fuzzy
 msgid "Remove Chat"
 msgstr "አስወግድ"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "መድረክን አስወግድ"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 #, fuzzy
 msgid "Remove Contact"
 msgstr "አስወግድ"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "እስክሪን ስም፦ (_S)"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr ""
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 #, fuzzy
 msgid "New Instant Message"
 msgstr "አዲስ መልእክት"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr ""
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 msgid "Get User Log"
 msgstr ""
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 msgid "_Save"
 msgstr "አስቀምጥ (_S)"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "አስቀምጥ እና ተጠቀም"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "ተጠቀም"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 #, fuzzy
 msgid "Alias Chat"
 msgstr "የጌም ማውሪያ"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 #, fuzzy
 msgid "Alias"
 msgstr "የጌም ማውሪያ"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 #, fuzzy
 msgid "Alias Contact"
 msgstr "የጌም ማውሪያ"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr ""
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ""
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr ""
 
--- a/po/bg.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/bg.po	Sun Aug 08 00:48:19 2004 +0000
@@ -673,7 +673,7 @@
 msgid "_Set"
 msgstr "_Задаване"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Забрави"
@@ -1535,8 +1535,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1553,9 +1553,9 @@
 msgstr "ОК"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1750,11 +1750,11 @@
 msgid "By account"
 msgstr "По абонаменти"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Предупреждаване на потребител"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1763,15 +1763,15 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "_Анонимно предупреждаване?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Анонимните предупреждения са по-малко строги.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -1779,11 +1779,11 @@
 " Вие се опитвате да изтриете %s от списъка си с познати. Желаете ли да "
 "продължите с операцията?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Изтриване на потребител"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1792,11 +1792,11 @@
 "Вие се опитвате да изтриете разговор %s от списъка си с познати.Желаете ли "
 "да продължите с операцията?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Изтриване на разговор"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1805,11 +1805,11 @@
 "Вие се опитвате да изтриете %s група и всички потребители в нея от своя лист "
 "с приятели. Желаете ли да продължите с операцията?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Изтриване на група"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1818,119 +1818,119 @@
 "Вие се опитвате да премахнете контакт, съдържащ %s и %d други приятели от "
 "вашия лист с приятели.Желаете ли да продължите с операцията?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Изтриване на контакт"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "_Потребителско име (ICQ номер):"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "_Абонамент:"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "Ново съобщение"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 #, fuzzy
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Моля, въведете име на лицето, на което желаете да изпратите съобщение.\n"
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Получаване на информация за потребител"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Моля, въведете име на лицето, на което желаете да изпратите съобщение.\n"
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Получаване на информация за потребител"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Моля, въведете име на лицето, на което желаете да изпратите съобщение.\n"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "Не можете да съхранявате съобщения за състояние Няма ме без заглавие"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Моля, задайте заглавие за съобщението или изберете \"Use\", за да използвате "
 "съобщението, без да го запазвате."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "Не можете да създавате празно съобщение за състояние Няма ме"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Ново съобщение за състояние Няма ме"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Заглавие на състоянието Няма ме:"
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Запазва"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Съхраняване и използване"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Използване"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Заглавие за разговор"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Въвеждане заглавие за този разговор."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 #, fuzzy
 msgid "Alias"
 msgstr "Псевдоним:"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "Заглавие на контакт"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Въвеждане заглавие за този контакт."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Въвеждане на име за %s."
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Псевдоним за познат"
 
--- a/po/ca.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/ca.po	Sun Aug 08 00:48:19 2004 +0000
@@ -726,7 +726,7 @@
 msgid "_Set"
 msgstr "_Desar"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Cancel·lar"
@@ -1622,8 +1622,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1640,9 +1640,9 @@
 msgstr "D'acord"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1839,11 +1839,11 @@
 msgid "By account"
 msgstr "Per compte"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Avisar usuari"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1856,26 +1856,26 @@
 "Això incrementarà el nivell d'avís de %s i estarà subjecte a una limitació "
 "de velocitat més estricta.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Avisar _anònimament?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Els avisos anònims són menys estrictes.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Esteu a punt d'eliminar a %s de la llista de contactes. Voleu continuar?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Eliminar contacte"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1883,12 +1883,12 @@
 msgstr ""
 "Esteu a punt d'eliminar a %s de la llista de contactes. Voleu continuar?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 #, fuzzy
 msgid "Remove Chat"
 msgstr "Eliminar conversa"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1897,11 +1897,11 @@
 "Esteu a punt d'eliminar el grup %s i tots els seus membres de la llista de "
 "contactes. Voleu continuar?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Eliminar grup"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1910,37 +1910,37 @@
 "Esteu a punt d'eliminar el contacte que conté %s i %d altres contactes de la "
 "llista de contactes. Voleu continuar?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Eliminar contacte"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "_Nom d'usuari:"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "_Compte:"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Missatgers instantanis"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 #, fuzzy
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Si us plau, introduïu el nom de l'usuari de la persona a qui vol enviar un "
 "missatge instantani.\n"
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Obtenir dades de l'usuari"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
@@ -1948,12 +1948,12 @@
 "Si us plau, introduïu el nom de l'usuari de la persona de la que voleu veure "
 "les dades.\n"
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Obtenir dades de l'usuari"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
@@ -1961,11 +1961,11 @@
 "Si us plau, introduïu el nom de l'usuari de la persona de la que voleu veure "
 "les dades.\n"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "No es pot desar un missatge d'absència amb un títol en blanc"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 #, fuzzy
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
@@ -1973,63 +1973,63 @@
 "Si us plau, doneu un títol al missatge, o escolliu \"Usar\" per usar-lo "
 "sente gravar."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "No pot crear un missatge d'absència buit"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Nou missatge d'absència"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Títol d'absència:"
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Gravar"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Gravar i usar"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Usar"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Àlies"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 #, fuzzy
 msgid "Enter an alias for this chat."
 msgstr "Si us plau, introduïu un àlies per aquesta conversa.\n"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Àlies"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 #, fuzzy
 msgid "Alias Contact"
 msgstr "Àlies"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 #, fuzzy
 msgid "Enter an alias for this contact."
 msgstr "Si us plau, introduïu un àlies per aquest contacte.\n"
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, fuzzy, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduïu la clau de %s"
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Posar un àlies a un contacte"
--- a/po/cs.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/cs.po	Sun Aug 08 00:48:19 2004 +0000
@@ -657,7 +657,7 @@
 msgid "_Set"
 msgstr "_Nastavit"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Zrušit"
 
@@ -1508,8 +1508,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2381 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2381 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1526,9 +1526,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2382 src/gtkblist.c:4411
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1717,11 +1717,11 @@
 msgid "By account"
 msgstr "Podle účtu"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Varovat uživatele"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1734,25 +1734,25 @@
 "Toto zvýší úroveň varování %s a oni budou pod vlivem tvrdšího omezení "
 "rychlosti.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Varovat _anonymně?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymní varování jsou méně vážná.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Hodláte odstranit %s ze svého seznamu kamarádů. Chcete pokračovat?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Odstranit kamaráda"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1760,11 +1760,11 @@
 msgstr ""
 "Hodláte odstranit chat %s ze svého seznamu kamarádů. Chcete pokračovat?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Odstranit chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1773,11 +1773,11 @@
 "Hodláte odstranit skupinu %s a všechny její členy ze svého seznamu kamarádů. "
 "Chcete pokračovat?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1786,105 +1786,105 @@
 "Hodláte odstranit kontakt obsahující %s a %d jiných kamarádů ze svého "
 "seznamu kamarádů. Chcete pokračovat?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Odstranit kontakt"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Jméno uživatele"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Účet"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Nová Instant Message"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Zadejte prosím jméno uživatele, kterého chcete IM."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Získat informace o uživateli"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Zadejte prosím jméno uživatele, jehož informace chcete zobrazit."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Získat záznam uživatele"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Zadejte prosím jméno uživatele, jehož záznam chcete zobrazit."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Nemůžete uložit zprávu o nepřítomnosti s prázdným nadpisem"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Dejte prosím zprávě nadpis, nebo zvolte \"Použít\" pro použití bez uložení."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Nemůžete vytvořit prázdnou zprávu o nepřítomnosti"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Nová zpráva o nepřítomnosti"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Nadpis zprávy o nepřítomnosti: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Uložit _a použít"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Použít"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Alias chatu"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Zadejte alias pro tento chat."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Alias kontaktu"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Zadejte alias pro tento kontakt."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Zadejte alias pro %s"
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Alias kamaráda"
 
--- a/po/da.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/da.po	Sun Aug 08 00:48:19 2004 +0000
@@ -670,7 +670,7 @@
 msgid "_Set"
 msgstr "_Sæt"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Annullér"
 
@@ -1534,8 +1534,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1552,9 +1552,9 @@
 msgstr "O.k."
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1740,11 +1740,11 @@
 msgid "By account"
 msgstr "Efter konto"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Advar bruger"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1757,36 +1757,36 @@
 "Dette vil forøge %s's advarselsniveau og han eller hun vil være berørt af en "
 "lavere grænse når beskeder bliver sendt hurtigt.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Advar _anonymt?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyme advarsler er mindre grove.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Du skal til at slette %s fra din venneliste. Vil du fortsætte?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Fjern ven"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Du skal til at fjerne chatten %s fra din venneliste. Vil du fortsætte?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Fjern chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1795,11 +1795,11 @@
 "Du skal til at fjerne gruppen %s og alle den indeholder fra din venneliste. "
 "Vil du fortsætte?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1808,105 +1808,105 @@
 "Du skal til at fjerne kontakten indeholdende %s og %d andre venner fra din "
 "venneliste. Vil du fortsætte?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Brugernavn"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Konto"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Ny besked"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Indtast brugernavnet på personen du vil snakke med."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Hent brugeroplysninger"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Indtast brugernavnet på den person, hvis oplysninger du gerne vil se."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Hent bruger log"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Indtast brugernavnet på den person, hvis log du gerne vil læse."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan ikke gemme en fraværsbesked uden en titel"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Giv fraværsbeskeden en titel, eller vælg \"Brug\" for at bruge uden at gemme."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lave en tom fraværsbesked"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Ny fraværsbesked"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Titel: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Gem"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "G_em og brug"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Brug"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Indtast et alias for denne chat."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Alias kontakt"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Indtast et alias for denne kontakt."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Indtast et alias for %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Lav alias for ven"
 
--- a/po/de.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/de.po	Sun Aug 08 00:48:19 2004 +0000
@@ -676,7 +676,7 @@
 msgid "_Set"
 msgstr "_Setzen"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
@@ -1545,8 +1545,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1563,9 +1563,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1752,11 +1752,11 @@
 msgid "By account"
 msgstr "Nach Konto"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Benutzer warnen"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1769,15 +1769,15 @@
 "Dies wird die Warnstufe von %s erhöhen und er oder sie bekommen eine "
 "schlechtere Bewertung.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "_Anonym warnen?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyme Warnungen sind nicht so schwerwiegend.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -1785,11 +1785,11 @@
 "Sie sind dabei, %s aus Ihrer Kontaktliste zu entfernen. Möchten Sie "
 "fortsetzen?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1798,11 +1798,11 @@
 "Sie sind dabei, den Chat %s aus Ihrer Kontaktliste zu entfernen. Möchten Sie "
 "fortsetzen?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Chat Entfernen"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1811,11 +1811,11 @@
 "Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
 "Ihrer Kontaktliste zu entfernen. Möchten Sie fortsetzen?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1824,111 +1824,111 @@
 "Sie sind dabei, den Kontakt, der %s enthält und %d andere Buddies aus Ihrer "
 "Kontaktliste zu entfernen.  Möchten Sie fortsetzen?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Benutzername"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Konto"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Neue Nachricht"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten wollen."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, dessen Info Sie sehen "
 "möchten."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Benutzer-Mitschnitt abrufen"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, dessen Mitschnitt Sie "
 "sehen möchten."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Sie können keine Abwesenheitsnachricht ohne Titel speichern"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Bitte geben Sie der Nachricht einen Titel oder wählen Sie „Übernehmen“, um "
 "die Nachricht zu übernehmen, ohne abzuspeichern."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Sie können keine leere Abwesenheitsnachricht erstellen"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Neue Abwesenheitsnachricht"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Abwesenheitsgrund: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Speichern"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "S_peichern & Übernehmen"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "Ü_bernehmen"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Chat-Alias"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Geben Sie einen Alias für diesen Chat ein."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Kontakt-Alias"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Geben Sie einen Alias für diesen Kontakt ein."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geben Sie einen Alias %s ein."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Alias für Buddy"
 
--- a/po/en_CA.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/en_CA.po	Sun Aug 08 00:48:19 2004 +0000
@@ -654,7 +654,7 @@
 msgid "_Set"
 msgstr "_Set"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -1492,8 +1492,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1510,9 +1510,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:350 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2001
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2001
 #: src/gtkaccount.c:2497 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1703,11 +1703,11 @@
 msgid "By account"
 msgstr "By account"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1720,26 +1720,26 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1748,11 +1748,11 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1761,11 +1761,11 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1774,107 +1774,107 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr "_Account"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Please enter the screen name of the person you would like to IM."
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 msgid "Get User Log"
 msgstr "Get User Log"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose log you would like to view."
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "You cannot save an away message with a blank title"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "You cannot create an empty away message"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "New away message"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Away title: "
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 msgid "_Save"
 msgstr "_Save"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 msgid "_Use"
 msgstr "_Use"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
--- a/po/en_GB.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/en_GB.po	Sun Aug 08 00:48:19 2004 +0000
@@ -654,7 +654,7 @@
 msgid "_Set"
 msgstr "_Set"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -1504,8 +1504,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1522,9 +1522,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1710,11 +1710,11 @@
 msgid "By account"
 msgstr "By account"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1727,26 +1727,26 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1755,11 +1755,11 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1768,11 +1768,11 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1781,107 +1781,107 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Account"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Please enter the screen name of the person you would like to IM."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Get User Log"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose log you would like to view."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "You cannot save an away message with a blank title"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "You cannot create an empty away message"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "New away message"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Away title: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Save"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Use"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
--- a/po/es.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/es.po	Sun Aug 08 00:48:19 2004 +0000
@@ -716,7 +716,7 @@
 msgid "_Set"
 msgstr "_Guardar"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -1578,8 +1578,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2381 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2381 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1596,9 +1596,9 @@
 msgstr "Aceptar"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2382 src/gtkblist.c:4411
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1784,11 +1784,11 @@
 msgid "By account"
 msgstr "Por cuenta"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Avisar usuario"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1801,25 +1801,25 @@
 "Ésto incrementará el nivel de aviso de %s y él o ella estará sujeto a un "
 "límite más duro en su tasa de envío de mensajes.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "¿Advertir _anónimamente?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Las advertencias anónimas son menos duras.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1827,11 +1827,11 @@
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1840,11 +1840,11 @@
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ¿Desea continuar?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1853,111 +1853,111 @@
 "Está a punto de borrar el contacto que contiene a %s y a otros %d amigos de "
 "su lista de amigos. ¿Desea continuar?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Nombre de usuario"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Mensaje instantáneo nuevo"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Introduzca el nombre de usuario de la persona con la que quiere comunicarse."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Introduzca el nombre de usuario de la persona de la cual quiere ver "
 "información."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Obtener registro de usuario"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Introduzca el nombre de usuario de la persona de la cual quiere ver "
 "informaciónde registro."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "No se puede guardar un mensaje de ausencia sin título"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Por favor, dele al mensaje un título, o elija «Usar» para usarlo sin "
 "grabarlo."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "No se puede crear un mensaje de ausencia vacío"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Nuevo mensaje de ausencia"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Título del mensaje de ausencia: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Guardar"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Usar"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Apodo"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
--- a/po/fi.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/fi.po	Sun Aug 08 00:48:19 2004 +0000
@@ -665,7 +665,7 @@
 msgid "_Set"
 msgstr "_Aseta"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Peruuta"
 
@@ -1558,8 +1558,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1576,9 +1576,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1764,11 +1764,11 @@
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Varoita kyttj"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1782,25 +1782,25 @@
 "taajuusrajoituksen.\n"
 "\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Varoitako _nimettmn?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Nimettmt varoitukset ovat vhemmn ankaria.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa '%s':n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1809,11 +1809,11 @@
 "Olet poistamassa ryhmkeskustelun nimelt '%s' tuttavalistaltasi.  Haluatko "
 "jatkaa?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Poista ryhmkeskustelu"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1821,12 +1821,12 @@
 msgstr ""
 "Olet poistamassa ryhm nimelt '%s' tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Poista ryhm"
 
 # TODO Untranslated
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1836,107 +1836,107 @@
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
 # NOTE source: 0.59.8/0.60
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Nyttnimi"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Kyttjtili"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Syt sen henkiln nyttnimi, jolle haluat lhett pikaviestin."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Hae kyttjtiedot"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Syt sen henkiln nyttnimi, jonka tiedot haluat nhd."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Hae kyttjloki"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Syt sen henkiln nyttnimi jonka lokia haluat katsella."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Et voi tallentaa poissaoloviesti tyhjll otsikolla"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Anna viestille otsikko, tai valitse \"Kyt\" kyttksesi tallentamatta."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhj poissaoloviesti"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
 # src/menus.c:280
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _kyt"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Kyt"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Anna ryhmkeskustelulle alias"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Syt aliasnimi tlle ryhmkeskustelulle."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmlle alias"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Anna alias tlle kontaktiryhmlle."
 
 # XXX relatively trivial editing of old non-fuzzy string (+ "%s:n")
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n alias."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
--- a/po/fr.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/fr.po	Sun Aug 08 00:48:19 2004 +0000
@@ -678,7 +678,7 @@
 msgid "_Set"
 msgstr "_Changer"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Annuler"
 
@@ -1545,8 +1545,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1563,9 +1563,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1753,11 +1753,11 @@
 msgid "By account"
 msgstr "Par compte"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Donner un avertissement"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1770,26 +1770,26 @@
 "Ceci augmentera le niveau d'avertissement de %s. Cet utilisateur sera plus "
 "sévèrement limité pour sa fréquence d'envoi de messages.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Donner un _avertissement anonyme ?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Les avertissements anonymes sont moins durs.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Vous allez supprimer %s de votre liste de contacts. Voulez-vous continuer ?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Supprimer ce contact"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1798,11 +1798,11 @@
 "Vous allez supprimer le groupe de discussion %s de votre liste de contacts. "
 "Voulez-vous continuer ?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Enlever discussion"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1811,11 +1811,11 @@
 "Vous allez supprimer le groupe %s et tous ses membres de votre liste de "
 "contacts. Voulez-vous continuer ?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Supprimer un groupe"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1824,106 +1824,106 @@
 "Vous allez supprimer le contact contenant %s et %d autres identifiants votre "
 "liste de contacts. Voulez-vous continuer ?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Supprimer contact"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Pseudonyme"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Compte"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Saisissez le pseudo du destinataire pour le message"
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Informations utilisateur"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Saisissez le pseudo de l'utilisateur dont vous voulez les informations"
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Archives utilisateur"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Saisissez le pseudo de l'utilisateur dont vous voulez les archives"
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Vous ne pouvez créer un message d'absence avec un titre vide."
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Donnez un titre au message ou cliquez « Utiliser » pour utiliser ce message "
 "sans le sauver."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Vous ne pouvez créer un message d'absence vide"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Nouveau message d'absence"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Titre : "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Enregistrer _et utiliser"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Utiliser"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Donner un alias à un groupe de discussion"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Saisissez un alias pour cette discussion"
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Donner un alias à un contact"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Saisissez un alias pour ce contact"
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Saisissez un alias pour %s"
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Donner un alias"
 
--- a/po/he.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/he.po	Sun Aug 08 00:48:19 2004 +0000
@@ -649,7 +649,7 @@
 msgid "_Set"
 msgstr "_קבע"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "ביטול"
@@ -1509,8 +1509,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1527,9 +1527,9 @@
 msgstr "אישור"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1716,11 +1716,11 @@
 msgid "By account"
 msgstr "לפי חשבון"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "הזהר את המשתמש"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1729,160 +1729,160 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "הזהר בעילום שם"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "הסר איש קשר"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "הסר שיחה"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "הסר קבוצה"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "הסר איש קשר"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr "שם _לתצוגה"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr "_חשבון"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 #, fuzzy
 msgid "New Instant Message"
 msgstr "/ידידים/הו_דעה חדשה..."
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "מידע כללי על המשתמש"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "מידע כללי על המשתמש"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "הזן את שם המשתמש ברצונך לחסום"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 #, fuzzy
 msgid "New away message"
 msgstr "הודעת \"לא נמצא\" חדשה"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 #, fuzzy
 msgid "Away title: "
 msgstr "הזן כותרת הודעת \"לא נמצא\":"
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "שמור"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "שמור והשתמש"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "השתמש"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "שם נוסף לשיחה"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "הזן שם נוסף לשיחה זו."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "שם נוסף"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 #, fuzzy
 msgid "Alias Contact"
 msgstr "שם איש קשר"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "הזן שם נוסף עבור איש קשר זה."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, fuzzy, c-format
 msgid "Enter an alias for %s."
 msgstr "כינוי חדש עבור %1:"
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "שם נוסף לאיש הקשר"
 
--- a/po/hi.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/hi.po	Sun Aug 08 00:48:19 2004 +0000
@@ -755,7 +755,7 @@
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "रद्द"
@@ -1683,8 +1683,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1705,9 +1705,9 @@
 # gnome-session/session-properties.c:179
 #  Cancel button.
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1902,11 +1902,11 @@
 msgid "By account"
 msgstr "खाता"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr ""
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1915,25 +1915,25 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1947,12 +1947,12 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 #, fuzzy
 msgid "Remove Chat"
 msgstr "रिमोट कंट्रोल"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1966,12 +1966,12 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 #, fuzzy
 msgid "Remove Group"
 msgstr "रिमोट कंट्रोल"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1985,112 +1985,112 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 #, fuzzy
 msgid "Remove Contact"
 msgstr "रिमोट कंट्रोल"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr ""
 
 #  And now for the buttons
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "खाता"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 #, fuzzy
 msgid "New Instant Message"
 msgstr "नया दूर संदेश"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr ""
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 msgid "Get User Log"
 msgstr ""
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 #, fuzzy
 msgid "New away message"
 msgstr "नया दूर संदेश"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "सहेजें"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 msgid "Sa_ve & Use"
 msgstr ""
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "नियत करें (_S)"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 #, fuzzy
 msgid "Alias Chat"
 msgstr "गपशप से जुड़ें"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr ""
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr ""
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr ""
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ""
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr ""
 
--- a/po/hu.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/hu.po	Sun Aug 08 00:48:19 2004 +0000
@@ -675,7 +675,7 @@
 msgid "_Set"
 msgstr "_Bellts"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Mgsem"
@@ -1555,8 +1555,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1573,9 +1573,9 @@
 msgstr "Rendben"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1769,11 +1769,11 @@
 msgid "By account"
 msgstr "Fik szerint"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Partner figyelmeztetse"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1785,36 +1785,36 @@
 "\n"
 "Ez nveli %s figyelmeztetsi szintjt.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Figyelmeztets _nvtelenl?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>A nvtelen figyelmeztetsek kevsb zavarak.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Trlni akarja %s-t a partnerei kzl.  Folytatja?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Partner trlse"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Trlni akarja %s csevegst a listjrl. Folytatja?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Csevegs eltvolttsa"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1822,11 +1822,11 @@
 msgstr ""
 "Trlni akarja %s csoportot s azok tagjait a partnerei kzl. Folytatja?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Csoport trlse"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1834,37 +1834,37 @@
 msgstr ""
 "Trlni akarja %s csoportot s azok tagjait a partnerei kzl. Folytatja?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Csevegs eltvolttsa"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "_Fik azonost:"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "F_ik:"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Azonnali zenetkldk"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 #, fuzzy
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Adja meg a fik azonostjt annak a partnernek akinek zenni szeretne.\n"
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Partner adatainak lekrdezse"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
@@ -1872,12 +1872,12 @@
 "Adja meg a fik azonostjt annak a partnernek akinek az adatait meg "
 "szeretn tekinteni.\n"
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Partner adatainak lekrdezse"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
@@ -1885,74 +1885,74 @@
 "Adja meg a fik azonostjt annak a partnernek akinek az adatait meg "
 "szeretn tekinteni.\n"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "Cm nlkl nem tudja elmenteni a tvollt zenetet"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Adjon az zenetnek egy cmet vagy vlassza a \"Hasznl\" gombot a ments "
 "nlkli alkalmazshoz."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "res tvollt zenetet nem hozhat ltre"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "j tvollt zenet"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Tvollt fejlce: "
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Ments"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Ment s alkalmaz"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Alkalmaz"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Csevegs lnven"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 #, fuzzy
 msgid "Enter an alias for this chat."
 msgstr "Adjon meg egy lnevt ehez a csevegshez.\n"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "lnv"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 #, fuzzy
 msgid "Alias Contact"
 msgstr "Csevegs lnven"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 #, fuzzy
 msgid "Enter an alias for this contact."
 msgstr "Adjon meg egy lnevt ehez a csevegshez.\n"
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, fuzzy, c-format
 msgid "Enter an alias for %s."
 msgstr "Jelsz:"
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Partner lneve"
 
--- a/po/it.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/it.po	Sun Aug 08 00:48:19 2004 +0000
@@ -671,7 +671,7 @@
 msgid "_Set"
 msgstr "_Imposta"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Annulla"
 
@@ -1541,8 +1541,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1559,9 +1559,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1746,11 +1746,11 @@
 msgid "By account"
 msgstr "Per account"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Richiama l'utente"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1763,25 +1763,25 @@
 "In questo modo il livello di richiamo di %s verr aumentato e l'utente sar "
 "soggetto a un limite di rate pi severo.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Richiama in maniera _anonima?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>I richiami anonimi sono meno severi.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Stai per rimuovere %s dalla tua lista contatti. Vuoi continuare?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Rimuovi il contatto"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1789,11 +1789,11 @@
 msgstr ""
 "Stai per rimuovere la chat %s dalla tua lista contatti. Vuoi continuare?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Rimuovi la chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1802,11 +1802,11 @@
 "Stai per rimuovere il gruppo %s e tutti i suoi membri dalla tua lista "
 "contatti. Vuoi continuare?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Rimuovi il gruppo"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1815,108 +1815,108 @@
 "Stai per rimuovere la lista contenente %s e altri %d contatti dalla tua "
 "lista contatti. Vuoi continuare?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Rimuovi lista"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Nome utente"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Account"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Nuovo messaggio immediato"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Inserisci il nome utente della persona alla quale vuoi inviare un messaggio "
 "immediato."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Informazioni sull'utente"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Inserisci il nome utente della persona sulla quale vuoi informazioni."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Log dell'utente"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Inserisci il nome utente della persona della quale vuoi vedere il log."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Non puoi salvare un messaggio di assenza senza specificare il titolo"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Specifica un titolo per il messaggio o scegli \"Utilizza\" per usarlo senza "
 "salvarlo."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Non puoi creare un messaggio di assenza vuoto"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Nuovo messaggio di assenza"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Titolo del messaggio: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Salva"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Sa_lva e utilizza"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Utilizza"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Imposta un alias per la chat"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Inserisci un alias per questa chat."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Imposta un alias per la lista"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Inserisci un alias per questa lista."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Inserisci un alias per %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Imposta un alias per il contatto"
 
--- a/po/ja.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/ja.po	Sun Aug 08 00:48:19 2004 +0000
@@ -661,7 +661,7 @@
 msgid "_Set"
 msgstr "セット(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
@@ -1526,8 +1526,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1544,9 +1544,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1732,11 +1732,11 @@
 msgid "By account"
 msgstr "アカウント毎に共有する"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "ユーザ警告"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1748,25 +1748,25 @@
 "\n"
 "%s の警告レベルを上げて、彼らを制限する条件を厳しくします。\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "匿名で警告しますか?(_A)"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名の警告はそれほど厳しくありません。</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "仲間リストから %s を削除しようとしています。続行してもよろしいですか?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "仲間の削除"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1775,11 +1775,11 @@
 "仲間リストからチャット %s を削除しようとしています。続行してもよろしいです"
 "か?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "チャットの削除"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1788,11 +1788,11 @@
 "仲間リストからグループ %s とそのメンバを削除しようとしています。続行してもよ"
 "ろしいですか?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1801,106 +1801,106 @@
 "仲間リストから %s とその他 %d 個のコンタクトを削除しようとしています。続行し"
 "てもよろしいですか?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "コンタクトの削除"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "スクリーン名(_S)"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "アカウント(_A)"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "新しいインスタント・メッセージ"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "IM で会話する相手のスクリーン名を入力して下さい。"
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "ユーザ情報の取得"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "情報を表示する相手のスクリーン名を入力して下さい。"
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "ユーザ情報の取得"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "ログを表示する人物のスクリーン名を入力して下さい。"
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "離席メッセージに題名をつけて下さい"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "メッセージに題名を指定するか、保存せずに単に使用する場合は \"使う\" を選択し"
 "て下さい。"
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "離席メッセージを入力して下さい"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "新しい離席メッセージ"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "題名: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "保存する(_S)"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "保存して使う(_V)"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "使う(_U)"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "チャットのエイリアス"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "このチャットのエイリアス (別名) を入力して下さい。"
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "エイリアス"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "コンタクトのエイリアス"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "このコンタクトの別名を入力して下さい。"
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s のエイリアスを入力して下さい。"
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "仲間のエイリアス"
 
--- a/po/ko.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/ko.po	Sun Aug 08 00:48:19 2004 +0000
@@ -642,7 +642,7 @@
 msgid "_Set"
 msgstr "설정(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 msgid "_Cancel"
 msgstr "취소(_C)"
 
@@ -1484,8 +1484,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1502,9 +1502,9 @@
 msgstr "확인"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1692,12 +1692,12 @@
 msgid "By account"
 msgstr "계정으로"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "사용자 경고"
 
 # c-format
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1709,158 +1709,158 @@
 "\n"
 "이것은 %s님의 경고 단계를 증가시키고 한계 비율을 엄격하게 적용할 것입니다.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "익명으로 경고를 보낼까요(_A)?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>익명 경고는 문제를 덜 일으킬 수 있습니다.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s님을 친구 목록에서 삭제합니다. 계속할까요?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "친구 지우기"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "%s 대화 채널을 친구 목록에서 삭제합니다. 계속할까요?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "채팅 지우기"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "내 친구 목록에서 %s 그룹과 모든 그룹원을 지우려고 합니다. 계속할까요?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "그룹 지우기"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr "내 친구 목록에서 %s 그룹과 모든 그룹원을 지우려고 합니다. 계속할까요?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "연락처 지우기"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr "아이디(_S)"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr "계정(_A)"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "새 메시지"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 #, fuzzy
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "메신저로 보내려는 상대의 아이디를 넣어 주십시오.\n"
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "사용자 정보 보기"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "정보를 보길 원하는 사람의 아이디를 넣으세요.\n"
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "사용자 정보 보기"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "정보를 보길 원하는 사람의 아이디를 넣으세요.\n"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "자리비움 메시지의 제목은 비어 있으면 안 됩니다"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "메시지 타이틀을 넣거나 저장 없이 사용하시려면 \"사용\"을 누르세요."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "자리비움 메시지는 비어 있으면 안 됩니다"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "새 자리비움 메시지"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "자리비움 제목: "
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "저장"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "저장 및 사용"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "사용"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "채팅 별칭"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "이 대화에서 사용할 별칭을 입력하세요."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "별칭"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "연락처 별칭"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "이 연락처가 사용할 별칭을 입력하세요."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s의 별칭을 넣으세요."
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "친구 별칭"
 
--- a/po/lt.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/lt.po	Sun Aug 08 00:48:19 2004 +0000
@@ -622,7 +622,7 @@
 msgid "_Set"
 msgstr "_Nustatyti"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 msgid "_Cancel"
 msgstr "_Atšaukti"
 
@@ -1459,8 +1459,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1477,9 +1477,9 @@
 msgstr "Gerai"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1664,11 +1664,11 @@
 msgid "By account"
 msgstr "Pagal sąskaitą"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Įspėti naudotoją"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1677,151 +1677,151 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Jūs norite pašalinti %s iš bičiulių sąrašo. Ar norite tęsti?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Pašalinti bičiulį"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Pašalinti pokalbių kambarį"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Pašalinti grupę"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Pašalinti kontaktą"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr "_Prisijungimo vardas"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr "_Abonentas"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "Nauja skubioji žinutė"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Gauti naudotojo informaciją"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 msgid "Get User Log"
 msgstr "Gauti naudotojo dienyną"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Nauja nebuvimo žinutė"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Nebuvimo antraštė:"
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 msgid "_Save"
 msgstr "_Išsaugoti"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 msgid "Sa_ve & Use"
 msgstr "Iš_saugoti ir naudoti"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 msgid "_Use"
 msgstr "_Naudoti"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Pokalbio pseudonimas"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Įveskite šio pokalbio slapyvardį"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Slapyvardis"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr ""
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Įveskite šio žmogaus slapyvardį."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ""
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr ""
 
--- a/po/mk.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/mk.po	Sun Aug 08 00:48:19 2004 +0000
@@ -637,7 +637,7 @@
 msgid "_Set"
 msgstr "_Постави"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Откажи"
@@ -1467,8 +1467,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1485,9 +1485,9 @@
 msgstr "Во ред"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1672,11 +1672,11 @@
 msgid "By account"
 msgstr ""
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Предупреди го корисникот"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1689,87 +1689,87 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Предупреди _анонимно?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Отстрани разговор"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr ""
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr ""
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr ""
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr ""
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr ""
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr ""
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 msgid "Get User Log"
 msgstr ""
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
@@ -1777,68 +1777,68 @@
 "Внеси го името на пријателот што сакаш да го поканиш, заедно со пораката за "
 "покана."
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Зачувај"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 msgid "Sa_ve & Use"
 msgstr ""
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Корисници"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr ""
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr ""
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr ""
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr ""
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ""
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr ""
 
--- a/po/nl.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/nl.po	Sun Aug 08 00:48:19 2004 +0000
@@ -663,7 +663,7 @@
 msgid "_Set"
 msgstr "_Activeren"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 msgid "_Cancel"
 msgstr "_Annuleren"
 
@@ -1522,8 +1522,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1540,9 +1540,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1733,11 +1733,11 @@
 msgid "By account"
 msgstr "Op account"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Gebruiker waarschuwen"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1750,15 +1750,15 @@
 "Dit zal %s zijn/haar waarschuwingsniveau verhogen en strengere regels zullen "
 "worden toegepast.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "_Anoniem waarschuwen?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonieme waarschuwingen zijn minder erg.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -1766,11 +1766,11 @@
 "U staat op het punt om %s van uw contactenlijst te verwijderen. Wilt u "
 "doorgaan?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Contact verwijderen"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1779,11 +1779,11 @@
 "U staat op het punt om de chatruimte %s van uw contactenlijst te "
 "verwijderen. Wilt u doorgaan?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Chat verwijderen"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1792,11 +1792,11 @@
 "U staat op het punt om de groep %s en alle contacten in die groep van uw "
 "contactenlijst te verwijderen. Wilt u doorgaan?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Groep verwijderen"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1805,112 +1805,112 @@
 "U staat op het punt om het contact die %s bevat en %d andere contacten van "
 "uw contactenlijst te verwijderen. Wilt u doorgaan?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Contact verwijderen"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr "_Gebruikersnaam"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr "_Account"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "Nieuw express-bericht"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Geef alstublieft de gebruikersnaam van de persoon aan wie u een bericht zou "
 "willen sturen."
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Gebruikersinfo"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Geef alstublieft de gebruikersnaam van de persoon waarvan u de informatie "
 "wilt opvragen."
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 msgid "Get User Log"
 msgstr "Gebruikerslogboek opvragen"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Geef alstublieft de gebruikersnaam van de persoon waarvan u het logboek wilt "
 "opvragen."
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "U kunt geen afwezigheidsbericht maken zonder titel"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Geef het bericht een titel, of kies \"Gebruiken\" om te gebruiken zonder op "
 "te slaan."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "U kunt geen leeg bericht maken"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Nieuw afwezigheidsbericht"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Afwezig titel:"
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 msgid "Sa_ve & Use"
 msgstr "Op_slaan & gebruiken"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 msgid "_Use"
 msgstr "_Gebruiken"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Geef een alias voor deze chat."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "Alias contact"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Geef een alias voor deze persoon."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geef een alias voor %s."
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Alias voor contact"
 
--- a/po/no.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/no.po	Sun Aug 08 00:48:19 2004 +0000
@@ -677,7 +677,7 @@
 msgid "_Set"
 msgstr "Lagre"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -1555,8 +1555,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1573,9 +1573,9 @@
 msgstr "_OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1770,11 +1770,11 @@
 msgid "By account"
 msgstr "Etter konto"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Advar bruker"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1787,25 +1787,25 @@
 "Dette vil ke advarselsnivet til %s og vedkommende vil mtte tle strengere "
 "hastighetsbegrensning.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Advar anonymt"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyme advarsler er mindre betydningsfulle.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Er du sikker p at du vil fjerne %s fra kontaktlisten din?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Fjern kontakt"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1813,11 +1813,11 @@
 msgstr ""
 "Er du sikker p at du vil fjerne samtalegruppen %s fra kontaktlisten din?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Fjern samtalegruppe"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1826,11 +1826,11 @@
 "Er du sikker p at du vil fjerne gruppen %s med alle medlemmer fra "
 "kontaktlisten din?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1840,124 +1840,124 @@
 "kontakter fra kontaktlisten din?"
 
 #
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "_Skjermnavn"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "Konto:"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 #, fuzzy
 msgid "New Instant Message"
 msgstr "/Kontakter/_Ny direktemelding..."
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 #, fuzzy
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Vennligst skriv inn skjermnavnet p den personen du vil sende direktemelding "
 "til.\n"
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Hent brukerinfo"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Vennligst skriv inn skjermnavnet til den personen du vil se informasjon om.\n"
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Hent brukerinfo"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Vennligst skriv inn skjermnavnet til den personen du vil se informasjon om.\n"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan ikke lagre en fravrsbeskjed uten tittel"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Vennligst gi beskjeden en tittel, eller velg \"Bruk\" for  bruke uten "
 "lagring."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lage en tom fravrsbeskjed"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Ny fravrsbeskjed"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Tittel: "
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Lagre"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Lagre & bruk"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Bruk"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Samtalealias"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 #, fuzzy
 msgid "Enter an alias for this chat."
 msgstr "Vennligst skriv inn aliasnavn for denne samtalen."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
 #
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
 #
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 #, fuzzy
 msgid "Enter an alias for this contact."
 msgstr "Vennligst skriv inn aliasnavn for denne kontakten."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, fuzzy, c-format
 msgid "Enter an alias for %s."
 msgstr "Oppgi passord for %s"
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Alias for kontakt"
 
--- a/po/pl.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/pl.po	Sun Aug 08 00:48:19 2004 +0000
@@ -635,7 +635,7 @@
 msgid "_Set"
 msgstr "U_staw"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -1470,8 +1470,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1488,9 +1488,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1670,12 +1670,12 @@
 msgid "By account"
 msgstr "Wg konta"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Ostrzeenie uytkownika"
 
 # FIXME - nazbyt bekotliwe to zdanie, trzeba jako inaczej je sformuowa
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1686,141 +1686,141 @@
 "\n"
 "Wybrana osoba (%s) bdzie miaa zwikszony poziom ostrzeenia i bdzie musiaa rzadziej wysya wiadomoci.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Ostrzec _anonimowo?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonimowe ostrzeenia s mniej dotkliwe.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Zamierzasz usun %s ze swojej listy znajomych. Czy chcesz kontynuowa?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Usunicie uytkownika"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "Zamierzasz usun konferencj %s ze swojej listy znajomych. Czy chcesz kontynuowa?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Usunicie konferencji"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "Zamierzasz usun grup %s i wszystkie osoby z tej grupy ze swojej listy znajomych. Czy chcesz kontynuowa?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Usunicie grupy"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
 msgstr "Zamierzasz usun kontakt zawierajcy %s i %d innych znajomych ze swojej listy. Czy chcesz kontynuowa?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Usunicie kontaktu"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Identyfikator"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Konto"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Nowa wiadomo"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Wprowad identyfikator osoby, ktrej chcesz wysa wiadomo."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Pobranie informacji o uytkowniku"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid "Please enter the screen name of the person whose info you would like to view."
 msgstr "Podaj identyfikator osoby, ktrej dane maj zosta wywietlone."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Wywietlenie dziennika uytkownika"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid "Please enter the screen name of the person whose log you would like to view."
 msgstr "Podaj identyfikator osoby, ktrej dziennik rozmw ma zosta wywietlony."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Nie mona zapisa komunikatu nieobecnoci bez tytuu"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "Nadaj komunikatowi tytu, albo wybierz \"Uyj\" aby uy go bez zapisywania."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Nie mona utworzy pustego komunikatu nieobecnoci"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Nowy komunikat nieobecnoci"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Tytu komunikatu: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Z_apisz i uyj"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Uyj"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Alias konferencji"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Wprowad alias dla tej konferencji."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Alias kontaktu"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Wprowad alias dla tego kontaktu."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Wprowad alias dla %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Alias znajomego"
 
--- a/po/pt.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/pt.po	Sun Aug 08 00:48:19 2004 +0000
@@ -667,7 +667,7 @@
 msgid "_Set"
 msgstr "_Definir"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -1525,8 +1525,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2381 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2381 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1543,9 +1543,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2382 src/gtkblist.c:4411
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1731,11 +1731,11 @@
 msgid "By account"
 msgstr "Por conta"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Alertar Utilizador"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1748,25 +1748,25 @@
 "Isto irá aumentar o nível de alerta de %s e ele ou ela estará sujeito a um "
 "limite de taxa mais rígido.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Alertar _anonimamente?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Alertas anónimos são menos severos.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está prestes a remover %s da sua lista de contactos. Deseja continuar?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Remover contacto"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1774,11 +1774,11 @@
 msgstr ""
 "Está prestes a remover o chat %s da sua lista de contactos. Deseja continuar?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Remover chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1787,11 +1787,11 @@
 "Está prestes a remover o grupo %s e todos os seus membros da sua lista de "
 "contactos. Deseja continuar?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1800,108 +1800,108 @@
 "Está prestes a remover o contacto contendo %s e mais %d membros da sua lista "
 "de contactos. Deseja continuar?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Remover Contacto"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "Nome de _utilizador"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Conta"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Nova Mensagem Imediata"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Por favor digite o nome da pessoa a que deseja enviar uma MI."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Ver Info do Utilizador"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Por favor digite o nome de utilizador da pessoa cuja informação gostaria de "
 "ver."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Ver Registo do Utilizador"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Por favor digite o nome de utilizador da pessoa cujo registo gostaria de ver."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Não pode guardar uma mensagem de ausência com o título em branco"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Por favor dê um título à mensagem, ou escolha \"Usar\" para usar sem guardar."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Não pode criar uma mensagem de ausência vazia"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Nova mensagem de ausência"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Título: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Guardar"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Guar_dar e Usar"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Usar"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Renomear Chat"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Digite um nome para este chat."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Nome"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Renomear Contacto"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Digite um nome para este contacto."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um nome para %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Definir nome para este contacto"
 
--- a/po/pt_BR.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/pt_BR.po	Sun Aug 08 00:48:19 2004 +0000
@@ -668,7 +668,7 @@
 msgid "_Set"
 msgstr "_Definir"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -1538,8 +1538,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1556,9 +1556,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1744,11 +1744,11 @@
 msgid "By account"
 msgstr "Por conta"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Alertar usuário"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1761,26 +1761,26 @@
 "Isto irá aumentar o nível de alerta de %s e ele ou ela estará sujeito a um "
 "limite de taxa mais rígido.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "_Alertar anonimamente?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Alertas anônimos são menos severos.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Você está prestes a remover %s da sua lista de amigos. Deseja continuar?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1789,11 +1789,11 @@
 "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1802,11 +1802,11 @@
 "Você está prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1815,110 +1815,110 @@
 "Você está prestes a remover o contato que contém %s e %d outros amigos da "
 "sua lista de amigos. Deseja continuar?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Nome de usuário"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Conta"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Nova mensagem instantânea"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa com quem você deseja trocar "
 "mensagens instantâneas."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Ver informações do usuário"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa cuja informação você gostaria "
 "de ver."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Ver log do usuário"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Você não pode salvar uma mensagem de ausência com um título em branco"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Por favor dê um título à mensagem, ou escolha \"Usar\" para usar sem salvar."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Você não pode criar uma mensagem de ausência vazia"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Nova mensagem de ausência"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Título da mensagem de ausência: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Usar"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Apelido:"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
--- a/po/ro.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/ro.po	Sun Aug 08 00:48:19 2004 +0000
@@ -662,7 +662,7 @@
 msgid "_Set"
 msgstr "_Setează"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Renunţă"
 
@@ -1524,8 +1524,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1542,9 +1542,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1730,11 +1730,11 @@
 msgid "By account"
 msgstr "După cont"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Avertizează utilizatorul"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1747,15 +1747,15 @@
 "Nivelul de avertizare al lui %s va creşte şi va suferi o rată de limitare "
 "mai dură.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Avertizare _anonimă?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Avertizările anonime sunt mai puţin supărătoare.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -1763,11 +1763,11 @@
 "Sunteţi pe cale să îl/o ştergeţi pe %s din lista de contacte. Doriţi să "
 "continuaţi?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Şterge contactul"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1776,11 +1776,11 @@
 "Sunteţi pe cale să ştergeţi un chat cu numele %s din lista de contacte. "
 "Doriţi să continuaţi?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Ştergere chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1789,11 +1789,11 @@
 "Sunteţi pe cale să ştergeţi grupul %s şi toţi membrii săi din lista de "
 "contacte. Doriţi să continuaţi?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Ştergere grup"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1802,109 +1802,109 @@
 "Sunteţi pe cale să ştergeţi contactul %s şi %d alte contacte din lista de "
 "contacte. Doriţi să continuaţi?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Ştergere contact"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Nume ales"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Cont"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Mesaj nou"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Introduceţi numele ales al persoanei pe care doriţi să o contactaţi."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Caută detalii"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Introduceţi numele ales al persoanei căreia vreţi să-i vedeţi detaliile "
 "personale."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Arată înregistrările unui utilizator"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Introduceţi numele ales al persoanei căreia vreţi să-i vedeţi înregistrările."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Nu puteţi crea un mesaj în absenţă fără titlu"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Daţi un titlu mesajului, sau alegeţi „Utilizează” pentru a-l folosi fără a-l "
 "salva."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Nu puteţi crea un mesaj în absenţă gol"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Nou mesaj în absenţă"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Titlu mesaj în absenţă: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Salvează"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Sal_vează şi utilizează"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Utilizează"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Introduceţi un nou alias pentru acest chat selectat."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Alias contact"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Introduceţi un alias pentru acest contact."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduceţi un alias pentru %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Alias contact"
 
--- a/po/ru.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/ru.po	Sun Aug 08 00:48:19 2004 +0000
@@ -659,7 +659,7 @@
 msgid "_Set"
 msgstr "Установить"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "О_тменить"
 
@@ -1532,8 +1532,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1550,9 +1550,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1740,11 +1740,11 @@
 msgid "By account"
 msgstr "По учётной записи"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Сделать предупреждение пользователю"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1757,36 +1757,36 @@
 "Это увеличит уровень предупреждения %s, и пользователь будет подвержен "
 "ужесточению ограничения уровня.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Сделать предупреждение анонимно?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Анонимные предупреждения менее серьёзны.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Вы удалите %s из списка контактов. Хотите продолжить?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Удалить пользователя"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Вы удалите чат %s из списка контактов. Хотите продолжить?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Удалить чат"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1794,11 +1794,11 @@
 msgstr ""
 "Вы удалите группу %s и всех её членов из списка контактов. Хотите продолжить?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Удалить Группу"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1807,112 +1807,112 @@
 "Вы удалите контакт, содержащий %s и %d других пользователей из списка "
 "контактов. Хотите продолжить?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Удалить контакт"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "Идентификатор пользователя"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "Учётнaя запись"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Новое сообщение"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Введите идентификатор пользователя персоны, которой вы хотели бы отправить "
 "сообщение."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Получить информацию о пользователе"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Введите идентификатор пользователя персоны, информацию о которой вы хотели "
 "бы просмотреть."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Получить журнал пользователя"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Введите идентификатор пользователя персоны, журнал которой вы хотели бы "
 "просмотреть."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Вы не можете сохранить сообщение об отсутствии без названия"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Дайте сообщению название или выберите \"Применить\" для использования без "
 "сохранения."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Вы не можете создать пустое сообщение об отсутствии"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Новое сообщение об отсутствии"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Название сообщения об отсутствии: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "Сохранить"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Сохранить и применить"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "Применить"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Псевдоним чата"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Введите псевдоним для этого чата."
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Псевдоним контакта"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Введите псевдоним для этого контакта."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Введите псевдоним для %s."
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Псевдоним пользователя"
 
--- a/po/sk.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/sk.po	Sun Aug 08 00:48:19 2004 +0000
@@ -669,7 +669,7 @@
 msgid "_Set"
 msgstr "Uložiť"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Zrušiť"
@@ -1554,8 +1554,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1572,9 +1572,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1770,12 +1770,12 @@
 msgid "By account"
 msgstr "Konto"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 #, fuzzy
 msgid "Warn User"
 msgstr "Gaim Použiť"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1784,166 +1784,166 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "Premenovať kamaráta"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 #, fuzzy
 msgid "Remove Chat"
 msgstr "Zrušiť"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 #, fuzzy
 msgid "Remove Group"
 msgstr "Premenovať Skupinu"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Zrušiť"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "???meno:"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "Konto"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Zobraz časovú značku pri správach"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 #, fuzzy
 msgid "Get User Info"
 msgstr "Získať informácie o užívateľovi"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Získať informácie o užívateľovi"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 #, fuzzy
 msgid "You cannot save an away message with a blank title"
 msgstr "Nemôžete vytvoriť 'Preč' správu s prázdnym názvom"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "Nemôžete vytvoriť prázdnu 'Preč' správu"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Nová 'Preč' správa"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Názov 'Preč': "
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Uložiť"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Uložiť a Použiť"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Používateľ"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 #, fuzzy
 msgid "Alias Chat"
 msgstr "Alias"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 #, fuzzy
 msgid "Alias Contact"
 msgstr "Alias"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr ""
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, fuzzy, c-format
 msgid "Enter an alias for %s."
 msgstr "Heslo:"
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Alias kamaráta"
 
--- a/po/sl.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/sl.po	Sun Aug 08 00:48:19 2004 +0000
@@ -688,7 +688,7 @@
 msgstr "_Nastavi"
 
 #: plugins/idle.c:67
-#: src/dialogs.c:808
+#: src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "_Prekliči"
 
@@ -1560,9 +1560,9 @@
 #.
 #: src/account.c:342
 #: src/connection.c:197
-#: src/dialogs.c:473
-#: src/dialogs.c:529
-#: src/dialogs.c:582
+#: src/gtkdialogs.c:473
+#: src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582
 #: src/gtkblist.c:2380
 #: src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048
@@ -1595,16 +1595,16 @@
 #: src/account.c:381
 #: src/away.c:349
 #: src/connection.c:198
-#: src/dialogs.c:299
-#: src/dialogs.c:311
-#: src/dialogs.c:324
-#: src/dialogs.c:345
-#: src/dialogs.c:474
-#: src/dialogs.c:530
-#: src/dialogs.c:583
-#: src/dialogs.c:830
-#: src/dialogs.c:846
-#: src/dialogs.c:864
+#: src/gtkdialogs.c:299
+#: src/gtkdialogs.c:311
+#: src/gtkdialogs.c:324
+#: src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474
+#: src/gtkdialogs.c:530
+#: src/gtkdialogs.c:583
+#: src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846
+#: src/gtkdialogs.c:864
 #: src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501
 #: src/gtkblist.c:2381
@@ -1805,11 +1805,11 @@
 msgid "By account"
 msgstr "Po vrsti računa"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Opozori uporabnika"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1820,152 +1820,152 @@
 "\n"
 "To bo zvišalo raven opozoril uporabniku %s. Nadzorovana bo tudi primernost besedišča.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Opozori _anonimno?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonimna opozorila imajo manjši učinek.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali želite nadaljevati?"
 
-#: src/dialogs.c:297
-#: src/dialogs.c:298
+#: src/gtkdialogs.c:297
+#: src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali želite nadaljevati?"
 
-#: src/dialogs.c:309
-#: src/dialogs.c:310
+#: src/gtkdialogs.c:309
+#: src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili skupino %s in vse njene člane. Ali želite nadaljevati?"
 
-#: src/dialogs.c:322
-#: src/dialogs.c:323
+#: src/gtkdialogs.c:322
+#: src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugih prijateljev. Ali želite nadaljevati?"
 
-#: src/dialogs.c:343
-#: src/dialogs.c:344
+#: src/gtkdialogs.c:343
+#: src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: src/dialogs.c:455
-#: src/dialogs.c:511
-#: src/dialogs.c:563
+#: src/gtkdialogs.c:455
+#: src/gtkdialogs.c:511
+#: src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "_Vzdevek"
 
-#: src/dialogs.c:461
-#: src/dialogs.c:517
-#: src/dialogs.c:569
+#: src/gtkdialogs.c:461
+#: src/gtkdialogs.c:517
+#: src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "_Račun"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Vnesite vzdevek osebe, ki ji želite poslati neposredno sporočilo."
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid "Please enter the screen name of the person whose info you would like to view."
 msgstr "Vnesite vzdevek osebe, katere dnevnik želite pridobiti."
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "Dobi uporabnikov dnevnik"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid "Please enter the screen name of the person whose log you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri želite pridobiti dnevnik."
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "Sporočila o odsotnosti brez naslova ne morete shraniti"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "Prosim poimenujte sporočilo ali pa izberite \"Uporabi\" da uporabite brez shranjevanja."
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "Praznega sporočila o odsotnosti ne morete ustvariti"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "Novo sporočilo o odsotnosti"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "Naslov sporočila: "
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "_Shrani"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "S_hrani in uporabi"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "_Uporabi"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/dialogs.c:829
-#: src/dialogs.c:845
-#: src/dialogs.c:863
+#: src/gtkdialogs.c:829
+#: src/gtkdialogs.c:845
+#: src/gtkdialogs.c:863
 #: src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s"
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
--- a/po/sr.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/sr.po	Sun Aug 08 00:48:19 2004 +0000
@@ -676,7 +676,7 @@
 msgid "_Set"
 msgstr "_Постави"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Откажи"
@@ -1536,8 +1536,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1554,9 +1554,9 @@
 msgstr "У реду"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1751,11 +1751,11 @@
 msgid "By account"
 msgstr "Према налогу"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Упозори корисника"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1768,36 +1768,36 @@
 "Ово ће увећати ниво обазривости за „%s“ и он или она ће имати строжије "
 "ограничење брзине слања порука.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Упозори _анонимно?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Анонимна упозорења су мањег утицаја.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Уклањате %s са списка другара. Да ли желите да наставите?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Уклони другара"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Уклањате разговор %s са списка другара. Да ли желите да наставите?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Уклони разговор"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1806,12 +1806,12 @@
 "Уклањате групу %s и све њене чланове из списка другара. Да ли желите да "
 "наставите?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Уклони групу"
 
 # bug: plural-forms
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1820,114 +1820,114 @@
 "Уклањате групу %s и %d осталих чланова из списка другара. Да ли желите да "
 "наставите?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Уклони контакт"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "_Име:"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "_Налог:"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "Нова брза порука"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 #, fuzzy
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Унесите име особе којој желите да упутите брзу поруку.\n"
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Прибави податке о кориснику"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Унесите име особе чије податке желите да видите.\n"
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Прибави податке о кориснику"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Унесите име особе чије податке желите да видите.\n"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "Не можете снимити поруку за одсуство без наслова"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Наведите и наслов поруке, или изаберите „Користи“ за коришћење без снимања."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "Не можете направити празну поруку за одсуство"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Нова порука за одсуство"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Наслов одсуства: "
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Сачувај"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Сачувај и користи"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Користи"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Надени име разговору"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Унесите надимак за овај разговор."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Надимак"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "Надени име контакту"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Унесите надимак за овај контакт."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Унесите надимак за %s."
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Надени име другару"
 
--- a/po/sr@Latn.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/sr@Latn.po	Sun Aug 08 00:48:19 2004 +0000
@@ -676,7 +676,7 @@
 msgid "_Set"
 msgstr "_Postavi"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Otkaži"
@@ -1538,8 +1538,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1556,9 +1556,9 @@
 msgstr "U redu"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1753,11 +1753,11 @@
 msgid "By account"
 msgstr "Prema nalogu"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Upozori korisnika"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1770,36 +1770,36 @@
 "Ovo će uvećati nivo obazrivosti za „%s“ i on ili ona će imati strožije "
 "ograničenje brzine slanja poruka.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Upozori _anonimno?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonimna upozorenja su manjeg uticaja.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Uklanjate %s sa spiska drugara. Da li želite da nastavite?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Ukloni drugara"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Uklanjate razgovor %s sa spiska drugara. Da li želite da nastavite?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Ukloni razgovor"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1808,12 +1808,12 @@
 "Uklanjate grupu %s i sve njene članove iz spiska drugara. Da li želite da "
 "nastavite?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
 # bug: plural-forms
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1822,114 +1822,114 @@
 "Uklanjate grupu %s i %d ostalih članova iz spiska drugara. Da li želite da "
 "nastavite?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Ukloni kontakt"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "_Ime:"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "_Nalog:"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "Nova brza poruka"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 #, fuzzy
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Unesite ime osobe kojoj želite da uputite brzu poruku.\n"
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Pribavi podatke o korisniku"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Unesite ime osobe čije podatke želite da vidite.\n"
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Pribavi podatke o korisniku"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Unesite ime osobe čije podatke želite da vidite.\n"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "Ne možete snimiti poruku za odsustvo bez naslova"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Navedite i naslov poruke, ili izaberite „Koristi“ za korišćenje bez snimanja."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "Ne možete napraviti praznu poruku za odsustvo"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Nova poruka za odsustvo"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Naslov odsustva: "
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Sačuvaj"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Sačuvaj i koristi"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Koristi"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Nadeni ime razgovoru"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Unesite nadimak za ovaj razgovor."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Nadimak"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "Nadeni ime kontaktu"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Unesite nadimak za ovaj kontakt."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Unesite nadimak za %s."
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Nadeni ime drugaru"
 
--- a/po/sv.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/sv.po	Sun Aug 08 00:48:19 2004 +0000
@@ -667,7 +667,7 @@
 msgid "_Set"
 msgstr "_Ställ"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Avbryt"
@@ -1525,8 +1525,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1543,9 +1543,9 @@
 msgstr "OK"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1738,11 +1738,11 @@
 msgid "By account"
 msgstr "Konto"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Varna användaren"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1755,25 +1755,25 @@
 "Detta kommer att öka %ss varningsnivå och hon/han kommer få en hårdare "
 "bandbreddsbegränsning.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Varna _anonymt?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyma varningar är mindre allvarliga.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Du håller på att ta bort %s från din kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Ta bort kompis"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1781,11 +1781,11 @@
 msgstr ""
 "Du håller på att ta bort chatten %s från din kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Ta bort chatt"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1794,11 +1794,11 @@
 "Du håller på att ta bort gruppen %s och alla dess medlemmar från din "
 "kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1807,112 +1807,112 @@
 "Du håller på att ta bort kontakten som innehåller %s och %d andra kompisar "
 "från din kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Ta bort kontakt"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr "_Användar-ID"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr "_Konto"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "Nytt snabbmeddelanden"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Ange användar-ID för den person du vill skicka snabbmeddelande till."
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Hämta användarinformation"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Ange användar-ID för den person som du vill ha information om."
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Hämta användarinformation"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Ange användar-ID för den person som du vill ha information om."
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan inte skapa ett frånvaromeddelande med en tom titel"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Ange en titel på meddelandet eller välj \"Använd\" för att använda utan att "
 "spara."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "Kunde inte skapa ett tomt frånvaromeddelande"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Nytt frånvaromeddelande"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Överskrift: "
 
 # src/menus.c:280
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Spara"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Spara och använd"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Använd"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Aliaschatt"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Ange ett alias för denna chatt."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "Aliaskontakt"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Ange ett alias för denna kontakt."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Ange ett alias för %s."
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Aliaskompis"
 
--- a/po/vi.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/vi.po	Sun Aug 08 00:48:19 2004 +0000
@@ -679,7 +679,7 @@
 msgid "_Set"
 msgstr "_Thiết lập"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/gtkdialogs.c:786
 #, fuzzy
 msgid "_Cancel"
 msgstr "Bỏ qua"
@@ -1534,8 +1534,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:462 src/gtkdialogs.c:518
+#: src/gtkdialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1552,9 +1552,9 @@
 msgstr "Đồng ý"
 
 #: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:463 src/gtkdialogs.c:519 src/gtkdialogs.c:572 src/gtkdialogs.c:808
+#: src/gtkdialogs.c:824 src/gtkdialogs.c:842 src/gtkaccount.c:2002
 #: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
 #: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
@@ -1746,11 +1746,11 @@
 msgid "By account"
 msgstr "Theo tài khoản"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "Cảnh báo người dùng"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1763,36 +1763,36 @@
 "Điều này sẽ tăng mức độ cảnh báo của %s và họ sẽ là đối tượng bị hạn chế "
 "khắt khe.\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Cảnh báo _nặc danh?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Cảnh báo nặc danh là ít nghiêm trọng.</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Bạn sắp xóa %s khỏi danh sách buddy của bạn. Bạn muốn thực hiện không?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "Xóa bỏ Buddy"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Bạn sắp xóa Chat %s khỏi danh sách buddy. Bạn muốn thực hiện không?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "Xóa Chat"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1801,11 +1801,11 @@
 "Bạn sắp xóa nhóm %s và mọi thành viên ra khỏi danh sách buddy của bạn. Bạn "
 "muốn thực hiện không?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "Xóa nhóm"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1814,116 +1814,116 @@
 "Bạn sắp xóa liên lạc có chứa %s và %d các buddy khác ra khỏi danh sách buddy "
 "của bạn. Bạn muốn thực hiện không?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "Xóa Liên Lạc"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/gtkdialogs.c:444 src/gtkdialogs.c:500 src/gtkdialogs.c:552
 #, fuzzy
 msgid "_Screen name"
 msgstr "Tên _hiển thị"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/gtkdialogs.c:450 src/gtkdialogs.c:506 src/gtkdialogs.c:558
 #, fuzzy
 msgid "_Account"
 msgstr "Tài _khoản:"
 
-#: src/dialogs.c:457
+#: src/gtkdialogs.c:457
 msgid "New Instant Message"
 msgstr "Tin nhắn nhanh mới"
 
-#: src/dialogs.c:459
+#: src/gtkdialogs.c:459
 #, fuzzy
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Hãy nhập tên hiển thị của người mà bạn muốn trò chuyện bằng Nhắn Tin Nhanh.\n"
 
-#: src/dialogs.c:513
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr "Thông tin buddy"
 
-#: src/dialogs.c:515
+#: src/gtkdialogs.c:515
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "Hãy nhập tên hiển thị của người mà bạn muốn xem thông tin về họ.\n"
 
-#: src/dialogs.c:566
+#: src/gtkdialogs.c:566
 #, fuzzy
 msgid "Get User Log"
 msgstr "Thông tin buddy"
 
-#: src/dialogs.c:568
+#: src/gtkdialogs.c:568
 #, fuzzy
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "Hãy nhập tên hiển thị của người mà bạn muốn xem thông tin về họ.\n"
 
-#: src/dialogs.c:623
+#: src/gtkdialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "Bạn không thể lưu thông báo trạng thái mà không có tiêu đề"
 
-#: src/dialogs.c:625
+#: src/gtkdialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Hãy nhập tiêu đề thông báo, hoặc chọn \"Dùng\" để sử dụng mà không lưu."
 
-#: src/dialogs.c:635
+#: src/gtkdialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "Không thể tạo thông báo trạng thái mà không có nội dung"
 
-#: src/dialogs.c:697
+#: src/gtkdialogs.c:697
 msgid "New away message"
 msgstr "Thông báo trạng thái mới"
 
-#: src/dialogs.c:718
+#: src/gtkdialogs.c:718
 msgid "Away title: "
 msgstr "Tiêu đề:"
 
-#: src/dialogs.c:774
+#: src/gtkdialogs.c:774
 #, fuzzy
 msgid "_Save"
 msgstr "Lưu"
 
-#: src/dialogs.c:778
+#: src/gtkdialogs.c:778
 #, fuzzy
 msgid "Sa_ve & Use"
 msgstr "Lưu Lại & Dùng"
 
-#: src/dialogs.c:782
+#: src/gtkdialogs.c:782
 #, fuzzy
 msgid "_Use"
 msgstr "Dùng"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "Alias Chat"
 msgstr "Bí danh Chat"
 
-#: src/dialogs.c:805
+#: src/gtkdialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "Nhập bí danh cho cuộc Chat này."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/gtkdialogs.c:807 src/gtkdialogs.c:823 src/gtkdialogs.c:841 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 #, fuzzy
 msgid "Alias"
 msgstr "Bí danh:"
 
-#: src/dialogs.c:820
+#: src/gtkdialogs.c:820
 msgid "Alias Contact"
 msgstr "Bí danh liên lạc"
 
-#: src/dialogs.c:821
+#: src/gtkdialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "Hãy nhập bí danh cho liên lạc này."
 
-#: src/dialogs.c:837
+#: src/gtkdialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Nhập bí danh cho %s."
 
-#: src/dialogs.c:839
+#: src/gtkdialogs.c:839
 msgid "Alias Buddy"
 msgstr "Bí danh Buddy"
 
--- a/po/zh_CN.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/zh_CN.po	Sun Aug 08 00:48:19 2004 +0000
@@ -644,7 +644,7 @@
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -1497,8 +1497,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1515,9 +1515,9 @@
 msgstr "确定"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1699,11 +1699,11 @@
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1715,47 +1715,47 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1764,104 +1764,104 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "用户名(_S)"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名。"
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名。"
 
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "获取用户日志"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "您想要查看谁的日志?请输入他/她的用户名。"
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "保存并使用(_V)"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "好友别名"
 
--- a/po/zh_TW.po	Sun Aug 08 00:03:12 2004 +0000
+++ b/po/zh_TW.po	Sun Aug 08 00:48:19 2004 +0000
@@ -732,7 +732,7 @@
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:808
+#: plugins/idle.c:67 src/gtkdialogs.c:808
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -1621,8 +1621,8 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
-#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
+#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
@@ -1639,9 +1639,9 @@
 msgstr "確定"
 
 #: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
-#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
+#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
+#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
 #: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
@@ -1836,11 +1836,11 @@
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:149
+#: src/gtkdialogs.c:149
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:168
+#: src/gtkdialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1852,37 +1852,37 @@
 "\n"
 "這個動作將會增加 %s 的警告等級,同時他(她)將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:177
+#: src/gtkdialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/dialogs.c:184
+#: src/gtkdialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:295
+#: src/gtkdialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:297 src/dialogs.c:298
+#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:307
+#: src/gtkdialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:309 src/dialogs.c:310
+#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:319
+#: src/gtkdialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1890,11 +1890,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:322 src/dialogs.c:323
+#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:340
+#: src/gtkdialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1904,107 +1904,107 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:343 src/dialogs.c:344
+#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
+#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
 msgid "_Screen name"
 msgstr "帳號(_S)"
 
-#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
+#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: src/dialogs.c:468
+#: src/gtkdialogs.c:468
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/dialogs.c:470
+#: src/gtkdialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: src/dialogs.c:524
+#: src/gtkdialogs.c:524
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:526
+#: src/gtkdialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/dialogs.c:577
+#: src/gtkdialogs.c:577
 msgid "Get User Log"
 msgstr "讀取使用者日誌"
 
-#: src/dialogs.c:579
+#: src/gtkdialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
 
-#: src/dialogs.c:645
+#: src/gtkdialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:647
+#: src/gtkdialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:657
+#: src/gtkdialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:719
+#: src/gtkdialogs.c:719
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:740
+#: src/gtkdialogs.c:740
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:796
+#: src/gtkdialogs.c:796
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: src/dialogs.c:800
+#: src/gtkdialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: src/dialogs.c:804
+#: src/gtkdialogs.c:804
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: src/dialogs.c:826
+#: src/gtkdialogs.c:826
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:827
+#: src/gtkdialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
+#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:842
+#: src/gtkdialogs.c:842
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:843
+#: src/gtkdialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:859
+#: src/gtkdialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/dialogs.c:861
+#: src/gtkdialogs.c:861
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
--- a/src/Makefile.am	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/Makefile.am	Sun Aug 08 00:48:19 2004 +0000
@@ -140,7 +140,6 @@
 	$(gaim_coresources) \
 	about.c \
 	away.c \
-	dialogs.c \
 	dnd-hints.c \
 	gaim-disclosure.c \
 	gtkaccount.c \
@@ -149,6 +148,7 @@
 	gtkconn.c \
 	gtkconv.c \
 	gtkdebug.c \
+	gtkdialogs.c \
 	gtkeventloop.c \
 	gtkft.c \
 	gtkimhtml.c \
@@ -182,6 +182,7 @@
 	gtkconn.h \
 	gtkconv.h \
 	gtkdebug.h \
+	gtkdialogs.h \
 	gtkeventloop.h \
 	gtkft.h \
 	gtkimhtml.h \
@@ -200,8 +201,7 @@
 	gtksourceiter.h \
 	gtkutils.h \
 	internal.h \
-	stock.h \
-	ui.h
+	stock.h
 
 gaimincludedir=$(includedir)/gaim
 gaiminclude_HEADERS = \
--- a/src/Makefile.mingw	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/Makefile.mingw	Sun Aug 08 00:48:19 2004 +0000
@@ -87,7 +87,6 @@
 			conversation.c \
 			core.c \
 			debug.c \
-			dialogs.c \
 			dnd-hints.c \
 			eventloop.c \
 			ft.c \
@@ -98,6 +97,7 @@
 			gtkconv.c \
 			gtkcellrendererprogress.c \
 			gtkdebug.c \
+			gtkdialogs.c \
 			gtkeventloop.c \
 			gtkft.c \
 			gtkimhtml.c \
--- a/src/about.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/about.c	Sun Aug 08 00:48:19 2004 +0000
@@ -25,7 +25,7 @@
 #include "gtkimhtml.h"
 #include "gtkutils.h"
 #include "stock.h"
-#include "ui.h"
+#include "gtkdialogs.h"
 
 /* XXX For WEBSITE */
 #include "gaim.h"
--- a/src/away.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/away.c	Sun Aug 08 00:48:19 2004 +0000
@@ -35,10 +35,10 @@
 #include "gaim.h"
 #include "gtkinternal.h"
 #include "gtkblist.h"
+#include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtkprefs.h"
 #include "gtkutils.h"
-#include "ui.h"
 
 GtkWidget *imaway = NULL;
 GtkWidget *awaymenu = NULL;
--- a/src/dialogs.c	Sun Aug 08 00:03:12 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,860 +0,0 @@
-/*
- * gaim
- *
- * Gaim is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include "gtkinternal.h"
-
-#include "debug.h"
-#include "notify.h"
-#include "prefs.h"
-#include "prpl.h"
-#include "request.h"
-#include "status.h"
-#include "util.h"
-
-#include "gtkimhtml.h"
-#include "gtkimhtmltoolbar.h"
-#include "gtklog.h"
-#include "gtkutils.h"
-#include "stock.h"
-
-#include "ui.h"
-
-/* XXX */
-#include "gaim.h"
-
-static GList *dialogwindows = NULL;
-
-struct confirm_del {
-	GtkWidget *window;
-	GtkWidget *label;
-	GtkWidget *ok;
-	GtkWidget *cancel;
-	char name[1024];
-	GaimConnection *gc;
-};
-
-struct create_away {
-	GtkWidget *window;
-	GtkWidget *toolbar;
-	GtkWidget *entry;
-	GtkWidget *text;
-	struct away_message *mess;
-};
-
-struct warning {
-	GtkWidget *window;
-	GtkWidget *anon;
-	char *who;
-	GaimConnection *gc;
-};
-
-struct getuserinfo {
-	GtkWidget *window;
-	GtkWidget *entry;
-	GtkWidget *account;
-	GaimConnection *gc;
-};
-
-struct view_log {
-	long offset;
-	int options;
-	char *name;
-	GtkWidget *bbox;
-	GtkWidget *window;
-	GtkWidget *layout;
-	void *clear_handle;
-};
-
-/* Wrapper to get all the text from a GtkTextView */
-gchar* gtk_text_view_get_text(GtkTextView *text, gboolean include_hidden_chars)
-{
-	GtkTextBuffer *buffer;
-	GtkTextIter start, end;
-
-	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
-	gtk_text_buffer_get_start_iter(buffer, &start);
-	gtk_text_buffer_get_end_iter(buffer, &end);
-
-	return gtk_text_buffer_get_text(buffer, &start, &end, include_hidden_chars);
-}
-
-/*------------------------------------------------------------------------*/
-/*  Destroys                                                              */
-/*------------------------------------------------------------------------*/
-
-static void destroy_dialog(GtkWidget *w, GtkWidget *w2)
-{
-	GtkWidget *dest;
-
-	if (!GTK_IS_WIDGET(w2))
-		dest = w;
-	else
-		dest = w2;
-
-	dialogwindows = g_list_remove(dialogwindows, dest);
-	gtk_widget_destroy(dest);
-}
-
-void destroy_all_dialogs()
-{
-	while (dialogwindows)
-		destroy_dialog(NULL, dialogwindows->data);
-
-	if (awaymessage)
-		do_im_back(NULL, NULL);
-}
-
-static void do_warn(GtkWidget *widget, gint resp, struct warning *w)
-{
-	if (resp == GTK_RESPONSE_OK)
-		serv_warn(w->gc, w->who, (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->anon))) ? 1 : 0);
-
-	destroy_dialog(NULL, w->window);
-	g_free(w->who);
-	g_free(w);
-}
-
-void show_warn_dialog(GaimConnection *gc, const char *who)
-{
-	char *labeltext;
-	GtkWidget *hbox, *vbox;
-	GtkWidget *label;
-	GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
-	GaimConversation *c = gaim_find_conversation_with_account(who, gc->account);
-
-	struct warning *w = g_new0(struct warning, 1);
-	w->who = g_strdup(who);
-	w->gc = gc;
-
-	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-
-	w->window = gtk_dialog_new_with_buttons(_("Warn User"),
-			GTK_WINDOW(GAIM_GTK_WINDOW(c->window)->window), 0,
-			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-			GAIM_STOCK_WARN, GTK_RESPONSE_OK, NULL);
-	gtk_dialog_set_default_response (GTK_DIALOG(w->window), GTK_RESPONSE_OK);
-	g_signal_connect(G_OBJECT(w->window), "response", G_CALLBACK(do_warn), w);
-
-	gtk_container_set_border_width (GTK_CONTAINER(w->window), 6);
-	gtk_window_set_resizable(GTK_WINDOW(w->window), FALSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(w->window), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(w->window)->vbox), 12);
-	gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), 6);
-
-	hbox = gtk_hbox_new(FALSE, 12);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(hbox), vbox);
-	labeltext = g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n\n"
-				      "This will increase %s's warning level and he or she will be subject to harsher rate limiting.\n"), who, who);
-	label = gtk_label_new(NULL);
-	gtk_label_set_markup(GTK_LABEL(label), labeltext);
-	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	g_free(labeltext);
-
-	w->anon = gtk_check_button_new_with_mnemonic(_("Warn _anonymously?"));
-	gtk_box_pack_start(GTK_BOX(vbox), w->anon, FALSE, FALSE, 0);
-
-	hbox = gtk_hbox_new(FALSE, 6);
-	gtk_container_add(GTK_CONTAINER(vbox), hbox);
-	img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_MENU);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-	labeltext = _("<b>Anonymous warnings are less severe.</b>");
-	label = gtk_label_new(NULL);
-	gtk_label_set_markup(GTK_LABEL(label), labeltext);
-	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
-	dialogwindows = g_list_prepend(dialogwindows, w->window);
-	gtk_widget_show_all(w->window);
-}
-
-static void
-do_remove_chat(GaimChat *chat)
-{
-	gaim_blist_remove_chat(chat);
-}
-
-static void
-do_remove_buddy(GaimBuddy *buddy)
-{
-	GaimGroup *group;
-	GaimConversation *conv;
-	gchar *name;
-	GaimAccount *account;
-
-	if (!buddy)
-		return;
-
-	group = gaim_find_buddys_group(buddy);
-	name = g_strdup(buddy->name); /* b->name is a crasher after remove_buddy */
-	account = buddy->account;
-
-	gaim_debug(GAIM_DEBUG_INFO, "blist",
-			   "Removing '%s' from buddy list.\n", buddy->name);
-	/* XXX - Should remove from blist first... then call serv_remove_buddy()? */
-	serv_remove_buddy(buddy->account->gc, buddy, group);
-	gaim_blist_remove_buddy(buddy);
-
-	conv = gaim_find_conversation_with_account(name, account);
-
-	if (conv != NULL)
-		gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE);
-
-	g_free(name);
-}
-
-static void do_remove_contact(GaimContact *contact)
-{
-	GaimBlistNode *bnode, *cnode;
-	GaimGroup *group;
-
-	if (!contact)
-		return;
-
-	cnode = (GaimBlistNode *)contact;
-	group = (GaimGroup*)cnode->parent;
-	for (bnode = cnode->child; bnode; bnode = bnode->next) {
-		GaimBuddy *buddy = (GaimBuddy*)bnode;
-		if (gaim_account_is_connected(buddy->account))
-			serv_remove_buddy(buddy->account->gc, buddy, group);
-	}
-	gaim_blist_remove_contact(contact);
-}
-
-void do_remove_group(GaimGroup *group)
-{
-	GaimBlistNode *cnode, *bnode;
-
-	cnode = ((GaimBlistNode*)group)->child;
-
-	while (cnode) {
-		if (GAIM_BLIST_NODE_IS_CONTACT(cnode)) {
-			bnode = cnode->child;
-			cnode = cnode->next;
-			while (bnode) {
-				GaimBuddy *buddy;
-				if (GAIM_BLIST_NODE_IS_BUDDY(bnode)) {
-					GaimConversation *conv;
-					buddy = (GaimBuddy*)bnode;
-					bnode = bnode->next;
-					conv = gaim_find_conversation_with_account(buddy->name, buddy->account);
-					if (gaim_account_is_connected(buddy->account)) {
-						serv_remove_buddy(buddy->account->gc, buddy, group);
-						gaim_blist_remove_buddy(buddy);
-						if (conv)
-							gaim_conversation_update(conv,
-									GAIM_CONV_UPDATE_REMOVE);
-					}
-				} else {
-					bnode = bnode->next;
-				}
-			}
-		} else if (GAIM_BLIST_NODE_IS_CHAT(cnode)) {
-			GaimChat *chat = (GaimChat *)cnode;
-			cnode = cnode->next;
-			if (gaim_account_is_connected(chat->account))
-				gaim_blist_remove_chat(chat);
-		} else {
-			cnode = cnode->next;
-		}
-	}
-
-	gaim_blist_remove_group(group);
-}
-
-void show_confirm_del(GaimBuddy *buddy)
-{
-	char *text;
-
-	if (!buddy)
-		return;
-
-	text = g_strdup_printf(_("You are about to remove %s from your buddy list.  Do you want to continue?"), buddy->name);
-
-	gaim_request_action(NULL, NULL, _("Remove Buddy"), text, -1, buddy, 2,
-						_("Remove Buddy"), G_CALLBACK(do_remove_buddy),
-						_("Cancel"), NULL);
-
-	g_free(text);
-}
-
-void show_confirm_del_blist_chat(GaimChat *chat)
-{
-	char *name = gaim_chat_get_display_name(chat);
-	char *text = g_strdup_printf(_("You are about to remove the chat %s from your buddy list.  Do you want to continue?"), name);
-
-	gaim_request_action(NULL, NULL, _("Remove Chat"), text, -1, chat, 2,
-						_("Remove Chat"), G_CALLBACK(do_remove_chat),
-						_("Cancel"), NULL);
-
-	g_free(name);
-	g_free(text);
-}
-
-void show_confirm_del_group(GaimGroup *group)
-{
-	char *text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"),
-			       group->name);
-
-	gaim_request_action(NULL, NULL, _("Remove Group"), text, -1, group, 2,
-						_("Remove Group"), G_CALLBACK(do_remove_group),
-						_("Cancel"), NULL);
-
-	g_free(text);
-}
-
-void show_confirm_del_contact(GaimContact *contact)
-{
-	GaimBuddy *buddy = gaim_contact_get_priority_buddy(contact);
-
-	if (!buddy)
-		return;
-
-	if (((GaimBlistNode*)contact)->child == (GaimBlistNode*)buddy &&
-			!((GaimBlistNode*)buddy)->next) {
-		show_confirm_del(buddy);
-	} else {
-		char *text = g_strdup_printf(_("You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"),
-			       buddy->name, contact->totalsize - 1);
-
-		gaim_request_action(NULL, NULL, _("Remove Contact"), text, -1, contact, 2,
-				_("Remove Contact"), G_CALLBACK(do_remove_contact),
-				_("Cancel"), NULL);
-
-		g_free(text);
-	}
-}
-
-static gboolean show_ee_dialog(const char *ee)
-{
-	GtkWidget *window;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, GTK_ICON_SIZE_DIALOG);
-	gchar *norm = gaim_strreplace(ee, "rocksmyworld", "");
-
-	label = gtk_label_new(NULL);
-	if (!strcmp(norm, "zilding"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				     "<span weight=\"bold\" size=\"large\" foreground=\"purple\">Amazing!  Simply Amazing!</span>");
-	else if (!strcmp(norm, "robflynn"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				     "<span weight=\"bold\" size=\"large\" foreground=\"#1f6bad\">Pimpin\' Penguin Style! *Waddle Waddle*</span>");
-	else if (!strcmp(norm, "flynorange"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				      "<span weight=\"bold\" size=\"large\" foreground=\"blue\">You should be me.  I'm so cute!</span>");
-	else if (!strcmp(norm, "ewarmenhoven"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				     "<span weight=\"bold\" size=\"large\" foreground=\"orange\">Now that's what I like!</span>");
-	else if (!strcmp(norm, "markster97"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				     "<span weight=\"bold\" size=\"large\" foreground=\"brown\">Ahh, and excellent choice!</span>");
-	else if (!strcmp(norm, "seanegn"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				     "<span weight=\"bold\" size=\"large\" foreground=\"#009900\">Everytime you click my name, an angel gets its wings.</span>");
-	else if (!strcmp(norm, "chipx86"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				     "<span weight=\"bold\" size=\"large\" foreground=\"red\">This sunflower seed taste like pizza.</span>");
-	else if (!strcmp(norm, "markdoliner"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				     "<span weight=\"bold\" size=\"large\" foreground=\"#6364B1\">Hey!  I was in that tumbleweed!</span>");
-	else if (!strcmp(norm, "lschiere"))
-		gtk_label_set_markup(GTK_LABEL(label),
-				     "<span weight=\"bold\" size=\"large\" foreground=\"gray\">I'm not anything.</span>");
-	g_free(norm);
-
-	if (strlen(gtk_label_get_label(GTK_LABEL(label))) <= 0)
-		return FALSE;
-
-	window = gtk_dialog_new_with_buttons(GAIM_ALERT_TITLE, NULL, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
-	gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK);
-	g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL);
-
-	gtk_container_set_border_width (GTK_CONTAINER(window), 6);
-	gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), 12);
-	gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), 6);
-
-	hbox = gtk_hbox_new(FALSE, 12);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-
-	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
-	gtk_widget_show_all(window);
-	return TRUE;
-}
-
-void
-gaim_gtkdialogs_new_im(GaimAccount *account, const char *username)
-{
-	GaimConversation *conv;
-	GaimConvWindow *win;
-
-	conv = gaim_find_conversation_with_account(username, account);
-
-	if (conv == NULL)
-		conv = gaim_conversation_new(GAIM_CONV_IM, account, username);
-
-	win = gaim_conversation_get_window(conv);
-
-	gaim_conv_window_raise(win);
-	gaim_conv_window_switch_conversation(win, gaim_conversation_get_index(conv));
-}
-
-static void
-new_im_cb(gpointer data, GaimRequestFields *fields)
-{
-	GaimAccount *account;
-	const char *username;
-
-	account  = gaim_request_fields_get_account(fields, "account");
-	username = gaim_request_fields_get_string(fields,  "screenname");
-
-	gaim_gtkdialogs_new_im(account, username);
-}
-
-void
-show_im_dialog(void)
-{
-	GaimRequestFields *fields;
-	GaimRequestFieldGroup *group;
-	GaimRequestField *field;
-
-	fields = gaim_request_fields_new();
-
-	group = gaim_request_field_group_new(NULL);
-	gaim_request_fields_add_group(fields, group);
-
-	field = gaim_request_field_string_new("screenname", _("_Screen name"),
-										  NULL, FALSE);
-	gaim_request_field_set_required(field, TRUE);
-	gaim_request_field_set_type_hint(field, "screenname");
-	gaim_request_field_group_add_field(group, field);
-
-	field = gaim_request_field_account_new("account", _("_Account"), NULL);
-	gaim_request_field_set_visible(field,
-		(gaim_connections_get_all() != NULL &&
-		 gaim_connections_get_all()->next != NULL));
-	gaim_request_field_set_required(field, TRUE);
-	gaim_request_field_group_add_field(group, field);
-
-	gaim_request_fields(gaim_get_blist(), _("New Instant Message"),
-						NULL,
-						_("Please enter the screen name of the person you "
-						  "would like to IM."),
-						fields,
-						_("OK"), G_CALLBACK(new_im_cb),
-						_("Cancel"), NULL,
-						NULL);
-}
-
-static void
-get_info_cb(gpointer data, GaimRequestFields *fields)
-{
-	char *username;
-	gboolean found = FALSE;
-	GaimAccount *account;
-
-	account  = gaim_request_fields_get_account(fields, "account");
-
-	username = g_strdup(gaim_normalize(account,
-		gaim_request_fields_get_string(fields,  "screenname")));
-
-	if (username != NULL && gaim_str_has_suffix(username, "rocksmyworld"))
-		found = show_ee_dialog(username);
-
-	if (!found && username != NULL && *username != '\0' && account != NULL)
-		serv_get_info(gaim_account_get_connection(account), username);
-
-	g_free(username);
-}
-
-void
-show_info_dialog(void)
-{
-	GaimRequestFields *fields;
-	GaimRequestFieldGroup *group;
-	GaimRequestField *field;
-
-	fields = gaim_request_fields_new();
-
-	group = gaim_request_field_group_new(NULL);
-	gaim_request_fields_add_group(fields, group);
-
-	field = gaim_request_field_string_new("screenname", _("_Screen name"),
-										  NULL, FALSE);
-	gaim_request_field_set_type_hint(field, "screenname");
-	gaim_request_field_set_required(field, TRUE);
-	gaim_request_field_group_add_field(group, field);
-
-	field = gaim_request_field_account_new("account", _("_Account"), NULL);
-	gaim_request_field_set_visible(field,
-		(gaim_connections_get_all() != NULL &&
-		 gaim_connections_get_all()->next != NULL));
-	gaim_request_field_set_required(field, TRUE);
-	gaim_request_field_group_add_field(group, field);
-
-	gaim_request_fields(gaim_get_blist(), _("Get User Info"),
-						NULL,
-						_("Please enter the screen name of the person whose "
-						  "info you would like to view."),
-						fields,
-						_("OK"), G_CALLBACK(get_info_cb),
-						_("Cancel"), NULL,
-						NULL);
-}
-
-static void
-get_log_cb(gpointer data, GaimRequestFields *fields)
-{
-	char *username;
-	GaimAccount *account;
-
-	account  = gaim_request_fields_get_account(fields, "account");
-
-	username = g_strdup(gaim_normalize(account,
-		gaim_request_fields_get_string(fields,  "screenname")));
-
-	if( username != NULL && *username != '\0' && account != NULL )
-		gaim_gtk_log_show( username, account );
-
-	g_free(username);
-}
-
-void
-show_log_dialog(void)
-{
-	GaimRequestFields *fields;
-	GaimRequestFieldGroup *group;
-	GaimRequestField *field;
-
-	fields = gaim_request_fields_new();
-
-	group = gaim_request_field_group_new(NULL);
-	gaim_request_fields_add_group(fields, group);
-
-	field = gaim_request_field_string_new("screenname", _("_Screen name"),
-										  NULL, FALSE);
-	gaim_request_field_set_type_hint(field, "screenname");
-	gaim_request_field_set_required(field, TRUE);
-	gaim_request_field_group_add_field(group, field);
-
-	field = gaim_request_field_account_new("account", _("_Account"), NULL);
-	gaim_request_field_account_set_show_all(field, TRUE);
-	gaim_request_field_set_visible(field,
-		(gaim_accounts_get_all() != NULL &&
-		 gaim_accounts_get_all()->next != NULL));
-	gaim_request_field_set_required(field, TRUE);
-	gaim_request_field_group_add_field(group, field);
-
-	gaim_request_fields(gaim_get_blist(), _("Get User Log"),
-						NULL,
-						_("Please enter the screen name of the person whose "
-						  "log you would like to view."),
-						fields,
-						_("OK"), G_CALLBACK(get_log_cb),
-						_("Cancel"), NULL,
-						NULL);
-}
-
-/*------------------------------------------------------------------------*/
-/*  The dialog for new away messages                                      */
-/*------------------------------------------------------------------------*/
-
-static void away_mess_destroy(GtkWidget *widget, struct create_away *ca)
-{
-	destroy_dialog(NULL, ca->window);
-	g_free(ca);
-}
-
-static void away_mess_destroy_ca(GtkWidget *widget, GdkEvent *event, struct create_away *ca)
-{
-	away_mess_destroy(NULL, ca);
-}
-
-static gint sort_awaymsg_list(gconstpointer a, gconstpointer b)
-{
-	struct away_message *msg_a;
-	struct away_message *msg_b;
-
-	msg_a = (struct away_message *)a;
-	msg_b = (struct away_message *)b;
-
-	return (strcmp(msg_a->name, msg_b->name));
-}
-
-static struct away_message *save_away_message(struct create_away *ca)
-{
-	struct away_message *am;
-	gchar *away_message;
-
-	if (!ca->mess)
-		am = g_new0(struct away_message, 1);
-	else {
-		am = ca->mess;
-	}
-
-	g_snprintf(am->name, sizeof(am->name), "%s", gtk_entry_get_text(GTK_ENTRY(ca->entry)));
-	away_message = gtk_imhtml_get_markup(GTK_IMHTML(ca->text));
-
-	g_snprintf(am->message, sizeof(am->message), "%s", away_message);
-	g_free(away_message);
-
-	if (!ca->mess)
-		away_messages = g_slist_insert_sorted(away_messages, am, sort_awaymsg_list);
-
-	do_away_menu(NULL);
-	gaim_status_sync();
-
-	return am;
-}
-
-int check_away_mess(struct create_away *ca, int type)
-{
-	gchar *msg;
-	if ((strlen(gtk_entry_get_text(GTK_ENTRY(ca->entry))) == 0) && (type == 1)) {
-		/* We shouldn't allow a blank title */
-		gaim_notify_error(NULL, NULL,
-						  _("You cannot save an away message with a "
-							"blank title"),
-						  _("Please give the message a title, or choose "
-							"\"Use\" to use without saving."));
-		return 0;
-	}
-
-	msg = gtk_imhtml_get_text(GTK_IMHTML(ca->text), NULL, NULL);
-
-	if ((type <= 1) && ((msg == NULL) || (*msg == '\0'))) {
-		/* We shouldn't allow a blank message */
-		gaim_notify_error(NULL, NULL,
-						  _("You cannot create an empty away message"), NULL);
-		return 0;
-	}
-
-	g_free(msg);
-
-	return 1;
-}
-
-void save_away_mess(GtkWidget *widget, struct create_away *ca)
-{
-	if (!check_away_mess(ca, 1))
-		return;
-
-	save_away_message(ca);
-
-	away_mess_destroy(NULL, ca);
-}
-
-void use_away_mess(GtkWidget *widget, struct create_away *ca)
-{
-	static struct away_message am;
-	gchar *away_message;
-
-	if (!check_away_mess(ca, 0))
-		return;
-
-	g_snprintf(am.name, sizeof(am.name), "%s", gtk_entry_get_text(GTK_ENTRY(ca->entry)));
-	away_message = gtk_imhtml_get_markup(GTK_IMHTML(ca->text));
-
-	g_snprintf(am.message, sizeof(am.message), "%s", away_message);
-	g_free(away_message);
-
-	do_away_message(NULL, &am);
-
-	away_mess_destroy(NULL, ca);
-}
-
-void su_away_mess(GtkWidget *widget, struct create_away *ca)
-{
-	if (!check_away_mess(ca, 1))
-		return;
-
-	do_away_message(NULL, save_away_message(ca));
-
-	away_mess_destroy(NULL, ca);
-}
-
-void create_away_mess(GtkWidget *widget, void *dummy)
-{
-	GtkWidget *vbox, *hbox;
-	GtkWidget *label;
-	GtkWidget *sw;
-	GtkWidget *button;
-	GList *focus_chain = NULL;
-	struct create_away *ca = g_new0(struct create_away, 1);
-
-	/* Set up window */
-	GAIM_DIALOG(ca->window);
-	gtk_widget_set_size_request(ca->window, -1, 250);
-	gtk_window_set_role(GTK_WINDOW(ca->window), "away_mess");
-	gtk_window_set_title(GTK_WINDOW(ca->window), _("New away message"));
-	g_signal_connect(G_OBJECT(ca->window), "delete_event",
-			   G_CALLBACK(away_mess_destroy_ca), ca);
-
-	hbox = gtk_hbox_new(FALSE, 12);
-	gtk_container_set_border_width(GTK_CONTAINER(hbox), 12);
-	gtk_container_add(GTK_CONTAINER(ca->window), hbox);
-
-	vbox = gtk_vbox_new(FALSE, 12);
-	gtk_container_add(GTK_CONTAINER(hbox), vbox);
-
-	/* Away message title */
-	hbox = gtk_hbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-	label = gtk_label_new(_("Away title: "));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
-	ca->entry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(hbox), ca->entry, TRUE, TRUE, 0);
-	gaim_set_accessible_label (ca->entry, label);
-	focus_chain = g_list_append(focus_chain, hbox);
-
-	/* Toolbar */
-	ca->toolbar = gtk_imhtmltoolbar_new();
-	gtk_box_pack_start(GTK_BOX(vbox), ca->toolbar, FALSE, FALSE, 0);
-
-	/* Away message text */
-	sw = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-								   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
-	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-
-	ca->text = gtk_imhtml_new(NULL, NULL);
-	gtk_imhtml_set_editable(GTK_IMHTML(ca->text), TRUE);
-	gtk_imhtml_set_format_functions(GTK_IMHTML(ca->text), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE);
-	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(ca->text), GTK_WRAP_WORD_CHAR);
-
-	gtk_imhtml_smiley_shortcuts(GTK_IMHTML(ca->text),
-			gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
-	gtk_imhtml_html_shortcuts(GTK_IMHTML(ca->text),
-			gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts"));
-	if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
-		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(ca->text));
-	gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(ca->toolbar), ca->text);
-	gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(ca->toolbar), "default");
-	gaim_setup_imhtml(ca->text);
-
-	gtk_container_add(GTK_CONTAINER(sw), ca->text);
-	focus_chain = g_list_append(focus_chain, sw);
-
-	if (dummy) {
-		struct away_message *amt;
-		GtkTreeIter iter;
-		GtkListStore *ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(dummy)));
-		GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dummy));
-		GValue val = { 0, };
-
-		if (! gtk_tree_selection_get_selected (sel, (GtkTreeModel**)&ls, &iter))
-			return;
-		gtk_tree_model_get_value (GTK_TREE_MODEL(ls), &iter, 1, &val);
-		amt = g_value_get_pointer (&val);
-		gtk_entry_set_text(GTK_ENTRY(ca->entry), amt->name);
-		gtk_imhtml_append_text_with_images(GTK_IMHTML(ca->text), amt->message, 0, NULL);
-		ca->mess = amt;
-	}
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-	button = gaim_pixbuf_button_from_stock(_("_Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL);
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_away_mess), ca);
-	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-
-	button = gaim_pixbuf_button_from_stock(_("Sa_ve & Use"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL);
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(su_away_mess), ca);
-	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-
-	button = gaim_pixbuf_button_from_stock(_("_Use"), GTK_STOCK_EXECUTE, GAIM_BUTTON_HORIZONTAL);
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(use_away_mess), ca);
-	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-
-	button = gaim_pixbuf_button_from_stock(_("_Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL);
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(away_mess_destroy), ca);
-	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-	focus_chain = g_list_prepend(focus_chain, hbox);
-
-	gtk_widget_show_all(ca->window);
-	gtk_container_set_focus_chain(GTK_CONTAINER(vbox), focus_chain);
-}
-
-static void
-alias_chat_cb(GaimChat *chat, const char *new_alias)
-{
-	gaim_blist_alias_chat(chat, new_alias);
-}
-
-void
-alias_dialog_blist_chat(GaimChat *chat)
-{
-	gaim_request_input(NULL, _("Alias Chat"), NULL,
-					   _("Enter an alias for this chat."),
-					   chat->alias, FALSE, FALSE, NULL,
-					   _("Alias"), G_CALLBACK(alias_chat_cb),
-					   _("Cancel"), NULL, chat);
-}
-
-static void
-alias_contact_cb(GaimContact *contact, const char *new_alias)
-{
-	gaim_contact_set_alias(contact, new_alias);
-}
-
-void
-alias_dialog_contact(GaimContact *contact)
-{
-	gaim_request_input(NULL, _("Alias Contact"), NULL,
-					   _("Enter an alias for this contact."),
-					   contact->alias, FALSE, FALSE, NULL,
-					   _("Alias"), G_CALLBACK(alias_contact_cb),
-					   _("Cancel"), NULL, contact);
-}
-
-static void
-alias_buddy_cb(GaimBuddy *buddy, const char *alias)
-{
-	gaim_blist_alias_buddy(buddy, (alias != NULL && *alias != '\0') ? alias : NULL);
-	serv_alias_buddy(buddy);
-}
-
-void
-alias_dialog_bud(GaimBuddy *b)
-{
-	char *secondary = g_strdup_printf(_("Enter an alias for %s."), b->name);
-
-	gaim_request_input(NULL, _("Alias Buddy"), NULL,
-					   secondary, b->alias, FALSE, FALSE, NULL,
-					   _("Alias"), G_CALLBACK(alias_buddy_cb),
-					   _("Cancel"), NULL, b);
-
-	g_free(secondary);
-}
--- a/src/gtkaccount.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkaccount.c	Sun Aug 08 00:48:19 2004 +0000
@@ -40,11 +40,10 @@
 #include "gaim-disclosure.h"
 #include "gtkaccount.h"
 #include "gtkblist.h"
+#include "gtkdialogs.h"
 #include "gtkutils.h"
 #include "stock.h"
 
-#include "ui.h"
-
 enum
 {
 	COLUMN_ICON,
--- a/src/gtkblist.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkblist.c	Sun Aug 08 00:48:19 2004 +0000
@@ -41,6 +41,7 @@
 #include "gtkblist.h"
 #include "gtkconv.h"
 #include "gtkdebug.h"
+#include "gtkdialogs.h"
 #include "gtkft.h"
 #include "gtklog.h"
 #include "gtkpounce.h"
@@ -49,8 +50,6 @@
 #include "gtkroomlist.h"
 #include "gtkutils.h"
 
-#include "ui.h"
-
 #include "gaim.h"
 
 #include <gdk/gdkkeysyms.h>
--- a/src/gtkconn.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkconn.c	Sun Aug 08 00:48:19 2004 +0000
@@ -23,6 +23,7 @@
 
 #include "account.h"
 #include "debug.h"
+#include "gtkdialogs.h"
 #include "notify.h"
 #include "prefs.h"
 #include "stock.h"
@@ -31,8 +32,6 @@
 #include "gtkblist.h"
 #include "gtkutils.h"
 
-#include "ui.h"
-
 /*
  * The next couple of functions deal with the connection dialog
  */
--- a/src/gtkconv.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkconv.c	Sun Aug 08 00:48:19 2004 +0000
@@ -51,6 +51,7 @@
 #include "dnd-hints.h"
 #include "gtkblist.h"
 #include "gtkconv.h"
+#include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtkimhtmltoolbar.h"
 #include "gtklog.h"
@@ -59,8 +60,6 @@
 #include "gtkutils.h"
 #include "stock.h"
 
-#include "ui.h"
-
 /* XXX */
 #include "gaim.h"
 
--- a/src/gtkconv.h	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkconv.h	Sun Aug 08 00:48:19 2004 +0000
@@ -28,6 +28,8 @@
 
 #include "conversation.h"
 
+#include "gtkinternal.h"
+
 enum {
 	CHAT_USERS_ICON_COLUMN,
 	CHAT_USERS_NAME_COLUMN,
--- a/src/gtkdebug.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkdebug.c	Sun Aug 08 00:48:19 2004 +0000
@@ -30,12 +30,11 @@
 #include "util.h"
 
 #include "gtkdebug.h"
+#include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtkutils.h"
 #include "stock.h"
 
-#include "ui.h"
-
 extern int opt_debug;
 
 typedef struct
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gtkdialogs.c	Sun Aug 08 00:48:19 2004 +0000
@@ -0,0 +1,859 @@
+/*
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include "gtkinternal.h"
+
+#include "debug.h"
+#include "notify.h"
+#include "prefs.h"
+#include "prpl.h"
+#include "request.h"
+#include "status.h"
+#include "util.h"
+
+#include "gtkdialogs.h"
+#include "gtkimhtml.h"
+#include "gtkimhtmltoolbar.h"
+#include "gtklog.h"
+#include "gtkutils.h"
+#include "stock.h"
+
+/* XXX */
+#include "gaim.h"
+
+static GList *dialogwindows = NULL;
+
+struct confirm_del {
+	GtkWidget *window;
+	GtkWidget *label;
+	GtkWidget *ok;
+	GtkWidget *cancel;
+	char name[1024];
+	GaimConnection *gc;
+};
+
+struct create_away {
+	GtkWidget *window;
+	GtkWidget *toolbar;
+	GtkWidget *entry;
+	GtkWidget *text;
+	struct away_message *mess;
+};
+
+struct warning {
+	GtkWidget *window;
+	GtkWidget *anon;
+	char *who;
+	GaimConnection *gc;
+};
+
+struct getuserinfo {
+	GtkWidget *window;
+	GtkWidget *entry;
+	GtkWidget *account;
+	GaimConnection *gc;
+};
+
+struct view_log {
+	long offset;
+	int options;
+	char *name;
+	GtkWidget *bbox;
+	GtkWidget *window;
+	GtkWidget *layout;
+	void *clear_handle;
+};
+
+/* Wrapper to get all the text from a GtkTextView */
+gchar* gtk_text_view_get_text(GtkTextView *text, gboolean include_hidden_chars)
+{
+	GtkTextBuffer *buffer;
+	GtkTextIter start, end;
+
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+	gtk_text_buffer_get_start_iter(buffer, &start);
+	gtk_text_buffer_get_end_iter(buffer, &end);
+
+	return gtk_text_buffer_get_text(buffer, &start, &end, include_hidden_chars);
+}
+
+/*------------------------------------------------------------------------*/
+/*  Destroys                                                              */
+/*------------------------------------------------------------------------*/
+
+static void destroy_dialog(GtkWidget *w, GtkWidget *w2)
+{
+	GtkWidget *dest;
+
+	if (!GTK_IS_WIDGET(w2))
+		dest = w;
+	else
+		dest = w2;
+
+	dialogwindows = g_list_remove(dialogwindows, dest);
+	gtk_widget_destroy(dest);
+}
+
+void destroy_all_dialogs()
+{
+	while (dialogwindows)
+		destroy_dialog(NULL, dialogwindows->data);
+
+	if (awaymessage)
+		do_im_back(NULL, NULL);
+}
+
+static void do_warn(GtkWidget *widget, gint resp, struct warning *w)
+{
+	if (resp == GTK_RESPONSE_OK)
+		serv_warn(w->gc, w->who, (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->anon))) ? 1 : 0);
+
+	destroy_dialog(NULL, w->window);
+	g_free(w->who);
+	g_free(w);
+}
+
+void show_warn_dialog(GaimConnection *gc, const char *who)
+{
+	char *labeltext;
+	GtkWidget *hbox, *vbox;
+	GtkWidget *label;
+	GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
+	GaimConversation *c = gaim_find_conversation_with_account(who, gc->account);
+
+	struct warning *w = g_new0(struct warning, 1);
+	w->who = g_strdup(who);
+	w->gc = gc;
+
+	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
+
+	w->window = gtk_dialog_new_with_buttons(_("Warn User"),
+			GTK_WINDOW(GAIM_GTK_WINDOW(c->window)->window), 0,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GAIM_STOCK_WARN, GTK_RESPONSE_OK, NULL);
+	gtk_dialog_set_default_response (GTK_DIALOG(w->window), GTK_RESPONSE_OK);
+	g_signal_connect(G_OBJECT(w->window), "response", G_CALLBACK(do_warn), w);
+
+	gtk_container_set_border_width (GTK_CONTAINER(w->window), 6);
+	gtk_window_set_resizable(GTK_WINDOW(w->window), FALSE);
+	gtk_dialog_set_has_separator(GTK_DIALOG(w->window), FALSE);
+	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(w->window)->vbox), 12);
+	gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), 6);
+
+	hbox = gtk_hbox_new(FALSE, 12);
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w->window)->vbox), hbox);
+	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(hbox), vbox);
+	labeltext = g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n\n"
+				      "This will increase %s's warning level and he or she will be subject to harsher rate limiting.\n"), who, who);
+	label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(label), labeltext);
+	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+	g_free(labeltext);
+
+	w->anon = gtk_check_button_new_with_mnemonic(_("Warn _anonymously?"));
+	gtk_box_pack_start(GTK_BOX(vbox), w->anon, FALSE, FALSE, 0);
+
+	hbox = gtk_hbox_new(FALSE, 6);
+	gtk_container_add(GTK_CONTAINER(vbox), hbox);
+	img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_MENU);
+	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+	labeltext = _("<b>Anonymous warnings are less severe.</b>");
+	label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(label), labeltext);
+	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+	dialogwindows = g_list_prepend(dialogwindows, w->window);
+	gtk_widget_show_all(w->window);
+}
+
+static void
+do_remove_chat(GaimChat *chat)
+{
+	gaim_blist_remove_chat(chat);
+}
+
+static void
+do_remove_buddy(GaimBuddy *buddy)
+{
+	GaimGroup *group;
+	GaimConversation *conv;
+	gchar *name;
+	GaimAccount *account;
+
+	if (!buddy)
+		return;
+
+	group = gaim_find_buddys_group(buddy);
+	name = g_strdup(buddy->name); /* b->name is a crasher after remove_buddy */
+	account = buddy->account;
+
+	gaim_debug(GAIM_DEBUG_INFO, "blist",
+			   "Removing '%s' from buddy list.\n", buddy->name);
+	/* XXX - Should remove from blist first... then call serv_remove_buddy()? */
+	serv_remove_buddy(buddy->account->gc, buddy, group);
+	gaim_blist_remove_buddy(buddy);
+
+	conv = gaim_find_conversation_with_account(name, account);
+
+	if (conv != NULL)
+		gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE);
+
+	g_free(name);
+}
+
+static void do_remove_contact(GaimContact *contact)
+{
+	GaimBlistNode *bnode, *cnode;
+	GaimGroup *group;
+
+	if (!contact)
+		return;
+
+	cnode = (GaimBlistNode *)contact;
+	group = (GaimGroup*)cnode->parent;
+	for (bnode = cnode->child; bnode; bnode = bnode->next) {
+		GaimBuddy *buddy = (GaimBuddy*)bnode;
+		if (gaim_account_is_connected(buddy->account))
+			serv_remove_buddy(buddy->account->gc, buddy, group);
+	}
+	gaim_blist_remove_contact(contact);
+}
+
+void do_remove_group(GaimGroup *group)
+{
+	GaimBlistNode *cnode, *bnode;
+
+	cnode = ((GaimBlistNode*)group)->child;
+
+	while (cnode) {
+		if (GAIM_BLIST_NODE_IS_CONTACT(cnode)) {
+			bnode = cnode->child;
+			cnode = cnode->next;
+			while (bnode) {
+				GaimBuddy *buddy;
+				if (GAIM_BLIST_NODE_IS_BUDDY(bnode)) {
+					GaimConversation *conv;
+					buddy = (GaimBuddy*)bnode;
+					bnode = bnode->next;
+					conv = gaim_find_conversation_with_account(buddy->name, buddy->account);
+					if (gaim_account_is_connected(buddy->account)) {
+						serv_remove_buddy(buddy->account->gc, buddy, group);
+						gaim_blist_remove_buddy(buddy);
+						if (conv)
+							gaim_conversation_update(conv,
+									GAIM_CONV_UPDATE_REMOVE);
+					}
+				} else {
+					bnode = bnode->next;
+				}
+			}
+		} else if (GAIM_BLIST_NODE_IS_CHAT(cnode)) {
+			GaimChat *chat = (GaimChat *)cnode;
+			cnode = cnode->next;
+			if (gaim_account_is_connected(chat->account))
+				gaim_blist_remove_chat(chat);
+		} else {
+			cnode = cnode->next;
+		}
+	}
+
+	gaim_blist_remove_group(group);
+}
+
+void show_confirm_del(GaimBuddy *buddy)
+{
+	char *text;
+
+	if (!buddy)
+		return;
+
+	text = g_strdup_printf(_("You are about to remove %s from your buddy list.  Do you want to continue?"), buddy->name);
+
+	gaim_request_action(NULL, NULL, _("Remove Buddy"), text, -1, buddy, 2,
+						_("Remove Buddy"), G_CALLBACK(do_remove_buddy),
+						_("Cancel"), NULL);
+
+	g_free(text);
+}
+
+void show_confirm_del_blist_chat(GaimChat *chat)
+{
+	char *name = gaim_chat_get_display_name(chat);
+	char *text = g_strdup_printf(_("You are about to remove the chat %s from your buddy list.  Do you want to continue?"), name);
+
+	gaim_request_action(NULL, NULL, _("Remove Chat"), text, -1, chat, 2,
+						_("Remove Chat"), G_CALLBACK(do_remove_chat),
+						_("Cancel"), NULL);
+
+	g_free(name);
+	g_free(text);
+}
+
+void show_confirm_del_group(GaimGroup *group)
+{
+	char *text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"),
+			       group->name);
+
+	gaim_request_action(NULL, NULL, _("Remove Group"), text, -1, group, 2,
+						_("Remove Group"), G_CALLBACK(do_remove_group),
+						_("Cancel"), NULL);
+
+	g_free(text);
+}
+
+void show_confirm_del_contact(GaimContact *contact)
+{
+	GaimBuddy *buddy = gaim_contact_get_priority_buddy(contact);
+
+	if (!buddy)
+		return;
+
+	if (((GaimBlistNode*)contact)->child == (GaimBlistNode*)buddy &&
+			!((GaimBlistNode*)buddy)->next) {
+		show_confirm_del(buddy);
+	} else {
+		char *text = g_strdup_printf(_("You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"),
+			       buddy->name, contact->totalsize - 1);
+
+		gaim_request_action(NULL, NULL, _("Remove Contact"), text, -1, contact, 2,
+				_("Remove Contact"), G_CALLBACK(do_remove_contact),
+				_("Cancel"), NULL);
+
+		g_free(text);
+	}
+}
+
+static gboolean show_ee_dialog(const char *ee)
+{
+	GtkWidget *window;
+	GtkWidget *hbox;
+	GtkWidget *label;
+	GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, GTK_ICON_SIZE_DIALOG);
+	gchar *norm = gaim_strreplace(ee, "rocksmyworld", "");
+
+	label = gtk_label_new(NULL);
+	if (!strcmp(norm, "zilding"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				     "<span weight=\"bold\" size=\"large\" foreground=\"purple\">Amazing!  Simply Amazing!</span>");
+	else if (!strcmp(norm, "robflynn"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				     "<span weight=\"bold\" size=\"large\" foreground=\"#1f6bad\">Pimpin\' Penguin Style! *Waddle Waddle*</span>");
+	else if (!strcmp(norm, "flynorange"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				      "<span weight=\"bold\" size=\"large\" foreground=\"blue\">You should be me.  I'm so cute!</span>");
+	else if (!strcmp(norm, "ewarmenhoven"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				     "<span weight=\"bold\" size=\"large\" foreground=\"orange\">Now that's what I like!</span>");
+	else if (!strcmp(norm, "markster97"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				     "<span weight=\"bold\" size=\"large\" foreground=\"brown\">Ahh, and excellent choice!</span>");
+	else if (!strcmp(norm, "seanegn"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				     "<span weight=\"bold\" size=\"large\" foreground=\"#009900\">Everytime you click my name, an angel gets its wings.</span>");
+	else if (!strcmp(norm, "chipx86"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				     "<span weight=\"bold\" size=\"large\" foreground=\"red\">This sunflower seed taste like pizza.</span>");
+	else if (!strcmp(norm, "markdoliner"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				     "<span weight=\"bold\" size=\"large\" foreground=\"#6364B1\">Hey!  I was in that tumbleweed!</span>");
+	else if (!strcmp(norm, "lschiere"))
+		gtk_label_set_markup(GTK_LABEL(label),
+				     "<span weight=\"bold\" size=\"large\" foreground=\"gray\">I'm not anything.</span>");
+	g_free(norm);
+
+	if (strlen(gtk_label_get_label(GTK_LABEL(label))) <= 0)
+		return FALSE;
+
+	window = gtk_dialog_new_with_buttons(GAIM_ALERT_TITLE, NULL, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
+	gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK);
+	g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL);
+
+	gtk_container_set_border_width (GTK_CONTAINER(window), 6);
+	gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
+	gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE);
+	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), 12);
+	gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), 6);
+
+	hbox = gtk_hbox_new(FALSE, 12);
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox);
+	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+
+	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+	gtk_widget_show_all(window);
+	return TRUE;
+}
+
+void
+gaim_gtkdialogs_new_im(GaimAccount *account, const char *username)
+{
+	GaimConversation *conv;
+	GaimConvWindow *win;
+
+	conv = gaim_find_conversation_with_account(username, account);
+
+	if (conv == NULL)
+		conv = gaim_conversation_new(GAIM_CONV_IM, account, username);
+
+	win = gaim_conversation_get_window(conv);
+
+	gaim_conv_window_raise(win);
+	gaim_conv_window_switch_conversation(win, gaim_conversation_get_index(conv));
+}
+
+static void
+new_im_cb(gpointer data, GaimRequestFields *fields)
+{
+	GaimAccount *account;
+	const char *username;
+
+	account  = gaim_request_fields_get_account(fields, "account");
+	username = gaim_request_fields_get_string(fields,  "screenname");
+
+	gaim_gtkdialogs_new_im(account, username);
+}
+
+void
+show_im_dialog(void)
+{
+	GaimRequestFields *fields;
+	GaimRequestFieldGroup *group;
+	GaimRequestField *field;
+
+	fields = gaim_request_fields_new();
+
+	group = gaim_request_field_group_new(NULL);
+	gaim_request_fields_add_group(fields, group);
+
+	field = gaim_request_field_string_new("screenname", _("_Screen name"),
+										  NULL, FALSE);
+	gaim_request_field_set_required(field, TRUE);
+	gaim_request_field_set_type_hint(field, "screenname");
+	gaim_request_field_group_add_field(group, field);
+
+	field = gaim_request_field_account_new("account", _("_Account"), NULL);
+	gaim_request_field_set_visible(field,
+		(gaim_connections_get_all() != NULL &&
+		 gaim_connections_get_all()->next != NULL));
+	gaim_request_field_set_required(field, TRUE);
+	gaim_request_field_group_add_field(group, field);
+
+	gaim_request_fields(gaim_get_blist(), _("New Instant Message"),
+						NULL,
+						_("Please enter the screen name of the person you "
+						  "would like to IM."),
+						fields,
+						_("OK"), G_CALLBACK(new_im_cb),
+						_("Cancel"), NULL,
+						NULL);
+}
+
+static void
+get_info_cb(gpointer data, GaimRequestFields *fields)
+{
+	char *username;
+	gboolean found = FALSE;
+	GaimAccount *account;
+
+	account  = gaim_request_fields_get_account(fields, "account");
+
+	username = g_strdup(gaim_normalize(account,
+		gaim_request_fields_get_string(fields,  "screenname")));
+
+	if (username != NULL && gaim_str_has_suffix(username, "rocksmyworld"))
+		found = show_ee_dialog(username);
+
+	if (!found && username != NULL && *username != '\0' && account != NULL)
+		serv_get_info(gaim_account_get_connection(account), username);
+
+	g_free(username);
+}
+
+void
+show_info_dialog(void)
+{
+	GaimRequestFields *fields;
+	GaimRequestFieldGroup *group;
+	GaimRequestField *field;
+
+	fields = gaim_request_fields_new();
+
+	group = gaim_request_field_group_new(NULL);
+	gaim_request_fields_add_group(fields, group);
+
+	field = gaim_request_field_string_new("screenname", _("_Screen name"),
+										  NULL, FALSE);
+	gaim_request_field_set_type_hint(field, "screenname");
+	gaim_request_field_set_required(field, TRUE);
+	gaim_request_field_group_add_field(group, field);
+
+	field = gaim_request_field_account_new("account", _("_Account"), NULL);
+	gaim_request_field_set_visible(field,
+		(gaim_connections_get_all() != NULL &&
+		 gaim_connections_get_all()->next != NULL));
+	gaim_request_field_set_required(field, TRUE);
+	gaim_request_field_group_add_field(group, field);
+
+	gaim_request_fields(gaim_get_blist(), _("Get User Info"),
+						NULL,
+						_("Please enter the screen name of the person whose "
+						  "info you would like to view."),
+						fields,
+						_("OK"), G_CALLBACK(get_info_cb),
+						_("Cancel"), NULL,
+						NULL);
+}
+
+static void
+get_log_cb(gpointer data, GaimRequestFields *fields)
+{
+	char *username;
+	GaimAccount *account;
+
+	account  = gaim_request_fields_get_account(fields, "account");
+
+	username = g_strdup(gaim_normalize(account,
+		gaim_request_fields_get_string(fields,  "screenname")));
+
+	if( username != NULL && *username != '\0' && account != NULL )
+		gaim_gtk_log_show( username, account );
+
+	g_free(username);
+}
+
+void
+show_log_dialog(void)
+{
+	GaimRequestFields *fields;
+	GaimRequestFieldGroup *group;
+	GaimRequestField *field;
+
+	fields = gaim_request_fields_new();
+
+	group = gaim_request_field_group_new(NULL);
+	gaim_request_fields_add_group(fields, group);
+
+	field = gaim_request_field_string_new("screenname", _("_Screen name"),
+										  NULL, FALSE);
+	gaim_request_field_set_type_hint(field, "screenname");
+	gaim_request_field_set_required(field, TRUE);
+	gaim_request_field_group_add_field(group, field);
+
+	field = gaim_request_field_account_new("account", _("_Account"), NULL);
+	gaim_request_field_account_set_show_all(field, TRUE);
+	gaim_request_field_set_visible(field,
+		(gaim_accounts_get_all() != NULL &&
+		 gaim_accounts_get_all()->next != NULL));
+	gaim_request_field_set_required(field, TRUE);
+	gaim_request_field_group_add_field(group, field);
+
+	gaim_request_fields(gaim_get_blist(), _("Get User Log"),
+						NULL,
+						_("Please enter the screen name of the person whose "
+						  "log you would like to view."),
+						fields,
+						_("OK"), G_CALLBACK(get_log_cb),
+						_("Cancel"), NULL,
+						NULL);
+}
+
+/*------------------------------------------------------------------------*/
+/*  The dialog for new away messages                                      */
+/*------------------------------------------------------------------------*/
+
+static void away_mess_destroy(GtkWidget *widget, struct create_away *ca)
+{
+	destroy_dialog(NULL, ca->window);
+	g_free(ca);
+}
+
+static void away_mess_destroy_ca(GtkWidget *widget, GdkEvent *event, struct create_away *ca)
+{
+	away_mess_destroy(NULL, ca);
+}
+
+static gint sort_awaymsg_list(gconstpointer a, gconstpointer b)
+{
+	struct away_message *msg_a;
+	struct away_message *msg_b;
+
+	msg_a = (struct away_message *)a;
+	msg_b = (struct away_message *)b;
+
+	return (strcmp(msg_a->name, msg_b->name));
+}
+
+static struct away_message *save_away_message(struct create_away *ca)
+{
+	struct away_message *am;
+	gchar *away_message;
+
+	if (!ca->mess)
+		am = g_new0(struct away_message, 1);
+	else {
+		am = ca->mess;
+	}
+
+	g_snprintf(am->name, sizeof(am->name), "%s", gtk_entry_get_text(GTK_ENTRY(ca->entry)));
+	away_message = gtk_imhtml_get_markup(GTK_IMHTML(ca->text));
+
+	g_snprintf(am->message, sizeof(am->message), "%s", away_message);
+	g_free(away_message);
+
+	if (!ca->mess)
+		away_messages = g_slist_insert_sorted(away_messages, am, sort_awaymsg_list);
+
+	do_away_menu(NULL);
+	gaim_status_sync();
+
+	return am;
+}
+
+int check_away_mess(struct create_away *ca, int type)
+{
+	gchar *msg;
+	if ((strlen(gtk_entry_get_text(GTK_ENTRY(ca->entry))) == 0) && (type == 1)) {
+		/* We shouldn't allow a blank title */
+		gaim_notify_error(NULL, NULL,
+						  _("You cannot save an away message with a "
+							"blank title"),
+						  _("Please give the message a title, or choose "
+							"\"Use\" to use without saving."));
+		return 0;
+	}
+
+	msg = gtk_imhtml_get_text(GTK_IMHTML(ca->text), NULL, NULL);
+
+	if ((type <= 1) && ((msg == NULL) || (*msg == '\0'))) {
+		/* We shouldn't allow a blank message */
+		gaim_notify_error(NULL, NULL,
+						  _("You cannot create an empty away message"), NULL);
+		return 0;
+	}
+
+	g_free(msg);
+
+	return 1;
+}
+
+void save_away_mess(GtkWidget *widget, struct create_away *ca)
+{
+	if (!check_away_mess(ca, 1))
+		return;
+
+	save_away_message(ca);
+
+	away_mess_destroy(NULL, ca);
+}
+
+void use_away_mess(GtkWidget *widget, struct create_away *ca)
+{
+	static struct away_message am;
+	gchar *away_message;
+
+	if (!check_away_mess(ca, 0))
+		return;
+
+	g_snprintf(am.name, sizeof(am.name), "%s", gtk_entry_get_text(GTK_ENTRY(ca->entry)));
+	away_message = gtk_imhtml_get_markup(GTK_IMHTML(ca->text));
+
+	g_snprintf(am.message, sizeof(am.message), "%s", away_message);
+	g_free(away_message);
+
+	do_away_message(NULL, &am);
+
+	away_mess_destroy(NULL, ca);
+}
+
+void su_away_mess(GtkWidget *widget, struct create_away *ca)
+{
+	if (!check_away_mess(ca, 1))
+		return;
+
+	do_away_message(NULL, save_away_message(ca));
+
+	away_mess_destroy(NULL, ca);
+}
+
+void create_away_mess(GtkWidget *widget, void *dummy)
+{
+	GtkWidget *vbox, *hbox;
+	GtkWidget *label;
+	GtkWidget *sw;
+	GtkWidget *button;
+	GList *focus_chain = NULL;
+	struct create_away *ca = g_new0(struct create_away, 1);
+
+	/* Set up window */
+	GAIM_DIALOG(ca->window);
+	gtk_widget_set_size_request(ca->window, -1, 250);
+	gtk_window_set_role(GTK_WINDOW(ca->window), "away_mess");
+	gtk_window_set_title(GTK_WINDOW(ca->window), _("New away message"));
+	g_signal_connect(G_OBJECT(ca->window), "delete_event",
+			   G_CALLBACK(away_mess_destroy_ca), ca);
+
+	hbox = gtk_hbox_new(FALSE, 12);
+	gtk_container_set_border_width(GTK_CONTAINER(hbox), 12);
+	gtk_container_add(GTK_CONTAINER(ca->window), hbox);
+
+	vbox = gtk_vbox_new(FALSE, 12);
+	gtk_container_add(GTK_CONTAINER(hbox), vbox);
+
+	/* Away message title */
+	hbox = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+	label = gtk_label_new(_("Away title: "));
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+	ca->entry = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(hbox), ca->entry, TRUE, TRUE, 0);
+	gaim_set_accessible_label (ca->entry, label);
+	focus_chain = g_list_append(focus_chain, hbox);
+
+	/* Toolbar */
+	ca->toolbar = gtk_imhtmltoolbar_new();
+	gtk_box_pack_start(GTK_BOX(vbox), ca->toolbar, FALSE, FALSE, 0);
+
+	/* Away message text */
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+								   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
+	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
+
+	ca->text = gtk_imhtml_new(NULL, NULL);
+	gtk_imhtml_set_editable(GTK_IMHTML(ca->text), TRUE);
+	gtk_imhtml_set_format_functions(GTK_IMHTML(ca->text), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE);
+	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(ca->text), GTK_WRAP_WORD_CHAR);
+
+	gtk_imhtml_smiley_shortcuts(GTK_IMHTML(ca->text),
+			gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
+	gtk_imhtml_html_shortcuts(GTK_IMHTML(ca->text),
+			gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts"));
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
+		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(ca->text));
+	gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(ca->toolbar), ca->text);
+	gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(ca->toolbar), "default");
+	gaim_setup_imhtml(ca->text);
+
+	gtk_container_add(GTK_CONTAINER(sw), ca->text);
+	focus_chain = g_list_append(focus_chain, sw);
+
+	if (dummy) {
+		struct away_message *amt;
+		GtkTreeIter iter;
+		GtkListStore *ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(dummy)));
+		GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dummy));
+		GValue val = { 0, };
+
+		if (! gtk_tree_selection_get_selected (sel, (GtkTreeModel**)&ls, &iter))
+			return;
+		gtk_tree_model_get_value (GTK_TREE_MODEL(ls), &iter, 1, &val);
+		amt = g_value_get_pointer (&val);
+		gtk_entry_set_text(GTK_ENTRY(ca->entry), amt->name);
+		gtk_imhtml_append_text_with_images(GTK_IMHTML(ca->text), amt->message, 0, NULL);
+		ca->mess = amt;
+	}
+
+	hbox = gtk_hbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+	button = gaim_pixbuf_button_from_stock(_("_Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_away_mess), ca);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+
+	button = gaim_pixbuf_button_from_stock(_("Sa_ve & Use"), GTK_STOCK_OK, GAIM_BUTTON_HORIZONTAL);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(su_away_mess), ca);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+
+	button = gaim_pixbuf_button_from_stock(_("_Use"), GTK_STOCK_EXECUTE, GAIM_BUTTON_HORIZONTAL);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(use_away_mess), ca);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+
+	button = gaim_pixbuf_button_from_stock(_("_Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(away_mess_destroy), ca);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	focus_chain = g_list_prepend(focus_chain, hbox);
+
+	gtk_widget_show_all(ca->window);
+	gtk_container_set_focus_chain(GTK_CONTAINER(vbox), focus_chain);
+}
+
+static void
+alias_chat_cb(GaimChat *chat, const char *new_alias)
+{
+	gaim_blist_alias_chat(chat, new_alias);
+}
+
+void
+alias_dialog_blist_chat(GaimChat *chat)
+{
+	gaim_request_input(NULL, _("Alias Chat"), NULL,
+					   _("Enter an alias for this chat."),
+					   chat->alias, FALSE, FALSE, NULL,
+					   _("Alias"), G_CALLBACK(alias_chat_cb),
+					   _("Cancel"), NULL, chat);
+}
+
+static void
+alias_contact_cb(GaimContact *contact, const char *new_alias)
+{
+	gaim_contact_set_alias(contact, new_alias);
+}
+
+void
+alias_dialog_contact(GaimContact *contact)
+{
+	gaim_request_input(NULL, _("Alias Contact"), NULL,
+					   _("Enter an alias for this contact."),
+					   contact->alias, FALSE, FALSE, NULL,
+					   _("Alias"), G_CALLBACK(alias_contact_cb),
+					   _("Cancel"), NULL, contact);
+}
+
+static void
+alias_buddy_cb(GaimBuddy *buddy, const char *alias)
+{
+	gaim_blist_alias_buddy(buddy, (alias != NULL && *alias != '\0') ? alias : NULL);
+	serv_alias_buddy(buddy);
+}
+
+void
+alias_dialog_bud(GaimBuddy *b)
+{
+	char *secondary = g_strdup_printf(_("Enter an alias for %s."), b->name);
+
+	gaim_request_input(NULL, _("Alias Buddy"), NULL,
+					   secondary, b->alias, FALSE, FALSE, NULL,
+					   _("Alias"), G_CALLBACK(alias_buddy_cb),
+					   _("Cancel"), NULL, b);
+
+	g_free(secondary);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gtkdialogs.h	Sun Aug 08 00:48:19 2004 +0000
@@ -0,0 +1,140 @@
+/**
+ * @file gtkdialogs.h Assorted GTK+ dialogs
+ * @defgroup gtkui GTK+ User Interface
+ *
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _GTKDIALOGS_H_
+#define _GTKDIALOGS_H_
+
+#include "account.h"
+#include "conversation.h"
+
+#include "gtkinternal.h"
+
+/**
+ * Our UI's identifier.
+ */
+#define GAIM_GTK_UI "gtk-gaim"
+
+
+#define GAIM_DIALOG(x)	x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \
+			gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
+#define GAIM_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
+
+/* This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
+ * earlier).  It defines the new wrap behavior (unknown in earlier versions)
+ * as the old (slightly buggy) wrap behavior.
+ */
+#ifndef GTK_WRAP_WORD_CHAR
+#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
+#endif
+
+#define DEFAULT_FONT_FACE "Helvetica"
+
+
+/* XXX CUI: away messages aren't really anything more than char* but we need two char*'s
+ * for the UI so that people can name their away messages when they save them. So these
+ * are really a UI function and struct away_message should be removed from the core. */
+/* WTF?  How does having a title for something mean that it is part of the UI? */
+struct away_message {
+	char name[80];
+	char message[2048];
+};
+
+
+
+/* this is used for queuing messages received while away. This is really a UI function
+ * which is why the struct is here. */
+
+struct queued_message {
+	char name[80];
+	char alias[80];
+	char *message;
+	time_t tm;
+	GaimAccount *account;
+	GaimMessageFlags flags;
+};
+
+struct smiley_theme {
+	char *path;
+	char *name;
+	char *desc;
+	char *icon;
+	char *author;
+	
+	struct smiley_list *list;
+};
+
+/* Globals in main.c */
+extern GtkWidget *mainwindow;
+extern int docklet_count;
+
+/* Globals in away.c */
+extern GSList *away_messages;
+extern struct away_message *awaymessage;
+extern GtkWidget *awaymenu;
+extern GtkWidget *awayqueue;
+extern GtkListStore *awayqueuestore;
+
+/* Globals in themes.c */
+extern struct smiley_theme *current_smiley_theme;
+extern GSList *smiley_themes;
+
+/* Functions in about.c */
+extern void show_about(GtkWidget *, void *);
+
+/* Functions in main.c */
+extern void show_login();
+extern void gaim_setup(GaimConnection *);
+
+/* Functions in away.c */
+extern void rem_away_mess(GtkWidget *, struct away_message *);
+extern void do_away_message(GtkWidget *, struct away_message *);
+extern void do_away_menu();
+extern void toggle_away_queue();
+extern void purge_away_queue(GSList**);
+extern void do_im_back(GtkWidget *w, GtkWidget *x);
+
+/* Functions in dialogs.c */
+extern void alias_dialog_bud(GaimBuddy *);
+extern void alias_dialog_contact(GaimContact *);
+extern void alias_dialog_blist_chat(GaimChat *);
+extern void show_warn_dialog(GaimConnection *, const char *);
+extern void gaim_gtkdialogs_new_im(GaimAccount *, const char *);
+extern void show_im_dialog();
+extern void show_info_dialog();
+extern void show_log_dialog();
+extern void destroy_all_dialogs();
+extern void create_away_mess(GtkWidget *, void *);
+
+/* Functions in session.c */
+extern void session_init(gchar *, gchar *, gchar *);
+extern void session_end();
+
+/* Functions in themes.c */
+extern void smiley_themeize(GtkWidget *);
+extern void smiley_theme_probe();
+extern void load_smiley_theme(const char *file, gboolean load);
+extern GSList *get_proto_smileys(const char *id);
+
+#endif /* _GTKDIALOGS_H_ */
--- a/src/gtkimhtml.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkimhtml.c	Sun Aug 08 00:48:19 2004 +0000
@@ -59,7 +59,7 @@
 
 #include <pango/pango-font.h>
 
-/* GTK+ < 2.2.2 hack, see ui.h for details. */
+/* GTK+ < 2.2.2 hack, see gtkdialogs.h for details. */
 #ifndef GTK_WRAP_WORD_CHAR
 #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
 #endif
--- a/src/gtkimhtmltoolbar.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Sun Aug 08 00:48:19 2004 +0000
@@ -25,11 +25,11 @@
 #include "gtkimhtmltoolbar.h"
 #include "gtkutils.h"
 
+#include "gtkdialogs.h"
 #include "imgstore.h"
 #include "notify.h"
 #include "request.h"
 #include "stock.h"
-#include "ui.h"
 #include "util.h"
 
 static GtkVBoxClass *parent_class = NULL;
--- a/src/gtknotify.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtknotify.c	Sun Aug 08 00:48:19 2004 +0000
@@ -32,12 +32,11 @@
 #include "stock.h"
 #include "util.h"
 
+#include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtknotify.h"
 #include "gtkutils.h"
 
-#include "ui.h"
-
 typedef struct
 {
 	GaimConnection *gc;
--- a/src/gtkplugin.h	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkplugin.h	Sun Aug 08 00:48:19 2004 +0000
@@ -25,9 +25,10 @@
 #ifndef _GAIM_GTK_PLUGIN_H_
 #define _GAIM_GTK_PLUGIN_H_
 
-#include <gtk/gtk.h>
 #include "plugin.h"
 
+#include "gtkinternal.h"
+
 typedef struct _GaimGtkPluginUiInfo GaimGtkPluginUiInfo;
 
 /**
--- a/src/gtkpluginpref.h	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkpluginpref.h	Sun Aug 08 00:48:19 2004 +0000
@@ -30,9 +30,9 @@
 # include <config.h>
 #endif
 
-#include <gtk/gtk.h>
+#include "pluginpref.h"
 
-#include "pluginpref.h"
+#include "gtkinternal.h"
 
 #ifdef __cplusplus
 extern "C" {
--- a/src/gtkpounce.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkpounce.c	Sun Aug 08 00:48:19 2004 +0000
@@ -33,14 +33,13 @@
 #include "request.h"
 #include "server.h"
 #include "sound.h"
+#include "util.h"
 
 #include "gtkblist.h"
+#include "gtkdialogs.h"
 #include "gtkpounce.h"
 #include "gtkutils.h"
 
-#include "ui.h"
-#include "util.h"
-
 typedef struct
 {
 	/* Pounce data */
--- a/src/gtkprefs.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkprefs.c	Sun Aug 08 00:48:19 2004 +0000
@@ -38,6 +38,7 @@
 #include "gtkblist.h"
 #include "gtkconv.h"
 #include "gtkdebug.h"
+#include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtkimhtmltoolbar.h"
 #include "gtkplugin.h"
@@ -47,8 +48,6 @@
 #include "gtkutils.h"
 #include "stock.h"
 
-#include "ui.h"
-
 #define PROXYHOST 0
 #define PROXYPORT 1
 #define PROXYUSER 2
--- a/src/gtkrequest.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkrequest.c	Sun Aug 08 00:48:19 2004 +0000
@@ -26,12 +26,12 @@
 
 #include "prefs.h"
 
+#include "gtkdialogs.h"
+#include "gtkimhtml.h"
+#include "gtkimhtmltoolbar.h"
 #include "gtkrequest.h"
 #include "gtkutils.h"
 #include "stock.h"
-#include "ui.h"
-#include "gtkimhtml.h"
-#include "gtkimhtmltoolbar.h"
 
 #include <gdk/gdkkeysyms.h>
 
--- a/src/gtkutils.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkutils.c	Sun Aug 08 00:48:19 2004 +0000
@@ -50,9 +50,9 @@
 #include "util.h"
 
 #include "gtkconv.h"
+#include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtkutils.h"
-#include "ui.h"
 
 guint accels_save_timer = 0;
 
--- a/src/gtkutils.h	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/gtkutils.h	Sun Aug 08 00:48:19 2004 +0000
@@ -25,8 +25,8 @@
 #ifndef _GAIM_GTK_UTILS_H_
 #define _GAIM_GTK_UTILS_H_
 
-#include <gtk/gtk.h>
 #include "gtkconv.h"
+#include "gtkinternal.h"
 #include "prpl.h"
 
 typedef enum
--- a/src/idle.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/idle.c	Sun Aug 08 00:48:19 2004 +0000
@@ -39,7 +39,8 @@
 #include "prefs.h"
 #include "signals.h"
 
-#include "ui.h"
+/* XXX - Get this out of here! */
+#include "gtkdialogs.h"
 
 /* XXX For the away stuff */
 #include "gaim.h"
--- a/src/main.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/main.c	Sun Aug 08 00:48:19 2004 +0000
@@ -43,6 +43,7 @@
 #include "gtkconn.h"
 #include "gtkconv.h"
 #include "gtkdebug.h"
+#include "gtkdialogs.h"
 #include "gtkeventloop.h"
 #include "gtkft.h"
 #include "gtknotify.h"
@@ -56,8 +57,6 @@
 #include "gtkutils.h"
 #include "stock.h"
 
-#include "ui.h"
-
 #if HAVE_SIGNAL_H
 # include <signal.h>
 #endif
--- a/src/protocols/jabber/iq.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/protocols/jabber/iq.c	Sun Aug 08 00:48:19 2004 +0000
@@ -169,9 +169,9 @@
 	char buf[1024];
 	xmlnode *query;
 	time_t now_t;
-	struct tm now;
+	struct tm *now;
 	time(&now_t);
-	localtime_r(&now_t, &now);
+	now = localtime(&now_t);
 
 	type = xmlnode_get_attrib(packet, "type");
 	from = xmlnode_get_attrib(packet, "from");
@@ -185,11 +185,11 @@
 
 		query = xmlnode_get_child(iq->node, "query");
 
-		strftime(buf, sizeof(buf), "%Y%m%dT%T", &now);
+		strftime(buf, sizeof(buf), "%Y%m%dT%T", now);
 		xmlnode_insert_data(xmlnode_new_child(query, "utc"), buf, -1);
-		strftime(buf, sizeof(buf), "%Z", &now);
+		strftime(buf, sizeof(buf), "%Z", now);
 		xmlnode_insert_data(xmlnode_new_child(query, "tz"), buf, -1);
-		strftime(buf, sizeof(buf), "%d %b %Y %T", &now);
+		strftime(buf, sizeof(buf), "%d %b %Y %T", now);
 		xmlnode_insert_data(xmlnode_new_child(query, "display"), buf, -1);
 
 		jabber_iq_send(iq);
--- a/src/server.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/server.c	Sun Aug 08 00:48:19 2004 +0000
@@ -35,9 +35,9 @@
 
 /* XXX UI Stuff */
 #include "gaim.h"
+#include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtkutils.h"
-#include "ui.h"
 
 #define SECS_BEFORE_RESENDING_AUTORESPONSE 600
 #define SEX_BEFORE_RESENDING_AUTORESPONSE "Only after you're married"
--- a/src/sound.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/sound.c	Sun Aug 08 00:48:19 2004 +0000
@@ -27,7 +27,7 @@
 
 /* XXX CORE/UI: this goes away when away messages become sane */
 #include "gtkinternal.h"
-#include "ui.h"
+#include "gtkdialogs.h"
 
 
 static GaimSoundUiOps *sound_ui_ops = NULL;
--- a/src/status.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/status.c	Sun Aug 08 00:48:19 2004 +0000
@@ -27,7 +27,7 @@
 
 /* XXX CORE/UI */
 #include "gtkinternal.h"
-#include "ui.h"
+#include "gtkdialogs.h"
 
 
 /* for people like myself who are too lazy to add an away msg :) */
--- a/src/themes.c	Sun Aug 08 00:03:12 2004 +0000
+++ b/src/themes.c	Sun Aug 08 00:48:19 2004 +0000
@@ -28,10 +28,9 @@
 #include "util.h"
 
 #include "gtkconv.h"
+#include "gtkdialogs.h"
 #include "gtkimhtml.h"
 
-#include "ui.h"
-
 struct smiley_list {
 	char *sml;
 	GSList *smileys;
--- a/src/ui.h	Sun Aug 08 00:03:12 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/**
- * @file ui.h Main GTK+ UI include file
- * @defgroup gtkui GTK+ User Interface
- *
- * gaim
- *
- * Gaim is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _UI_H_
-#define _UI_H_
-
-#include "account.h"
-#include "conversation.h"
-
-/**
- * Our UI's identifier.
- */
-#define GAIM_GTK_UI "gtk-gaim"
-
-
-#define GAIM_DIALOG(x)	x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \
-			gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
-#define GAIM_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
-
-/* This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
- * earlier).  It defines the new wrap behavior (unknown in earlier versions)
- * as the old (slightly buggy) wrap behavior.
- */
-#ifndef GTK_WRAP_WORD_CHAR
-#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
-#endif
-
-#define DEFAULT_FONT_FACE "Helvetica"
-
-
-/* XXX CUI: away messages aren't really anything more than char* but we need two char*'s
- * for the UI so that people can name their away messages when they save them. So these
- * are really a UI function and struct away_message should be removed from the core. */
-/* WTF?  How does having a title for something mean that it is part of the UI? */
-struct away_message {
-	char name[80];
-	char message[2048];
-};
-
-
-
-/* this is used for queuing messages received while away. This is really a UI function
- * which is why the struct is here. */
-
-struct queued_message {
-	char name[80];
-	char alias[80];
-	char *message;
-	time_t tm;
-	GaimAccount *account;
-	GaimMessageFlags flags;
-};
-
-struct smiley_theme {
-	char *path;
-	char *name;
-	char *desc;
-	char *icon;
-	char *author;
-	
-	struct smiley_list *list;
-};
-
-/* Globals in main.c */
-extern GtkWidget *mainwindow;
-extern int docklet_count;
-
-/* Globals in away.c */
-extern GSList *away_messages;
-extern struct away_message *awaymessage;
-extern GtkWidget *awaymenu;
-extern GtkWidget *awayqueue;
-extern GtkListStore *awayqueuestore;
-
-/* Globals in themes.c */
-extern struct smiley_theme *current_smiley_theme;
-extern GSList *smiley_themes;
-
-/* Functions in about.c */
-extern void show_about(GtkWidget *, void *);
-
-/* Functions in main.c */
-extern void show_login();
-extern void gaim_setup(GaimConnection *);
-
-/* Functions in away.c */
-extern void rem_away_mess(GtkWidget *, struct away_message *);
-extern void do_away_message(GtkWidget *, struct away_message *);
-extern void do_away_menu();
-extern void toggle_away_queue();
-extern void purge_away_queue(GSList**);
-extern void do_im_back(GtkWidget *w, GtkWidget *x);
-
-/* Functions in dialogs.c */
-extern void alias_dialog_bud(GaimBuddy *);
-extern void alias_dialog_contact(GaimContact *);
-extern void alias_dialog_blist_chat(GaimChat *);
-extern void show_warn_dialog(GaimConnection *, const char *);
-extern void gaim_gtkdialogs_new_im(GaimAccount *, const char *);
-extern void show_im_dialog();
-extern void show_info_dialog();
-extern void show_log_dialog();
-extern void destroy_all_dialogs();
-extern void create_away_mess(GtkWidget *, void *);
-
-/* Functions in session.c */
-extern void session_init(gchar *, gchar *, gchar *);
-extern void session_end();
-
-/* Functions in themes.c */
-extern void smiley_themeize(GtkWidget *);
-extern void smiley_theme_probe();
-extern void load_smiley_theme(const char *file, gboolean load);
-extern GSList *get_proto_smileys(const char *id);
-
-#endif /* _UI_H_ */