pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] CVS: gaim/src dialogs.c,1.311,1.312

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv6775/src

Modified Files:
	dialogs.c 
Log Message:
AIM 4.8 Mobile indicator by Mark "the KingAnt" Doliner.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- dialogs.c	15 Mar 2002 20:09:13 -0000	1.311
+++ dialogs.c	19 Mar 2002 06:26:04 -0000	1.312
@@ -79,6 +79,7 @@
 #include "pixmaps/dt_icon.xpm"
 #include "pixmaps/admin_icon.xpm"
 #include "pixmaps/ab.xpm"
+#include "pixmaps/wireless_icon.xpm"
 
 #define PATHSIZE 1024
 
@@ -1847,6 +1848,8 @@
 		return admin_icon_xpm;
 	if (!g_strcasecmp(url, "ab_icon.gif"))
 		return ab_xpm;
+	if (!g_strcasecmp(url, "wireless_icon.gif"))
+		return wireless_icon_xpm;
 	return NULL;
 }
 

[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.65,1.66

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/pixmaps
In directory usw-pr-cvs1:/tmp/cvs-serv6775/pixmaps

Modified Files:
	Makefile.am 
Log Message:
AIM 4.8 Mobile indicator by Mark "the KingAnt" Doliner.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- Makefile.am	15 Mar 2002 04:04:25 -0000	1.65
+++ Makefile.am	19 Mar 2002 06:26:04 -0000	1.66
@@ -111,6 +111,7 @@
 		underline.xpm			\
 		warn.xpm			\
 		wink.xpm			\
+		wireless_icon.xpm		\
 		wood.xpm			\
 		yell.xpm			
 

[Gaim-commits] CVS: gaim ChangeLog,1.419,1.420

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv6775

Modified Files:
	ChangeLog 
Log Message:
AIM 4.8 Mobile indicator by Mark "the KingAnt" Doliner.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -d -r1.419 -r1.420
--- ChangeLog	17 Mar 2002 22:25:12 -0000	1.419
+++ ChangeLog	19 Mar 2002 06:26:04 -0000	1.420
@@ -10,7 +10,9 @@
 	* Can reorder your accounts in the account editor (Thanks
 	  Luke Schierer)
 	* Updated Dutch translation
-	
+	* Shows "mobile" icon for Oscar buddies using mobile
+	  devices (Thanks Mark Doliner)
+
 version 0.54 (03/14/2002):
 	* Compiles without GdkPixbuf again
 	* GtkIMHtml will refresh when you set a new GTK+ theme
@@ -29,7 +31,7 @@
 	* Protocol specific smiley faces
 	* Italian translation added
 	* IM Image sending
-	
+
 version 0.53 (02/28/2002):
 	* Updated Polish Translation (thanks Przemyslaw Sulek)
 	* Slovak translation added (Thanks Daniel Rezny)

[Gaim-commits] CVS: gaim/po de.po,1.32,1.33 es.po,1.18,1.19 fi.po,1.2,1.3 fr.po,1.24,1.25 it.po,1.1,1.2 ko.po,1.22,1.23 pl.po,1.8,1.9 ru.po,1.6,1.7 sk.po,1.1,1.2 sv.po,1.2,1.3 zh_CN.po,1.19,1.20

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv3537/po

Modified Files:
	de.po es.po fi.po fr.po it.po ko.po pl.po ru.po sk.po sv.po 
	zh_CN.po 
Log Message:
i dont know



Index: de.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/de.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- de.po	22 Feb 2002 23:48:22 -0000	1.32
+++ de.po	18 Mar 2002 03:43:56 -0000	1.33
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2002-02-17 12:41-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2002-01-30 22:42+0100\n"
 "Last-Translator: Karsten Weiss <kn...@gm...>\n"
 "Language-Team: de <de...@li...>\n"
@@ -180,7 +180,7 @@
 msgstr "Geschlecht"
 
[...2795 lines suppressed...]
-#: src/server.c:818
+#: src/server.c:850
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:819
+#: src/server.c:851
 msgid "No"
 msgstr "Nein"
 
-#: src/server.c:995
+#: src/server.c:1027
 msgid "More Info"
 msgstr "Mehr Informationen"
+
+#~ msgid "Play"
+#~ msgstr "Abspielen"
 
 #~ msgid "Available"
 #~ msgstr "Erreichbar"

Index: es.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/es.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- es.po	22 Feb 2002 23:48:23 -0000	1.18
+++ es.po	18 Mar 2002 03:43:56 -0000	1.19
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-02-17 12:41-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -184,7 +184,7 @@
 msgstr ""
 
[...2931 lines suppressed...]
@@ -3074,9 +3274,6 @@
 #~ msgid "Settings"
 #~ msgstr "Ajustes"
 
-#~ msgid "User Info"
-#~ msgstr "Información de Usuario"
-
 #~ msgid "Invite who?"
 #~ msgstr "Invitar a quien?"
 
@@ -3155,9 +3352,6 @@
 #, fuzzy
 #~ msgid "couldn't resolve host"
 #~ msgstr "no se pudo resolver patrón\n"
-
-#~ msgid "Load Plugin"
-#~ msgstr "Usar Aditivo"
 
 #, fuzzy
 #~ msgid "Browser Options"

Index: fi.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fi.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fi.po	22 Feb 2002 23:48:23 -0000	1.2
+++ fi.po	18 Mar 2002 03:43:56 -0000	1.3
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.50\n"
-"POT-Creation-Date: 2002-02-17 12:41-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2002-01-03 22:17+0200\n"
 "Last-Translator: Tero Kuusela <te...@ya...>\n"
 "Language-Team: Finnish <fi...@li...>\n"
@@ -172,7 +172,7 @@
 msgstr "Sukupuoli"
 
[...2782 lines suppressed...]
-#: src/server.c:747
+#: src/server.c:757
 msgid "Warned"
 msgstr "Varoitettu"
 
-#: src/server.c:818
+#: src/server.c:850
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/server.c:819
+#: src/server.c:851
 msgid "No"
 msgstr "Ei"
 
-#: src/server.c:995
+#: src/server.c:1027
 #, fuzzy
 msgid "More Info"
 msgstr "Hae tiedot"

Index: fr.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fr.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- fr.po	22 Feb 2002 23:48:23 -0000	1.24
+++ fr.po	18 Mar 2002 03:43:56 -0000	1.25
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2002-02-17 12:41-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2001-12-27 22:26-0700\n"
 "Last-Translator: Sebfrance\n"
 "MIME-Version: 1.0\n"
@@ -185,7 +185,7 @@
 msgstr ""
 
[...2971 lines suppressed...]
 
-#~ msgid "New User Registration"
-#~ msgstr "Enregistrement d'un nouvel utilisateur"
-
-#~ msgid "Register new user for"
-#~ msgstr "Enregistrer le nouvel utilisateur pour"
-
 #, fuzzy
 #~ msgid "Gaim - Select File"
 #~ msgstr "Gaim - Sélectionner le fichier"
@@ -3243,9 +3439,6 @@
 #, fuzzy
 #~ msgid "couldn't resolve host"
 #~ msgstr "incapable de résoudre l'adresse\n"
-
-#~ msgid "Load Plugin"
-#~ msgstr "Charger le Plugin"
 
 #, fuzzy
 #~ msgid "Browser Options"

Index: it.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/it.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- it.po	14 Mar 2002 02:49:18 -0000	1.1
+++ it.po	18 Mar 2002 03:43:56 -0000	1.2
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.53\n"
-"POT-Creation-Date: 2002-03-01 23:55-0500\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2002-03-13 19:26+0100\n"
 "Last-Translator: Salvatore di Maggio <tit...@li...>\n"
 "Language-Team: Italian <it...@li...>\n"
@@ -13,35 +13,6 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
[...2696 lines suppressed...]
+#~ msgid "Invisible"
+#~ msgstr "Invisibile"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "Invisibile solo per gli amici"
+
+#~ msgid "Unavailable"
+#~ msgstr "Occupato"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim su irc.openprojects.net"
+
+#~ msgid "Play"
+#~ msgstr "Suona"

Index: ko.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/ko.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ko.po	22 Feb 2002 23:48:23 -0000	1.22
+++ ko.po	18 Mar 2002 03:43:57 -0000	1.23
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-02-17 12:41-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2001-11-07 16:22+0900\n"
 "Last-Translator: ÀÌÈ£¼® <al...@de...>\n"
 "Language-Team: artsilly and alee team <>\n"
@@ -190,7 +190,7 @@
 
 # src/dialogs.c:1437 src/dialogs.c:2146
[...3221 lines suppressed...]
 msgstr "°æ°í¹Þ¾Ò½À´Ï´Ù"
 
 # src/server.c:781
-#: src/server.c:818
+#: src/server.c:850
 msgid "Yes"
 msgstr "³×"
 
 # src/server.c:782
-#: src/server.c:819
+#: src/server.c:851
 msgid "No"
 msgstr "¾Æ´Ï¿ä"
 
 # plugins/icq/gaim_icq.c:442 src/oscar.c:2895 src/toc.c:1031
-#: src/server.c:995
+#: src/server.c:1027
 #, fuzzy
 msgid "More Info"
 msgstr "Á¤º¸ °¡Á®¿À±â"

Index: pl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/pl.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pl.po	20 Feb 2002 01:05:53 -0000	1.8
+++ pl.po	18 Mar 2002 03:43:57 -0000	1.9
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.52\n"
-"POT-Creation-Date: 2002-02-17 20:13+0000\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2002-02-19 9:30+0200\n"
 "Last-Translator: Przemys³aw Su³ek <pb...@li...>\n"
 "Language-Team: POLISH <pl...@li...>\n"
@@ -13,35 +13,6 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
[...2906 lines suppressed...]
-#~ "Zapisz siê. Gdy ju¿ jeste¶ dostêpny, mo¿esz porozmawiaæ z którym¶ z "
-#~ "twórców w celu uzyskania wiêkszej ilo¶ci pomocnych rad; informacje na ich "
-#~ "temat znajdziesz w pliku Authors w ¼ród³ach Gaim lub w "
+#~ "nowe konto. Je¶li masz ju¿ konto, wprowad¼ nazwê u¿ytkownika i has³o w okno "
+#~ "logowania, które pokazuje siê po starcie Gaim, i naci¶nij przycisk Zapisz "
+#~ "siê. Gdy ju¿ jeste¶ dostêpny, mo¿esz porozmawiaæ z którym¶ z twórców w celu "
+#~ "uzyskania wiêkszej ilo¶ci pomocnych rad; informacje na ich temat znajdziesz "
+#~ "w pliku Authors w ¼ród³ach Gaim lub w "
 
 #~ msgid ""
 #~ "contactinfo.php. If you can't get online and still need more assistance, "
 #~ "feel free to email us at ga...@ma.... Thanks for using Gaim!"
 #~ msgstr ""
-#~ "contactinfo.php. Je¶li nie jeste¶ dostêpny a wci±¿ potrzebujesz pomocy, "
-#~ "nie miej wstrêtu napisac do nas majla na adres ga...@ma.... Dziêki za "
+#~ "contactinfo.php. Je¶li nie jeste¶ dostêpny a wci±¿ potrzebujesz pomocy, nie "
+#~ "miej wstrêtu napisac do nas majla na adres ga...@ma.... Dziêki za "
 #~ "korzystanie z Gaim!"
 
 #~ msgid "Help!"

Index: ru.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ru.po	22 Feb 2002 23:48:23 -0000	1.6
+++ ru.po	18 Mar 2002 03:43:57 -0000	1.7
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2002-02-17 12:41-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2001-11-16 13:51+0400\n"
 "Last-Translator: Sergey Volozhanin <sv...@as...>\n"
 "Language-Team: RUSSIAN <RU...@li...>\n"
@@ -172,7 +172,7 @@
 msgstr "ðÏÌ"
 
[...2781 lines suppressed...]
-#: src/server.c:747
+#: src/server.c:757
 msgid "Warned"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
 
-#: src/server.c:818
+#: src/server.c:850
 msgid "Yes"
 msgstr "äÁ"
 
-#: src/server.c:819
+#: src/server.c:851
 msgid "No"
 msgstr "îÅÔ"
 
-#: src/server.c:995
+#: src/server.c:1027
 #, fuzzy
 msgid "More Info"
 msgstr "ðÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ"

Index: sk.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/sk.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sk.po	21 Feb 2002 12:59:25 -0000	1.1
+++ sk.po	18 Mar 2002 03:43:57 -0000	1.2
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2001-11-15 02:19-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2001-02-22 00:00\n"
 "Last-Translator: Daniel Re¾ný <da...@re...>\n"
 "Language-Team: SK <SK...@li...>\n"
@@ -13,447 +13,834 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
[...3834 lines suppressed...]
+#~ "their contact information is in the AUTHORS file in the Gaim source, or at "
+#~ msgstr ""
+#~ "Relac, pomoc je za rohom. Prvú vec, ktorú musíte urobi» je získa» AIM konto; "
+#~ "mo¾ete to urobi» na http://aim.aol.com. Iba kliknite na tlaèítko \"New "
+#~ "Users\" a mo¾ete konto vytvori» touto cestou. Potom ako vytvoríte Va¹e "
+#~ "konto, vpí¹te pou¾ivateµské meno a heslo do prihlasovacieho okna, ktoré sa "
+#~ "objavý po ¹tarte aplikácie Gaim, a potom kliknite na tlaèidlo Prihlási». Keï "
+#~ "ste pripojený, mô¾ete sa rozpráva» s niektorým s vývojárov Gaim-u, ak "
+#~ "potrebujete daµ¹iu pomoc; ich kontaktné informácie sú v súbore AUTHORS v "
+#~ "zdrojovom kóde Gaim-u, alebo v "
+
+#~ msgid ""
+#~ "contactinfo.php. If you can't get online and still need more assistance, "
+#~ "feel free to email us at ga...@ma.... Thanks for using Gaim!"
+#~ msgstr ""
+#~ "contactinfo.php. Ak sa nemo¾ete pripoji» a stále potrebujete daµ¹iu pomoc, "
+#~ "bez obáv po¹lite email na ga...@ma.... Ïakujeme za pou¾ívanie Gaim-u!"
+
+#~ msgid "Help!"
+#~ msgstr "Pomoc!"

Index: sv.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/sv.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sv.po	22 Feb 2002 23:48:23 -0000	1.2
+++ sv.po	18 Mar 2002 03:43:57 -0000	1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2002-02-17 12:41-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2001-12-02 19:44+0100\n"
 "Last-Translator: Christian Rose <me...@me...>\n"
 "Language-Team: Swedish <sv...@li...>\n"
@@ -174,7 +174,7 @@
 msgstr "Kön"
 
[...2786 lines suppressed...]
-#: src/server.c:747
+#: src/server.c:757
 msgid "Warned"
 msgstr "Varnad"
 
-#: src/server.c:818
+#: src/server.c:850
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:819
+#: src/server.c:851
 msgid "No"
 msgstr "Nej"
 
-#: src/server.c:995
+#: src/server.c:1027
 #, fuzzy
 msgid "More Info"
 msgstr "Hämta information"

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/zh_CN.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- zh_CN.po	23 Feb 2002 04:28:34 -0000	1.19
+++ zh_CN.po	18 Mar 2002 03:43:57 -0000	1.20
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2002-02-17 12:41-0800\n"
+"POT-Creation-Date: 2002-03-14 22:24-0800\n"
 "PO-Revision-Date: 2000-06-17 17:55+08\n"
 "Last-Translator: hashao <ha...@ch...>\n"
 "Language-Team: Simplified Chinese <zh...@li...>\n"
@@ -187,7 +187,7 @@
 msgstr ""
 
[...2830 lines suppressed...]
 
-#~ msgid "New User Registration"
-#~ msgstr "ÐÂÓû§×¢²á"
-
-#~ msgid "Register new user for"
-#~ msgstr "×¢²áеÄÓû§"
-
 #~ msgid "Gaim - Select File"
 #~ msgstr "Gaim - Ñ¡ÔñÎļþ"
 
@@ -3053,9 +3249,6 @@
 
 #~ msgid "couldn't resolve host"
 #~ msgstr "²»ÄܽâÎöÖ÷»ú\n"
-
-#~ msgid "Load Plugin"
-#~ msgstr "ÔØÈë²å¼þ"
 
 #~ msgid "Browser Options"
 #~ msgstr "Ñ¡Ïî"

[Gaim-commits] CVS: gaim/doc CREDITS,1.34,1.35

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/doc
In directory usw-pr-cvs1:/tmp/cvs-serv3537/doc

Modified Files:
	CREDITS 
Log Message:
i dont know



Index: CREDITS
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/CREDITS,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- CREDITS	14 Mar 2002 07:44:42 -0000	1.34
+++ CREDITS	18 Mar 2002 03:43:57 -0000	1.35
@@ -73,3 +73,6 @@
 A big thanks to the X-Chat developers, who were kind enough to
 license X-Chat under the GPL so that I could learn to be as cool
 as them. -EW
+
+Thanks to Jeroen van der Vegt for the initial smiley plugin and images.
+

[Gaim-commits] CVS: gaim/po nl.po,1.3,1.4

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv14882/po

Modified Files:
	nl.po 
Log Message:
updated dutch translation, thanks tux_rocker



Index: nl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/nl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nl.po	26 Nov 2001 21:55:53 -0000	1.3
+++ nl.po	17 Mar 2002 22:25:12 -0000	1.4
@@ -1,14 +1,15 @@
 # Dutch translation for "Gaim".
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) 2002  Free Software Foundation, Inc.
 # Floris Eshuis <f.e...@hc...>, 2001.
