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

[Gaim-commits] CVS: gaim/src conversation.c,1.353,1.354 ui.h,1.37,1.38

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

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

Modified Files:
	conversation.c ui.h 
Log Message:
For plugins.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -d -r1.353 -r1.354
--- conversation.c	15 May 2002 02:21:21 -0000	1.353
+++ conversation.c	28 May 2002 08:00:27 -0000	1.354
@@ -2273,6 +2273,7 @@
 	gdk_pixmap_unref(speaker_i);
 	gdk_pixmap_unref(image_i);
 
+	c->toolbar = toolbar;
 	c->bold = bold;
 	c->strike = strike;
 	c->italic = italic;

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ui.h	4 May 2002 08:21:31 -0000	1.37
+++ ui.h	28 May 2002 08:00:27 -0000	1.38
@@ -109,6 +109,7 @@
 	/* stuff used for both IM and chat */
 	GtkWidget *window;
 	char name[80];
+	GtkWidget *toolbar;
 	GtkWidget *text;
 	GtkWidget *entry;
 	GtkWidget *italic;

[Gaim-commits] CVS: gaim/src about.c,1.67,1.68

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

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

Modified Files:
	about.c 
Log Message:
you can redistribute me and/or modify me under the terms of the GNU
General Public License as published by the Free Software Foundation


Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- about.c	25 May 2002 18:58:24 -0000	1.67
+++ about.c	25 May 2002 19:11:34 -0000	1.68
@@ -134,7 +134,7 @@
 		    gtk_label_new(
 				  _("Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
 				   "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
-				    "I is written using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n"
+				    "It is written using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n"
 				   "IRC: #gaim on irc.openprojects.net"));
 
 		gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);

[Gaim-commits] CVS: gaim/src about.c,1.66,1.67 buddy.c,1.313,1.314

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

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

Modified Files:
	about.c buddy.c 
