[gaim-migrate @ 2549]

I got an itty bitty diff for you now ;-)

20 files changed, 125 insertions, 125 deletions

diff --git a/ChangeLog b/ChangeLog
index 43bc69816e..2ab5c3c086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-GAIM: The Pimpin' Penguin IM Clone thats good for the soul! 
+Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
 version 0.46:
 	* New applet icons (courtesy David Raeman)
@@ -360,7 +360,7 @@ version 0.9.18 (06/02/2000):
 	  fixed.
 	* Pressing enter once again sends a message in buddy chatrooms (oops)
 	* More fixes for the change on the AOL sign-on process. 
-	* Fixed bug where GAIM sometimes doesn't find a font to use.
+	* Fixed bug where Gaim sometimes doesn't find a font to use.
 	* Per-conversation font and color dialogs (thanks fflewddur)
 	* Chat in oscar works (somewhat)
 	* Even more fixes for the sign-on process, and now you don't flash when
@@ -442,7 +442,7 @@ version 0.9.11 (03/22/2000):
 	* Better support for multiple screen names
 	* Font Properties
 	* Saving of buddylist window position 
-	* Fixed a problem with GAIM and the Netscape-branded version
+	* Fixed a problem with Gaim and the Netscape-branded version
 	  of Mozilla 
 	* New Sound Properties
 	* More General Properties
@@ -450,7 +450,7 @@ version 0.9.11 (03/22/2000):
 	* Various Random Bug fixes
 
 version 0.9.10 (11/03/1999):
-	* Fixed a nasty memory leak.  No more 40M GAIM processes. LOL
+	* Fixed a nasty memory leak.  No more 40M Gaim processes. LOL
 	* IDLE Times are displayed in a neater fashion.
  
 version 0.9.9  (10/31/1999):
@@ -473,7 +473,7 @@ version 0.9.8  (10/04/1999):
 	* Some logging fixes and improvements
 	* configurable host/port selection
 	* Clickable Links in buddy chat
-	* New GAIM Logo 
+	* New Gaim Logo 
 	* Display Signon/Signoff messages in conversation windows 
 	* Option to strip HTML from logged messages
 	* GNOME cleanups (It might work now haha)
@@ -550,5 +550,5 @@ version 0.8.0  (04/31/1999):
 	* Scroll-Wheel Mice work in Conversation Window
 	* Fixed WindowMaker Appicon 
 	* Version Number in About Box
-	* GAIM Slogan in about box :)
+	* Gaim Slogan in about box :)
 	* Created Changelog File :) 
diff --git a/NEWS b/NEWS
index 5d9ff09d05..a3834105c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
--=[ GAIM ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
+-=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
 0.45 (10/04/2001):
 	Eric: Well, it seems that the time has come for yet another
@@ -383,7 +383,7 @@
 	of work to the user interface.  It's still not in the state that I
 	would like it to be, though.  Over the next few versions you will
 	notice a few more interface changes as we try to bring a more
-	professional look to GAIM.  As always, we will stay true to our
+	professional look to Gaim.  As always, we will stay true to our
 	pimpin' penguin atittude. 
 
 	Eric: While Rob's been busy making things pretty, I've been busy
@@ -427,7 +427,7 @@
 
 0.9.18 (06/02/2000):
 	Rob: Talk about release early, release often - sheesh!  We're going
-	insane.  Ya know, I'm not too happy with the GAIM UI.  I dont know
+	insane.  Ya know, I'm not too happy with the Gaim UI.  I dont know
 	how the rest of you feel but it's time for a nice overhaul.  In the
 	next few days I'll be sitting down with some of my friends and coming
 	up with an improved interface.  I hope you all enjoy it.  It'll
@@ -530,7 +530,7 @@ support will be in 0.9.13 which is due out soon.
 0.9.11:
 	Jeramey got a new Comfy Chair! Its very very comfy!  Whee!
 Jim also had a little hyper-drunken moment and started hacking away at
-a new configuration format for GAIM.  Looks like we're running .gaimrc
+a new configuration format for Gaim.  Looks like we're running .gaimrc
 version 1 now.  Gotta love it.  I got bored and hacked in a couple font
 properties that will, in time, contain more features.  That's about it
 for this version -- cept for that memory leak we fixed.  Shush! We're
@@ -552,7 +552,7 @@ Send us beer.  We'll do better :)
 
 0.9.9:
 	Welp, All of you boys and girls who run Mandrake and have some
-problems with GAIM working properly, please check out the FAQ file.  It 
+problems with Gaim working properly, please check out the FAQ file.  It 
 contains a nice fix submitted by one of our users.  I hope this works for
 you guys!
 	Jim appears to have intoxicated himself.  This is, as always, a
@@ -573,7 +573,7 @@ with this release.  We are all a little bit happy tonight.  You must love
 life.  This is a special release of gaim.  We will be releasing some wonderful
 photographs soon .. or perhaps if we get the bloody webcam working then we
 will take a couple of quick snapshots.
-	Looks like the GAIM developers convention (cool name huh) that we
+	Looks like the Gaim developers convention (cool name huh) that we
 had this weekend in Auburn, AL went wonderfully :).  yum yum yum. Hahahah. Oh
 by the way.  Beware of insecure rednecks in the deli.  Bad things.
 	In (non)related news, Jeramey could not successfully slaughter the
