# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1113222287 0
# Node ID 364a2ef907aead31c042352909160cca3525a5c4
# Parent  290131d5f626337c82584a024b51231ea2ae84cb
[gaim-migrate @ 12468]
same thing here, changing to consistently using GTK+, by rlaager

committer: Tailor Script <tailor@pidgin.im>

diff -r 290131d5f626 -r 364a2ef907ae HACKING
--- a/HACKING	Mon Apr 11 12:11:11 2005 +0000
+++ b/HACKING	Mon Apr 11 12:24:47 2005 +0000
@@ -18,7 +18,7 @@
 If you don't know how event-driven programs work, stop right now. Gaim
 uses GTK+'s main loop (actually GLib's but I won't talk about how GTK
 works) and uses GLib functions for timeouts and socket notification. If
-you don't know GTK you should go learn that first.
+you don't know GTK+ you should go learn that first.
 
 If you're going to hack gaim, PLEASE, PLEASE PLEASE PLEASE send patches
 against the absolute latest CVS. I get really annoyed when I get patches
@@ -131,8 +131,8 @@
 mostly drawing the window. show_conv is the best place to edit the UI.
 
 That's pretty much it for the quick tutorial. I know it wasn't much but
-it's enough to get you started. Make sure you know GTK before you get too
-involved. Most of the back-end stuff is pretty basic; most of gaim is GTK.
+it's enough to get you started. Make sure you know GTK+ before you get too
+involved. Most of the back-end stuff is pretty basic; most of gaim is GTK+.
 
 
 SOURCE FILES  (this should probly be utterly removed)
@@ -256,7 +256,7 @@
   like the name says.
 
 plugins/ticker/gtkticker.c:
-  Syd, our resident GTK God, wrote a GtkWidget, GtkTicker. This is that
+  Syd, our resident GTK+ God, wrote a GtkWidget, GtkTicker. This is that
   widget. It's cool, and it's tiny. This is actually a really good example
   widget for those of you looking to write your own.
 
@@ -426,14 +426,14 @@
 because without it, Gaim will most likely segfault. The second most
 important function is login(). Not all functions need to be implemented.
 
-There should be absolutely *ZERO* GTK in the PRPLs. PRPLs should *NEVER*
+There should be absolutely *ZERO* GTK+ in the PRPLs. PRPLs should *NEVER*
 say what the UI *looks* like, only what information needs to be there.
-There's currently an effort to get the GTK that is contained in the PRPLs
-directory out of there. If you submit a patch that adds GTK to those
+There's currently an effort to get the GTK+ that is contained in the PRPLs
+directory out of there. If you submit a patch that adds GTK+ to those
 directories it's very likely to be refused, unless if I'm in a good mood
 and decide to relocate things for you. That's not likely.
 
-You're probably wondering how you can do certain things without GTK. Well,
+You're probably wondering how you can do certain things without GTK+. Well,
 you're just going to have to make do. Rely on the UI, that's why it's
 there.  A PRPL should have absolutely ZERO interaction with the user, it
 should all be handled by the UI.
diff -r 290131d5f626 -r 364a2ef907ae configure.ac
--- a/configure.ac	Mon Apr 11 12:11:11 2005 +0000
+++ b/configure.ac	Mon Apr 11 12:24:47 2005 +0000
@@ -1218,7 +1218,7 @@
 echo Protocols to link statically.. : $STATIC_PRPLS
 echo Protocols to build dynamically : $DYNAMIC_PRPLS
 echo
-echo UI Library.................... : GTK 2.x
+echo UI Library.................... : GTK+ 2.x
 echo SSL Library/Libraries......... : $msg_ssl
 echo
 echo Build with Plugin support..... : $enable_plugins
diff -r 290131d5f626 -r 364a2ef907ae doc/FAQ
--- a/doc/FAQ	Mon Apr 11 12:11:11 2005 +0000
+++ b/doc/FAQ	Mon Apr 11 12:24:47 2005 +0000
@@ -13,7 +13,7 @@
                still using the old version.
          1.7.  Are the packages signed? If so, by who, and how can I get the
                key?
-         1.8.  Can I use Gaim for GTK+1.2?
+         1.8.  Can I use Gaim for GTK+ 1.2?
          1.9.  Can I run Gaim on IRIX?
          1.10. Can I run gaim on MacOSX?
          1.11. How do I apply the patch "something.diff"?
@@ -422,7 +422,7 @@
   On Windows, this file is located at C:\Documents and Settings\username
   \.themes\Default\gtk-2.0\gtkrc.
 
-  You can also just switch to a different GTK theme. You can find GTK themes
+  You can also just switch to a different GTK+ theme. You can find GTK+ themes
   (and information on using them) by visiting themes.freshmeat.net,
   art.gnome.org, or searching on Google.
 
@@ -517,7 +517,7 @@
   client has multiple windows with identical WM_CLASS and WM_NAME properties,
   then it should provide a WM_WINDOW_ROLE property."
 
-  Gtk+ sets these WM_CLASS values for us so that they are unique for Gaim
+  GTK+ sets these WM_CLASS values for us so that they are unique for Gaim
   instances, and the documentation for the gtk_window_set_wmclass function says
   explicitly not to use it for anything else. Gaim uses the WM_WINDOW_ROLE hint
   to differentiate windows. If your window manager is having problems
diff -r 290131d5f626 -r 364a2ef907ae doc/PERL-HOWTO.dox
--- a/doc/PERL-HOWTO.dox	Mon Apr 11 12:11:11 2005 +0000
+++ b/doc/PERL-HOWTO.dox	Mon Apr 11 12:24:47 2005 +0000
@@ -12,7 +12,7 @@
   plugin, and appears in the list of plugins in Gaim's preferences pane.
   Until now, they have been very basic, and consisted of only a few
   functions. However, with the latest changes to Gaim's perl API, a much
-  larger part of Gaim is now open. In time, even such things as Gtk+
+  larger part of Gaim is now open. In time, even such things as GTK+
   preference panes for perl scripts will be possible.
 
  @section first-script Writing your first perl script
@@ -62,7 +62,7 @@
 
   The first thing you see is a hash called @c @%PLUGIN_INFO. It contains
   the basic information on your plugin. In the future, additional fields
-  may be allowed, such as ones to setup a Gtk+ preferences pane.
+  may be allowed, such as ones to setup a GTK+ preferences pane.
 
   The @c plugin_init function is required in all perl scripts. Its job
   is to return the @c @%PLUGIN_INFO hash, which Gaim will use to register
diff -r 290131d5f626 -r 364a2ef907ae gaim-installer.nsi
--- a/gaim-installer.nsi	Mon Apr 11 12:11:11 2005 +0000
+++ b/gaim-installer.nsi	Mon Apr 11 12:24:47 2005 +0000
@@ -925,8 +925,8 @@
 ;   0 - We have the correct version
 ;       Second Pop: Key where Version was found
 ;   1 - We have an old version that needs to be upgraded
-;       Second Pop: HKLM or HKCU depending on where GTK was found.
-;   2 - We don't have Gtk+ at all
+;       Second Pop: HKLM or HKCU depending on where GTK+ was found.
+;   2 - We don't have GTK+ at all
 ;       Second Pop: "NONE, HKLM or HKCU" depending on our rights..
 ;
 Function DoWeNeedGtk
@@ -1031,7 +1031,7 @@
   StrCpy $GTK_THEME_SEL ${SecGtkWimp}
   StrCpy $ISSILENT "/NOUI"
 
-  ; GTK installer has two silent states.. one with Message boxes, one without
+  ; GTK+ installer has two silent states.. one with Message boxes, one without
   ; If gaim installer was run silently, we want to supress gtk installer msg boxes.
   IfSilent 0 set_gtk_normal
       StrCpy $ISSILENT "/S"
diff -r 290131d5f626 -r 364a2ef907ae gaim.spec.in
--- a/gaim.spec.in	Mon Apr 11 12:11:11 2005 +0000
+++ b/gaim.spec.in	Mon Apr 11 12:24:47 2005 +0000
@@ -1,4 +1,4 @@
-Summary:    A Gtk+ based multiprotocol instant messaging client
+Summary:    A GTK+ based multiprotocol instant messaging client
 Name:       @PACKAGE@
 Version:    @VERSION@
 Release:    0