Log Message:
more de-aim-ization, and a buddy pounce fix.


Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- about.c	27 Apr 2002 19:41:06 -0000	1.66
+++ about.c	25 May 2002 18:58:24 -0000	1.67
@@ -132,8 +132,9 @@
 
 		label =
 		    gtk_label_new(
-				  _("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: " WEBSITE "\n\n"
+				  _("Gaim is a modular Instant Messaging client capable of using AIM, ICQ,\n"
+				   "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.\n"
+				    "I is written using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n"
 				   "IRC: #gaim on irc.openprojects.net"));
 
 		gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- buddy.c	23 May 2002 00:47:30 -0000	1.313
+++ buddy.c	25 May 2002 18:58:24 -0000	1.314
@@ -1607,9 +1607,9 @@
 				 * because I thought it'd be funny :-) */
 
 				g_snprintf(tmp, sizeof(tmp), "%s has %s", name, 
-					   (b->options & OPT_POUNCE_TYPING) ? "started typing to you" :
-					   (b->options & OPT_POUNCE_SIGNON) ? "signed on" : 
-					   (b->options & OPT_POUNCE_UNIDLE) ? "returned from being idle" : 
+					   (when & OPT_POUNCE_TYPING) ? "started typing to you" :
+					   (when & OPT_POUNCE_SIGNON) ? "signed on" : 
+					   (when & OPT_POUNCE_UNIDLE) ? "returned from being idle" : 
 					   "returned from being away");
 				
 				do_error_dialog(tmp, _("Buddy Pounce"));

[Gaim-commits] CVS: gaim/po pl.po,1.13,1.14

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

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

Modified Files:
	pl.po 
Log Message:
yeah yeah



Index: pl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/pl.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pl.po	22 May 2002 12:25:44 -0000	1.13
+++ pl.po	24 May 2002 00:03:14 -0000	1.14
@@ -4,15 +4,91 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.56\n"
-"POT-Creation-Date: 2002-05-20 19:16-0400\n"
-"PO-Revision-Date: 2002-05-21 12:30+0200\n"
+"Project-Id-Version: gaim 0.57\n"
+"POT-Creation-Date: 2002-05-22 20:45-0400\n"
+"PO-Revision-Date: 2002-05-23 08:01+0200\n"
 "Last-Translator: Przemys³aw Su³ek <pb...@li...>\n"
 "Language-Team: POLISH <pl...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/chatlist.c:67 src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "Czat z kumplem"
+
+#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407
+#: plugins/chatlist.c:409
+msgid "Gaim Chat"
+msgstr "Gaim Czat"
+
+#: plugins/chatlist.c:339 src/about.c:164 src/aim.c:319 src/buddy.c:2687
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
+#: src/conversation.c:2839 src/dialogs.c:567 src/dialogs.c:3899
+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2537 src/prpl.c:438
+#: src/prpl.c:679 src/server.c:1072
+msgid "Close"
+msgstr "Zamknij"
+
+#: plugins/chatlist.c:344
+msgid "Chat Rooms"
+msgstr "Pokoje czat"
+
+#: plugins/chatlist.c:363
+msgid "Refresh"
+msgstr "Od¶wie¿"
+
+#. Put the buttons in the box
+#: plugins/chatlist.c:364 src/buddy.c:489 src/buddy.c:2798
+#: src/buddy_chat.c:1454 src/conversation.c:2372 src/conversation.c:2854
+#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
+#: src/prefs.c:2031 src/prefs.c:2373 src/prefs.c:2407
+msgid "Add"
+msgstr "Dodaj"
+
+#: plugins/chatlist.c:365 src/buddy.c:491 src/buddy.c:2800
+#: src/buddy_chat.c:1456 src/conversation.c:2358 src/conversation.c:2851
+#: src/prefs.c:2045 src/prefs.c:2377 src/prefs.c:2411
+msgid "Remove"
+msgstr "Usuñ"
+
+#: plugins/chatlist.c:388
+msgid "List of available chats"
+msgstr "Lista dostêpnych czatów"
+
+#: plugins/chatlist.c:398
+msgid "List of subscribed chats"
+msgstr "Lista subskrybowanych czatów"
+
+#: plugins/gtik.c:699
+msgid "Gnome Stock Ticker Properties"
+msgstr ""
+
+#: plugins/gtik.c:711
+msgid "Update Frequency in min"
+msgstr "Od¶wie¿anie w minutach"
+
+#: plugins/gtik.c:727
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr "Wprowad¼ symbole w oknie poni¿ej rozdzielaj±c je \"+\""
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:737
+msgid "Check this box to display only symbols and price:"
+msgstr "Zaznacz to by wy¶wietlaæ tylko symbole i cenê:"
+
+#: plugins/gtik.c:738
+msgid "Check this box to scroll left to right:"
+msgstr "Zaznacz to by przewijaæ od lewej do prawej"
+
+#: plugins/gtik.c:974
+msgid "(No"
+msgstr "(Nie"
+
+#: plugins/gtik.c:975
+msgid "Change"
+msgstr "Zmieñ"
+
 #: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1915
 msgid "Available"
 msgstr "Dostêpny"
@@ -296,7 +372,7 @@
 msgstr "Wy¶lij wiadomo¶æ poprzez serwer"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2323 src/protocols/oscar/oscar.c:3580
+#: src/protocols/jabber/jabber.c:2323 src/protocols/oscar/oscar.c:3583
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "Pobierz informacjê"
@@ -333,7 +409,7 @@
 msgid ""
 "%s has requested a DCC chat.  Would you like to establish the direct "
 "connection?"
-msgstr "%s za¿±da³ chatu DCC. Czy chcesz ustanowiæ po³±czenie bezpo¶rednie?"
+msgstr "%s za¿±da³ czatu DCC. Czy chcesz ustanowiæ po³±czenie bezpo¶rednie?"
 
 #: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:310
 msgid "Unable to write"
@@ -483,7 +559,7 @@
 msgstr "Nieznany"
 
 #: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2328
-#: src/protocols/oscar/oscar.c:3593
+#: src/protocols/oscar/oscar.c:3596
 msgid "Get Away Msg"
 msgstr "Pobierz wiadomo¶æ Zajêty"
 
@@ -841,7 +917,7 @@
 msgid "Invalid name"
 msgstr "Niepoprawna nazwa"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3196
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3199
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "Do jakiej grupy przy³±czyæ:"
@@ -876,15 +952,15 @@
 
 #: src/protocols/oscar/oscar.c:395
 msgid "Chat Error!"
-msgstr "B³±d Chat!"
+msgstr "B³±d Czat!"
 
 #: src/protocols/oscar/oscar.c:407
 msgid "Chat is currently unavailable"
-msgstr "Chat jest w tej chwili niedostêpny"
+msgstr "Czat jest w tej chwili niedostêpny"
 
 #: src/protocols/oscar/oscar.c:408
 msgid "Gaim - Chat"
-msgstr "Gaim - Chat"
+msgstr "Gaim - Czat"
 
 #: src/protocols/oscar/oscar.c:467 src/protocols/oscar/oscar.c:527
 msgid "Couldn't connect to host"
@@ -952,7 +1028,7 @@
 msgid "Internal Error"
 msgstr "B³±d wewnêtrzny"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3407
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3410
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Ustanowiono bezpo¶redni IM z %s"
@@ -964,8 +1040,8 @@
 "the following reason:\n"
 "%s"
 msgstr ""
-"U¿ytkownik %lu odrzuci³ Twoj± pro¶bê o dodanie go do Twojej listy u¿ytkowników "
-"z nastêpuj±cego powodu:\n"
+"U¿ytkownik %lu odrzuci³ Twoj± pro¶bê o dodanie go do Twojej listy "
+"u¿ytkowników z nastêpuj±cego powodu:\n"
 "%s"
 
 #: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:2446
@@ -980,7 +1056,8 @@
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
-"U¿ytkownik %lu zaakceptowa³ Twoj± pro¶bê o dodanie go do Twojej listy u¿ytkowników."
+"U¿ytkownik %lu zaakceptowa³ Twoj± pro¶bê o dodanie go do Twojej listy "
+"u¿ytkowników."
 
 #: src/protocols/oscar/oscar.c:1502 src/protocols/oscar/oscar.c:2454
 msgid "Gaim - ICQ Authorization Granted"
@@ -1101,7 +1178,7 @@
 #: src/buddy.c:495 src/buddy.c:2111 src/buddy.c:2552 src/prefs.c:2914
 #: src/protocols/oscar/oscar.c:1801
 msgid "Chat"
-msgstr "Chat"
+msgstr "Czat"
 
 #: src/buddy.c:2114 src/protocols/oscar/oscar.c:1804
 msgid "Get File"
@@ -1160,10 +1237,11 @@
 "Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
 msgstr ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Opis:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Zwyk³y u¿ytkownik AIM<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
-"\"dt_icon.gif\"> : Testowy u¿ytkownik AIM <br><IMG SRC=\"admin_icon.gif\"> : "
-"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
-"Agent<br><IMG SRC=\"wireless_icon.gif\"> :  U¿ytkownik urz±dzenia bezprzewodowego<br>"
+"\"> : Zwyk³y u¿ytkownik AIM<br><IMG SRC=\"aol_icon.gif\"> : AOL User "
+"<br><IMG SRC=\"dt_icon.gif\"> : Testowy u¿ytkownik AIM <br><IMG SRC="
+"\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
+"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> :  "
+"U¿ytkownik urz±dzenia bezprzewodowego<br>"
 
 #: src/protocols/oscar/oscar.c:1904
 #, c-format
@@ -1206,36 +1284,37 @@
 "Ostatnia wiadomo¶æ nie zosta³a wys³ana poniewa¿ przekroczy³e¶ limit "
 "prêdko¶ci. Zaczekaj 10 sekund i spróbuj ponownie."
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2576
-#: src/protocols/oscar/oscar.c:3528 src/protocols/toc/toc.c:1564
+#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2579
+#: src/protocols/oscar/oscar.c:3531 src/protocols/toc/toc.c:1564
 #: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
 #: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
 #: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
 msgid "Error"
 msgstr "B³±d"
 
-#: src/protocols/oscar/oscar.c:3179
+#: src/protocols/oscar/oscar.c:3182
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 "Maksymalna dopuszczalna liczba kumpli na Twojej li¶cie to %d, a masz ich %d. "
-"Dopóki przekraczasz limit niektórzy kolesie nie bêd± pokazywani jako dostêpni."
+"Dopóki przekraczasz limit niektórzy kolesie nie bêd± pokazywani jako "
+"dostêpni."
 
-#: src/protocols/oscar/oscar.c:3182
+#: src/protocols/oscar/oscar.c:3185
 msgid "Gaim - Warning"
 msgstr "Gaim - Ostrze¿enie"
 
-#: src/protocols/oscar/oscar.c:3200 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3203 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "Wymiana:"
 
-#: src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3531
 msgid "Unable to open Direct IM"
 msgstr "Nie mo¿na otworzyæ bezpo¶redniego IM"
 
-#: src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:3541
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1246,7 +1325,7 @@
 "zobaczyæ twój adres IP i mo¿e to byæ ryzykiem zabezpieczeñ. Czy chcesz "
 "kontynuowaæ?"
 
-#: src/protocols/oscar/oscar.c:3555
+#: src/protocols/oscar/oscar.c:3558
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
@@ -1255,7 +1334,7 @@
 "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR><I>Zdalny klient nie potrafi "
 "wysy³aæ wiadomo¶ci o stanie.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3562
+#: src/protocols/oscar/oscar.c:3565
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
@@ -1264,15 +1343,15 @@
 "<B>UIN:</B> %s<BR><B>Stan:</B> %s<BR><HR><BR><I>U¿ytkownik nie ma wiadomo¶ci "
 "o stanie.</I><BR>"
 
-#: src/protocols/oscar/oscar.c:3587
+#: src/protocols/oscar/oscar.c:3590
 msgid "Get Status Msg"
 msgstr "Pobierz wiadomo¶æ o stanie"
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3603
 msgid "Direct IM"
 msgstr "Bezpo¶rednia IM"
 
-#: src/protocols/oscar/oscar.c:3608
+#: src/protocols/oscar/oscar.c:3611
 msgid "Get Capabilities"
 msgstr "Pobierz uprawnienia: "
 
@@ -1308,7 +1387,7 @@
 #: src/protocols/toc/toc.c:416
 #, c-format
 msgid "Chat in %s is not available."
-msgstr "Chat w %s jest niedostêpny."
+msgstr "Czat w %s jest niedostêpny."
 
 #: src/protocols/toc/toc.c:419
 #, c-format
@@ -1411,7 +1490,7 @@
 
 #: src/protocols/toc/toc.c:763
 msgid "Chat Error"
-msgstr "B³±d Chat"
+msgstr "B³±d Czat"
 
 #: src/protocols/toc/toc.c:782
 msgid "Password Change Successful"
@@ -1516,6 +1595,7 @@
 "IRC: #gaim na irc.openprojects.net"
 
 #: src/about.c:146
+#, fuzzy
 msgid ""
 "Active Developers\n"
 "====================\n"
@@ -1533,12 +1613,12 @@
 "===================\n"
 "Jim Duchek\n"
 "Eric Warmenhoven                   [ war...@ya... ]\n"
-"Mark Spencer (author orygina³u)   [ mar...@ma... ]"
+"Mark Spencer (original author)   [ mar...@ma... ]"
 msgstr ""
 "Aktywni Deweloperzy\n"
 "====================\n"
-"Rob Flynn (maintainer) [ ro...@ma... ]\n"
-"Sean Egan (coder)      [ bj...@bi... ]\n"
+"Rob Flynn (opiekun)    [ ro...@ma... ]\n"
+"Sean Egan (koder)      [ bj...@bi... ]\n"
 "\n"
 "Autorzy Szalonych £atek\n"
 "===================\n"
@@ -1551,14 +1631,7 @@
 "===================\n"
 "Jim Duchek\n"
 "Eric Warmenhoven                   [ war...@ya... ]\n"
-"Mark Spencer (original author)   [ mar...@ma... ]"
-
-#: src/about.c:164 src/aim.c:319 src/buddy.c:2687 src/buddy_chat.c:1322
-#: src/buddy_chat.c:1419 src/buddy_chat.c:1449 src/conversation.c:2839
-#: src/dialogs.c:567 src/dialogs.c:3899 src/multi.c:1069 src/plugins.c:277
-#: src/prefs.c:2537 src/prpl.c:438 src/prpl.c:679 src/server.c:1072
-msgid "Close"
-msgstr "Zamknij"
+"Mark Spencer (autor orygina³u)     [ mar...@ma... ]"
 
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
@@ -1668,24 +1741,10 @@
 msgid "Set All Away"
 msgstr "Ustaw wszystkie Zajêty"
 
-#. Put the buttons in the box
-#: src/buddy.c:489 src/buddy.c:2798 src/buddy_chat.c:1454
-#: src/conversation.c:2372 src/conversation.c:2854 src/dialogs.c:932
-#: src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053 src/prefs.c:2031
-#: src/prefs.c:2373 src/prefs.c:2407
-msgid "Add"
-msgstr "Dodaj"
-
 #: src/buddy.c:490 src/buddy.c:2799 src/dialogs.c:942 src/dialogs.c:1089
 msgid "Group"
 msgstr "Grupa"
 
-#: src/buddy.c:491 src/buddy.c:2800 src/buddy_chat.c:1456
-#: src/conversation.c:2358 src/conversation.c:2851 src/prefs.c:2045
-#: src/prefs.c:2377 src/prefs.c:2411
-msgid "Remove"
-msgstr "Usuñ"
-
 #: src/buddy.c:496 src/buddy.c:661 src/buddy.c:825 src/buddy.c:2550
 #: src/buddy_chat.c:861 src/buddy_chat.c:1278
 msgid "IM"
@@ -1784,7 +1843,7 @@
 
 #: src/buddy.c:2587
 msgid "Start/join a Buddy Chat"
-msgstr "Rozpocznij/przy³±cz do chatu kumpla"
+msgstr "Rozpocznij/przy³±cz do czatu kumpla"
 
 #: src/buddy.c:2588
 msgid "Activate Away Message"
@@ -1800,7 +1859,7 @@
 
 #: src/buddy.c:2666
 msgid "Join A Chat"
-msgstr "Przy³±cz do chatu"
+msgstr "Przy³±cz do czatu"
 
 #: src/buddy.c:2668
 msgid "New Instant Message"
@@ -1884,15 +1943,11 @@
 
 #: src/buddy_chat.c:265
 msgid "Join Chat"
-msgstr "Przy³±cz do chatu"
-
-#: src/buddy_chat.c:272
-msgid "Buddy Chat"
-msgstr "Chat z kumplem"
+msgstr "Przy³±cz do czatu"
 
 #: src/buddy_chat.c:283
 msgid "Join Chat As:"
-msgstr "Przy³±cz do chatu jako:"
+msgstr "Przy³±cz do czatu jako:"
 
 #: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
 #: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
@@ -1923,7 +1978,7 @@
 
 #: src/buddy_chat.c:454
 msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "Gaim - zawo³aj kumpla do pokoju chat"
+msgstr "Gaim - zawo³aj kumpla do pokoju czat"
 
 #: src/buddy_chat.c:868
 msgid "Un-Ignore"
@@ -1962,7 +2017,7 @@
 
 #: src/buddy_chat.c:1155
 msgid "Gaim - Group Chats"
-msgstr "Gaim - grupy chatów"
+msgstr "Gaim - grupy czatów"
 
 #: src/buddy_chat.c:1218
 msgid "Topic:"
@@ -1970,7 +2025,7 @@
 
 #: src/buddy_chat.c:1259
 msgid "0 people in room"
-msgstr "0 ludzi w pokoju"
+msgstr "Nie ma ludzi w pokoju"
 
 #: src/buddy_chat.c:1333 src/buddy_chat.c:1417
 msgid "Whisper"
@@ -2580,6 +2635,10 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: B³±d otwierania po³±czenia.\n"
 
+#: src/module.c:106 src/module.c:112 src/module.c:122
+msgid "Plugin Error"
+msgstr "B³±d wtyczki"
+
 #: src/multi.c:454
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - wczytaj ikonê u¿ytkownika"
@@ -2942,7 +3001,7 @@
 
 #: src/prefs.c:585
 msgid "Hide IM/Info/Chat buttons"
-msgstr "Ukryj przyciski IM/Info/Chat"
+msgstr "Ukryj przyciski IM/Info/Czat"
 
 #: src/prefs.c:587
 msgid "Automatically show buddy list on sign on"
@@ -3110,7 +3169,7 @@
 
 #: src/prefs.c:959
 msgid "Show chats in the same tabbed window"
-msgstr "Poka¿ wszystkie chaty w jednym oknie z zak³adkami"
+msgstr "Poka¿ wszystkie czaty w jednym oknie z zak³adkami"
 
 #: src/prefs.c:966 src/prefs.c:1118
 msgid "Raise windows on events"
@@ -3170,15 +3229,15 @@
 
 #: src/prefs.c:1062
 msgid "Chat Options"
-msgstr "Opcje chatu"
+msgstr "Opcje czatu"
 
 #: src/prefs.c:1074
 msgid "Group Chat Window"
-msgstr "Okno grupy chatu"
+msgstr "Okno grupy czatu"
 
 #: src/prefs.c:1109
 msgid "Show all chats in one tabbed window"
-msgstr "Poka¿ wszystkie chaty w jednym oknie z zak³adkami"
+msgstr "Poka¿ wszystkie czaty w jednym oknie z zak³adkami"
 
 #: src/prefs.c:1111
 msgid "Show conversations in the same tabbed window"
@@ -3462,20 +3521,51 @@
 msgid "More Info"
 msgstr "Wiêcej informacji"
 
+#: src/sound.c:59
+msgid "Buddy logs in"
+msgstr "Kumpel loguje siê"
+
+#: src/sound.c:60
+msgid "Buddy logs out"
+msgstr "Kumpel wylogowuje siê"
+
+#: src/sound.c:61
+msgid "Message received"
+msgstr "Odebrano wiadomo¶æ"
+
+#: src/sound.c:62
+msgid "Message received begins conversation"
+msgstr "Odebrana wiadomo¶æ rozpoczyna rozmowê"
+
+#: src/sound.c:63
+msgid "Message sent"
+msgstr "Wiadomo¶æ wys³ana"
+
+#: src/sound.c:64
+msgid "Person enters chat"
+msgstr "Osoba wchodzi na czat"
+
+#: src/sound.c:65
+msgid "Person leaves chat"
+msgstr "Osoba opuszcza czat"
+
+#: src/sound.c:66
+msgid "You talk in chat"
+msgstr "Móiwsz na czacie"
+
+#: src/sound.c:67
+msgid "Others talk in chat"
+msgstr "Inni mówi± na czacie"
+
+#: src/sound.c:69
+msgid "Someone says your name in chat"
+msgstr "Kto¶ wymawia Twoje imiê na czacie"
+
 #~ msgid "Events"
 #~ msgstr "Zdarzenia"
 
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "D¼wiêk gdy kole¶ siê loguje"
-
-#~ msgid "Sound when buddy logs out"
-#~ msgstr "D¼wiêk gdy kole¶ siê wylogowuje"
-
-#~ msgid "Sound when received message begins conversation"
-#~ msgstr "D¼wiêk gdy odebrana wiadomo¶æ rozpoczyna rozmowê"
-
-#~ msgid "Sound when message is received"
-#~ msgstr "D¼wiêk gdy odebrano wiadomo¶æ"
 
 #~ msgid "Sound when message is sent"
 #~ msgstr "D¼wiêk gdy wiadomo¶æ wys³ana"

[Gaim-commits] CVS: gaim/src buddy.c,1.312,1.313

[Jim S. <jse...@us...>]

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

Modified Files:
	buddy.c 
Log Message:
Fix for "away" pop-up menu "sticking."  (Thanks, Jason Willis)


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- buddy.c	15 May 2002 02:26:03 -0000	1.312
+++ buddy.c	23 May 2002 00:47:30 -0000	1.313
@@ -1552,11 +1552,10 @@
 		gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 				   GTK_SIGNAL_FUNC(do_away_message), a);
 		gtk_widget_show(menuitem);
-
 		awy = awy->next;
 	}
 
-	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, time(NULL));
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME );
 }
 
 void rem_bp(GtkWidget *w, struct buddy_pounce *b)

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.138,1.139

[Jim S. <jse...@us...>]

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

Modified Files:
	oscar.c 