diff --git a/README b/README
index bcf0ba07b6..78607470e3 100644
--- a/README
+++ b/README
@@ -44,7 +44,7 @@ for you there are several libraries that you can link gaim against.
 
 * Plugins:
 
-If you do not wish to enable the plugin support within GAIM, run the
+If you do not wish to enable the plugin support within Gaim, run the
 ./configure script with the --disable-plugins option and recompile your
 source code.  This will prevent the ability to load plugins.
 
diff --git a/STATUS b/STATUS
index e5a856116b..d31e208093 100644
--- a/STATUS
+++ b/STATUS
@@ -1,4 +1,4 @@
-STATUS of GAIM CVS tree. Last modified $Date: 2001-09-20 04:13:25 -0400 (Thu, 20 Sep 2001) $ by
+STATUS of Gaim CVS tree. Last modified $Date: 2001-10-18 08:12:38 -0400 (Thu, 18 Oct 2001) $ by
 $Author: warmenhoven $.
 
 This file is meant to provide gaim users who use the CVS version to see whether
diff --git a/doc/FAQ b/doc/FAQ
index 2c9967a23e..f64c83ff24 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,4 +1,4 @@
-GAIM: The Pimpin' Penguin IM Clone Thats Good For The Soul
+Gaim: The Pimpin' Penguin IM Clone Thats Good For The Soul
 
 1  The Basics
 	1.1  What does 'gaim' stand for?
@@ -70,8 +70,8 @@ $HOME/.gaim/YourScreenName/ (e.g. $HOME/.gaim/EWarmenhoven).
 
 1.3  What are GtkHTML and GtkIMHtml, and why not just use GNOME's GtkHTML?
 
-The widget GAIM had previously used to display HTML was called GtkHTML, and
-was written by Mark and Jim specifically for GAIM. Over time, Rob and Eric
+The widget Gaim had previously used to display HTML was called GtkHTML, and
+was written by Mark and Jim specifically for Gaim. Over time, Rob and Eric
 hacked at it (read: broke it) and it's gotten to be very fragile and fairly
 buggy.
 
@@ -81,9 +81,9 @@ it its own separate project, so that other IM clients (like Jabber clients)
 could use it. He based it somewhat off of the old GtkHTML and GNOME's GtkHTML.
 
 GNOME's GtkHTML is a very powerful HTML viewer. Because of this, it isn't
-well-suited for GAIM. It wouldn't be very good if we let you have IFrames in
+well-suited for Gaim. It wouldn't be very good if we let you have IFrames in
 your conversation, for example. Also, GNOME's GtkHTML depends on a lot of
-GNOME libraries that we don't want to force people to use in GAIM. (There is
+GNOME libraries that we don't want to force people to use in Gaim. (There is
 a strip-down version, CSCHTML, which doesn't use the GNOME libraries; but the
 first objection (that it supports too many tags) still applies.)
 
diff --git a/doc/gaim.1 b/doc/gaim.1
index e28c331a7c..cde04a51c6 100644
--- a/doc/gaim.1
+++ b/doc/gaim.1
@@ -19,9 +19,9 @@
 .\" License along with this manual; if not, write to the Free
 .\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
 .\" USA.
-.TH GAIM 1
+.TH gaim 1
 .SH NAME
-gaim v0.46 \- Instant Messaging client
+Gaim v0.46 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim \fI[options]\fR
@@ -215,7 +215,7 @@ This opens the \fBBuddy Ticker\fR, a small window in which the contents of your
 This opens a debug window into which \fBgaim\fR sends more verbose information about what it's doing.
 .TP
 .B Report Idle Times