+# upgraded by Reinier Lamers <tux...@pl...>, 2002
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2001-11-09 15:51+0100\n"
-"PO-Revision-Date: 2001-11-09 15:53+0100\n"
-"Last-Translator: Floris Eshuis <f.e...@hc...>\n"
+"PO-Revision-Date: 2002-03-02 16:25+0100\n"
+"Last-Translator: Reinier Lamers <tux...@pl...>\n"
 "Language-Team: nl <nl...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -28,8 +29,8 @@
 "\n"
 "URL: "
 msgstr ""
-"Gaim is een Client gebaseerd op het AOL's Intstant messenger protocol. "
-"Het is in Gtk+ geschreven en is onder de GPL uitgegeven.\n"
+"Gaim is een Client gebaseerd op het AOL's Intstant Messenger protocol. "
+"Het is in Gtk+ geschreven en is uitgegeven onder de GPL.\n"
 "\n"
 "URL: "
 
@@ -54,7 +55,7 @@
 
 #: src/about.c:168
 msgid "Web Site"
-msgstr "Web Site"
+msgstr "Website"
 
 #: src/about.c:223
 msgid ""
@@ -66,7 +67,7 @@
 "online, you can talk to one of the Gaim developers for more assistance; "
 "their contact information is in the AUTHORS file in the Gaim source, or at "
 msgstr ""
-"Rustig.. Hulp is makkelijk te vinden. Het eerste wat u moet doen is een AIM "
+"Rustig... Hulp is makkelijk te vinden. Het eerste wat u moet doen is een AIM "
 "account aanmaken. Dat kan op http://aim.aol.com/. Klik op de knop "
 "\"New Users\" en daarmee kunt u een nieuw account aanmaken. Heeft u dat "
 "eenmaal gedaan dan kunt u zich aanmelden door uw gekozen Gebruikersnaam en "
@@ -84,7 +85,7 @@
 
 #: src/aim.c:140 src/multi.c:1231 src/server.c:53
 msgid "Signon Error"
-msgstr "Aanmeldings fout"
+msgstr "Aanmeldingsfout"
 
 #: src/aim.c:238
 msgid "Gaim - Login"