Log Message:
Fix crash for checking ICQ info of people not in your contact list.
(Thanks, Mark Doliner)


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- oscar.c	21 May 2002 21:26:53 -0000	1.138
+++ oscar.c	23 May 2002 00:06:01 -0000	1.139
@@ -2503,19 +2503,22 @@
 	 * parse-icq-status-message function knows if it is putting it's message in 
 	 * an info window because the name will _not_ be in od->evilhack.  For getting 
 	 * only the away message the contact's UIN is put in od->evilhack. */
-	if ((budlight = find_buddy(gc, who)) && ((budlight->uc >> 7) & (AIM_ICQ_STATE_AWAY || AIM_ICQ_STATE_DND || AIM_ICQ_STATE_OUT || AIM_ICQ_STATE_BUSY || AIM_ICQ_STATE_CHAT))) {
-		if (budlight->caps & AIM_CAPS_ICQSERVERRELAY)
-			g_show_info_text(gc, who, 0, buf, NULL);
-		else {
+	if (budlight = find_buddy(gc, who)) {
+		if ((budlight->uc >> 7) & (AIM_ICQ_STATE_AWAY || AIM_ICQ_STATE_DND || AIM_ICQ_STATE_OUT || AIM_ICQ_STATE_BUSY || AIM_ICQ_STATE_CHAT)) {
+			if (budlight->caps & AIM_CAPS_ICQSERVERRELAY)
+				g_show_info_text(gc, who, 0, buf, NULL);
+			else {
+				char *state_msg = gaim_icq_status((budlight->uc & 0xff80) >> 7);
+				g_show_info_text(gc, who, 2, buf, "<B>Status:</B> ", state_msg, "<BR>\n<HR><BR><I>Remote client does not support sending status messages.</I><BR>\n", NULL);
+				free(state_msg);
+			}
+		} else {
 			char *state_msg = gaim_icq_status((budlight->uc & 0xff80) >> 7);
-			g_show_info_text(gc, who, 2, buf, "<B>Status:</B> ", state_msg, "<BR>\n<HR><BR><I>Remote client does not support sending status messages.</I><BR>\n", NULL);
+			g_show_info_text(gc, who, 2, buf, "<B>Status:</B> ", state_msg, NULL);
 			free(state_msg);
 		}
-	} else {
-		char *state_msg = gaim_icq_status((budlight->uc & 0xff80) >> 7);
-		g_show_info_text(gc, who, 2, buf, "<B>Status:</B> ", state_msg, NULL);
-		free(state_msg);
-	}
+	} else
+		g_show_info_text(gc, who, 2, buf, NULL);
 
 	return 1;
 }

[Gaim-commits] CVS: gaim/po pl.po,1.12,1.13

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

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

Modified Files:
	pl.po 
Log Message:
la



Index: pl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/pl.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pl.po	14 Apr 2002 22:44:28 -0000	1.12
+++ pl.po	22 May 2002 12:25:44 -0000	1.13
@@ -5,14 +5,43 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.56\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
-"PO-Revision-Date: 2002-04-14 23:30+0200\n"
+"POT-Creation-Date: 2002-05-20 19:16-0400\n"
+"PO-Revision-Date: 2002-05-21 12:30+0200\n"
 "Last-Translator: Przemys³aw Su³ek <pb...@li...>\n"
 "Language-Team: POLISH <pl...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
[...3583 lines suppressed...]
-#~ "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!"

[Gaim-commits] CVS: gaim ChangeLog,1.486,1.487

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

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

Modified Files:
	ChangeLog 
Log Message:
la



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -d -r1.486 -r1.487
--- ChangeLog	19 May 2002 17:27:06 -0000	1.486
+++ ChangeLog	22 May 2002 12:25:44 -0000	1.487
@@ -6,6 +6,7 @@
 	* Spanish translation updated (Thanks, Alex)
 	* Traditional Chinese translation updated (Thanks, Paladin Liu)
 	* Czech translation added (Thanks, Honza)
+	* Polish translation updated (Thanks Przemyslaw Sulek)
 	* Squashed a bug in buddy right-click menu handling
 	  that crashed Gaim.  In the process: found and
 	  eliminated some memory leaks.

[Gaim-commits] CVS: gaim/po POTFILES.in,1.13,1.14

[Jim S. <jse...@us...>]

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

Modified Files:
	POTFILES.in 
Log Message:
Added missing files. (See bug: [ 557826 ] Files missing from POTFILES.in)


Index: POTFILES.in
===================================================================
RCS file: /cvsroot/gaim/gaim/po/POTFILES.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- POTFILES.in	7 Nov 2001 00:46:18 -0000	1.13
+++ POTFILES.in	21 May 2002 23:07:15 -0000	1.14
@@ -1,3 +1,5 @@
+plugins/chatlist.c
+plugins/gtik.c
 src/protocols/gg/gg.c
 src/protocols/icq/gaim_icq.c
 src/protocols/irc/irc.c
@@ -18,9 +20,11 @@
 src/dialogs.c
 src/gaimrc.c
 src/html.c
+src/module.c
 src/multi.c
 src/perl.c
 src/plugins.c
 src/prefs.c
 src/prpl.c
 src/server.c
+src/sound.c

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.137,1.138

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

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

Modified Files:
	oscar.c 
Log Message:
SmarterChild, Agent Reuters, and RingMessenger are on ICQ now.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- oscar.c	5 May 2002 19:20:18 -0000	1.137
+++ oscar.c	21 May 2002 21:26:53 -0000	1.138
@@ -1150,22 +1150,22 @@
 
 	if (info->present & AIM_USERINFO_PRESENT_CAPABILITIES)
 		caps = info->capabilities;
+	if (info->flags & AIM_FLAG_ACTIVEBUDDY)
+		type |= UC_AB;
 