-For protocol's that require the client to report idle times, this option sets the method of determining idle times.  If \fINone\fR is chosen, idleness will not be reported.  If \fIGAIM Use\fR is chosen, it will send idle times relative to the last time \fBgaim\fR was used.  If \fIX Use\fR is chosen, idle times will be reported based on the last time the mouse or keyboard was used.
+For protocol's that require the client to report idle times, this option sets the method of determining idle times.  If \fINone\fR is chosen, idleness will not be reported.  If \fIGaim Use\fR is chosen, it will send idle times relative to the last time \fBgaim\fR was used.  If \fIX Use\fR is chosen, idle times will be reported based on the last time the mouse or keyboard was used.
 .TP
 .B Logging
 Log all conversations will automatically log conversations into ~/.gaim/logs/.  Unless \fIStrip HTML from logs\fR is checked, they will be saved as an HTML file with a .log extension.  The preferences window provides options to specify exactly what to log.
diff --git a/doc/gaims_funniest_home_convos.txt b/doc/gaims_funniest_home_convos.txt
index 4006d404f5..e4dc1db657 100644
--- a/doc/gaims_funniest_home_convos.txt
+++ b/doc/gaims_funniest_home_convos.txt
@@ -114,7 +114,7 @@ I was going to ask him is microscopic.
 13:45:00 WinFreak : Where can I download tar xvzf gaim-0.9.5.tar.gz?  Is this for windows?
 
 
-*** This is what happens when GAIM Developers get bored.
+*** This is what happens when Gaim Developers get bored.
 
 22:39:18 RobFlynn: Umm
 22:39:19 RobFlynn: My brain is dead.
diff --git a/plugins/PERL-HOWTO b/plugins/PERL-HOWTO
index 47ef203770..96311b3c58 100644
--- a/plugins/PERL-HOWTO
+++ b/plugins/PERL-HOWTO
@@ -3,7 +3,7 @@ but there didn't seem to be a much better place.
 
 If you've ever written a perl script for X-Chat then you've basically written
 one for gaim as well. perl.c in gaim's source is basically an exact copy of
-X-Chat's perl.c file, with small modifications to suit GAIM rather than IRC.
+X-Chat's perl.c file, with small modifications to suit Gaim rather than IRC.
 
 Basically the reason for including perl is based on the experience with the
 plugins. X-Chat's docs on Perl Scripting sums it up nicely:
diff --git a/plugins/gtik.c b/plugins/gtik.c
index 140d86849c..87b56224df 100644
--- a/plugins/gtik.c
+++ b/plugins/gtik.c
@@ -607,7 +607,7 @@
 	}
 
 	char *name() {
-		return "The Gnome Stock Ticker for GAIM";
+		return "The Gnome Stock Ticker for Gaim";
 	}
 
 
diff --git a/po/de.po b/po/de.po
index 340a020ba4..112726b1e0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,4 +1,4 @@
-# German translation for "GAIM"
+# German translation for "Gaim"
 # Copyright (C) YEAR Free Software Foundation, Inc.
 #
 msgid ""
@@ -48,12 +48,12 @@ msgstr "Die Napsterregistrierung ist im Moment noch in Entwicklung"
 
 #: src/about.c:87
 #, c-format
-msgid "About GAIM v%s"
-msgstr "Über GAIM v%s"
+msgid "About Gaim v%s"
+msgstr "Über Gaim v%s"
 
 #: src/about.c:124
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
@@ -147,7 +147,7 @@ msgid "New Away Message"
 msgstr "Neue Abwesenheits-Mitteilung"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
+msgid "Can't create Gaim applet!"
 msgstr "Kann Gaim-Applet nicht erstellen"
 
 #: src/applet.c:352
@@ -1063,7 +1063,7 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
+msgid "Gaim - Add URL"
 msgstr "Gaim - Url hinzufügen"
 
 #: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
@@ -1568,7 +1568,7 @@ msgid "None"
 msgstr "Nein"
 
 #: src/prefs.c:241
-msgid "GAIM Use"
+msgid "Gaim Use"
 msgstr "von Gaim"
 
 #: src/prefs.c:243
@@ -2057,7 +2057,7 @@ msgid "Gaim - Preferences"
 msgstr "Gaim - Einstellungen"
 
 #: src/prefs.c:2459
-msgid "GAIM debug output window"
+msgid "Gaim debug output window"
 msgstr "Gaim Debug-Ausgabefenster"
 
 #: src/prefs.c:2653
diff --git a/po/es.po b/po/es.po
index 9ef77fb2d8..c56391c85a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -53,12 +53,12 @@ msgstr ""
 
 #: src/about.c:87
 #, c-format
-msgid "About GAIM v%s"
-msgstr "Sobre GAIM v%s"
+msgid "About Gaim v%s"
+msgstr "Sobre Gaim v%s"
 
 #: src/about.c:124
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
@@ -152,8 +152,8 @@ msgid "New Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "No pudo crearse el programa GAIM"
+msgid "Can't create Gaim applet!"
+msgstr "No pudo crearse el programa Gaim"
 
 #: src/applet.c:352
 msgid "About..."