@@ -92,11 +93,11 @@
 
 #: src/aim.c:256
 msgid "Screen Name: "
-msgstr "Gebruikersnaam"
+msgstr "Gebruikersnaam:"
 
 #: src/aim.c:272
 msgid "Password: "
-msgstr "Wachtwoord"
+msgstr "Wachtwoord:"
 
 #: src/aim.c:293 src/buddy.c:2400
 msgid "Quit"
@@ -124,7 +125,7 @@
 
 #: src/aim.c:742 src/buddy.c:2436
 msgid "Preferences"
-msgstr "Voorkeuren"
+msgstr "Instellingen"
 
 #: src/protocols/gg/gg.c:68
 msgid "Available"
@@ -186,14 +187,14 @@
 
 #: src/protocols/gg/gg.c:186
 msgid "Unknown Error Code."
-msgstr "Onbekende Fout Code"
+msgstr "Onbekende Foutcode"
 
 #: src/protocols/gg/gg.c:191 src/protocols/gg/gg.c:597
 #: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:838
 #: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:919
 #, fuzzy
 msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu - Fout"
+msgstr "Gadu-Gadu Fout"
 
 #: src/protocols/gg/gg.c:311
 #, c-format
@@ -234,7 +235,7 @@
 
 #: src/protocols/gg/gg.c:543
 msgid "Looking up GG server"
-msgstr ""
+msgstr "Bezig met vinden GG-server"
 
 #: src/protocols/gg/gg.c:546
 msgid "Invalid Gadu-Gadu UIN specified"
@@ -255,7 +256,7 @@
 
 #: src/protocols/gg/gg.c:701
 msgid "Gadu-Gadu Search Engine"
-msgstr "Gadu-Gadu Zoek Machine"
+msgstr "Gadu-Gadu Zoekmachine"
 
 #: src/protocols/gg/gg.c:728
 msgid "Active"
@@ -291,7 +292,7 @@
 
 #: src/protocols/gg/gg.c:753 src/protocols/gg/gg.c:756
 msgid "Birth year"
-msgstr "Geboorte datum"
+msgstr "Geboortedatum"
 
 #: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:764
 #: src/protocols/gg/gg.c:766
@@ -305,12 +306,12 @@
 
 #: src/protocols/gg/gg.c:838
 msgid "Couldn't send search request"
-msgstr "Kan de zoek opdracht niet versturen"
+msgstr "Kan de zoekopdracht niet versturen"
 
 #: src/protocols/gg/gg.c:874 src/protocols/gg/gg.c:918
 #, c-format
 msgid "Connect to search service failed (%s)"
-msgstr "Verbinding met zoek machine afgebroken (%s)"
+msgstr "Verbinding met zoekmachine afgebroken (%s)"
 
 #: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:893
 #, fuzzy
@@ -335,13 +336,13 @@
 
 #: src/protocols/irc/irc.c:659
 msgid "No such nick/channel"
-msgstr "Onjuiste bijnaam/kanaal"
+msgstr "Bijnaam of kanaal bestaat niet"
 
 #: src/protocols/irc/irc.c:659 src/protocols/irc/irc.c:662
 #: src/protocols/irc/irc.c:664 src/protocols/irc/irc.c:879
 #, fuzzy
 msgid "IRC Error"
-msgstr "Chat Fout"
+msgstr "IRC Fout"
 
 #: src/protocols/irc/irc.c:662
 msgid "No such server"
@@ -400,7 +401,7 @@
 #: src/protocols/msn/msn.c:566
 #, fuzzy
 msgid "Gaim was unable to send a message"
-msgstr "Gaim kon geen bericht verzenden"
+msgstr "Gaim kon een bericht niet verzenden"
 
 #: src/protocols/napster/napster.c:444 src/protocols/oscar/oscar.c:2338
 #: src/protocols/toc/toc.c:1086
@@ -457,11 +458,11 @@
 
 #: src/protocols/oscar/oscar.c:463
 msgid "internal connection error\n"
-msgstr "Interne verbindings fout\n"
+msgstr "Interne verbindingsfout\n"
 
 #: src/protocols/oscar/oscar.c:464
 msgid "Unable to login to AIM"
-msgstr "Aanmelden niet mogelijk"
+msgstr "Aanmelden bij AIM niet mogelijk"
 
 #: src/protocols/oscar/oscar.c:469
 #, c-format
@@ -605,7 +606,7 @@
 
 #: src/protocols/oscar/oscar.c:1635
 msgid "<i>User has no away message</i>"
-msgstr "<i>Gebruiker heeft geen afwezigheids bericht</i>"
+msgstr "<i>Gebruiker heeft geen afwezigheidsbericht</i>"
 
 #: src/protocols/oscar/oscar.c:1660
 msgid "Your connection may be lost."
@@ -643,7 +644,7 @@
 
 #: src/protocols/oscar/oscar.c:2646
 msgid "Get Away Msg"
-msgstr "Haal afwezigeids bericht op"
+msgstr "Haal afwezigheidsbericht op"
 
 #: src/protocols/oscar/oscar.c:2653
 msgid "Direct IM"
@@ -743,7 +744,7 @@
 
 #: src/protocols/toc/toc.c:461
 msgid "The service is temporarily unavailable."
-msgstr "De Service it momenteel niet bereikbaar."
+msgstr "De service is momenteel niet bereikbaar."
 
 #: src/protocols/toc/toc.c:464
 msgid "Your warning level is currently too high to log in."
@@ -789,7 +790,7 @@
 
 #: src/protocols/toc/toc.c:775
 msgid "Password Change Successeful"
-msgstr "Wachtwoord Veranderen Succesvol"
+msgstr "Wachtwoord Veranderen Gelukt"
 
 #: src/dialogs.c:1490 src/protocols/toc/toc.c:775
 msgid "Gaim - Password Change"
@@ -801,10 +802,10 @@
 "sent to it, and may kick you off if you send a message. Gaim will prevent "
 "anything from going through. This is only temporary, please be patient."
 msgstr ""
-"TOC heeft een PAUSE commando verstuurd. Als dit gebeurd negeerd TOC ieder "
+"TOC heeft een PAUSE commando verstuurd. Als dit gebeurd negeert TOC ieder "
 "bericht dat verzonden wordt en het kan gebeuren dat uw verbinding verbroken "
-"wordt Gaim verhinderdt dat dit gebeurd maar u kunt geen berichten verzenden. "
-"Dit is tijdelijk heeft u dus geduld."
+"wordt. Gaim verhindert dat dit gebeurd maar u kunt geen berichten verzenden. "
+"Dit is tijdelijk, wees even geduldig."
 
 #: src/protocols/toc/toc.c:781
 msgid "TOC Pause"
@@ -821,7 +822,7 @@
 
 #: src/protocols/toc/toc.c:1811
 msgid "Could not write file header!"
-msgstr "Kan bestandskop niet schrijven!"
+msgstr "Kan bestandsheader niet schrijven!"
 
 #: src/protocols/toc/toc.c:1900
 msgid "Gaim - Save As..."
@@ -885,11 +886,11 @@
 
 #: src/applet.c:294 src/away.c:387
 msgid "New Away Message"
-msgstr "Nieuw Afwezigheids bericht"
+msgstr "Nieuw Afwezigheidsbericht"
 
 #: src/applet.c:441
 msgid "Can't create Gaim applet!"
-msgstr "Kan de gaim applet niet maken!"
+msgstr "Kan de gaim applet niet aanmaken!"
 
 #: src/applet.c:458
 msgid "About..."
@@ -909,7 +910,7 @@
 
 #: src/away.c:407
 msgid "Remove Away Message"
-msgstr "Afwezigheids bericht verwijderen"
+msgstr "Afwezigheidsbericht verwijderen"
 
 #: src/away.c:595
 msgid "Set All Away"
@@ -1064,7 +1065,7 @@
 
 #: src/buddy.c:2313
 msgid "Activate Away Message"
-msgstr "Aktiveer afwezigheids melding"
+msgstr "Activeer afwezigheidsbericht"
 
 #: src/buddy.c:2376
 msgid "File"
@@ -1100,7 +1101,7 @@
 
 #: src/buddy.c:2438
 msgid "View System Log"
-msgstr "Toon Systeem Log"
+msgstr "Toon Systeemlog"
 
 #: src/buddy.c:2450
 msgid "Perl"
@@ -1112,7 +1113,7 @@
 
 #: src/buddy.c:2457
 msgid "Unload All Scripts"
-msgstr "Deactiveer Scripts"
+msgstr "Deactiveer alle scripts"
 
 #: src/buddy.c:2461
 msgid "List Scripts"
@@ -1262,7 +1263,7 @@
 #: src/conversation.c:542
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
-msgstr "Verwijder '%s' van de Buddylijst.\n"
+msgstr "Verwijder '%s' van de buddylijst.\n"
 
 #: src/conversation.c:925
 msgid "Unable to send message: too large"
@@ -1270,7 +1271,7 @@
 
 #: src/conversation.c:925 src/conversation.c:927
 msgid "Message Error"
-msgstr "Bericht Fout"
+msgstr "Berichtfout"
 
 #: src/conversation.c:927
 msgid "Unable to send message: Unknown reason"
@@ -1352,7 +1353,7 @@
 
 #: src/conversation.c:1761 src/prefs.c:1281
 msgid "Text Color"
-msgstr "Tekst Kleur"
+msgstr "Tekstkleur"
 
 #: src/conversation.c:1762 src/conversation.c:1766
 msgid "Color"
@@ -1380,7 +1381,7 @@
 
 #: src/conversation.c:1784
 msgid "Enable logging"
-msgstr "Schakel Logboek In"
+msgstr "Schakel logboek in"
 
 #: src/conversation.c:1785 src/prefs.c:244
 msgid "Logging"
@@ -1438,7 +1439,7 @@
 #: src/dialogs.c:398
 #, c-format
 msgid "Do you really want to warn %s?"