-	if (!od->icq && (info->present & AIM_USERINFO_PRESENT_FLAGS)) {
-		if (info->flags & AIM_FLAG_ACTIVEBUDDY)
-			type |= UC_AB;
-		if (info->flags & AIM_FLAG_UNCONFIRMED)
-			type |= UC_UNCONFIRMED;
-		if (info->flags & AIM_FLAG_ADMINISTRATOR)
-			type |= UC_ADMIN;
-		if (info->flags & AIM_FLAG_AOL)
-			type |= UC_AOL;
-		if (info->flags & AIM_FLAG_FREE)
-			type |= UC_NORMAL;
-		if (info->flags & AIM_FLAG_AWAY)
-			type |= UC_UNAVAILABLE;
-		if (info->flags & AIM_FLAG_WIRELESS)
-			type |= UC_WIRELESS;
+	if ((!od->icq) && (info->present & AIM_USERINFO_PRESENT_FLAGS)) {
+			if (info->flags & AIM_FLAG_UNCONFIRMED)
+				type |= UC_UNCONFIRMED;
+			if (info->flags & AIM_FLAG_ADMINISTRATOR)
+				type |= UC_ADMIN;
+			if (info->flags & AIM_FLAG_AOL)
+				type |= UC_AOL;
+			if (info->flags & AIM_FLAG_FREE)
+				type |= UC_NORMAL;
+			if (info->flags & AIM_FLAG_AWAY)
+				type |= UC_UNAVAILABLE;
+			if (info->flags & AIM_FLAG_WIRELESS)
+				type |= UC_WIRELESS;
 	}
 	if (info->present & AIM_USERINFO_PRESENT_ICQEXTSTATUS) {
 		type = (info->icqinfo.status << 7);

[Gaim-commits] CVS: gaim configure.ac,1.68,1.69 configure.in,1.112,1.113

[Jim S. <jse...@us...>]

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

Modified Files:
	configure.ac configure.in 
Log Message:
Since "Z" does not a "z" make, make did not make.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- configure.ac	19 May 2002 17:32:43 -0000	1.68
+++ configure.ac	19 May 2002 19:09:15 -0000	1.69
@@ -15,7 +15,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv Zh_CN zh_TW"
+ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv zh_CN zh_TW"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- configure.in	19 May 2002 17:32:43 -0000	1.112
+++ configure.in	19 May 2002 19:09:15 -0000	1.113
@@ -15,7 +15,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv Zh_CN zh_TW"
+ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv zh_CN zh_TW"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

[Gaim-commits] CVS: gaim configure.in,1.111,1.112 configure.ac,1.67,1.68

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

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

Modified Files:
	configure.in configure.ac 
Log Message:
i got weird.



Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- configure.in	19 May 2002 17:27:06 -0000	1.111
+++ configure.in	19 May 2002 17:32:43 -0000	1.112
@@ -15,7 +15,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="da de es fr ko ru zh_CN pl nl sv fi sk it ja bg hu zh_TW cs"
+ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv Zh_CN zh_TW"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- configure.ac	19 May 2002 17:27:06 -0000	1.67
+++ configure.ac	19 May 2002 17:32:43 -0000	1.68
@@ -15,7 +15,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="da de es fr ko ru zh_CN pl nl sv fi sk it ja bg hu zh_TW cs"
+ALL_LINGUAS="bg cs da de es fi fr hu it ja ko nl pl ru sk sv Zh_CN zh_TW"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

[Gaim-commits] CVS: gaim/po cs.po,NONE,1.1 .cvsignore,1.20,1.21

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

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

Modified Files:
	.cvsignore 
Added Files:
	cs.po 
Log Message:
Czech translation added.



--- NEW FILE: cs.po ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# Honza Král <hk...@ce...>, 2002.
#
msgid ""
msgstr ""
"Project-Id-Version: gaim 0.48\n"
"POT-Creation-Date: 2002-04-26 01:28-0400\n"
"PO-Revision-Date: 2002-05-05 17:15GMT+1\n"
"Last-Translator: Honza Král <hk...@ce...>\n"
"Language-Team: Èeský jazyk <cs...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"

#: src/protocols/gg/gg.c:71
msgid "Available"
msgstr "Pøítomen"

[...3096 lines suppressed...]
msgid "(1 messege)"
msgstr "(1 zpráva)"

#: src/server.c:783
msgid "Warned"
msgstr "Varován"

#: src/server.c:876
msgid "Yes"
msgstr "Ano"

#: src/server.c:877
msgid "No"
msgstr "Ne"

#: src/server.c:1076
#, fuzzy
msgid "More Info"
msgstr "Víc informací"


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/po/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- .cvsignore	14 May 2002 18:24:30 -0000	1.20
+++ .cvsignore	19 May 2002 17:27:06 -0000	1.21
@@ -23,3 +23,4 @@
 bg.gmo
 hu.gmo
 zh_TW.gmo
+cs.gmo

[Gaim-commits] CVS: gaim configure.in,1.110,1.111 configure.ac,1.66,1.67 ChangeLog,1.485,1.486

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

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

Modified Files:
	configure.in configure.ac ChangeLog 
Log Message:
Czech translation added.



Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- configure.in	14 May 2002 18:24:30 -0000	1.110
+++ configure.in	19 May 2002 17:27:06 -0000	1.111
@@ -15,7 +15,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="da de es fr ko ru zh_CN pl nl sv fi sk it ja bg hu zh_TW"
+ALL_LINGUAS="da de es fr ko ru zh_CN pl nl sv fi sk it ja bg hu zh_TW cs"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- configure.ac	14 May 2002 18:24:30 -0000	1.66
+++ configure.ac	19 May 2002 17:27:06 -0000	1.67
@@ -15,7 +15,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="da de es fr ko ru zh_CN pl nl sv fi sk it ja bg hu zh_TW"
+ALL_LINGUAS="da de es fr ko ru zh_CN pl nl sv fi sk it ja bg hu zh_TW cs"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -d -r1.485 -r1.486
--- ChangeLog	19 May 2002 03:11:09 -0000	1.485
+++ ChangeLog	19 May 2002 17:27:06 -0000	1.486
@@ -5,6 +5,7 @@
 	* Swedish translation updated (Thanks, Christian Rose)
 	* Spanish translation updated (Thanks, Alex)
 	* Traditional Chinese translation updated (Thanks, Paladin Liu)
+	* Czech translation added (Thanks, Honza)
 	* Squashed a bug in buddy right-click menu handling
 	  that crashed Gaim.  In the process: found and
 	  eliminated some memory leaks.

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.76,1.77

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

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

Modified Files:
	msn.c 
Log Message:
lala



Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- msn.c	7 May 2002 23:13:20 -0000	1.76
+++ msn.c	19 May 2002 03:11:09 -0000	1.77
@@ -68,7 +68,7 @@
 #define MIME_HEADER	"MIME-Version: 1.0\r\n" \
 			"Content-Type: text/plain; charset=UTF-8\r\n" \
 			"User-Agent: Gaim/" VERSION "\r\n" \
-			"X-MMS-IM-Format: FN=MS%20Sans%20Serif; EF=; CO=0; PF=0\r\n\r\n"
+			"X-MMS-IM-Format: FN=Arial; EF=; CO=0; PF=0\r\n\r\n"
 
 #define HOTMAIL_URL "http://www.hotmail.com/cgi-bin/folders"
 #define PASSPORT_URL "http://lc1.law13.hotmail.passport.com/cgi-bin/dologin?login="
@@ -222,128 +222,128 @@
 
 	switch (errcode) {
 		case 200:
-			g_snprintf(msg, sizeof(msg), "Syntax Error (probably a Gaim bug)");
+			g_snprintf(msg, sizeof(msg), _("Syntax Error (probably a Gaim bug)"));
 			break;
 		case 201:
-			g_snprintf(msg, sizeof(msg), "Invalid Parameter (probably a Gaim bug)");
+			g_snprintf(msg, sizeof(msg), _("Invalid Parameter (probably a Gaim bug)"));
 			break;
 		case 205:
-			g_snprintf(msg, sizeof(msg), "Invalid User");
+			g_snprintf(msg, sizeof(msg), _("Invalid User"));
 			break;
 		case 206:
-			g_snprintf(msg, sizeof(msg), "Fully Qualified Domain Name missing");
+			g_snprintf(msg, sizeof(msg), _("Fully Qualified Domain Name missing"));
 			break;
 		case 207:
-			g_snprintf(msg, sizeof(msg), "Already Login");
+			g_snprintf(msg, sizeof(msg), _("Already Login"));
 			break;
 		case 208:
-			g_snprintf(msg, sizeof(msg), "Invalid Username");
+			g_snprintf(msg, sizeof(msg), _("Invalid Username"));
 			break;
 		case 209:
-			g_snprintf(msg, sizeof(msg), "Invalid Friendly Name");
+			g_snprintf(msg, sizeof(msg), _("Invalid Friendly Name"));
 			break;
 		case 210:
-			g_snprintf(msg, sizeof(msg), "List Full");
+			g_snprintf(msg, sizeof(msg), _("List Full"));
 			break;
 		case 215:
-			g_snprintf(msg, sizeof(msg), "Already there");
+			g_snprintf(msg, sizeof(msg), _("Already there"));
 			break;
 		case 216:
-			g_snprintf(msg, sizeof(msg), "Not on list");
+			g_snprintf(msg, sizeof(msg), _("Not on list"));
 			break;
 		case 217:
-			g_snprintf(msg, sizeof(msg), "User is offline");
+			g_snprintf(msg, sizeof(msg), _("User is offline"));
 			break;
 		case 218:
-			g_snprintf(msg, sizeof(msg), "Already in the mode");
+			g_snprintf(msg, sizeof(msg), _("Already in the mode"));
 			break;
 		case 219:
-			g_snprintf(msg, sizeof(msg), "Already in opposite list");
+			g_snprintf(msg, sizeof(msg), _("Already in opposite list"));
 			break;
 		case 280:
-			g_snprintf(msg, sizeof(msg), "Switchboard failed");
+			g_snprintf(msg, sizeof(msg), _("Switchboard failed"));
 			break;
 		case 281:
-			g_snprintf(msg, sizeof(msg), "Notify Transfer failed");
+			g_snprintf(msg, sizeof(msg), _("Notify Transfer failed"));
 			break;
 
 		case 300:
-			g_snprintf(msg, sizeof(msg), "Required fields missing");
+			g_snprintf(msg, sizeof(msg), _("Required fields missing"));
 			break;
 		case 302:
-			g_snprintf(msg, sizeof(msg), "Not logged in");
+			g_snprintf(msg, sizeof(msg), _("Not logged in"));
 			break;
 
 		case 500:
-			g_snprintf(msg, sizeof(msg), "Internal server error");
+			g_snprintf(msg, sizeof(msg), _("Internal server error"));
 			break;
 		case 501:
-			g_snprintf(msg, sizeof(msg), "Database server error");
+			g_snprintf(msg, sizeof(msg), _("Database server error"));
 			break;
 		case 510:
-			g_snprintf(msg, sizeof(msg), "File operation error");
+			g_snprintf(msg, sizeof(msg), _("File operation error"));
 			break;
 		case 520:
-			g_snprintf(msg, sizeof(msg), "Memory allocation error");
+			g_snprintf(msg, sizeof(msg), _("Memory allocation error"));
 			break;
 
 		case 600:
-			g_snprintf(msg, sizeof(msg), "Server busy");
+			g_snprintf(msg, sizeof(msg), _("Server busy"));
 			break;
 		case 601:
-			g_snprintf(msg, sizeof(msg), "Server unavailable");
+			g_snprintf(msg, sizeof(msg), _("Server unavailable"));
 			break;
 		case 602:
-			g_snprintf(msg, sizeof(msg), "Peer Notification server down");
+			g_snprintf(msg, sizeof(msg), _("Peer Notification server down"));
 			break;
 		case 603:
-			g_snprintf(msg, sizeof(msg), "Database connect error");
+			g_snprintf(msg, sizeof(msg), _("Database connect error"));
 			break;
 		case 604:
-			g_snprintf(msg, sizeof(msg), "Server is going down (abandon ship)");
+			g_snprintf(msg, sizeof(msg), _("Server is going down (abandon ship)"));
 			break;
 
 		case 707:
-			g_snprintf(msg, sizeof(msg), "Error creating connection");
+			g_snprintf(msg, sizeof(msg), _("Error creating connection"));
 			break;
 		case 711:
-			g_snprintf(msg, sizeof(msg), "Unable to write");
+			g_snprintf(msg, sizeof(msg), _("Unable to write"));
 			break;
 		case 712:
-			g_snprintf(msg, sizeof(msg), "Session overload");
+			g_snprintf(msg, sizeof(msg), _("Session overload"));
 			break;
 		case 713:
-			g_snprintf(msg, sizeof(msg), "User is too active");
+			g_snprintf(msg, sizeof(msg), _("User is too active"));
 			break;
 		case 714:
-			g_snprintf(msg, sizeof(msg), "Too many sessions");
+			g_snprintf(msg, sizeof(msg), _("Too many sessions"));
 			break;
 		case 715:
-			g_snprintf(msg, sizeof(msg), "Not expected");
+			g_snprintf(msg, sizeof(msg), _("Not expected"));
 			break;
 		case 717:
-			g_snprintf(msg, sizeof(msg), "Bad friend file");
+			g_snprintf(msg, sizeof(msg), _("Bad friend file"));
 			break;
 
 		case 911:
-			g_snprintf(msg, sizeof(msg), "Authentication failed");
+			g_snprintf(msg, sizeof(msg), _("Authentication failed"));
 			break;
 		case 913:
-			g_snprintf(msg, sizeof(msg), "Not allowed when offline");
+			g_snprintf(msg, sizeof(msg), _("Not allowed when offline"));
 			break;
 	        case 920:
-			g_snprintf(msg, sizeof(msg), "Not accepting new users");
+			g_snprintf(msg, sizeof(msg), _("Not accepting new users"));
 			break;
 	        case 924:
-			g_snprintf(msg, sizeof(msg), "User unverified");
+			g_snprintf(msg, sizeof(msg), _("User unverified"));
 			break;
 		default:
-			g_snprintf(msg, sizeof(msg), "Unknown Error Code");
+			g_snprintf(msg, sizeof(msg), _("Unknown Error Code"));
 			break;
 	}
 
 	if (show)
-		do_error_dialog(msg, "MSN Error");
+		do_error_dialog(msg, _("MSN Error"));
 
 	return msg;
 }
@@ -544,7 +544,7 @@
 		ms->msguser = g_strdup(user);
 		ms->msglen = length;
 	} else if (!g_strncasecmp(buf, "NAK", 3)) {
-		do_error_dialog("A message may not have been received.", "MSN Error");
+		do_error_dialog(_("A message may not have been received."), _("MSN Error"));
 	} else if (!g_strncasecmp(buf, "NLN", 3)) {
 	} else if (!g_strncasecmp(buf, "OUT", 3)) {
 		if (ms->chat)
@@ -921,7 +921,7 @@
 		ap->friend = g_strdup(url_decode(friend));
 		ap->gc = gc;
 
-		g_snprintf(msg, sizeof(msg), "The user %s (%s) wants to add you to their buddy list.",
+		g_snprintf(msg, sizeof(msg), _("The user %s (%s) wants to add you to their buddy list."),
 				ap->user, url_decode(ap->friend));
 
 		do_ask_dialog(msg, ap, msn_accept_add, msn_cancel_add);
@@ -1072,7 +1072,7 @@
 				ap->friend = g_strdup(friend);
 				ap->gc = gc;
                          
-		                g_snprintf(msg, sizeof(msg), "The user %s (%s) wants to add you to their buddy list",ap->user, url_decode(ap->friend));
+		                g_snprintf(msg, sizeof(msg), _("The user %s (%s) wants to add you to their buddy list"),ap->user, url_decode(ap->friend));
 				do_ask_dialog(msg, ap, msn_accept_add, msn_cancel_add);
 			}
 		    }
@@ -1108,7 +1108,7 @@
 				struct buddy *b;
 				md->fl = g_slist_remove(md->fl, mb);
 				if (!(b = find_buddy(gc, mb->user)))
-					add_buddy(gc, "Buddies", mb->user, mb->friend);
+					add_buddy(gc, _("Buddies"), mb->user, mb->friend);
 				else if (!g_strcasecmp(b->name, b->show)) {
 					g_snprintf(b->show, sizeof(b->show), "%s", mb->friend);
 					handle_buddy_rename(b, b->name);
@@ -1433,7 +1433,7 @@
 	len = read(md->fd, buf, sizeof(buf));
 
 	if (len <= 0) {
-		hide_login_progress_error(gc, "Error reading from server");
+		hide_login_progress_error(gc, _("Error reading from server"));
 		signoff(gc);
 		return;
 	}
@@ -1566,7 +1566,7 @@
 			return 0;
 		}
 
-		set_login_progress(gc, 3, "Requesting to send password");
+		set_login_progress(gc, 3, _("Requesting to send password"));
 	} else if (!g_strncasecmp(buf, "USR", 3)) {
 		char *resp, *friend, *tmp = buf;
 
@@ -1613,12 +1613,12 @@
 			strcat(sendbuf, "\n");
 
 			if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
-				hide_login_progress(gc, "Unable to send password");
+				hide_login_progress(gc, _("Unable to send password"));
 				signoff(gc);
 				return 0;
 			}
 
-			set_login_progress(gc, 4, "Password sent");
+			set_login_progress(gc, 4, _("Password sent"));
 		}
 	} else if (!g_strncasecmp(buf, "XFR", 3)) {
 		char *host = strstr(buf, "NS");
@@ -1674,7 +1674,7 @@
 	len = read(md->fd, buf, sizeof(buf));
 
 	if (len <= 0) {
-		hide_login_progress(gc, "Error reading from server");
+		hide_login_progress(gc, _("Error reading from server"));
 		signoff(gc);
 		return;
 	}
@@ -1736,20 +1736,20 @@
 		md->fd = source;
 
 	if (md->fd == -1) {
-		hide_login_progress(gc, "Unable to connect");
+		hide_login_progress(gc, _("Unable to connect"));
 		signoff(gc);
 		return;
 	}
 
 	g_snprintf(buf, sizeof(buf), "VER %d MSNP5\r\n", ++md->trId);
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
-		hide_login_progress(gc, "Unable to write to server");
+		hide_login_progress(gc, _("Unable to write to server"));
 		signoff(gc);
 		return;
 	}
 
 	md->inpa = gaim_input_add(md->fd, GAIM_INPUT_READ, msn_login_callback, gc);
-	set_login_progress(gc, 2, "Synching with server");
+	set_login_progress(gc, 2,_("Synching with server"));
 }
 
 static void msn_login(struct aim_user *user)
@@ -1757,13 +1757,13 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct msn_data *md = gc->proto_data = g_new0(struct msn_data, 1);
 
-	set_login_progress(gc, 1, "Connecting");
+	set_login_progress(gc, 1, _("Connecting"));
 
 	g_snprintf(gc->username, sizeof(gc->username), "%s", msn_normalize(gc->username));
 
 	md->fd = proxy_connect("messenger.hotmail.com", 1863, msn_login_connect, gc);
 	if (md->fd < 0) {
-		hide_login_progress(gc, "Unable to connect");
+		hide_login_progress(gc, _("Unable to connect"));
 		signoff(gc);
 	}
 }