@@ -1101,8 +1101,8 @@ msgid "Description"
 msgstr "Descripción"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
-msgstr "GAIM - Agregar dirección"
+msgid "Gaim - Add URL"
+msgstr "Gaim - Agregar dirección"
 
 #: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
 msgid "Select Text Color"
@@ -1154,7 +1154,7 @@ msgstr "Titulo del mensaje: "
 #: src/dialogs.c:3203
 #, fuzzy
 msgid "Use"
-msgstr "GAIM Usar"
+msgstr "Gaim Usar"
 
 #: src/dialogs.c:3207
 msgid "Save & Use"
@@ -1634,13 +1634,13 @@ msgid "None"
 msgstr ""
 
 #: src/prefs.c:241
-msgid "GAIM Use"
-msgstr "GAIM Usar"
+msgid "Gaim Use"
+msgstr "Gaim Usar"
 
 #: src/prefs.c:243
 #, fuzzy
 msgid "X Use"
-msgstr "GAIM Usar"
+msgstr "Gaim Usar"
 
 #: src/prefs.c:254
 #, fuzzy
@@ -2178,8 +2178,8 @@ msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
 #: src/prefs.c:2459
-msgid "GAIM debug output window"
-msgstr "GAIM ventana de respuestas del programa"
+msgid "Gaim debug output window"
+msgstr "Gaim ventana de respuestas del programa"
 
 #: src/prefs.c:2653
 msgid "General"
@@ -2440,8 +2440,8 @@ msgstr "%s le pide que les mande un archivo"
 #~ msgid "Make Away Now"
 #~ msgstr "Hacerme ausente ahora"
 
-#~ msgid "GAIM"
-#~ msgstr "GAIM"
+#~ msgid "Gaim"
+#~ msgstr "Gaim"
 
 #~ msgid "HTML Link:"
 #~ msgstr "Dirección:"
diff --git a/po/fr.po b/po/fr.po
index 1b7c384e03..87be7abbba 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -38,7 +38,7 @@ msgstr ""
 #: plugins/yay/yay.c:203
 #, fuzzy
 msgid "Gaim - Buddy"
-msgstr "GAIM - Ajouter un Pote"
+msgstr "Gaim - Ajouter un Pote"
 
 #: plugins/yay/yay.c:250 src/about.c:179 src/aim.c:303 src/buddy.c:2607
 #: src/buddy_chat.c:971 src/buddy_chat.c:1125 src/buddy_chat.c:1152
@@ -53,12 +53,12 @@ msgstr "Enregistrement à Napster est encore en développement"
 
 #: src/about.c:87
 #, c-format
-msgid "About GAIM v%s"
-msgstr "A propos de GAIM v%s"
+msgid "About Gaim v%s"
+msgstr "A propos de Gaim v%s"
 
 #: src/about.c:124
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
@@ -152,8 +152,8 @@ msgid "New Away Message"
 msgstr "Nouveau Message d'absence"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "Impossible de créer l'applet GAIM"
+msgid "Can't create Gaim applet!"
+msgstr "Impossible de créer l'applet Gaim"
 
 #: src/applet.c:352
 msgid "About..."
@@ -450,7 +450,7 @@ msgstr "Editer ses amis"
 
 #: src/buddy.c:2847
 msgid "Gaim - Buddy List"
-msgstr "GAIM - Liste des Potes"
+msgstr "Gaim - Liste des Potes"
 
 #: src/buddy_chat.c:104 src/oscar.c:2590 src/toc.c:1001
 msgid "Join what group:"
@@ -887,11 +887,11 @@ msgstr "Ajouter un Groupe"
 #: src/dialogs.c:921
 #, fuzzy
 msgid "Gaim - Add Group"
-msgstr "GAIM - Ajouter un Pote"
+msgstr "Gaim - Ajouter un Pote"
 
 #: src/dialogs.c:948
 msgid "Gaim - Add Buddy"
-msgstr "GAIM - Ajouter un Pote"
+msgstr "Gaim - Ajouter un Pote"
 
 #: src/dialogs.c:962
 msgid "Add Buddy"
@@ -1098,7 +1098,7 @@ msgid "Description"
 msgstr "Description"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
+msgid "Gaim - Add URL"
 msgstr "Gaim - Ajouter une adresse internet"
 
 #: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
@@ -1171,7 +1171,7 @@ msgstr "Ajouter un Pote"
 #: src/dialogs.c:3466
 #, fuzzy
 msgid "Gaim - Alias Buddy"