-msgstr "Wilt u de gebruiker waarschuwen?"
+msgstr "Wilt u %s echt waarschuwen?"
 
 #: src/dialogs.c:403
 msgid "Warn anonymously?"
@@ -1456,7 +1457,7 @@
 
 #: src/dialogs.c:561
 msgid "Gaim - IM user"
-msgstr "Gaim - IM bebruiker"
+msgstr "Gaim - IM gebruiker"
 
 #: src/dialogs.c:578
 msgid "IM who:"
@@ -1540,7 +1541,7 @@
 
 #: src/dialogs.c:1172
 msgid "Open IM Window"
-msgstr "Open Bericht Venser"
+msgstr "Open Berichtvenster"
 
 #: src/dialogs.c:1177
 msgid "Popup Notification"
@@ -1572,7 +1573,7 @@
 
 #: src/dialogs.c:1336
 msgid "Allow Web Searches To Find Your Info"
-msgstr "Sta zoek opdrachten toe om uw info te vinden"
+msgstr "Sta zoekopdrachten toe om uw info te vinden"
 
 #: src/dialogs.c:1339 src/dialogs.c:2017
 msgid "First Name"
@@ -1604,7 +1605,7 @@
 
 #: src/dialogs.c:1460
 msgid "New Passwords Do Not Match"
-msgstr "Het nieuwe wachtwoord is niet gelijk"
+msgstr "Nieuwe wachtwoorden zijn niet gelijk"
 
 #: src/dialogs.c:1460 src/dialogs.c:1465
 msgid "Gaim - Change Password Error"
@@ -1656,11 +1657,11 @@
 
 #: src/dialogs.c:1855
 msgid "Gaim - Add Deny"
-msgstr "Gaim - Blokade toevoegen"
+msgstr "Gaim - Blokkade toevoegen"
 
 #: src/dialogs.c:1915
 msgid "Gaim - Log Conversation"
-msgstr "Gaim - Houdt gesprek bij in logboek"
+msgstr "Gaim - Houd gesprek bij in logboek"
 
 #: src/dialogs.c:1993 src/dialogs.c:2156
 msgid "Search for Buddy"
@@ -1692,7 +1693,7 @@
 
 #: src/dialogs.c:2441 src/dialogs.c:2462 src/dialogs.c:2516
 msgid "Select Text Color"
-msgstr "Selecteer Tekst Kleur"
+msgstr "Selecteer Tekstkleur"
 
 #: src/dialogs.c:2495
 msgid "Select Background Color"
@@ -1704,7 +1705,7 @@
 
 #: src/dialogs.c:2743
 msgid "Gaim - Import Buddy List"
-msgstr "Gaim - Importeer Buddy Lijst"
+msgstr "Gaim - Importeer Buddylijst"
 
 #: src/dialogs.c:2804
 msgid "You cannot create an away message with a blank title"
@@ -1720,11 +1721,11 @@
 
 #: src/dialogs.c:2879
 msgid "Gaim - New away message"
-msgstr "Gaim - Nieuw afwezigheids bericht"
+msgstr "Gaim - Nieuw afwezigheidsbericht"
 
 #: src/dialogs.c:2889
 msgid "New away message"
-msgstr "Nieuw afwezigheids bericht"
+msgstr "Nieuw afwezigheidsbericht"
 
 #: src/dialogs.c:2902
 msgid "Away title: "
@@ -1810,11 +1811,11 @@
 #: src/gaimrc.c:1107
 #, c-format
 msgid "Could not open config file %s."
-msgstr "Kan configuratie bestand %s niet openen."
+msgstr "Kan configuratiebestand %s niet openen."
 
 #: src/gaimrc.c:1108
 msgid "Preferences Error"
-msgstr "Instellings Fout"
+msgstr "Instellingsfout"
 
 #: src/html.c:183
 #, c-format
@@ -1859,7 +1860,7 @@
 
 #: src/multi.c:522
 msgid "Remember Password"
-msgstr "Onthoudt Wachtwoord"
+msgstr "Onthoud Wachtwoord"
 
 #: src/multi.c:523
 msgid "Auto-Login"
@@ -1931,7 +1932,7 @@
 
 #: src/plugins.c:238
 msgid "Filepath:"
-msgstr "Bestands Pad"
+msgstr "Bestandspad:"
 
 #: src/plugins.c:256
 msgid "Load"
@@ -1939,7 +1940,7 @@
 
 #: src/plugins.c:259
 msgid "Load a plugin from a file"
-msgstr "Laad een Plugin uit een bestand"
+msgstr "Laad een plugin uit een bestand"
 
 #: src/plugins.c:261
 msgid "Configure"
@@ -1947,7 +1948,7 @@
 
 #: src/plugins.c:264
 msgid "Configure settings of the selected plugin"
-msgstr "Instellingen voor Plugin"
+msgstr "Instellingen voor plugin"
 
 #: src/plugins.c:266
 msgid "Reload"
@@ -1999,6 +2000,10 @@
 msgid "Report Idle Times"
 msgstr "Toon inactieve tijd"
 
+#L src/prefs.c:232
+msgid "Notify buddies that you are typing to them"
+msgstr "Laat buddy's zien dat je tegen ze typt"
+
 #: src/prefs.c:238
 msgid "None"
 msgstr "Geen"
@@ -2025,7 +2030,7 @@
 
 #: src/prefs.c:261
 msgid "Log when buddies become idle/un-idle"
-msgstr "Log als buddy's in/actief worden"
+msgstr "Log als buddy's inactief/actief worden"
 
 #: src/prefs.c:263
 msgid "Log when buddies go away/come back"
@@ -2037,7 +2042,7 @@
 
 #: src/prefs.c:266
 msgid "Individual log file for each buddy's signons"
-msgstr "Eigen logbestand voor elke buddy aanmelding"
+msgstr "Eigen log voor elke buddy-aanmelding"
 
 #: src/prefs.c:269
 msgid "Browser"
@@ -2137,7 +2142,7 @@
 
 #: src/prefs.c:559
 msgid "Save Window Size/Position"
-msgstr "Venster grootte en positie opslaan"
+msgstr "Venstergrootte en -positie opslaan"
 
 #: src/prefs.c:566
 msgid "Show pictures on buttons"
@@ -2149,7 +2154,7 @@
 
 #: src/prefs.c:574
 msgid "Group Displays"
-msgstr "Groepen weergave"
+msgstr "Groepenweergave"
 
 #: src/prefs.c:586
 msgid "Hide groups with no online buddies"
@@ -2161,7 +2166,7 @@
 
 #: src/prefs.c:594
 msgid "Buddy Displays"
-msgstr "Buddy weergave"
+msgstr "Buddyweergave"
 
 #: src/prefs.c:606
 msgid "Show buddy type icons"
@@ -2169,7 +2174,7 @@
 
 #: src/prefs.c:607
 msgid "Show warning levels"
-msgstr "Toon waarschuwings niveau"
+msgstr "Toon waarschuwingsniveau"
 
 #: src/prefs.c:613
 msgid "Show idle times"
@@ -2177,39 +2182,39 @@
 
 #: src/prefs.c:614
 msgid "Grey idle buddies"
-msgstr "Toon Inactieve Buddy's grijs"
+msgstr "Toon inactieve buddy's grijs"
 
 #: src/prefs.c:631
 msgid "Conversation Options"
-msgstr "Gespreks Opties"
+msgstr "Gespreksopties"
 
 #: src/prefs.c:643
 msgid "Keyboard Options"
-msgstr "Instellingen Toetsenbord"
+msgstr "Toetsenbord-instellingen"
 
 #: src/prefs.c:655
 msgid "Enter sends message"
-msgstr "Enter verzendt het bericht"
+msgstr "Bericht verzenden met Enter"
 
 #: src/prefs.c:656
 msgid "Control-Enter sends message"
-msgstr "Ctrl-Enter verzendt het bericht"
+msgstr "Bericht verzenden met Control-Enter"
 
 #: src/prefs.c:657
 msgid "Escape closes window"
-msgstr "Esc sluit het venster"
+msgstr "Venster sluiten met Esc"
 
 #: src/prefs.c:663
 msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Ctrl-{B/I/U/S} voegt HTML tags in"
+msgstr "HTML-tags invoegen met Ctrl-{B/I/U/S}"
 
 #: src/prefs.c:664
 msgid "Control-(number) inserts smileys"
-msgstr "Ctrl-(cijfer) voegt Smiley in"
+msgstr "Smiley invoegen met Ctrl-(cijfer)"
 
 #: src/prefs.c:665
 msgid "F2 toggles timestamp display"
-msgstr "F2 schakeld Tijdweergave in"
+msgstr "Tijdweergave inschakelen met F2"
 
 #: src/prefs.c:667
 msgid "Display and General Options"
@@ -2217,7 +2222,7 @@
 
 #: src/prefs.c:679
 msgid "Show graphical smileys"
-msgstr "Toon Grafische smileys"
+msgstr "Toon grafische smileys"
 
 #: src/prefs.c:680
 msgid "Show timestamp on messages"
@@ -2261,11 +2266,11 @@
 
 #: src/prefs.c:860
 msgid "IM Options"
-msgstr "Instellingen Berichten"
+msgstr "Bericht-instellingen"
 
 #: src/prefs.c:872 src/prefs.c:2735
 msgid "IM Window"
-msgstr "Bericht venster"
+msgstr "Berichtvenster"
 
 #: src/prefs.c:888 src/prefs.c:1023
 msgid "Show buttons as: "
@@ -2287,6 +2292,10 @@
 msgid "Show all conversations in one tabbed window"
 msgstr "Toon gesprekken in een venster met tabbladen"
 
+#: src/prefs.c:941
+msgid "Show chats in the same tabbed window"
+msgstr "Toon gesprekken in hetzelfde venster met tabbladen"
+
 #: src/prefs.c:907 src/prefs.c:1044
 msgid "Raise windows on events"
 msgstr "Haal venster omhoog bij gebeurtenissen"