diff -r 290131d5f626 -r 364a2ef907ae plugins/gaimrc.c
--- a/plugins/gaimrc.c	Mon Apr 11 12:11:11 2005 +0000
+++ b/plugins/gaimrc.c	Mon Apr 11 12:24:47 2005 +0000
@@ -340,7 +340,7 @@
 	hbox = gtk_hbox_new(FALSE, 18);
 	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-	check = gaim_gtk_prefs_checkbox(_("Gtk interface font"),
+	check = gaim_gtk_prefs_checkbox(_("GTK+ Interface Font"),
 	                                "/plugins/gtk/gaimrc/set/gtk-font-name",
 	                                hbox);
 	gtk_size_group_add_widget(sg, check);
@@ -359,7 +359,7 @@
 	hbox = gtk_hbox_new(FALSE, 18);
 	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-	check = gaim_gtk_prefs_checkbox(_("Gtk text shortcut theme"),
+	check = gaim_gtk_prefs_checkbox(_("GTK+ Text Shortcut Theme"),
 	                                "/plugins/gtk/gaimrc/set/gtk-key-theme-name",
 	                                hbox);
 	gtk_size_group_add_widget(sg, check);
diff -r 290131d5f626 -r 364a2ef907ae plugins/gestures/stroke-draw.c
--- a/plugins/gestures/stroke-draw.c	Mon Apr 11 12:11:11 2005 +0000
+++ b/plugins/gestures/stroke-draw.c	Mon Apr 11 12:24:47 2005 +0000
@@ -319,7 +319,7 @@
 }
 
 
-/* This function should be written using Gtk+ primitives*/
+/* This function should be written using GTK+ primitives*/
 static void
 gstroke_invisible_window_init (GtkWidget *widget)
 {
diff -r 290131d5f626 -r 364a2ef907ae po/am.po
--- a/po/am.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/am.po	Mon Apr 11 12:24:47 2005 +0000
@@ -2998,7 +2998,7 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/bg.po
--- a/po/bg.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/bg.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3096,10 +3096,10 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim клиент за изпращане на съобщения чрез·AIM,·ICQ,·Yahoo!,·MSN,·IRC,"
-"·Jabber,·Napster,·Zephyr,·и·Gadu-Gadu.Написан е чрез·Gtk+·и е лицензиран "
+"·Jabber,·Napster,·Zephyr,·и·Gadu-Gadu.Написан е чрез·GTK+·и е лицензиран "
 "под·GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/ca.po
--- a/po/ca.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/ca.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3186,11 +3186,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim és un client modular de missatges instantanis capaç d'usar AIM, MSN, "
 "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, i Gadu-"
-"Gadu, tots alhora. Està escrit usant Gtk+ i roman sota llicència GPL.<BR><BR>"
+"Gadu, tots alhora. Està escrit usant GTK+ i roman sota llicència GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:248
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/cs.po
--- a/po/cs.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/cs.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3083,11 +3083,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim je modulární klient Instant Messaging schopný používat AIM, MSN, "
 "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, a Gadu-"
-"Gadu zároveň. Je napsán s použitím Gtk+ a je licencován pod GPL.<BR><BR>"
+"Gadu zároveň. Je napsán s použitím GTK+ a je licencován pod GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/da.po
--- a/po/da.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/da.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3100,11 +3100,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim er et modulært 'kvikbeskedsprogram', der understøtter AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, Silc, Novel GroupWise, Napster, Zephyr og Gadu-Gadu på "
-"samme tid. Det er skrevet i Gtk+ og er under GPL-licensen.<BR><BR>"
+"samme tid. Det er skrevet i GTK+ og er under GPL-licensen.<BR><BR>"
 
 #: src/gtkdialogs.c:217
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/de.po
--- a/po/de.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/de.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3113,11 +3113,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim ist ein modularer Instant Messaging Client, der AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr und Gadu-Gadu und "
-"alle zusammen unterstützt. Gaim ist mit Gtk+ geschrieben und steht unter der "
+"alle zusammen unterstützt. Gaim ist mit GTK+ geschrieben und steht unter der "
 "GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/en_CA.po
--- a/po/en_CA.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/en_CA.po	Mon Apr 11 12:24:47 2005 +0000
@@ -446,12 +446,12 @@
 msgstr "Select Interface Font"
 
 #: plugins/gaimrc.c:343
-msgid "Gtk interface font"
-msgstr "GTK interface font"
+msgid "GTK+ Interface Font"
+msgstr "GTK+ Interface Font"
 
 #: plugins/gaimrc.c:362
-msgid "Gtk text shortcut theme"
-msgstr "GTK text shortcut theme"
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ Text Shortcut Theme"
 
 #: plugins/gaimrc.c:460
 msgid "Gaim GTK+ Theme Control"
@@ -3100,11 +3100,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licenced under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licenced under the GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:231
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/en_GB.po
--- a/po/en_GB.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/en_GB.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3078,11 +3078,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/es.po
--- a/po/es.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/es.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3150,11 +3150,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim es un cliente modular de mensajería instantánea, capaz de utilizar AIM, "
 "MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr y "
-"Gadu-Gadu al mismo tiempo.  Está escrito usando Gtk+ y se licencia con la "
+"Gadu-Gadu al mismo tiempo.  Está escrito usando GTK+ y se licencia con la "
 "GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/fi.po
--- a/po/fi.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/fi.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3131,11 +3131,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim on modulaarinen pikaviestinasiakassovellus, joka kykenee k�ytt�m��n "
 "AIM-, ICQ-, Yahoo!-, MSN-, IRC-, SILC, Novell GroupWise, Jabber-, Napster-, "
-"Zephyr- ja Gadu-Gadu-protokollia yht� aikaa. Se on ohjelmoitu k�ytt�en Gtk+:"
+"Zephyr- ja Gadu-Gadu-protokollia yht� aikaa. Se on ohjelmoitu k�ytt�en GTK+:"
 "aa ja on lisensoitu GPL:n mukaisesti.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/fr.po
--- a/po/fr.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/fr.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3113,11 +3113,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim est un client de messagerie instantanée compatible avec AIM, MSN, "
 "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr et Gadu-"
-"Gadu. Il est écrit en Gtk+ et est distribué sous licence GPL.<BR><BR>"
+"Gadu. Il est écrit en GTK+ et est distribué sous licence GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/he.po
--- a/po/he.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/he.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3066,7 +3066,7 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/hi.po
--- a/po/hi.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/hi.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3319,7 +3319,7 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "गेम एक माड्यूलर इंस्टेंट मैसेन्जिंग क्लायन्ट है जो एआईएम, आईसीक्यू, याहू!, एमएसएन, आईआरसी, "
 "ज़ेबल, नेपस्टर, ज़ेफायर, तथा गडू-गडू इन सभी को एक साथ उपयोग में ला सकता है. इसे जीटीके+ के "
diff -r 290131d5f626 -r 364a2ef907ae po/hu.po
--- a/po/hu.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/hu.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3167,11 +3167,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim egy modul�ris �zenetk�ld� kliens AIM, ICQ, Yahoo!, MSN, IRC, Jabber, "
 "Napster, Zephyr, �s Gadu-Gadu protokollok egyidej� haszn�lat�nak "
-"k�pess�g�vel.  Gtk+ seg�ts�g�vel k�sz�l GPL licensz alatt.<BR><BR>"
+"k�pess�g�vel.  GTK+ seg�ts�g�vel k�sz�l GPL licensz alatt.<BR><BR>"
 
 #: src/gtkdialogs.c:217
 #, fuzzy
diff -r 290131d5f626 -r 364a2ef907ae po/it.po
--- a/po/it.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/it.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3107,11 +3107,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim � un client modulare per messaggi immediati in grado di usare AIM, MSN, "
 "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr e Gadu-"
-"Gadu allo stesso tempo. � scritto utilizzando Gtk+ ed � distribuito sotto "
+"Gadu allo stesso tempo. � scritto utilizzando GTK+ ed � distribuito sotto "
 "licenza GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/ja.po
--- a/po/ja.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/ja.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3078,7 +3078,7 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim は、同時に AIM、MSN、Yahoo!、Jabber、ICQ、IRC、SILC、Novell グループウェ"
 "ア、Napster、Zephyr、そして Gadu-Gadu を利用することが可能なモジュール式イン"
diff -r 290131d5f626 -r 364a2ef907ae po/ko.po
--- a/po/ko.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/ko.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3025,10 +3025,10 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "게임은 AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, Gadu-Gadu 등을 지"
-"원하는 모듈 기반의 메신저입니다.  Gtk+를 이용하여 만들어졌으며 GPL 라이센스"
+"원하는 모듈 기반의 메신저입니다.  GTK+를 이용하여 만들어졌으며 GPL 라이센스"
 "를 따릅니다.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/lt.po
--- a/po/lt.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/lt.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3160,11 +3160,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim yra modulinis susirašinėjimo klientas palaikantis AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, Novrll GroupWise, Napster, Zephyr, ir Gadu-Gadu "
-"protokolus. Naudoja Gtk+ ir yra GPL licenzijos.<BR><BR>"
+"protokolus. Naudoja GTK+ ir yra GPL licenzijos.<BR><BR>"
 
 #: src/gtkdialogs.c:217
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/mk.po
--- a/po/mk.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/mk.po	Mon Apr 11 12:24:47 2005 +0000
@@ -2989,7 +2989,7 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/nl.po
--- a/po/nl.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/nl.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3088,11 +3088,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim is een modulair programma om expresberichten uit te wisselen via AIM, "
 "MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell Groupwise, Napster, Zephyr en "
-"GaduGadu en dat allemaal tegelijk! Het is geschreven m.b.v. Gtk+ en wordt "
+"GaduGadu en dat allemaal tegelijk! Het is geschreven m.b.v. GTK+ en wordt "
 "verspreid onder een GPL-licentie.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/no.po
--- a/po/no.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/no.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3165,11 +3165,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim er en modulbasert klient for direktemeldinger som kan bruke AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr og Gadu-Gadu samtidig. Programmet "
-"er bygget p� Gtk+ og er lisensiert under GPL.<BR><BR>"
+"er bygget p� GTK+ og er lisensiert under GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
 #, fuzzy
diff -r 290131d5f626 -r 364a2ef907ae po/pl.po
--- a/po/pl.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/pl.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3096,11 +3096,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim jest modularnym komunikatorem mog�cym u�ywa� jednocze�nie protoko��w "
 "takich jak: AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell Group Wise, "
-"Napster, Zephyr i Gadu-Gadu. Program jest napisany z u�yciem Gtk+ i "
+"Napster, Zephyr i Gadu-Gadu. Program jest napisany z u�yciem GTK+ i "
 "rozprowadzany na licencji GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/pt.po
--- a/po/pt.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/pt.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3092,11 +3092,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "O Gaim é um cliente de Mensagem Imediata modular capaz de usar o AIM, MSN, "
 "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zepyhr, e Gadu-"
-"Gadu todos ao mesmo tempo. Está escrito usando o Gtk+ e é licenciado sob a "
+"Gadu todos ao mesmo tempo. Está escrito usando o GTK+ e é licenciado sob a "
 "GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/pt_BR.po
--- a/po/pt_BR.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/pt_BR.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3021,11 +3021,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "O Gaim é um cliente de Mensagem Instantânea modular capaz de usar o AIM, "
 "MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell Groupwise, Napster, Zepyhr, e "
-"Gadu-Gadu ao mesmo tempo. Ele é escrito usando o Gtk+ e é licenciado sob a "
+"Gadu-Gadu ao mesmo tempo. Ele é escrito usando o GTK+ e é licenciado sob a "
 "GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:230
diff -r 290131d5f626 -r 364a2ef907ae po/ro.po
--- a/po/ro.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/ro.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3082,12 +3082,12 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim este un client modular de mesagerie instant capabil să comunice "
 "simultan utilizând protocoalele AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, "
 "Novel GroupWise, Napster, Zephyr şi Gadu-Gadu. Are licenţă GPL şi utilizează "
-"Gtk+.<BR><BR>"
+"GTK+.<BR><BR>"
 
 #: src/gtkdialogs.c:217
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/ru.po
--- a/po/ru.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/ru.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3055,11 +3055,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim - это модульный клиент обмена сообщениями, позволяющий использовать "
 "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr "
-"и Gadu-Gadu одновременно. Он написан с использованием Gtk+ и "
+"и Gadu-Gadu одновременно. Он написан с использованием GTK+ и "
 "распространяется под лицензией GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/sk.po
--- a/po/sk.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/sk.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3175,10 +3175,10 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim je klient podporujúci protokol AOL Instant Messenger. Bol napísaný \n"
-"použitím Gtk+ a je licencovaný pod GPL.\n"
+"použitím GTK+ a je licencovaný pod GPL.\n"
 "\n"
 "URL: "
 
diff -r 290131d5f626 -r 364a2ef907ae po/sl.po
--- a/po/sl.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/sl.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3145,11 +3145,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati "
 "sodeluje s protokoli AIM, ICQ, Yahoo!, MSN, IRC, Jabber, SILC, Novell "
-"GroupWise, Napster, Zephyr, and Gadu-Gadu. Uporablja Gtk+ in je objavljen "
+"GroupWise, Napster, Zephyr, and Gadu-Gadu. Uporablja GTK+ in je objavljen "
 "pod licenco GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/sq.po
--- a/po/sq.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/sq.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3269,8 +3269,8 @@
 msgstr "Rreth Gaim"
 
 #: src/gtkdialogs.c:222
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr "Gaim-i është një klient modular shkëmbimi mesazhesh i aftë të përdorë njëherazi AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, dhe Gadu-Gadu.  Është shkruajtur duke përdorur Gtk+ dhe licensuar sipas GPL.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
+msgstr "Gaim-i është një klient modular shkëmbimi mesazhesh i aftë të përdorë njëherazi AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, dhe Gadu-Gadu.  Është shkruajtur duke përdorur GTK+ dhe licensuar sipas GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:231
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/sr.po
--- a/po/sr.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/sr.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3082,7 +3082,7 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Гаим је прошириви клијент за брзе поруке који може да користи АИМ, ICQ, "
 "Јаху, МСН, ИРЦ, Џабер, Напстер, Зефир и Гаду-Гаду истовремено. Написан је "
diff -r 290131d5f626 -r 364a2ef907ae po/sr@Latn.po
--- a/po/sr@Latn.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/sr@Latn.po	Mon Apr 11 12:24:47 2005 +0000
@@ -1178,7 +1178,7 @@
 
 #: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
-msgstr "Gtk+ biblioteka izdanje"
+msgstr "GTK+ biblioteka izdanje"
 
 #. Autostart
 #: plugins/win32/winprefs/winprefs.c:352
@@ -3086,11 +3086,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim je proširivi klijent za brze poruke koji može da koristi AIM, ICQ, "
 "Jahu, MSN, IRC, DŽaber, Napster, Zefir i Gadu-Gadu istovremeno. Napisan je "
-"pomoću Gtk+ i licenciran pod Gnuovom Opštom javnom licencom (GPL).<BR><BR>"
+"pomoću GTK+ i licenciran pod Gnuovom Opštom javnom licencom (GPL).<BR><BR>"
 
 #: src/gtkdialogs.c:217
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
diff -r 290131d5f626 -r 364a2ef907ae po/sv.po
--- a/po/sv.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/sv.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3104,10 +3104,10 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim är en modulär snabbmeddelandeklient som stödjer AIM, ICQ, Yahoo!, MSN, "
-"IRC, Jabber, Napster, Zephyr och Gadu-Gadu samtidigt. Den använder Gtk+ och "
+"IRC, Jabber, Napster, Zephyr och Gadu-Gadu samtidigt. Den använder GTK+ och "
 "är licensierad under GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/tr.po
--- a/po/tr.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/tr.po	Mon Apr 11 12:24:47 2005 +0000
@@ -2965,7 +2965,7 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 
 #: src/gtkdialogs.c:228
diff -r 290131d5f626 -r 364a2ef907ae po/uk.po
--- a/po/uk.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/uk.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3134,11 +3134,11 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "GaimGaim - модульний клієнт обміну повідомленнями, що дозволяє "
 "використовувати AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, "
-"Napster, Zephyr, та Gadu-Gadu одразу.  Він написаний з використанням Gtk+ та "
+"Napster, Zephyr, та Gadu-Gadu одразу.  Він написаний з використанням GTK+ та "
 "поширюється на умовах GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:230
diff -r 290131d5f626 -r 364a2ef907ae po/vi.po
--- a/po/vi.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/vi.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3108,10 +3108,10 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim là trình khách nhắn tin có khả năng sử dụng AIM, ICQ, Yahoo!, MSN, IRC, "
-"Jabber, Napster, Zephyr, và Gadu-Gadu. Gaim sử dụng Gtk+ và đăng ký theo GPL."
+"Jabber, Napster, Zephyr, và Gadu-Gadu. Gaim sử dụng GTK+ và đăng ký theo GPL."
 "<BR><BR>"
 
 #: src/gtkdialogs.c:217
diff -r 290131d5f626 -r 364a2ef907ae po/zh_CN.po
--- a/po/zh_CN.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/zh_CN.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3051,10 +3051,10 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim 是模块化的即时通讯客户程序，同时支持 AIM、MSN、Yahoo!、Jabber、ICQ、"
-"IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
+"IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 GTK+ 写"
 "成，并以 GPL 许可协议发行。<BR><BR>"
 
 #: src/gtkdialogs.c:232
diff -r 290131d5f626 -r 364a2ef907ae po/zh_TW.po
--- a/po/zh_TW.po	Mon Apr 11 12:11:11 2005 +0000
+++ b/po/zh_TW.po	Mon Apr 11 12:24:47 2005 +0000
@@ -3185,7 +3185,7 @@
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim 是一個模組化的訊息程式，同時提供 AIM、ICQ、Yahoo!、MSN、IRC、Jabber、"
 "Napster、Zephyr，以及 Gadu-Gadu 等功能。它是以 GTK+ 開發，並以 GPL 的方式發"
diff -r 290131d5f626 -r 364a2ef907ae src/gtkblist.c
--- a/src/gtkblist.c	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkblist.c	Mon Apr 11 12:24:47 2005 +0000
@@ -143,7 +143,7 @@
 
 #ifdef WANT_DROP_SHADOW
 /**************************** Weird drop shadow stuff *******************/
-/* This is based on a patch for drop shadows in GTK menus available at 
+/* This is based on a patch for drop shadows in GTK+ menus available at 
  * http://www.xfce.org/gtkmenu-shadow/
  */
 
@@ -227,7 +227,7 @@
 	 *
 	 * In Win32, GDK gets the workarea that isn't occupied by toolbars
 	 * (including the taskbar) and uses that region as the screen size.
-	 * GTK returns positions based on a screen size that ignores these
+	 * GTK+ returns positions based on a screen size that ignores these
 	 * toolbars.  Since we want a pixmap with real X,Y coordinates, we
 	 * need to find out the offset from GTK's screen to GDK's screen,
 	 * and adjust the pixmaps we grab accordingly.  GDK will not deal
@@ -1500,7 +1500,7 @@
 
 #if (1)
 	/*
-	 * This code only exists because GTK doesn't work.  If we return
+	 * This code only exists because GTK+ doesn't work.  If we return
 	 * FALSE here, as would be normal the event propoagates down and
 	 * somehow gets interpreted as the start of a drag event.
 	 *
diff -r 290131d5f626 -r 364a2ef907ae src/gtkblist.h
--- a/src/gtkblist.h	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkblist.h	Mon Apr 11 12:24:47 2005 +0000
@@ -117,7 +117,7 @@
 /**
  * Returns the UI operations structure for the buddy list.
  *
- * @return The GTK list operations structure.
+ * @return The GTK+ list operations structure.
  */
 GaimBlistUiOps *gaim_gtk_blist_get_ui_ops(void);
 
@@ -128,7 +128,7 @@
  * returns the GaimGtkBuddyList we're most likely wanting to work with. This is slightly
  * cleaner than an externed global.
  * 
- * @return The default GTK buddy list
+ * @return The default GTK+ buddy list
  */
 GaimGtkBuddyList *gaim_gtk_blist_get_default_gtk_blist();
 
diff -r 290131d5f626 -r 364a2ef907ae src/gtkconn.h
--- a/src/gtkconn.h	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkconn.h	Mon Apr 11 12:24:47 2005 +0000
@@ -30,7 +30,7 @@
 /*@{*/
 
 /**
- * Gets GTK Connection UI ops
+ * Gets GTK+ Connection UI ops
  *
  * @return UI operations struct
  */
diff -r 290131d5f626 -r 364a2ef907ae src/gtkconv.h
--- a/src/gtkconv.h	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkconv.h	Mon Apr 11 12:24:47 2005 +0000
@@ -205,16 +205,16 @@
 /*@{*/
 
 /**
- * Returns the UI operations structure for GTK windows.
+ * Returns the UI operations structure for GTK+ windows.
  *
- * @return The GTK window operations structure.
+ * @return The GTK+ window operations structure.
  */
 GaimConvWindowUiOps *gaim_gtk_conversations_get_win_ui_ops(void);
 
 /**
- * Returns the UI operations structure for GTK conversations.
+ * Returns the UI operations structure for GTK+ conversations.
  *
- * @return The GTK conversation operations structure.
+ * @return The GTK+ conversation operations structure.
  */
 GaimConversationUiOps *gaim_gtk_conversations_get_conv_ui_ops(void);
 
diff -r 290131d5f626 -r 364a2ef907ae src/gtkdebug.h
--- a/src/gtkdebug.h	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkdebug.h	Mon Apr 11 12:24:47 2005 +0000
@@ -50,9 +50,9 @@
 void gaim_gtk_debug_window_hide(void);
 
 /**
- * Returns the UI operations structure for GTK debug output.
+ * Returns the UI operations structure for GTK+ debug output.
  *
- * @return The GTK UI debug operations structure.
+ * @return The GTK+ UI debug operations structure.
  */
 GaimDebugUiOps *gaim_gtk_debug_get_ui_ops(void);
 
diff -r 290131d5f626 -r 364a2ef907ae src/gtkimhtml.c
--- a/src/gtkimhtml.c	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkimhtml.c	Mon Apr 11 12:24:47 2005 +0000
@@ -552,7 +552,7 @@
 			return TRUE;
 			break;
 			
-#endif /* !(Gtk+ >= 2.2.0) */
+#endif /* !(GTK+ >= 2.2.0) */
 		}
 	
 	return FALSE;
@@ -964,7 +964,7 @@
 {
 #ifdef _WIN32
 	/* If we're on windows, let's see if we can get data from the HTML Format
-	   clipboard before we try to paste from the GTK buffer */
+	   clipboard before we try to paste from the GTK+ buffer */
 	HGLOBAL hdata;
 	DWORD err;
 	char *buffer;
@@ -1140,7 +1140,7 @@
 	G_OBJECT_CLASS(parent_class)->finalize (object);
 }
 
-/* Boring GTK stuff */
+/* Boring GTK+ stuff */
 static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 {
 	GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
diff -r 290131d5f626 -r 364a2ef907ae src/gtkimhtml.h
--- a/src/gtkimhtml.h	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkimhtml.h	Mon Apr 11 12:24:47 2005 +0000
@@ -245,16 +245,16 @@
 GType gtk_imhtml_get_type(void);
 
 /**
- * Creates and returns a new GTK IM/HTML widget.
+ * Creates and returns a new GTK+ IM/HTML widget.
  *
- * @return The GTK IM/HTML widget created.
+ * @return The GTK+ IM/HTML widget created.
  */
 GtkWidget *gtk_imhtml_new(void *, void *);
 
 /**
  * Returns the smiley object associated with the text.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param sml    The name of the smiley category.
  * @param text   The text associated with the smiley.
  */
@@ -264,49 +264,49 @@
 
 
 /**
- * Associates a smiley with a GTK IM/HTML.
+ * Associates a smiley with a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param sml    The name of the smiley category.
  * @param smiley The GtkIMSmiley to associate.
  */
 void gtk_imhtml_associate_smiley(GtkIMHtml *imhtml, const gchar *sml, GtkIMHtmlSmiley *smiley);
 
 /**
- * Removes all smileys associated with a GTK IM/HTML.
+ * Removes all smileys associated with a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  */
 void gtk_imhtml_remove_smileys(GtkIMHtml *imhtml);
 
 /**
- * Sets the function callbacks to use with a GTK IM/HTML instance.
+ * Sets the function callbacks to use with a GTK+ IM/HTML instance.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param f      The GtkIMHTMLFuncs struct containing the functions to use.
  */
 void gtk_imhtml_set_funcs(GtkIMHtml *imhtml, GtkIMHtmlFuncs *f);
 
 /**
- * Enables or disables showing the contents of HTML comments in a GTK IM/HTML.
+ * Enables or disables showing the contents of HTML comments in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param show   @c TRUE if comments should be shown, or @c FALSE otherwise.
  */
 void gtk_imhtml_show_comments(GtkIMHtml *imhtml, gboolean show);
 
 /**
- * Associates a protocol name with a GTK IM/HTML.
+ * Associates a protocol name with a GTK+ IM/HTML.
  *
- * @param imhtml        The GTK IM/HTML.
+ * @param imhtml        The GTK+ IM/HTML.
  * @param protocol_name The protocol name to associate with the IM/HTML.
  */
 void gtk_imhtml_set_protocol_name(GtkIMHtml *imhtml, const gchar *protocol_name);
 
 /**
- * Appends HTML formatted text to a GTK IM/HTML.
+ * Appends HTML formatted text to a GTK+ IM/HTML.
  *
- * @param imhtml  The GTK IM/HTML.
+ * @param imhtml  The GTK+ IM/HTML.
  * @param text    The formatted text to append.
  * @param options A GtkIMHtmlOptions object indicating insert behavior.
  */
@@ -314,9 +314,9 @@
  gtk_imhtml_append_text_with_images(imhtml, text, options, NULL)
 
 /**
- * Appends HTML formatted text to a GTK IM/HTML.
+ * Appends HTML formatted text to a GTK+ IM/HTML.
  *
- * @param imhtml  The GTK IM/HTML.
+ * @param imhtml  The GTK+ IM/HTML.
  * @param text    The formatted text to append.
  * @param options A GtkIMHtmlOptions object indicating insert behavior.
  * @param unused  Use @c NULL value.
@@ -327,12 +327,12 @@
                                          GSList *unused);
 
 /**
- * Inserts HTML formatted text to a GTK IM/HTML at a given iter.
+ * Inserts HTML formatted text to a GTK+ IM/HTML at a given iter.
  *
- * @param imhtml  The GTK IM/HTML.
+ * @param imhtml  The GTK+ IM/HTML.
  * @param text    The formatted text to append.
  * @param options A GtkIMHtmlOptions object indicating insert behavior.
- * @param iter    A GtkTextIter in the GTK IM/HTML at which to insert text.
+ * @param iter    A GtkTextIter in the GTK+ IM/HTML at which to insert text.
  */
 void gtk_imhtml_insert_html_at_iter(GtkIMHtml        *imhtml,
                                     const gchar      *text,
@@ -340,42 +340,42 @@
                                     GtkTextIter      *iter);
 
 /**
- * Scrolls a GTK IM/HTML to the end of its contents.
+ * Scrolls a GTK+ IM/HTML to the end of its contents.
  *
- * @param imhtml  The GTK IM/HTML.
+ * @param imhtml  The GTK+ IM/HTML.
  */
 void gtk_imhtml_scroll_to_end(GtkIMHtml *imhtml);
 
 /**
- * Purges the contents from a GTK IM/HTML and resets formatting.
+ * Purges the contents from a GTK+ IM/HTML and resets formatting.
  *
- * @param imhtml  The GTK IM/HTML.
+ * @param imhtml  The GTK+ IM/HTML.
  */
 void gtk_imhtml_clear(GtkIMHtml *imhtml);
 
 /**
- * Scrolls a GTK IM/HTML up by one page.
+ * Scrolls a GTK+ IM/HTML up by one page.
  *
- * @param imhtml  The GTK IM/HTML.
+ * @param imhtml  The GTK+ IM/HTML.
  */
 void gtk_imhtml_page_up(GtkIMHtml *imhtml);
 
 /**
- * Scrolls a GTK IM/HTML down by one page.
+ * Scrolls a GTK+ IM/HTML down by one page.
  *
- * @param imhtml  The GTK IM/HTML.
+ * @param imhtml  The GTK+ IM/HTML.
  */
 void gtk_imhtml_page_down(GtkIMHtml *imhtml);
 
 /**
- * Creates and returns an new GTK IM/HTML scalable object.
+ * Creates and returns an new GTK+ IM/HTML scalable object.
  *
  * @return A new IM/HTML Scalable object.
  */
 GtkIMHtmlScalable *gtk_imhtml_scalable_new();
 
 /**
- * Creates and returns an new GTK IM/HTML scalable object with an image.
+ * Creates and returns an new GTK+ IM/HTML scalable object with an image.
  *
  * @param img      A GdkPixbuf of the image to add.
  * @param filename The filename to associate with the image.
@@ -386,67 +386,67 @@
 GtkIMHtmlScalable *gtk_imhtml_image_new(GdkPixbuf *img, const gchar *filename, int id);
 
 /**
- * Destroys and frees a GTK IM/HTML scalable image.
+ * Destroys and frees a GTK+ IM/HTML scalable image.
  *
- * @param scale The GTK IM/HTML scalable.
+ * @param scale The GTK+ IM/HTML scalable.
  */
 void gtk_imhtml_image_free(GtkIMHtmlScalable *scale);
 
 /**
- * Rescales a GTK IM/HTML scalable image to a given size.
+ * Rescales a GTK+ IM/HTML scalable image to a given size.
  *
- * @param scale  The GTK IM/HTML scalable.
+ * @param scale  The GTK+ IM/HTML scalable.
  * @param width  The new width.
  * @param height The new height.
  */
 void gtk_imhtml_image_scale(GtkIMHtmlScalable *scale, int width, int height);
 
 /**
- * Adds a GTK IM/HTML scalable image to a given GTK IM/HTML at a given iter.
+ * Adds a GTK+ IM/HTML scalable image to a given GTK+ IM/HTML at a given iter.
  *
- * @param scale  The GTK IM/HTML scalable.
- * @param imhtml The GTK IM/HTML.
+ * @param scale  The GTK+ IM/HTML scalable.
+ * @param imhtml The GTK+ IM/HTML.
  * @param iter   The GtkTextIter at which to add the scalable.
  */
 void gtk_imhtml_image_add_to(GtkIMHtmlScalable *scale, GtkIMHtml *imhtml, GtkTextIter *iter);
 
 /**
- * Creates and returns an new GTK IM/HTML scalable with a horizontal rule.
+ * Creates and returns an new GTK+ IM/HTML scalable with a horizontal rule.
  *
  * @return A new IM/HTML Scalable object with an image.
  */
 GtkIMHtmlScalable *gtk_imhtml_hr_new();
 
 /**
- * Destroys and frees a GTK IM/HTML scalable horizontal rule.
+ * Destroys and frees a GTK+ IM/HTML scalable horizontal rule.
  *
- * @param scale The GTK IM/HTML scalable.
+ * @param scale The GTK+ IM/HTML scalable.
  */
 void gtk_imhtml_hr_free(GtkIMHtmlScalable *scale);
 
 /**
- * Rescales a GTK IM/HTML scalable horizontal rule to a given size.
+ * Rescales a GTK+ IM/HTML scalable horizontal rule to a given size.
  *
- * @param scale  The GTK IM/HTML scalable.
+ * @param scale  The GTK+ IM/HTML scalable.
  * @param width  The new width.
  * @param height The new height.
  */
 void gtk_imhtml_hr_scale(GtkIMHtmlScalable *scale, int width, int height);
 
 /**
- * Adds a GTK IM/HTML scalable horizontal rule to a given GTK IM/HTML at
+ * Adds a GTK+ IM/HTML scalable horizontal rule to a given GTK+ IM/HTML at
  * a given iter.
  *
- * @param scale  The GTK IM/HTML scalable.
- * @param imhtml The GTK IM/HTML.
+ * @param scale  The GTK+ IM/HTML scalable.
+ * @param imhtml The GTK+ IM/HTML.
  * @param iter   The GtkTextIter at which to add the scalable.
  */
 void gtk_imhtml_hr_add_to(GtkIMHtmlScalable *scale, GtkIMHtml *imhtml, GtkTextIter *iter);
 
 /**
- * Finds and highlights a given string in a GTK IM/HTML.
+ * Finds and highlights a given string in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param text   The string to search for.
  *
  * @return @c TRUE if a search was performed, or @c FALSE if not.
@@ -454,42 +454,42 @@
 gboolean gtk_imhtml_search_find(GtkIMHtml *imhtml, const gchar *text);
 
 /**
- * Clears the highlighting from a prior search in a GTK IM/HTML.
+ * Clears the highlighting from a prior search in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  */
 void gtk_imhtml_search_clear(GtkIMHtml *imhtml);
 
 /**
- * Enables or disables editing in a GTK IM/HTML.
+ * Enables or disables editing in a GTK+ IM/HTML.
  *
- * @param imhtml   The GTK IM/HTML.
+ * @param imhtml   The GTK+ IM/HTML.
  * @param editable @c TRUE to make the widget editable, or @c FALSE otherwise.
  */
 void gtk_imhtml_set_editable(GtkIMHtml *imhtml, gboolean editable);
 
 /**
- * Enables or disables whole buffer formatting only (wbfo) in a GTK IM/HTML.
+ * Enables or disables whole buffer formatting only (wbfo) in a GTK+ IM/HTML.
  * In this mode formatting options to the buffer take effect for the entire
  * buffer instead of specific text.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param wbfo   @c TRUE to enable the mode, or @c FALSE otherwise.
  */
 void gtk_imhtml_set_whole_buffer_formatting_only(GtkIMHtml *imhtml, gboolean wbfo);
 
 /**
- * Indicates which formatting functions to enable and disable in a GTK IM/HTML.
+ * Indicates which formatting functions to enable and disable in a GTK+ IM/HTML.
  *
- * @param imhtml  The GTK IM/HTML.
+ * @param imhtml  The GTK+ IM/HTML.
  * @param buttons A GtkIMHtmlButtons bitmask indicating which functions to use.
  */
 void gtk_imhtml_set_format_functions(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons);
 
 /**
- * Returns which formatting functions are enabled in a GTK IM/HTML.
+ * Returns which formatting functions are enabled in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return A GtkIMHtmlButtons bitmask indicating which functions to are enabled.
  */
@@ -497,9 +497,9 @@
 
 /**
  * Sets each boolean to TRUE if that formatting option is enabled at the
- * current position in a GTK IM/HTML.
+ * current position in a GTK+ IM/HTML.
  *
- * @param imhtml    The GTK IM/HTML.
+ * @param imhtml    The GTK+ IM/HTML.
  * @param bold      A reference to a boolean for bold.
  * @param italic    A reference to a boolean for italic.
  * @param underline A reference to a boolean for underline.
@@ -508,9 +508,9 @@
 
 /**
  * Returns a string containing the selected font face at the current position
- * in a GTK IM/HTML.
+ * in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return A string containg the font face or @c NULL if none is set.
  */
@@ -518,9 +518,9 @@
 
 /**
  * Returns a string containing the selected foreground color at the current
- * position in a GTK IM/HTML.
+ * position in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return A string containg the foreground color or @c NULL if none is set.
  */
@@ -528,9 +528,9 @@
 
 /**
  * Returns a string containing the selected font background color at the current
- * position in a GTK IM/HTML.
+ * position in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return A string containg the font background color or @c NULL if none is set.
  */
@@ -538,9 +538,9 @@
 
 /**
  * Returns a string containing the selected background color at the current
- * position in a GTK IM/HTML.
+ * position in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return A string containg the background color or @c NULL if none is set.
  */
@@ -548,54 +548,54 @@
 
 /**
  * Returns a integer containing the selected HTML font size at the current
- * position in a GTK IM/HTML.
+ * position in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return The HTML font size.
  */
 gint gtk_imhtml_get_current_fontsize(GtkIMHtml *imhtml);
 
 /**
- * Checks whether a GTK IM/HTML is marked as editable.
+ * Checks whether a GTK+ IM/HTML is marked as editable.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return @c TRUE if the IM/HTML is editable, or @c FALSE otherwise.
  */
 gboolean gtk_imhtml_get_editable(GtkIMHtml *imhtml);
 
 /**
- * Toggles bold at the cursor location or selection in a GTK IM/HTML.
+ * Toggles bold at the cursor location or selection in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return @c TRUE if bold was turned on, or @c FALSE if it was turned off.
  */
 gboolean gtk_imhtml_toggle_bold(GtkIMHtml *imhtml);
 
 /**
- * Toggles italic at the cursor location or selection in a GTK IM/HTML.
+ * Toggles italic at the cursor location or selection in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return @c TRUE if italic was turned on, or @c FALSE if it was turned off.
  */
 gboolean gtk_imhtml_toggle_italic(GtkIMHtml *imhtml);
 
 /**
- * Toggles underline at the cursor location or selection in a GTK IM/HTML.
+ * Toggles underline at the cursor location or selection in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return @c TRUE if underline was turned on, or @c FALSE if it was turned off.
  */
 gboolean gtk_imhtml_toggle_underline(GtkIMHtml *imhtml);
 
 /**
- * Toggles strikethrough at the cursor location or selection in a GTK IM/HTML.
+ * Toggles strikethrough at the cursor location or selection in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return @c TRUE if strikethrough was turned on, or @c FALSE if it was turned off.
  */
@@ -605,7 +605,7 @@
  * Toggles a foreground color at the current location or selection in a GTK
  * IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param color  The HTML-style color, or @c NULL or "" to clear the color.
  *
  * @return @c TRUE if a color was set, or @c FALSE if it was cleared.
@@ -616,7 +616,7 @@
  * Toggles a background color at the current location or selection in a GTK
  * IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param color  The HTML-style color, or @c NULL or "" to clear the color.
  *
  * @return @c TRUE if a color was set, or @c FALSE if it was cleared.
@@ -627,7 +627,7 @@
  * Toggles a background color at the current location or selection in a GTK
  * IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param color  The HTML-style color, or @c NULL or "" to clear the color.
  *
  * @return @c TRUE if a color was set, or @c FALSE if it was cleared.
@@ -635,9 +635,9 @@
 gboolean gtk_imhtml_toggle_background(GtkIMHtml *imhtml, const char *color);
 
 /**
- * Toggles a font face at the current location or selection in a GTK IM/HTML.
+ * Toggles a font face at the current location or selection in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param face   The font face name, or @c NULL or "" to clear the font.
  *
  * @return @c TRUE if a font name was set, or @c FALSE if it was cleared.
@@ -646,17 +646,17 @@
 
 /**
  * Toggles a link tag with the given URL at the current location or selection
- * in a GTK IM/HTML.
+ * in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param url    The URL for the link or @c NULL to terminate the link.
  */
 void gtk_imhtml_toggle_link(GtkIMHtml *imhtml, const char *url);
 
 /**
- * Inserts a link to the given url at the given GtkTextMark in a GTK IM/HTML.
+ * Inserts a link to the given url at the given GtkTextMark in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param mark   The GtkTextMark to insert the link at.
  * @param url    The URL for the link.
  * @param text   The string to use for the link description.
@@ -664,17 +664,17 @@
 void gtk_imhtml_insert_link(GtkIMHtml *imhtml, GtkTextMark *mark, const char *url, const char *text);
 
 /**
- * Inserts a smiley at the current location or selection in a GTK IM/HTML.
+ * Inserts a smiley at the current location or selection in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param sml    The category of the smiley.
  * @param smiley The text of the smiley to insert.
  */
 void gtk_imhtml_insert_smiley(GtkIMHtml *imhtml, const char *sml, char *smiley);
 /**
- * Inserts a smiley at the given iter in a GTK IM/HTML.
+ * Inserts a smiley at the given iter in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param sml    The category of the smiley.
  * @param smiley The text of the smiley to insert.
  * @param iter   The GtkTextIter in the IM/HTML to insert the smiley at.
@@ -683,18 +683,18 @@
 
 /**
  * Inserts the IM/HTML scalable image with the given id at the given iter in a
- * GTK IM/HTML.
+ * GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param id     The id of the IM/HTML scalable.
  * @param iter   The GtkTextIter in the IM/HTML to insert the image at.
  */
 void gtk_imhtml_insert_image_at_iter(GtkIMHtml *imhtml, int id, GtkTextIter *iter);
 
 /**
- * Sets the font size at the current location or selection in a GTK IM/HTML.
+ * Sets the font size at the current location or selection in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param size   The HTML font size to use.
  */
 void gtk_imhtml_font_set_size(GtkIMHtml *imhtml, gint size);
@@ -703,7 +703,7 @@
  * Decreases the font size by 1 at the current location or selection in a GTK
  * IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  */
 void gtk_imhtml_font_shrink(GtkIMHtml *imhtml);
 
@@ -711,14 +711,14 @@
  * Increases the font size by 1 at the current location or selection in a GTK
  * IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  */
 void gtk_imhtml_font_grow(GtkIMHtml *imhtml);
 
 /**
- * Returns the HTML formatted contents between two iters in a GTK IM/HTML.
+ * Returns the HTML formatted contents between two iters in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param start  The GtkTextIter indicating the start point in the IM/HTML.
  * @param end    The GtkTextIter indicating the end point in the IM/HTML.
  *
@@ -727,9 +727,9 @@
 char *gtk_imhtml_get_markup_range(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end);
 
 /**
- * Returns the entire HTML formatted contents of a GTK IM/HTML.
+ * Returns the entire HTML formatted contents of a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return A string containing the HTML formatted text.
  */
@@ -739,17 +739,17 @@
  * Returns a null terminated array of pointers to null terminated strings, each
  * string for each line.  g_strfreev() should be called to free it when done.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  *
  * @return A null terminated array of null terminated HTML formatted strings.
  */
 char **gtk_imhtml_get_markup_lines(GtkIMHtml *imhtml);
 
 /**
- * Returns the entire unformatted (plain text) contents of a GTK IM/HTML
- * between two iters in a GTK IM/HTML.
+ * Returns the entire unformatted (plain text) contents of a GTK+ IM/HTML
+ * between two iters in a GTK+ IM/HTML.
  *
- * @param imhtml The GTK IM/HTML.
+ * @param imhtml The GTK+ IM/HTML.
  * @param start  The GtkTextIter indicating the start point in the IM/HTML.
  * @param stop   The GtkTextIter indicating the end point in the IM/HTML.
  *
diff -r 290131d5f626 -r 364a2ef907ae src/gtkimhtmltoolbar.c
--- a/src/gtkimhtmltoolbar.c	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkimhtmltoolbar.c	Mon Apr 11 12:24:47 2005 +0000
@@ -942,7 +942,7 @@
 	G_OBJECT_CLASS(parent_class)->finalize (object);
 }
 
-/* Boring GTK stuff */
+/* Boring GTK+ stuff */
 static void gtk_imhtmltoolbar_class_init (GtkIMHtmlToolbarClass *class)
 {
 	GtkObjectClass *object_class;
diff -r 290131d5f626 -r 364a2ef907ae src/gtksavedstatuses.c
--- a/src/gtksavedstatuses.c	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtksavedstatuses.c	Mon Apr 11 12:24:47 2005 +0000
@@ -853,7 +853,7 @@
 
 
 /**************************************************************************
-* GTK saved status glue
+* GTK+ saved status glue
 **************************************************************************/
 
 void *
diff -r 290131d5f626 -r 364a2ef907ae src/gtkstatusselector.c
--- a/src/gtkstatusselector.c	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/gtkstatusselector.c	Mon Apr 11 12:24:47 2005 +0000
@@ -159,7 +159,7 @@
 	gtk_box_pack_start(GTK_BOX(selector), combo, FALSE, FALSE, 0);
 
 
-#else /* GTK < 2.4.0 */
+#else /* GTK+ < 2.4.0 */
 	selector->priv->optmenu = optmenu = gtk_option_menu_new();
 	gtk_widget_show(optmenu);
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/albanian.nsh
--- a/src/win32/nsis/translations/albanian.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/albanian.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Një grup mjetesh shumëplatformësh për GUI, përdorur nga Gaim-i"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Temat GTK+ mund të ndryshojnë pamjen dhe sjelljen e zbatimeve GTK+."
 !define GTK_NO_THEME_DESC			"Mos instalo temë GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) është një temë GTK që ndërthuret mirë mjedisin Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) është një temë GTK+ që ndërthuret mirë mjedisin Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/bulgarian.nsh
--- a/src/win32/nsis/translations/bulgarian.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/bulgarian.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -23,7 +23,7 @@
 !define GTK_SECTION_DESCRIPTION		"�������������� ��� �� �������� ������, ��������� �� Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ ������ ����� �� �������� ������� �� GTK+ ����������."
 !define GTK_NO_THEME_DESC			"�� ������������ GTK+ ����"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � GTK ���� ����� �� ������ ����� ��� Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � GTK+ ���� ����� �� ������ ����� ��� Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve ������."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue ������."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/catalan.nsh
--- a/src/win32/nsis/translations/catalan.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/catalan.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Una eina IGU multiplataforma, utilitzada per Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes can change the look and feel of GTK+ applications."
 !define GTK_NO_THEME_DESC			"No instal.lis un tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Imwi (imitador Windows) �s un tema GTK que s'integra perfectament en un entorn d'escriptori Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Imwi (imitador Windows) �s un tema GTK+ que s'integra perfectament en un entorn d'escriptori Windows."
 !define GTK_BLUECURVE_THEME_DESC		"El tema Corba Blava."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/czech.nsh
--- a/src/win32/nsis/translations/czech.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/czech.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Multi-platform GUI toolkit pou��van� Gaimem"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ t�mata umo��uj� m�nit vzhled a zp�sob ovl�d�n� GTK+ aplikac�."
 !define GTK_NO_THEME_DESC			"Neinstalovat GTK+ t�ma"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK t�ma kter� zapadne do Va�eho pracovn�ho prost�ed� ve Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK+ t�ma kter� zapadne do Va�eho pracovn�ho prost�ed� ve Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve t�ma."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue t�ma."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/danish.nsh
--- a/src/win32/nsis/translations/danish.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/danish.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Et multi-platform grafisk interface udviklingsv�rkt�j, bruges af Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Temaer kan �ndre GTK+ programmers generelle udseende."
 !define GTK_NO_THEME_DESC			"Install�r ikke noget GTK+ tema"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows efterligner) er et GTK tema som falder i med Windows skrivebordsmilj�et."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows efterligner) er et GTK+ tema som falder i med Windows skrivebordsmilj�et."
 !define GTK_BLUECURVE_THEME_DESC		"The Bluecurve tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue tema."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/english.nsh
--- a/src/win32/nsis/translations/english.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/english.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -32,7 +32,7 @@
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Gaim"
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes can change the look and feel of GTK+ applications."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_DESC			"Don't install a GTK+ theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK+ theme that blends well into the Windows desktop environment."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC		"The Bluecurve theme."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/finnish.nsh
--- a/src/win32/nsis/translations/finnish.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/finnish.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Monipohjainen GUI (k�ytt�j�ulkoasu) ty�kalupakki, Gaimin k�ytt�m�"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teemat voivat muuttaa GTK+ ohjelmien ulkon�k�� ja tuntua."
 !define GTK_NO_THEME_DESC			"�l� asenna GTK+ teemoja"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windowsiin mukautuminen) on GTK teema joka sulautuu hyvin Windowsin ymp�rist��n."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windowsiin mukautuminen) on GTK+ teema joka sulautuu hyvin Windowsin ymp�rist��n."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve teema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue teema."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/german.nsh
--- a/src/win32/nsis/translations/german.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/german.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -29,7 +29,7 @@
 !define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform GUI Toolkit, verwendet von Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themen k�nnen Aussehen und Bedienung von GTK+ Anwendungen ver�ndern."
 !define GTK_NO_THEME_DESC			"Installiere kein GTK+ Thema"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK Theme, da� sich besonders gut in den Windows Desktop integriert."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK+ Theme, da� sich besonders gut in den Windows Desktop integriert."
 !define GTK_BLUECURVE_THEME_DESC		"Das Bluecurve Thema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Das Lighthouseblue Thema."
  
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/hungarian.nsh
--- a/src/win32/nsis/translations/hungarian.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/hungarian.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -22,7 +22,7 @@
 !define GTK_SECTION_DESCRIPTION		"Gaim �ltal haszn�lt t�bb-platformos grafikus k�rnyezet"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ t�m�k megv�ltoztatj�k a GTK+ alkalmaz�sok kin�zet�t."
 !define GTK_NO_THEME_DESC			"Ne install�lja a GTK+ t�m�kat"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows ut�nzat) egy Windows k�rnyezettel harmoniz�l� GTK t�ma."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows ut�nzat) egy Windows k�rnyezettel harmoniz�l� GTK+ t�ma."
 !define GTK_BLUECURVE_THEME_DESC		"A Bluecurve t�ma."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"A Lighthouseblue t�ma."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/italian.nsh