-msgstr "GAIM - Ajouter un Pote"
+msgstr "Gaim - Ajouter un Pote"
 
 #: src/dialogs.c:3543
 #, fuzzy
@@ -1200,7 +1200,7 @@ msgstr "Fermer"
 #: src/dialogs.c:3821
 #, fuzzy
 msgid "Gaim - Rename Group"
-msgstr "GAIM - Renommer un groupe"
+msgstr "Gaim - Renommer un groupe"
 
 #: src/dialogs.c:3831
 msgid "Rename Group"
@@ -1214,12 +1214,12 @@ msgstr "Pseudonyme:"
 #: src/dialogs.c:3909
 #, fuzzy
 msgid "Gaim - Rename Buddy"
-msgstr "GAIM - Renommer un Pote"
+msgstr "Gaim - Renommer un Pote"
 
 #: src/dialogs.c:3919
 #, fuzzy
 msgid "Rename Buddy"
-msgstr "GAIM - Renommer un Pote"
+msgstr "Gaim - Renommer un Pote"
 
 #: src/gaimrc.c:980
 #, c-format
@@ -1649,8 +1649,8 @@ msgid "None"
 msgstr "Aucune"
 
 #: src/prefs.c:241
-msgid "GAIM Use"
-msgstr "Utilisation de GAIM"
+msgid "Gaim Use"
+msgstr "Utilisation de Gaim"
 
 #: src/prefs.c:243
 #, fuzzy
@@ -2191,8 +2191,8 @@ msgid "Gaim - Preferences"
 msgstr "Gaim - Préférences"
 
 #: src/prefs.c:2459
-msgid "GAIM debug output window"
-msgstr "fenêtre de debug GAIM"
+msgid "Gaim debug output window"
+msgstr "fenêtre de debug Gaim"
 
 #: src/prefs.c:2653
 msgid "General"
@@ -2458,8 +2458,8 @@ msgstr "%s vous demande de leur envoyer un fichier"
 #~ msgid "Make Away Now"
 #~ msgstr "Etre absent maintenant"
 
-#~ msgid "GAIM"
-#~ msgstr "GAIM"
+#~ msgid "Gaim"
+#~ msgstr "Gaim"
 
 #~ msgid "HTML Link:"
 #~ msgstr "Lien HTML:"
diff --git a/po/ko.po b/po/ko.po
index caacbb316c..eaa4bfbea6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -516,18 +516,18 @@ msgstr "¼ö½Å:"
 # src/about.c:87
 #: src/about.c:96
 #, c-format
-msgid "About GAIM v%s"
-msgstr "GAIM v%s ¿¡ ´ëÇÏ¿©"
+msgid "About Gaim v%s"
+msgstr "Gaim v%s ¿¡ ´ëÇÏ¿©"
 
 # src/about.c:124
 #: src/about.c:126
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is written\n"
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
 "using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
-"GAIMÀº AOL ÇÁ·ÎÅäÄÝÀ» »ç¿ëÇÏ´Â ¸Þ½ÅÀúÀÔ´Ï´Ù. Gtk+¸¦ ÀÌ¿ëÇÏ¿© ¸¸µé¾îÁ³À¸¸ç\n"
+"GaimÀº AOL ÇÁ·ÎÅäÄÝÀ» »ç¿ëÇÏ´Â ¸Þ½ÅÀúÀÔ´Ï´Ù. Gtk+¸¦ ÀÌ¿ëÇÏ¿© ¸¸µé¾îÁ³À¸¸ç\n"
 "GPL ¶óÀ̼¾½º·Î ¹èÆ÷ÇÕ´Ï´Ù.\n"
 "\n"
 "ÀÎÅͳÝÁÖ¼Ò:"
@@ -709,8 +709,8 @@ msgstr "»õ ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö"
 
 # src/applet.c:309
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "GAIM ¾ÖÇø´À» ¸¸µé ¼ö ¾ø½À´Ï´Ù!"
+msgid "Can't create Gaim applet!"
+msgstr "Gaim ¾ÖÇø´À» ¸¸µé ¼ö ¾ø½À´Ï´Ù!"
 
 # src/applet.c:352
 #: src/applet.c:352
@@ -1086,7 +1086,7 @@ msgstr "µµ¿ò¸»"
 # src/buddy.c:2708
 #: src/buddy.c:2752
 msgid "About Gaim"
-msgstr "GAIM ˼"
+msgstr "Gaim ˼"
 
 # src/buddy.c:2727 src/prefs.c:2671
 #: src/buddy.c:2771