@@ -2295,9 +2304,17 @@
 msgid "Show logins in window"
 msgstr "Toon aanmeldingen in venster"
 
+#: src/prefs.c:950
+msgid "Show aliases in tabs/titles"
+msgstr "Toon aliassen in tabs of titels"
+
+#: src/prefs.c:951
+msgid "Hide window on send"
+msgstr "Verberg venster bij verzenden"
+
 #: src/prefs.c:910 src/prefs.c:1047
 msgid "Window Sizes"
-msgstr "Venster Afmetingen"
+msgstr "Vensterafmetingen"
 
 #: src/prefs.c:918 src/prefs.c:1055
 msgid "New window width:"
@@ -2309,7 +2326,7 @@
 
 #: src/prefs.c:920 src/prefs.c:1057
 msgid "Entry widget height:"
-msgstr ""
+msgstr "Hoogte van invoerveld:"
 
 #: src/prefs.c:922 src/prefs.c:1059
 msgid "Tab Placement"
@@ -2337,7 +2354,7 @@
 
 #: src/prefs.c:969
 msgid "Hide Buddy Icons"
-msgstr "Verberg Buddy Incons"
+msgstr "Verberg Buddy Icons"
 
 #: src/prefs.c:995
 msgid "Chat Options"
@@ -2349,11 +2366,15 @@
 
 #: src/prefs.c:1042
 msgid "Show all chats in one tabbed window"
-msgstr "Toon alle gesprekken in een venster met tabs"
+msgstr "Toon alle gesprekken in een venster met tabbladen"
+
+#: src/prefs.c:1087
+msgid "Show conversations in the same tabbed window"
+msgstr "Toon gesprekken in hetzelfde venster met tabbladen"
 
 #: src/prefs.c:1045
 msgid "Show people joining/leaving in window"
-msgstr "Toon pesonen die wegaan of binnenkomen in venster"
+msgstr "Toon pesonen die weggaan of binnenkomen in venster"
 
 #: src/prefs.c:1093
 msgid "Tab Completion"
@@ -2361,7 +2382,7 @@
 
 #: src/prefs.c:1105
 msgid "Tab-Complete Nicks"
-msgstr "Voledige namen in Tabs"
+msgstr "Volledige namen in Tabs"
 
 #: src/prefs.c:1111
 msgid "Old-Style Tab Completion"
@@ -2389,7 +2410,7 @@
 
 #: src/prefs.c:1422
 msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Geluids Configuratie"
+msgstr "Gaim - Geluidsconfiguratie"
 
 #: src/prefs.c:1462
 msgid "Choose..."
@@ -2397,7 +2418,7 @@
 
 #: src/prefs.c:1513
 msgid "Sound Options"
-msgstr "Geluids Instellingen"
+msgstr "Geluidsinstellingen"
 
 #: src/prefs.c:1541
 msgid "No sounds when you log in"
@@ -2409,7 +2430,7 @@
 
 #: src/prefs.c:1557
 msgid "Sound Player:"
-msgstr "Geluids Afspeler"
+msgstr "Geluidsafspeler:"
 
 #: src/prefs.c:1626
 #, c-format
@@ -2418,7 +2439,8 @@
 "(%s for filename; internal if empty)"
 msgstr ""
 "Commando voor het afspelen van geluid\n"
-"(%s voor bestandnaam, laat leeg voor intern\n)"
+"(%s voor bestandsnaam, leeg laten voor\n"
+"interne speler)"
 
 #: src/prefs.c:1637
 msgid "Events"
@@ -2426,11 +2448,11 @@
 
 #: src/prefs.c:1645
 msgid "Sound when buddy logs in"
-msgstr "Geluid als buddy zich aanmeld"
+msgstr "Geluid als buddy zich aanmeldt"
 
 #: src/prefs.c:1646
 msgid "Sound when buddy logs out"
-msgstr "Geluid als buddy zich afmeld"
+msgstr "Geluid als buddy zich afmeldt"
 
 #: src/prefs.c:1652
 msgid "Sound when received message begins conversation"
@@ -2438,7 +2460,7 @@
 
 #: src/prefs.c:1654
 msgid "Sound when message is received"
-msgstr "Geluid bij ontvangen bericht"
+msgstr "Geluid bij het ontvangen van een bericht"
 
 #: src/prefs.c:1655
 msgid "Sound when message is sent"
@@ -2446,15 +2468,15 @@
 
 #: src/prefs.c:1661
 msgid "Sound in chat rooms when people enter"
-msgstr "Geluid bij het binnengaan van chatruimte"
+msgstr "Geluid als iemand chatruimte binnenkomt"
 
 #: src/prefs.c:1662
 msgid "Sound in chat rooms when people leave"
-msgstr "Geluid bij het weggaan van chatruimte"
+msgstr "Geluid als iemand uit chatruimte weggaat"
 
 #: src/prefs.c:1663
 msgid "Sound in chat rooms when you talk"
-msgstr "Geluid bij het praten in chat ruimtes"
+msgstr "Geluid bij het praten in chatruimtes"
 
 #: src/prefs.c:1664
 msgid "Sound in chat rooms when others talk"
@@ -2462,12 +2484,21 @@
 
 #: src/prefs.c:1787 src/prefs.c:2767
 msgid "Away Messages"
-msgstr "Afwezigheids bericht"
+msgstr "Afwezigheid"
 
 #: src/prefs.c:1824
 msgid "Don't send auto-response"
 msgstr "Geen automatisch antwoord verzenden"
 
+#: src/prefs.c:1889
+msgid "Only send auto-response when idle"
+msgstr "Alleen automatisch antwoord\n"
+       "verzenden wanneer u inactief bent"
+
+#: src/prefs.c:1904
+msgid "Time between sending auto-responses (in seconds):"
+msgstr "Tijd tussen het verzenden van automatische antwoorden (seconden):"
+
 #: src/prefs.c:1835
 msgid "Auto Away after"
 msgstr "Automatisch afwezig na"
@@ -2494,7 +2525,7 @@
 
 #: src/prefs.c:2198
 msgid "Privacy Options"
-msgstr "Privacy Instellingen"
+msgstr "Privacy-instellingen"
 
 #: src/prefs.c:2214
 msgid "Set privacy for:"
@@ -2518,7 +2549,7 @@
 
 #: src/prefs.c:2268
 msgid "Block the users below"
-msgstr "Onderstaande gebruikers blokeren"
+msgstr "Onderstaande gebruikers blokkeren"
 
 #: src/prefs.c:2270
 msgid "Block List"
@@ -2559,10 +2590,10 @@
 "not the same version I cannot safely tell you which one it was. Needless to "
 "say, it was not successfully loaded."
 msgstr ""
-"U heeft geprobeerd een protocol te laden die niet met deze versie is "
-"gecompileerd. Omdat het niet dezelfde versie is als bij dit programma wordt "
-"gebruikt kan ik helaas niet zeggen welke het was maar werken zal het "
-"waarschijnlijk niet."
+"U hebt geprobeerd een protocol te laden dat een andere versie heeft dan "
+"dit programma. Omdat het niet dezelfde versie is als dit programma "
+"kan ik helaas niet zeggen welke het was maar werken zal het in ieder "
+"geval niet."
 
 #: src/prpl.c:74
 msgid "Protocol Error"
@@ -2635,7 +2666,7 @@
 
 #: src/server.c:541
 msgid "(1 message)"
-msgstr "(1 Bericht)"
+msgstr "(1 bericht)"
 
 #: src/server.c:756
 msgid "Warned"

[Gaim-commits] CVS: gaim ChangeLog,1.418,1.419

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv14882

Modified Files:
	ChangeLog 
Log Message:
updated dutch translation, thanks tux_rocker



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -d -r1.418 -r1.419
--- ChangeLog	17 Mar 2002 21:49:56 -0000	1.418
+++ ChangeLog	17 Mar 2002 22:25:12 -0000	1.419
@@ -9,6 +9,7 @@
 	* Server side buddy lists for ICQ again  
 	* Can reorder your accounts in the account editor (Thanks
 	  Luke Schierer)
+	* Updated Dutch translation
 	
 version 0.54 (03/14/2002):
 	* Compiles without GdkPixbuf again

[Gaim-commits] CVS: gaim/src aim.c,1.176,1.177 browser.c,1.21,1.22 buddy.c,1.293,1.294 gaim.h,1.314,1.315 sound.c,1.52,1.53 util.c,1.113,1.114

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv14021/src

Modified Files:
	aim.c browser.c buddy.c gaim.h sound.c util.c 
Log Message:
CLeaner PID stuff. Thanks, BMIller :)



Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- aim.c	2 Mar 2002 04:52:20 -0000	1.176
+++ aim.c	17 Mar 2002 22:23:17 -0000	1.177
@@ -406,6 +406,9 @@
 #endif
 		abort();
 		break;
+	case SIGCHLD:
+		clean_pid();
+		break;
 	default:
 		debug_printf("caught signal %d\n", sig);
 		gtkspell_stop();
@@ -576,6 +579,7 @@
 	signal(SIGTERM, sighandler);
 	signal(SIGQUIT, sighandler);
 	signal(SIGPIPE, SIG_IGN);
+	signal(SIGCHLD, sighandler);
 #endif
 
 

Index: browser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/browser.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- browser.c	2 Dec 2001 00:47:33 -0000	1.21
+++ browser.c	17 Mar 2002 22:23:17 -0000	1.22
@@ -499,8 +499,6 @@
 		if (status != 6)
 			mozilla_remote_free_lock(window);
 
-		gtk_timeout_add(1000, (GtkFunction)clean_pid, NULL);
-
 		netscape_lock = 0;
 
 		g_free(msg);
@@ -612,8 +610,6 @@
 
 			execvp(args[0], args);
 			_exit(0);