@@ -1912,13 +1912,13 @@
 {
 	GList *m = NULL;
 
-	m = g_list_append(m, "Available");
-	m = g_list_append(m, "Away From Computer");
-	m = g_list_append(m, "Be Right Back");
-	m = g_list_append(m, "Busy");
-	m = g_list_append(m, "On The Phone");
-	m = g_list_append(m, "Out To Lunch");
-	m = g_list_append(m, "Hidden");
+	m = g_list_append(m, _("Available"));
+	m = g_list_append(m, _("Away From Computer"));
+	m = g_list_append(m, _("Be Right Back"));
+	m = g_list_append(m, _("Busy"));
+	m = g_list_append(m, _("On The Phone"));
+	m = g_list_append(m, _("Out To Lunch"));
+	m = g_list_append(m, _("Hidden"));
 
 	return m;
 }
@@ -2034,7 +2034,7 @@
 	static char buf[MSN_BUF_LEN];
 
 	pbm = g_new0(struct proto_buddy_menu, 1);
-	pbm->label = "Reset friendly name";
+	pbm->label = _("Reset friendly name");
 	pbm->callback = msn_reset_friend;
 	pbm->gc = gc;
 	m = g_list_append(m, pbm);
@@ -2043,7 +2043,7 @@
 		return m;
 
 	pbm = g_new0(struct proto_buddy_menu, 1);
-	g_snprintf(buf, sizeof(buf), "Status: %s", msn_get_away_text(b->uc >> 1));
+	g_snprintf(buf, sizeof(buf), _("Status: %s"), msn_get_away_text(b->uc >> 1));
 	pbm->label = buf;
 	pbm->callback = NULL;
 	pbm->gc = gc;
@@ -2104,7 +2104,7 @@
 	char buf[MSN_BUF_LEN];
 
 	if (strlen(url_encode(entry)) >= BUDDY_ALIAS_MAXLEN) {
-		do_error_dialog("Friendly name too long.", "MSN Error");
+		do_error_dialog(_("Friendly name too long."), _("MSN Error"));
 		return;
 	}
 	