@@ -1969,8 +1969,8 @@ msgstr "¼³¸í"
 
 # src/dialogs.c:2381
 #: src/dialogs.c:2364
-msgid "GAIM - Add URL"
-msgstr "GAIM - URL Ãß°¡"
+msgid "Gaim - Add URL"
+msgstr "Gaim - URL Ãß°¡"
 
 # src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
 #: src/dialogs.c:2512
@@ -2359,8 +2359,8 @@ msgstr "¾Æ´Ô"
 
 # src/prefs.c:241
 #: src/prefs.c:240
-msgid "GAIM Use"
-msgstr "GAIM »ç¿ë"
+msgid "Gaim Use"
+msgstr "Gaim »ç¿ë"
 
 # src/prefs.c:243
 #: src/prefs.c:242
@@ -3004,8 +3004,8 @@ msgstr "Gaim - ¼³Á¤"
 
 # src/prefs.c:2459
 #: src/prefs.c:2323
-msgid "GAIM debug output window"
-msgstr "GAIM µð¹ö±ë Ãâ·Ââ"
+msgid "Gaim debug output window"
+msgstr "Gaim µð¹ö±ë Ãâ·Ââ"
 
 # src/prefs.c:2653
 #: src/prefs.c:2578
diff --git a/po/pl.po b/po/pl.po
index 855389acd9..ac9c313e5d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,4 +1,4 @@
-# GAIM polish translation .
+# Gaim polish translation .
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Przemys³aw Su³ek <pbs@linux.net.pl> <psulek@plo.pl>, 2001.
 #
@@ -717,18 +717,18 @@ msgstr "Odbiorca:"
 
 #: src/about.c:96
 #, c-format
-msgid "About GAIM v%s"
-msgstr "O GAIM v%s"
+msgid "About Gaim v%s"
+msgstr "O Gaim v%s"
 
 #: src/about.c:128
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written\n"
 "using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
-"GAIM jest klientem obs³uguj±cym protokó³ Instant Messenger AOL. Napisany\n"
+"Gaim jest klientem obs³uguj±cym protokó³ Instant Messenger AOL. Napisany\n"
 "z u¿yciem Gtk+ i licencjonowany wg. GPL.\n"
 "\n"
 "URL: "
@@ -879,8 +879,8 @@ msgid "New Away Message"
 msgstr "Nowy komunikat Zajêty"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "Nie mo¿na stworzyæ apletu GAIM!"
+msgid "Can't create Gaim applet!"
+msgstr "Nie mo¿na stworzyæ apletu Gaim!"
 
 #: src/applet.c:348
 msgid "About..."
@@ -1670,8 +1670,8 @@ msgid "Description"
 msgstr "Opis"
 
 #: src/dialogs.c:2225
-msgid "GAIM - Add URL"
-msgstr "GAIM - Dodaj URL"
+msgid "Gaim - Add URL"
+msgstr "Gaim - Dodaj URL"
 
 #: src/dialogs.c:2376 src/dialogs.c:2397 src/dialogs.c:2451
 msgid "Select Text Color"
@@ -1966,7 +1966,7 @@ msgid "None"
 msgstr "Brak"
 
 #: src/prefs.c:239
-msgid "GAIM Use"
+msgid "Gaim Use"
 msgstr "U¿yj Gaim"
 
 #: src/prefs.c:241
@@ -2483,8 +2483,8 @@ msgid "Gaim - Preferences"
 msgstr "Gaim - preferencje"
 
 #: src/prefs.c:2358
-msgid "GAIM debug output window"
-msgstr "GAIM okno wyj¶cia odplukswiania"
+msgid "Gaim debug output window"
+msgstr "Gaim okno wyj¶cia odplukswiania"
 
 #: src/prefs.c:2612
 msgid "General"
diff --git a/po/ru.po b/po/ru.po
index 2d2e8dcd62..1a3c90ab6d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -65,12 +65,12 @@ msgstr "òÅÇÉÓÔÒÁÃÉÑ ÎÁ ÓÅÒ×ÅÒÅ Napster ÎÁÈÏÄÉÔÓÑ ÎÁ ÓÔÁÄÉÉ ÒÁÚÒÁÂÏÔËÉ"
 
 #: src/about.c:89
 #, c-format
-msgid "About GAIM v%s"
+msgid "About Gaim v%s"
 msgstr "ï Gaim ×ÅÒÓÉÑ%s "
 
 #: src/about.c:119
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is written\n"
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
 "using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
@@ -199,8 +199,8 @@ msgid "New Away Message"
 msgstr "îÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ Ï ÏÔÓÕÔÓÔ×ÉÉ"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ GAIM ÁÐÐÌÅÔ!"