-		} else {
-			gtk_timeout_add(1000, (GtkFunction)clean_pid, NULL);
 		}
 	}
 }

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- buddy.c	16 Mar 2002 20:14:24 -0000	1.293
+++ buddy.c	17 Mar 2002 22:23:18 -0000	1.294
@@ -1551,8 +1551,6 @@
 					args[3] = NULL;
 					execvp(args[0], args);
 					_exit(0);
-				} else if (pid > 0) {
-					gtk_timeout_add(100, (GtkFunction)clean_pid, NULL);
 				}
 			}
 			if (b->options & OPT_POUNCE_SOUND) {

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- gaim.h	16 Mar 2002 00:32:53 -0000	1.314
+++ gaim.h	17 Mar 2002 22:23:18 -0000	1.315
@@ -399,7 +399,7 @@
 extern char *normalize(const char *);
 extern char *tobase64(const char *);
 extern void frombase64(const char *, char **, int *);
-extern gint clean_pid(gpointer);
+extern void clean_pid();
 extern char *date();
 extern gint linkify_text(char *);
 extern FILE *open_log_file (char *);

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- sound.c	17 Mar 2002 18:29:17 -0000	1.52
+++ sound.c	17 Mar 2002 22:23:18 -0000	1.53
@@ -463,8 +463,6 @@
 		}
 
 		_exit(0);
-	} else {
-		g_timeout_add(100, clean_pid, NULL);
 	}
 }
 
@@ -533,8 +531,6 @@
 		}
 
 		_exit(0);
-	} else {
-		g_timeout_add(100, clean_pid, NULL);
 	}
 }
 

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- util.c	17 Feb 2002 18:08:12 -0000	1.113
+++ util.c	17 Mar 2002 22:23:18 -0000	1.114
@@ -613,17 +613,13 @@
 }
 
 
-gboolean clean_pid(gpointer dummy)
+void clean_pid(void)
 {
 	int status;
 	pid_t pid;
 
+	printf ("clean_pid\n");
 	pid = waitpid(-1, &status, WNOHANG);
-
-	if (pid == 0)
-		return TRUE;
-
-	return FALSE;
 }
 
 struct aim_user *find_user(const char *name, int protocol)

[Gaim-commits] CVS: gaim/src multi.c,1.113,1.114

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv30904/src

Modified Files:
	multi.c 
Log Message:
Can reorder accounts in the account editor.  Thanks Luke.


Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- multi.c	17 Mar 2002 20:23:33 -0000	1.113
+++ multi.c	17 Mar 2002 21:49:56 -0000	1.114
@@ -164,6 +164,18 @@
 		return "Unknown";
 }
 
+
+static void reorder_list(GtkCList *cl, int from, int to, void *p)
+{
+	struct aim_user *au;
+	if (from == to)
+		return; /* This shouldn't happen, but just in case */
+	au = (struct aim_user*)g_slist_nth_data(aim_users, from);
+	aim_users = g_slist_remove (aim_users, au);
+	aim_users = g_slist_insert(aim_users, au, to);
+	save_prefs();
+}
+
 void regenerate_user_list()
 {
 	char *titles[4];
@@ -201,11 +213,15 @@
 	gtk_clist_set_column_width(GTK_CLIST(list), 0, 90);
 	gtk_clist_set_selection_mode(GTK_CLIST(list), GTK_SELECTION_EXTENDED);
 	gtk_clist_column_titles_passive(GTK_CLIST(list));
+	
 	gtk_container_add(GTK_CONTAINER(win), list);
 	gtk_widget_show(list);
 
 	regenerate_user_list();
-
+	gtk_clist_set_reorderable (GTK_CLIST(list), TRUE);
+	gtk_clist_set_use_drag_icons (GTK_CLIST(list), TRUE);
+	gtk_signal_connect(GTK_OBJECT(list), "row-move", GTK_SIGNAL_FUNC(reorder_list), NULL);
+		
 	gtk_widget_show(win);
 	return win;
 }
@@ -923,7 +939,7 @@
 		l = l->next;
 	}
 }