--- a/src/win32/nsis/translations/italian.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/italian.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"I temi GTK+ modificano l'aspetto delle applicazioni GTK+."
 !define GTK_NO_THEME_DESC			"Non installare nessun tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � un tema GTK che si adatta bene all'aspetto di Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � un tema GTK+ che si adatta bene all'aspetto di Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Il tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Il tema Lighthouseblue."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/korean.nsh
--- a/src/win32/nsis/translations/korean.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/korean.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -22,7 +22,7 @@
 !define GTK_SECTION_DESCRIPTION		"������ ����ϴ� ��Ƽ �÷��� GUI ��Ŷ"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ �׸��� GTK+ ���α׷��� ������� �ٲ� �� �ֽ��ϴ�."
 !define GTK_NO_THEME_DESC			"GTK+ �׸��� ��ġ���� �ʽ��ϴ�."
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)�� ������ ����ũž ȯ�濡 �� ��ȭ�Ǵ� GTK �׸��Դϴ�."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)�� ������ ����ũž ȯ�濡 �� ��ȭ�Ǵ� GTK+ �׸��Դϴ�."
 !define GTK_BLUECURVE_THEME_DESC		"����Ŀ�� �׸�."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/polish.nsh
--- a/src/win32/nsis/translations/polish.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/polish.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Wieloplatformowe narz�dzie GUI, u�ywane w Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Tematy GTK+ mog� zmieni� wygl�d i dzia�anie aplikacji GTK+ ."
 !define GTK_NO_THEME_DESC			"Nie instaluj temat�w GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) to temat GTK kt�ry doskonale wkomponowuje si� w �rodowisko systemu Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) to temat GTK+ kt�ry doskonale wkomponowuje si� w �rodowisko systemu Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Temat The Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Temat Lighthouseblue."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/portuguese-br.nsh