+msgid "Can't create Gaim applet!"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ Gaim ÁÐÐÌÅÔ!"
 
 #: src/applet.c:352
 msgid "About..."
@@ -1236,7 +1236,7 @@ msgid "Description"
 msgstr "ïÐÉÓÁÎÉÅ"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
+msgid "Gaim - Add URL"
 msgstr "Gaim - äÏÂÁ×ÉÔØ URL"
 
 #: src/dialogs.c:2524
@@ -1787,8 +1787,8 @@ msgid "None"
 msgstr "îÅÔ"
 
 #: src/prefs.c:241
-msgid "GAIM Use"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ GAIM"
+msgid "Gaim Use"
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ Gaim"
 
 #: src/prefs.c:243
 msgid "X Use"
@@ -2304,8 +2304,8 @@ msgid "Gaim - Preferences"
 msgstr "Gaim - îÁÓÔÒÏÊËÉ"
 
 #: src/prefs.c:2482
-msgid "GAIM debug output window"
-msgstr "ÏËÎÏ ÏÔÌÁÄËÉ GAIM"
+msgid "Gaim debug output window"
+msgstr "ÏËÎÏ ÏÔÌÁÄËÉ Gaim"
 
 #: src/prefs.c:2676
 msgid "General"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b7fc204750..b41665048a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,4 +1,4 @@
-# Simplified Chinese translation for GAIM.
+# Simplified Chinese translation for Gaim.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Hashao <hashao@china.com>, 2000.
 # 
@@ -53,12 +53,12 @@ msgstr ""
 
 #: src/about.c:87
 #, c-format
-msgid "About GAIM v%s"
-msgstr "¹ØÓÚ GAIM µÚ %s °æ"
+msgid "About Gaim v%s"
+msgstr "¹ØÓÚ Gaim µÚ %s °æ"
 
 #: src/about.c:124
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
@@ -152,8 +152,8 @@ msgid "New Away Message"
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "ÎÞ·¨½¨Á¢ GAIM applet!"
+msgid "Can't create Gaim applet!"
+msgstr "ÎÞ·¨½¨Á¢ Gaim applet!"
 
 #: src/applet.c:352
 msgid "About..."
@@ -1098,8 +1098,8 @@ msgid "Description"
 msgstr "ÃèÊö"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
-msgstr "GAIM - Ôö¼Ó URL"
+msgid "Gaim - Add URL"
+msgstr "Gaim - Ôö¼Ó URL"
 
 #: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
 msgid "Select Text Color"
@@ -1151,7 +1151,7 @@ msgstr "ÔÝʱÀ뿪±êÌ⣺"
 #: src/dialogs.c:3203
 #, fuzzy
 msgid "Use"
-msgstr "GAIM ʹÓÃ"
+msgstr "Gaim ʹÓÃ"
 
 #: src/dialogs.c:3207
 msgid "Save & Use"
@@ -1628,13 +1628,13 @@ msgid "None"
 msgstr ""
 
 #: src/prefs.c:241
-msgid "GAIM Use"
-msgstr "GAIM ʹÓÃ"
+msgid "Gaim Use"
+msgstr "Gaim ʹÓÃ"
 
 #: src/prefs.c:243
 #, fuzzy
 msgid "X Use"
-msgstr "GAIM ʹÓÃ"
+msgstr "Gaim ʹÓÃ"
 
 #: src/prefs.c:254
 #, fuzzy
@@ -2166,8 +2166,8 @@ msgid "Gaim - Preferences"
 msgstr "Gaim - ÓÅÏÈÉ趨"
 
 #: src/prefs.c:2459
-msgid "GAIM debug output window"
-msgstr "GAIM ³ý³æÊä³ö´°¿Ú"
+msgid "Gaim debug output window"
+msgstr "Gaim ³ý³æÊä³ö´°¿Ú"
 
 #: src/prefs.c:2653
 msgid "General"
diff --git a/src/gaim.h b/src/gaim.h
index 116f13416d..6dcbd5ab1c 100644
--- a/src/gaim.h
+++ b/src/gaim.h
@@ -129,7 +129,7 @@
 #define OPT_USR_REM_PASS	0x00000004
 #define OPT_USR_MAIL_CHECK      0x00000008
 
-#define DEFAULT_INFO "Visit the GAIM website at <A HREF=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net/</A>."
+#define DEFAULT_INFO "Visit the Gaim website at <A HREF=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net/</A>."
 
 enum log_event {
 	log_signon = 0,
diff --git a/src/list.c b/src/list.c
index 51b36ad10d..5a41ec441a 100644
--- a/src/list.c
+++ b/src/list.c
@@ -487,7 +487,7 @@ static char *remove_spaces(char *str)
 }
 
 
