Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rob F. <rob...@us...> - 2002-07-02 23:51:08
|
Update of /cvsroot/gaim/gaim/po In directory usw-pr-cvs1:/tmp/cvs-serv8947/po Modified Files: fi.po Log Message: lalal Index: fi.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/fi.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- fi.po 2 Jul 2002 05:42:26 -0000 1.7 +++ fi.po 2 Jul 2002 23:51:05 -0000 1.8 @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: gaim 0.55\n" +"Project-Id-Version: gaim 0.59\n" "POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-03-23 20:32+0200\n" "Last-Translator: Tero Kuusela <te...@su...>\n" @@ -19,9 +19,8 @@ #: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:407 #: plugins/chatlist.c:409 -#, fuzzy msgid "Gaim Chat" -msgstr "Gaim - Ryhmäkeskustelu" +msgstr "Gaim Ryhmäkeskustelu" #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716 #: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449 @@ -32,13 +31,12 @@ msgstr "Sulje" #: plugins/chatlist.c:344 -#, fuzzy msgid "Chat Rooms" -msgstr "Ryhmäkeskusteluvalinnat" +msgstr "Keskusteluhuoneet" #: plugins/chatlist.c:363 msgid "Refresh" -msgstr "" +msgstr "Päivitä" #. Put the buttons in the box #: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827 @@ -56,51 +54,48 @@ #: plugins/chatlist.c:388 msgid "List of available chats" -msgstr "" +msgstr "Saatavilla olevien ryhmäkeskustelujen lista" #: plugins/chatlist.c:398 msgid "List of subscribed chats" -msgstr "" +msgstr "Tilattujen ryhmäkeskustelujen lista" #: plugins/gtik.c:699 msgid "Gnome Stock Ticker Properties" -msgstr "" +msgstr "Gnomen osakekurssisovelman asetukset" #: plugins/gtik.c:711 msgid "Update Frequency in min" -msgstr "" +msgstr "Päivitystiheys minuuteissa" #: plugins/gtik.c:727 msgid "Enter symbols delimited with \"+\" in the box below." -msgstr "" +msgstr "Kirjoita symbolit erotettuna \"+\"-merkillä alla olevaan laatikkoon." #. OUTPUT FORMAT and SCROLL DIRECTION #: plugins/gtik.c:737 msgid "Check this box to display only symbols and price:" -msgstr "" +msgstr "Näytä vain symbolit ja hinta:" #: plugins/gtik.c:738 msgid "Check this box to scroll left to right:" -msgstr "" +msgstr "Vieritä vasemmalta oikealle:" #: plugins/gtik.c:974 -#, fuzzy msgid "(No" -msgstr "Ei" +msgstr "(Ei" #: plugins/gtik.c:975 -#, fuzzy msgid "Change" -msgstr "Kanava:" +msgstr "Vaihda" #: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919 -#, fuzzy msgid "Available" -msgstr "Tavoittamattomissa" +msgstr "Tavoitettavissa" #: src/protocols/gg/gg.c:72 msgid "Available for friends only" -msgstr "" +msgstr "Tavoitettavissa vain ystäville" #: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727 #: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118 @@ -109,16 +104,15 @@ #: src/protocols/gg/gg.c:74 msgid "Away for friends only" -msgstr "" +msgstr "Poissa vain ystäville" #: src/protocols/gg/gg.c:75 -#, fuzzy msgid "Invisible" -msgstr "Kutsu" +msgstr "Näkymätön" #: src/protocols/gg/gg.c:76 msgid "Invisible for friends only" -msgstr "" +msgstr "Näkymätön vain ystäville" #: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114 msgid "Unavailable" @@ -416,7 +410,8 @@ msgid "" "%s has requested a DCC chat. Would you like to establish the direct " "connection?" -msgstr "%s on pyytänyt DCC-keskustelua. Haluatko muodostaa suoran yhteyden?" +msgstr "" +"%s on pyytänyt DCC-keskustelua. Haluatko muodostaa suoran yhteyden?" #: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315 msgid "Unable to write" @@ -455,16 +450,15 @@ #: src/protocols/jabber/jabber.c:942 msgid "Incorrect current password! Password NOT Changed!" -msgstr "" +msgstr "Väärä nykyinen salasana! Salasanaa EI vaihdettu!" #: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948 -#, fuzzy msgid "Password Change Error!" -msgstr "Gaim - Salasanan vaihto" +msgstr "Virhe vaihdettaessa salasanaa!" #: src/protocols/jabber/jabber.c:947 msgid "New password same as old password! Password NOT Changed!" -msgstr "" +msgstr "Uusi salasana sama kuin vanha salasana! Salasanaa EI vaihdettu!" #: src/protocols/jabber/jabber.c:1092 msgid "Unknown" @@ -486,20 +480,16 @@ #: src/protocols/jabber/jabber.c:1434 #, c-format msgid "Error %s: %s" -msgstr "" +msgstr "Virhe %s: %s" #: src/protocols/jabber/jabber.c:1437 -#, fuzzy msgid "Unknown Error in presence" -msgstr "Tuntematon virhekoodi." +msgstr "Tuntematon virhe tavoitettavuudessa" #: src/protocols/jabber/jabber.c:1607 -#, fuzzy, c-format +#, c-format msgid "The user %s wants to add you to their buddy list." -msgstr "" -"\n" -"\n" -"Haluatko lisätä hänet tuttavalistallesi?" +msgstr "Käyttäjä %s haluaa lisätä sinut tuttavalistalleen." #: src/protocols/jabber/jabber.c:1632 msgid "No such user" @@ -524,14 +514,12 @@ msgstr "Tuntematon sisäänkirjautumisvirhe" #: src/protocols/jabber/jabber.c:2010 -#, fuzzy msgid "Password successfully changed." -msgstr "Salasanan vaihto onnistui" +msgstr "Salasanan vaihto onnistui." #: src/protocols/jabber/jabber.c:2012 -#, fuzzy msgid "Password Change" -msgstr "Gaim - Salasanan vaihto" +msgstr "Salasanan vaihto" #: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676 msgid "Connection lost" @@ -557,9 +545,8 @@ msgstr "Yhdistetään" #: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505 -#, fuzzy msgid "Invalid Jabber I.D." -msgstr "Epäkelpo nimi" +msgstr "Epäkelpo Jabber I.D." #: src/protocols/jabber/jabber.c:2473 msgid "Room:" @@ -574,14 +561,12 @@ msgstr "Kädensija:" #: src/protocols/jabber/jabber.c:2539 -#, fuzzy msgid "Chats" -msgstr "Ryhmäkeskustelu" +msgstr "Ryhmäkeskustelut" #: src/protocols/jabber/jabber.c:2854 -#, fuzzy msgid "View Error Msg" -msgstr "Näytä loki" +msgstr "Näytä virheviesti" #: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865 #: src/protocols/oscar/oscar.c:3606 @@ -590,7 +575,7 @@ #: src/protocols/jabber/jabber.c:2882 msgid "Remove From Roster" -msgstr "" +msgstr "Poista tuttavalistalta" #: src/protocols/jabber/jabber.c:3076 msgid "Full Name" @@ -700,167 +685,152 @@ #: src/protocols/msn/msn.c:230 msgid "Syntax Error (probably a Gaim bug)" -msgstr "" +msgstr "Syntaksivirhe (todennäköisesti ohjelmistovirhe Gaimissa)" #: src/protocols/msn/msn.c:233 msgid "Invalid Parameter (probably a Gaim bug)" -msgstr "" +msgstr "Epäkelpo parametri (todennäköisesti ohjelmistovirhe Gaimissa)" #: src/protocols/msn/msn.c:236 -#, fuzzy msgid "Invalid User" -msgstr "Epäkelpo nimi" +msgstr "Epäkelpo käyttäjä" #: src/protocols/msn/msn.c:239 msgid "Fully Qualified Domain Name missing" -msgstr "" +msgstr "Täysin kelvollinen verkkoalueen nimi puuttuu" #: src/protocols/msn/msn.c:242 msgid "Already Login" -msgstr "" +msgstr "Olet jo kirjautuneena sisään" #: src/protocols/msn/msn.c:245 -#, fuzzy msgid "Invalid Username" -msgstr "Epäkelpo nimi" +msgstr "Epäkelpo käyttäjänimi" #: src/protocols/msn/msn.c:248 -#, fuzzy msgid "Invalid Friendly Name" -msgstr "Epäkelpo nimi" +msgstr "Epäkelpo tuttavanimi" #: src/protocols/msn/msn.c:251 msgid "List Full" -msgstr "" +msgstr "Lista täynnä" #: src/protocols/msn/msn.c:254 msgid "Already there" -msgstr "" +msgstr "Olet jo siellä" #: src/protocols/msn/msn.c:257 -#, fuzzy msgid "Not on list" -msgstr "Yhteys kadotettu" +msgstr "Ei listalla" #: src/protocols/msn/msn.c:260 msgid "User is offline" -msgstr "" +msgstr "Käyttäjä on poissa linjoilta" #: src/protocols/msn/msn.c:263 msgid "Already in the mode" -msgstr "" +msgstr "Olet jo kyseisessä tilassa" #: src/protocols/msn/msn.c:266 msgid "Already in opposite list" -msgstr "" +msgstr "Olet jo vastakkaisessa listassa" #: src/protocols/msn/msn.c:269 +#, fuzzy msgid "Switchboard failed" -msgstr "" +msgstr "Kytkentä epäonnistui" #: src/protocols/msn/msn.c:272 msgid "Notify Transfer failed" -msgstr "" +msgstr "Siirrosta tiedottaminen epäonnistui" #: src/protocols/msn/msn.c:276 msgid "Required fields missing" -msgstr "" +msgstr "Vaadittuja kenttiä puuttuu" #: src/protocols/msn/msn.c:279 -#, fuzzy msgid "Not logged in" -msgstr "%s kirjautui sisään." +msgstr "Et ole kirjautuneena sisään." #: src/protocols/msn/msn.c:283 -#, fuzzy msgid "Internal server error" -msgstr "Sisäinen virhe" +msgstr "Sisäinen palvelinvirhe" #: src/protocols/msn/msn.c:286 msgid "Database server error" -msgstr "" +msgstr "Tietokantapalvelimen virhe" #: src/protocols/msn/msn.c:289 -#, fuzzy msgid "File operation error" -msgstr "sisäinen yhteysvirhe\n" +msgstr "Tiedostotoiminnossa virhe" #: src/protocols/msn/msn.c:292 -#, fuzzy msgid "Memory allocation error" -msgstr "merkittävä yhteysvirhe\n" +msgstr "Muistin varaamisessa virhe" #: src/protocols/msn/msn.c:296 -#, fuzzy msgid "Server busy" -msgstr "Palvelin:" +msgstr "Palvelin on varattu" #: src/protocols/msn/msn.c:299 -#, fuzzy msgid "Server unavailable" -msgstr "Tavoittamattomissa" +msgstr "Palvelin on tavoittamattomissa" #: src/protocols/msn/msn.c:302 msgid "Peer Notification server down" -msgstr "" +msgstr "Vastapään tiedottajapalvelin ei toiminnassa" #: src/protocols/msn/msn.c:305 -#, fuzzy msgid "Database connect error" -msgstr "sisäinen yhteysvirhe\n" +msgstr "Tietokantayhteysvirhe" #: src/protocols/msn/msn.c:308 msgid "Server is going down (abandon ship)" -msgstr "" +msgstr "Palvelin on poistumassa toiminnasta (jättäkää laiva)" #: src/protocols/msn/msn.c:312 -#, fuzzy msgid "Error creating connection" -msgstr "g003: Virhe avattaessa yhteyttä.\n" +msgstr "Virhe luotaessa yhteyttä" #: src/protocols/msn/msn.c:318 msgid "Session overload" -msgstr "" +msgstr "Istunnon ylikuormitus" #: src/protocols/msn/msn.c:321 msgid "User is too active" -msgstr "" +msgstr "Käyttäjä on liian aktiivinen" #: src/protocols/msn/msn.c:324 -#, fuzzy msgid "Too many sessions" -msgstr "Liian monta täsmäävyyttä." +msgstr "Liian monta istuntoa" #: src/protocols/msn/msn.c:327 msgid "Not expected" -msgstr "" +msgstr "Odottamaton" #: src/protocols/msn/msn.c:330 msgid "Bad friend file" -msgstr "" +msgstr "Virheellinen tuttavatiedosto" #: src/protocols/msn/msn.c:334 -#, fuzzy msgid "Authentication failed" -msgstr "Todennus epäonnistui." +msgstr "Todennus epäonnistui" #: src/protocols/msn/msn.c:337 -#, fuzzy msgid "Not allowed when offline" -msgstr "Ei ääniä kun kirjaudut sisään" +msgstr "Ei sallittu kun poissa linjoilta" #: src/protocols/msn/msn.c:340 msgid "Not accepting new users" -msgstr "" +msgstr "Ei ota vastaan uusia käyttäjiä" #: src/protocols/msn/msn.c:343 msgid "User unverified" -msgstr "" +msgstr "Varmistamaton käyttäjä" #: src/protocols/msn/msn.c:346 -#, fuzzy msgid "Unknown Error Code" -msgstr "Tuntematon virhekoodi." +msgstr "Tuntematon virhekoodi" #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558 #: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114 @@ -870,7 +840,7 @@ #: src/protocols/msn/msn.c:558 msgid "A message may not have been received." -msgstr "" +msgstr "Viestiä ei ehkä ole saatu vastaan" #: src/protocols/msn/msn.c:813 msgid "Gaim was unable to send a message" @@ -879,93 +849,84 @@ #: src/protocols/msn/msn.c:917 #, c-format msgid "The user %s (%s) wants to add %s to his or her buddy list." -msgstr "" +msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen." #: src/protocols/msn/msn.c:1074 #, c-format msgid "The user %s (%s) wants to add you to their buddy list" -msgstr "" +msgstr "Käyttäjä %s (%s) haluaa lisätä sinut tuttavalistalleen" #: src/protocols/msn/msn.c:1175 msgid "You have been disconnected. You have signed on from another location." msgstr "Yhteytesi on katkennut. Olet kirjautunut sisään toisesta paikasta." #: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679 -#, fuzzy msgid "Error reading from server" -msgstr "Virhe luettaessa socketista." +msgstr "Virhe luettaessa palvelimelta" #: src/protocols/msn/msn.c:1568 msgid "Requesting to send password" -msgstr "" +msgstr "Pyydetään salasanan lähettämistä" #: src/protocols/msn/msn.c:1618 -#, fuzzy msgid "Unable to send password" -msgstr "Ei kyetty lukemaan socketia" +msgstr "Ei kyetty lähettämään salasanaa" #: src/protocols/msn/msn.c:1623 -#, fuzzy msgid "Password sent" -msgstr "Salasana: " +msgstr "Salasana lähetetty" #: src/protocols/msn/msn.c:1748 -#, fuzzy msgid "Unable to write to server" -msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä." +msgstr "Palvelimelle ei kyetty kirjoittamaan" #: src/protocols/msn/msn.c:1754 -#, fuzzy msgid "Synching with server" -msgstr "Rekisteröidy palvelimeen" +msgstr "Synkronoidaan palvelimen kanssa" #: src/protocols/msn/msn.c:1920 msgid "Away From Computer" -msgstr "" +msgstr "Poissa tietokoneelta" #: src/protocols/msn/msn.c:1921 msgid "Be Right Back" -msgstr "" +msgstr "Tulen pian takaisin" #: src/protocols/msn/msn.c:1922 -#, fuzzy msgid "Busy" -msgstr "Tuttava" +msgstr "Varattu" #: src/protocols/msn/msn.c:1923 msgid "On The Phone" -msgstr "" +msgstr "Puhelimessa" #: src/protocols/msn/msn.c:1924 msgid "Out To Lunch" -msgstr "" +msgstr "Lounaalla" #: src/protocols/msn/msn.c:1925 -#, fuzzy msgid "Hidden" -msgstr "Piilota kuvake" +msgstr "Piilotettu" #: src/protocols/msn/msn.c:2041 msgid "Reset friendly name" -msgstr "" +msgstr "Nollaa tuttavanimi" #: src/protocols/msn/msn.c:2114 msgid "Friendly name too long." -msgstr "" +msgstr "Tuttavanimi liian pitkä." #: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150 -#, fuzzy msgid "Set Friendly Name" -msgstr "Sukunimi" +msgstr "Aseta tuttavanimi" #: src/protocols/msn/msn.c:2130 -#, fuzzy msgid "Set Friendly Name:" -msgstr "Näyttönimi: " +msgstr "Aseta tuttavanimi: " #: src/protocols/msn/msn.c:2131 msgid "Reset All Friendly Names" -msgstr "" +msgstr "Nollaa kaikki tuttavanimet" #: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336 msgid "Invalid name" @@ -1088,15 +1049,15 @@ msgstr "Suora pikaviesti %s:n kanssa muodostettu" #: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456 -#, fuzzy, c-format +#, c-format msgid "" "The user %lu has denied your request to add them to your contact list for " "the following reason:\n" "%s" msgstr "" -"Käyttäjä %d on evännyt pyyntösi lisätä hänet tuttavalistallesi seuraavasta " +"Käyttäjä %lu on evännyt pyyntösi lisätä hänet tuttavalistallesi seuraavasta " "syystä:\n" -"\n" +"%s" #: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456 msgid "No reason given." @@ -1107,9 +1068,9 @@ msgstr "Gaim - ICQ valtuutus evätty" #: src/protocols/oscar/oscar.c:1511 src/protocols/oscar/oscar.c:2463 -#, fuzzy, c-format +#, c-format msgid "The user %lu has granted your request to add them to your contact list." -msgstr "Käyttäjä %d on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi." +msgstr "Käyttäjä %lu on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi." #: src/protocols/oscar/oscar.c:1512 src/protocols/oscar/oscar.c:2464 msgid "Gaim - ICQ Authorization Granted" @@ -1144,7 +1105,8 @@ #, c-format msgid "" "You missed %d messages from %s because the rate limit has been exceeded." -msgstr "Et saanut %d viestiä %s:lta koska taajuusraja ylittyi." +msgstr "" +"Et saanut %d viestiä %s:lta koska taajuusraja ylittyi." #: src/protocols/oscar/oscar.c:1615 #, c-format @@ -1185,12 +1147,12 @@ #: src/protocols/oscar/oscar.c:1703 #, c-format msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR>%s<BR>" -msgstr "" +msgstr "<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR>%s<BR>" #: src/protocols/oscar/oscar.c:1705 #, c-format msgid "<B>Status:</B> %s<BR><HR><BR>%s<BR>" -msgstr "" +msgstr "<B>Tila:</B> %s<BR><HR><BR>%s<BR>" #: src/protocols/oscar/oscar.c:1734 #, c-format @@ -1350,11 +1312,12 @@ "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 "" +"Maksimimäärä tuttavia tuttavalistallasi on %d ja sinulla on nyt %d. Jotkut " +"tuttavat eivat näy olevan linjoilla ennen kuin alitat rajan." #: src/protocols/oscar/oscar.c:3195 -#, fuzzy msgid "Gaim - Warning" -msgstr "Gaim - Varoita käyttäjää?" +msgstr "Gaim - Varoitus" #: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108 msgid "Exchange:" @@ -1381,6 +1344,8 @@ "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not " "support sending status messages.</I><BR>" msgstr "" +"<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR><I>Vastapuolen ohjelma ei " +"tue tilaviestien lähettämistä.</I><BR>" #: src/protocols/oscar/oscar.c:3575 #, c-format @@ -1388,11 +1353,12 @@ "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message." "</I><BR>" msgstr "" +"<B>UIN:</B> %s<BR><B>Tila:</B> %s<BR><HR><BR><I>Käyttäjällä ei ole tilaviestia." +"</I><BR>" #: src/protocols/oscar/oscar.c:3600 -#, fuzzy msgid "Get Status Msg" -msgstr "Hae poissaoloviesti" +msgstr "Hae tilaviesti" #: src/protocols/oscar/oscar.c:3613 msgid "Direct IM" @@ -1620,7 +1586,6 @@ msgstr "Tietoja Gaimista v%s" #: src/about.c:135 -#, fuzzy msgid "" "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" @@ -1628,8 +1593,10 @@ "\n" "URL: " msgstr "" -"Gaim on asiakassovellus joka tukee AOL:n pikaviestiprotokollaa. Se on \n" -"ohjelmoitu käyttäen Gtk+:aa ja on lisensoitu GPL:n mukaisesti.\n" +"Gaim on modulaarinen pikaviestinasiakassovellus, joka kykenee \n" +"käyttämään AIM-, ICQ-, Yahoo!-, MSN-, IRC-, Jabber-, Napster-,\n" +"Zephyr- ja Gadu-Gadu-protokollia yhtä aikaa. Se on ohjelmoitu \n" +"käyttäen Gtk+:aa ja on lisensoitu GPL:n mukaisesti.\n" "\n" "URL: " @@ -1639,6 +1606,9 @@ "\n" "IRC: #gaim on irc.openprojects.net" msgstr "" +"\n" +"\n" +"IRC: #gaim palvelimella irc.openprojects.net" #: src/about.c:147 msgid "" @@ -1663,7 +1633,7 @@ "Aktiiviset kehittäjät\n" "==============================\n" "Rob Flynn (ylläpitäjä) [ ro...@ma... ]\n" -"Sean Egan (ohjelmoija) [ bj...@bi... ]\n" +"Sean Egan (ohjelmoija) [ bj...@bi... ]\n" "\n" "Villit korjausten kirjoittajat\n" "==============================\n" @@ -1676,7 +1646,7 @@ "==============================\n" "Jim Duchek\n" "Eric Warmenhoven [ war...@ya... ]\n" -"Mark Spencer (alkuperäinen tekijä) [ mar...@ma... ]" +"Mark Spencer (alkuperäinen tekijä) [ mar...@ma... ]" #. this makes the sizes not work. #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); @@ -1739,9 +1709,8 @@ msgstr "Asetukset" #: src/aim.c:838 src/multi.c:1472 -#, fuzzy msgid "Auto-login" -msgstr "Kirjaudu sisään automaattisesti" +msgstr "Automaattinen sisäänkirjautuminen" #: src/applet.c:109 msgid "Attempting to sign on...." @@ -1958,14 +1927,12 @@ msgstr "Ohje" #: src/buddy.c:2787 -#, fuzzy msgid "Online Help" -msgstr "Linjoilla" +msgstr "Tukea linjoilla" #: src/buddy.c:2788 -#, fuzzy msgid "Debug Window" -msgstr "Näytä testausikkuna" +msgstr "Testausikkuna" #: src/buddy.c:2789 msgid "About Gaim" @@ -2344,9 +2311,8 @@ msgstr "Käyttäjä:" #: src/dialogs.c:777 -#, fuzzy msgid "Account:" -msgstr "Käyttäjätili" +msgstr "Käyttäjätili:" #. Finish up #: src/dialogs.c:826 @@ -2689,9 +2655,8 @@ msgstr "g003: Virhe avattaessa yhteyttä.\n" #: src/module.c:106 src/module.c:112 src/module.c:122 -#, fuzzy msgid "Plugin Error" -msgstr "Sisäänkirjautumisvirhe" +msgstr "Liitännäisvirhe" #: src/multi.c:454 msgid "Gaim - Load Buddy Icon" @@ -2714,9 +2679,8 @@ msgstr "Näyttönimi:" #: src/multi.c:559 -#, fuzzy msgid "Alias:" -msgstr "Alias" +msgstr "Alias:" #: src/multi.c:569 msgid "Protocol:" @@ -2957,7 +2921,7 @@ #: src/prefs.c:291 msgid "Konqueror" -msgstr "" +msgstr "Konqueror" #: src/prefs.c:292 msgid "Opera" @@ -2969,7 +2933,7 @@ #: src/prefs.c:294 msgid "Mozilla" -msgstr "" +msgstr "Mozilla" #: src/prefs.c:297 msgid "Pop up new window by default" @@ -2986,7 +2950,7 @@ #: src/prefs.c:307 #, c-format msgid "Manual (%s for URL)" -msgstr "" +msgstr "Käyttöohje (URL:ksi %s)" #: src/prefs.c:376 msgid "Proxy Options" @@ -3082,7 +3046,7 @@ #: src/prefs.c:600 msgid "Raise Buddy List on Signons and Signoffs" -msgstr "" +msgstr "Nosta tuttavalista sisään- ja uloskirjautumisten kohdalla" #: src/prefs.c:602 msgid "Group Displays" @@ -3090,7 +3054,7 @@ #: src/prefs.c:614 msgid "Hide groups with no online buddies" -msgstr "Piilota ryhmät joissa ei ole sisäänkirjautuneita tuttavia" +msgstr "Piilota ryhmät joissa ei ole tuttavia linjoilla" #: src/prefs.c:620 msgid "Show numbers in groups" @@ -3137,9 +3101,8 @@ msgstr "\"Escape\" sulkee ikkunan" #: src/prefs.c:686 -#, fuzzy msgid "Control-W closes window" -msgstr "\"Escape\" sulkee ikkunan" +msgstr "\"Control-W\" sulkee ikkunan" #: src/prefs.c:692 msgid "Control-{B/I/U/S} inserts HTML tags" @@ -3242,9 +3205,8 @@ msgstr "Näytä sisäänkirjautumiset ikkunassa" #: src/prefs.c:969 -#, fuzzy msgid "Show aliases in tabs/titles/ticker" -msgstr "Näytä aliakset välilehdissä/otsikoissa" +msgstr "Näytä aliakset välilehdissä/otsikoissa/vierittimessä" #: src/prefs.c:970 msgid "Hide window on send" @@ -3498,7 +3460,7 @@ #: src/prpl.c:93 #, c-format msgid "%s was using %s, which got removed. %s is now offline." -msgstr "%s käytti %s:aa, joka poistettiin. %s on nyt poissa verkosta." +msgstr "%s käytti %s:aa, joka poistettiin. %s on nyt poissa linjoilta." #: src/prpl.c:96 msgid "Disconnect" @@ -3521,12 +3483,11 @@ msgstr "Avaa sähköposti" #: src/prpl.c:570 -#, fuzzy, c-format +#, c-format msgid "%s%s%s%s has made %s his or her buddy%s%s%s" msgstr "%s%s%s%s on tehnyt %s:sta tuttavansa%s%s%s" #: src/prpl.c:578 -#, fuzzy msgid "" "\n" "\n" @@ -3586,54 +3547,42 @@ msgstr "Lisää tietoja" #: src/sound.c:63 -#, fuzzy msgid "Buddy logs in" -msgstr "Tuttavakuvake" +msgstr "Tuttava kirjautuu sisään" #: src/sound.c:64 -#, fuzzy msgid "Buddy logs out" -msgstr "Tuttavalista" +msgstr "Tuttava kirjautuu ulos" #: src/sound.c:65 -#, fuzzy msgid "Message received" -msgstr "Viestivirhe" +msgstr "Viesti vastaanotettu" #: src/sound.c:66 msgid "Message received begins conversation" -msgstr "" +msgstr "Vastaanotettu viesti aloittaa keskustelun" #: src/sound.c:67 -#, fuzzy msgid "Message sent" -msgstr "Viestit" +msgstr "Viesti lähetetty" #: src/sound.c:68 msgid "Person enters chat" -msgstr "" +msgstr "Joku saapuu ryhmäkeskusteluun" #: src/sound.c:69 msgid "Person leaves chat" -msgstr "" +msgstr "Joku poistuu ryhmäkeskustelusta" #: src/sound.c:70 msgid "You talk in chat" -msgstr "" +msgstr "Sinä puhut ryhmäkeskustelussa" #: src/sound.c:71 msgid "Others talk in chat" -msgstr "" +msgstr "Muut puhuvat ryhmäkeskustelussa" #: src/sound.c:74 msgid "Someone says your name in chat" -msgstr "" - -#~ msgid "Enable sounds" -#~ msgstr "Ota äänet käyttöön" - -#~ msgid "KFM" -#~ msgstr "KFM" +msgstr "Joku sanoo nimesi ryhmäkeskustelussa" -#~ msgid "Manual" -#~ msgstr "Manuaalinen" |
|
From: Rob F. <rob...@us...> - 2002-07-02 23:51:08
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv8947 Modified Files: ChangeLog Log Message: lalal Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.511 retrieving revision 1.512 diff -u -d -r1.511 -r1.512 --- ChangeLog 2 Jul 2002 05:44:20 -0000 1.511 +++ ChangeLog 2 Jul 2002 23:51:05 -0000 1.512 @@ -3,6 +3,7 @@ version 0.60: * French translation updated (thanks, Stephane Wirtel) * Polish translation updated (Thanks, Przemyslaw Sulek) + * Finnish translation updated (Thanks, Tero Kuusela) version 0.59 (06/24/2002): * Hungarian translation added (Thanks, Sutto Zoltan) |
|
From: Rob F. <rob...@us...> - 2002-07-02 05:44:23
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv22537 Modified Files: ChangeLog Log Message: death is quite becoming Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.510 retrieving revision 1.511 diff -u -d -r1.510 -r1.511 --- ChangeLog 2 Jul 2002 05:41:29 -0000 1.510 +++ ChangeLog 2 Jul 2002 05:44:20 -0000 1.511 @@ -1,7 +1,8 @@ Gaim: The Pimpin' Penguin IM Clone thats good for the soul! version 0.60: - * French translation updated + * French translation updated (thanks, Stephane Wirtel) + * Polish translation updated (Thanks, Przemyslaw Sulek) version 0.59 (06/24/2002): * Hungarian translation added (Thanks, Sutto Zoltan) |
|
From: Rob F. <rob...@us...> - 2002-07-02 05:44:23
|
Update of /cvsroot/gaim/gaim/po In directory usw-pr-cvs1:/tmp/cvs-serv22537/po Modified Files: pl.po Log Message: death is quite becoming Index: pl.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/pl.po,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- pl.po 2 Jul 2002 05:42:26 -0000 1.17 +++ pl.po 2 Jul 2002 05:44:20 -0000 1.18 @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: gaim 0.59\n" -"POT-Creation-Date: 2002-06-25 00:10-0400\n" -"PO-Revision-Date: 2002-06-02 20:01+0100\n" +"Project-Id-Version: gaim 0.60\n" +"POT-Creation-Date: 2002-06-30 01:05-0400\n" +"PO-Revision-Date: 2002-06-30 07:59+0100\n" "Last-Translator: Przemys³aw Su³ek <pb...@li...>\n" "Language-Team: POLISH <pl...@li...>\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716 #: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449 -#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899 +#: src/conversation.c:2866 src/dialogs.c:567 src/dialogs.c:3899 #: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438 #: src/prpl.c:685 src/server.c:1072 msgid "Close" @@ -40,14 +40,14 @@ #. Put the buttons in the box #: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827 -#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879 +#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2881 #: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053 #: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417 msgid "Add" msgstr "Dodaj" #: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829 -#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876 +#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2878 #: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421 msgid "Remove" msgstr "Usuñ" @@ -98,7 +98,7 @@ msgstr "Dostêpny tylko dla przyjació³" #: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727 -#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118 +#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141 msgid "Away" msgstr "Zajêty" @@ -114,7 +114,7 @@ msgid "Invisible for friends only" msgstr "Niewidoczny tylko dla przyjació³" -#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114 +#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137 msgid "Unavailable" msgstr "Niedostêpny" @@ -351,7 +351,7 @@ #. show_set_dir(gc); #. #: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177 -#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761 +#: src/protocols/jabber/jabber.c:3904 src/protocols/jabber/jabber.c:3917 msgid "Change Password" msgstr "Zmieñ has³o" @@ -372,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:2860 src/protocols/oscar/oscar.c:3593 +#: src/protocols/jabber/jabber.c:2992 src/protocols/oscar/oscar.c:3593 #: src/protocols/toc/toc.c:1219 msgid "Get Info" msgstr "Pobierz informacjê" @@ -446,214 +446,226 @@ msgid "DCC Chat" msgstr "Chat DCC" -#: src/protocols/jabber/jabber.c:942 +#: src/protocols/jabber/jabber.c:950 msgid "Incorrect current password! Password NOT Changed!" msgstr "Niepoprawne obezne has³o! Has³o NIE zmienione!" -#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948 +#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956 msgid "Password Change Error!" msgstr "B³±d zmiany has³a!" -#: src/protocols/jabber/jabber.c:947 +#: src/protocols/jabber/jabber.c:955 msgid "New password same as old password! Password NOT Changed!" msgstr "Nowe has³o takie samo jak stare! Has³o NIE zmienione!" -#: src/protocols/jabber/jabber.c:1092 +#: src/protocols/jabber/jabber.c:1115 msgid "Unknown" msgstr "Nieznany" -#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120 -#: src/protocols/jabber/jabber.c:1138 +#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1143 +#: src/protocols/jabber/jabber.c:1161 msgid "Online" msgstr "Dostêpny" -#: src/protocols/jabber/jabber.c:1122 +#: src/protocols/jabber/jabber.c:1145 msgid "Extended Away" msgstr "Rozszerzona zajêto¶æ" -#: src/protocols/jabber/jabber.c:1124 +#: src/protocols/jabber/jabber.c:1147 msgid "Do Not Disturb" msgstr "Nie przeszkadzaæ" -#: src/protocols/jabber/jabber.c:1434 +#: src/protocols/jabber/jabber.c:1457 #, c-format msgid "Error %s: %s" msgstr "B³±d %s: %s" -#: src/protocols/jabber/jabber.c:1437 +#: src/protocols/jabber/jabber.c:1460 msgid "Unknown Error in presence" msgstr "Nieznany b³±d w prezencji." -#: src/protocols/jabber/jabber.c:1607 +#: src/protocols/jabber/jabber.c:1630 #, c-format msgid "The user %s wants to add you to their buddy list." msgstr "U¿ytkownik %s chce dodaæ Ciê do swojej listy kumpli." -#: src/protocols/jabber/jabber.c:1632 +#: src/protocols/jabber/jabber.c:1655 msgid "No such user" msgstr "Brak u¿ytkownika" -#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341 -#: src/protocols/jabber/jabber.c:2506 +#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2364 +#: src/protocols/jabber/jabber.c:2632 msgid "Jabber Error" msgstr "B³±d Jabber" -#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719 +#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1742 #: src/protocols/msn/msn.c:1110 msgid "Buddies" msgstr "Kumple" -#: src/protocols/jabber/jabber.c:1782 +#: src/protocols/jabber/jabber.c:1805 msgid "Authenticating" msgstr "Autentykowanie" -#: src/protocols/jabber/jabber.c:1819 +#: src/protocols/jabber/jabber.c:1842 msgid "Unknown login error" msgstr "Nieznany b³±d logowania." -#: src/protocols/jabber/jabber.c:2010 +#: src/protocols/jabber/jabber.c:2033 msgid "Password successfully changed." msgstr "Zmiana has³a powiod³a siê." -#: src/protocols/jabber/jabber.c:2012 +#: src/protocols/jabber/jabber.c:2035 msgid "Password Change" msgstr "Zmiana has³a" -#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676 +#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3832 msgid "Connection lost" msgstr "Po³±czenie utracone" -#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088 -#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724 +#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111 +#: src/protocols/jabber/jabber.c:3834 src/protocols/jabber/jabber.c:3880 #: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770 msgid "Unable to connect" msgstr "Nie mo¿na siê po³±czyæ" -#: src/protocols/jabber/jabber.c:2062 +#: src/protocols/jabber/jabber.c:2085 msgid "Connected" msgstr "Po³±czony" -#: src/protocols/jabber/jabber.c:2065 +#: src/protocols/jabber/jabber.c:2088 msgid "Requesting Authentication Method" msgstr "¯±danie metody autentykacji" #. we have no chats yet -#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762 +#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1762 msgid "Connecting" msgstr "£±czenie" -#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505 +#: src/protocols/jabber/jabber.c:2363 src/protocols/jabber/jabber.c:2631 msgid "Invalid Jabber I.D." msgstr "Niepoprawna ID Jabber" -#: src/protocols/jabber/jabber.c:2473 +#: src/protocols/jabber/jabber.c:2599 msgid "Room:" msgstr "Pokój:" -#: src/protocols/jabber/jabber.c:2477 +#: src/protocols/jabber/jabber.c:2603 msgid "Server:" msgstr "Serwer:" -#: src/protocols/jabber/jabber.c:2482 +#: src/protocols/jabber/jabber.c:2608 msgid "Handle:" msgstr "Uchwyt:" -#: src/protocols/jabber/jabber.c:2539 +#: src/protocols/jabber/jabber.c:2665 msgid "Chats" msgstr "Czaty" -#: src/protocols/jabber/jabber.c:2854 +#: src/protocols/jabber/jabber.c:2980 msgid "View Error Msg" msgstr "Poka¿ komunikat b³êdu" -#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865 +#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2997 #: src/protocols/oscar/oscar.c:3606 msgid "Get Away Msg" msgstr "Pobierz wiadomo¶æ Zajêty" -#: src/protocols/jabber/jabber.c:2882 +#: src/protocols/jabber/jabber.c:3004 +msgid "Un-hide From" +msgstr "Ods³oñ Od" + +#: src/protocols/jabber/jabber.c:3007 +msgid "Temporarily Hide From" +msgstr "Tymczasowo schowaj Od" + +#: src/protocols/jabber/jabber.c:3025 msgid "Remove From Roster" msgstr "Usuñ ze spisu" -#: src/protocols/jabber/jabber.c:3076 +#: src/protocols/jabber/jabber.c:3030 +msgid "Cancel Presence Notification" +msgstr "Anuluj pokazywanie powiadomienia" + +#: src/protocols/jabber/jabber.c:3232 msgid "Full Name" msgstr "Pe³na nazwa" -#: src/protocols/jabber/jabber.c:3077 +#: src/protocols/jabber/jabber.c:3233 msgid "Family Name" msgstr "Nazwisko" -#: src/protocols/jabber/jabber.c:3078 +#: src/protocols/jabber/jabber.c:3234 msgid "Given Name" msgstr "Nazwisko panieñskie" -#: src/protocols/jabber/jabber.c:3079 +#: src/protocols/jabber/jabber.c:3235 msgid "Nickname" msgstr "Pseudonim" -#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080 +#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3236 msgid "URL" msgstr "URL" -#: src/protocols/jabber/jabber.c:3081 +#: src/protocols/jabber/jabber.c:3237 msgid "Street Address" msgstr "Adres ulica" -#: src/protocols/jabber/jabber.c:3082 +#: src/protocols/jabber/jabber.c:3238 msgid "Extended Address" msgstr "Rozszerzony adres" -#: src/protocols/jabber/jabber.c:3083 +#: src/protocols/jabber/jabber.c:3239 msgid "Locality" msgstr "Miejsce (lokalizacja)" -#: src/protocols/jabber/jabber.c:3084 +#: src/protocols/jabber/jabber.c:3240 msgid "Region" msgstr "Region" -#: src/protocols/jabber/jabber.c:3085 +#: src/protocols/jabber/jabber.c:3241 msgid "Postal Code" msgstr "Kod pocztowy" #. Line 7 -#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086 +#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3242 msgid "Country" msgstr "Kraj" -#: src/protocols/jabber/jabber.c:3087 +#: src/protocols/jabber/jabber.c:3243 msgid "Telephone" msgstr "Telefon" -#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088 +#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3244 msgid "Email" msgstr "Email" -#: src/protocols/jabber/jabber.c:3089 +#: src/protocols/jabber/jabber.c:3245 msgid "Organization Name" msgstr "Nazwa organizacji" -#: src/protocols/jabber/jabber.c:3090 +#: src/protocols/jabber/jabber.c:3246 msgid "Organization Unit" msgstr "Jednostka organizacyjna" -#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091 +#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3247 msgid "Title" msgstr "Tytu³" -#: src/protocols/jabber/jabber.c:3092 +#: src/protocols/jabber/jabber.c:3248 msgid "Role" msgstr "Rola" -#: src/protocols/jabber/jabber.c:3093 +#: src/protocols/jabber/jabber.c:3249 msgid "Birthday" msgstr "Data urodzenia" #. Right side: frame with description and the filepath of plugin -#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094 +#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3250 msgid "Description" msgstr "Opis" -#: src/protocols/jabber/jabber.c:3119 +#: src/protocols/jabber/jabber.c:3275 msgid "" "All items below are optional. Enter only the information with which you feel " "comfortable" @@ -661,23 +673,23 @@ "Wszystkie poni¿sze pola s± opcjonalne. Wprowad¼ jedynie te informacje, które " "uwa¿asz za stosowne" -#: src/protocols/jabber/jabber.c:3120 +#: src/protocols/jabber/jabber.c:3276 msgid "User Identity" msgstr "Identyfikacja u¿ytkownika" -#: src/protocols/jabber/jabber.c:3532 +#: src/protocols/jabber/jabber.c:3688 msgid "Gaim - Edit Jabber vCard" msgstr "Gaim - Edycja vCard Jabber" -#: src/protocols/jabber/jabber.c:3606 +#: src/protocols/jabber/jabber.c:3762 msgid "Server Registration successful!" msgstr "Poprawa rejestracja na serwerze!" -#: src/protocols/jabber/jabber.c:3633 +#: src/protocols/jabber/jabber.c:3789 msgid "Unknown registration error" msgstr "Nieznany b³±d rejestracji" -#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757 +#: src/protocols/jabber/jabber.c:3898 src/protocols/jabber/jabber.c:3913 msgid "Set User Info" msgstr "Ustaw informacje o u¿ytkowniku" @@ -1769,7 +1781,7 @@ msgstr "IM" #: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286 -#: src/buddy_chat.c:1462 src/conversation.c:2897 +#: src/buddy_chat.c:1462 src/conversation.c:2899 msgid "Info" msgstr "Info" @@ -2050,15 +2062,15 @@ msgstr "Szept" #: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464 -#: src/conversation.c:2908 +#: src/conversation.c:2910 msgid "Send" msgstr "Wy¶lij " -#: src/buddy_chat.c:1458 src/conversation.c:2885 +#: src/buddy_chat.c:1458 src/conversation.c:2887 msgid "Block" msgstr "Blokuj" -#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424 +#: src/buddy_chat.c:1460 src/conversation.c:2893 src/dialogs.c:424 #: src/dialogs.c:453 msgid "Warn" msgstr "Ostrze¿" @@ -2222,23 +2234,23 @@ msgid "Send message as: " msgstr "Wy¶lij wiadomo¶æ jako: " -#: src/conversation.c:3453 +#: src/conversation.c:3455 msgid "Gaim - Save Icon" msgstr "Gaim - zapisz ikonê" -#: src/conversation.c:3487 +#: src/conversation.c:3489 msgid "Disable Animation" msgstr "Wy³±cz animacjê" -#: src/conversation.c:3492 +#: src/conversation.c:3494 msgid "Enable Animation" msgstr "Za³±cz animacjê" -#: src/conversation.c:3498 +#: src/conversation.c:3500 msgid "Hide Icon" msgstr "Ukryj ikonê" -#: src/conversation.c:3504 +#: src/conversation.c:3506 msgid "Save Icon As..." msgstr "Zapisz ikonê jako..." |
|
From: Rob F. <rob...@us...> - 2002-07-02 05:42:30
|
Update of /cvsroot/gaim/gaim/po In directory usw-pr-cvs1:/tmp/cvs-serv21824/po Modified Files: bg.po cs.po da.po de.po fi.po hu.po it.po ja.po ko.po pl.po ru.po sk.po sv.po zh_CN.po zh_TW.po Log Message: blah Index: bg.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/bg.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bg.po 26 Apr 2002 22:18:07 -0000 1.2 +++ bg.po 2 Jul 2002 05:42:25 -0000 1.3 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-04-15 21:02-0700\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-04-16 04:54+0200\n" "Last-Translator: Hristo Todorov <ig...@bo...>\n" "Language-Team: Bulgarian <bg...@li...>\n" @@ -14,6 +14,117 @@ "Content-Type: text/plain; charset=Windows-1251\n" "Content-Transfer-Encoding: 8bit\n" [...3566 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "Ïîçâîëÿâàíå íà çâóêà" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "Ðú÷íî" Index: cs.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/cs.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cs.po 19 May 2002 17:27:06 -0000 1.1 +++ cs.po 2 Jul 2002 05:42:25 -0000 1.2 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gaim 0.48\n" -"POT-Creation-Date: 2002-04-26 01:28-0400\n" +"POT-Creation-Date: 2002-06-25 00:10-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" @@ -13,7 +13,87 @@ "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" [...3792 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "Povolit zvuky" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "Návod" Index: da.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/da.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- da.po 18 Apr 2002 01:22:37 -0000 1.1 +++ da.po 2 Jul 2002 05:42:25 -0000 1.2 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GAIM 0.55\n" -"POT-Creation-Date: 2002-03-30 16:35-0800\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-04-01 23:04+0200\n" "Last-Translator: Lars Sarauw Hansen <sa...@dk...>\n" "Language-Team: Danish <da...@kl...>\n" @@ -16,6 +16,117 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" [...3587 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "Brug lyde" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "Andet program" Index: de.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/de.po,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- de.po 12 Apr 2002 02:57:18 -0000 1.35 +++ de.po 2 Jul 2002 05:42:25 -0000 1.36 @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Gaim 0.9.19\n" -"POT-Creation-Date: 2002-04-11 22:46-0700\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-03-31 11:29+0200\n" "Last-Translator: Karsten Weiss <kn...@gm...>\n" "Language-Team: de <de...@li...>\n" @@ -23,6 +23,115 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" [...3595 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "Klänge aktivieren" + +#~ msgid "KFM" +#~ msgstr "KFM/Konqueror" + +#~ msgid "Manual" +#~ msgstr "Manuell" Index: fi.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/fi.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- fi.po 18 Apr 2002 01:19:40 -0000 1.6 +++ fi.po 2 Jul 2002 05:42:26 -0000 1.7 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gaim 0.55\n" -"POT-Creation-Date: 2002-04-11 22:46-0700\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-03-23 20:32+0200\n" "Last-Translator: Tero Kuusela <te...@su...>\n" "Language-Team: Finnish <fi...@li...>\n" @@ -13,6 +13,117 @@ "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" [...3558 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "Ota äänet käyttöön" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "Manuaalinen" Index: hu.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/hu.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- hu.po 14 May 2002 18:24:30 -0000 1.1 +++ hu.po 2 Jul 2002 05:42:26 -0000 1.2 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-05-15 00:00-0400\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-05-12 19:00+0100\n" "Last-Translator: Zoltan Sutto <sut...@br...>\n" "Language-Team: HU <hu...@li...>\n" @@ -14,7 +14,87 @@ "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" [...2746 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "Hangok engedélyezése" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "Egyéni" Index: it.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/it.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- it.po 12 Apr 2002 02:57:19 -0000 1.3 +++ it.po 2 Jul 2002 05:42:26 -0000 1.4 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Gaim 0.53\n" -"POT-Creation-Date: 2002-04-11 22:46-0700\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\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,6 +13,115 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" [...3617 lines suppressed...] -#~ msgid "Away for friends only" -#~ msgstr "Assente solo per gli amici" - -#~ msgid "Invisible" -#~ msgstr "Invisibile" - -#~ msgid "Invisible for friends only" -#~ msgstr "Invisibile solo per gli amici" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "IRC: #gaim on irc.openprojects.net" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "IRC: #gaim su irc.openprojects.net" #~ msgid "Play" #~ msgstr "Suona" Index: ja.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/ja.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ja.po 24 Apr 2002 04:21:29 -0000 1.1 +++ ja.po 2 Jul 2002 05:42:26 -0000 1.2 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gaim version 0.56\n" -"POT-Creation-Date: 2002-04-11 22:59-0400\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-04-22 13:12+0900\n" "Last-Translator: Ryosuke Kutsuna <ry...@co...>\n" "Language-Team: Japanese\n" @@ -14,7 +14,87 @@ "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" [...3596 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "²»¤Î͸ú²½" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "¼êºî¶È" Index: ko.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/ko.po,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ko.po 4 Jun 2002 23:43:58 -0000 1.25 +++ ko.po 2 Jul 2002 05:42:26 -0000 1.26 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gaim 0.58\n" -"POT-Creation-Date: 2002-05-13 22:41-0400\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-06-03 09:02+0900\n" "Last-Translator: A Lee <al...@de...>\n" "Language-Team: artsilly and alee team\n" @@ -14,7 +14,87 @@ "Content-Type: text/plain; charset=euc-kr\n" "Content-Transfer-Encoding: 8bit\n" [...2779 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "¼Ò¸® »ç¿ë" + +#~ msgid "KFM" +#~ msgstr "ÄÁÄõ·¯" + +#~ msgid "Manual" +#~ msgstr "¼öµ¿" Index: pl.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/pl.po,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- pl.po 16 Jun 2002 17:09:55 -0000 1.16 +++ pl.po 2 Jul 2002 05:42:26 -0000 1.17 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gaim 0.59\n" -"POT-Creation-Date: 2002-06-15 17:14-0400\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-06-02 20:01+0100\n" "Last-Translator: Przemys³aw Su³ek <pb...@li...>\n" "Language-Team: POLISH <pl...@li...>\n" @@ -25,7 +25,7 @@ #: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716 #: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449 [...1779 lines suppressed...] -#: src/sound.c:66 +#: src/sound.c:70 msgid "You talk in chat" msgstr "Móiwsz na czacie" -#: src/sound.c:67 +#: src/sound.c:71 msgid "Others talk in chat" msgstr "Inni mówi± na czacie" -#: src/sound.c:69 +#: src/sound.c:74 msgid "Someone says your name in chat" msgstr "Kto¶ wymawia Twoje imiê na czacie" + +#~ msgid "KFM" +#~ msgstr "KFM" #~ msgid "Enable sounds" #~ msgstr "Za³±cz d¼wiêki" Index: ru.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/ru.po,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ru.po 12 Apr 2002 02:57:19 -0000 1.9 +++ ru.po 2 Jul 2002 05:42:26 -0000 1.10 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gaim 0.48\n" -"POT-Creation-Date: 2002-04-11 22:46-0700\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-03-22 14:05+0300\n" "Last-Translator: Grigory Bakunov <bl...@as...>\n" "Language-Team: RUSSIAN <RU...@li...>\n" @@ -13,6 +13,115 @@ "Content-Type: text/plain; charset=KOI8-R\n" "Content-Transfer-Encoding: 8bit\n" [...3573 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "òÁÚÒÅÛÉÔØ Ú×ÕË" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "äÒÕÇÏÊ" Index: sk.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/sk.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sk.po 12 Apr 2002 02:57:19 -0000 1.3 +++ sk.po 2 Jul 2002 05:42:26 -0000 1.4 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gaim 0.48\n" -"POT-Creation-Date: 2002-04-11 22:46-0700\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\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,6 +13,115 @@ "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" [...3693 lines suppressed...] +#~ "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!" +#~ "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.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- sv.po 19 May 2002 03:07:31 -0000 1.5 +++ sv.po 2 Jul 2002 05:42:26 -0000 1.6 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gaim\n" -"POT-Creation-Date: 2002-05-19 03:54+0200\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-05-19 03:54+0200\n" "Last-Translator: Christian Rose <me...@me...>\n" "Language-Team: Swedish <sv...@li...>\n" @@ -15,7 +15,83 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" [...2689 lines suppressed...] +#~ msgid "Enable sounds" +#~ msgstr "Använd ljud" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "Manuell" + #~ msgid "Error while writting to socket." #~ msgstr "Fel vid skrivning till uttag (socket)." #~ msgid "Handshake" #~ msgstr "Handskakning" - -#~ msgid "Connecting to GG server" -#~ msgstr "Ansluter till GG-servern" #~ msgid "Sending key" #~ msgstr "Skickar nyckel" Index: zh_CN.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/zh_CN.po,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- zh_CN.po 12 Apr 2002 02:57:20 -0000 1.21 +++ zh_CN.po 2 Jul 2002 05:42:26 -0000 1.22 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.9.19\n" -"POT-Creation-Date: 2002-04-11 22:46-0700\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2000-06-17 17:55+08\n" "Last-Translator: hashao <ha...@ch...>\n" "Language-Team: Simplified Chinese <zh...@li...>\n" @@ -16,6 +16,114 @@ "Content-Type: text/plain; charset=gb2312\n" "Content-Transfer-Encoding: 8bit\n" [...3686 lines suppressed...] -#~ "Unfortunately, currently TOC only allows new user registration by going to " -#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no" -#~ ". Clicking the Register button will open the URL for you." +#~ "Unfortunately, currently TOC only allows new user registration by going " +#~ "to http://aim.aol.com/aimnew/Aim/register.adp?" +#~ "promo=106723&pageset=Aim&client=no. Clicking the Register button will " +#~ "open the URL for you." #~ msgid "Gaim - Change MSN Name" #~ msgstr "Gaim - ¸ü¸Ä MSN Ãû×Ö" @@ -3383,9 +3897,6 @@ #~ msgid "Error Resolving Mail Server.\n" #~ msgstr "½âÎöµçÓÊ·þÎñÆ÷ʱ³ö´í¡£\n" - -#~ msgid "Buddy To Pounce:" -#~ msgstr "±»¼àÊÓµÄÅóÓÑ£º" #~ msgid "Message to send:" #~ msgstr "·¢ËÍÐÅÏ¢£º" Index: zh_TW.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/zh_TW.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- zh_TW.po 19 May 2002 03:09:05 -0000 1.2 +++ zh_TW.po 2 Jul 2002 05:42:26 -0000 1.3 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1 for gaim-0.5.7\n" -"POT-Creation-Date: 2002-04-26 01:28-0400\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-05-18 04:21+0800\n" "Last-Translator: Paladin Liu <pa...@ms...>\n" "Language-Team: z10n <z10n>\n" @@ -16,7 +16,87 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" [...4061 lines suppressed...] +#: src/sound.c:70 +msgid "You talk in chat" +msgstr "" + +#: src/sound.c:71 +msgid "Others talk in chat" +msgstr "" + +#: src/sound.c:74 +msgid "Someone says your name in chat" +msgstr "" + +#~ msgid "Enable sounds" +#~ msgstr "éåé³æ" + +#~ msgid "KFM" +#~ msgstr "KFM" + +#~ msgid "Manual" +#~ msgstr "èªå®" |
|
From: Rob F. <rob...@us...> - 2002-07-02 05:41:33
|
Update of /cvsroot/gaim/gaim/po In directory usw-pr-cvs1:/tmp/cvs-serv21669/po Modified Files: fr.po Log Message: hmm Index: fr.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/fr.po,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- fr.po 12 Apr 2002 02:57:19 -0000 1.27 +++ fr.po 2 Jul 2002 05:41:30 -0000 1.28 @@ -2,17 +2,127 @@ # Copyright (C) 2002 Free Software Foundation, Inc. # FIRST AUTHOR <seb...@if...>, 2001. # Stéphane Pontier <ste...@fr...>, 2002. +# Stephane Wirtel <ste...@be...>, 2002. # msgid "" msgstr "" "Project-Id-Version: Gaim 0.9.20\n" -"POT-Creation-Date: 2002-04-11 22:46-0700\n" +"POT-Creation-Date: 2002-06-25 00:10-0400\n" "PO-Revision-Date: 2002-03-24 02:00GMT\n" [...3362 lines suppressed...] +ÛÙ]\HÈLMÌ [Ú[]ÛY HWܺX]]\È\È ]Ú ÈH[ÝY\×OOOOOOOOOOOOOOOOOOW[[Z[Z[\XÚÛ[ÜÝ\][Ø[ X\ÈÛ[\][Ü]\È ]\º\×OOOOOOOOOOOOOOOOOOW[H XÚZ×\XÈØ\Y[Ý[È Ø\Y[Ý[ XZÛËÛÛHWX\ÈÜ[Ù\ +]]]\ÜYÚ[[ +HÈX\ÜÝ\X\ÛË]HË \ÈXZÙ\È H Ú^\ÈÝ ÛÜËËÕ×ÕÒQÑUÔÑUÑQÔÊ] ÛÕ×ÐÐSÑQUS +NÂËÝ×ÝÚYÙ]ÙÜXÙY][ +] ÛNÂÎ ÜËØXÝ] ÎN B\ÙÚYÙXÚ]H\ÙÜÝ Ú]HÙXÎ ÜËØZ[KÎMLÈ ÜËØY KÎÌB\ÙÚYÚYÛÙ\ÙÜÝ :XÛÛXÝ[ÛÎ ÜËØZ[KÎMB\ÙÚYX\ÙH[\ [Ý\ÙÛÛ\ÙÜÝ [ ^ Ý HÙÚ[Î ÜËØZ[KÎMH ÜËÛ][ KÎM ÜËÜÙ\\ÎMB\ÙÚYÚYÛÛ\Ü\ÙÜÝ \]\HÛÛXÝ[ÛÎ ÜËØZ[KÎÂ\ÙÚYØZ[H HÙÚ[\ÙÜÝ ØZ[H HÛÛXÝ[ÛÎ ÜËØZ[KÎ B\ÙÚYØÜY[[YN\ÙÜÝ Ù]YÛ[YNÎ ÜËØZ[KÎMÂ\ÙÚY\ÜÝÛÜ\ÙÜÝ [ÝH\ÜÙNÎ ÜËØZ[KÎÌN ÜËØY KÎÌLÂ\ÙÚY]Z]\ÙÜÝ ]Z] \Î ÜËØZ[KÎÌÈ ÜËØZ[KÎ ÌH ÜËØY KÎÌÎB\ÙÚYXØÛÝ[ È\ÙÜÝ XØÛÛ\ \ÈÎ ÜËØZ[KÎÌH ÜËÛ][ KÎLMB\ÙÚYÚYÛÛ\ÙÜÝ ÛÛXÝ[ÛÎ ÜËØZ[KÎÍMÂ\ÙÚYXÝ]\ÙÜÝ ° ÜÜÈÎ ÜËØZ[KÎÍN ÜËÜ YËÎMÌÈ ÜËÜ YËÎNL B\ÙÚYÜ [ÛÈ\ÙÜÝ Ü [ÛÈÎ ÜËØZ[KÎÍ ÜËØZ[KÎ Í ÜËØY KÎÍMÂ\ÙÚY YÚ[È\ÙÜÝ YÚ[ÈÎ ÜËØZ[KÎ ÜËØY KÎÍB\ÙÚY Y\[Ù\È\ÙÜÝ ºYº\[Ù\ÈÎ ÜËØZ[KÎ Î ÜËÛ][ KÎM ÌË^B\ÙÚY]]Ë[ÙÚ[\ÙÜÝ ÛÛXÝ[Û]]ÛX]\]YHÎ ÜËØ\ ] ÎLB\ÙÚY] [\ [È È ÚYÛÛ\ÙÜÝ []]HHÛÛXÝ[ÛÎ ÜËØ\ ] ÎLL\ÙÚYÙ[KÛXÚÈ È[È \ÙÚ[Þ \ÙÜÝ :XÛÛXÝ:KÛ\]Y\ Ý\Ý]\H[º HHÛÛXÝ[ÛÎ ÜËØ\ ] ÎLËËYÜX]\ÙÚY]Ø^N Y [[Ë\ÙÜÝ XÙ[ Y[] [HÎ ÜËØ\ ] ÎLÌB\ÙÚY]Ø^K\ÙÜÝ XÙ[Î ÜËØ\ ] Î ÜËØ]Ø^KÎÎ\ÙÚY]È]Ø^HY\ÜØYÙH\ÙÜÝ Ý]X]HY\ÜØYÙH ØXÙ[ÙHÎ ÜËØ\ ] ÎÍ\ÙÚYØ[ÝÜX]HØZ[H\ ]H\ÙÜÝ [\ÜÜÚXHHܺY\ Ø\ ]ØZ[HÎ ÜËØ\ ] ÎÍ\ÙÚYXÝ] \ÙÜÝ ° ÜÜËÎ ÜËØ]Ø^KÎ \ÙÚYØZ[H H]Ø^HH\ÙÜÝ ØZ[H HXÙ[HÎ ÜËØ]Ø^KÎL\ÙÚYIÛHXÚÈH\ÙÜÝ H ÝZ\ÈH]Ý\HHÎ ÜËØ]Ø^KÎ ÜËØ]Ø^KÎÍ ÜËØ]Ø^KÎL\ÙÚYXÚÈ\ÙÜÝ H ]Ý\Î ÜËØ]Ø^KÎ \ÙÚY[[ÝH]Ø^HY\ÜØYÙH\ÙÜÝ []\HY\ÜØYÙH ØXÙ[ÙHÎ ÜËØ]Ø^KÎNM\ÙÚYÙ][]Ø^H\ÙÜÝ Y] HHY\ÜØYÙH ØXÙ[ÙH Ý\ Ý\È\ÈÛÛ\ \ÈÎ ÜËØY KÎLÈ ÜËØY KÎ ÜËÙX[ÙÜËÎM ÜËÙX[ÙÜËÎLB\ÙÚYÜÝ\\ÙÜÝ ÜÝ\HÎ ÜËØY KÎNH ÜËØY KÎ ÜËØY KÎ Í ÜËØY KÎMÎBÎ ÜËØY WØÚ] Î H ÜËØY WØÚ] ÎLÎ\ÙÚYSH\ÙÜÝ SHÎ ÜËØY KÎL ÜËØY KÎN ÜËØY WØÚ] Î ÍÈ ÜËØY WØÚ] ÎL Î ÜËØY WØÚ] ÎM ÜËØÛÛ\Ø][ÛÎMÂ\ÙÚY[È\ÙÜÝ [ÈË ] H] ÛÈ[ HÞÎ ÜËØY KÎH ÜËØY KÎ ÎH ÜËÙX[ÙÜËÎL H ÜËÙX[ÙÜËÎÍ NÎ ÜËÙX[ÙÜËÎÍ ÌÂ\ÙÚY[X\È\ÙÜÝ [X\ÈÎ ÜËØY KÎÍ ÜËØY KÎ N\ÙÚYYY HÝ[ÙH\ÙÜÝ ZÝ]\ [H[\HÎ ÜËØY KÎ H ÜËØY KÎ \ÙÚYY]ÈÙÈ\ÙÜÝ Ú\\ÈÙÜÈÎ ÜËØY KÎ H ÜËØY KÎ L\ÙÚY[[YH\ÙÜÝ [Û[Y\Î ÜËØY KÎ \ÙÚY[P[X\È\ÙÜÝ ]\\ Ø[X\ÈÎ ÜËØY KÎM H ÜËØY KÎÌÌ\ÙÚYY HÝ[ÙH\ÙÜÝ [\HÎ ÜËØY KÎMÌB\ÙÚY]ÈY HÝ[ÙH\ÙÜÝ Ý][H[\HÎ ÜËØY KÎMÍ Â\ÙÚY[[ÝHY HÝ[ÙH\ÙÜÝ []\ [H[\HÎ ÜËØY KÎMÍÌB\ÙÚYÐÛXÚÈ ÈY]H\ÙÜÝ ÐÛ\]Y\ Ý\:Y]\HÎ ÜËØY KÎMËËYÜX]\ÙÚYÙÙÙY[ \×\ÙÜÝ ÛÛXÝ:N \×Î ÜËØY KÎËËYÜX]\ÙÚYØ\[ÜÎ Y IW\ÙÜÝ ] [[Û Y IWÎ ÜËØY KÎÎËËYÜX]\ÙÚYØ\X[]Y\Î \×\ÙÜÝ ÜÜÚX[]:\Î \×Î ÜËØY KÎ ËËYÜX]\ÙÚY[X\Î \ÈØÜY[[YN \×\É\É\É\É\É\È\ÙÜÝ [X\Î \È Ù]YÛ[YN \×\É\É\É\É\É\ÈÎ ÜËØY KÎ \ÙÚYYN\ÙÜÝ [XÝYÎ ÜËØY KÎÍNH ÜËØY KÎÍËËYÜX]\ÙÚY\ÈÙÙÙY[\ÙÜÝ \È ÉÙ\ÝÛÛXÝ:KÎ ÜËØY KÎ ÜËØY KÎ BËËYÜX]\ÙÚY\ÈÙÙÙYÝ] \ÙÜÝ \È ÉÙ\Ý:XÛÛXÝ:KÎ ÜËØY KÎM\ÙÚY[ÜX][ÛÛ Ù[XÝYY H\ÙÜÝ [ÜX][Û Ý\HÛÛXÝ ú[XÝ[ÛºHÎ ÜËØY KÎMH ÜËÙX[ÙÜËÎMÂ\ÙÚYÙ[[Ý[Y\ÜØYÙH\ÙÜÝ [ÞY\ [Y\ÜØYÙHÎ ÜËØY KÎM\ÙÚYÝ\ ÚÚ[HY HÚ]\ÙÜÝ Ý]\ÚÚ[ H [Ú]Î ÜËØY KÎMÂ\ÙÚYXÝ]]H]Ø^HY\ÜØYÙH\ÙÜÝ XÝ]\HY\ÜØYÙH ØXÙ[ÙHÎ ÜËØY KÎB\ÙÚY[H\ÙÜÝ XÚY\Î ÜËØY KÎLÂ\ÙÚYYHY H\ÙÜÝ ZÝ]\ [ÛÛXÝÎ ÜËØY KÎMB\ÙÚYÚ[HÚ]\ÙÜÝ Ú[ HHÚ]Î ÜËØY KÎMÂ\ÙÚY]È[Ý[Y\ÜØYÙH\ÙÜÝ Ý]X]HY\ÜØYÙHÎ ÜËØY KÎNH ÜËÙX[ÙÜËÎÍNB\ÙÚYÙ]\Ù\[È\ÙÜÝ Ø[\\È[ÜX][ÛÈ][\Ø]]\Î ÜËØY KÎÌ \ÙÚY[\ÜY H\Ý\ÙÜÝ [\Ü\ [H\ÝHHÛÛXÝ ÈÎ ÜËØY KÎÌ\ÙÚYÛÛ È\ÙÜÝ Ý][ ÈÎ ÜËØY KÎÍ B\ÙÚY ÝØÛÛXÝ[ÛÈ\ÙÜÝ XÝ[ÛÈ H ÝØÛÛÎ ÜËØY KÎÍLB\ÙÚYY]ÈÞ\Ý[HÙÈ\ÙÜÝ Ú\\ÈÙÜÈ H Þ\Ý:YHÎ ÜËØY KÎÍÂ\ÙÚY\\ÙÜÝ \Î ÜËØY KÎÍ\ÙÚYØYØÜ\ \ÙÜÝ Ú\Ù\ [ ØÜ\ Î ÜËØY KÎÍÌ\ÙÚY[ØY[ØÜ\ È\ÙÜÝ :XÚ\Ù\ Ý\È\È ØÜ\ ÈÎ ÜËØY KÎÍÍ\ÙÚY\ÝØÜ\ È\ÙÜÝ \Ý\\È ØÜ\ ÈÎ ÜËØY KÎÎ \ÙÚY[ \ÙÜÝ ZYHÎ ÜËØY KÎÎ ÂË^B\ÙÚYÛ[H[ \ÙÜÝ [YÛHÎ ÜËØY KÎÎË^B\ÙÚYXYÈÚ[ÝÈ\ÙÜÝ YXÚ\H[] HHXYÈÎ ÜËØY KÎÎB\ÙÚYXÝ]ØZ[H\ÙÜÝ ° ÜÜÈHØZ[HÎ ÜËØY KÎ È ÜËÜ YËÎL B\ÙÚYY H\Ý\ÙÜÝ \ÝHHÛÛXÝ ÈÎ ÜËØY KÎ \ÙÚYYH]ÈY H\ÙÜÝ ZÝ]\ [Ý]X]HÛÛXÝÎ ÜËØY KÎ B\ÙÚYYH]ÈÜÝ\\ÙÜÝ ZÝ]\ [Ý]X]HÜÝ\HÎ ÜËØY KÎ \ÙÚY[[ÝH Ù[XÝYY KÑÜÝ\\ÙÜÝ Ý\ [Y\HÛÛXÝ ÑÜÝ\H ú[XÝ[ÛºHÎ ÜËØY KÎB\ÙÚYY]YY\È\ÙÜÝ Y]\ ØH\ÝHHÛÛXÝ ÈÎ ÜËØY KÎLÌ\ÙÚYØZ[H HY H\Ý\ÙÜÝ ØZ[H H\ÝHHÛÛXÝ ÈÎ ÜËØY WØÚ] ÎB\ÙÚYÚ[Ú]\ÙÜÝ Ú[ HHÚ]Î ÜËØY WØÚ] Î Â\ÙÚYÚ[Ú]\Î\ÙÜÝ Ú[ HHÚ][ [ ]YNÎ ÜËØY WØÚ] ÎÌ ÜËØY WØÚ] ÎÎL ÜËÙX[ÙÜËÎ BÎ ÜËÙX[ÙÜËÎLÎH ÜËÙX[ÙÜËÎÌMH ÜËÙX[ÙÜËÎ M ÜËÙX[ÙÜËÎLÍÎ ÜËÙX[ÙÜËÎLLL ÜËÙX[ÙÜËÎM ÌÈ ÜËÙX[ÙÜËÎMÎ ÜËÙX[ÙÜËÎN Î ÜËÙX[ÙÜËÎN ÜËÙX[ÙÜËÎ ÜËÙX[ÙÜËÎ ÜËÙX[ÙÜËÎ BÎ ÜËÙX[ÙÜËÎLL ÜËÙX[ÙÜËÎÌ ÜËÙX[ÙÜËÎÍ ÜËÙX[ÙÜËÎÍ BÎ ÜËÙX[ÙÜËÎ L ÜËÙX[ÙÜËÎ LN ÜËÙX[ÙÜËÎ ÍÍÈ ÜËÛ][ KÎÎ BÎ ÜËÛ][ KÎLLH ÜËÜ ÎML ÜËÜ Î\ÙÚYØ[Ù[\ÙÜÝ [[\Î ÜËØY WØÚ] ÎÌB\ÙÚYÚ[\ÙÜÝ Ú[ HÎ ÜËØY WØÚ] ÎÎLÈ ÜËØY WØÚ] ÎÎM ÜËØY WØÚ] ÎLÌÎ ÜËØY WØÚ] ÎM N\ÙÚY[]H\ÙÜÝ []\Î ÜËØY WØÚ] Î L ÜËÙX[ÙÜËÎLÌ H ÜËÙX[ÙÜËÎÍ \ÙÚYY H\ÙÜÝ ÛÛXÝÎ ÜËØY WØÚ] Î MÈ ÜËÜ YËÎ \ÙÚYY\ÜØYÙH\ÙÜÝ Y\ÜØYÙHÎ ÜËØY WØÚ] Î M\ÙÚYØZ[H H[]HY H[ÈÚ]ÛÛH\ÙÜÝ ØZ[H H[]\HÛÛXÝ[È [ Ø[ÛHÚ]Î ÜËØY WØÚ] Î \ÙÚY[RYÛÜH\ÙÜÝ H \ÈYÛÜ\Î ÜËØY WØÚ] Î Ì ÜËØY WØÚ] ÎL \ÙÚYYÛÜH\ÙÜÝ YÛÜ\ËÛÝ [[ÝH [HÛHYÛÜY[Ø\ÙH ^H KY[\Î ÜËØY WØÚ] ÎLÌÈ ÜËØY WØÚ] ÎL H ÜËØY WØÚ] ÎMLÎ ÜËØY WØÚ] ÎMM BËËYÜX]\ÙÚYY \È[ ÛÛH\ÙÜÝ Y \È[ÈH Ø[ÛÎ ÜËØY WØÚ] ÎM BËËYÜX]\ÙÚY\È[\Y H ÛÛK\ÙÜÝ \È\Ý[ ºH[ÈH Ø[ÛÎ ÜËØY WØÚ] ÎL ÂËËYÜX]\ÙÚY\È\ÈÝÈÛÝÛ\È \È\ÙÜÝ \È\Ý:\ÛÜXZ\ÈÛÛH ÛÝ\ÈHÛHH \ÈÎ ÜËØY WØÚ] ÎL MËËYÜX]\ÙÚY\ÈY H ÛÛH + \ÊK\ÙÜÝ \ÈH ]Z] :HH Ø[Û + \ÊKÎ ÜËØY WØÚ] ÎL MËËYÜX]\ÙÚY\ÈY H ÛÛK\ÙÜÝ \ÈH ]Z] :HH Ø[ÛÎ ÜËØY WØÚ] ÎLMMB\ÙÚYØZ[H HÜÝ\Ú] È\ÙÜÝ ØZ[H HÜÝ\HH\ØÝ\ÜÚ[ÛÎ ÜËØY WØÚ] ÎLN\ÙÚYÜXÎ\ÙÜÝ ÝZ]Î ÜËØY WØÚ] ÎLNB\ÙÚY [ÜH[ ÛÛH\ÙÜÝ \ÛÛH[ÈÙHØ[ÛÎ ÜËØY WØÚ] ÎLÌÌÈ ÜËØY WØÚ] ÎM MÂ\ÙÚYÚ\Ü\\ÙÜÝ ]\]\\Î ÜËØY WØÚ] ÎLÌÎ ÜËØY WØÚ] ÎM MH ÜËØY WØÚ] ÎM Î ÜËØÛÛ\Ø][ÛÎL\ÙÚYÙ[\ÙÜÝ [ÞY\Î ÜËØY WØÚ] ÎM N ÜËØÛÛ\Ø][ÛÎ B\ÙÚYØÚÈ\ÙÜÝ Ü]Y\Î ÜËØY WØÚ] ÎM ÜËØÛÛ\Ø][ÛÎLH ÜËÙX[ÙÜËÎ Î ÜËÙX[ÙÜËÎ LÂ\ÙÚYØ\\ÙÜÝ Û\ []\\ÜÙ[Y[Î ÜËØÛÛ\Ø][ÛÎ ÌB\ÙÚYØZ[H HØ]HÛÛ\Ø][Û\ÙÜÝ ØZ[H H Ø]]\HÛÛ\Ø][ÛÎ ÜËØÛÛ\Ø][ÛÎL\ÙÚYØZ[H H[Ù\[XYÙH\ÙÜÝ ØZ[H H[Ù\\[XYÙHÎ ÜËØÛÛ\Ø][ÛÎLÌÍ\ÙÚY[XH È Ù[Y\ÜØYÙN ÛÈ\ÙH\ÙÜÝ [\ÜÜÚXH Ù[ÞY\HY\ÜØYÙN Ü Û [Z[]^Î ÜËØÛÛ\Ø][ÛÎLÌÍ ÜËØÛÛ\Ø][ÛÎLÍ \ÙÚYY\ÜØYÙH\Ü\ÙÜÝ \]\HY\ÜØYÙHÎ ÜËØÛÛ\Ø][ÛÎLÍ \ÙÚY[XH È Ù[Y\ÜØYÙN[ÛÝÛ X\ÛÛ\ÙÜÝ [Ø\XH Ù[ÞY\HY\ÜØYÙN Z\ÛÛ[ÛÛYKÎ ÜËØÛÛ\Ø][ÛÎMMNBËËYÜX]\ÙÚYÝ\[ H] Y \ÙÜÝ XÝ Y[[Y[[È Y Î ÜËØÛÛ\Ø][ÛÎMMÂËËYÜX]\ÙÚYÙ] [È ÜÚ][Û È Y\ÙÜÝ ÜÚ][ÛºH8 YÎ ÜËØÛÛ\Ø][ÛÎMÌ ÜËÜ YËÎLÌ\ÙÚYÛ^ \ÙÜÝ ^ H[Ü\ÈÎ ÜËØÛÛ\Ø][ÛÎMÌ\ÙÚYÛ\ÙÜÝ Ü\ÈÎ ÜËØÛÛ\Ø][ÛÎMÍ\ÙÚY][XÜÈ^ \ÙÜÝ ^ H[][\]YHÎ ÜËØÛÛ\Ø][ÛÎMÍB\ÙÚY][XÜÈ\ÙÜÝ ][\]YHÎ ÜËØÛÛ\Ø][ÛÎMÎ ÜËÜ YËÎLÌ\ÙÚY[\[H^ \ÙÜÝ ^ HÛÝ[YÛºHÎ ÜËØÛÛ\Ø][ÛÎMÎB\ÙÚY[\[H\ÙÜÝ ÛÝ[YÛºHÎ ÜËØÛÛ\Ø][ÛÎN È ÜËÜ YËÎLÌ\ÙÚYÝ ZÙH ÝYÚ^ \ÙÜÝ ^ H\ºHÎ ÜËØÛÛ\Ø][ÛÎN Â\ÙÚYÝ ZÙH\ÙÜÝ \ºHÎ ÜËØÛÛ\Ø][ÛÎNB\ÙÚYXÜX\ÙHÛ Ú^H\ÙÜÝ ÛXÙH \È]]HÎ ÜËØÛÛ\Ø][ÛÎNB\ÙÚYÛX[\ÙÜÝ ]]Î ÜËØÛÛ\Ø][ÛÎNL\ÙÚYÜX[Û Ú^H\ÙÜÝ ÛXÙHÜX[HÎ ÜËØÛÛ\Ø][ÛÎNL\ÙÚYÜX[\ÙÜÝ ÜX[Î ÜËØÛÛ\Ø][ÛÎNMB\ÙÚY[ÜX\ÙHÛ Ú^H\ÙÜÝ ÛXÙH \ÈÜ[HÎ ÜËØÛÛ\Ø][ÛÎNMB\ÙÚYYÈ\ÙÜÝ Ü[Î ÜËØÛÛ\Ø][ÛÎ ÜËÙX[ÙÜËÎ È ÜËÙX[ÙÜËÎL Â\ÙÚYÙ[XÝÛ\ÙÜÝ ÙXÝ[Û\ [H ÛXÙHÎ ÜËØÛÛ\Ø][ÛÎ Â\ÙÚYÛ\ÙÜÝ ÛXÙHÎ ÜËØÛÛ\Ø][ÛÎ ÜËÜ YËÎLÍM\ÙÚY^ ÛÛÜ\ÙÜÝ ÛÝ[]\H ^ HÎ ÜËØÛÛ\Ø][ÛÎ È ÜËØÛÛ\Ø][ÛÎLB\ÙÚYÛÛÜ\ÙÜÝ ÛÝ[]\Î ÜËØÛÛ\Ø][ÛÎLH ÜËÜ YËÎLÍÍ\ÙÚYXÚÙÜÝ[ÛÛÜ\ÙÜÝ ÛÝ[]\HÛÎ ÜËØÛÛ\Ø][ÛÎN ÜËÙX[ÙÜËÎL \ÙÚY[Ù\[È\ÙÜÝ [ú\\ [Y[Î ÜËØÛÛ\Ø][ÛÎNB\ÙÚY[È\ÙÜÝ Y[Î ÜËØÛÛ\Ø][ÛÎ\ÙÚY[Ù\ ÛZ[^HXÙH\ÙÜÝ [ú\\ [ ÛZ[^HÎ ÜËØÛÛ\Ø][ÛÎ\ÙÚYÛZ[^H\ÙÜÝ ÛZ[^HÎ ÜËØÛÛ\Ø][ÛÎB\ÙÚY[Ù\SH[XYÙH\ÙÜÝ [Ù\\ [H Ú[XYÙHÎ ÜËØÛÛ\Ø][ÛÎB\ÙÚY[XYÙH\ÙÜÝ [XYÙHÎ ÜËØÛÛ\Ø][ÛÎÌ\ÙÚY[XHÙÙÚ[È\ÙÜÝ XÝ]\ Ù[YÚ\Ý [Y[ +ÙÊHÎ ÜËØÛÛ\Ø][ÛÎÌÈ ÜËÜ YËÎM\ÙÚYÙÙÚ[È\ÙÜÝ [YÚ\Ý [Y[Î ÜËØÛÛ\Ø][ÛÎ \ÙÚYØ]HÛÛ\Ø][Û\ÙÜÝ Ø]]\HÛÛ\Ø][ÛÈÎ ÜËØÛÛ\Ø][ÛÎ È ÜËÙX[ÙÜËÎM ÜËÙX[ÙÜËÎN Î ÜËÙX[ÙÜËÎÌ ÜËÙX[ÙÜËÎÎL ÜËÙX[ÙÜËÎ Î B\ÙÚYØ]H\ÙÜÝ Ø]]YØ\\Î ÜËØÛÛ\Ø][ÛÎ È ÜËØÛÛ\Ø][ÛÎ\ÙÚYÛÝ[\ÙÜÝ ÛÛÎ ÜËØÛÛ\Ø][ÛÎÌB\ÙÚYØZ[H HÛÛ\Ø][ÛÈ\ÙÜÝ ØZ[H HÛÛ\Ø][ÛÈÎ ÜËØÛÛ\Ø][ÛÎ M\ÙÚYÙ[Y\ÜØYÙH\Î\ÙÜÝ [ÞY\HY\ÜØYÙH[ [ ]YNÎ ÜËØÛÛ\Ø][ÛÎÍ LÂ\ÙÚYØZ[H HØ]HXÛÛ\ÙÜÝ ØZ[H HØ]]YØ\\ ÚXÛÛHÎ ÜËØÛÛ\Ø][ÛÎÍ Â\ÙÚY\ØXH[[X][Û\ÙÜÝ :\ØXÝ]\ Ð[[X][ÛÎ ÜËØÛÛ\Ø][ÛÎÍL\ÙÚY[XH[[X][Û\ÙÜÝ XÝ]\ Ø[[X][ÛÎ ÜËØÛÛ\Ø][ÛÎÍN\ÙÚYYHXÛÛ\ÙÜÝ ØXÚ\ ÒXÛÛHÎ ÜËØÛÛ\Ø][ÛÎÍL \ÙÚYØ]HXÛÛ\Ë\ÙÜÝ Ø]]YØ\\ ÒXÛÛH ÛÝ\ËÎ ÜËÙX[ÙÜËÎ L\ÙÚYØZ[H HØ\ \Ù\È\ÙÜÝ ØZ[H HÛ\ []\\ÜÙ[Y[ÈÎ ÜËÙX[ÙÜËÎ ÌËËYÜX]\ÙÚYÈ [ÝH X[ H Ø[ È Ø\ \ÏÈ\ÙÜÝ Ý[^]Ý\È ºY[[Y[Û\ []\\ÜÙ[Y[8 \ÏÈÎ ÜËÙX[ÙÜËÎ ÍÂ\ÙÚYØ\[Û[[Ý\Û OÈ\ÙÜÝ Û\ []\\ÜÙ[Y[[Û[YOÈÎ ÜËÙX[ÙÜËÎ B\ÙÚY[Û[[Ý\È Ø\[ÜÈ\H\ÜÈ\Ú \ÙÜÝ \È]\\ÜÙ[Y[ È[Û[Y\È ÛÛ[Ú[È \ËÎ ÜËÙX[ÙÜËÎ BËËYÜX]\ÙÚY[[Ý[È É\ÉÈÛHY [\Ý \ÙÜÝ Ý\ \ÜÚ[ÛH É\ÉÈHH\ÝHHÛÛXÝ ×Î ÜËÙX[ÙÜËÎMËËYÜX]\ÙÚYØZ[H H[[ÝH \ÏÈ\ÙÜÝ ØZ[H H[]\ \ÏÈÎ ÜËÙX[ÙÜËÎL Â\ÙÚY[[ÝHY H\ÙÜÝ []\ [ÛÛXÝÎ ÜËÙX[ÙÜËÎLMÂËËYÜX]\ÙÚY[ÝH\HXÝ] È [[ÝH É\ÉÈÛW[Ý\Y [\Ý È [ÝH Ø[ ÈÛÛ[YOÈ\ÙÜÝ Ý\È:\È Ý\H Ú[ Ù[]\ É\É×H Ý H\ÝHHÛÛXÝ ËÝ[^ Ý\ÈÛÛ[\ÈÎ ÜËÙX[ÙÜËÎLH ÜËÜ ÎMM ÜËÜ Î\ÙÚYXØÙ\ \ÙÜÝ XØÙ\ \ËZ[ÒÈ] ÛÎ ÜËÙX[ÙÜËÎÍH ÜËÙX[ÙÜËÎÌ ÜËÙX[ÙÜËÎ H ÜËÙX[ÙÜËÎM ÍÂÎ ÜËÙX[ÙÜËÎN ÜËÙX[ÙÜËÎNMMÈ ÜËÙX[ÙÜËÎH ÜËÙX[ÙÜËÎ BÎ ÜËÙX[ÙÜËÎLLH ÜËÙX[ÙÜËÎ MÈ ÜËÙX[ÙÜËÎ LÈ ÜËÛ][ KÎÎ \ÙÚYÒÈ\ÙÜÝ ÒÈÎ ÜËÙX[ÙÜËÎ Â\ÙÚYØZ[H HSH \Ù\\ÙÜÝ ØZ[H HY\ÜØYÙH8][\Ø]]\Î ÜËÙX[ÙÜËÎÌ Ë^B\ÙÚYSH ÚÎ\ÙÜÝ [ÞY\ [Y\ÜØYÙH8 ]ZNÎ ÜËÙX[ÙÜËÎÍ\ÙÚY\Ù\\ÙÜÝ ][\Ø]]\Î ÜËÙX[ÙÜËÎÍÍÂË^B\ÙÚYXØÛÝ[\ÙÜÝ ÛÛ\ \ÈË[\Ú \Î ÜËÙX[ÙÜËÎ \ÙÚYØZ[H HÙ]\Ù\[È\ÙÜÝ ØZ[H HØ[\\È[ÜX][ÛÈH Ý][\Ø]]\Î ÜËÙX[ÙÜËÎM \ÙÚYYÜÝ\\ÙÜÝ ZÝ]\ [ÜÝ\HÎ ÜËÙX[ÙÜËÎMB\ÙÚYØZ[H HYÜÝ\\ÙÜÝ ØZ[H HZÝ]\ [ÜÝ\HÎ ÜËÙX[ÙÜËÎL B\ÙÚYØZ[H HYY H\ÙÜÝ ØZ[H HZÝ]\ [ÛÛXÝÎ ÜËÙX[ÙÜËÎL B\ÙÚYYY H\ÙÜÝ ZÝ]\ [ÛÛXÝÎ ÜËÙX[ÙÜËÎL ÌB\ÙÚYÛÛXÝ\ÙÜÝ ÛÛXÝËÙ] \ Ý YÜ HXØÛÝ[ÞÎ ÜËÙX[ÙÜËÎLMÂ\ÙÚYYÈ\ÙÜÝ ZÝ]\8Î ÜËÙX[ÙÜËÎLLÍ\ÙÚYX\ÙH[\HY H È Ý[ÙK\ÙÜÝ [ ^ [ÛÛXÝ Ý\HܺX][Û Ý[H[\HÎ ÜËÙX[ÙÜËÎLLÍ\ÙÚYY HÝ[ÙH\Ü\ÙÜÝ \]\ Ð[\HÎ ÜËÙX[ÙÜËÎLÌ\ÙÚYØZ[H H]ÈY HÝ[ÙH\ÙÜÝ ØZ[H HÝ][H[\HË Ý[ÙH \OHÚÈÎ ÜËÙX[ÙÜËÎL B\ÙÚYÝ[ÙHÚÈ\ÙÜÝ [\\ ]ZHÎ ÜËÙX[ÙÜËÎLL\ÙÚYXØÛÝ[\ÙÜÝ ÛÛ\ \ÈË ÜÝ[ÙH \OHÚÈË Ý[ÙH \OHÚ[Î ÜËÙX[ÙÜËÎLÌN\ÙÚYÝ[ÙHÚ[\ÙÜÝ [\\]X[Î ÜËÙX[ÙÜËÎLÌ\ÙÚYÝ[ÙHÛ ÚYÛÛ\ÙÜÝ [\\8HÛÛXÝ[ÛÎ ÜËÙX[ÙÜËÎLÌÍÂ\ÙÚYÝ[ÙHÛ ] \ÛH]Ø^H\ÙÜÝ [\\ÜÜ]YHHÛÛXÝ ]Y[Î ÜËÙX[ÙÜËÎLÍ \ÙÚYÝ[ÙHÛ ] \ÛHYH\ÙÜÝ [\\ÜÜ]YHHÛÛXÝ Y]Y[ÈXÝYÎ ÜËÙX[ÙÜËÎLÍMB\ÙÚYÝ[ÙH Ú[Y H\È \[È È [ÝH\ÙÜÝ [\\ ]X[HÛÛXÝ Ý\È:XÜ]Ë ÜÝ[ÙH \OHÚ[Ë Ý[ÙH \OHXÝ[ÛÎ ÜËÙX[ÙÜËÎLÍB\ÙÚYÝ[ÙHXÝ[Û\ÙÜÝ XÝ[ÛH Ð[\HÎ ÜËÙX[ÙÜËÎLÍÍ\ÙÚYÜ[SHÚ[ÝÈ\ÙÜÝ Ý]\H[º HHY\ÜØYÙHÎ ÜËÙX[ÙÜËÎLÎ B\ÙÚYÜ \ÝYXØ][Û\ÙÜÝ Z\H\ \Z] HHÝYXØ][ÛÎ ÜËÙX[ÙÜËÎLÎM\ÙÚYÙ[Y\ÜØYÙH\ÙÜÝ [ÞY\HY\ÜØYÙHÎ ÜËÙX[ÙÜËÎM MB\ÙÚY^XÝ]HÛÛ[X[Û Ý[ÙH\ÙÜÝ ^XÝ]\ [HÛÛ[X[HÜÈ Ý[H[\HÎ ÜËÙX[ÙÜËÎM ÍÂ\ÙÚY^H ÛÝ[Û Ý[ÙH\ÙÜÝ ÝY\ [ ÛÛÜÈ Ý[H[\HË ÜÝ[ÙH \OHXÝ[ÛÎ ÜËÙX[ÙÜËÎM NB\ÙÚYØ]H \È Ý[ÙHY\XÝ]][Û\ÙÜÝ Ø]]YØ\\Ù] H[\H Ý\ [ \ØYÙH [ :\Y]\Î ÜËÙX[ÙÜËÎMM B\ÙÚYØZ[H HÙ]\[È\ÙÜÝ ØZ[H HÛ\ ÜÈ[ÜX][ÛÈ \ÛÛ[\ÈÎ ÜËÙX[ÙÜËÎMMM\ÙÚY\XÝÜH[È\ÙÜÝ [ÜX][ÛH Ø[XZ\HÎ ÜËÙX[ÙÜËÎMMÍ\ÙÚY[ÝÈÙXÙX\Ú\ÈÈ[[Ý\[È\ÙÜÝ ]]Ü\Ù\\È XÚ\Ú\È Ý\H ÙX8 Ý]\ ÜÈ[ÜX][ÛÈË[H BÎ ÜËÙX[ÙÜËÎMMÎH ÜËÙX[ÙÜËÎ \ÙÚY\Ý[YH\ÙÜÝ º[ÛHË[H Î ÜËÙX[ÙÜËÎMNL ÜËÙX[ÙÜËÎM\ÙÚYZYH[YH\ÙÜÝ ]^zYH º[ÛHË[H ÂÎ ÜËÙX[ÙÜËÎM ÜËÙX[ÙÜËÎÌ\ÙÚY\Ý[YH\ÙÜÝ ÛHË[H Î ÜËÙX[ÙÜËÎMLÈ ÜËÙX[ÙÜËÎÌ\ÙÚYXZY[[YH\ÙÜÝ ÛHH][KY[HË[H Î ÜËÙX[ÙÜËÎMÍH ÜËÙX[ÙÜËÎÍ Â\ÙÚYÝ]H\ÙÜÝ ]]Î ÜËÙX[ÙÜËÎMÌ \ÙÚY]È\ÜÝÛÜ ÈÈÝX]Ú\ÙÜÝ \ÈÝ]X]^ \ÜÝÛÜYº [Î ÜËÙX[ÙÜËÎMÌ ÜËÙX[ÙÜËÎMÌ B\ÙÚYØZ[H HÚ[ÙH\ÜÝÛÜ\Ü\ÙÜÝ ØZ[H H\]\]HÚ[Ù[Y[H[ÝH\ÜÙHÎ ÜËÙX[ÙÜËÎMÌ B\ÙÚY[Ý][Y[ ÈÛÛ\][ H\ÙÜÝ [\\ÜÙ^ Ý\È\ÈÚ[\ ÈÎ ÜËÙX[ÙÜËÎMÍ\ÙÚYÜYÚ[[\ÜÝÛÜ\ÙÜÝ [ÝH\ÜÙHÛÝ\[Î ÜËÙX[ÙÜËÎMÍÍ\ÙÚY]È\ÜÝÛÜ\ÙÜÝ Ý]X]H[ÝH\ÜÙHÎ ÜËÙX[ÙÜËÎMÎ\ÙÚY]È\ÜÝÛÜ +YØZ[H\ÙÜÝ Ý]X]H[ÝH \ÜÙH +ÛÛ\X][ÛHÎ ÜËÙX[ÙÜËÎN B\ÙÚYØZ[H HÙ]\Ù\[È\ÙÜÝ ØZ[H H YÛ\\È[ÜX][ÛÈH Ý][\Ø]]\Î ÜËÙX[ÙÜËÎNM B\ÙÚY[ÝÈ\H H \Ý[ ÈÙ [Ý\ ÙX\Ú\ÙÜÝ ÚXÚH\È º\Ý[ ] ÈH Ý H XÚ\ÚNÎ ÜËÙX[ÙÜËÎ Í ÜËÙX[ÙÜËÎ B\ÙÚY\Z]\ÙÜÝ ]]Ü\Ù\Î ÜËÙX[ÙÜËÎ Í ÜËÙX[ÙÜËÎ Â\ÙÚY[H\ÙÜÝ Y\Ù\Î ÜËÙX[ÙÜËÎL\ÙÚYØZ[H HY\Z]\ÙÜÝ ØZ[H HZÝ]\]]Ü\Ø][ÛÎ ÜËÙX[ÙÜËÎL\ÙÚYØZ[H HY[H\ÙÜÝ ØZ[H HZÝ]\Y\ÈÎ ÜËÙX[ÙÜËÎN \ÙÚYØZ[H HÙÈÛÛ\Ø][Û\ÙÜÝ ØZ[H H[YÚ\Ý \HÛÛ\Ø][ÛÎ ÜËÙX[ÙÜËÎ ÜËÙX[ÙÜËÎ Â\ÙÚYÙX\ÚÜY H\ÙÜÝ XÚ\Ú\ [ÛÛXÝÎ ÜËÙX[ÙÜËÎÎ\ÙÚYØZ[H H[Y HH[È\ÙÜÝ ØZ[H H Ý]\ [ÛÛXÝ Ø\ º È Ù\È[ÜËÎ ÜËÙX[ÙÜËÎ MÂ\ÙÚYØZ[H H[Y HH[XZ[\ÙÜÝ ØZ[H H Ý]\ [ÛÛXÝ Ø\ º È ÛÛ[XZ[Î ÜËÙX[ÙÜËÎMMÂ\ÙÚYØZ[H HYT\ÙÜÝ ØZ[H HZÝ]\ [HY \ÜÙH[\]Î ÜËÙX[ÙÜËÎÌ ÜËÙX[ÙÜËÎÌH ÜËÙX[ÙÜËÎÎ Â\ÙÚYÙ[XÝ^ ÛÛÜ\ÙÜÝ Ù[XÝ[Û\HÛÝ[]\H ^ HÎ ÜËÙX[ÙÜËÎÍ\ÙÚYÙ[XÝXÚÙÜÝ[ÛÛÜ\ÙÜÝ Ù[XÝ[Û\HÛÝ[]\HÛÎ ÜËÙX[ÙÜËÎN \ÙÚY[\Ü Î\ÙÜÝ [\Ü\[ÎÎ ÜËÙX[ÙÜËÎÌ \ÙÚYØZ[H H[\ÜY H\Ý\ÙÜÝ ØZ[H H[\Ü\H\ÝHHÛÛXÝËÙH ÚÝ[Ý[ÝÈH[È ]BÎ ÜËÙX[ÙÜËÎÌ ÍB\ÙÚY[ÝHØ[ÝÜX]H[]Ø^HY\ÜØYÙH Ú]H[È ]H\ÙÜÝ Ý\ÈH Ý]^ܺY\ [Y\ÜØYÙH ØXÙ[ÙH]XÈ [ ] H YHËÙH ÚÝ[Ý[ÝÈH[ÈY\ÜØYÙBÎ ÜËÙX[ÙÜËÎÌ \ÙÚY[ÝHØ[ÝÜX]H[[\ H]Ø^HY\ÜØYÙH\ÙÜÝ Ý\ÈH Ý]^ܺY\ [Y\ÜØYÙH ØXÙ[ÙH YHÎ ÜËÙX[ÙÜËÎÌML\ÙÚYØZ[H H]È]Ø^HY\ÜØYÙH\ÙÜÝ ØZ[H HÝ]X]HY\ÜØYÙH ØXÙ[ÙHÎ ÜËÙX[ÙÜËÎÌM\ÙÚY]È]Ø^HY\ÜØYÙH\ÙÜÝ Ý]X]HY\ÜØYÙH ØXÙ[ÙHÎ ÜËÙX[ÙÜËÎÌMÌÂ\ÙÚY]Ø^H ]N\ÙÜÝ ] H HY\ÜØYÙH ØXÙ[ÙNÎ ÜËÙX[ÙÜËÎÌL\ÙÚY\ÙH\ÙÜÝ ][\Ù\Î ÜËÙX[ÙÜËÎÌM\ÙÚYØ]H \ÙH\ÙÜÝ Ø]]YØ\\]][\Ù\Ë ÚÝÈ]\][ÂÎ ÜËÙX[ÙÜËÎÍ LÂ\ÙÚYÛZ[HH\ÙÜÝ ÛÝ\Y^HÎ ÜËÙX[ÙÜËÎÍ \ÙÚY[X\ÈY H\ÙÜÝ Ý\Û[Y\ [ÛÛXÝÎ ÜËÙX[ÙÜËÎÍNB\ÙÚYØZ[H H[X\ÈY H\ÙÜÝ ØZ[H H Ý\Û[Y\ [ÛÛXÝÎ ÜËÙX[ÙÜËÎÍMÌB\ÙÚYØZ[H HØ]HÙÈ[H\ÙÜÝ ØZ[H HØ]]\\ÈXÚY\ÈHÙÈÎ ÜËÙX[ÙÜËÎÍ ÂËËYÜX]\ÙÚY[XH È [[ÝH[H \È H \È\ÙÜÝ [\ÜÜÚXHH Ý\ [Y\HXÚY\ \È H \ÈÎ ÜËÙX[ÙÜËÎÍÌB\ÙÚYX[ HÛX\ÙÏÈ\ÙÜÝ YXÙ\\ÈÙÜÏÈÎ ÜËÙX[ÙÜËÎÍ \ÙÚYÚØ^H\ÙÜÝ ÚÈÎ ÜËÙX[ÙÜËÎÎ MÂ\ÙÚY]H\ÙÜÝ ]HÎ ÜËÙX[ÙÜËÎÎ \ÙÚYÛÛ\Ø][Û\ÙÜÝ ÛÛ\Ø][ÛÎ ÜËÙX[ÙÜËÎÎL Â\ÙÚYÛX\\ÙÜÝ YXÙ\Î ÜËÙX[ÙÜËÎÎN B\ÙÚYØZ[H H[[YHÜÝ\\ÙÜÝ ØZ[H H[Û[Y\ÜÝ\HÎ ÜËÙX[ÙÜËÎÎNLB\ÙÚY[[YHÜÝ\\ÙÜÝ [Û[Y\ [ÜÝ\HÎ ÜËÙX[ÙÜËÎÎNN ÜËÙX[ÙÜËÎ L \ÙÚY]È[YN\ÙÜÝ Ý]X]HÛNÎ ÜËÙX[ÙÜËÎ Â\ÙÚYØZ[H H[[YHY H\ÙÜÝ ØZ[H H[Û[Y\ [ÛÛXÝÎ ÜËÙX[ÙÜËÎ MÂ\ÙÚY[[YHY H\ÙÜÝ [Û[Y\ [ÛÛXÝË[ÝÈ\È\ÚXØ[ H ÝÛ[ÛH YÚ[ËÂÎ ÜËÙX[ÙÜËÎ N B\ÙÚYØZ[H HÙ[XÝ\ØÜ\ \ÙÜÝ ØZ[H HÙ[XÝ[Û^ [ ØÜ\ \Î ÜËÙØZ[\ËÎLLÍËËYÜX]\ÙÚYÛÝ[ÝÜ[ÛÛYÈ[H \Ë\ÙÜÝ H ]^Ý]\HXÚY\HÛÛYÝ\][Û \ËÎ ÜËÙØZ[\ËÎLLÍÂ\ÙÚY Y\[Ù\È\Ü\ÙÜÝ \]\H ºYº\[Ù\ÈÎ ÜËÚ [ ÎN ÂË^KËYÜX]\ÙÚYXÙZ]Y É\É×\ÙÜÝ yÝN É\É×Î ÜËÚ [ ÎB\ÙÚYÌ Î\ÜÜ[[ÈÛÛXÝ[Û\ÙÜÝ Ì Î\]\8 ÛÝ]\ \HHHÛÛXÝ[ÛÎ ÜËÛ[Ù [KÎL ÜËÛ[Ù [KÎLL ÜËÛ[Ù [KÎLË^B\ÙÚY YÚ[\Ü\ÙÜÝ \]\HÛÛXÝ[ÛÎ ÜËÛ][ KÎ M\ÙÚYØZ[H HØYY HXÛÛ\ÙÜÝ ØZ[H HÚ\Ù\ [HXÛÛHÎ ÜËÛ][ KÎMÂ\ÙÚYY HXÛÛ[N\ÙÜÝ XÛÛH HÛÛXÝÎ ÜËÛ][ KÎL\ÙÚYÝÜÙH\ÙÜÝ ]YÝYHÎ ÜËÛ][ KÎLLÈ ÜËÜ YËÎMM\ÙÚY\Ù]\ÙÜÝ [Z\ÙH8 º\ÈÎ ÜËÛ][ KÎM \ÙÚYØÜY[[YN\ÙÜÝ Ù]YÛ[YNÎ ÜËÛ][ KÎMNBË^B\ÙÚY[X\Î\ÙÜÝ [X\ÈÎ ÜËÛ][ KÎMB\ÙÚY ÝØÛÛ\ÙÜÝ ÝØÛÛNÎ ÜËÛ][ KÎMÍ\ÙÚY[Y[X\\ÜÝÛÜ\ÙÜÝ z[[Ü\Ù\H[ÝH \ÜÙHÎ ÜËÛ][ KÎMÍB\ÙÚY]]ËSÙÚ[\ÙÜÝ ÛÛXÝ[Û]]ÛX]\]YHÎ ÜËÛ][ KÎM\ÙÚY]ÈXZ[ÝYXØ][ÛÈ\ÙÜÝ Ý][HÝYXØ][ÛHÛÝ\Y\Î ÜËÛ][ KÎÌ \ÙÚYYÚ\Ý\ Ú] Ù\\\ÙÜÝ ÉÙ[YÚ\Ý \ Ý\H Ù\]\Î ÜËÛ][ KÎÍ\ÙÚYØZ[H H[ÙYHXØÛÝ[\ÙÜÝ ØZ[H H[ÙYY\HÛÛ\ HÎ ÜËÛ][ KÎ Â\ÙÚY[\\ÜÝÛÜ\ÙÜÝ [ \H[ÝH\ÜÙHÎ ÜËÛ][ KÎM Â\ÙÚY[ÝHØ[ÝÙÈ \ÈXØÛÝ[[È [ÝHÈÝ]H H ÝØÛÛ] \Ù\ÈØYY Ü H ÝØÛÛÙ\ÈÝ]HHÙÚ[[Ý[Û\ÙÜÝ Ý\ÈH Ý]^ Ý\ÈÛÛXÝ\È Ý\ÈØ]^ \ÈÚ\úHH ÝØÛÛH[\ÞzKÝHH ÝØÛÛHØH \ÈHÛÝ[Û \Y] [HÛÛXÝ[ÛÎ ÜËÛ][ KÎMB\ÙÚYÙÚ[\Ü\ÙÜÝ \]\HÛÛXÝ[ÛÎ ÜËÛ][ KÎMÎËËYÜX]\ÙÚY\H [ÝH Ý\H [ÝH Ø[ È[]H \ÏÈ\ÙÜÝ ]\È Ý\È Ý\H Ý[Ú\YXÙ\ \ÏÈÎ ÜËÛ][ KÎL MB\ÙÚYØZ[H HXØÛÝ[Y]Ü\ÙÜÝ ØZ[H H\ÝH\ÈÛÛ\ \ÈÎ ÜËÛ][ KÎL Í\ÙÚYÙ[XÝ[\ÙÜÝ Ù[XÝ[Û\ Ý\ÈÎ ÜËÛ][ KÎL ÎB\ÙÚYÙ[XÝ]]ÜÈ\ÙÜÝ ÙXÝ[Û\\ÈÛÛXÝ[ÛÈ]]ÛX]\]Y\ÈÎ ÜËÛ][ KÎL Â\ÙÚYÙ[XÝÛH\ÙÜÝ ÙXÝ[Û\]XÝ[Î ÜËÛ][ KÎL MÂ\ÙÚY[ÙYH\ÙÜÝ [ÙYY\Î ÜËÛ][ KÎL B\ÙÚYÚYÛÛÓÙ\ÙÜÝ ÛÛXÝ[ÛÑ:XÛÛXÝ[ÛÎ ÜËÛ][ KÎL B\ÙÚY[]H\ÙÜÝ YXÙ\Î ÜËÛ][ KÎLÎ ËËYÜX]\ÙÚY\×\Î \È\ÙÜÝ \×\Î \ÈÎ ÜËÛ][ KÎLÎNBËËYÜX]\ÙÚY\È Ø\È [XH È ÚYÛÛ\ÙÜÝ \ÈØH \È H ÙHÛÛXÝ\Î ÜËÛ][ KÎM L\ÙÚYÝXÙH\ÙÜÝ ÝYXØ][ÛÎ ÜËÛ][ KÎM ËËYÜX]\ÙÚY\È\ÈY[ ÚYÛYÙ\ÙÜÝ \ÈH:]:H:XÛÛXÝ:HÎ ÜËÛ][ KÎM B\ÙÚYÛÛXÝ[Û\Ü\ÙÜÝ \]\HÛÛXÝ[ÛÎ ÜËÜ\ Î ÍB\ÙÚY\ØÜ\ È\ÙÜÝ ØÜ\ È\Î ÜËÜ YÚ[ËÎLLÂ\ÙÚYØZ[H H YÚ[\Ý\ÙÜÝ ØZ[H H\ÝH\È YÚ[ÈÎ ÜËÜ YÚ[ËÎMÎ\ÙÚYØZ[H H YÚ[È\ÙÜÝ ØZ[H H YÚ[ÈËY ÚYN[YH Ú]\ÝÙ YÚ[[H[Y\ÂÎ ÜËÜ YÚ[ËÎNL\ÙÚYØYY YÚ[È\ÙÜÝ YÚ[ÈÚ\ú\ÈÎ ÜËÜ YÚ[ËÎÎ\ÙÚY[\]\ÙÜÝ Ú[Z[ HXÚY\Î ÜËÜ YÚ[ËÎM\ÙÚYØY\ÙÜÝ Ú\Ù\Î ÜËÜ YÚ[ËÎNB\ÙÚYØYH YÚ[ÛHH[H\ÙÜÝ Ú\Ù\ [ YÚ[8 \\ HXÚY\Î ÜËÜ YÚ[ËÎB\ÙÚYÛÛYÝ\H\ÙÜÝ ÛÛYÝ\\Î ÜËÜ YÚ[ËÎ\ÙÚYÛÛYÝ\H Ù] [ÜÈÙ H Ù[XÝY YÚ[\ÙÜÝ ÛÛYÝ\H\ÈÜ [ÛÈ H YÚ[ ú[XÝ[ÛºHÎ ÜËÜ YÚ[ËÎ\ÙÚY[ØY\ÙÜÝ XÚ\Ù\Î ÜËÜ YÚ[ËÎÌ\ÙÚY[ØY H Ù[XÝY YÚ[\ÙÜÝ XÚ\Ù\H YÚ[ ú[XÝ[ÛºHÎ ÜËÜ YÚ[ËÎÌ\ÙÚY[ØY\ÙÜÝ :XÚ\Ù\Î ÜËÜ YÚ[ËÎÍB\ÙÚY[ØY H Ù[XÝY YÚ[\ÙÜÝ :XÚ\Ù\H YÚ[ ú[XÝ[ÛºHÎ ÜËÜ YÚ[ËÎ \ÙÚYÛÜÙH \È Ú[ÝÈ\ÙÜÝ \Y\Ù] H[º HÎ ÜËÜ YËÎNL\ÙÚYÙ[\[Ü [ÛÈ\ÙÜÝ Ü [ÛÈú[º\[\ÈÎ ÜËÜ YËÎ ÜËÜ YËÎÎ ÜËÜ YËÎML ÜËÜ YËÎÂÎ ÜËÜ YËÎLH ÜËÜ YËÎL ÌH ÜËÜ YËÎLM ÜËÜ YËÎMBÎ ÜËÜ YËÎNL H ÜËÜ YËÎÌÍ\ÙÚY[Ü [ÛÈ ZÙHYXÝ[[YYX][ H [\ÜÈÝ\Ú\ÙHÝY \ÙÜÝ Ý]\È\ÈÜ [ÛÈ ÛÛ \Ù\È[ÛÛ\ H[[zYX][Y[ Ø]Y ºXÚ\Ú[Û HØ\ÈÛÛ Z\KÎ ÜËÜ YËÎL\ÙÚYZ\ØÙ[[[Ý\È\ÙÜÝ ]] \ÈÎ ÜËÜ YËÎ\ÙÚY\ÙHÜ\\ÜÈ] ÛÈ\ÙÜÝ ][\Ù\\ÈÝ]ÛÈ Ø[ÈÜ \\ÈÎ ÜËÜ YËÎ\ÙÚYÚÝÈY HXÚÙ\\ÙÜÝ YXÚ\H\HHÛÛXÝ +XÚÙ\HÎ ÜËÜ YËÎB\ÙÚYÚÝÈXYÈÚ[ÝÈ\ÙÜÝ YXÚ\H[] HHXYÈË Y\[Ù\È ÚÝ[H ÜÚ]]BÎ ÜËÜ YËÎÌÂ\ÙÚYÝYHYY\È ] [ÝH\H \[È È [H\ÙÜÝ ÝYY\\ÈÛÛXÝ È ]YH Ý\È:\È[ Z[H]\:XÜ\HÎ ÜËÜ YËÎ \ÙÚY\ÜYH[Y\È\ÙÜÝ YXÚ\\È \ºY\È Ú[XÝ]]:HÎ ÜËÜ YËÎ\ÙÚYÛH\ÙÜÝ ]XÝ[HÎ ÜËÜ YËÎB\ÙÚYØZ[H\ÙH\ÙÜÝ ][\Ø][ÛHØZ[HÎ ÜËÜ YËÎLB\ÙÚY\ÙH\ÙÜÝ ][\Ø][ÛHÎ ÜËÜ YËÎ\ÙÚYÙÈ[ÛÛ\Ø][ÛÈ\ÙÜÝ [YÚ\Ý \ Ý]\È\ÈÛÛ\Ø][ÛÈÎ ÜËÜ YËÎÂ\ÙÚYÝ \SÛHÙÜÈ\ÙÜÝ []\ ÒS\ÈÝ\]^Î ÜËÜ YËÎB\ÙÚYÙÈ Ú[YY\È ÚYÛÛÜÚYÛÙ\ÙÜÝ [YÚ\Ý \\ÈÛÛXÝ[ÛËÙ:XÛÛXÝ[Û\ÈÛÛXÝ ÈÎ ÜËÜ YËÎÌB\ÙÚYÙÈ Ú[YY\ÈXÛÛYHYKÝ[ZYH\ÙÜÝ [YÚ\Ý \ÜÜ]YH\ÈÛÛXÝ È]Y[[XÝYÚ[XÝYÎ ÜËÜ YËÎÌÂ\ÙÚYÙÈ Ú[YY\ÈÛÈ]Ø^KØÛÛYHXÚÈ\ÙÜÝ [YÚ\Ý \ÜÜ]YH\ÈÛÛXÝ È ÛÛXÙ[ ÙH ]Ý\Î ÜËÜ YËÎÍ\ÙÚYÙÈ [Ý\ÝÛ ÚYÛÛËÚY[\ÜËØ]Ø^[\ÜÈ\ÙÜÝ [YÚ\Ý \ ÜÈ Ü \ÈÛÛXÝ[ÛË[XÝ]]:\ËXÙ[Ù\ÈÎ ÜËÜ YËÎÍ\ÙÚY[]Y X[ÙÈ[HÜXXÚY IÜÈ ÚYÛÛÈ\ÙÜÝ Ý\[[]Y Y[ Ý\Ú\]YHÛÛXÝÎ ÜËÜ YËÎÎB\ÙÚYÝÜÙ\\ÙÜÝ ]YØ]]\Î ÜËÜ YËÎLB\ÙÚYÛÛ]Y\Ü\ÙÜÝ ÛÛ]Y\ÜÎ ÜËÜ YËÎL\ÙÚYÜ\H\ÙÜÝ Ü\HÎ ÜËÜ YËÎLÂ\ÙÚY] ØØ\H\ÙÜÝ ] ØØ\HÎ ÜËÜ YËÎM\ÙÚY[Þ[H\ÙÜÝ [Þ[HÎ ÜËÜ YËÎMÂ\ÙÚYÜ \]È Ú[ÝÈHY][ \ÙÜÝ YXÚ\ [HÝ][H[º H \:Y]]Î ÜËÜ YËÎÌ \ÙÚYÓÓQHT[\\ÙÜÝ ÙÜ[[YHHÙ\Ý[Û ØY \ÜÙ\ÈÛÛYHÎ ÜËÜ YËÎÌ \ÙÚYØ[[Û\ÙÜÝ Ø[[ÛÎ ÜËÜ YËÎÌ ÂËËYÜX]\ÙÚYX[X[ + \ÈÜT +H\ÙÜÝ X[Y[ + \È Ý\T +HÎ ÜËÜ YËÎÍÍ\ÙÚY Þ HÜ [ÛÈ\ÙÜÝ Ü [ÛÈ H Þ HÎ ÜËÜ YËÎÎ\ÙÚYÝ[ ÝØÛÛ ÈØ[ \ÙH \ÙH Þ HÜ [ÛËX\ÙH ÙYH HPQQH[HÜ]Z[ Ë\ÙÜÝ \È ÝØÛÛ\ÈH ]][ \È Ý\È ][\Ù\\ÈÜ [ÛÈH Þ K]Z[^\HHXÚY\PQQ\Ý\ \È Ú[ÜX][ÛËÎ ÜËÜ YËÎÎLÂ\ÙÚY Þ H \H\ÙÜÝ \HH Þ HÎ ÜËÜ YËÎ B\ÙÚY Þ HÙ\\\ÙÜÝ Ù\]\H Þ HÎ ÜËÜ YËÎ \ÙÚYÈ Þ H\ÙÜÝ \ÈH Þ HÎ ÜËÜ YËÎ \ÙÚYÓÐÒÔÈ \ÙÜÝ ÓÐÒÔÈ Î ÜËÜ YËÎ Ì\ÙÚYÓÐÒÔÈ H\ÙÜÝ ÓÐÒÔÈ HÎ ÜËÜ YËÎ ÎB\ÙÚY\ÙÜÝ Î ÜËÜ YËÎ Â\ÙÚYÜÝ\ÙÜÝ = HÎ ÜËÜ YËÎ ÎB\ÙÚYÜ\ÙÜÝ ÜÎ ÜËÜ YËÎM\ÙÚY\Ù\\ÙÜÝ ][\Ø]]\Î ÜËÜ YËÎLL\ÙÚY\ÜÝÛÜ\ÙÜÝ [ÝH\ÜÙHÎ ÜËÜ YËÎM \ÙÚYY H\ÝÜ [ÛÈ\ÙÜÝ Ü [ÛÈHH\ÝHHÛÛXÝ ÈÎ ÜËÜ YËÎMM\ÙÚYY H\ÝÚ[ÝÈ\ÙÜÝ [º HHH\ÝHHÛÛXÝ ÈÎ ÜËÜ YËÎMB\ÙÚYXXÙ[Y[\ÙÜÝ XÙ[Y[\ÈÛÛ] ÈÎ ÜËÜ YËÎMÌÈ ÜËÜ YËÎL ÜËÜ YËÎLMM\ÙÚYÜ\ÙÜÝ ]]Î ÜËÜ YËÎMÍ ÜËÜ YËÎL ÜËÜ YËÎLMM\ÙÚYÝ ÛH\ÙÜÝ \ÈÎ ÜËÜ YËÎN \ÙÚYYHSKÒ[ËÐÚ]] ÛÈ\ÙÜÝ ØXÚ\Y\ÜØYÙKÒ[ÜËÐÝ] ÛÈ HÚ]Î ÜËÜ YËÎN\ÙÚY]]ÛX]XØ[ H ÚÝÈY H\ÝÛ ÚYÛÛ\ÙÜÝ YXÚ\H\ÝH\ÈÛÛXÝ]]ÛX]\]Y[Y[Î ÜËÜ YËÎNL\ÙÚY\Ü^HY H\ÝX\\ ]\ÙÜÝ ÜÚ][Û\H\ÝH\ÈÛÛXÝ º ÈH Ø\ ]Î ÜËÜ YËÎNLÂ\ÙÚYØ]HÚ[ÝÈÚ^KÔÜÚ][Û\ÙÜÝ z[[Ü\Ù\HZ[KÔÜÚ][Û\È[º \ÈÎ ÜËÜ YËÎNM\ÙÚYÚÝÈ XÝ \\ÈÛ] ÛÈ\ÙÜÝ YXÚ\\È[XYÙ\È Ý\\ÈÝ]ÛÈÎ ÜËÜ YËÎ \ÙÚYZ\ÙHY H\ÝÛÚYÛÛÈ[ÚYÛÙÈ\ÙÜÝ \ÝH\ÈÛÜZ[È ]ZH ÙHÛÛXÝ[ÝH ÙH:XÛÛXÝ[Î ÜËÜ YËÎ \ÙÚYÜÝ\\Ü^\È\ÙÜÝ YXÚYÙH\ÈÜÝ\\ÈÎ ÜËÜ YËÎM\ÙÚYYHÜÝ\ È Ú]ÈÛ[HYY\È\ÙÜÝ ØXÚ\\ÈÜÝ\\ÈHÛÛ[[]XÝ[ÛÛXÝÛÛXÝ:HÎ ÜËÜ YËÎ\ÙÚYÚÝÈ[X\È[ÜÝ\ È\ÙÜÝ YXÚ\HÛXHHÛÛXÝ È[È\ÈÜÝ\\ÈÎ ÜËÜ YËÎ\ÙÚYY H\Ü^\È\ÙÜÝ \ÝHHÛÛXÝ ÈÎ ÜËÜ YËÎÍ\ÙÚYÚÝÈY H \HXÛÛÈ\ÙÜÝ YXÚ\\ÈXÛÛ\È\ÈÛÛXÝ ÈÎ ÜËÜ YËÎÍB\ÙÚYÚÝÈ Ø\[È][ È\ÙÜÝ YXÚ\H]X]H Ð]\\ÜÙ[Y[Î ÜËÜ YËÎ B\ÙÚYÚÝÈYH [Y\È\ÙÜÝ YXÚ\\È [\ È Ú[XÝ]]:HÎ ÜËÜ YËÎ \ÙÚYÜ^HYHYY\È\ÙÜÝ Ü\Ù\\ÈÛÛXÝ È[XÝYÈÎ ÜËÜ YËÎNB\ÙÚYÛÛ\Ø][ÛÜ [ÛÈ\ÙÜÝ Ü [ÛHÛÛ\Ø][ÛÎ ÜËÜ YËÎÌB\ÙÚYÙ^XØ\Ü [ÛÈ\ÙÜÝ Ü [ÛÈ HÛ]Y\Î ÜËÜ YËÎ Â\ÙÚY[\ Ù[ ÈY\ÜØYÙH\ÙÜÝ H ÝXÚH[ \[ÚYH\ÈY\ÜØYÙ\ÈÎ ÜËÜ YËÎ \ÙÚYÛÛ Û Q[\ Ù[ ÈY\ÜØYÙH\ÙÜÝ Ý Q[ ºYH[ÚYH\ÈY\ÜØYÙ\ÈÎ ÜËÜ YËÎ B\ÙÚY\ØØ\HÛÜÙ\È Ú[ÝÈ\ÙÜÝ XÚ\\YHH[º HÎ ÜËÜ YËÎ Ë^B\ÙÚYÛÛ Û UÈÛÜÙ\È Ú[ÝÈ\ÙÜÝ XÚ\\YHH[º HÎ ÜËÜ YËÎL\ÙÚYÛÛ Û ^ÐÒKÕKÔßH[Ù\ ÈS YÜÈ\ÙÜÝ Ý ^ÐÒKÕKÔßH[Ù\\È[\Ù\ÈSÎ ÜËÜ YËÎLÂ\ÙÚYÛÛ Û J[X\H[Ù\ È ÛZ[^\È\ÙÜÝ Ý JÛXJH[Ù\ [ ÛZ[^HÎ ÜËÜ YËÎM\ÙÚY ÙÙÛ\È [Y\Ý[\\Ü^H\ÙÜÝ YXÚKØØXÚH ØYXÚYÙHH Ú]\HÎ ÜËÜ YËÎM\ÙÚY\Ü^H[Ù[\[Ü [ÛÈ\ÙÜÝ Ü [ÛÈú[º\[\È] ØYXÚYÙHÎ ÜËÜ YËÎÌ\ÙÚYÚÝÈÜ\XØ[ ÛZ[^\È\ÙÜÝ YXÚ\Ü\\]Y[Y[\È ÛZ[^\ÈÎ ÜËÜ YËÎÌB\ÙÚYÚÝÈ [Y\Ý[\ÛY\ÜØYÙ\È\ÙÜÝ YXÚ\ Ú]\H Ý\\ÈY\ÜØYÙ\ÈÎ ÜËÜ YËÎÌL\ÙÚYÚÝÈT È\È[ÜÈ\ÙÜÝ [ÞY\\ÈTÛÛ[YH\ÈY[ÈÎ ÜËÜ YËÎÌLB\ÙÚYYÚYÚ Z\ÜÜ[Y ÛÜ È\ÙÜÝ Ý\YÛ\\È[Ý ÈX[ÜÙÜ\z\ÈÎ ÜËÜ YËÎÌL ÜËÜ YËÎNLÂ\ÙÚYÙ[[ÈY\ÜØYÙ\È [[Ý\È]Ø^H Ý] \È\ÙÜÝ Ù[ÚHHY\ÜØYÙHÚ[ÙHH Ý] ] ØXÙ[ÙHÎ ÜËÜ YËÎÌLÈ ÜËÜ YËÎNLÍ\ÙÚY]Y]YH]ÈY\ÜØYÙ\È Ú[]Ø^H\ÙÜÝ Y\ÜØYÙ\ÈZ\È[] [HÜÈ Ý[HXÙ[ÙHÎ ÜËÜ YËÎÌNB\ÙÚYYÛÜHÛÛÜÈ\ÙÜÝ YÛÜ\\ÈÛÝ[]\ÈÎ ÜËÜ YËÎÌ\ÙÚYYÛÜHÛXÙ\È\ÙÜÝ YÛÜ\\È ÛXÙ\ÈÎ ÜËÜ YËÎÌB\ÙÚYYÛÜHÛ Ú^\È\ÙÜÝ YÛÜ\H Z[H\ÈÛXÙ\ÈÎ ÜËÜ YËÎÌ\ÙÚYYÛÜHRÈ]]ÛX]YY\ÜØYÙ\È\ÙÜÝ YÛÜ\\ÈY\ÜØYÙ\È]]ÛX]\]Y\ÈRÈÎ ÜËÜ YËÎÌÈ ÜËÜ YËÎNLB\ÙÚYYÛÜH]ÈÛÛ\Ø][ÛÈ Ú[]Ø^H\ÙÜÝ YÛÜ\\ÈÝ][\ÈÛÛ\Ø][ÛÈÜÈ\ÈXÙ[Ù\ÈÎ ÜËÜ YËÎLL\ÙÚYSHÜ [ÛÈ\ÙÜÝ Ü [ÛÈHY\ÜØYÙHÎ ÜËÜ YËÎLH ÜËÜ YËÎLB\ÙÚYSHÚ[ÝÈ\ÙÜÝ [º HHY\ÜØYÙHÎ ÜËÜ YËÎM H ÜËÜ YËÎLLB\ÙÚYÚÝÈ] ÛÈ\Î\ÙÜÝ YXÚ\\ÈÝ]ÛÈ ÛÝ\ÈHÜYNÎ ÜËÜ YËÎM H ÜËÜ YËÎLM\ÙÚYXÝ \\È[^ \ÙÜÝ [XYÙ\È] ^ \ÈÎ ÜËÜ YËÎM ÜËÜ YËÎLN\ÙÚYXÝ \\È\ÙÜÝ [XYÙ\ÈÎ ÜËÜ YËÎM È ÜËÜ YËÎLNB\ÙÚY^ \ÙÜÝ ^ HÎ ÜËÜ YËÎMN\ÙÚYÚÝÈ[ÛÛ\Ø][ÛÈ[ÛH XY Ú[ÝÈ\ÙÜÝ YXÚ\ Ý]\È\ÈÛÛ\Ø][ÛÈ[È [H[º H]XÈ\ÈÛÛ] ÈÎ ÜËÜ YËÎM\ÙÚYÚÝÈÚ] È[ H Ø[YH XY Ú[ÝÈ\ÙÜÝ YXÚ\\ÈÚ] È[ÈHzYH[º H]XÈÛÛ] ÈÎ ÜËÜ YËÎMÈ ÜËÜ YËÎLLNB\ÙÚYZ\ÙH Ú[ÝÜÈÛ][ È\ÙÜÝ [Û \\È[º \È XÙ][ [Y\ÜØYÙHÎ ÜËÜ YËÎM\ÙÚYÚÝÈÙÚ[È[ Ú[ÝÈ\ÙÜÝ YXÚ\\ÈÛÛXÝ[ÛÈ[ÈH[º HÎ ÜËÜ YËÎMBË^B\ÙÚYÚÝÈ[X\Ù\È[ XËÝ]\ËÝXÚÙ\\ÙÜÝ [Û H\È[X\È[È\ÈÛÛ] ËÝ] \ÈÎ ÜËÜ YËÎMÌ\ÙÚYYH Ú[ÝÈÛ Ù[\ÙÜÝ ØXÚ\H[º HÜÈH Ù[ÚHÎ ÜËÜ YËÎMÌ ÜËÜ YËÎLL\ÙÚYÚ[ÝÈÚ^\È\ÙÜÝ Z[\È\È[º \ÈÎ ÜËÜ YËÎN ÜËÜ YËÎLLÌ\ÙÚY]È Ú[ÝÈ ÚY \ÙÜÝ \Ù]\HHÝ][H[º HÎ ÜËÜ YËÎN H ÜËÜ YËÎLLÌB\ÙÚY]È Ú[ÝÈZYÚ \ÙÜÝ ]]]\HHÝ][H[º HÎ ÜËÜ YËÎN ÜËÜ YËÎLLÌ\ÙÚY[ H ÚYÙ]ZYÚ \ÙÜÝ ]]]\HH ÛHH ^ H +8[ÞY\HÎ ÜËÜ YËÎN ÜËÜ YËÎLLÍ\ÙÚYXXÙ[Y[\ÙÜÝ XÙ[Y[\ÈÛÛ] ÈÎ ÜËÜ YËÎL LÈ ÜËÜ YËÎLMÂ\ÙÚYY\ÙÜÝ Ø]XÚHÎ ÜËÜ YËÎL MH ÜËÜ YËÎLMB\ÙÚYYÚ \ÙÜÝ Ú]HÎ ÜËÜ YËÎL NB\ÙÚYY HXÛÛÈ\ÙÜÝ XÛÛ\È HÛÛXÝÎ ÜËÜ YËÎL ÌB\ÙÚYYHY HXÛÛÈ\ÙÜÝ ØXÚ\ ÒXÛÛH HÛÛXÝÎ ÜËÜ YËÎL ÍÂ\ÙÚY\ØXHY HXÛÛ[[X][Û\ÙÜÝ :\ØXÝ]\ Ø[[X][ÛH ÚXÛÛH HÛÛXÝÎ ÜËÜ YËÎL Â\ÙÚYÚ]Ü [ÛÈ\ÙÜÝ Ü [ÛÈ HÚ]Î ÜËÜ YËÎL ÍB\ÙÚYÜÝ\Ú]Ú[ÝÈ\ÙÜÝ [º HH\ØÝ][Û[ÜÝ\HÎ ÜËÜ YËÎLLL\ÙÚYÚÝÈ[Ú] È[ÛH XY Ú[ÝÈ\ÙÜÝ YXÚ\ Ý\È\ÈÚ] È[È [H[º H]XÈÛÛ] ÈÎ ÜËÜ YËÎLLL\ÙÚYÚÝÈÛÛ\Ø][ÛÈ[ H Ø[YH XY Ú[ÝÈ\ÙÜÝ YXÚ\\ÈÛÛ\Ø][ÛÈ[ÈHzYH[º H]XÈ\ÈÛÛ] ÈÎ ÜËÜ YËÎLL\ÙÚYÚÝÈ [ÜHÚ[[ËÛX][È[ Ú[ÝÈ\ÙÜÝ YXÚ\\È\]ºYKÙ:\\[ÈH[º HÎ ÜËÜ YËÎLM\ÙÚYXÛÛ\][Û\ÙÜÝ ÛÛ\:][ÛH[Ý ÈÎ ÜËÜ YËÎLN \ÙÚYXPÛÛ\]HXÚÜÈ\ÙÜÝ ÛÛ\:][Û\È Ù]YÜÈÎ ÜËÜ YËÎLN \ÙÚYÛ TÝ [HXÛÛ\][Û\ÙÜÝ ÛÛ\:][ÛH[Ý È +[ÚY[ Ý [JHÎ ÜËÜ YËÎL ÜËÜ YËÎLÌB\ÙÚYÛÜ [ÛÈ\ÙÜÝ Ü [ÛÈH ÛXÙHÎ ÜËÜ YËÎLÌM\ÙÚY][XÈ^ \ÙÜÝ ^ H[][\]YHÎ ÜËÜ YËÎLÍN ÜËÜ YËÎLÍÍ ÜËÜ YËÎLÎN\ÙÚYÙ[XÝ\ÙÜÝ ÙXÝ[Û\Î ÜËÜ YËÎLÎM\ÙÚYÛXÙHÜ^ \ÙÜÝ ÛXÙH Ý\H^ HÎ ÜËÜ YËÎM LB\ÙÚYÛÚ^HÜ^ \ÙÜÝ Z[HHH ÛXÙH Ý\H^ HÎ ÜËÜ YËÎML\ÙÚYØZ[H HÛÝ[ÛÛYÝ\][Û\ÙÜÝ ØZ[H HÛÛYÝ\][ÛÛÛÜHÎ ÜËÜ YËÎMM Â\ÙÚY\Ý\ÙÜÝ \Ý\Î ÜËÜ YËÎMMLÂ\ÙÚYÚÛÜÙK\ÙÜÝ ÚÚ\Ú\Î ÜËÜ YËÎMB\ÙÚYÛÝ[Ü [ÛÈ\ÙÜÝ Ü [ÛÈ ÛÛÜ\ÈÎ ÜËÜ YËÎMB\ÙÚYÈ ÛÝ[ È Ú[ [ÝHÙÈ[\ÙÜÝ ]XÝ[ ÛÛÜÈH Ý HÛÛXÝ[ÛÎ ÜËÜ YËÎMMH ÜËÜ YËÎNL\ÙÚYÛÝ[ È Ú[H]Ø^H\ÙÜÝ ÝY\\È ÛÛÈzYHÜÜ]YH Ý\È:\ÈXÙ[Î ÜËÜ YËÎMB\ÙÚYÛÝ[Y]Ù\ÙÜÝ Y]ÙH][\úYHÎ ÜËÜ YËÎMÌÎBËËYÜX]\ÙÚYÛÝ[ÛÛ[X[ \ÈÜ[[[YJH\ÙÜÝ ÛÛ[X[H8 ][\Ù\ \È Ý\HÛHHXÚY\HÎ ÜËÜ YËÎMÍLB\ÙÚYÛÝ[ ^YY Ú[\ÙÜÝ ÛÛÝzH ]X[Î ÜËÜ YËÎNLÈ ÜËÜ YËÎMLÂ\ÙÚY]Ø^HY\ÜØYÙ\È\ÙÜÝ Y\ÜØYÙ\È ØXÙ[ÙHÎ ÜËÜ YËÎNLÌ\ÙÚYÛÝ Ù[]]Ë\\ÜÛÙH\ÙÜÝ H \È[ÞY\H º\ÛÙH]]ÛX]\]YHÎ ÜËÜ YËÎNLÌB\ÙÚYÛ H Ù[]]Ë\\ÜÛÙH Ú[YH\ÙÜÝ [ÞY\H º\ÛÙH]]ÛX]\]YH [\]Y[Y[ÜÈH Ú[XÝ]]:HÎ ÜËÜ YËÎNM \ÙÚY[YH] ÙY[ Ù[[È]]Ë\\ÜÛÙ\È +[ ÙXÛÛ ÊN\ÙÜÝ [ZH][ Ù[ÞY\\È º\ÛÙ\È]]ÛX]\]Y\È +[ ÙXÛÛ\ÊHÎ ÜËÜ YËÎNMB\ÙÚY]]È]Ø^HY\\ÙÜÝ \ÜÙ\]]ÛX]\]Y[Y[[[ÙHXÙ[\ º ÈÎ ÜËÜ YËÎNMÍB\ÙÚYZ[]\È \Ú[È\ÙÜÝ Z[]\È[ ][\Ø[Î ÜËÜ YËÎNN\ÙÚYY\ÜØYÙ\È\ÙÜÝ Y\ÜØYÙ\ÈÎ ÜËÜ YËÎ B\ÙÚYY]\ÙÜÝ Y]\Î ÜËÜ YËÎ B\ÙÚYXZÙH]Ø^H\ÙÜÝ ] HXÙ[XZ[[[Î ÜËÜ YËÎÌ\ÙÚY ]XÞHÜ [ÛÈ\ÙÜÝ Ü [ÛÈ Ò[[Z]:HÎ ÜËÜ YËÎÍ \ÙÚYÙ] ]XÞHÜ\ÙÜÝ Y] H[ XÙH [[ H Ý\Î ÜËÜ YËÎÍB\ÙÚY[ÝÈ[ \Ù\È ÈÛÛXÝYH\ÙÜÝ \Y] H8 Ý\È\È ][\Ù]\ÈHYHÛÛXÝ\Î ÜËÜ YËÎÍ\ÙÚY[ÝÈÛ H H \Ù\È[ÝÈ\ÙÜÝ \Y] H]^ ][\Ù]\ÈÚH\ÜÛÝ\ÈÎ ÜËÜ YËÎÍ\ÙÚY[ÝÈ\Ý\ÙÜÝ \ÝH\Z\ÜÚ[ÛÎ ÜËÜ YËÎÎMB\ÙÚY[H[ \Ù\È\ÙÜÝ [\\H8 Ý\ÈÎ ÜËÜ YËÎÎM\ÙÚYØÚÈ H \Ù\È[ÝÈ\ÙÜÝ Ü]Y\\È ][\Ø]]\ÈÚH\ÜÛÝ\ÈÎ ÜËÜ YËÎÎN\ÙÚYØÚÈ\Ý\ÙÜÝ Ü]Y\H\ÝHÎ ÜËÜ YËÎLÂ\ÙÚYØZ[H H Y\[Ù\È\ÙÜÝ ØZ[H H ºYº\[Ù\ÈÎ ÜËÜ YËÎMÍ\ÙÚYØZ[HXYÈÝ] ] Ú[ÝÈ\ÙÜÝ [º HHXYÈØZ[HÎ ÜËÜ YËÎ Â\ÙÚYÙ[\[\ÙÜÝ ú[\[Î ÜËÜ YËÎL\ÙÚY Þ H\ÙÜÝ Þ HÎ ÜËÜ YËÎLM\ÙÚYÛÛ\Ø][ÛÈ\ÙÜÝ ÛÛ\Ø][ÛÈÎ ÜËÜ YËÎM \ÙÚYÛÝ[ È\ÙÜÝ ÛÛÈÎ ÜËÜ YËÎM\ÙÚY ]XÞH\ÙÜÝ [ HÎ ÜËÜ ÎÌ\ÙÚY[ÝH]H] [\ Y ÈØYH ÝØÛÛ ÚXÚ Ø\ÈÝÛÛ\[YÛH H Ø[YH\Ú[ÛÙ H ÛÝ\ÙH\È \È\ XØ][Û Ø\Ë[Ü [][ KXØ]\ÙH]\ÈÝ H Ø[YH \Ú[ÛHØ[Ý ØY[ H [ [ÝH ÚXÚÛH] Ø\ËYY\ÜÈ ÈØ^K] Ø\ÈÝ ÝXØÙ\ÜÙ[ HØYY \ÙÜÝ Ý\È]^\ÜØ^zHHÚ\Ù\ [ ÝØÛÛH ]ZHØH \È:]:HÛÛ\[:H8 \\HHzYH \Ú[Û\È ÛÝ\Ù\È ]YHÙ] H\ XØ][ÛX[]\]\Ù[Y[ 8Ø]\ÙHHÙ] HYº\[ÙHHH ]^ Ý\È\H\]Y[HÉú]Z] ]Y[Y[ HÚ\Ù[Y[H:XÚÝzKÎ ÜËÜ ÎÍ\ÙÚY ÝØÛÛ\Ü\ÙÜÝ \]\H ÝØÛÛHÎ ÜËÜ ÎLÂËËYÜX]\ÙÚY\È Ø\È \Ú[È \Ë ÚXÚÛÝ [[ÝY \È\ÈÝÈÙ[K\ÙÜÝ \È ][\ØZ] \Ë ]ZHH:]:H[]ºK \È\ÝXZ[[[ÜÈYÛKÎ ÜËÜ ÎM\ÙÚY\ØÛÛXÝ\ÙÜÝ :XÛÛXÝ\Î ÜËÜ ÎLÌÂ\ÙÚYXØÙ\ È\ÙÜÝ XØÙ\ \ÈÎ ÜËÜ ÎNNBË^B\ÙÚYØZ[H H Û\ \ÙÜÝ ØZ[H H Û\ Î ÜËÜ Î NB\ÙÚYØZ[H H]ÈXZ[\ÙÜÝ ØZ[H HÝ]X]HÛÝ\Y\Î ÜËÜ Î B\ÙÚYÜ[XZ[\ÙÜÝ Ý]\HÛÝ\Y\Î ÜËÜ ÎMÌË^KËYÜX]\ÙÚY\É\É\É\È\ÈXYH \È\ÈÜ\Y I\É\É\È\ÙÜÝ \É\É\É\ÈHZ]H \È]\ÛÛXÝ \É\É\ÈÎ ÜËÜ ÎMÎË^B\ÙÚYÈ [ÝH Ú\Ú ÈY[HÜ\ È [Ý\Y H\ÝÈ\ÙÜÝ Ý[^ Ý\È\ÈZÝ]\H Ý H\ÝHHÛÛXÝ ÏÈÎ ÜËÜ ÎB\ÙÚY[ÝHÈÝÝ\[ H]H[H ÝØÛÛ È]Z[XH ]\HXH È YÚ\Ý\]ÈXØÛÝ[ Ë\ÙÜÝ Ý\ÈØ]^ \ÈH ÝØÛÛH\ÜÛXH Ý\È \Y] [HܺY\HÝ]X]^ÛÛ\ \ÈÎ ÜËÜ ÎN\ÙÚYØZ[H HYÚ\Ý ][Û\ÙÜÝ ØZ[H H[YÚ\Ý [Y[ Ý[Ý][ ][\Ø]]\Î ÜËÜ ÎÌÂ\ÙÚYYÚ\Ý ][Û[ÜX][Û\ÙÜÝ [ÜX][Û Ù[YÚ\Ý [Y[Î ÜËÜ ÎL\ÙÚYYÚ\Ý\\ÙÜÝ ÉÙ[YÚ\Ý \Î ÜËÜÙ\\ÎMB\ÙÚYX\ÙH[\ [Ý\ \ÜÝÛÜ\ÙÜÝ [ ^ Ý H[ÝH \ÜÙHÎ ÜËÜÙ\\ÎN BËËYÜX]\ÙÚY YY\ÜØYÙ\ÊH\ÙÜÝ YY\ÜØYÙ\ÊHÎ ÜËÜÙ\\ÎNLB\ÙÚY HY\ÜØYÙJH\ÙÜÝ HY\ÜØYÙJHÎ ÜËÜÙ\\ÎÎ Â\ÙÚYØ\Y\ÙÜÝ ]\]Î ÜËÜÙ\\Î Í\ÙÚYY\È\ÙÜÝ ÝZHÎ ÜËÜÙ\\Î ÍÂ\ÙÚYÈ\ÙÜÝ ÛÎ ÜËÜÙ\\ÎL Í\ÙÚY[ÜH[È\ÙÜÝ \È Ú[ÜX][ÛÈÎ ÜËÜÛÝ[ ÎÂË^B\ÙÚYY HÙÜÈ[\ÙÜÝ XÛÛH HÛÛXÝÎ ÜËÜÛÝ[ ÎË^B\ÙÚYY HÙÜÈÝ]\ÙÜÝ \ÝHHÛÛXÝ ÈÎ ÜËÜÛÝ[ ÎBË^B\ÙÚYY\ÜØYÙH XÙZ]Y\ÙÜÝ \]\HY\ÜØYÙHÎ ÜËÜÛÝ[ Î\ÙÚYY\ÜØYÙH XÙZ]YYÚ[ÈÛÛ\Ø][Û\ÙÜÝ :X]HHÛÛ\Ø][ÛÎ ÜËÜÛÝ[ ÎÂË^B\ÙÚYY\ÜØYÙH Ù[\ÙÜÝ Y\ÜØYÙ\ÈÎ ÜËÜÛÝ[ Î\ÙÚY\ÛÛ[\ÈÚ]\ÙÜÝ H \ÛÛH[ H[ÈHÚ]Î ÜËÜÛÝ[ ÎB\ÙÚY\ÛÛX]\ÈÚ]\ÙÜÝ H \ÛÛH ]Z] HHÚ]Î ÜËÜÛÝ[ ÎÌ\ÙÚY[ÝH [È[Ú]\ÙÜÝ Ý\È \^[ÈHÚ]Î ÜËÜÛÝ[ ÎÌB\ÙÚYÝ\È [È[Ú]\ÙÜÝ Ø]] \È \[[ÈHÚ]Î ÜËÜÛÝ[ ÎÍ\ÙÚYÛÛY[ÛH Ø^\È [Ý\[YH[Ú]\ÙÜÝ ]Y[ ]IÝ[] Ý H Ù]YÈ[ÈHÚ]ß\ÙÚY[XH ÛÝ[ Èß\ÙÜÝ XÝ]\H ÛÛß\ÙÚYÑHß\ÙÜÝ ÑHß\ÙÚYX[X[ß\ÙÜÝ X[Y[ \ No newline at end of file ... [truncated message content] |
|
From: Rob F. <rob...@us...> - 2002-07-02 05:41:33
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv21669 Modified Files: ChangeLog Log Message: hmm Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.509 retrieving revision 1.510 diff -u -d -r1.509 -r1.510 --- ChangeLog 25 Jun 2002 01:25:44 -0000 1.509 +++ ChangeLog 2 Jul 2002 05:41:29 -0000 1.510 @@ -1,5 +1,8 @@ Gaim: The Pimpin' Penguin IM Clone thats good for the soul! +version 0.60: + * French translation updated + version 0.59 (06/24/2002): * Hungarian translation added (Thanks, Sutto Zoltan) * Swedish translation updated (Thanks, Christian Rose) |
|
From: Christian H. <ch...@us...> - 2002-06-30 05:26:02
|
Update of /cvsroot/gaim/gaim/doc In directory usw-pr-cvs1:/tmp/cvs-serv7409 Modified Files: FAQ Log Message: Slight fix. Index: FAQ =================================================================== RCS file: /cvsroot/gaim/gaim/doc/FAQ,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- FAQ 29 Jun 2002 12:13:25 -0000 1.22 +++ FAQ 30 Jun 2002 05:25:57 -0000 1.23 @@ -40,7 +40,7 @@ default of "/GAIM"? 7.3 How do I register a new Jabber account? 7.4 How do I use invisibility? - 7.5 I've a buddy that I keep removing from my buddy list, but + 7.5 I've a buddy that I keep removing from my buddy list, but he keeps coming back! How can I stop this? 7.6 What does "Remove From Roster" do? 7.7 What does "Cancel Presence Notification" do? |
|
From: Jim S. <jse...@us...> - 2002-06-29 12:13:29
|
Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv1378/src/protocols/jabber
Modified Files:
jabber.c
Log Message:
Added support for Jabber invisibility.
Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- jabber.c 27 Jun 2002 23:24:39 -0000 1.57
+++ jabber.c 29 Jun 2002 12:13:25 -0000 1.58
@@ -143,11 +143,19 @@
};
/*
+ * Used in jabber_buddy_data.invisible, below
+ */
+#define JABBER_NOT_INVIS 0x00
+#define JABBER_SERV_INVIS 0x01 /* Invisible set on server */
+#define JABBER_BUD_INVIS 0x02 /* Invisible set on buddy */
+
+/*
* It is *this* to which we point the buddy proto_data
*/
struct jabber_buddy_data {
GSList *resources;
char *error_msg;
+ unsigned invisible; /* We've set presence type invisible for this buddy */
};
/*
@@ -973,6 +981,9 @@
}
}
+/*
+ * Return pointer to jabber_buddy_data if buddy found. Create if necessary.
+ */
static struct jabber_buddy_data* jabber_find_buddy(struct gaim_connection *gc, char *buddy)
{
struct jabber_data *jd = gc->proto_data;
@@ -991,6 +1002,7 @@
struct jabber_buddy_data *jbd = g_new0(struct jabber_buddy_data, 1);
jbd->error_msg = NULL;
jbd->resources = NULL;
+ jbd->invisible = JABBER_NOT_INVIS;
g_hash_table_insert(jd->buddies, g_strdup(realwho), jbd);
g_free(realwho);
return jbd;
@@ -2396,20 +2408,123 @@
*/
static void jabber_remove_buddy_roster_item(struct gaim_connection *gc, char *name)
{
- xmlnode x, y;
+ gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc;
char *realwho;
+
+ if((realwho = get_realwho(gjc, name, FALSE, NULL)) != NULL) {
+ xmlnode x = jutil_iqnew(JPACKET__SET, NS_ROSTER);
+ xmlnode y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item");
+ xmlnode_put_attrib(y, "jid", realwho);
+ xmlnode_put_attrib(y, "subscription", "remove");
+ gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
+ g_free(realwho);
+ xmlnode_free(x);
+ }
+}
+
+/*
+ * Unsubscribe a buddy from our presence
+ */
+static void jabber_unsubscribe_buddy_from_us(struct gaim_connection *gc, char *name)
+{
gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc;
+ char *realwho;
- if(!name || (realwho = get_realwho(gjc, name, FALSE, NULL)) == NULL)
- return;
+ if((realwho = get_realwho(gjc, name, FALSE, NULL)) != NULL) {
+ xmlnode g = xmlnode_new_tag("presence");
+ xmlnode_put_attrib(g, "to", realwho);
+ xmlnode_put_attrib(g, "type", "unsubscribed");
+ gjab_send(gjc, g);
+ xmlnode_free(g);
+ }
+}
- x = jutil_iqnew(JPACKET__SET, NS_ROSTER);
- y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item");
- xmlnode_put_attrib(y, "jid", realwho);
- xmlnode_put_attrib(y, "subscription", "remove");
- gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
- g_free(realwho);
- xmlnode_free(x);
+/*
+ * Common code for setting ourselves invisible/visible to buddy
+ */
+static void jabber_invisible_to_buddy_common(struct gaim_connection *gc, char *name, gboolean invisible)
+{
+ gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc;
+ char *realwho;
+
+ if((realwho = get_realwho(gjc, name, FALSE, NULL)) != NULL) {
+ struct jabber_buddy_data *jbd = jabber_find_buddy(gc, realwho);
+ xmlnode g = xmlnode_new_tag("presence");
+
+ xmlnode_put_attrib(g, "to", realwho);
+
+ if(invisible)
+ xmlnode_put_attrib(g, "type", "invisible");
+
+ gjab_send(gjc, g);
+
+ g_free(realwho);
+ xmlnode_free(g);
+
+ if(jbd) {
+ if(invisible) {
+ jbd->invisible |= JABBER_BUD_INVIS;
+ } else {
+ jbd->invisible &= ~JABBER_BUD_INVIS;
+ }
+ }
+ }
+}
+
+/*
+ * Make ourselves temporarily invisible to a buddy
+ */
+static void jabber_invisible_to_buddy(struct gaim_connection *gc, char *name)
+{
+ jabber_invisible_to_buddy_common(gc, name, TRUE);
+}
+
+/*
+ * Make ourselves visible to a buddy
+ */
+static void jabber_visible_to_buddy(struct gaim_connection *gc, char *name)
+{
+ jabber_invisible_to_buddy_common(gc, name, FALSE);
+}
+
+/*
+ * Function used by the g_hash_table_foreach() in invisible_to_all_buddies() to
+ * actually set the status.
+ *
+ * key is unused
+ * value is the pointer to the jabber_buddy_data struct
+ * data is gboolean: TRUE (invisible) or FALSE (not invisible)
+ */
+static void set_invisible_to_buddy_status(gpointer key, gpointer val, gpointer data) {
+ struct jabber_buddy_data *jbd = val;
+ gboolean invisible = (gboolean) data;
+
+ if(jbd) {
+ if(invisible) {
+ jbd->invisible = JABBER_SERV_INVIS | JABBER_BUD_INVIS;
+ } else {
+ /*
+ * If we've asserted server-level invisibility, cancelling
+ * it removes explicit buddy invisibility settings too.
+ */
+ if(jbd->invisible & JABBER_SERV_INVIS)
+ jbd->invisible = JABBER_NOT_INVIS;
+ }
+ }
+}
+
+/*
+ * Show we've set ourselves invisible/visible to all buddies on the server
+ *
+ * Used when we set server-wide invisibility so that individual buddy menu
+ * entries show the proper option.
+ */
+static void invisible_to_all_buddies(struct gaim_connection *gc, gboolean invisible)
+{
+ struct jabber_data *jd = gc->proto_data;
+
+ if(jd->buddies != NULL)
+ g_hash_table_foreach(jd->buddies, set_invisible_to_buddy_status, (gpointer) invisible);
}
static char **jabber_list_icon(int uc)
@@ -2867,6 +2982,12 @@
pbm->gc = gc;
m = g_list_append(m, pbm);
} else {
+ gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc;
+ char *realwho = get_realwho(gjc, who, FALSE, NULL);
+ struct jabber_buddy_data *jbd = jabber_find_buddy(gc, realwho);
+
+ g_free(realwho);
+
pbm = g_new0(struct proto_buddy_menu, 1);
pbm->label = _("Get Info");
pbm->callback = jabber_get_info;
@@ -2877,6 +2998,17 @@
pbm->callback = jabber_get_away_msg;
pbm->gc = gc;
m = g_list_append(m, pbm);
+
+ pbm = g_new0(struct proto_buddy_menu, 1);
+ if(jbd && (jbd->invisible & JABBER_BUD_INVIS)) {
+ pbm->label = _("Un-hide From");
+ pbm->callback = jabber_visible_to_buddy;
+ } else {
+ pbm->label = _("Temporarily Hide From");
+ pbm->callback = jabber_invisible_to_buddy;
+ }
+ pbm->gc = gc;
+ m = g_list_append(m, pbm);
}
return m;
@@ -2894,6 +3026,11 @@
pbm->callback = jabber_remove_buddy_roster_item;
pbm->gc = gc;
m = g_list_append(m, pbm);
+ pbm = g_new0(struct proto_buddy_menu, 1);
+ pbm->label = _("Cancel Presence Notification");
+ pbm->callback = jabber_unsubscribe_buddy_from_us;
+ pbm->gc = gc;
+ m = g_list_append(m, pbm);
return m;
}
@@ -2906,6 +3043,7 @@
m = g_list_append(m, "Away");
m = g_list_append(m, "Extended Away");
m = g_list_append(m, "Do Not Disturb");
+ m = g_list_append(m, "Invisible");
return m;
}
@@ -2918,6 +3056,7 @@
GSList *jcs;
struct jabber_chat *jc;
char *chatname;
+ gboolean invisible = FALSE;
gc->away = NULL; /* never send an auto-response */
@@ -2955,6 +3094,10 @@
y = xmlnode_insert_tag(x, "show");
xmlnode_insert_cdata(y, "dnd", -1);
gc->away = "";
+ } else if (!strcmp(state, "Invisible")) {
+ xmlnode_put_attrib(x, "type", "invisible");
+ gc->away = "";
+ invisible = TRUE;
}
}
@@ -2977,6 +3120,8 @@
}
xmlnode_free(x);
+
+ invisible_to_all_buddies(gc, invisible);
}
static void jabber_set_idle(struct gaim_connection *gc, int idle) {
|
|
From: Jim S. <jse...@us...> - 2002-06-29 12:13:29
|
Update of /cvsroot/gaim/gaim/doc
In directory usw-pr-cvs1:/tmp/cvs-serv1378/doc
Modified Files:
FAQ
Log Message:
Added support for Jabber invisibility.
Index: FAQ
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/FAQ,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- FAQ 20 Jun 2002 04:00:52 -0000 1.21
+++ FAQ 29 Jun 2002 12:13:25 -0000 1.22
@@ -39,6 +39,11 @@
7.2 How do I change my Jabber resource to be other than the
default of "/GAIM"?
7.3 How do I register a new Jabber account?
+ 7.4 How do I use invisibility?
+ 7.5 I've a buddy that I keep removing from my buddy list, but
+ he keeps coming back! How can I stop this?
+ 7.6 What does "Remove From Roster" do?
+ 7.7 What does "Cancel Presence Notification" do?
8 Scripts and Plugins
8.1 Where can I find documentation on writing plugins and
@@ -320,6 +325,65 @@
password" check-box as well, as Gaim presently does no password
verification. So if you don't type in what you thought you did,
you're hosed.
+
+
+7.4 How do I use invisibility?
+
+ Jabber invisibility support is available in Gaim version 0.60 and later.
+
+ There are two ways to use Jabber invisibility: on a per-buddy and on a
+ per-server basis.
+
+ To use per-buddy invisibility: right-click on the buddy on the Online
+ buddy list and select "Temporarily Hide From." You will appear to that
+ buddy to be off-line. To make yourself seen by that buddy again:
+ right-click on the buddy and select "Un-hide From." Note that the menu
+ changes based on whether you're currently invisible to that buddy or
+ not.
+
+ The "Temporarily" part is a dead give-away. Your invisibility to
+ that buddy will last only until the next time you log on or until
+ you set server invisibility (discussed next) on and off.
+
+ To use per-server invisibility: click "Tools -> Away," select the Jabber
+ server login for the server upon which you wish to become invisible (if
+ necessary) and select "Invisible." To become visible again: select
+ anything else from that same menu (such as "Online"), or set your away
+ status or log off the server and back on again.
+
+ You can set yourself invisible per-server and subsequently make yourself
+ visible to selected buddies only.
+
+ Gaim currently does not retain invisibility settings between logins,
+ just as it doesn't currently retain "away" status.
+
+
+7.5 I've a buddy that I keep removing from my buddy list but the entry
+ keeps coming back every time I log in again! How can I stop this?
+
+ As of Gaim version 0.59 and later: Select the Edit Buddies tab, right-
+ click on the offending entry, and select "Remove From Roster."
+
+
+7.6 Can I remove a buddy from my Jabber roster entirely?
+
+ As of Gaim version 0.59 and later: yes. In the Edit Buddies tab, right-
+ click on a buddy and Select "Remove From Roster."
+
+ The buddy will disappear from your buddy list and also will no longer
+ receive presence notifications from you.
+
+
+7.7 What does "Cancel Presence Notification" do?
+
+ This selection, available in Gaim version 0.60 and later, and found by
+ right-clicking on a buddy entry in the Edit Buddies tab, prevents that
+ Jabber I.D. from receiving future presence notifications when you log on
+ to the server.
+
+ After you do this, that buddy will have to re-request a subscription to
+ your presence (and you will have to approve it) for them to again see you
+ on-line.
+--------------------------------------------------------------------------
|
|
From: Jim S. <jse...@us...> - 2002-06-28 01:47:15
|
Update of /cvsroot/gaim/gaim/src/protocols/gg In directory usw-pr-cvs1:/tmp/cvs-serv433/src/protocols/gg Modified Files: gg.c Log Message: Patch [ 573779 ] Fix ugly bug in gg plugin (caused sig11) (Thanks, Arkadiusz Miskiewicz) Index: gg.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- gg.c 28 Mar 2002 18:22:49 -0000 1.19 +++ gg.c 28 Jun 2002 01:47:12 -0000 1.20 @@ -580,9 +580,9 @@ if (gc->inpa) gaim_input_remove(gc->inpa); gg_logoff(gd->sess); + gd->own_status = GG_STATUS_NOT_AVAIL; gg_free_session(gd->sess); g_free(gc->proto_data); - gd->own_status = GG_STATUS_NOT_AVAIL; } static int agg_send_im(struct gaim_connection *gc, char *who, char *msg, int len, int flags) |
|
From: Jim S. <jse...@us...> - 2002-06-27 23:47:31
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv6775/src Modified Files: conversation.c Log Message: Sean asked me to do this. Index: conversation.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/conversation.c,v retrieving revision 1.358 retrieving revision 1.359 diff -u -d -r1.358 -r1.359 --- conversation.c 15 Jun 2002 17:24:07 -0000 1.358 +++ conversation.c 27 Jun 2002 23:47:28 -0000 1.359 @@ -2846,6 +2846,8 @@ MAX(conv_size.entry_height, gdk_char_height(gtk_widget_get_default_style()->font, '0') + gtk_widget_get_default_style()->font->ascent + 1)); +#else + gtk_widget_set_usize(entry, conv_size.width - 20, MAX(conv_size.entry_height, 25)); #endif gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback), c); |
|
From: Jim S. <jse...@us...> - 2002-06-27 23:24:42
|
Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv31971/src/protocols/jabber
Modified Files:
jabber.c
Log Message:
Fix for null-resource JIDs not being handled in .59. (Thanks, Nathan Walp)
Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- jabber.c 19 Jun 2002 21:20:08 -0000 1.56
+++ jabber.c 27 Jun 2002 23:24:39 -0000 1.57
@@ -1022,7 +1022,7 @@
} else if(!res) { /* we're looking for the default priority, so... */
if(((jab_res_info) resources->data)->priority >= jri->priority)
jri = (jab_res_info) resources->data;
- } else {
+ } else if(((jab_res_info)resources->data)->name) {
if(!strcasecmp(((jab_res_info) resources->data)->name, res)) {
jri = (jab_res_info) resources->data;
break;
@@ -1046,9 +1046,14 @@
{
struct jabber_buddy_data *jbd = jabber_find_buddy(gc, buddy);
- if(jbd && res) {
- char *who = g_strdup_printf("%s/%s", buddy, res);
- jab_res_info jri = jabber_find_resource(gc, who);
+ if(jbd) {
+ char *who;
+ jab_res_info jri;
+ if(res)
+ who = g_strdup_printf("%s/%s", buddy, res);
+ else
+ who = g_strdup(buddy);
+ jri = jabber_find_resource(gc, who);
g_free(who);
if(!jri) {
jri = g_new0(struct jabber_resource_info, 1);
@@ -1067,12 +1072,18 @@
static void jabber_remove_resource(struct gaim_connection *gc, char *buddy, char *res)
{
struct jabber_buddy_data *jbd = jabber_find_buddy(gc, buddy);
- if(jbd && res) {
- char *who = g_strdup_printf("%s/%s", buddy, res);
- jab_res_info jri = jabber_find_resource(gc, who);
+ if(jbd) {
+ char *who;
+ jab_res_info jri;
+ if(res)
+ who = g_strdup_printf("%s/%s", buddy, res);
+ else
+ who = g_strdup(buddy);
+ jri = jabber_find_resource(gc, who);
g_free(who);
if(jri) {
- g_free(jri->name);
+ if(jri->name)
+ g_free(jri->name);
if(jri->away_msg)
g_free(jri->away_msg);
jbd->resources = g_slist_remove(jbd->resources, jri);
@@ -1102,7 +1113,7 @@
char *msg = NULL;
jab_res_info jri = NULL;
- if(!p || !p->from || !p->from->resource || !p->from->user)
+ if(!p || !p->from || !p->from->user)
return;
jri = jabber_find_resource(GJ_GC(gjc), jid_full(p->from));
|
|
From: Rob F. <rob...@us...> - 2002-06-25 04:14:41
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv16314 Modified Files: NEWS Log Message: blah Index: NEWS =================================================================== RCS file: /cvsroot/gaim/gaim/NEWS,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- NEWS 25 Jun 2002 04:01:34 -0000 1.139 +++ NEWS 25 Jun 2002 04:14:38 -0000 1.140 @@ -10,7 +10,9 @@ to do it. But now we have. Aside from some Jabber changes and some crucial MSN fixes, most of this release's changes are transparent, but none-the-less important. Well get some better changes when my - computer works again, you have my word**My word is worthless. + computer works again, you have my word* + + *My word is worthless. 0.58 (05/13/2002): |
|
From: Rob F. <rob...@us...> - 2002-06-25 04:01:37
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv13594 Modified Files: NEWS Log Message: One of us always has a broken computer. Index: NEWS =================================================================== RCS file: /cvsroot/gaim/gaim/NEWS,v retrieving revision 1.138 retrieving revision 1.139 diff -u -d -r1.138 -r1.139 --- NEWS 25 Jun 2002 01:25:44 -0000 1.138 +++ NEWS 25 Jun 2002 04:01:34 -0000 1.139 @@ -5,6 +5,13 @@ I'm very tired but it's time for a release. Enjoy. :) SORRY FOR THE DELAY. :( + Sean: It's been a long time since our last release, and for no + good reason either. Rob and I just haven't been able to get together + to do it. But now we have. Aside from some Jabber changes and some + crucial MSN fixes, most of this release's changes are transparent, + but none-the-less important. Well get some better changes when my + computer works again, you have my word**My word is worthless. + 0.58 (05/13/2002): Rob: Yeah, so, my computer has been bad which is why the release |
|
From: Rob F. <rob...@us...> - 2002-06-25 01:25:47
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv29215 Modified Files: gaim.spec.in ChangeLog NEWS Log Message: The drugs are goood! Index: gaim.spec.in =================================================================== RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- gaim.spec.in 7 Jun 2002 18:29:43 -0000 1.51 +++ gaim.spec.in 25 Jun 2002 01:25:44 -0000 1.52 @@ -95,7 +95,7 @@ rm -r $RPM_BUILD_ROOT %changelog -* Fri May 31 2002 Rob Flynn <ro...@ma...> (0.59 release) +* Mon Jun 24 2002 Rob Flynn <ro...@ma...> (0.59 release) - Hungarian translation added (Thanks, Sutto Zoltan) - Swedish translation updated (Thanks, Christian Rose) - Spanish translation updated (Thanks, Alex) @@ -112,8 +112,22 @@ - Perl scripts can play Gaim sounds (thanks Andrew Rodland) - Internal sounds can be played by commands (thanks Lex Spoon) - Auto-login item in applet menu (thanks Chris Boyle) -- Fixed MSN "Unkown Error Code", "Already there", and "Already in opposite list" errors +- Fixed MSN "Unkown Error Code", "Already there", and Already in opposite list" errors - Changed "Play sound" button to "Mute" button +- You can now have "reserved" chars in IM and proxy passwords +- Jabber now has typing notification (Thanks, Nathan Walp) +- Improved support for Jabber resources (Thanks, Nathan Walp) +- Fixed problem with Gaim crashing on non-ASCII Jabber buddy aliases (Jabber "name" attribute) chars (Thanks, Ho-seok Lee) +- Plugged memory leaks in Jabber plug-in +- Fixed problem with Jabber away status not being propagated to conference rooms for jabberd (server) v1.4.2 and above +- Chat room buddy lists are now sorted independent of case +- Added capability for protocol-specific edit buddy menu entries +- Can now remove a Jabber buddy roster item from the server entirely +- Gaim can now handle messages from Mac ICQ and Miranda ICQ (Thanks, Mark Doliner) +- Added Mozilla to browser options and changed KFM to Konqueror. +- Can now set the server and port for MSN and Napster +- MSN Internationalization (Thanks Felipe Contreras and countless, countless others) +- E-mail addresses are no longer truncated when there is a '.' at the end. * Mon May 13 2002 Rob Flynn <ro...@ma...> (0.58 release) - Bulgarian translation added (Thanks, Igel Itzo) Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.508 retrieving revision 1.509 diff -u -d -r1.508 -r1.509 --- ChangeLog 22 Jun 2002 00:40:47 -0000 1.508 +++ ChangeLog 25 Jun 2002 01:25:44 -0000 1.509 @@ -1,6 +1,6 @@ Gaim: The Pimpin' Penguin IM Clone thats good for the soul! -version 0.59 (06/07/2002): +version 0.59 (06/24/2002): * Hungarian translation added (Thanks, Sutto Zoltan) * Swedish translation updated (Thanks, Christian Rose) * Spanish translation updated (Thanks, Alex) Index: NEWS =================================================================== RCS file: /cvsroot/gaim/gaim/NEWS,v retrieving revision 1.137 retrieving revision 1.138 diff -u -d -r1.137 -r1.138 --- NEWS 7 Jun 2002 18:29:43 -0000 1.137 +++ NEWS 25 Jun 2002 01:25:44 -0000 1.138 @@ -1,8 +1,10 @@ -=[ Gaim ]=- The Pimpin' Penguin IM Client That's Good For The Soul! -0.59 (06/07/2002): +0.59 (06/24/2002): Rob: I guess Sean is busy at home or something and Jim is asleep. I'm very tired but it's time for a release. Enjoy. :) + SORRY FOR THE DELAY. :( + 0.58 (05/13/2002): Rob: Yeah, so, my computer has been bad which is why the release |
|
From: Jim S. <jse...@us...> - 2002-06-22 12:25:56
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv8647/src Modified Files: dialogs.c Log Message: Fixed "Add A Buddy" dialog focus problem. (Ref: bug i.d. [ 572375 ] [tab] funcionality is screwy in "Add...) Index: dialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v retrieving revision 1.324 retrieving revision 1.325 diff -u -d -r1.324 -r1.325 --- dialogs.c 18 Jun 2002 22:59:22 -0000 1.324 +++ dialogs.c 22 Jun 2002 12:25:53 -0000 1.325 @@ -1073,7 +1073,7 @@ a->entry = gtk_entry_new(); gtk_table_attach_defaults(GTK_TABLE(table), a->entry, 1, 2, 0, 1); - gtk_window_set_focus(GTK_WINDOW(a->window), a->entry); + gtk_widget_grab_focus(a->entry); if (buddy != NULL) gtk_entry_set_text(GTK_ENTRY(a->entry), buddy); gtk_signal_connect(GTK_OBJECT(a->entry), "activate", GTK_SIGNAL_FUNC(do_add_buddy), a); |
|
From: Jim S. <jse...@us...> - 2002-06-22 11:58:00
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv4521/src/protocols/oscar
Modified Files:
ssi.c
Log Message:
Fix bug where buddies sometimes wouldn't show up. (Thanks, Mark Doliner)
Index: ssi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ssi.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ssi.c 10 May 2002 22:32:41 -0000 1.10
+++ ssi.c 22 Jun 2002 11:57:57 -0000 1.11
@@ -125,11 +125,11 @@
if (parentgroup->gid == 0x0000) {
for (cur=*list; cur; cur=cur->next)
if ((cur->gid != 0x0000) && (cur->type == AIM_SSI_TYPE_GROUP))
- aimutil_put16(newdata+newlen*2, cur->gid);
+ newlen += aimutil_put16(newdata+newlen, cur->gid);
} else {
for (cur=*list; cur; cur=cur->next)
if ((cur->gid == parentgroup->gid) && (cur->type == AIM_SSI_TYPE_BUDDY))
- aimutil_put16(newdata+newlen*2, cur->bid);
+ newlen += aimutil_put16(newdata+newlen, cur->bid);
}
aim_addtlvtochain_raw((aim_tlvlist_t **)&(parentgroup->data), 0x00c8, newlen, newdata);
|
|
From: Christian H. <ch...@us...> - 2002-06-22 02:07:52
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv12997/src
Modified Files:
util.c
Log Message:
This should work a bit better.
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- util.c 22 Jun 2002 00:40:47 -0000 1.122
+++ util.c 22 Jun 2002 02:07:48 -0000 1.123
@@ -287,10 +287,10 @@
while (flag) {
if (badchar(*t)) {
- while (*(t - 1) == '.') {
- url_buf[t - cpy - 1] = '\0';
- t--;
- }
+ char *d;
+
+ for (d = url_buf + strlen(url_buf) - 1; *d == '.'; d--, t--)
+ *d = '\0';
cnt += g_snprintf(&text[cnt], 1024,
"<A HREF=\"mailto:%s\">%s</A>", url_buf,
|
|
From: Christian H. <ch...@us...> - 2002-06-22 00:40:50
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv25462/src
Modified Files:
util.c
Log Message:
E-mail addresses are no longer truncated when there is a '.' at the end.
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- util.c 29 May 2002 01:23:38 -0000 1.121
+++ util.c 22 Jun 2002 00:40:47 -0000 1.122
@@ -252,7 +252,7 @@
char *tmp;
int flag;
int len = 0;
- char illegal_chars[] = "!@#$%^&*()[]{}/\\<>\":;\0";
+ char illegal_chars[] = "!@#$%^&*()[]{}/|\\<>\":;\0";
url_buf[0] = 0;
if (*(c - 1) == ' ' || *(c + 1) == ' ' || rindex(illegal_chars, *(c + 1))
@@ -283,15 +283,15 @@
}
}
-
t = c + 1;
while (flag) {
if (badchar(*t)) {
- if (*(t - 1) == '.') {
- url_buf[t-c] = '\0';
+ while (*(t - 1) == '.') {
+ url_buf[t - cpy - 1] = '\0';
t--;
}
+
cnt += g_snprintf(&text[cnt], 1024,
"<A HREF=\"mailto:%s\">%s</A>", url_buf,
url_buf);
@@ -308,10 +308,7 @@
}
t++;
-
}
-
-
}
if (*c == 0)
|
|
From: Christian H. <ch...@us...> - 2002-06-22 00:40:50
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv25462 Modified Files: ChangeLog Log Message: E-mail addresses are no longer truncated when there is a '.' at the end. Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.507 retrieving revision 1.508 diff -u -d -r1.507 -r1.508 --- ChangeLog 17 Jun 2002 02:39:38 -0000 1.507 +++ ChangeLog 22 Jun 2002 00:40:47 -0000 1.508 @@ -47,6 +47,8 @@ * Can now set the server and port for MSN and Napster * MSN Internationalization (Thanks Felipe Contreras and countless, countless others) + * E-mail addresses are no longer truncated when there is a '.' at + the end. version 0.58 (05/13/2002): * Bulgarian translation added (Thanks, Igel Itzo) |
|
From: <XxW...@ao...> - 2002-06-20 15:35:44
|
confirm 275058 |
|
From: Christian H. <ch...@us...> - 2002-06-20 04:00:56
|
Update of /cvsroot/gaim/gaim/doc In directory usw-pr-cvs1:/tmp/cvs-serv12401 Modified Files: FAQ Log Message: Chip is making a commit! This makes the FAQ basically identical to the one on the website. I'll look through the old version in the gaim/docs dir soon and see if some things should be salvaged and merged into the new one and the website. Index: FAQ =================================================================== RCS file: /cvsroot/gaim/gaim/doc/FAQ,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- FAQ 30 Mar 2002 10:22:29 -0000 1.20 +++ FAQ 20 Jun 2002 04:00:52 -0000 1.21 @@ -1,371 +1,437 @@ Gaim: The Pimpin' Penguin IM Clone Thats Good For The Soul -1 The Basics - 1.1 What does 'gaim' stand for? - 1.2 Where are my log files stored? - 1.3 What are GtkHTML and GtkIMHtml, and why not just use GNOME's - GtkHTML? - 1.4 How do I load plugins/perl scripts? - 1.5 I'm not a native English speaker and I would like a translated - version of gaim. - 1.6 Why can I import my buddylist but not export it? +1 Compiling + 1.1 Is there some way I can compile just Gaim, without all of + these protocols? + 1.2 I'm getting an error: ./au2h.c BuddyArrive.h open: No such + file or directory + 1.3 I compiled Gaim, but when I restart, it did not update. + 1.4 I can't compile Gaim CVS. + 1.5 I have a question about GTK2. -2 Multiple Connections - 2.1 What do you mean by "multiple connections"? - 2.2 How do I sign on more than one account? - 2.3 How do buddy lists work for multiple connections? - 2.4 What's a PRPL? - 2.5 How do I use a different protocol? +2 Using Gaim + 2.1 How do I register for a new account? + 2.2 Why is gaim crashing when somebody sends me an IM? -3 About the Protocols (what they support, and how to do things with them) - 3.0 Introduction - 3.1 TOC - 3.2 Oscar - 3.3 Yahoo! - 3.4 IRC - 3.5 ICQ - 3.6 MSN - 3.7 Jabber - 3.8 Napster +3 Features + 3.1 How do I use MSN, Yahoo, IRC, Gadu-Gadu, Napster, or Zephyr? + 3.2 Can Gaim send files? + 3.3 When will file transfer be supported? Is it being worked on? + 3.4 How come there's no Export Buddy List? + 3.5 Will Gaim save my buddy list to the server? + 3.6 Can Gaim import my buddy list? + 3.7 Can I set a buddy icon? -4 Problems - 4.1 Sound doesn't work - 4.2 Clicking on URLs doesn't open Netscape - 4.3 I don't use Netscape - 4.4 I have a bug not described here +4 ICQ Protocol + 4.1 How do I use ICQ? + 4.2 ICQ doesn't work. -5 Programming - 5.1 I have a patch for gaim! - 5.2 I have a plugin/perl script for gaim! - 5.3 Can you teach me how to program GTK? +5 AIM/ICQ (Oscar) Protocol + 5.1 Some of my buddies are not showing up as online, why is that? + 5.2 IM Image doesn't work, why? + 5.3 I sent an IM Image, but only a blank line shows up, why? -6 Miscellaneous - 6.1 Can I talk to you on IM? - 6.2 I want to write an IM client. Will you help me? - 6.3 I have money. I need software written. Can you help? - 6.4 I have hardware here that's not being used. Can you use it? - 6.5 I would like to send you beer. - 6.6 Are you going to port this to Windows? - 6.7 Why no AOL logo? - 6.8 Why the GPL? - 6.9 What is a wagii? - 6.10 What window manager/distribution/other crap do you use? - 6.11 Is XX a good hard drive, YY a good monitor and ZZ a good CPU? - 6.12 I want to contribute to the effort. Where can I send beer to? +6 IRC Protocol + 6.1 Why am I getting disconnected when I try to connect to IRC? ---- +7 Jabber Protocol + 7.1 How do I choose which Jabber server to use? + 7.2 How do I change my Jabber resource to be other than the + default of "/GAIM"? + 7.3 How do I register a new Jabber account? -1 The Basics +8 Scripts and Plugins + 8.1 Where can I find documentation on writing plugins and + Perl scripts? + 8.2 How do I compile a plugin for Gaim? -1.1 What does 'gaim' stand for? +9 Development + 9.1 Where should I report bugs? + 9.2 Did you guys reverse engineer it? + 9.3 Will Gaim be ported to Windows 95/98/Me/2000/XP? + 9.4 Will there be a QT dock app? -It's basically the letter 'g' tacked on to the beginning of 'AIM' (which is -fairly obvious). G stands for all sorts of good things. Girls, Godzilla, GTK, -graham crackers, whatever. +10 Misc. Questions + 10.1 Does AOL's attempts at blocking Trillian affect Gaim? + 10.2 Is Gaim affected by the vulnerability found in Windows + AIM or Yahoo Instant Messenger clients? + 10.3 Can I IM you guys? + 10.4 Can I give you money/hardware/other expensive things that + can be hocked for cash what with you all being + students/full-time-workers and helping to produce this + wonderful software instead of studying/sleeping? -1.2 Where are my log files stored? -Your logs are stored in $HOME/.gaim/logs/. They had previously been stored in -$HOME/.gaim/YourScreenName/ (e.g. $HOME/.gaim/EWarmenhoven). ++-------------------------------------------------------------------------- +| 1 Compiling ++-------------------------------------------------------------------------- -1.3 What are GtkHTML and GtkIMHtml, and why not just use GNOME's GtkHTML? +1.1 Is there some way I can compile just Gaim, without all of + these protocols? -The widget Gaim had previously used to display HTML was called GtkHTML, and -was written by Mark and Jim specifically for Gaim. Over time, Rob and Eric -hacked at it (read: broke it) and it's gotten to be very fragile and fairly -buggy. + Sort of, yeah. There's actually two ways to do it. -One day Eric got pissed off at GtkHTML and decided to rewrite it, and called -it GtkIMHtml (IM to indicate that it should be used in IM clients). He made -it its own separate project, so that other IM clients (like Jabber clients) -could use it. He based it somewhat off of the old GtkHTML and GNOME's GtkHTML. + 1. Use the --with-static-prpls option to ./configure along with + --disable-plugins. This will let you choose which protocols are + compiled in with Gaim, but you will not be able to use any other + protocols or plugins. -GNOME's GtkHTML is a very powerful HTML viewer. Because of this, it isn't -well-suited for Gaim. It wouldn't be very good if we let you have IFrames in -your conversation, for example. Also, GNOME's GtkHTML depends on a lot of -GNOME libraries that we don't want to force people to use in Gaim. (There is -a strip-down version, CSCHTML, which doesn't use the GNOME libraries; but the -first objection (that it supports too many tags) still applies.) + You'll need to compile any protocols that you specified in + --with-static-prpls. Oscar and TOC are defaults. -1.4 How do I load plugins/perl scripts? + 2. Change to the directories for the protocols you + want to compile (e.g. src/protocols/jabber), and + run make from there. Then after you've compiled all + of them, change back to src/ and run make gaim. -Plugins you had loaded when you quit gaim are loaded again when you start -gaim. To load a new plugin, either click 'Plugins' on the login screen, or -select 'Plugins' from the 'Tools' menu in the buddy list. From there, you -can load and unload plugins, and configure certain ones. If you click on -the 'Load Plugin' button, it will present you with a file dialog, asking -which file you want to load; it will default to looking for a .so file in -the directory plugins get installed to, though you don't have to load a .so -file, and you don't have to load it from that directory. -When you start gaim, all the .pl files in ~/.gaim will be loaded -automatically. You can also load new scripts from the 'Perl' menu in 'Tools'. -From that menu, you can load a new script (similarly to how you loaded a -plugin above), unload all your loaded scripts, and list which scripts you have -loaded. +1.2 I'm getting an error: -1.5 I'm not a native English speaker and I would like a translated version of -gaim. + ./au2h.c BuddyArrive.h + open: No such file or directory -Gaim currently has a few translations (French, Spanish, Korean, and Simplified -Chinese); however, most of them are out of date. If you would like to update -or add a translation of gaim, email or IM either Rob or Eric and they can tell -you how to go about it. + You're not using gmake, are you? You need to be using gmake -1.6 Why can I import my buddylist but not export it? -Because you don't have to. Gaim, out of the kindness of its sweet little -heart, automagically exports your buddylist for you. You can find a copy -of your list in ~/.gaim/YOURNAME.PROTO.BLIST. For example, if you're -using AIM, and your name is JoeUser, then your buddy list could be found -in: ~/.gaim/JOEUSER.0.blist. +1.3 I compiled Gaim, but when I restart, it did not update. -2 Multiple Connections + If you previously had an rpm or a Debian package installed, you need to + remove that first. When you restart Gaim, it will give some errors about + your plugins. This is normal. Simply go into the Plugins dialog + (Tools->Plugins) and reload them. These errors will only happen once. -2.1 What do you mean by "multiple connections"? -Multiple Connections means that it's possible to connect to the AOL servers -using more than one screenname at a time. It's just a way of not having to run -three copies of gaim for each of your screennames. +1.4 I can't compile Gaim CVS. -2.2 How do I sign on more than one account? + Make sure you have gettext <= 0.10.40, autoconf 2.11 or 2.53, and + automake 1.4px. If you are still having problems, make sure that your + gettext package includes the program gettextize. If it does not, look for + another package. -The Account Editor controls all of your accounts, and lets you add, delete, -modify, and sign on/off accounts. It is accessible from the login window or -from the 'Tools' menu in the buddy list as 'Accounts'. Simply highlight the -account you want to sign on, and click the 'Sign On/Off' button. To sign on -another account, highlight it and click the 'Sign On/Off' button. There is a -column labeled 'Currently Online' to let you know if the account is online or -not. + If you have Slackware, you need to get non-slack packages for autoconf, + automake, gettext, and libtool. You also have to copy the contents of + /usr/local/share/aclocal to /usr/share/aclocal. This is due to bugs in + Slackware and the auto* packages. -2.3 How do buddy lists work for multiple connections? -"The same as they did before" is the simple answer. Each account you have will -have its own buddy list, which you can add buddies to and remove from. In the -'Edit Buddies' tab of your buddy list, you'll see the name of each of your -online accounts (unless if you only have one), with its buddy list nested -underneath it. +1.5 I have a question about GTK2. -2.4 What's a PRPL? + Don't ask untill the changelog says it works. -PRPL stands for Protocol Plugin. It's a way to dynamically add new protocols -to gaim. This allows you to use gaim as your AIM, ICQ, Yahoo, and even IRC -client, all at the same time. Loading a PRPL is just like loading any other -plugin - simply load the .so file from the plugins dialog. -2.5 How do I use a different protocol? ++-------------------------------------------------------------------------- +| 2 Using Gaim ++-------------------------------------------------------------------------- -In the Account Editor, click the 'Add' button to add a new account. Below the -password entry, you should see a menu labeled 'Protocol', with a list of the -protocols available for you to use. (If you don't see the protocol you want to -use, make sure you have the proper PRPL loaded.) Enter in your username (for -ICQ this should be your UIN) and password, and you're set. You can then sign -the account on by clicking the 'Sign On/Off' button when the account is -highlighted. +2.1 How do I register for a new account? + This depends on the protocol. -3 About the Protocols (what they support, and how to do things with them) + AIM: Go to http://aim.AOL.com/aimnew/Aim/register.adp. -3.0 Introduction + ICQ: Go to http://web.icq.com/register. -This really only describes the protocol, and how gaim is able to use it. For -a listing of what gaim has implemented with each protocol, please read the -STATUS file. + Yahoo: Go to http://edit.yahoo.com/config/eval_register. -3.1 TOC + MSN: Go to http://registernet.passport.com. -TOC is an open protocol (meaning that there's open documentation from the -people who developed it), developed by AOL, for clients to use to connect to -the AIM server. It has stopped being supported by AOL (though they do still -make changes to the TOC server). It is a strip-down and simplified version of -their "real" protocol, Oscar. + Gadu-Gadu: Use the official client to create an account. -TOC is a TCP protocol, and will only ever make one TCP connection (unless if -you accept a file transfer request). Your buddy list is stored on the server, -and gaim keeps a locally cached copy as well. When you sign on the server and -local lists are merged. + Jabber: See the question "How do I register a new Jabber account?" + below. -3.2 Oscar -Oscar is the protocol that the Windows version of AIM uses (and actually, -ICQ2000 uses it too). It's a closed protocol, meaning that in order for gaim -to use it, someone had to reverse-engineer it. For gaim, the libfaim authors -did this, and wrote a library so that we could use it. +2.2 Why is gaim crashing when somebody sends me an IM? -Oscar is a TCP protocol, but it makes several connections: the authorizor (the -initial connection, who you send your screenname/password to), the BOS (which -is the "main" connection, through which all your messages go), ChatNav (which -lets you join chat rooms), as well as one for each chat room you join. Oscar -does let you store your buddy list on the server, but libfaim hasn't added -that functionality yet. + If you're using a version older than 0.55 (or Ximian or Debian's 0.54 + package), you can be crashed remotely through an IM using one of two + strings. The solution is to upgrade to the latest version, where both + exploits are fixed. -3.3 Yahoo! + If you are using a version newer than 0.55 and gaim still crashes, please + let us know. -Yahoo! uses a closed protocol; the authors of libyahoo reverse-engineered it -and gaim uses that library. It is a TCP protocol, and makes several -connections, though I'm not entirely sure at which points. It stores your -buddy list on the server, and gaim keeps a locally cached copy. When you sign -on the server and local lists are merged. -3.4 IRC ++-------------------------------------------------------------------------- +| 3 Features ++-------------------------------------------------------------------------- -IRC is an open protocol (though I've heard that some servers deviate slightly -from it). It's a TCP protocol, and will only ever make one connection (outside -of DCC connections). +3.1 How do I use MSN, Yahoo, IRC, Gadu-Gadu, Napster, or Zephyr? -3.5 ICQ + First load the plugin. Protocol plugins come with Gaim, so just go to the + Plugins dialog (Tools->Plugins, or the Plugins button on the start + screen) and then click "Load." The protocol plugins are named + lib<protocol>.so, so MSN for instance is provided by libmsn.so. -ICQ is a closed protocol, though there have been several groups of people who -have reverse-engineered it, and there are several libraries available. Gaim -uses icqlib (which supports multiple connections, as opposed to libicq, which -does not). It is a mix of UDP and TCP: the connection to the server is UDP, -and conversations are TCP unless if they are sent through the server. This -means you'll make one UDP connection, and possibly very many TCP connections. + After you have loaded the appropriate plugin, use the Account Editor + (Tools->Accounts, or the Accounts button on the start screen) to add the + account. -3.6 MSN -MSN is a weird TCP protocol written by Microsoft. It requires multiple -connections and is a real headache :). +3.2 Can Gaim send files? -3.7 Jabber + TOC can, in a limited way. Most protocols are capable of it, but Gaim + hasn't implemented anything yet. -Jabber is an open protocol, developed by the Jabber team, and is XML-encoded. -It is a TCP protocol, and you will only ever make one TCP connection. Jabber -has a feature it calls 'transports', where the server tells you which services -it has available (such as AIM or ICQ), and you tell it which service you would -like to use. This way you can have only one connection, but be connected to -AIM and ICQ (among others) several times. Anyone who gives a damn about Open -Source, especially open messaging, should use Jabber. They have the only Open -Source IM server. -3.8 Napster +3.3 When will file transfer be supported? Is it being worked on? -Napster is, as you know, the protocol used by that wonderful little program -called napster. You know the one! It's what millions of college kids across -america are using to sastisfy their longing for music :-D. Anyways, gaim supports -it. It's kind of fiunky, though. Napster is a TCP protocol and only requires one -connection to the server. All file transfers, however, are explicitly client to -client. The plugin currently only supports one way file transfer (downloading) -from people who are _not_ firewalled. You can also send private messages to each -other, join chat rooms, browse a user's files, and search. More implementation -coming soon. + File transfer is not currently being worked on. It will be supported if + someone writes a patch using a generic user interface and without adding + any GTK+ to the protocol plugins. -4 Problems -4.1 Sound doesn't work +3.4 How come there's no Export Buddy List? -./configure should autodetect whether or not you have ESD libraries. If you -have them it will compile with them; if not it won't. If it compiles with them -you don't need to be running the ESD daemon; it'll automatically fall back to -using /dev/dsp. Make sure gaim has the proper permissions to talk to /dev/dsp -and /dev/audio though! + It would be the same as the cp command. Gaim stores your buddy list in + the $HOME/.gaim directory. You can copy it out of there. -4.2 Clicking on URLs doesn't open Netscape -Netscape either needs to be running on the current display (though gaim should -handle remote netscape windows OK), or 'netscape' needs to be in your path. +3.5 Will Gaim save my buddy list to the server? -4.3 I don't use Netscape + Gaim already does this in MSN, Yahoo, and TOC. As of version 0.53, this + support exists for Oscar as well. Improved Jabber support is being worked + on. -There's the option to manually enter which browser you'd like to use. We're -interested in supporting browsers other than Netscape though; send us some -information about how to send a URL to your browser (source is nice :) ). -4.4 I have a bug not described here +3.6 Can Gaim import my buddy list? -We have a page at http://sourceforge.net/projects/gaim/, and from there you -can report your bug. + This depends on the format of the buddy list. Gaim cannot import Licq + contact lists. Gaim has mixed success importing Windows AIM buddy lists. + If you want to try, click File->Import. This is accessible after you sign + on. -5 Programming +3.7 Can I set a buddy icon? -5.1 I have a patch for gaim! + Yes. Go to the Account Editor (Tools->Accounts from the buddy list), and + click to "Modify" the Oscar account you wish to have an icon. Type the + full path to the image you wish to use in the box labeled "Buddy Icon + File." The file must be below 4KB. It can have any dimensions, and can be + in any format. However, if you wish Windows users to see it, it must be + in a format Windows understands, such as .bmp, .gif, and .jpg. -Great! Send it over to the Patches section on our sourceforge page, -http://sourceforge.net/projects/gaim/. From there we'll take a look at it (no -promises that it'll get in, but we'll at least take a look at it). -5.2 I have a plugin/perl script for gaim! ++-------------------------------------------------------------------------- +| 4 ICQ Protocol ++-------------------------------------------------------------------------- -Great! Post it to the Patches section on our sourceforge page, and mark it as -a plugin. Then other people will be able to see it and use it. (Make sure that -you understand that your plugin is necessarily GPL'd, and you must provide -source to your plugin.) +4.1 How do I use ICQ? -5.3 Can you teach me how to program GTK? + ICQ support is part of the OSCAR protocol, labeled AIM/ICQ in gaim (see + the question "ICQ doesn't" work for why). To use it, simply put your + account number in the ScreenName box and your password in the password + box. Leave the server settings alone. -Actually, I can't. I'm a very bad teacher. I'm much too impatient. There is a -really great tutorial and API reference on the GTK website though, -http://www.gtk.org/. That's how I learned, anyway. +4.2 ICQ doesn't work. -6 Miscellaneous + Use AIM/ICQ for ICQ. AOL stopped supporting the older versions of the ICQ + protocol. The newer versions are extensions of Oscar, which is labled + AIM/ICQ in gaim. Currently, Oscar supports as much of ICQ as the ICQ + plugin used to. To use Oscar for ICQ, put your UIN in the Screenname box, + and leave the server information alone. -6.1 Can I talk to you on IM? -Sure. Our IM names can be found in the AUTHORS file. Keep in mind though that -we're busy people. We use those screennames as our main screen names, not just -to talk to gaim users. So please, don't IM us for us to answer questions about -Linux. We'd like to be able to answer everyone's questions, but we just don't -have the time. We aren't paid to hack gaim; we do have other jobs. Also, -please don't waste our time with a simple "hi" or "hello." Don't ask if -you can ask a question, just ask it. We'll usually respond. ++-------------------------------------------------------------------------- +| 5 AIM/ICQ (Oscar) Protocol ++-------------------------------------------------------------------------- -6.2 I want to write an IM client. Will you help me? +5.1 Some of my buddies are not showing up as online, why is that? -I'll give you advice, but other than that, no (unless you'd like to pay me). + AOL has set a limit for the maximum number of people you can have in your + buddy list. This number is currently 200. Gaim 0.58 gives you a warning + if you are over the limit, but if you are using something prior to 0.58, + make sure you are not over the limit (and upgrade to something more + recent!). -6.3 I have money. I need software written. Can you help? + The other possibility is that your server-stored buddy list is corrupt. + Unfortunately, Gaim 0.53 had a bug that caused it to corrupt some + entries, especially group names. While this corruption doesn't show in + gaim unless you remove the SCREENNAME.0.blist file from ~/.gaim, it does + affect how long the server thinks your list is. The best way to fix this, + is to: -Oh yes. Our email addresses are bj...@bi... (SeanEgn) and -r...@ma... (RobFlynn). +mv ~/.gaim/SCREENNAME.0.blist ~/ -6.4 I have hardware here that's not being used. Can you use it? + where SCREENNAME is your screenname, without spaces and in all caps. Then + signon, delete all groups, signoff, and signon again to verify that your + list is empty. Once it is empty, signoff, mv your SCREENNAME.0.blist file + back into ~/.gaim, then sign on again. -Most certainly. IM me or email me and I'll tell you where you can ship it to -(I might be able to scratch together shipping money even). -6.5 I would like to send you beer. +5.2 IM Image doesn't work, why? -OK. + IM Image is very sensitive, even from windows. Gaim currently only + supports sending IM Images if the sender is not behind a firewall or nat + device. Given that the windows version of AIM also has trouble in this + situation, we are not sure this is entirely fixable. A work around that + is sometimes effective is to have the reciever, not being behind a + firewall, request a direct connection, then send the immage. -6.6 Are you going to port this to Windows? -No. If you'd like to work on a port help yourself; but I really really dislike -Windows (in all its closed-source evilness). +5.3 I sent an IM Image, but only a blank line shows up, why? -6.7 Why no AOL logo? + You need to have gdk-pixbuf installed to send IM Images, if the reciever + is also using gaim, [s]he also needs to have this installed. -AOL's legal staff told us no-no. -6.8 Why the GPL? ++-------------------------------------------------------------------------- +| 6 IRC Protocol ++-------------------------------------------------------------------------- -I like the GPL. +6.1 Why am I getting disconnected when I try to connect to IRC? -6.9 What is a wagii? + You will be disconnected if the nickname you chose is already in use on + that IRC server. Try again with a different nickname. -Interesting question that you ask, there. 'Wagii' is the official celebratory -cry of gaim. Anytime you are feeling happy or excited, just remember all of -the hard work that we have done to provide you with this wonderful, free piece -of software -- as the pure, raw, emotion flows through you, maybe you too will -let out the cry of -- Wagii. -It is also the sound a Penguin Samurai makes :) ++-------------------------------------------------------------------------- +| 7 Jabber Protocol ++-------------------------------------------------------------------------- -6.10 What window manager/distribution/other crap do you use? +7.1 How do I choose which Jabber server to use? -Rob uses Red Hat, with Ximian GNOME on top. I dont really like Ximian but I like -Gnome. On top of my Ximian Gnome is Sawfish. Eric hates saw fish. I kinda of -like it even though it makes me mad. + The Jabber server name is part of your Jabber I.D., such as + som...@se.... So when entering your Jabber "screen name", the + server is specified as part of your JID. -Eric uses debian woody. He uses Enlightenment as his window manager; though -the only reason it would seem that Eric uses X at all is to support having -his 20 Eterms and 4 Mozilla windows open. Oh yeah, and gaim_applet. -6.11 Is XX a good hard drive, YY a good monitor and ZZ a good CPU? +7.2 How do I change my Jabber resource to be other than the default of + "/GAIM"? -You could send us one and we could tell you... :) + When you create your account in Gaim, simply append the desired resource + identifier to your Jabber I.D. For example: som...@se.../resource -6.12 I want to contribute to the effort. Where can I send beer to? -IM RobFlynn or email him at ro...@ma.... +7.3 How do I register a new Jabber account? + + As of version 0.52 and up: + + 1. Click "Tools->Accounts->Add" + 2. Select "Jabber" for the protocol. + 3. Fill in screen name and password as you normally would. + 4. Check the "Register with server" check-box + 5. Click "OK". + + A pop-up will tell you whether the registration succeeded or not. + + Note: You are strongly recommended to check the "Remember + password" check-box as well, as Gaim presently does no password + verification. So if you don't type in what you thought you did, + you're hosed. + + ++-------------------------------------------------------------------------- +| 8 Scripts and Plugins ++-------------------------------------------------------------------------- + +8.1 Where can I find documentation on writing plugins and Perl scripts? + + If you look in the plugins/ directory in the Gaim source, you should see + a HOWTO file for C plugins and a PERL-HOWTO for Perl scripts. + + +8.2 How do I compile a plugin for Gaim? + + To compile a plugin for Gaim, you must have Gaim's source code. There are + two ways to get this: Tarballs, and CVS. To work with a tarball, follow + the instructions below. To use CVS, follow the instructions on the CVS + page. Please note that normally, CVS is much more stable than the + tarballs! + + To work with a tarball, download the latest source code from + http://gaim.sf.net/ and untar it with the command: + + tar zxvf filename + + where filename is the file you downloaded. + + After you have a Gaim source code tree, either through tarballs or CVS: + + 1. Change to the resulting directory and run the command: + + ./configure + + This will create the necessary make files. + + 2. Move the plugin you wish to compile into the plugins/ directory in + the Gaim source code tree. + + 3. Change to the plugins/ directory. + 4. Type: + + make name.so + + where the name of the file you wish to compile is name.c. + + Note well the difference in the extensions. If you type make name.c + nstead of name.so, it won't work. + + 5. After make finishes, you can move the plugin to a place that is more + convenient. $prefix/lib/gaim is suggested. If you installed Gaim by + compiling it yourself, $prefix is /usr/local by default. Otherwise, + $prefix is /usr. + + ++-------------------------------------------------------------------------- +| 9 Development ++-------------------------------------------------------------------------- + +9.1 Where should I report bugs? + + http://gaim.sf.net/bug.php + + +9.2 Did you guys reverse engineer it? + + TOC, Jabber, MSN, Napster, and IRC are published protocols, so we didn't + have to reverse engineer those. Oscar, ICQ, and Yahoo are not published, + and were reverse engineered by other people. + + +9.3 Will Gaim be ported to Windows 95/98/Me/2000/XP? + + When GTK+ 2.0 comes out and compiles well against Cygwin, and Gaim has + been ported to it, Gaim should work. It will not happen before GTK+ 2.0 + is ported to Windows, though. + + +9.4 Will there be a QT dock app? + + Right now Gaim, is done entirely in C and GTK+, so a QT dock app is not + in planned. You can either write a patch to do this yourself, or wait + until the core and UI of Gaim are split. A QT UI will probably be + considered at that time. + + ++-------------------------------------------------------------------------- +| 10 Misc. Questions ++-------------------------------------------------------------------------- + +10.1 Does AOL's attempts at blocking Trillian affect Gaim? + + No. + + +10.2 Is Gaim affected by the vulnerability found in Windows AIM or Yahoo + Instant Messenger clients? + + No. + + +10.3 Can I IM you guys? + + Sure! Look at the Contact Information + (http://gaim.sf.net/contactinfo.php) page! + + +10.4 Can I give you money/hardware/other expensive things that can be + hocked for cash what with you all being students/full-time-workers + and helping to produce this wonderful software instead of + studying/sleeping? + + No. We're completely fool-hardy and won't accept any gratuities with no + strings attached for just being good guys. That and we'd have to share + with everyone who has submitted patches. ;-) + |
|
From: Jim S. <jse...@us...> - 2002-06-19 21:20:11
|
Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv25826/src/protocols/jabber
Modified Files:
jabber.c
Log Message:
Remainder of fix for Gaim crashing on non-ASCII buddy alias (Jabber "name"
attribute) chars. (Thanks, A Ho-seok Lee)
Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- jabber.c 15 Jun 2002 20:22:28 -0000 1.55
+++ jabber.c 19 Jun 2002 21:20:08 -0000 1.56
@@ -1710,6 +1710,9 @@
/*
* Add or remove a buddy? Change buddy's alias or group?
*/
+ if(name)
+ name = utf8_to_str(name);
+
if (BUD_SUB_TO_PEND(sub, ask) || BUD_SUBD_TO(sub, ask)) {
if ((b = find_buddy(GJ_GC(gjc), buddyname)) == NULL) {
debug_printf("adding buddy [4]: %s\n", buddyname);
@@ -1748,6 +1751,10 @@
} else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);
}
+
+ if(name)
+ g_free(name);
+
g_free(buddyname);
}
|
|
From: Sean E. <sea...@us...> - 2002-06-18 22:59:30
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21481/src
Modified Files:
dialogs.c
Log Message:
patch -r
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- dialogs.c 18 Jun 2002 00:35:23 -0000 1.323
+++ dialogs.c 18 Jun 2002 22:59:22 -0000 1.324
@@ -4288,60 +4288,23 @@
button_box_2 = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
-
gtk_widget_show(button_box_2);
gtk_widget_show(button_box);
-
- switch(dispstyle) {
- case 0:
- /* Display just pixmap */
- pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
- pixmap = gtk_pixmap_new(pm, mask);
- gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
-
- gtk_widget_show(pixmap);
-
- gdk_pixmap_unref(pm);
- gdk_bitmap_unref(mask);
- break;
-
- case 1:
- /* Display just label */
- label = gtk_label_new(text);
- gtk_widget_show(label);
- gtk_box_pack_start(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
- break;
-
- case 2:
- /* Display pixmap and label */
- {
- GtkWidget *button_box_top = gtk_vbox_new(FALSE, 0);
- GtkWidget *button_box_bottom = gtk_vbox_new(FALSE, 0);
-
- pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
- pixmap = gtk_pixmap_new(pm, mask);
- gtk_box_pack_end(GTK_BOX(button_box_top), pixmap, FALSE, FALSE, 0);
-
- gtk_widget_show(pixmap);
+ if (dispstyle == 2 || dispstyle == 0) {
+ pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
+ pixmap = gtk_pixmap_new(pm, mask);
+ gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
- gdk_pixmap_unref(pm);
- gdk_bitmap_unref(mask);
+ gtk_widget_show(pixmap);
- label = gtk_label_new(text);
- gtk_widget_show(label);
- gtk_box_pack_start(GTK_BOX(button_box_bottom), label, FALSE, FALSE, 0);
-
- gtk_box_pack_start(GTK_BOX(button_box_2), button_box_top, TRUE,
- TRUE, 0);
- gtk_box_pack_start(GTK_BOX(button_box_2), button_box_bottom, TRUE,
- TRUE, 0);
- gtk_widget_show(button_box_top);
- gtk_widget_show(button_box_bottom);
- }
- break;
+ gdk_pixmap_unref(pm);
+ gdk_bitmap_unref(mask);
+ }
- default:
- break;
+ if (dispstyle == 2 || dispstyle == 1) {
+ label = gtk_label_new(text);
+ gtk_widget_show(label);
+ gtk_box_pack_end(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
}
gtk_tooltips_set_tip(button_tips, button, text, "Gaim");
|
6 messages has been excluded from this view by a project administrator.