-
+	
 static void do_del_acct(gpointer w, struct aim_user *u)
 {
 	if (u->gc) {

[Gaim-commits] CVS: gaim ChangeLog,1.417,1.418

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv30904

Modified Files:
	ChangeLog 
Log Message:
Can reorder accounts in the account editor.  Thanks Luke.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -d -r1.417 -r1.418
--- ChangeLog	17 Mar 2002 04:24:52 -0000	1.417
+++ ChangeLog	17 Mar 2002 21:49:56 -0000	1.418
@@ -7,6 +7,8 @@
 	* Login process shown in single window (Thanks Michael 
 	  Golden)
 	* Server side buddy lists for ICQ again  
+	* Can reorder your accounts in the account editor (Thanks
+	  Luke Schierer)
 	
 version 0.54 (03/14/2002):
 	* Compiles without GdkPixbuf again

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.121,1.122

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv15107/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
Less ambiguous error message when you get kicked offline.  Thanks, JSeymour.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- oscar.c	17 Mar 2002 04:24:52 -0000	1.121
+++ oscar.c	17 Mar 2002 20:23:33 -0000	1.122
@@ -375,7 +375,7 @@
 				if ((conn->type == AIM_CONN_TYPE_BOS) ||
 					   !(aim_getconn_type(odata->sess, AIM_CONN_TYPE_BOS))) {
 					debug_printf(_("major connection error\n"));
-					hide_login_progress(gc, _("Disconnected."));
+					hide_login_progress_error(gc, _("Disconnected."));
 					signoff(gc);
 				} else if (conn->type == AIM_CONN_TYPE_CHAT) {
 					struct chat_connection *c = find_oscar_chat_by_conn(gc, conn);

[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.43,1.44

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/toc
In directory usw-pr-cvs1:/tmp/cvs-serv15107/src/protocols/toc

Modified Files:
	toc.c 
Log Message:
Less ambiguous error message when you get kicked offline.  Thanks, JSeymour.


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- toc.c	12 Mar 2002 17:21:45 -0000	1.43
+++ toc.c	17 Mar 2002 20:23:33 -0000	1.44
@@ -486,7 +486,7 @@
 
 	/* there's data waiting to be read, so read it. */
 	if (wait_reply(gc, buf, 8 * 1024) <= 0) {
-		hide_login_progress(gc, _("Connection Closed"));
+		hide_login_progress_error(gc, _("Connection Closed"));
 		signoff(gc);
 		return;
 	}

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.39,1.40

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv15107/src/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
Less ambiguous error message when you get kicked offline.  Thanks, JSeymour.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- yahoo.c	13 Mar 2002 04:06:23 -0000	1.39
+++ yahoo.c	17 Mar 2002 20:23:34 -0000	1.40
@@ -711,7 +711,7 @@
 	len = read(yd->fd, buf, sizeof(buf));
 
 	if (len <= 0) {
-		hide_login_progress(gc, "Unable to read");
+		hide_login_progress_error(gc, "Unable to read");
 		signoff(gc);
 		return;
 	}

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.64,1.65

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv15107/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
Less ambiguous error message when you get kicked offline.  Thanks, JSeymour.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- msn.c	17 Mar 2002 18:55:39 -0000	1.64
+++ msn.c	17 Mar 2002 20:23:33 -0000	1.65
@@ -1205,7 +1205,7 @@
 	len = read(md->fd, buf, sizeof(buf));
 
 	if (len <= 0) {
-		hide_login_progress(gc, "Error reading from server");
+		hide_login_progress_error(gc, "Error reading from server");
 		signoff(gc);
 		return;
 	}

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.37,1.38

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv15107/src/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
Less ambiguous error message when you get kicked offline.  Thanks, JSeymour.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- jabber.c	15 Mar 2002 20:09:13 -0000	1.37
+++ jabber.c	17 Mar 2002 20:23:33 -0000	1.38
@@ -76,10 +76,15 @@
 
 #define USEROPT_PORT 0
 
+/*
+ * Note: "was_connected" may seem redundant, but it was needed and I
+ * didn't want to touch the Jabber state stuff not specific to Gaim.
+ */
 typedef struct gjconn_struct {
 	/* Core structure */
 	pool p;			/* Memory allocation pool */
 	int state;		/* Connection state flag */
+	int was_connected;	/* We were once connected */
 	int fd;			/* Connection file descriptor */
 	jid user;		/* User info */
 	char *pass;		/* User passwd */
@@ -209,6 +214,7 @@
 	gjc->pass = pstrdup(p, pass);
 
 	gjc->state = JCONN_STATE_OFF;
+	gjc->was_connected = 0;
 	gjc->id = 1;
 	gjc->fd = -1;
 
@@ -249,6 +255,7 @@
 
 	gjab_send_raw(gjc, "</stream:stream>");
 	gjc->state = JCONN_STATE_OFF;
+	gjc->was_connected = 0;
 	close(gjc->fd);
 	gjc->fd = -1;
 	XML_ParserFree(gjc->parser);
@@ -1401,10 +1408,15 @@
 {
 	switch (state) {
 	case JCONN_STATE_OFF:
-		hide_login_progress(GJ_GC(gjc), _("Unable to connect"));
+		if(gjc->was_connected) {
+			hide_login_progress_error(GJ_GC(gjc), _("Connection lost"));
+		} else {
+			hide_login_progress(GJ_GC(gjc), _("Unable to connect"));
+		}
 		signoff(GJ_GC(gjc));
 		break;
 	case JCONN_STATE_CONNECTED:
+		gjc->was_connected = 1;
 		set_login_progress(GJ_GC(gjc), 2, _("Connected"));
 		break;
 	case JCONN_STATE_ON:
@@ -2804,10 +2816,15 @@
 {
 	switch (state) {
 	case JCONN_STATE_OFF:
-		hide_login_progress(GJ_GC(gjc), _("Unable to connect"));
+		if(gjc->was_connected) {
+			hide_login_progress_error(GJ_GC(gjc), _("Connection lost"));
+		} else {
+			hide_login_progress(GJ_GC(gjc), _("Unable to connect"));
+		}
 		signoff(GJ_GC(gjc));
 		break;
 	case JCONN_STATE_CONNECTED:
+		gjc->was_connected = 1;
 		/*
 		 * TBD?
 		set_login_progress(GJ_GC(gjc), 2, _("Connected"));

[Gaim-commits] CVS: gaim/src multi.c,1.112,1.113 multi.h,1.40,1.41

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv15107/src

Modified Files:
	multi.c multi.h 
Log Message:
Less ambiguous error message when you get kicked offline.  Thanks, JSeymour.


Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- multi.c	17 Mar 2002 04:58:38 -0000	1.112
+++ multi.c	17 Mar 2002 20:23:33 -0000	1.113
@@ -1401,6 +1401,17 @@
 	hide_login_progress_common(gc, why, _("Notice"), gc->username);
 }
 
+/*
+ * Like hide_login_progress(), but for non-signon error messages.
+ *
+ */
+void hide_login_progress_error(struct gaim_connection *gc, char *why)
+{
+	char buf[2048];
+	g_snprintf(buf, sizeof(buf), _("%s has been signed off"), gc->username);
+	hide_login_progress_common(gc, why, _("Connection Error"), buf);
+}
+
 void signoff_all()
 {
 	GSList *c = connections;

Index: multi.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- multi.h	17 Feb 2002 18:08:12 -0000	1.40
+++ multi.h	17 Mar 2002 20:23:33 -0000	1.41
@@ -112,5 +112,6 @@
 void set_login_progress(struct gaim_connection *, float, char *);
 void hide_login_progress(struct gaim_connection *, char *);
 void hide_login_progress_notice(struct gaim_connection *, char *);
+void hide_login_progress_error(struct gaim_connection *, char *);
 
 #endif /* _MULTI_H_ */

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.74,1.75

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv15107/src/protocols/irc

Modified Files:
	irc.c 
Log Message:
Less ambiguous error message when you get kicked offline.  Thanks, JSeymour.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- irc.c	16 Mar 2002 20:14:24 -0000	1.74
+++ irc.c	17 Mar 2002 20:23:33 -0000	1.75
@@ -1161,7 +1161,7 @@
 
 	i = read(idata->fd, buf, 1024);
 	if (i <= 0) {
-		hide_login_progress(gc, "Read error");
+		hide_login_progress_error(gc, "Read error");
 		signoff(gc);
 		return;
 	}

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.63,1.64

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv28449/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
A new MSN error message, thanks mjc.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- msn.c	16 Mar 2002 22:39:49 -0000	1.63
+++ msn.c	17 Mar 2002 18:55:39 -0000	1.64
@@ -323,10 +323,12 @@
 		case 913:
 			g_snprintf(msg, sizeof(msg), "Not allowed when offline");
 			break;
-		case 920:
+	        case 920:
 			g_snprintf(msg, sizeof(msg), "Not accepting new users");
 			break;
-
+	        case 924:
+			g_snprintf(msg, sizeof(msg), "User unverified");
+			break;
 		default:
 			g_snprintf(msg, sizeof(msg), "Unknown Error Code");
 			break;

[Gaim-commits] CVS: gaim/src prefs.c,1.219,1.220 sound.c,1.51,1.52

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv23064/src

Modified Files:
	prefs.c sound.c 
Log Message:
Sound bugfix; thanks Robot101.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- prefs.c	16 Mar 2002 20:14:24 -0000	1.219
+++ prefs.c	17 Mar 2002 18:29:17 -0000	1.220
@@ -1743,8 +1743,8 @@
 	gtk_widget_show(vbox);
 
 	for (j=0; j < NUM_SOUNDS; j++) {
-		/* no entry for the buddy pounce sound, it's configurable per-pounce */
-		if (j == SND_POUNCE_DEFAULT)
+		/* no entry for sounds without an option */
+		if (sounds[j].opt == 0)
 			continue;
 
 		/* seperators before SND_RECEIVE and SND_CHAT_JOIN */

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sound.c	16 Mar 2002 00:32:53 -0000	1.51
+++ sound.c	17 Mar 2002 18:29:17 -0000	1.52
@@ -58,14 +58,14 @@
 struct sound_struct sounds[NUM_SOUNDS] = {
 	N_("Buddy logs in"), OPT_SOUND_LOGIN, BuddyArrive, sizeof(BuddyArrive),
 	N_("Buddy logs out"), OPT_SOUND_LOGOUT, BuddyLeave, sizeof(BuddyLeave),
-	N_("Message recieved begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive),
 	N_("Message recieved"), OPT_SOUND_RECV, Receive, sizeof(Receive),
+	N_("Message recieved begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive),
 	N_("Message sent"), OPT_SOUND_SEND, Send, sizeof(Send),
 	N_("Person enters chat"), OPT_SOUND_CHAT_JOIN, BuddyArrive, sizeof(BuddyArrive),
 	N_("Person leaves chat"), OPT_SOUND_CHAT_PART, BuddyLeave, sizeof(BuddyLeave),
 	N_("You talk in chat"), OPT_SOUND_CHAT_YOU_SAY, Send, sizeof(Send),
 	N_("Others talk in chat"), OPT_SOUND_CHAT_SAY, Receive, sizeof(Receive),
-	NULL, NULL, &RedAlert, sizeof(RedAlert)
+	NULL, 0, RedAlert, sizeof(RedAlert)
 };
 
 static int check_dev(char *dev)
@@ -413,7 +413,7 @@
 	}
 
 	else if (sound_options & OPT_SOUND_NORMAL) {
-		debug_printf("attempting to play audio file with internal method -- this is unlikely to work");
+		debug_printf("attempting to play audio file with internal method -- this is unlikely to work\n");
 	}
 
 	pid = fork();
@@ -549,12 +549,12 @@
 		return;
 
 	if (sound >= NUM_SOUNDS) {
-		debug_printf("sorry old fruit... can't say I know that sound: ", sound);
+		debug_printf("sorry old fruit... can't say I know that sound: ", sound, "\n");
 		return;
 	}
 
 	/* check NULL for sounds that don't have an option, ie buddy pounce */
-	if ((sound_options & sounds[sound].opt) || (sounds[sound].opt == NULL)) {
+	if ((sound_options & sounds[sound].opt) || (sounds[sound].opt == 0)) {
 		if (sound_file[sound]) {
 			play_file(sound_file[sound]);
 		} else {

[Gaim-commits] CVS: gaim .cvsignore,1.9,1.10

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv23064

Modified Files:
	.cvsignore 
Log Message:
Sound bugfix; thanks Robot101.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- .cvsignore	10 Sep 2001 23:05:48 -0000	1.9
+++ .cvsignore	17 Mar 2002 18:29:17 -0000	1.10
@@ -23,3 +23,4 @@
 depcomp
 stamp-h1
 configure.in
+autom4te.cache

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.103,1.104

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21018/src

Modified Files:
	gtkimhtml.c 
Log Message:
Will compile with gtk2 again.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- gtkimhtml.c	15 Mar 2002 02:34:10 -0000	1.103
+++ gtkimhtml.c	17 Mar 2002 06:43:54 -0000	1.104
@@ -742,8 +742,13 @@
 		return;
 
 	if (GTK_WIDGET_HAS_FOCUS (widget)) {
+#if GTK_CHECK_VERSION(1,3,0)
+		gtk_paint_focus (widget->style, widget->window, GTK_STATE_NORMAL, NULL, widget, "text", 
+				 0, 0, widget->allocation.width - 1, widget->allocation.height - 1);
+#else
 		gtk_paint_focus (widget->style, widget->window, NULL, widget, "text", 0, 0,
 				 widget->allocation.width - 1, widget->allocation.height - 1);
+#endif
 		x = 1; y = 1; w = 2; h = 2;
 	}
 

[Gaim-commits] CVS: gaim/pixmaps/protocols/msn Makefile.am,1.2,1.3

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/pixmaps/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv10790/pixmaps/protocols/msn

Modified Files:
	Makefile.am 
Log Message:
:-$


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/protocols/msn/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	15 Mar 2002 03:25:03 -0000	1.2
+++ Makefile.am	17 Mar 2002 05:27:40 -0000	1.3
@@ -14,7 +14,7 @@
 	msn_dog.xpm \
 	msn_drink.xpm \
 	msn_email.xpm \
-	msn_embaressed.xpm \
+	msn_embarrassed.xpm \
 	msn_film.xpm \
 	msn_flower.xpm \
 	msn_gift.xpm \

[Gaim-commits] CVS: gaim/src multi.c,1.111,1.112 server.c,1.223,1.224

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv6203/src

Modified Files:
	multi.c server.c 
Log Message:
But I say it just to reach you.


Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- multi.c	17 Mar 2002 01:22:35 -0000	1.111
+++ multi.c	17 Mar 2002 04:58:38 -0000	1.112
@@ -896,16 +896,17 @@
 	GList *l = GTK_CLIST(list)->selection;
 	int row = -1;
 	struct aim_user *u = NULL;
-	struct prpl *p = find_prpl(u->protocol);
+	struct prpl *p = NULL;
 	while (l) {
 		row = (int)l->data;
 		u = g_slist_nth_data(aim_users, row);
-		serv_login(u);
+		p = find_prpl(u->protocol);
 		if (!u->gc && p && p->login) {
 			struct prpl *p = find_prpl(u->protocol);
 			if (p && !(p->options & OPT_PROTO_NO_PASSWORD) && !u->password[0]) {
 				do_pass_dlg(u);
 			} else {
+				serv_login(u);
 #ifdef USE_APPLET
 				set_user_state(signing_on);
 #endif /* USE_APPLET */
@@ -914,6 +915,10 @@
 		} else if (u->gc) {
 			u->gc->wants_to_die = TRUE;
 			signoff(u->gc);
+		} else {
+			do_error_dialog(_("You cannot log this account in; you do not have "
+					  "the protocol it uses loaded, or the protocol does "
+					  "not have a login function."), _("Login Error"));
 		}
 		l = l->next;
 	}

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- server.c	16 Mar 2002 00:32:53 -0000	1.223
+++ server.c	17 Mar 2002 04:58:38 -0000	1.224
@@ -58,10 +58,6 @@
 
 		debug_printf(PACKAGE " " VERSION " logging in %s using %s\n", user->username, p->name());
 		p->login(user);
-	} else {
-		do_error_dialog(_("You cannot log this account in; you do not have "
-				  "the protocol it uses loaded, or the protocol does "
-				  "not have a login function."), _("Login Error"));
 	}
 }
 

[Gaim-commits] CVS: gaim/src/protocols/oscar auth.c,1.5,1.6 oscar.c,1.120,1.121

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv1328/src/protocols/oscar

Modified Files:
	auth.c oscar.c 
Log Message:
Added SSI to ICQ again.  Not positive if it works, though.  Let me know if it doesn't.


Index: auth.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/auth.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- auth.c	1 Dec 2001 00:56:30 -0000	1.5
+++ auth.c	17 Mar 2002 04:24:52 -0000	1.6
@@ -304,8 +304,8 @@
 	 * If set, old-fashioned buddy lists will not work. You will need
 	 * to use SSI.
 	 */
-	if (0)
-		aim_addtlvtochain8(&tl, 0x004a, 0x01);
+	
+	aim_addtlvtochain8(&tl, 0x004a, 0x01);
 
 	aim_writetlvchain(&fr->data, &tl);
 

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- oscar.c	16 Mar 2002 22:18:38 -0000	1.120
+++ oscar.c	17 Mar 2002 04:24:52 -0000	1.121
@@ -2239,8 +2239,7 @@
 
 	aim_reqservice(sess, fr->conn, AIM_CONN_TYPE_CHATNAV);
 
-	if (!odata->icq)
-		aim_ssi_reqrights(sess, fr->conn);
+       	aim_ssi_reqrights(sess, fr->conn);
 
 	return 1;
 }
@@ -2662,96 +2661,74 @@
 
 static void oscar_add_buddy(struct gaim_connection *g, char *name) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-	if (odata->icq) {
-		aim_add_buddy(odata->sess, odata->conn, name);
-	} else {
-		if ((odata->sess->ssi.received_data) && !(aim_ssi_inlist(odata->sess, odata->conn, name, 0x0000))) {
+	if ((odata->sess->ssi.received_data) && !(aim_ssi_inlist(odata->sess, odata->conn, name, 0x0000))) {
 			debug_printf("ssi: adding buddy %s to group %s\n", name, find_group_by_buddy(g, name)->name);
 			aim_ssi_addbuddies(odata->sess, odata->conn, find_group_by_buddy(g, name)->name, &name, 1);
-		}
 	}
+	
 }
 
 static void oscar_add_buddies(struct gaim_connection *g, GList *buddies) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-	if (odata->icq) {
-		char buf[MSG_LEN];
-		int n=0;
-		while (buddies) {
-			if (n > MSG_LEN - 18) {
-				aim_bos_setbuddylist(odata->sess, odata->conn, buf);
-				n = 0;
-			}
-			n += g_snprintf(buf + n, sizeof(buf) - n, "%s&", (char *)buddies->data);
-			buddies = buddies->next;
-		}
-		aim_bos_setbuddylist(odata->sess, odata->conn, buf);
-	} else {
-		if (odata->sess->ssi.received_data) {
-			int tmp;
-			GSList *curgrp, *curbud;
-			for (curgrp=g->groups; curgrp; curgrp=g_slist_next(curgrp)) {
+	if (odata->sess->ssi.received_data) {
+		int tmp;
+		GSList *curgrp, *curbud;
+		for (curgrp=g->groups; curgrp; curgrp=g_slist_next(curgrp)) {
+			tmp = 0;
+			for (curbud=((struct group*)curgrp->data)->members; curbud; curbud=curbud->next)
+				if (!aim_ssi_inlist(odata->sess, odata->conn, ((struct buddy*)curbud->data)->name, 0x0000))
+					tmp++;
+			if (tmp) {
+				char **sns = (char **)malloc(tmp*sizeof(char*));
 				tmp = 0;
 				for (curbud=((struct group*)curgrp->data)->members; curbud; curbud=curbud->next)
-					if (!aim_ssi_inlist(odata->sess, odata->conn, ((struct buddy*)curbud->data)->name, 0x0000))
+					if (!aim_ssi_inlist(odata->sess, odata->conn, ((struct buddy*)curbud->data)->name, 0x0000)) {
+						debug_printf("ssi: adding buddy %s to group %s\n", ((struct buddy*)curbud->data)->name, ((struct group*)curgrp->data)->name);
+						sns[tmp] = (char *)((struct buddy*)curbud->data)->name;
 						tmp++;
-				if (tmp) {
-					char **sns = (char **)malloc(tmp*sizeof(char*));
-					tmp = 0;
-					for (curbud=((struct group*)curgrp->data)->members; curbud; curbud=curbud->next)
-						if (!aim_ssi_inlist(odata->sess, odata->conn, ((struct buddy*)curbud->data)->name, 0x0000)) {
-							debug_printf("ssi: adding buddy %s to group %s\n", ((struct buddy*)curbud->data)->name, ((struct group*)curgrp->data)->name);
-							sns[tmp] = (char *)((struct buddy*)curbud->data)->name;
-							tmp++;
-						}
-					aim_ssi_addbuddies(odata->sess, odata->conn, ((struct group*)curgrp->data)->name, sns, tmp);
-					free(sns);
+					}
+				aim_ssi_addbuddies(odata->sess, odata->conn, ((struct group*)curgrp->data)->name, sns, tmp);
+				free(sns);
 				}
-			}
 		}
+		
 	}
 }
 
 static void oscar_remove_buddy(struct gaim_connection *g, char *name, char *group) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-	if (odata->icq) {
-		aim_remove_buddy(odata->sess, odata->conn, name);
-	} else {
-		if (odata->sess->ssi.received_data) {
-			char *ssigroup;
-			while (aim_ssi_inlist(odata->sess, odata->conn, name, 0x0000) && (ssigroup = aim_ssi_getparentgroup(odata->sess, odata->conn, name)) && !aim_ssi_delbuddies(odata->sess, odata->conn, ssigroup, &name, 1))
-				debug_printf("ssi: deleted buddy %s from group %s\n", name, group);
-		}
+
+	if (odata->sess->ssi.received_data) {
+		char *ssigroup;
+		while (aim_ssi_inlist(odata->sess, odata->conn, name, 0x0000) && (ssigroup = aim_ssi_getparentgroup(odata->sess, odata->conn, name)) && !aim_ssi_delbuddies(odata->sess, odata->conn, ssigroup, &name, 1))
+			debug_printf("ssi: deleted buddy %s from group %s\n", name, group);
 	}
 }
 
+
 static void oscar_remove_buddies(struct gaim_connection *g, GList *buddies, char *group) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-	if (odata->icq) {
+	
+	if (odata->sess->ssi.received_data) {
 		GList *cur;
+		int tmp = 0;
 		for (cur=buddies; cur; cur=cur->next)
-			aim_remove_buddy(odata->sess, odata->conn, cur->data);
-	} else {
-		if (odata->sess->ssi.received_data) {
-			GList *cur;
-			int tmp = 0;
+			if (aim_ssi_inlist(odata->sess, odata->conn, cur->data, 0x0000))
+				tmp++;
+		if (tmp) {
+			char **sns;
+			sns = (char **)malloc(tmp*sizeof(char*));
+			tmp = 0;
 			for (cur=buddies; cur; cur=cur->next)
-				if (aim_ssi_inlist(odata->sess, odata->conn, cur->data, 0x0000))
+				if (aim_ssi_inlist(odata->sess, odata->conn, cur->data, 0x0000)) {
+					debug_printf("ssi: deleting buddy %s from group %s\n", cur->data, group);
+					sns[tmp] = cur->data;
 					tmp++;
-			if (tmp) {
-				char **sns;
-				sns = (char **)malloc(tmp*sizeof(char*));
-				tmp = 0;
-				for (cur=buddies; cur; cur=cur->next)
-					if (aim_ssi_inlist(odata->sess, odata->conn, cur->data, 0x0000)) {
-						debug_printf("ssi: deleting buddy %s from group %s\n", cur->data, group);
-						sns[tmp] = cur->data;
-						tmp++;
-					}
-				aim_ssi_delbuddies(odata->sess, odata->conn, group, sns, tmp);
-				free(sns);
-			}
+				}
+			aim_ssi_delbuddies(odata->sess, odata->conn, group, sns, tmp);
+			free(sns);
 		}
+		
 	}
 }
 
@@ -2785,13 +2762,6 @@
 
 	debug_printf("ssi: syncing local list and server list\n");
 
-	if (odata->icq) {
-		/* Delete the buddy list */
-		debug_printf("ssi: using ICQ, removing ssi data\n");
-		aim_ssi_deletelist(sess, fr->conn);
-		return 1;
-	}
-
 	/* Activate SSI */
 	debug_printf("ssi: activating server-stored buddy list\n");
 	aim_ssi_enable(sess, fr->conn);
@@ -2929,7 +2899,7 @@
 			}
 		}
 	}
-
+	
 	return 1;
 }
 

[Gaim-commits] CVS: gaim ChangeLog,1.416,1.417

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv1328

Modified Files:
	ChangeLog 
Log Message:
Added SSI to ICQ again.  Not positive if it works, though.  Let me know if it doesn't.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -d -r1.416 -r1.417
--- ChangeLog	16 Mar 2002 00:32:53 -0000	1.416
+++ ChangeLog	17 Mar 2002 04:24:52 -0000	1.417
@@ -6,6 +6,7 @@
 	* Various sound cleanups (Thanks Robert McQueen)
 	* Login process shown in single window (Thanks Michael 
 	  Golden)
+	* Server side buddy lists for ICQ again  
 	
 version 0.54 (03/14/2002):
 	* Compiles without GdkPixbuf again