@@ -2118,9 +2118,9 @@
 
 static void msn_do_action(struct gaim_connection *gc, char *act)
 {
-	if (!strcmp(act, "Set Friendly Name")) {
-		do_prompt_dialog("Set Friendly Name:", gc->displayname, gc, msn_act_id, NULL);
-	} else if (!strcmp(act, "Reset All Friendly Names")) {
+	if (!strcmp(act, _("Set Friendly Name"))) {
+		do_prompt_dialog(_("Set Friendly Name:"), gc->displayname, gc, msn_act_id, NULL);
+	} else if (!strcmp(act, _("Reset All Friendly Names"))) {
 		GSList *g = gc->groups;
 		while (g) {
 			GSList *m = ((struct group *)g->data)->members;
@@ -2139,7 +2139,7 @@
 {
 	GList *m = NULL;
 
-	m = g_list_append(m, "Set Friendly Name");
+	m = g_list_append(m, _("Set Friendly Name"));
 	m = g_list_append(m, "Reset All Friendly Names");
 
 	return m;

[Gaim-commits] CVS: gaim/po es.po,1.21,1.22

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

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

Modified Files:
	es.po 
Log Message:
lala



Index: es.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/es.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- es.po	12 Apr 2002 02:57:19 -0000	1.21
+++ es.po	19 May 2002 03:11:09 -0000	1.22
@@ -1,13 +1,14 @@
 # translation of PACKAGE.
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Amaya Rodrigo <am...@de...>, March 2002.
+# Alejandro G Villar <al...@te...>, April 2002
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2002-04-11 22:46-0700\n"
 "PO-Revision-Date: 2002-02-23 18:05+0100\n"
-"Last-Translator: Amaya Rodrigo <am...@de...>\n"
+"Last-Translator: Alex Villar <al...@te...>\n"
 "Language-Team:  <es...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
@@ -553,22 +554,216 @@
 msgid "Set User Info"
 msgstr "Información de Usuario"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:2041
-#: src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:826 src/protocols/msn/msn.c:2107
+#: src/protocols/msn/msn.c:2264 src/protocols/msn/msn.c:2297
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:547
 msgid "MSN Error"
 msgstr "Error de MSN"
 
-#: src/protocols/msn/msn.c:719
+#: src/protocols/msn/msn.c:547
+msgid "A message may not have been received."
+msgstr "Puede que no se haya recibido un mensaje"
+
+#: src/protocols/msn/msn.c:826
 msgid "Gaim was unable to send a message"
 msgstr "Gaim no pudo envíar el mensaje"
 
-#: src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:1176
 msgid "You have been disconnected. You have signed on from another location."
-msgstr "Has sido desconectado. Has conectado desde otra ubicación"
+msgstr "Ha sido desconectado al conectar desde otra ubicación"
 
-#: src/protocols/msn/msn.c:2041 src/protocols/msn/msn.c:2074
+#: src/protocols/msn/msn.c:2264 src/protocols/msn/msn.c:2297
 msgid "Invalid name"
-msgstr "Nombre inválido"
+msgstr "Nombre no válido"
+
+#: src/protocols/msn/msn.c:1915 src/protocols/msn/msn.c:2016
+msgid "Available"
+msgstr "En línea"
+
+#: src/protocols/msn/msn.c:1916
+msgid "Away From Computer"
+msgstr "Ausente"
+
+#: src/protocols/msn/msn.c:2008
+msgid "Away from the computer"
+msgstr "Ausente"
+
+#: src/protocols/msn/msn.c:2014
+msgid "Idle"
+msgstr "Ausente"
+
+#: src/protocols/msn/msn.c:1917
+msgid "Be Right Back"
+msgstr "Vuelvo enseguida"
+
+#: src/protocols/msn/msn.c:2006
+msgid "Be right back"
+msgstr "Vuelvo enseguida"
+
+#: src/protocols/msn/msn.c:1918 src/protocols/msn/msn.c:2004
+msgid "Busy"
+msgstr "No Disponible"
+
+#: src/protocols/msn/msn.c:1919
+msgid "On The Phone"
+msgstr "Al teléfono"
+
+#: src/protocols/msn/msn.c:2010
+msgid "On the phone"
+msgstr "Al teléfono"
+
+#: src/protocols/msn/msn.c:1920
+msgid "Out To Lunch"
+msgstr "Salí a comer"
+
+#: src/protocols/msn/msn.c:2012
+msgid "Out to lunch"
+msgstr "Salí a comer"
+
+#: src/protocols/msn/msn.c:1921
+msgid "Hidden"
+msgstr "Sin conexión"
+
+#: src/protocols/msn/msn.c:2037
+msgid "Reset friendly name"
+msgstr "Actualizar nombre"
+
+#: src/protocols/msn/msn.c:2121 src/protocols/msn/msn.c:2122
+#: src/protocols/msn/msn.c:2142
+msgid "Set Friendly Name"
+msgstr "Establecer nombre"
+
+#: src/protocols/msn/msn.c:924 src/protocols/msn/msn.c:1075
+msgid "The user %s (%s) wants to add you to their buddy list"
+msgstr "El usuario %s (%s) quiere añadirle a su lista de amigos"
+
+#: src/protocols/msn/msn.c:2107
+msgid "Friendly name too long."
+msgstr "Nombre demasiado largo"
+
+#: src/protocols/msn/msn.c:1111
+msgid "Buddies"
+msgstr "Amigos"
+
+#: src/protocols/msn/msn.c:1739 src/protocols/msn/msn.c:1766
+msgid "Unable to connect"
+msgstr "No se puede conectar"
+
+#: src/protocols/msn/msn.c:1746
+msgid "Unable to write to server"
+msgstr "No se puede escribir al servidor"
+
+#: src/protocols/msn/msn.c:1752
+msgid "Synching with server"
+msgstr "Redirigiendo al servidor"
+
+#: src/protocols/msn/msn.c:1436 src/protocols/msn/msn.c:1677
+msgid "Error reading from server"
+msgstr "Error al leer del servidor"
+
+#: src/protocols/msn/msn.c:1621
+msgid "Password sent"
+msgstr "Contraseña enviada"
+
+#: src/protocols/msn/msn.c:1616
+msgid "Unable to send password"
+msgstr "No se puede enviar la contraseña"
+
+#: src/protocols/msn/msn.c:1760
+msgid "Connecting"
+msgstr "Conectando"
+
+#: src/protocols/msn/msn.c:1569
+msgid "Requesting to send password"
+msgstr "Enviando contraseña"
+
+#: src/protocols/msn/msn.c:2046
+msgid "Status: %s"
+msgstr "Estado: %s"
+ 
+#: src/protocols/msn/msn.c:2123 src/protocols/msn/msn.c:2143
+msgid "Reset All Friendly Names"
+msgstr "Actualizar todos los nombres"
+
+#: src/protocols/msn/msn.c:225
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr "Error de sintaxis (problabemente un bug de Gaim)"
+
+#: src/protocols/msn/msn.c:228
+msgid "Invalid Parameter (probably a Gaim bug)"
+msgstr "Parámetro inválido (problabemente un bug de Gaim)"
+
+#: src/protocols/msn/msn.c:231
+msgid "Invalid User"
+msgstr "Usuario no válido"
+
+#: src/protocols/msn/msn.c:240
+msgid "Invalid Username"
+msgstr "Nombre de usuario no válido"
+
+#: src/protocols/msn/msn.c:243
+msgid "Invalid Friendly Name"
+msgstr "Nombre no válido"
+
+#: src/protocols/msn/msn.c:246
+msgid "List Full"
+msgstr "Lista llena"
+
+#: src/protocols/msn/msn.c:249
+msgid "Already there"
+msgstr "Ya en lista"
+
+#: src/protocols/msn/msn.c:252
+msgid "Not on list"
+msgstr "No está en la lista"
+
+#: src/protocols/msn/msn.c:255
+msgid "User is offline"
+msgstr "El usuario no está conectado"
+
+#: src/protocols/msn/msn.c:261
+msgid "Already in opposite list"
+msgstr "Ya está en la lista contraria"
+
+#: src/protocols/msn/msn.c:264
+msgid "Switchboard failed"
+msgstr "Falló el servidor Switchboard"
+
+#: src/protocols/msn/msn.c:274
+msgid "Not logged in"
+msgstr "No ha iniciado sesión"
+
+#: src/protocols/msn/msn.c:278
+msgid "Internal server error"
+msgstr "Error interno del servidor"
+
+#: src/protocols/msn/msn.c:291
+msgid "Server busy"
+msgstr "Servidor ocupado"
+
+#: src/protocols/msn/msn.c:294
+msgid "Server unavailable"
+msgstr "Servidor no disponible"
+
+#: src/protocols/msn/msn.c:303
+msgid "Server is going down (abandon ship)"
+msgstr "El servidor está apagándose (Sálvese quien pueda)"
+
+#: src/protocols/msn/msn.c:307
+msgid "Error creating connection"
+msgstr "Error al crear la conexión"
+
+#: src/protocols/msn/msn.c:329
+msgid "Authentication failed"
+msgstr "Falló la autentificación.Compruebe\nnombre de usuario y contraseña"
+
+#: src/protocols/msn/msn.c:332
+msgid "Not allowed when offline"
+msgstr "No puede mandar mensajes fuera de línea"
+
+#: src/protocols/msn/msn.c:341
+msgid "Unknown error code"
+msgstr "Código de error desconocido"
 
 #: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:3075
 #: src/protocols/toc/toc.c:1101
@@ -1181,7 +1376,7 @@
 #: src/about.c:93
 #, c-format
 msgid "About Gaim v%s"
-msgstr "Sobre Gaim v%s"
+msgstr "Acerca de Gaim v%s"
 
 #: src/about.c:126
 msgid ""
@@ -1286,7 +1481,7 @@
 
 #: src/aim.c:355
 msgid "About"
-msgstr "Sobre"
+msgstr "Acerca de..."
 
 #: src/aim.c:356 src/prefs.c:1619 src/prefs.c:1893
 msgid "Options"
@@ -1294,7 +1489,7 @@
 
 #: src/aim.c:358 src/aim.c:822 src/buddy.c:2674
 msgid "Plugins"
-msgstr "Añadidos"
+msgstr "Plugins"
 
 #: src/aim.c:816 src/buddy.c:2666
 msgid "Preferences"
@@ -1327,7 +1522,7 @@
 
 #: src/applet.c:465
 msgid "About..."
-msgstr "Sobre..."
+msgstr "Acerca de..."
 
 #: src/away.c:202
 msgid "Gaim - Away!"
@@ -1528,7 +1723,7 @@
 
 #: src/buddy.c:2704
 msgid "About Gaim"
-msgstr "Sobre Gaim"
+msgstr "Acerca de Gaim"
 
 #: src/buddy.c:2721 src/prefs.c:2891
 msgid "Buddy List"
@@ -2377,17 +2572,16 @@
 
 #: src/plugins.c:113
 msgid "Gaim - Plugin List"
-msgstr "Gaim - Lista de Añadidos"
+msgstr "Gaim - Lista de Plugins"
 
 #: src/plugins.c:178
 msgid "Gaim - Plugins"
-msgstr "Gaim - Añadidos"
+msgstr "Gaim - Plugins"
 
 #. Left side: frame with list of plugin file names
 #: src/plugins.c:192
-#, fuzzy
 msgid "Loaded Plugins"
-msgstr "Usar Añadido"
+msgstr "Plugins cargados"
 
 #: src/plugins.c:238
 msgid "Filepath:"

[Gaim-commits] CVS: gaim ChangeLog,1.484,1.485

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

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

Modified Files:
	ChangeLog 
Log Message:
lala



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -d -r1.484 -r1.485
--- ChangeLog	19 May 2002 03:09:05 -0000	1.484
+++ ChangeLog	19 May 2002 03:11:09 -0000	1.485
@@ -3,6 +3,7 @@
 version 0.59
 	* Hungarian translation added (Thanks, Sutto Zoltan)
 	* Swedish translation updated (Thanks, Christian Rose)
+	* Spanish translation updated (Thanks, Alex)
 	* Traditional Chinese translation updated (Thanks, Paladin Liu)
 	* Squashed a bug in buddy right-click menu handling
 	  that crashed Gaim.  In the process: found and

[Gaim-commits] CVS: gaim/po zh_TW.po,1.1,1.2

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

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

Modified Files:
	zh_TW.po 
Log Message:
lalala2


Index: zh_TW.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/zh_TW.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh_TW.po	29 Apr 2002 13:15:41 -0000	1.1
+++ zh_TW.po	19 May 2002 03:09:05 -0000	1.2
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: 0.1 for gaim-0.5.7\n"
 "POT-Creation-Date: 2002-04-26 01:28-0400\n"
-"PO-Revision-Date: 2002-04-29 16:12+0800\n"
+"PO-Revision-Date: 2002-05-18 04:21+0800\n"
 "Last-Translator: Paladin Liu <pa...@ms...>\n"
 "Language-Team: z10n <z10n>\n"
 "MIME-Version: 1.0\n"
@@ -84,11 +84,11 @@
 
 #: src/protocols/gg/gg.c:317
 msgid "Nick:"
-msgstr ""
+msgstr "暱稱："
 
 #: src/protocols/gg/gg.c:318
 msgid "Gadu-Gadu User"
-msgstr ""
+msgstr "Gadu-Gadu 使用者"
 
 #: src/protocols/gg/gg.c:337
 msgid "Could not connect"
@@ -112,7 +112,7 @@
 
 #: src/protocols/gg/gg.c:471
 msgid "Reading server key"
-msgstr ""
+msgstr "讀取 Server Key"
 
 #: src/protocols/gg/gg.c:474
 msgid "Exchanging key hash"
@@ -128,7 +128,7 @@
 
 #: src/protocols/gg/gg.c:533
 msgid "Send as message"
-msgstr ""
+msgstr "以訊息送出"
 
 #: src/protocols/gg/gg.c:541
 msgid "Looking up GG server"
@@ -136,7 +136,7 @@
 
 #: src/protocols/gg/gg.c:544
 msgid "Invalid Gadu-Gadu UIN specified"
-msgstr ""
+msgstr "無效的 Gadu-Gadu UIN 定義"
 
 #: src/protocols/gg/gg.c:570
 msgid "Connect to %s failed"
@@ -144,7 +144,7 @@
 
 #: src/protocols/gg/gg.c:594
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-msgstr ""
+msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
 #: src/protocols/gg/gg.c:595
 #: src/protocols/gg/gg.c:657
@@ -161,7 +161,7 @@
 #: src/protocols/gg/gg.c:1149
 #: src/protocols/gg/gg.c:1214
 msgid "Gadu-Gadu Error"
-msgstr ""
+msgstr "Gadu-Gadu 錯誤"
 
 #: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
@@ -169,11 +169,11 @@
 
 #: src/protocols/gg/gg.c:662
 msgid "Gadu-Gadu Search Engine"
-msgstr ""
+msgstr "Gadu-Gadu 搜尋引擎"
 
 #: src/protocols/gg/gg.c:687
 msgid "Active"
-msgstr ""
+msgstr "啟動"
 
 #: src/protocols/gg/gg.c:688
 msgid "yes"
@@ -233,7 +233,7 @@
 #: src/protocols/gg/gg.c:828
 #: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Information"
-msgstr ""
+msgstr "Gadu-Gadu 資訊"
 
 #: src/protocols/gg/gg.c:821
 msgid "Couldn't transfer Buddy List to server"
@@ -357,11 +357,11 @@
 
 #: src/protocols/irc/irc.c:1071
 msgid "You have been kicked from %s: %s"
-msgstr ""
+msgstr "%s 正在呼叫您：%s"
 
 #: src/protocols/irc/irc.c:1076
 msgid "Kicked by %s: %s"
-msgstr ""
+msgstr "被 %s 呼叫：%s"
 
 #: src/protocols/irc/irc.c:1581
 msgid "You have left %s"
@@ -404,7 +404,7 @@
 
 #: src/protocols/jabber/jabber.c:1093
 msgid "Jabber Error"
-msgstr ""
+msgstr "Jabber 錯誤"
 
 #: src/dialogs.c:847
 #: src/protocols/jabber/jabber.c:1173
@@ -489,11 +489,11 @@
 
 #: src/protocols/jabber/jabber.c:2355
 msgid "Street Address"
-msgstr ""
+msgstr "街道地址"
 
 #: src/protocols/jabber/jabber.c:2356
 msgid "Extended Address"
-msgstr ""
+msgstr "其他地址"
 
 #: src/protocols/jabber/jabber.c:2357
 msgid "Locality"
@@ -553,19 +553,19 @@
 
 #: src/protocols/jabber/jabber.c:2393
 msgid "All items below are optional. Enter only the information with which you feel comfortable"
-msgstr ""
+msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
 
 #: src/protocols/jabber/jabber.c:2394
 msgid "User Identity"
-msgstr ""
+msgstr "使用者識別"
 
 #: src/protocols/jabber/jabber.c:2810
 msgid "Gaim - Edit Jabber vCard"
-msgstr ""
+msgstr "Gaim - 編輯 Jabber vCard"
 
 #: src/protocols/jabber/jabber.c:2884
 msgid "Server Registration successful!"
-msgstr ""
+msgstr "伺服器註冊成功！"
 
 #: src/protocols/jabber/jabber.c:2911
 msgid "Unknown registration error"
@@ -603,15 +603,15 @@
 
 #: src/protocols/oscar/oscar.c:329
 msgid "Direct IM with %s closed"
-msgstr ""
+msgstr "和 %s 的即時訊息關閉"
 
 #: src/protocols/oscar/oscar.c:331
 msgid "Direct IM with %s failed"
-msgstr ""
+msgstr "和 %s 的即時訊息失敗"
 
 #: src/protocols/oscar/oscar.c:369
 msgid "connection error (rend)\n"
-msgstr ""
+msgstr "連線錯誤 (rend)\n"
 
 #: src/protocols/oscar/oscar.c:380
 msgid "major connection error\n"
@@ -635,7 +635,7 @@
 
 #: src/protocols/oscar/oscar.c:406
 msgid "Chat is currently unavailable"
-msgstr ""
+msgstr "這個交談目前並不存在"
 
 #: src/protocols/oscar/oscar.c:407
 msgid "Gaim - Chat"
@@ -684,17 +684,17 @@
 #. Suspended account
 #: src/protocols/oscar/oscar.c:643
 msgid "Your account is currently suspended."
-msgstr ""
+msgstr "您的帳號目前停用中。"
 
 #. connecting too frequently
 #: src/protocols/oscar/oscar.c:647
 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
+msgstr "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線，那麼您的等待時間將會更加的延長。"
 
 #. client too old
 #: src/protocols/oscar/oscar.c:652
 msgid "The client version you are using is too old. Please upgrade at "
-msgstr ""
+msgstr "您所使用的 Client 端程式太過老舊。請更新到"
 
 #: src/protocols/oscar/oscar.c:656
 #: src/protocols/toc/toc.c:542
@@ -708,13 +708,14 @@
 #: src/protocols/oscar/oscar.c:1246
 #: src/protocols/oscar/oscar.c:3282
 msgid "Direct IM with %s established"
-msgstr ""
+msgstr "和 %s 的即時訊息已經被建立"
 
 #: src/protocols/oscar/oscar.c:1492
 #: src/protocols/oscar/oscar.c:2367
 msgid "The user %lu has denied your request to add them to your contact list for the following reason:\n"
 "%s"
-msgstr ""
+msgstr "使用者 %lu 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
+"%s"
 
 #: src/protocols/oscar/oscar.c:1492
 #: src/protocols/oscar/oscar.c:2367
@@ -729,60 +730,60 @@
 #: src/protocols/oscar/oscar.c:1499
 #: src/protocols/oscar/oscar.c:2374
 msgid "The user %lu has granted your request to add them to your contact list."
-msgstr ""
+msgstr "使用者 %lu 同意了您將其加入好友清單的要求。"
 
 #: src/protocols/oscar/oscar.c:1500
 #: src/protocols/oscar/oscar.c:2375
 msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
+msgstr "Gaim - ICQ 許可認證"
 
 #: src/protocols/oscar/oscar.c:1573
 msgid "You missed %d message from %s because it was invalid."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為那是無效的。"
 
 #: src/protocols/oscar/oscar.c:1574
 msgid "You missed %d messages from %s because they were invalid."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為那是無效的。"
 
 #: src/protocols/oscar/oscar.c:1583
 msgid "You missed %d message from %s because it was too large."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息太大了。"
 
 #: src/protocols/oscar/oscar.c:1584
 msgid "You missed %d messages from %s because they were too large."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息太大了。"
 
 #: src/protocols/oscar/oscar.c:1593
 msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為訊息的發送速率到了上限。"
 
 #: src/protocols/oscar/oscar.c:1594
 msgid "You missed %d messages from %s because the rate limit has been exceeded."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為訊息的發送速率到了上限。"
 
 #: src/protocols/oscar/oscar.c:1603
 msgid "You missed %d message from %s because it was too evil."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息可能不懷好意。"
 
 #: src/protocols/oscar/oscar.c:1604
 msgid "You missed %d messages from %s because they are too evil."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這些訊息可能不懷好意。"
 
 #: src/protocols/oscar/oscar.c:1613
 msgid "You missed %d message from %s because you are too evil."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息可能不懷好意。"
 
 #: src/protocols/oscar/oscar.c:1614
 msgid "You missed %d messages from %s because you are too evil."
-msgstr ""
+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息可能不懷好意。"
 
 #: src/protocols/oscar/oscar.c:1622
 msgid "You missed %d message from %s for unknown reasons."
-msgstr ""
+msgstr "您因為不明的原因，而遺失了由 %s 送來的 %d 個訊息。"
 
 #: src/protocols/oscar/oscar.c:1623
 msgid "You missed %d messages from %s for unknown reasons."
-msgstr ""
+msgstr "您因為不明的原因，而遺失了由 %s 送來的 %d 個訊息。"
 
 #: src/dialogs.c:3036
 #: src/dialogs.c:3042
@@ -796,7 +797,7 @@
 
 #: src/protocols/oscar/oscar.c:1645
 msgid "SNAC threw error: %s\n"
-msgstr ""
+msgstr "SNAC 丟出錯誤：%s\n"
 
 #: src/protocols/oscar/oscar.c:1647
 msgid "Gaim - Oscar SNAC Error"
@@ -813,7 +814,7 @@
 
 #: src/protocols/oscar/oscar.c:1682
 msgid "User information for %s unavailable: %s"
-msgstr ""
+msgstr "使用者 %s 的個人資訊並不存在：%s"
 
 #: src/buddy.c:2065
 #: src/protocols/oscar/oscar.c:1713
@@ -886,12 +887,12 @@
 #: src/buddy.c:2105
 #: src/protocols/oscar/oscar.c:1753
 msgid "ICQ Server Relay"
-msgstr ""
+msgstr "ICQ 伺服器轉送"
 
 #: src/buddy.c:2108
 #: src/protocols/oscar/oscar.c:1756
 msgid "ICQ Unknown"
-msgstr ""
+msgstr "ICQ 未知"
 
 #: src/buddy.c:2111
 #: src/protocols/oscar/oscar.c:1759
@@ -936,7 +937,7 @@
 
 #: src/protocols/oscar/oscar.c:2136
 msgid "The last message was not sent because you are over the rate limit. Please wait 10 seconds and try again."
-msgstr ""
+msgstr "訊息並未送出，因為您已經達到發送訊息速率的上限。請等待十秒後再試一次。"
 
 #: src/dialogs.c:3564
 #: src/protocols/oscar/oscar.c:2478
@@ -962,7 +963,7 @@
 
 #: src/protocols/oscar/oscar.c:3413
 msgid "You have selected to open a Direct IM connection with %s. Doing this will let them see your IP address, and may be a security risk. Do you wish to continue?"
-msgstr ""
+msgstr "您選擇和 %s 開啟一個即時訊息。這樣子的做法會讓對方知道您的 IP 位址，同時存在著系統安全上的顧慮。您確定要繼續嗎？"
 
 #: src/protocols/oscar/oscar.c:3446
 msgid "Direct IM"
@@ -986,15 +987,15 @@
 
 #: src/protocols/toc/toc.c:407
 msgid "%s not currently logged in."
-msgstr ""
+msgstr "%s 目前並未登入。"
 
 #: src/protocols/toc/toc.c:410
 msgid "Warning of %s not allowed."
-msgstr ""
+msgstr "警告：%s 是不被允許的。"
 
 #: src/protocols/toc/toc.c:413
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
+msgstr "訊息被丟棄，因為您達到伺服器所限制的發送速度。"
 
 #: src/protocols/toc/toc.c:416
 msgid "Chat in %s is not available."
@@ -1026,11 +1027,11 @@
 
 #: src/protocols/toc/toc.c:437
 msgid "Dir service temporarily unavailable."
-msgstr ""
+msgstr "目錄服務暫時不存在。"
 
 #: src/protocols/toc/toc.c:440
 msgid "Email lookup restricted."
-msgstr ""
+msgstr "禁止 eMail 檢查。"
 
 #: src/protocols/toc/toc.c:443
 msgid "Keyword ignored."
@@ -1054,7 +1055,7 @@
 
 #: src/protocols/toc/toc.c:462
 msgid "The service is temporarily unavailable."
-msgstr ""
+msgstr "服務暫時不存在。"
 
 #: src/protocols/toc/toc.c:465
 msgid "Your warning level is currently too high to log in."
@@ -1062,15 +1063,15 @@
 
 #: src/protocols/toc/toc.c:468
 msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
+msgstr "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線，那麼您的等待時間將會更加的延長。"
 
 #: src/protocols/toc/toc.c:471
 msgid "An unknown signon error has occurred: %s."
-msgstr ""
+msgstr "發生了一個未知的登入錯誤：%s。"
 
 #: src/protocols/toc/toc.c:474
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr ""
+msgstr "一個未知的錯誤 %d 發生。資訊：%s"
 
 #: src/protocols/toc/toc.c:491
 msgid "Connection Closed"
@@ -1082,7 +1083,7 @@
 
 #: src/protocols/toc/toc.c:598
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
+msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
 #: src/protocols/toc/toc.c:599
 msgid "TOC Resume"
@@ -1107,18 +1108,18 @@
 
 #: src/protocols/toc/toc.c:788
 msgid "TOC Pause"
-msgstr ""
+msgstr "TOC 暫停"
 
 #: src/protocols/toc/toc.c:1222
 msgid "Get Dir Info"
-msgstr ""
+msgstr "取得使用者個人資訊"
 
 #: src/protocols/toc/toc.c:1638
 #: src/protocols/toc/toc.c:1680
 #: src/protocols/toc/toc.c:1799
 #: src/protocols/toc/toc.c:1885
 msgid "Could not connect for transfer!"
-msgstr ""
+msgstr "無法開啟傳輸的連線！"
 
 #: src/protocols/toc/toc.c:1829
 msgid "Could not write file header!"
@@ -1130,15 +1131,15 @@
 
 #: src/protocols/toc/toc.c:1959
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr ""
+msgstr "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
 
 #: src/protocols/toc/toc.c:1960
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr ""
+msgstr "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
 
 #: src/protocols/toc/toc.c:1965
 msgid "%s requests you to send them a file"
-msgstr ""
+msgstr "%s 要求您傳送檔案給他們。"
 
 #: src/protocols/yahoo/yahoo.c:594
 msgid "Your message did not get sent."
@@ -1150,7 +1151,7 @@
 
 #: src/protocols/zephyr/zephyr.c:839
 msgid "Class:"
-msgstr ""
+msgstr "類別："
 
 #: src/protocols/zephyr/zephyr.c:843
 msgid "Instance:"
@@ -1295,11 +1296,11 @@
 
 #: src/applet.c:199
 msgid "Attempting to sign on...."
-msgstr ""
+msgstr "正在嘗試登入…"
 
 #: src/applet.c:202
 msgid "Offline. Click to bring up login box."
-msgstr ""
+msgstr "斷線。點選以帶出登入視窗。"
 
 #: src/applet.c:218
 msgid "Away: %d pending."
@@ -1316,7 +1317,7 @@
 
 #: src/applet.c:444
 msgid "Can't create Gaim applet!"
-msgstr ""
+msgstr "無法建立 Gaim 小程式！"
 
 #: src/applet.c:465
 msgid "About..."
@@ -1470,12 +1471,12 @@
 #: src/buddy.c:2291
 #: src/buddy.c:2296
 msgid "%s logged in."
-msgstr ""
+msgstr "%s 登入。"
 
 #: src/buddy.c:2355
 #: src/buddy.c:2360
 msgid "%s logged out."
-msgstr ""
+msgstr "%s 登出。"
 
 #: src/buddy.c:2545
 msgid "Information on selected Buddy"
@@ -1630,7 +1631,7 @@
 #: src/buddy_chat.c:1317
 #: src/buddy_chat.c:1407
 msgid "Invite"
-msgstr ""
+msgstr "邀請"
 
 #: src/buddy_chat.c:412
 #: src/dialogs.c:1261
@@ -1645,7 +1646,7 @@
 
 #: src/buddy_chat.c:454
 msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr ""
+msgstr "Gaim - 邀請好友進入聊天室"
 
 #: src/buddy_chat.c:857
 msgid "Un-Ignore"
@@ -1695,7 +1696,7 @@
 #: src/buddy_chat.c:1322
 #: src/buddy_chat.c:1406
 msgid "Whisper"
-msgstr ""
+msgstr "悄悄話"
 
 #: src/buddy_chat.c:1327
 #: src/buddy_chat.c:1404
@@ -1861,7 +1862,7 @@
 #: src/conversation.c:2214
 #: src/prefs.c:254
 msgid "Logging"
-msgstr ""
+msgstr "登入中"
 
 #: src/conversation.c:2223
 msgid "Save Conversation"
@@ -1943,7 +1944,8 @@
 #: src/dialogs.c:518
 msgid "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
-msgstr ""
+msgstr "您正試著將 '%s'  從您的好友清單\n"
+"中移除。您要繼續這個動作嗎？"
 
 #: src/dialogs.c:530
 #: src/prpl.c:154
@@ -2218,12 +2220,12 @@
 #. We shouldn't allow a blank title
 #: src/dialogs.c:3035
 msgid "You cannot create an away message with a blank title"
-msgstr ""
+msgstr "您不能建立一個沒有原因的離開訊息"
 
 #. We shouldn't allow a blank message
 #: src/dialogs.c:3042
 msgid "You cannot create an empty away message"
-msgstr ""
+msgstr "您無法建立一個空白的離開訊息"
 
 #: src/dialogs.c:3110
 msgid "Gaim - New away message"
@@ -2235,7 +2237,7 @@
 
 #: src/dialogs.c:3133
 msgid "Away title: "
-msgstr ""
+msgstr "離開原因："
 
 #: src/dialogs.c:3172
 msgid "Use"
@@ -2366,7 +2368,7 @@
 
 #: src/multi.c:694
 msgid "Register with server"
-msgstr ""
+msgstr "向伺服器註冊"
 
 #: src/multi.c:752
 msgid "Gaim - Modify Account"
@@ -2378,7 +2380,7 @@
 
 #: src/multi.c:935
 msgid "You cannot log this account in; you do not have the protocol it uses loaded, or the protocol does not have a login function."
-msgstr ""
+msgstr "您無法使用這個帳號來登入；您可能沒有設定這個帳號所使用的 Protocol，或者這個 Protocol 並沒有提供登入的功能。"
 
 #: src/multi.c:937
 msgid "Login Error"
@@ -2457,7 +2459,7 @@
 
 #: src/plugins.c:238
 msgid "Filepath:"
-msgstr ""
+msgstr "檔案路徑："
 
 #: src/plugins.c:256
 msgid "Load"
@@ -2518,7 +2520,7 @@
 
 #: src/prefs.c:220
 msgid "Use borderless buttons"
-msgstr ""
+msgstr "使用沒有邊框的按鈕"
 
 #: src/prefs.c:224
 msgid "Show Buddy Ticker"
@@ -2526,16 +2528,16 @@
 
 #: src/prefs.c:229
 msgid "Show Debug Window"
-msgstr ""
+msgstr "顯示除錯視窗"
 
 #. Preferences should be positive
 #: src/prefs.c:233
 msgid "Notify buddies that you are typing to them"
-msgstr ""
+msgstr "通知您的好友您正在發訊息給他們"
 
 #: src/prefs.c:240
 msgid "Report Idle Times"
-msgstr ""
+msgstr "報告閒置時間"
 
 #: src/prefs.c:248
 msgid "None"
@@ -2551,31 +2553,31 @@
 
 #: src/prefs.c:262
 msgid "Log all conversations"
-msgstr ""
+msgstr "記錄所有的交談內容"
 
 #: src/prefs.c:263
 msgid "Strip HTML from logs"
-msgstr ""
+msgstr "將交談記錄中的 HTML 標籤去除"
 
 #: src/prefs.c:269
 msgid "Log when buddies sign on/sign off"
-msgstr ""
+msgstr "記錄好友的登入／登出"
 
 #: src/prefs.c:271
 msgid "Log when buddies become idle/un-idle"
-msgstr ""
+msgstr "記錄好友的閒置／取消閒置"
 
 #: src/prefs.c:273
 msgid "Log when buddies go away/come back"
-msgstr ""
+msgstr "記錄好友離開／回來"
 
 #: src/prefs.c:274
 msgid "Log your own signons/idleness/awayness"
-msgstr ""
+msgstr "記錄您自已登入／閒置／離開等狀態"
 
 #: src/prefs.c:276
 msgid "Individual log file for each buddy's signons"
-msgstr ""
+msgstr "使用個別的檔案來記錄每一個好友的登入"
 
 #: src/prefs.c:279
 msgid "Browser"
@@ -2788,17 +2790,17 @@
 
 #: src/prefs.c:709
 msgid "Highlight misspelled words"
-msgstr ""
+msgstr "標示出錯誤的拼字"
 
 #: src/prefs.c:710
 #: src/prefs.c:1912
 msgid "Sending messages removes away status"
-msgstr ""
+msgstr "送出訊息時取消離開狀態"
 
 #: src/prefs.c:711
 #: src/prefs.c:1925
 msgid "Queue new messages when away"
-msgstr ""
+msgstr "在離開時，將所有的新訊息置入佇列中"
 
 #: src/prefs.c:717
 msgid "Ignore colors"
@@ -2814,12 +2816,12 @@
 
 #: src/prefs.c:720
 msgid "Ignore TiK Automated Messages"
-msgstr ""
+msgstr "忽略 Tik 自動訊息"
 
 #: src/prefs.c:721
 #: src/prefs.c:1910
 msgid "Ignore new conversations when away"
-msgstr ""
+msgstr "在離開時，忽略新的交談"
 
 #: src/prefs.c:910
 msgid "IM Options"
@@ -2852,11 +2854,11 @@
 
 #: src/prefs.c:956
 msgid "Show all conversations in one tabbed window"
-msgstr ""
+msgstr "將所有的交談顯示在同一個有標籤的視窗中"
 
 #: src/prefs.c:958
 msgid "Show chats in the same tabbed window"
-msgstr ""
+msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
 #: src/prefs.c:965
 #: src/prefs.c:1117
@@ -2932,15 +2934,15 @@
 
 #: src/prefs.c:1108
 msgid "Show all chats in one tabbed window"
-msgstr ""
+msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
 
 #: src/prefs.c:1110
 msgid "Show conversations in the same tabbed window"
-msgstr ""
+msgstr "將所有的交談顯示在同一個有標籤的視窗中"
 
 #: src/prefs.c:1118
 msgid "Show people joining/leaving in window"
-msgstr ""
+msgstr "在視窗中顯示其他人進入或離開的事件"
 
 #: src/prefs.c:1166
 msgid "Tab Completion"

[Gaim-commits] CVS: gaim ChangeLog,1.483,1.484

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

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

Modified Files:
	ChangeLog 
Log Message:
lalala2


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -d -r1.483 -r1.484
--- ChangeLog	19 May 2002 03:07:31 -0000	1.483
+++ ChangeLog	19 May 2002 03:09:05 -0000	1.484
@@ -3,6 +3,7 @@
 version 0.59
 	* Hungarian translation added (Thanks, Sutto Zoltan)
 	* Swedish translation updated (Thanks, Christian Rose)
+	* Traditional Chinese translation updated (Thanks, Paladin Liu)
 	* Squashed a bug in buddy right-click menu handling
 	  that crashed Gaim.  In the process: found and
 	  eliminated some memory leaks.
@@ -17,7 +18,7 @@
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)
-	* Taiwanese translation added (Thanks, Paladin Liu)
+	* Traditional Chinese  translation added (Thanks, Paladin Liu)
 	* Better applet transparency
 	* Option to raise buddy list on signons/signoffs
 	* Formatting of incoming MSN messages	

[Gaim-commits] CVS: gaim/po sv.po,1.4,1.5

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

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

Modified Files:
	sv.po 
Log Message:
lalala



Index: sv.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/sv.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sv.po	12 Apr 2002 02:57:20 -0000	1.4
+++ sv.po	19 May 2002 03:07:31 -0000	1.5
@@ -1,5 +1,5 @@
 # Swedish messages for gaim.
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # Christian Rose <me...@me...>, 2001.
 #
 # $Id$
@@ -7,14 +7,43 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2002-04-11 22:46-0700\n"
[...3645 lines suppressed...]
+#~ msgid "Sound when buddy logs out"
+#~ msgstr "Ljud då kompis loggar ut"
+
+#~ msgid "Sound when message is received"
+#~ msgstr "Ljud då meddelande tas emot"
+
+#~ msgid "Sound when message is sent"
+#~ msgstr "Ljud då meddelande skickas"
+
+#~ msgid "Sound in chat rooms when people enter"
+#~ msgstr "Ljud i chattrum då personer kommer in"
+
+#~ msgid "Sound in chat rooms when people leave"
+#~ msgstr "Ljud i chattrum då personer lämnar"
+
+#~ msgid "Sound in chat rooms when you talk"
+#~ msgstr "Ljud i chattrum då du pratar"
+
+#~ msgid "Sound in chat rooms when others talk"
+#~ msgstr "Ljud i chattrum då andra pratar"

[Gaim-commits] CVS: gaim ChangeLog,1.482,1.483

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

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

Modified Files:
	ChangeLog 
Log Message:
lalala



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -d -r1.482 -r1.483
--- ChangeLog	18 May 2002 20:34:55 -0000	1.482
+++ ChangeLog	19 May 2002 03:07:31 -0000	1.483
@@ -2,6 +2,7 @@
 
 version 0.59
 	* Hungarian translation added (Thanks, Sutto Zoltan)
+	* Swedish translation updated (Thanks, Christian Rose)
 	* Squashed a bug in buddy right-click menu handling
 	  that crashed Gaim.  In the process: found and
 	  eliminated some memory leaks.

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.52,1.53

[Jim S. <jse...@us...>]

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

Modified Files:
	jabber.c 
Log Message:
Better fix for NULL JID resource in presence handling. (faceprint insisted)


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- jabber.c	18 May 2002 20:34:55 -0000	1.52
+++ jabber.c	18 May 2002 23:31:33 -0000	1.53
@@ -1087,7 +1087,7 @@
 				serv_got_update(GJ_GC(gjc), buddy, 0, 0, 0, 0, 0, 0);
 			}
 		} else {
-			if (!resources) {
+			if (res && !resources) {
 				b->proto_data = g_slist_append(b->proto_data, g_strdup(res));
 			}
 

[Gaim-commits] CVS: gaim ChangeLog,1.481,1.482

[Jim S. <jse...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Certain types of Jabber presence errors now show "broken light-bulb"
graphic and status available in "Get Away Msg".


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -d -r1.481 -r1.482
--- ChangeLog	18 May 2002 15:42:01 -0000	1.481
+++ ChangeLog	18 May 2002 20:34:55 -0000	1.482
@@ -8,6 +8,11 @@
 	* Fixed a significant applet leak
 	* Can now change Jabber password on server (Thanks,
 	  Nathan Walp)
+	* Certain types of Jabber presence errors no longer
+	  falsely show a buddy on-line.  Instead now a "broken
+	  light-bulb" icon is shown and the error status is
+	  available via "Get Away Msg"  (Thanks and a tip o'
+	  the hat to Christian Hammond for the graphic)
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.51,1.52

[Jim S. <jse...@us...>]

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

Modified Files:
	jabber.c 
Log Message:
Certain types of Jabber presence errors now show "broken light-bulb"
graphic and status available in "Get Away Msg".


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- jabber.c	18 May 2002 15:42:01 -0000	1.51
+++ jabber.c	18 May 2002 20:34:55 -0000	1.52
@@ -55,6 +55,7 @@
 #include "pixmaps/available-chat.xpm"
 #include "pixmaps/available-xa.xpm"
 #include "pixmaps/available-dnd.xpm"
+#include "pixmaps/available-error.xpm"
 
 /* The priv member of gjconn's is a gaim_connection for now. */
 #define GJ_GC(x) ((struct gaim_connection *)(x)->priv)
@@ -65,10 +66,11 @@
 #define IQ_AUTH 0
 #define IQ_ROSTER 1
 
-#define UC_AWAY (0x02 | UC_UNAVAILABLE)
-#define UC_CHAT  0x04
-#define UC_XA   (0x08 | UC_UNAVAILABLE)
-#define UC_DND  (0x10 | UC_UNAVAILABLE)
+#define UC_AWAY   (0x02 | UC_UNAVAILABLE)
+#define UC_CHAT    0x04
+#define UC_XA     (0x08 | UC_UNAVAILABLE)
+#define UC_DND    (0x10 | UC_UNAVAILABLE)
+#define UC_ERROR  (0x20 | UC_UNAVAILABLE)
 
 #define DEFAULT_SERVER "jabber.org"
 #define DEFAULT_GROUPCHAT "conference.jabber.org"
@@ -773,7 +775,18 @@
 		}
 	}
 
-	status = xmlnode_get_tag_data(p->x, "status");
+	if (type && (strcasecmp(type, "error") == 0)) {
+		xmlnode enode;
+		
+		if((enode = xmlnode_get_tag(p->x, "error")) != NULL) {
+			status = g_strdup_printf(_("Error %s: %s"),
+				xmlnode_get_attrib(enode, "code"), xmlnode_get_data(enode));
+		} else {
+			status = g_strdup(_("Unknown Error in presence"));
+		}
+	} else {
+		status = g_strdup(xmlnode_get_tag_data(p->x, "status"));
+	}
 
 	if(vshow != NULL || status != NULL ) {
 		/* kinda hokey, but it works :-) */
@@ -785,6 +798,8 @@
 		msg = g_strdup(_("Online"));
 	}
 
+	g_free(status);
+
 	if (val) {
 		g_free(val);
 		g_hash_table_insert(jd->hash, name, msg);
@@ -1006,21 +1021,25 @@
 	from = xmlnode_get_attrib(p->x, "from");
 	type = xmlnode_get_attrib(p->x, "type");
 	
-	if ((y = xmlnode_get_tag(p->x, "show"))) {
-		show = xmlnode_get_data(y);
-		if (!show) {
+	if(type && !strcasecmp(type, "error")) {
+		state = UC_ERROR;
+	} else {
+		if ((y = xmlnode_get_tag(p->x, "show"))) {
+			show = xmlnode_get_data(y);
+			if (!show) {
+				state = 0;
+			} else if (!strcasecmp(show, "away")) {
+				state = UC_AWAY;
+			} else if (!strcasecmp(show, "chat")) {
+				state = UC_CHAT;
+			} else if (!strcasecmp(show, "xa")) {
+				state = UC_XA;
+			} else if (!strcasecmp(show, "dnd")) {
+				state = UC_DND;
+			}
+		} else {
 			state = 0;
-		} else if (!strcasecmp(show, "away")) {
-			state = UC_AWAY;
-		} else if (!strcasecmp(show, "chat")) {
-			state = UC_CHAT;
-		} else if (!strcasecmp(show, "xa")) {
-			state = UC_XA;
-		} else if (!strcasecmp(show, "dnd")) {
-			state = UC_DND;
 		}
-	} else {
-		state = 0;
 	}
 
 	who = jid_new(gjc->p, from);
@@ -1051,7 +1070,7 @@
 		res = who->resource;
 		if (res)
 			while (resources) {
-				if (!strcmp(res, resources->data))
+				if (resources->data && !strcmp(res, resources->data))
 					break;
 				resources = resources->next;
 			}
@@ -1059,16 +1078,7 @@
 		/* keep track of away msg same as yahoo plugin */
 		jabber_track_away(gjc, p, normalize(b->name), type);
 
-		/*
-		 * JFIXME: The check for "error" is a temporary fix.  We don't want to show the
-		 * buddy on-line in this case.  Ultimately what we'll want to do is process
-		 * "error" the same way as "away" type status and probably have the GUI show,
-		 * say, a broken lightbulb?
-		 *
-		 * Note that there's another check just like this one, below.
-		 */
-		if (type && ((strcasecmp(type, "unavailable") == 0) ||
-				     (strcasecmp(type, "error") == 0))) {
+		if (type && (strcasecmp(type, "unavailable") == 0)) {
 			if (resources) {
 				g_free(resources->data);
 				b->proto_data = g_slist_remove(b->proto_data, resources->data);
@@ -1092,11 +1102,7 @@
 			jabber_track_away(gjc, p, buf, type);
 			g_free(buf);
 
-			/*
-			 * JFIXME: Here's the other place we have temporary handling of a
-			 * presence "error."
-			 */
-			if (type && (!strcasecmp(type, "unavailable") || !strcasecmp(type, "error"))) {
+			if (type && (!strcasecmp(type, "unavailable"))) {
 				struct jabber_data *jd;
 				if (!jc && !(jc = find_existing_chat(GJ_GC(gjc), who))) {
 					g_free(buddy);
@@ -1922,6 +1928,8 @@
 		return available_xa_xpm;
 	case UC_DND:
 		return available_dnd_xpm;
+	case UC_ERROR:
+		return available_error_xpm;
 	default:
 		return available_xpm;
 	}

[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.68,1.69

[Jim S. <jse...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
Certain types of Jabber presence errors now show "broken light-bulb"
graphic and status available in "Get Away Msg".


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- Makefile.am	26 Apr 2002 01:33:35 -0000	1.68
+++ Makefile.am	18 May 2002 20:34:55 -0000	1.69
@@ -12,6 +12,7 @@
 		available-away.xpm		\
 		available-chat.xpm		\
 		available-dnd.xpm		\
+		available-error.xpm		\
 		available-xa.xpm		\
 		available.xpm			\
 		away.png			\