--- a/src/win32/nsis/translations/portuguese-br.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/portuguese-br.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas multi-plataforma para interface do usu�rio, usado pelo Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a apar�ncia e o funcionamento dos aplicativos GTK+."
 !define GTK_NO_THEME_DESC			"N�o instalar um tema do GTK+"
-!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK que combina bem com o ambiente de �rea de trabalho do Windows."
+!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK+ que combina bem com o ambiente de �rea de trabalho do Windows."
 !define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/portuguese.nsh
--- a/src/win32/nsis/translations/portuguese.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/portuguese.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas de interface gr�fica multi-plataforma, usado pelo Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a apar�ncia dos programas GTK+."
 !define GTK_NO_THEME_DESC			"N�o instalar um tema do GTK+"
-!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK que combina bem com o ambiente de trabalho do Windows."
+!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK+ que combina bem com o ambiente de trabalho do Windows."
 !define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/romanian.nsh
--- a/src/win32/nsis/translations/romanian.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/romanian.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -22,7 +22,7 @@
 !define GTK_SECTION_DESCRIPTION		"Un mediu de dezvoltare multiplatform� utilizat de Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Temele GTK+ schimb� aparen�a aplica�iilor GTK+."
 !define GTK_NO_THEME_DESC			"Nu instala o tem� GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp este o tem� GTK �n acord cu mediul Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp este o tem� GTK+ �n acord cu mediul Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/serbian-latin.nsh