-/* translate an AIM 3 buddylist (*.lst) to a GAIM buddylist */
+/* translate an AIM 3 buddylist (*.lst) to a Gaim buddylist */
 static void translate_lst(FILE *src_fp, char *dest)
 {
 	char line[BUF_LEN], *line2;
@@ -520,7 +520,7 @@ static void translate_lst(FILE *src_fp, char *dest)
 }
 
 
-/* translate an AIM 4 buddylist (*.blt) to GAIM format */
+/* translate an AIM 4 buddylist (*.blt) to Gaim format */
 static void translate_blt(FILE *src_fp, char *dest)
 {
 	int i;
@@ -708,7 +708,7 @@ void do_import(struct gaim_connection *gc, char *filename)
 		buf = g_malloc(8193);
 		g_snprintf(buf, 8192, "toc_set_config {%s}\n", buf2);
 		g_free(buf2);
-		/* GAIM buddy list - no translation */
+		/* Gaim buddy list - no translation */
 	} else if (first[0] == 'm') {
 		rewind(f);
 		len = fread(buf, 1, BUF_LONG * 2, f);
diff --git a/src/prefs.c b/src/prefs.c
index 38a21ee5fd..2dc23d5b48 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -236,7 +236,7 @@ static void general_page()
 	gtk_widget_show(mbox);
 
 	idle = idle_radio(_("None"), IDLE_NONE, mbox, NULL);
-	idle = idle_radio(_("GAIM Use"), IDLE_GAIM, mbox, idle);
+	idle = idle_radio(_("Gaim Use"), IDLE_GAIM, mbox, idle);
 #ifdef USE_SCREENSAVER
 	idle = idle_radio(_("X Use"), IDLE_SCREENSAVER, mbox, idle);
 #endif
@@ -2359,7 +2359,7 @@ static void build_debug()
 		dw = g_new0(struct debug_window, 1);
 
 	dw->window = gtk_window_new(GTK_WINDOW_DIALOG);
-	gtk_window_set_title(GTK_WINDOW(dw->window), _("GAIM debug output window"));
+	gtk_window_set_title(GTK_WINDOW(dw->window), _("Gaim debug output window"));
 	gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");
 	gtk_signal_connect(GTK_OBJECT(dw->window), "delete_event", GTK_SIGNAL_FUNC(debug_delete), NULL);
 
diff --git a/src/protocols/irc/irc.c b/src/protocols/irc/irc.c
index ba206c720b..80fedd0d95 100644
--- a/src/protocols/irc/irc.c
+++ b/src/protocols/irc/irc.c
@@ -677,7 +677,7 @@ static void handle_ctcp(struct gaim_connection *gc, char *to, char *nick,
 	char buf[IRC_BUF_LEN];
 
 	if (!g_strncasecmp(msg, "VERSION", 7)) {
-		g_snprintf(buf, sizeof(buf), "NOTICE %s :\001VERSION GAIM " VERSION ": The Pimpin "
+		g_snprintf(buf, sizeof(buf), "NOTICE %s :\001VERSION Gaim " VERSION ": The Pimpin "
 					     "Penguin AIM Clone: " WEBSITE "\001\r\n", nick);
 		irc_write(id->fd, buf, strlen(buf));
 	}
@@ -899,7 +899,7 @@ static void irc_login_callback(gpointer data, gint source, GaimInputCondition co
 	hostname[sizeof(hostname) - 1] = 0;
 	if (!*hostname)
 		g_snprintf(hostname, sizeof(hostname), "localhost");
-	g_snprintf(buf, sizeof(buf), "USER %s %s %s :GAIM (%s)\r\n",
+	g_snprintf(buf, sizeof(buf), "USER %s %s %s :Gaim (%s)\r\n",
 		   g_get_user_name(), hostname, gc->user->proto_opt[USEROPT_SERV], WEBSITE);
 	if (irc_write(idata->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");
@@ -943,7 +943,7 @@ static void irc_close(struct gaim_connection *gc)
 	struct irc_data *idata = (struct irc_data *)gc->proto_data;
 	gchar buf[IRC_BUF_LEN];
 
-	g_snprintf(buf, sizeof(buf), "QUIT :Download GAIM [%s]\r\n", WEBSITE);
+	g_snprintf(buf, sizeof(buf), "QUIT :Download Gaim [%s]\r\n", WEBSITE);
 	irc_write(idata->fd, buf, strlen(buf));
 
 	g_free(idata->chantypes);