--- a/src/win32/nsis/translations/serbian-latin.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/serbian-latin.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -22,7 +22,7 @@
 !define GTK_SECTION_DESCRIPTION		"Skup oru�a za grafi�ko okru�enje, za vi�e platformi, koristi ga Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teme menjaju izgled i na�in rada GTK+ aplikacija."
 !define GTK_NO_THEME_DESC			"Ne instaliraj GTK+ temu"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitator) je GTK tema koja se dobro uklapa u Windows radno okru�enje."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitator) je GTK+ tema koja se dobro uklapa u Windows radno okru�enje."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue tema."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/simp-chinese.nsh
--- a/src/win32/nsis/translations/simp-chinese.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/simp-chinese.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Gaim ���õĶ�ƽ̨ GUI ���߰�"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ ������Ը��� GTK+ ����Ĺ۸С�"
 !define GTK_NO_THEME_DESC			"����װ GTK+ ����"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)�� is a GTK theme that blends well into the Windows desktop environment."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)�� is a GTK+ theme that blends well into the Windows desktop environment."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve ���⡣"
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue ���⡣"
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/slovak.nsh
--- a/src/win32/nsis/translations/slovak.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/slovak.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -26,7 +26,7 @@
 !define GTK_SECTION_DESCRIPTION		"Multiplatformov� GUI n�stroje, pou��van� Gaim-om"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Pomocou GTK+ grafick�ch t�m m��ete zmeni� vzh�ad GTK+ aplik�ci�."
 !define GTK_NO_THEME_DESC			"Nein�talova� GTK+ grafick� t�mu"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK grafick� t�ma, ktor� pekne lad� s prostred�m Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK+ grafick� t�ma, ktor� pekne lad� s prostred�m Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve grafick� t�ma."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue grafick� t�ma"
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/spanish.nsh
--- a/src/win32/nsis/translations/spanish.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/spanish.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Una suite de herramientas GUI multiplataforma, utilizada por Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Los temas pueden cambiar la apariencia de aplicaciones GTK+."
 !define GTK_NO_THEME_DESC			"No instalar un tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) es un tema GTK que se fusiona muy bien con el entorno de escritorio de Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) es un tema GTK+ que se fusiona muy bien con el entorno de escritorio de Windows."
 !define GTK_BLUECURVE_THEME_DESC		"El tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"El tema Lighthouseblue."
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/trad-chinese.nsh
--- a/src/win32/nsis/translations/trad-chinese.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/trad-chinese.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Gaim �ҨϥΪ��󥭥x�ϧΤ����禡�w"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ �G���D�D�i�H�Ψӧ��� GTK+ ���ε{�����~�[�C"
 !define GTK_NO_THEME_DESC			"���w�� GTK+ �G���D�D"
-!define GTK_WIMP_THEME_DESC			"�uGTK-Wimp�v(Windows impersonator) �D�D�i�� GTK �ĤJ Windows �������������C"
+!define GTK_WIMP_THEME_DESC			"�uGTK-Wimp�v(Windows impersonator) �D�D�i�� GTK+ �ĤJ Windows �������������C"
 !define GTK_BLUECURVE_THEME_DESC		"�uBluecurve�v�D�D"
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"�uLighthouseblue�v�D�D�C"
 
diff -r 290131d5f626 -r 364a2ef907ae src/win32/nsis/translations/vietnamese.nsh
--- a/src/win32/nsis/translations/vietnamese.nsh	Mon Apr 11 12:11:11 2005 +0000
+++ b/src/win32/nsis/translations/vietnamese.nsh	Mon Apr 11 12:24:47 2005 +0000
@@ -28,7 +28,7 @@
 !define GTK_SECTION_DESCRIPTION		"Bộ công cụ giao diện đồ họa đa nền để dùng cho Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes có thể thay đổi diệm mạo và sác thái của các ứng dụng GTK+."
 !define GTK_NO_THEME_DESC			"Không cài đặt GTK+ theme"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) là một GTK theme tích hợp tốt trong môi trường desktop của Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) là một GTK+ theme tích hợp tốt trong môi trường desktop của Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve theme."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue theme."