changeset 7203:97f5f4b65911

[gaim-migrate @ 7772] updates that arrived in my mailbox last night committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 09 Oct 2003 11:43:26 +0000
parents 25e78bf033be
children b4b92004334c
files ChangeLog po/it.po po/sr.po po/sr@Latn.po
diffstat 4 files changed, 6614 insertions(+), 5560 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 09 05:57:12 2003 +0000
+++ b/ChangeLog	Thu Oct 09 11:43:26 2003 +0000
@@ -35,7 +35,10 @@
 	* Czech translation updated (Miloslav Trmac)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* French translation updated (Eric Boumaour)
+	* Italian translation updated (Claudio Satriano)
 	* German translation updated (Christian Weyer, Bjoern Voigt)
+	* Serbian translation updated (Danilo Segan)
+	* Serbian Latin translation updated (Danilo Segan)
 	* Swedish translation updated (Tore Lundqvist (luntor))
 
 version 0.70 (09/28/2003):
--- a/po/it.po	Thu Oct 09 05:57:12 2003 +0000
+++ b/po/it.po	Thu Oct 09 11:43:26 2003 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2003-09-24 15:57+0200\n"
-"PO-Revision-Date: 2003-07-22 23:00--100\n"
+"POT-Creation-Date: 2003-10-08 05:50-0400\n"
+"PO-Revision-Date: 2003-10-09 11:00--100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,14 +23,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:105
 msgid "Auto-Reconnect"
 msgstr "Riconnessione Automatica"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:108 plugins/autorecon.c:110
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Ti riconnette automaticamente quando sei cacciato fuori."
 
@@ -66,12 +66,12 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Assente"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1658
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1758
 msgid "Auto-login"
 msgstr "Login Automatico"
 
 #: plugins/docklet/docklet.c:117
-msgid "New Message.."
+msgid "New Message..."
 msgstr "Nuovo Messaggio..."
 
 #: plugins/docklet/docklet.c:118
@@ -82,12 +82,12 @@
 msgid "New..."
 msgstr "Nuovo..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1794 src/gtkpounce.c:461
-#: src/gtkprefs.c:1468 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3585 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:5518
-#: src/protocols/oscar/oscar.c:5912
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
+#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:868 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:6064
 msgid "Away"
 msgstr "Assente"
 
@@ -104,11 +104,11 @@
 msgstr "Trasferimento File"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1816 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1917 src/main.c:326
 msgid "Accounts"
 msgstr "Account"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2322 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:336
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -462,60 +462,71 @@
 msgstr "Controlla se ci sono nuovi messaggi di posta."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:707
+#: plugins/notify.c:572
 msgid "Notify For"
 msgstr "Notifica Per"
 
-#: plugins/notify.c:711
+#: plugins/notify.c:576
 msgid "_IM windows"
 msgstr "Finestre dei _Messaggi Immediati"
 
-#: plugins/notify.c:716
-msgid "_Chat windows"
+#: plugins/notify.c:583
+msgid "C_hat windows"
 msgstr "Finestre delle _Chat"
 
+#: plugins/notify.c:590
+msgid "_Focused windows"
+msgstr "Finestre in _primo piano"
+
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:722
+#: plugins/notify.c:598
 msgid "Notification Methods"
 msgstr "Metodi di Notifica"
 
-#: plugins/notify.c:728
+#: plugins/notify.c:605
 msgid "Prepend _string into window title:"
 msgstr "Anteponi la seguente _stringa nel titolo della finestra:"
 
-#: plugins/notify.c:739
-msgid "_Quote window title"
-msgstr "Metti il titolo della finestra tra _doppi apici"
-
-#: plugins/notify.c:744
-msgid "Set Window Manager \"_URGENT\" Hint"
-msgstr "Invia il messaggio \"_URGENTE\" al Window Manager"
-
-#: plugins/notify.c:749
+#. Count method button
+#: plugins/notify.c:624
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inserisci il c_onteggio dei nuovi messaggi nel titolo della finestra"
 
-#: plugins/notify.c:754
-msgid "_Notify even if conversation is in focus"
-msgstr "_Notifica anche se la conversazione  in primo piano"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:760
+#. Urgent method button
+#: plugins/notify.c:633
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Invia il messaggio \"_URGENTE\" al Window Manager"
+
+#. ---------- "Notification Removals" ----------
+#: plugins/notify.c:640
 msgid "Notification Removal"
 msgstr "Rimozione della Notifica"
 
-#: plugins/notify.c:764
-msgid "Remove when conversation window gains _focus"
+#. Remove on focus button
+#: plugins/notify.c:646
+msgid "Remove when conversation window _gains focus"
 msgstr "Rimuovi quando la finestra di conversazione va in _primo piano"
 
-#: plugins/notify.c:769
+#. Remove on click button
+#: plugins/notify.c:654
 msgid "Remove when conversation window _receives click"
 msgstr "Rimuovi quando si c_licca sulla finestra di conversazione"
 
-#: plugins/notify.c:774
+#. Remove on type button
+#: plugins/notify.c:662
 msgid "Remove when _typing in conversation window"
 msgstr "Rimuovi quando si scri_ve nella finestra di conversazione"
 
+#. Remove on message send button
+#: plugins/notify.c:670
+msgid "Remove when a _message gets sent"
+msgstr "Rimuovi quando un _messaggio viene inviato"
+
+#. Remove on conversation switch button
+#: plugins/notify.c:679
+msgid "Remove on conversation ta_b switch"
+msgstr "Rimuovi quando si _passa ad un'altra scheda"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -523,14 +534,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:858
+#: plugins/notify.c:762
 msgid "Message Notification"
 msgstr "Notifica Messaggi"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:861 plugins/notify.c:863
+#: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Fornisce diversi modi per notificare i messaggi non letti."
 
@@ -638,10 +649,64 @@
 "Sostituisce il testo nei messaggi in uscita secondo delle regole definite "
 "dall'utente."
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:190
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+msgid "Provides SSL support through GNUTLS."
+msgstr "Fornisce il supporto SSL attraverso GNUTLS."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:287
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Fornisce il supporto SSL attraverso NSS di Mozilla."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:91
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
-msgstr "%s  andato via"
+msgstr "%s  andato via."
 
 #: plugins/statenotify.c:36
 #, c-format
@@ -758,7 +823,7 @@
 msgstr "_Mostra la barra di scorrimento nella finestra "
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "Finestra della Lista Contatti"
 
@@ -806,8 +871,8 @@
 msgstr "_Lancia Gaim all'avvio di Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1635
-#: src/gtkprefs.c:2255
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
+#: src/gtkprefs.c:2270
 msgid "Buddy List"
 msgstr "Lista Contatti"
 
@@ -826,8 +891,8 @@
 msgstr "Mantieni la finestra della Lista Contatti in _primo piano"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
-#: src/gtkprefs.c:2256
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
+#: src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr "Conversazioni"
 
@@ -894,156 +959,232 @@
 msgid "Crazy Patch Writers"
 msgstr "I Pazzi Scrittori di Patch"
 
-#: src/about.c:136
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "Sviluppatori Ritirati"
 
-#: src/about.c:137
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "precedente maintainer della libfaim"
 
-#: src/about.c:138
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "precedente sviluppatore principale"
 
-#: src/about.c:141
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "precedente maintainer"
 
-#: src/about.c:142
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "precedente sviluppatore per Jabber"
 
-#: src/about.c:143
+#: src/about.c:151
 msgid "original author"
 msgstr "autore originale"
 
-#: src/about.c:146
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e autista designato [lazy bum]"
 
-#: src/about.c:154
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "Traduttori Attuali"
 
-#: src/about.c:155 src/about.c:184
+#: src/about.c:163 src/about.c:192
 msgid "Catalan"
 msgstr "Catalano"
 
-#: src/about.c:156 src/about.c:185
+#: src/about.c:164 src/about.c:193
 msgid "Czech"
 msgstr "Ceco"
 
-#: src/about.c:157
+#: src/about.c:165
 msgid "Danish"
 msgstr "Danese"
 
-#: src/about.c:158 src/about.c:186
+#: src/about.c:166 src/about.c:194
 msgid "German"
 msgstr "Tedesco"
 
-#: src/about.c:159 src/about.c:187
+#: src/about.c:167 src/about.c:195
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: src/about.c:160 src/about.c:188
+#: src/about.c:168 src/about.c:196
 msgid "French"
 msgstr "Francese"
 
-#: src/about.c:161
+#: src/about.c:169
 msgid "Hindi"
 msgstr ""
 
-#: src/about.c:162
+#: src/about.c:170
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: src/about.c:163 src/about.c:190
+#: src/about.c:171 src/about.c:198
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/about.c:164 src/about.c:192
+#: src/about.c:172 src/about.c:200
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/about.c:165
+#: src/about.c:173
 msgid "Dutch; Flemish"
 msgstr "Olandese; Fiammingo"
 
-#: src/about.c:166 src/about.c:194
+#: src/about.c:174 src/about.c:202
 msgid "Polish"
 msgstr "Polacco"
 
-#: src/about.c:167
+#: src/about.c:175
 msgid "Portuguese-Brazil"
 msgstr "Portoghese - Brasile"
 
-#: src/about.c:168
+#: src/about.c:176
 msgid "Portuguese-Portugal"
 msgstr "Portoghese - Portogallo"
 
-#: src/about.c:169
+#: src/about.c:177
 msgid "Romanian"
 msgstr "Rumeno"
 
-#: src/about.c:170 src/about.c:195
+#: src/about.c:178 src/about.c:203
 msgid "Russian"
 msgstr "Russo"
 
-#: src/about.c:171
+#: src/about.c:179
 msgid "Serbian"
 msgstr "Serbo"
 
-#: src/about.c:172 src/about.c:197
+#: src/about.c:180 src/about.c:205
 msgid "Swedish"
 msgstr "Svedese"
 
-#: src/about.c:173
-msgid "Simplified Chinese"
-msgstr "Cinese Semplificato"
-
-#: src/about.c:174
-msgid "Traditional Chinese"
-msgstr "Cinese Tradizionale"
-
 #: src/about.c:181
-msgid "Past Translators"
-msgstr "Traduttori Precedenti"
+msgid "Simplified Chinese"
+msgstr "Cinese Semplificato"
 
 #: src/about.c:182
-#, fuzzy
-msgid "Amharic"
-msgstr "Automatico"
-
-#: src/about.c:183
-msgid "Bulgarian"
-msgstr "Bulgaro"
+msgid "Traditional Chinese"
+msgstr "Cinese Tradizionale"
 
 #: src/about.c:189
-msgid "Hebrew"
-msgstr "Ebreo"
+msgid "Past Translators"
+msgstr "Traduttori Precedenti"
+
+#: src/about.c:190
+msgid "Amharic"
+msgstr "Amarico"
 
 #: src/about.c:191
+msgid "Bulgarian"
+msgstr "Bulgaro"
+
+#: src/about.c:197
+msgid "Hebrew"
+msgstr "Ebreo"
+
+#: src/about.c:199
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: src/about.c:193
+#: src/about.c:201
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: src/about.c:196
+#: src/about.c:204
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: src/about.c:198
+#: src/about.c:206
 msgid "Chinese"
 msgstr "Cinese"
 
-#: src/about.c:211 src/dialogs.c:3509 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:240 src/server.c:1567
+#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
+#: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Chiudi"
 
+#: src/account.c:265 src/protocols/jabber/jabber.c:918
+msgid "New passwords do not match."
+msgstr "Le nuove password non coincidono"
+
+#: src/account.c:273
+msgid "Fill out all fields completely."
+msgstr "Riempi tutti i campi in maniera completa."
+
+#: src/account.c:298
+msgid "Original password"
+msgstr "Pasword originale"
+
+#: src/account.c:304
+msgid "New password"
+msgstr "Nuova Password"
+
+#: src/account.c:310
+msgid "New password (again)"
+msgstr "Nuova Password (di nuovo)"
+
+#: src/account.c:315
+#, c-format
+msgid "Change password for %s"
+msgstr "Cambia la password per %s"
+
+#: src/account.c:321
+msgid "Please enter your current password and your new password."
+msgstr "Inserisci la tua password attuale e la nuova password."
+
+#. *
+#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#.
+#: src/account.c:324 src/connection.c:193 src/dialogs.c:1812
+#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
+#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:963
+#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
+#: src/protocols/oscar/oscar.c:2448 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
+#: src/protocols/yahoo/yahoo.c:2234 src/request.h:852
+msgid "OK"
+msgstr "OK"
+
+#. Cancel button.
+#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
+#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
+#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
+#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1612
+#: src/gtkaccount.c:2080 src/gtkblist.c:1139 src/gtkblist.c:3038
+#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
+#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:964
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2412
+#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
+#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
+#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
+#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
+#: src/protocols/yahoo/yahoo.c:2235 src/request.h:852 src/request.h:862
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/account.c:351
+#, c-format
+msgid "Change user information for %s"
+msgstr "Modifica le informazioni utente per %s"
+
+#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
+#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
+#: src/protocols/trepia/trepia.c:337
+msgid "Save"
+msgstr "Salva"
+
 #: src/away.c:208
 msgid "Gaim - Away!"
 msgstr "Gaim - Assente!"
@@ -1064,16 +1205,16 @@
 msgid "Set All Away"
 msgstr "Imposta come Assente dappertutto"
 
-#: src/blist.c:542 src/gtkprefs.c:2258
+#: src/blist.c:548 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr "Chat"
 
-#: src/blist.c:637 src/blist.c:803 src/dialogs.c:872
-#: src/protocols/jabber/jabber.c:1917 src/protocols/msn/notification.c:1135
+#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
 msgid "Buddies"
 msgstr "Contatti"
 
-#: src/blist.c:1069
+#: src/blist.c:1103
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1086,58 +1227,32 @@
 msgstr[1] ""
 "%d contatti del gruppo %s non sono stati rimossi poich non erano connessi.\n"
 
-#: src/blist.c:1078
+#: src/blist.c:1112
 msgid "Group not removed"
 msgstr "Gruppo non rimosso"
 
-#: src/blist.c:1129 src/gtkaccount.c:140 src/gtkpounce.c:307
-#: src/gtkutils.c:842 src/protocols/jabber/jabber.c:1261
+#: src/blist.c:1163 src/gtkaccount.c:159 src/gtkpounce.c:307
+#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
+#: src/protocols/jabber/buddy.c:571
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/blist.c:1439
+#: src/blist.c:1491
 msgid "Invalid Groupname"
 msgstr "Nome del Gruppo non valido"
 
-#: src/blist.c:2219
+#: src/blist.c:2135
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "Si  verificato un errore nell'analisi della tua lista contatti. Per questo "
 "motivo non  stata caricata."
 
-#: src/blist.c:2221
+#: src/blist.c:2137
 msgid "Buddy List Error"
 msgstr "Errore della Lista Contatti"
 
-#: src/browser.c:407 src/browser.c:435
-msgid ""
-"Communication with the browser failed. Please close all windows and try "
-"again."
-msgstr "Comunicazione col browser fallita. Chiudi tutte le finestre e riprova."
-
-#: src/browser.c:570 src/browser.c:590 src/browser.c:598
-msgid "Unable to open URL"
-msgstr "Impossibile aprire l'URL"
-
-#: src/browser.c:571
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-" stato scelto di impostare il browser "
-"manualmente, ma non  stato immesso nessun comando."
-
-#: src/browser.c:588
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "Il browser \"%s\" non  valido."
-
-#: src/browser.c:595
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr "Errore nell'esecuzione del \"comando\": %s"
-
-#: src/buddy_chat.c:316 src/dialogs.c:1318
+#: src/buddy_chat.c:316 src/gtkblist.c:2931
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1161,27 +1276,6 @@
 msgid "Join"
 msgstr "Entra"
 
-#. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:487
-#: src/dialogs.c:499 src/dialogs.c:512 src/dialogs.c:533 src/dialogs.c:910
-#: src/dialogs.c:1602 src/dialogs.c:1717 src/dialogs.c:1783 src/dialogs.c:2045
-#: src/dialogs.c:2194 src/dialogs.c:2866 src/dialogs.c:3033 src/dialogs.c:3075
-#: src/dialogs.c:3212 src/dialogs.c:3556 src/gtkaccount.c:1547
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4200
-#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
-#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
-#: src/protocols/msn/msn.c:221 src/protocols/oscar/oscar.c:2420
-#: src/protocols/oscar/oscar.c:2457 src/protocols/oscar/oscar.c:2492
-#: src/protocols/oscar/oscar.c:2537 src/protocols/oscar/oscar.c:5790
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
-#: src/protocols/oscar/oscar.c:6118 src/protocols/trepia/trepia.c:379
-#: src/protocols/yahoo/yahoo.c:1632 src/prpl.c:164 src/request.h:813
-#: src/request.h:823
-msgid "Cancel"
-msgstr "Annulla"
-
 #: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
@@ -1200,87 +1294,74 @@
 msgid "Enter password for %s"
 msgstr "Inserisci la password per %s"
 
-#. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1713 src/dialogs.c:1853
-#: src/dialogs.c:2044 src/dialogs.c:2190 src/dialogs.c:3032 src/dialogs.c:3074
-#: src/dialogs.c:3205 src/dialogs.c:3555 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:185
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6004 src/protocols/oscar/oscar.c:6053
-#: src/protocols/oscar/oscar.c:6117 src/protocols/yahoo/yahoo.c:1631
-#: src/request.h:813
-msgid "OK"
-msgstr "OK"
-
-#: src/conversation.c:424
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "Impossibile inviare il messaggio. Il messaggio  troppo lungo."
 
-#: src/conversation.c:432
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "Impossibile inviare il messaggio."
 
-#: src/conversation.c:1983
+#: src/conversation.c:1888
 #, c-format
 msgid "%s entered the room."
 msgstr "%s  entrato nella stanza."
 
-#: src/conversation.c:1986
+#: src/conversation.c:1891
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>]  entrato nella stanza."
 
-#: src/conversation.c:2071
+#: src/conversation.c:1976
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s  ora conosciuto come %s"
 
-#: src/conversation.c:2113
+#: src/conversation.c:2018
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha abbandonato la stanza (%s)."
 
-#: src/conversation.c:2115
+#: src/conversation.c:2020
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha abbandonato la stanza."
 
-#: src/conversation.c:2188
+#: src/conversation.c:2093
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d in pi)"
 
-#: src/conversation.c:2190
+#: src/conversation.c:2095
 #, c-format
 msgid " left the room (%s)."
 msgstr " ha abbandonato la stanza (%s)."
 
-#: src/conversation.c:2472
+#: src/conversation.c:2377
 msgid "Last created window"
 msgstr "Ultima finestra creata"
 
-#: src/conversation.c:2474
+#: src/conversation.c:2379
 msgid "New window"
 msgstr "Nuova finestra"
 
-#: src/conversation.c:2476
+#: src/conversation.c:2381
 msgid "By group"
 msgstr "Per gruppo"
 
-#: src/conversation.c:2478
+#: src/conversation.c:2383
 msgid "By account"
 msgstr "Per account"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr "Richiama l'Utente"
 
-#: src/dialogs.c:338
+#: src/dialogs.c:317
 msgid "_Warn"
 msgstr "_Richiama"
 
-#: src/dialogs.c:354
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1293,25 +1374,25 @@
 "In questo modo il livello di richiamo di %s verr aumentato e l'utente sar "
 "soggetto a un limite di rate pi severo.\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr "Richiama in maniera _anonima?"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>I richiami anonimi sono meno severi.</b>"
 
-#: src/dialogs.c:483
+#: src/dialogs.c:462
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Stai per rimuovere %s dalla tua lista contatti. Vuoi continuare?"
 
-#: src/dialogs.c:485 src/dialogs.c:486
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr "Rimuovi il Contatto"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:474
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1319,11 +1400,11 @@
 msgstr ""
 "Stai per rimuovere la chat %s dalla tua lista contatti. Vuoi continuare?"
 
-#: src/dialogs.c:497 src/dialogs.c:498
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Chat"
 msgstr "Rimuovi la Chat"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:486
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1332,11 +1413,11 @@
 "Stai per rimuovere il gruppo %s e tutti i suoi membri dalla tua lista "
 "contatti. Vuoi continuare?"
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "Rimuovi il Gruppo"
 
-#: src/dialogs.c:528
+#: src/dialogs.c:507
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1345,252 +1426,62 @@
 "Stai per rimuovere il gruppo contenente %s e altri %d contatti dalla tua "
 "lista contatti. Vuoi continuare?"
 
-#: src/dialogs.c:531 src/dialogs.c:532
+#: src/dialogs.c:510 src/dialogs.c:511
 msgid "Remove Contact"
 msgstr "Rimuovi Contatto"
 
-#: src/dialogs.c:680
+#: src/dialogs.c:659
 msgid "New Message"
 msgstr "Nuovo Messaggio"
 
-#: src/dialogs.c:698
+#: src/dialogs.c:677
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 "Inserisci il nome utente della persona alla quale\n"
 "vuoi inviare un messaggio immediato.\n"
 
-#: src/dialogs.c:714 src/dialogs.c:791
+#: src/dialogs.c:693 src/dialogs.c:770
 msgid "_Screenname:"
 msgstr "_Nome utente:"
 
-#: src/dialogs.c:729 src/dialogs.c:807 src/gtkpounce.c:408
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/dialogs.c:760
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr "Informazioni sull'Utente"
 
-#: src/dialogs.c:779
+#: src/dialogs.c:758
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr ""
 "Inserisci il nome utente della persona sulla quale vuoi informazioni.\n"
 
-#: src/dialogs.c:906
-msgid "Add Group"
-msgstr "Aggiungi un Gruppo"
-
-#: src/dialogs.c:906
-msgid "Add a new group"
-msgstr "Aggiungi un nuovo gruppo"
-
-#: src/dialogs.c:907
-msgid "Please enter the name of the group to be added."
-msgstr "Inserisci il nome del gruppo da aggiungere."
-
-#: src/dialogs.c:909 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2689 src/prpl.c:163
-msgid "Add"
-msgstr "Aggiungi"
-
-#: src/dialogs.c:935 src/protocols/yahoo/yahoo.c:1565
-msgid "Add Buddy"
-msgstr "Aggiungi un Contatto"
-
-#: src/dialogs.c:954
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Inserisci il nome utente della persona che vuoi aggiungere alla tua lista "
-"contatti. Puoi aggiungere opzionalmente un alias per il contatto. Gli alias "
-"verranno mostrati al posto del nome utente, laddove  possibile.\n"
-
-#: src/dialogs.c:973 src/gtkaccount.c:1624
-msgid "Screen Name"
-msgstr "Nome Utente"
-
-#: src/dialogs.c:986
-msgid "Alias"
-msgstr "Alias"
-
-#: src/dialogs.c:996
-msgid "Group"
-msgstr "Gruppo"
-
-#. Set up stuff for the account box
-#: src/dialogs.c:1005
-msgid "Add To"
-msgstr "Aggiungi a"
-
-#: src/dialogs.c:1325
-msgid "Add Chat"
-msgstr "Aggiungi una Chat"
-
-#: src/dialogs.c:1348
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Inserisci un alias e le informazioni appropriate per la chat che vuoi "
-"aggiungere alla tua lista contatti.\n"
-
-#: src/dialogs.c:1357
-msgid "Account:"
-msgstr "Account:"
-
-#: src/dialogs.c:1376 src/gtkaccount.c:450
-msgid "Alias:"
-msgstr "Alias:"
-
-#: src/dialogs.c:1387
-msgid "Group:"
-msgstr "Gruppo:"
-
-#: src/dialogs.c:1466
-msgid "Set Directory Info"
-msgstr "Imposta le Informazioni di Directory"
-
-#: src/dialogs.c:1474
-msgid "Directory Info"
-msgstr "Informazioni di Directory"
-
-#: src/dialogs.c:1484
-#, c-format
-msgid "Setting Dir Info for %s:"
-msgstr "Impostazione delle Informazioni di Directory per %s:"
-
-#: src/dialogs.c:1497
-msgid "Allow Web Searches To Find Your Info"
-msgstr "Consenti di trovare le tue informazioni con le ricerche sul web"
-
-#. Line 1
-#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3968
-#: src/protocols/trepia/trepia.c:299
-msgid "First Name"
-msgstr "Nome"
-
-#. Line 2
-#: src/dialogs.c:1511 src/dialogs.c:2073
-msgid "Middle Name"
-msgstr "Secondo Nome"
-
-#. Line 3
-#: src/dialogs.c:1523 src/dialogs.c:2083 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3971 src/protocols/trepia/trepia.c:306
-msgid "Last Name"
-msgstr "Cognome"
-
-#. Line 4
-#: src/dialogs.c:1534 src/dialogs.c:2093
-msgid "Maiden Name"
-msgstr "Cognome da Nubile"
-
-#. Line 5
-#: src/dialogs.c:1545 src/dialogs.c:2103 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
-#: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
-msgid "City"
-msgstr "Citt"
-
-#. Line 6
-#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4020
-#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:367
-#: src/protocols/trepia/trepia.c:471
-msgid "State"
-msgstr "Stato"
-
-#. Line 7
-#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3729
-#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
-msgid "Country"
-msgstr "Paese"
-
-#: src/dialogs.c:1598 src/dialogs.c:1779 src/dialogs.c:2854 src/dialogs.c:3518
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4199
-#: src/protocols/trepia/trepia.c:378
-msgid "Save"
-msgstr "Salva"
-
-#: src/dialogs.c:1621
-msgid "New passwords do not match."
-msgstr "Le password non coincidono."
-
-#: src/dialogs.c:1627
-msgid "Fill out all fields completely."
-msgstr "Riempi tutti i campi."
-
-#: src/dialogs.c:1656 src/dialogs.c:1665 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4418 src/protocols/oscar/oscar.c:6185
-#: src/protocols/toc/toc.c:1534
-msgid "Change Password"
-msgstr "Cambia Password"
-
-#: src/dialogs.c:1672
-#, c-format
-msgid "Changing password for %s:"
-msgstr "Cambio della password per %s:"
-
-#: src/dialogs.c:1680
-msgid "Original Password"
-msgstr "Vecchia Password"
-
-#: src/dialogs.c:1691
-msgid "New Password"
-msgstr "Nuova Password"
-
-#: src/dialogs.c:1702
-msgid "New Password (again)"
-msgstr "Nuova Password (di nuovo)"
-
-#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4404
-#: src/protocols/oscar/oscar.c:6171 src/protocols/toc/toc.c:1522
+#: src/dialogs.c:852 src/protocols/jabber/jabber.c:974
+#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
 msgid "Set User Info"
 msgstr "Imposta le Informazioni Utente"
 
-#: src/dialogs.c:1751
+#: src/dialogs.c:861
 #, c-format
 msgid "Changing info for %s:"
 msgstr "Modifica delle informazioni per %s:"
 
-#: src/dialogs.c:1839
-msgid "Below are the results of your search: "
-msgstr "Ecco i risultati della ricerca:"
-
-#: src/dialogs.c:1958
+#: src/dialogs.c:963
 msgid "Log Conversation"
 msgstr "Fai il Log della Conversazione"
 
-#: src/dialogs.c:2039 src/dialogs.c:2172
-msgid "Search for Buddy"
-msgstr "Cerca un Contatto"
-
-#: src/dialogs.c:2139
-msgid "Find Buddy By Info"
-msgstr "Caerca un contatto attraverso le Informazioni"
-
-#: src/dialogs.c:2166
-msgid "Find Buddy By Email"
-msgstr "Cerca un Contatto per Email"
-
-#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3731
-#: src/protocols/yahoo/yahoo.c:2041
-msgid "Email"
-msgstr "Email"
-
-#: src/dialogs.c:2270
+#: src/dialogs.c:1059
 msgid "Insert Link"
 msgstr "Inserisci un Collegamento"
 
-#: src/dialogs.c:2272
+#: src/dialogs.c:1061
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/dialogs.c:2291
+#: src/dialogs.c:1083
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -1598,92 +1489,93 @@
 "Inserisci l'indirizzo e la descrizione del collegamento che vuoi inserire. "
 "La descrizione  opzionale.\n"
 
-#: src/dialogs.c:2315 src/protocols/jabber/jabber.c:3723
+#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/jabber.c:594
 msgid "URL"
 msgstr "Sito Web"
 
-#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1804
-#: src/protocols/jabber/jabber.c:3737
+#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
+#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/dialogs.c:2460 src/dialogs.c:2477
+#: src/dialogs.c:1247 src/dialogs.c:1264
 msgid "Select Text Color"
 msgstr "Scegli il Colore del Testo"
 
-#: src/dialogs.c:2512 src/dialogs.c:2529
+#: src/dialogs.c:1299 src/dialogs.c:1316
 msgid "Select Background Color"
 msgstr "Scegli il Colore dello Sfondo"
 
-#: src/dialogs.c:2626 src/dialogs.c:2652
+#: src/dialogs.c:1401 src/dialogs.c:1427
 msgid "Select Font"
 msgstr "Scegli il Carattere"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:1493
 msgid "You cannot save an away message with a blank title"
 msgstr "Non puoi salvare un messaggio senza specificare il titolo"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:1495
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Specifica un titolo per il messaggio o scegli \"Utilizza\" per usarlo senza "
 "salvarlo."
 
-#: src/dialogs.c:2730
+#: src/dialogs.c:1505
 msgid "You cannot create an empty away message"
 msgstr "Non puoi creare un messaggio di assente vuoto"
 
-#: src/dialogs.c:2795 src/dialogs.c:2803
+#: src/dialogs.c:1570 src/dialogs.c:1578
 msgid "New away message"
 msgstr "Nuovo messaggio di assente"
 
-#: src/dialogs.c:2813
+#: src/dialogs.c:1588
 msgid "Away title: "
 msgstr "Titolo del messaggio:"
 
-#: src/dialogs.c:2858
+#: src/dialogs.c:1638
 msgid "Save & Use"
 msgstr "Salva e Utilizza"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:1642
 msgid "Use"
 msgstr "Utilizza"
 
 #. show everything
-#: src/dialogs.c:3011
+#: src/dialogs.c:1791
 msgid "Smile!"
 msgstr "Sorridi!"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias Chat"
 msgstr "Imposta un Alias per la Chat"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias chat"
 msgstr "Imposta un Alias per la Chat"
 
-#: src/dialogs.c:3030
+#: src/dialogs.c:1810
 msgid "Please enter an aliased name for this chat."
 msgstr "Inserisci un alias per questa chat."
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:1841
 msgid "_Screenname"
 msgstr "_Nome utente:"
 
-#: src/dialogs.c:3065 src/gtkblist.c:477 src/gtkblist.c:536
+#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/dialogs.c:3069
+#: src/dialogs.c:1850
 msgid "Alias Buddy"
 msgstr "Dai un Alias al Contatto"
 
-#: src/dialogs.c:3070
+#: src/dialogs.c:1851
 msgid "Alias buddy"
 msgstr "Scegli un Alias per il Contatto"
 
-#: src/dialogs.c:3071
+#: src/dialogs.c:1852
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
@@ -1691,66 +1583,54 @@
 "Puoi inserire qui sotto un alias per il contatto oppure rinominare questo "
 "contatto nella tua lista contatti."
 
-#: src/dialogs.c:3107 src/dialogs.c:3114
+#: src/dialogs.c:1888 src/dialogs.c:1895
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Impossibile scrivere a %s."
 
-#: src/dialogs.c:3138
+#: src/dialogs.c:1919
 msgid "Save Log File"
 msgstr "Salva il File di Log"
 
-#: src/dialogs.c:3168
+#: src/dialogs.c:1949
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Impossibile rimuovere il file %s."
 
-#: src/dialogs.c:3187
+#: src/dialogs.c:1968
 msgid "Clear Log"
 msgstr "Pulisci il Log"
 
-#: src/dialogs.c:3196
+#: src/dialogs.c:1977
 msgid "Really clear log?"
 msgstr "Vuoi davvero pulire il log?"
 
-#: src/dialogs.c:3241 src/dialogs.c:3412
+#: src/dialogs.c:2022 src/dialogs.c:2193
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "Impossibile aprire il file di log %s."
 
-#: src/dialogs.c:3389
+#: src/dialogs.c:2170
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversazioni con %s"
 
-#: src/dialogs.c:3391
+#: src/dialogs.c:2172
 msgid "System Log"
 msgstr "Log di Sistema"
 
-#: src/dialogs.c:3433
+#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:599
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs.c:3490
+#: src/dialogs.c:2271
 msgid "Log"
 msgstr "Log"
 
-#: src/dialogs.c:3513
+#: src/dialogs.c:2294
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/dialogs.c:3552
-msgid "Rename Group"
-msgstr "Rinomina il Gruppo"
-
-#: src/dialogs.c:3552
-msgid "New group name"
-msgstr "Nuovo nome del gruppo"
-
-#: src/dialogs.c:3553
-msgid "Please enter a new name for the selected group."
-msgstr "Inserire un nuovo nome per il gruppo selezionato."
-
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1866,15 +1746,15 @@
 msgid "boring default"
 msgstr "default"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1595
+#: src/gaimrc.c:1267 src/gtkblist.c:1717
 msgid "Alphabetical"
 msgstr "Alfabetico"
 
-#: src/gaimrc.c:1269
+#: src/gaimrc.c:1269 src/gtkblist.c:1718
 msgid "By status"
 msgstr "Per stato"
 
-#: src/gaimrc.c:1271
+#: src/gaimrc.c:1271 src/gtkblist.c:1719
 msgid "By log size"
 msgstr "Per dimensione del log"
 
@@ -1883,7 +1763,7 @@
 msgid "Could not open config file %s."
 msgstr "Impossibile aprire il file di configurazione %s."
 
-#: src/gtkaccount.c:268
+#: src/gtkaccount.c:287
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1894,316 +1774,364 @@
 "<b>Dimensione del file:</b> %s\n"
 "<b>Dimensione dell'immagine:</b> %dx%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3086
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3067
 msgid "Buddy Icon"
 msgstr "Icona del Contatto"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:350
+#: src/gtkaccount.c:369
 msgid "Login Options"
 msgstr "Opzioni di Login"
 
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:386
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:391
 msgid "Screenname:"
 msgstr "Nome Utente:"
 
-#: src/gtkaccount.c:445 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:464 src/main.c:310 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:454
+#: src/gtkaccount.c:469 src/gtkblist.c:2680 src/gtkblist.c:2989
+msgid "Alias:"
+msgstr "Alias:"
+
+#: src/gtkaccount.c:473
 msgid "Remember password"
 msgstr "Ricorda la Password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:527
 msgid "User Options"
 msgstr "Opzioni Utente"
 
-#: src/gtkaccount.c:521
+#: src/gtkaccount.c:540
 msgid "New mail notifications"
 msgstr "Notifica i Nuovi Messaggi di Posta"
 
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:549
 msgid "Buddy icon file:"
 msgstr "File per l'Icona del Contatto:"
 
-#: src/gtkaccount.c:539
+#: src/gtkaccount.c:558
 msgid "_Browse"
 msgstr "_Sfoglia"
 
-#: src/gtkaccount.c:545
+#: src/gtkaccount.c:564
 msgid "_Reset"
 msgstr "_Pulisci"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:606
+#: src/gtkaccount.c:625
 #, c-format
 msgid "%s Options"
 msgstr "Opzioni %s"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:727
+#: src/gtkaccount.c:746
 msgid "Use Global Proxy Settings"
 msgstr "Utilizza le Opzioni Globali del Proxy"
 
 #. No Proxy
-#: src/gtkaccount.c:734
+#: src/gtkaccount.c:753
 msgid "No Proxy"
 msgstr "Nessun Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:741
+#: src/gtkaccount.c:760
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:748
+#: src/gtkaccount.c:767
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:755
+#: src/gtkaccount.c:774
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:762 src/gtkprefs.c:1107
+#: src/gtkaccount.c:781 src/gtkprefs.c:1112
 msgid "Use Environmental Settings"
 msgstr "Utilizza le Opzioni Globali"
 
-#: src/gtkaccount.c:795
+#: src/gtkaccount.c:814
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:799
+#: src/gtkaccount.c:818
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:834
 msgid "Proxy Options"
 msgstr "Opzioni del Proxy"
 
-#: src/gtkaccount.c:831 src/gtkprefs.c:1101
+#: src/gtkaccount.c:850 src/gtkprefs.c:1106
 msgid "Proxy _type:"
 msgstr "_Tipo di proxy:"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:859
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:863
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: src/gtkaccount.c:852
+#: src/gtkaccount.c:871
 msgid "_Username:"
 msgstr "Nome _Utente:"
 
-#: src/gtkaccount.c:857
+#: src/gtkaccount.c:876
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1208
 msgid "Add Account"
 msgstr "Aggiungi un Account"
 
-#: src/gtkaccount.c:1192
+#: src/gtkaccount.c:1210
 msgid "Modify Account"
 msgstr "Modifica l'Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1216
+#: src/gtkaccount.c:1234
 msgid "Show more options"
 msgstr "Mostra pi opzioni"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1235
 msgid "Show fewer options"
 msgstr "Mostra meno opzioni"
 
 #. Register button
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:612
 msgid "Register"
 msgstr "Iscriviti"
 
-#: src/gtkaccount.c:1542
+#: src/gtkaccount.c:1607
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro di voler eliminare %s?"
 
-#: src/gtkaccount.c:1546 src/gtkrequest.c:192
+#: src/gtkaccount.c:1611 src/gtkrequest.c:206
 msgid "Delete"
 msgstr "Elimina"
 
-#. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3529
-#: src/protocols/jabber/jabber.c:3579 src/protocols/oscar/oscar.c:2847
-#: src/protocols/oscar/oscar.c:4598 src/protocols/oscar/oscar.c:5911
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:873
-#: src/protocols/zephyr/zephyr.c:883
+#: src/gtkaccount.c:1724
+msgid "Screen Name"
+msgstr "Nome Utente"
+
+#: src/gtkaccount.c:1747 src/protocols/jabber/jabber.c:866
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:1665
+#: src/gtkaccount.c:1765
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: src/gtkblist.c:450
+#: src/gtkaccount.c:2055
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+msgstr "%s%s%s%s ha aggiunto %s alla sua lista contatti%s%s%s"
+
+#: src/gtkaccount.c:2069
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"Vuoi aggiungerlo alla tua lista dei contatti?"
+
+#: src/gtkaccount.c:2073
+msgid "Gaim - Information"
+msgstr "Gaim - Informazione"
+
+#: src/gtkaccount.c:2077
+msgid "Add buddy to your list?"
+msgstr "Vuoi aggiungere il contatto alla tua lista?"
+
+#: src/gtkaccount.c:2079 src/gtkblist.c:3037 src/gtkconv.c:1137
+#: src/gtkconv.c:3016 src/gtkconv.c:4190 src/gtkrequest.c:207
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+msgid "Add"
+msgstr "Aggiungi"
+
+#: src/gtkblist.c:496
 msgid "_Get Info"
 msgstr "_Info"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:499
 msgid "_IM"
 msgstr "_Messaggio"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:501
 msgid "Add Buddy _Pounce"
 msgstr "Aggiungi un _Allarme"
 
-#: src/gtkblist.c:457
+#: src/gtkblist.c:503
 msgid "View _Log"
 msgstr "Mostra il _Log"
 
-#: src/gtkblist.c:479 src/gtkblist.c:538 src/gtkblist.c:548
+#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: src/gtkblist.c:517
+#: src/gtkblist.c:597
 msgid "Add a _Buddy"
 msgstr "_Aggiungi un Contatto"
 
-#: src/gtkblist.c:519
+#: src/gtkblist.c:599
 msgid "Add a C_hat"
 msgstr "Aggiungi una C_hat"
 
-#: src/gtkblist.c:521
+#: src/gtkblist.c:601
 msgid "_Delete Group"
 msgstr "_Elimina il Gruppo"
 
-#: src/gtkblist.c:523
+#: src/gtkblist.c:603
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: src/gtkblist.c:531
+#: src/gtkblist.c:611
 msgid "_Join"
 msgstr "_Entra"
 
-#: src/gtkblist.c:533
+#: src/gtkblist.c:613
 msgid "Auto-Join"
 msgstr "Entra Automaticamente"
 
-#: src/gtkblist.c:544 src/gtkblist.c:575
+#: src/gtkblist.c:622 src/gtkblist.c:653
 msgid "_Collapse"
 msgstr "_Minimizza"
 
-#: src/gtkblist.c:580
+#: src/gtkblist.c:658
 msgid "_Expand"
 msgstr "M_assimizza"
 
 #. Buddies menu
-#: src/gtkblist.c:1005
+#: src/gtkblist.c:1088
 msgid "/_Buddies"
 msgstr "/_Contatti"
 
-#: src/gtkblist.c:1006
+#: src/gtkblist.c:1089
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Contatti/Nuovo _Messaggio..."
 
-#: src/gtkblist.c:1007
+#: src/gtkblist.c:1090
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contatti/Entra in _Chat..."
 
-#: src/gtkblist.c:1008
+#: src/gtkblist.c:1091
 msgid "/Buddies/Get _User Info..."
 msgstr "/Contatti/_Informazioni su un Contatto..."
 
-#: src/gtkblist.c:1010
+#: src/gtkblist.c:1093
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contatti/Mostra i Contatti non in linea"
 
-#: src/gtkblist.c:1011
+#: src/gtkblist.c:1094
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contatti/Mostra i Gruppi _Vuoti"
 
-#: src/gtkblist.c:1012
+#: src/gtkblist.c:1095
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/Contatti/_Aggiungi un Contatto..."
 
-#: src/gtkblist.c:1013
+#: src/gtkblist.c:1096
 msgid "/Buddies/Add a C_hat..."
 msgstr "/Contatti/Aggiungi una C_hat"
 
-#: src/gtkblist.c:1014
+#: src/gtkblist.c:1097
 msgid "/Buddies/Add a _Group..."
 msgstr "/Contatti/Aggiungi un _Gruppo"
 
-#: src/gtkblist.c:1016
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr "/Contatti/_Disconnetti"
 
-#: src/gtkblist.c:1017
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr "/Contatti/_Esci"
 
 #. Tools
-#: src/gtkblist.c:1020
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "/_Strumenti"
 
-#: src/gtkblist.c:1021
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr "/Strumenti/_Assente"
 
-#: src/gtkblist.c:1022
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Strumenti/A_llarmi"
 
-#: src/gtkblist.c:1023
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Strumenti/Azioni di P_rotocollo"
 
-#: src/gtkblist.c:1025
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr "/Strumenti/A_ccount"
 
-#: src/gtkblist.c:1026
+#: src/gtkblist.c:1109
 msgid "/Tools/_File Transfers..."
 msgstr "/Strumenti/Trasferimento _File..."
 
-#: src/gtkblist.c:1027
+#: src/gtkblist.c:1110
 msgid "/Tools/Preferences"
 msgstr "/Strumenti/_Preferenze"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr "/Strumenti/Pr_ivacy"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr "/Strumenti/Mostra il _Log di Sistema"
 
 #. Help
-#: src/gtkblist.c:1033
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "/_Aiuto"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr "/Aiuto/_Help Online"
 
-#: src/gtkblist.c:1035
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr "/Aiuto/Finestra di _Debug"
 
-#: src/gtkblist.c:1036
+#: src/gtkblist.c:1119
 msgid "/Help/_About"
 msgstr "/Aiuto/_A proposito..."
 
-#: src/gtkblist.c:1066
+#: src/gtkblist.c:1135
+msgid "Rename Group"
+msgstr "Rinomina il Gruppo"
+
+#: src/gtkblist.c:1135
+msgid "New group name"
+msgstr "Nuovo nome del gruppo"
+
+#: src/gtkblist.c:1136
+msgid "Please enter a new name for the selected group."
+msgstr "Inserire un nuovo nome per il gruppo selezionato."
+
+#: src/gtkblist.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -2212,16 +2140,16 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:1125 src/protocols/oscar/oscar.c:5498
+#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Stato:</b> Non Connesso"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1236
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1151
+#: src/gtkblist.c:1250
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2229,7 +2157,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:1152
+#: src/gtkblist.c:1251
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2237,7 +2165,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:1153
+#: src/gtkblist.c:1252
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2245,7 +2173,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:1154
+#: src/gtkblist.c:1253
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2253,7 +2181,7 @@
 "\n"
 "<b>Inattivo:</b>"
 
-#: src/gtkblist.c:1155
+#: src/gtkblist.c:1254
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2261,7 +2189,7 @@
 "\n"
 "<b>Richiamato:</b>"
 
-#: src/gtkblist.c:1157
+#: src/gtkblist.c:1256
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2269,7 +2197,7 @@
 "\n"
 "<b>Descrizione:</b> Spettrale"
 
-#: src/gtkblist.c:1158
+#: src/gtkblist.c:1257
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2277,7 +2205,7 @@
 "\n"
 "<b>Stato</b>: Impressionante"
 
-#: src/gtkblist.c:1159
+#: src/gtkblist.c:1258
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2285,81 +2213,132 @@
 "\n"
 "<b>Stato</b>: Rockin'"
 
-#: src/gtkblist.c:1413
+#: src/gtkblist.c:1514
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inattivo (%dh%02dm) "
 
-#: src/gtkblist.c:1415
+#: src/gtkblist.c:1516
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inattivo (%dm) "
 
-#: src/gtkblist.c:1419
+#: src/gtkblist.c:1520
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Richiamato (%d%%)"
 
-#: src/gtkblist.c:1422
+#: src/gtkblist.c:1523
 msgid "Offline "
 msgstr "Non Connesso "
 
-#: src/gtkblist.c:1594 src/gtkprefs.c:841 src/gtkprefs.c:1499
+#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
 msgid "None"
 msgstr "Nessuno"
 
-#: src/gtkblist.c:1659
+#: src/gtkblist.c:1780
 msgid "/Tools/Away"
 msgstr "/Strumenti/Assente"
 
-#: src/gtkblist.c:1662
+#: src/gtkblist.c:1783
 msgid "/Tools/Buddy Pounce"
 msgstr "/Strumenti/Allarmi"
 
-#: src/gtkblist.c:1665
+#: src/gtkblist.c:1786
 msgid "/Tools/Protocol Actions"
 msgstr "/Strumenti/Azioni di Protocollo"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1748
+#: src/gtkblist.c:1870
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contatti/Mostra i Contatti non in linea"
 
-#: src/gtkblist.c:1750
+#: src/gtkblist.c:1872
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contatti/Mostra i Gruppi Vuoti"
 
-#: src/gtkblist.c:1768 src/gtkconv.c:1073
+#: src/gtkblist.c:1890 src/gtkconv.c:1096
 msgid "IM"
 msgstr "Messaggio"
 
-#: src/gtkblist.c:1774
+#: src/gtkblist.c:1896
 msgid "Send a message to the selected buddy"
 msgstr "Invia un messaggio al contatto selezionato"
 
-#: src/gtkblist.c:1777 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Info"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:1905
 msgid "Get information on the selected buddy"
 msgstr "Informazioni sul contatto selezionato"
 
-#: src/gtkblist.c:1786 src/protocols/oscar/oscar.c:3095
+#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gtkblist.c:1791
+#: src/gtkblist.c:1913
 msgid "Join a chat room"
 msgstr "Entra in una chat room"
 
-#: src/gtkblist.c:1799
+#: src/gtkblist.c:1921
 msgid "Set an away message"
 msgstr "Imposta un messaggio di assente"
 
-#: src/gtkblist.c:2846
+#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2168
+msgid "Add Buddy"
+msgstr "Aggiungi un Contatto"
+
+#: src/gtkblist.c:2645
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Inserisci il nome utente della persona che vuoi aggiungere alla tua lista "
+"contatti. Puoi aggiungere opzionalmente un alias per il contatto. Gli alias "
+"verranno mostrati al posto del nome utente, laddove  possibile.\n"
+
+#: src/gtkblist.c:2667 src/main.c:292
+msgid "Screen Name:"
+msgstr "Nome Utente:"
+
+#: src/gtkblist.c:2693 src/gtkblist.c:3000
+msgid "Group:"
+msgstr "Gruppo:"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:2702 src/gtkblist.c:2971
+msgid "Account:"
+msgstr "Account:"
+
+#: src/gtkblist.c:2938
+msgid "Add Chat"
+msgstr "Aggiungi una Chat"
+
+#: src/gtkblist.c:2961
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Inserisci un alias e le informazioni appropriate per la chat che vuoi "
+"aggiungere alla tua lista contatti.\n"
+
+#: src/gtkblist.c:3034
+msgid "Add Group"
+msgstr "Aggiungi un Gruppo"
+
+#: src/gtkblist.c:3034
+msgid "Add a new group"
+msgstr "Aggiungi un nuovo gruppo"
+
+#: src/gtkblist.c:3035
+msgid "Please enter the name of the group to be added."
+msgstr "Inserisci il nome del gruppo da aggiungere."
+
+#: src/gtkblist.c:3547
 msgid "No actions available"
 msgstr "Nessuna azione disponibile"
 
@@ -2388,24 +2367,29 @@
 msgid "Reason Unknown."
 msgstr "Motivo Sconosciuto."
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:185
 msgid "That file already exists"
 msgstr "Il file esiste gi."
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "Vuoi sovrascriverlo?"
 
-#: src/gtkconv.c:280
+#: src/gtkconv.c:241
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Impossibile salvare l'immagine: %s\n"
+
+#: src/gtkconv.c:303
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Inserisci un'Immagine"
 
-#: src/gtkconv.c:584
+#: src/gtkconv.c:607
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invita un Contatto nella Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:635
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2413,324 +2397,324 @@
 "Inserisci il nome del contatto che vuoi invitare, insieme a un messaggio di "
 "invito (opzionale)."
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:656
 msgid "_Buddy:"
 msgstr "_Contatto:"
 
-#: src/gtkconv.c:653
+#: src/gtkconv.c:676
 msgid "_Message:"
 msgstr "_Messaggio:"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1104
 msgid "Un-Ignore"
 msgstr "Annulla Ignora"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:773
+#: src/gtkconv.c:1106 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "Ignora"
 
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2978
+#: src/gtkconv.c:1115 src/gtkconv.c:3039
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3491
+#: src/gtkconv.c:1124
 msgid "Get Away Msg"
 msgstr "Messaggio di Assente"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2961 src/gtkconv.c:4123
-#: src/gtkrequest.c:194
+#: src/gtkconv.c:1135 src/gtkconv.c:3022 src/gtkconv.c:4175
+#: src/gtkrequest.c:208
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/gtkconv.c:2187
+#: src/gtkconv.c:2247
 msgid "User is typing..."
 msgstr "L'utente sta scrivendo..."
 
-#: src/gtkconv.c:2195
+#: src/gtkconv.c:2255
 msgid "User has typed something and paused"
 msgstr "L'utente ha scritto qualcosa ed ora  in pausa"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2297
+#: src/gtkconv.c:2358
 msgid "_Send As"
 msgstr "_Invia Come"
 
-#: src/gtkconv.c:2757
+#: src/gtkconv.c:2818
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Salva la Conversazione"
 
 #. Conversation menu
-#: src/gtkconv.c:2774
+#: src/gtkconv.c:2835
 msgid "/_Conversation"
 msgstr "/_Conversazione"
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2837
 msgid "/Conversation/_Save As..."
 msgstr "/Conversazione/_Salva con nome..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2839
 msgid "/Conversation/View _Log..."
 msgstr "/Conversazione/Mostra il _Log..."
 
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversazione/Aggiungi un _Allarme..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2845
 msgid "/Conversation/A_lias..."
 msgstr "/Conversazione/A_lias..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2847
 msgid "/Conversation/_Get Info..."
 msgstr "/Conversazione/_Info..."
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:2849
 msgid "/Conversation/In_vite..."
 msgstr "/Conversazione/In_vita..."
 
-#: src/gtkconv.c:2793
+#: src/gtkconv.c:2854
 msgid "/Conversation/Insert _URL..."
 msgstr "/Conversazione/Inserisci _URL..."
 
-#: src/gtkconv.c:2795
+#: src/gtkconv.c:2856
 msgid "/Conversation/Insert _Image..."
 msgstr "/Conversazione/Inserisci un'_Immagine..."
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2861
 msgid "/Conversation/_Warn..."
 msgstr "/Conversazione/_Richiama..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2863
 msgid "/Conversation/_Block..."
 msgstr "/Conversazione/_Blocca..."
 
-#: src/gtkconv.c:2804
+#: src/gtkconv.c:2865
 msgid "/Conversation/_Add..."
 msgstr "/Conversazione/_Aggiungi..."
 
-#: src/gtkconv.c:2806
+#: src/gtkconv.c:2867
 msgid "/Conversation/_Remove..."
 msgstr "/Conversazione/_Rimuovi..."
 
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2872
 msgid "/Conversation/_Close"
 msgstr "/Conversazione/_Chiudi"
 
 #. Options
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2876
 msgid "/_Options"
 msgstr "/_Opzioni"
 
-#: src/gtkconv.c:2816
+#: src/gtkconv.c:2877
 msgid "/Options/Enable _Logging"
 msgstr "/Opzioni/Abilita il _Log"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2878
 msgid "/Options/Enable _Sounds"
 msgstr "/Opzioni/Abilita i _Suoni"
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2918
 msgid "/Conversation/View Log..."
 msgstr "/Conversazione/Mostra il Log..."
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2923
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversazione/Aggiungi un Allarme..."
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2927
 msgid "/Conversation/Alias..."
 msgstr "/Conversazione/Alias..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2931
 msgid "/Conversation/Get Info..."
 msgstr "/Conversazione/Info..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2935
 msgid "/Conversation/Invite..."
 msgstr "/Conversazione/Invita..."
 
-#: src/gtkconv.c:2880
+#: src/gtkconv.c:2941
 msgid "/Conversation/Insert URL..."
 msgstr "/Conversazione/Inserisci URL..."
 
-#: src/gtkconv.c:2884
+#: src/gtkconv.c:2945
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversazione/Inserisci un'Immagine..."
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:2951
 msgid "/Conversation/Warn..."
 msgstr "/Conversazione/Richiama..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2955
 msgid "/Conversation/Block..."
 msgstr "/Conversazione/Blocca..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2959
 msgid "/Conversation/Add..."
 msgstr "/Conversazione/Aggiungi..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2963
 msgid "/Conversation/Remove..."
 msgstr "/Conversazione/Rimuovi..."
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2969
 msgid "/Options/Enable Logging"
 msgstr "/Opzioni/Abilita il Log"
 
-#: src/gtkconv.c:2911
+#: src/gtkconv.c:2972
 msgid "/Options/Enable Sounds"
 msgstr "/Opzioni/Abilita i Suoni"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2935 src/gtkconv.c:2937 src/gtkconv.c:3035 src/gtkconv.c:3037
-#: src/gtkconv.c:5918
+#: src/gtkconv.c:2996 src/gtkconv.c:2998 src/gtkconv.c:3096 src/gtkconv.c:3098
+#: src/gtkconv.c:5957
 msgid "Send"
 msgstr "Invia"
 
-#: src/gtkconv.c:2958 src/gtkconv.c:4141
+#: src/gtkconv.c:3019 src/gtkconv.c:4193
 msgid "Add the user to your buddy list"
 msgstr "Aggiungi l'utente alla tua lista dei contatti"
 
-#: src/gtkconv.c:2964 src/gtkconv.c:4126
+#: src/gtkconv.c:3025 src/gtkconv.c:4178
 msgid "Remove the user from your buddy list"
 msgstr "Rimuovi l'utente dalla lista dei contatti"
 
 #. Warn button
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:3032
 msgid "Warn"
 msgstr "Richiama"
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:3036
 msgid "Warn the user"
 msgstr "Richiama l'utente"
 
-#: src/gtkconv.c:2982 src/gtkconv.c:3417
+#: src/gtkconv.c:3043 src/gtkconv.c:3478
 msgid "Get the user's information"
 msgstr "Informazioni sull'utente"
 
 #. Block button
-#: src/gtkconv.c:2985 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3046 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Blocca"
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:3050
 msgid "Block the user"
 msgstr "Blocca l'utente"
 
 #. Invite
-#: src/gtkconv.c:3047 src/gtkconv.c:5921
+#: src/gtkconv.c:3108 src/gtkconv.c:5960
 msgid "Invite"
 msgstr "Invita"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3111
 msgid "Invite a user"
 msgstr "Invita un utente"
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3150
 msgid "Bold"
 msgstr "Grassetto"
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3161
 msgid "Italic"
 msgstr "Corsivo"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3172
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3188
 msgid "Larger font size"
 msgstr "Aumenta la dimensione del carattere"
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3200
 msgid "Normal font size"
 msgstr "Dimensione normale del carattere"
 
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3212
 msgid "Smaller font size"
 msgstr "Diminuisci la dimensione del carattere"
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3229
 msgid "Font Face"
 msgstr "Tipo di carattere"
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3241
 msgid "Foreground font color"
 msgstr "Colore del carattere"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3253
 msgid "Background color"
 msgstr "Colore dello sfondo"
 
-#: src/gtkconv.c:3207
+#: src/gtkconv.c:3268
 msgid "Insert image"
 msgstr "Inserisci un'immagine"
 
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3279
 msgid "Insert link"
 msgstr "Inserisci un collegamento"
 
-#: src/gtkconv.c:3229
+#: src/gtkconv.c:3290
 msgid "Insert smiley"
 msgstr "Inserisci uno smiley"
 
-#: src/gtkconv.c:3286
+#: src/gtkconv.c:3347
 msgid "Topic:"
 msgstr "Argomento:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3337
+#: src/gtkconv.c:3398
 msgid "0 people in room"
 msgstr "0 persone nella stanza"
 
-#: src/gtkconv.c:3394
+#: src/gtkconv.c:3455
 msgid "IM the user"
 msgstr "Invia un messaggio immediato all'utente"
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3467
 msgid "Ignore the user"
 msgstr "Ignora l'utente"
 
-#: src/gtkconv.c:3908 src/server.c:1393
+#: src/gtkconv.c:3961 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- Nuova Conversazione %s ----</H3><BR>\n"
 
-#: src/gtkconv.c:3912 src/server.c:1396
+#: src/gtkconv.c:3965 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- Nuova Conversazione %s ----\n"
 
-#: src/gtkconv.c:3945
+#: src/gtkconv.c:3998
 msgid "Close conversation"
 msgstr "Chiudi la conversazione"
 
-#: src/gtkconv.c:4619 src/gtkconv.c:4651 src/gtkconv.c:4772 src/gtkconv.c:4839
+#: src/gtkconv.c:4682 src/gtkconv.c:4714 src/gtkconv.c:4835 src/gtkconv.c:4902
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona nella stanza"
 msgstr[1] "%d persone nella stanza"
 
-#: src/gtkconv.c:5188
+#: src/gtkconv.c:5224
 msgid "Disable Animation"
 msgstr "Disabilita le Animazioni"
 
-#: src/gtkconv.c:5197
+#: src/gtkconv.c:5233
 msgid "Enable Animation"
 msgstr "Abilita le Animazioni"
 
-#: src/gtkconv.c:5204
+#: src/gtkconv.c:5240
 msgid "Hide Icon"
 msgstr "Nascondi l'Icona"
 
-#: src/gtkconv.c:5210
+#: src/gtkconv.c:5246
 msgid "Save Icon As..."
 msgstr "Salva l'Icona con nome..."
 
-#: src/gtkconv.c:5688 src/gtkconv.c:5691
+#: src/gtkconv.c:5727 src/gtkconv.c:5730
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversazione/Chiudi"
 
@@ -2838,7 +2822,7 @@
 msgid "Gaim - Open..."
 msgstr "Gaim - Apri..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2030
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
 msgid "Gaim - Save As..."
 msgstr "Gaim - Salva con Nome..."
 
@@ -2847,15 +2831,19 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vuole inviarti %s (%s)"
 
-#: src/gtkimhtml.c:529
+#: src/gtkimhtml.c:535
+msgid "_Copy E-Mail Address"
+msgstr "_Copia l'indirizzo email"
+
+#: src/gtkimhtml.c:547
 msgid "_Copy Link Location"
 msgstr "_Copia l'indirizzo del collegamento"
 
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:557
 msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
-#: src/gtkimhtml.c:1652
+#: src/gtkimhtml.c:1639
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2863,37 +2851,37 @@
 "Gaim non  in grado di stabilire il formato dell'immagine sulla base "
 "dell'estensione. Il formato  impostato di default come PNG."
 
-#: src/gtkimhtml.c:1660
+#: src/gtkimhtml.c:1647
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Errore di salvataggio dell'immagine: %s"
 
-#: src/gtkimhtml.c:1669
+#: src/gtkimhtml.c:1656
 msgid "Save Image"
 msgstr "Salva l'Immagine"
 
-#: src/gtkimhtml.c:1691
+#: src/gtkimhtml.c:1679
 msgid "_Save Image..."
 msgstr "_Salva l'Immagine..."
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ha %d nuovo messaggio"
 msgstr[1] "%s ha %d nuovi messaggi"
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Da:</span> %s\n"
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Oggetto:</span> %s\n"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2904,7 +2892,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2915,6 +2903,27 @@
 "\n"
 "%s"
 
+#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
+msgid "Unable to open URL"
+msgstr "Impossibile aprire l'URL"
+
+#: src/gtknotify.c:413
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+" stato scelto di impostare il browser manualmente, ma non  stato immesso "
+"nessun comando."
+
+#: src/gtknotify.c:430
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr "Il browser \"%s\" non  valido."
+
+#: src/gtknotify.c:437
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "Errore nell'esecuzione del \"comando\": %s"
+
 #: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "Scegli un file"
@@ -2946,7 +2955,7 @@
 msgid "Pounce When"
 msgstr "Controlla i seguenti eventi"
 
-#: src/gtkpounce.c:457 src/main.c:331
+#: src/gtkpounce.c:457 src/main.c:342
 msgid "Sign on"
 msgstr "Connessione"
 
@@ -2958,8 +2967,8 @@
 msgid "Return from away"
 msgstr "Ritorna dall'assenza"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1496 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1427
+#: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2030
 msgid "Idle"
 msgstr "Inattivo"
 
@@ -3004,7 +3013,7 @@
 msgid "Browse"
 msgstr "Sfoglia"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2082
+#: src/gtkpounce.c:518 src/gtkprefs.c:2087
 msgid "Test"
 msgstr "Test"
 
@@ -3056,15 +3065,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento sconosciuto. Per piacere riporta questo errore!"
 
-#: src/gtkprefs.c:377
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr "Opzioni dell'Interfaccia"
 
-#: src/gtkprefs.c:379
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Mostra i nickname remoti se non  impostato nessun alias"
 
-#: src/gtkprefs.c:560
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3072,155 +3081,154 @@
 "Scegli un tema per gli smilely dalla seguente lista. Possono essere "
 "installati nuovi temi trascinandoli sulla lista dei temi."
 
-#: src/gtkprefs.c:593
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "Icona"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "Stile"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "_Grassetto"
 
-#: src/gtkprefs.c:670
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "_Corsivo"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "_Sottolineato"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "_Barrato"
 
-#: src/gtkprefs.c:677
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "Carattere"
 
-#: src/gtkprefs.c:680
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "Utilizza un carattere _personalizzato"
 
-#: src/gtkprefs.c:697
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "Utilizza una _dimensione personalizzata"
 
-#: src/gtkprefs.c:710
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "Colore"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "Colore del _testo"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "Colore dello s_fondo"
 
-#: src/gtkprefs.c:761 src/gtkprefs.c:998 src/gtkprefs.c:1051
+#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
 msgid "Display"
 msgstr "Visualizzazione"
 
-#: src/gtkprefs.c:762
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "Mostra gli _smileys grafici"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "Mostra l'_orario nei messaggi"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "Mostra gli _URL come collegamenti"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "_Evidenzia le parole con errori di ortografia"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "Ignora i _colori"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "Ignora i _tipi di carattere"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "Ignora la _dimensione dei caratteri"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "Invia un messaggio"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "_Invio spedisce un messaggio"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Invio spedisce un messaggio"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:798
 msgid "Window Closing"
 msgstr "Chiusura della Finestra"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:799
 msgid "_Escape closes window"
 msgstr "E_sc chiude la finestra"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "Inserimenti"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:803
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Control-{B/I/U/S} inserisce un tag _HTML"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(numero) inserisce uno _smiley"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "Ordinamento della Lista Contatti"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "Ordinamento:"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "Toolbar della Lista Contatti"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "Show _buttons as:"
 msgstr "Mostra i _pulsanti come:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
 msgid "Pictures"
 msgstr "Immagini"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "Text"
 msgstr "Testo"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "Pictures and text"
 msgstr "Immagini e testo"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:986 src/gtkprefs.c:1042
+#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
 msgid "_Raise window on events"
 msgstr "_Solleva la finestra ad ogni evento"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "Visualizzazione Gruppi"
 
-#. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
 #: src/gtkprefs.c:850
 msgid "Show _numbers in groups"
 msgstr "Mostra i _numeri nei gruppi"
@@ -3229,7 +3237,7 @@
 msgid "Buddy Display"
 msgstr "Lista Contatti"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:993
+#: src/gtkprefs.c:854 src/gtkprefs.c:998
 msgid "Show buddy _icons"
 msgstr "Mostra le _icone dei contatti"
 
@@ -3245,190 +3253,189 @@
 msgid "Dim i_dle buddies"
 msgstr "Contatti inattivi in _grigio"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr "_Posizione:"
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:905
 msgid "Send _URLs as Links"
 msgstr "Invia gli _URL come collegamenti"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:908
 msgid "Tab Options"
 msgstr "Opzioni Schede"
 
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:910
 msgid "_Tab Placement:"
 msgstr "_Posizione delle linguette:"
 
+#: src/gtkprefs.c:912
+msgid "Top"
+msgstr "In alto"
+
 #: src/gtkprefs.c:913
-msgid "Top"
-msgstr "In alto"
+msgid "Bottom"
+msgstr "In basso"
 
 #: src/gtkprefs.c:914
-msgid "Bottom"
-msgstr "In basso"
+msgid "Left"
+msgstr "A sinistra"
 
 #: src/gtkprefs.c:915
-msgid "Left"
-msgstr "A sinistra"
-
-#: src/gtkprefs.c:916
 msgid "Right"
 msgstr "A destra"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:921
 msgid "Show IMs and chats in _tabbed windows"
 msgstr ""
 "Mostra i messaggi immediati e le chat come schede\n"
 "nella _stessa finestra"
 
-#. XXX: grey this out when the above is unchecked
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:924
 msgid "Show IMs and chats in _same tabbed window"
 msgstr ""
 "Mostra i messaggi immediati e le chat come schede\n"
 "nella _stessa finestra"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:934
 msgid "Show _close button on tabs"
 msgstr "Mostra il pulsante di _chiusura sulle linguette"
 
-#: src/gtkprefs.c:940
+#: src/gtkprefs.c:945
 msgid "Show status _icons on tabs"
 msgstr "Mostra le _icone di stato sulle linguette"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1023
+#: src/gtkprefs.c:972 src/gtkprefs.c:1028
 msgid "Window"
 msgstr "Finestra"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "New window _width:"
 msgstr "_Larghezza della nuova finestra:"
 
-#: src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:985 src/gtkprefs.c:1041
 msgid "New window _height:"
 msgstr "_Altezza della nuova finestra:"
 
-#: src/gtkprefs.c:983 src/gtkprefs.c:1039
+#: src/gtkprefs.c:988 src/gtkprefs.c:1044
 msgid "_Entry field height:"
 msgstr "Altezza dell'area di _immissione testo:"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:993
 msgid "Hide window on _send"
 msgstr "Nascondi la finestra all'_invio"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:997
 msgid "Buddy Icons"
 msgstr "Icone dei Contatti"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:1000
 msgid "Enable buddy icon a_nimation"
 msgstr "Abilita l'a_nimazione delle icone dei contatti"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1004
 msgid "Show _logins in window"
 msgstr "Mostra i _login nella finestra"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1006
 msgid "Show a_liases in tabs/titles"
 msgstr "Mostra gli _alias nei titoli delle schede e delle finestre"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1009
 msgid "Typing Notification"
 msgstr "Scrittura in Corso"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1010
 msgid "Notify buddies that you are _typing to them"
 msgstr "Segnala ai contatti che stai _scrivendo"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1050
 msgid "Tab Completion"
 msgstr "Completamento delle Parole"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1051
 msgid "_Tab-complete nicks"
 msgstr "Completa con _Tab i nickname"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1053
 msgid "_Old-style tab completion"
 msgstr "Completamento con tab _vecchio stile"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1057
 msgid "_Show people joining in window"
 msgstr "M_ostra nella finestra le persone che entrano"
 
-#: src/gtkprefs.c:1054
+#: src/gtkprefs.c:1059
 msgid "_Show people leaving in window"
 msgstr "_Mostra nella finestra le persone che escono"
 
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1061
 msgid "Co_lorize screennames"
 msgstr "Co_lora i nomi utente"
 
-#: src/gtkprefs.c:1100
+#: src/gtkprefs.c:1105
 msgid "Proxy Type"
 msgstr "Tipo di Proxy"
 
-#: src/gtkprefs.c:1103
+#: src/gtkprefs.c:1108
 msgid "No proxy"
 msgstr "Nessun Proxy"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1115
 msgid "Proxy Server"
 msgstr "Server Proxy"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1136
 msgid "_Host"
 msgstr "_Host"
 
-#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4528 src/protocols/msn/msn.c:1529
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
+#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
+#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1616
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
 msgid "Port"
 msgstr "Porta"
 
-#: src/gtkprefs.c:1166
+#: src/gtkprefs.c:1171
 msgid "_User"
 msgstr "_Utente"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1188
 msgid "Pa_ssword"
 msgstr "Pa_ssword"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1225
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1226
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1227
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1223
+#: src/gtkprefs.c:1228
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1229
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1233
+#: src/gtkprefs.c:1238
 msgid "Manual"
 msgstr "Manuale"
 
-#: src/gtkprefs.c:1274
+#: src/gtkprefs.c:1279
 msgid "Browser Selection"
 msgstr "Scelta del Browser"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1283
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1293
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3437,88 +3444,88 @@
 "Scelta _manuale:\n"
 "(%s per inserire un URL)"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1314
 msgid "Browser Options"
 msgstr "Opzioni del Browser"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1315
 msgid "Open new _window by default"
 msgstr "Apri di default una nuova _finestra"
 
-#: src/gtkprefs.c:1325
-msgid "Message Logs"
-msgstr "Log dei Messaggi"
-
-#: src/gtkprefs.c:1326
-msgid "_Log all instant messages"
-msgstr "Esegui il _log di tutti i messaggi immediati"
-
-#: src/gtkprefs.c:1328
-msgid "Log all c_hats"
-msgstr "Esegui il log di tutte le c_hat"
-
 #: src/gtkprefs.c:1330
-msgid "Strip _HTML from logs"
-msgstr "Elimina i tag HT_ML dai log"
+msgid "Message Logs"
+msgstr "Log dei Messaggi"
+
+#: src/gtkprefs.c:1331
+msgid "_Log all instant messages"
+msgstr "Esegui il _log di tutti i messaggi immediati"
 
 #: src/gtkprefs.c:1333
+msgid "Log all c_hats"
+msgstr "Esegui il log di tutte le c_hat"
+
+#: src/gtkprefs.c:1335
+msgid "Strip _HTML from logs"
+msgstr "Elimina i tag HT_ML dai log"
+
+#: src/gtkprefs.c:1338
 msgid "System Logs"
 msgstr "Log di Sistema"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1339
 msgid "Log when buddies _sign on/sign off"
 msgstr "Esegui il log quando un contatto si _connette/disconnette"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1341
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Esegui il log quando un contatto diventa _inattivo/attivo"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1343
 msgid "Log when buddies go away/come _back"
 msgstr "Esegui il log quando un contatto diventa assente/_ritorna"
 
-#: src/gtkprefs.c:1340
+#: src/gtkprefs.c:1345
 msgid "Log your _own signons/idleness/awayness"
 msgstr ""
 "Esegui il log dei _tuoi collegamenti/stati di inattivit/stati di assente"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1347
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Scrivi un file di log _individuale per ogni contatto che si collega"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1390
 msgid "Sound Options"
 msgstr "Opzioni Suono"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1391
 msgid "_No sounds when you log in"
 msgstr "_Nessun suono quando ti connetti"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1393
 msgid "_Sounds while away"
 msgstr "_Esegui i suoni quando sei assente"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1397
 msgid "Sound Method"
 msgstr "Metodo del Suono"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1398
 msgid "_Method:"
 msgstr "_Metodo:"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1400
 msgid "Console beep"
 msgstr "Beep di console"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1402
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/gtkprefs.c:1404
+#: src/gtkprefs.c:1409
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1419
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3527,67 +3534,67 @@
 "C_omando da eseguire:\n"
 "(%s per il nome del file)"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1474
 msgid "_Sending messages removes away status"
 msgstr "L'_invio di un messaggio rimuove lo stato di assente"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1476
 msgid "_Queue new messages when away"
 msgstr "Metti in _coda i nuovi messaggi quando sei assente"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1479
 msgid "Auto-response"
 msgstr "Risposta automatica"
 
-#: src/gtkprefs.c:1477
+#: src/gtkprefs.c:1482
 msgid "Seconds before _resending:"
 msgstr "Secondi prima di spedire _nuovamente:"
 
-#: src/gtkprefs.c:1480
+#: src/gtkprefs.c:1485
 msgid "_Send auto-response"
 msgstr "Invia una risposta _automatica"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1487
 msgid "_Only send auto-response when idle"
 msgstr "Invia una risposta automatica _solamente se inattivo"
 
-#: src/gtkprefs.c:1484
-msgid "Send auto-response in active conversations"
+#: src/gtkprefs.c:1489
+msgid "Send auto-response in _active conversations"
 msgstr "Invia _risposte automatiche nelle conversazioni attive"
 
-#: src/gtkprefs.c:1497
+#: src/gtkprefs.c:1499
 msgid "Idle _time reporting:"
 msgstr "Riporta il _tempo di inattivit sulla base:"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1502
 msgid "Gaim usage"
 msgstr "dell'utilizzo di Gaim"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1505
 msgid "X usage"
 msgstr "dell'utilizzo di X"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1507
 msgid "Windows usage"
 msgstr "dell'utilizzo di Windows"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1515
 msgid "Auto-away"
 msgstr "Assente Automatico"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1516
 msgid "Set away _when idle"
 msgstr "Imposta come assente _quando sei inattivo"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1518
 msgid "_Minutes before setting away:"
 msgstr "_Minuti prima di impostare come assente:"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1525
 msgid "Away m_essage:"
 msgstr "M_essaggio di assente:"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1587
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3602,7 +3609,7 @@
 "<span weight=\"bold\">Sito web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome file:</span>\t%s"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1592
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3617,97 +3624,97 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Nome file:</span>  %s"
 
-#: src/gtkprefs.c:1768
+#: src/gtkprefs.c:1773
 msgid "Load"
 msgstr "Carica"
 
-#: src/gtkprefs.c:1775 src/protocols/msn/msn.c:1284
-#: src/protocols/trepia/trepia.c:433
+#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
+#: src/protocols/msn/msn.c:1302 src/protocols/trepia/trepia.c:392
 msgid "Name"
 msgstr "Nome"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:1827
 msgid "Details"
 msgstr "Dettagli"
 
-#: src/gtkprefs.c:1949
+#: src/gtkprefs.c:1954
 msgid "Sound Selection"
 msgstr "Selezione Suoni"
 
-#: src/gtkprefs.c:2056
+#: src/gtkprefs.c:2061
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/gtkprefs.c:2063
+#: src/gtkprefs.c:2068
 msgid "Event"
 msgstr "Evento"
 
-#: src/gtkprefs.c:2086
+#: src/gtkprefs.c:2091
 msgid "Reset"
 msgstr "Pulisci"
 
-#: src/gtkprefs.c:2090
+#: src/gtkprefs.c:2095
 msgid "Choose..."
 msgstr "Scegli..."
 
-#: src/gtkprefs.c:2214
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: src/gtkprefs.c:2250
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr "Temi degli Smiley"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr "Testo del Messaggio"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "Scorciatoie"
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr "Messaggi Immediati"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2279
 msgid "Logging"
 msgstr "Log"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2280
 msgid "Sounds"
 msgstr "Suoni"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr "Eventi Sonori"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr "Assente / Inattivo"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr "Messaggi di Assente"
 
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "Plugin"
 
@@ -3795,15 +3802,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "S"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:204
 msgid "Apply"
 msgstr "Applica"
 
@@ -3869,61 +3876,14 @@
 "Impossibile riprodurre il suono poich il comando per il suono scelto non "
 "pu essere eseguito: %s"
 
-#: src/gtkutils.c:289
+#: src/gtkutils.c:286
 msgid "Can't save icon file to disk."
 msgstr "Impossibile salvare l'icona sul disco."
 
-#: src/gtkutils.c:324
+#: src/gtkutils.c:321
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Salva l'Icona"
 
-#. full help text
-#: src/gtkutils.c:1037
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Uso: %s [OPZIONI]...\n"
-"\n"
-"  -a, --acct          mostra la finestra dell'editor degli account\n"
-"  -w, --away[=MSG]    imposta come assente al login (l'argomento opzionale "
-"MSG\n"
-"                      specifica il nome del messaggio di assente da usare)\n"
-"  -l, --login[=NOME]  effettua il login automatico (l'argomento opzionale "
-"NOME\n"
-"                      specifica gli account da usare, seperati da virgole)\n"
-"  -n, --loginwin      non fare il login automatico; mostra la finestra di "
-"login\n"
-"  -u, --user=NOME     usa l'account NOME\n"
-"  -f, --file=FILE     usa FILE come file di configurazione\n"
-"  -d, --debug         stampa messaggi di debug sullo standard output\n"
-"  -v, --version       mostra la versione ed esci\n"
-"  -h, --help          mostra questo help ed esci\n"
-
-#. short message
-#: src/gtkutils.c:1052
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Prova con `%s -h' per maggiori informazioni.\n"
-
-#: src/html.c:345
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Errore di apertura della connessione.\n"
-
 #: src/log.c:30
 msgid "Error in specifying buddy conversation."
 msgstr "Errore di specifica della conversazione tra contatti."
@@ -4042,23 +4002,62 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) ha riportato che %s  ritornato attivo %s"
 
-#: src/main.c:140
+#: src/main.c:151
 msgid "Please enter your login."
 msgstr "Inserisci il nome utente."
 
-#: src/main.c:223
+#: src/main.c:234
 msgid "<New User>"
 msgstr "<Nuovo Utente>"
 
-#: src/main.c:265
+#: src/main.c:276
 msgid "Login"
 msgstr "Login"
 
-#: src/main.c:281
-msgid "Screen Name:"
-msgstr "Nome Utente:"
-
-#: src/plugin.c:258
+#. full help text
+#: src/main.c:553
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"Uso: %s [OPZIONI]...\n"
+"\n"
+"  -a, --acct          mostra la finestra dell'editor degli account\n"
+"  -w, --away[=MSG]    imposta come assente al login (l'argomento opzionale "
+"MSG\n"
+"                      specifica il nome del messaggio di assente da usare)\n"
+"  -l, --login[=NOME]  effettua il login automatico (l'argomento opzionale "
+"NOME\n"
+"                      specifica gli account da usare, seperati da virgole)\n"
+"  -n, --loginwin      non fare il login automatico; mostra la finestra di "
+"login\n"
+"  -u, --user=NOME     usa l'account NOME\n"
+"  -f, --file=FILE     usa FILE come file di configurazione\n"
+"  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -v, --version       mostra la versione ed esci\n"
+"  -h, --help          mostra questo help ed esci\n"
+
+#. short message
+#: src/main.c:568
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Prova con `%s -h' per maggiori informazioni.\n"
+
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4067,11 +4066,11 @@
 "Il plugin %s richiesto non  stato trovato. Installare questo plugin e "
 "provare di nuovo."
 
-#: src/plugin.c:263 src/plugin.c:291
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim non  in grado di caricare il tuo plugin."
 
-#: src/plugin.c:287
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Impossibile caricare il plugin %s richiesto."
@@ -4080,202 +4079,225 @@
 msgid "Slightly less boring default"
 msgstr "Messaggio di default"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1276
-#: src/protocols/msn/msn.c:337 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1703
-#: src/protocols/yahoo/yahoo.c:1804
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2306
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Available"
 msgstr "Presente"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "Disponibile solo per gli amici"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
 msgstr "Assente solo per gli amici"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3597 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4615
-#: src/protocols/oscar/oscar.c:5917 src/protocols/yahoo/yahoo.c:1425
-#: src/protocols/yahoo/yahoo.c:1723 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
+#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:2326 src/protocols/yahoo/yahoo.c:2417
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "Invisibile solo per gli amici"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "Non Disponibile"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:136
 msgid "Unable to resolve hostname."
 msgstr "Impossibile risolvere il nome dell'host."
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:139
 msgid "Unable to connect to server."
 msgstr "Impossibile connettersi al server."
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:142
 msgid "Invalid response from server."
 msgstr "Risposta non valida da parte del server."
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
 msgstr "Errore di lettura dal socket."
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:148
 msgid "Error while writing to socket."
 msgstr "Errore di scrittura sul socket."
 
-#: src/protocols/gg/gg.c:154
+#: src/protocols/gg/gg.c:151
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/protocols/gg/gg.c:157
+#: src/protocols/gg/gg.c:154
 msgid "Unknown Error Code."
 msgstr "Codice di errore sconosciuto."
 
-#: src/protocols/gg/gg.c:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "Impossibile leggere il socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:204
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr "Impossibile connettersi."
 
+#: src/protocols/gg/gg.c:415
+msgid "Reading data"
+msgstr "Lettura dati in corso"
+
 #: src/protocols/gg/gg.c:418
-msgid "Reading data"
-msgstr "Lettura dati in corso"
+msgid "Balancer handshake"
+msgstr ""
 
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr ""
+msgid "Reading server key"
+msgstr "Lettura della chiave del server in corso"
 
 #: src/protocols/gg/gg.c:424
-msgid "Reading server key"
-msgstr "Lettura della chiave del server in corso"
-
-#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "Sto scambiando la chiave dell'hash"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "Errore critico nella libreria GG\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:180
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connessione a %s fallita"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "Impossibile fare ping sul server"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "Invia come messaggio"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "Ricerca del server GG in corso"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "Ricerca del server GG in corso"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "L'UIN Gadu-Gadu specificato non  valido"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Stai cercando di inviare un messaggio ad un UIN Gadu-Gadu non valido."
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "Impossibile ottenere i risultati della ricerca"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Motore di Ricerca di Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "Attivo"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3963
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3892
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:671
+#: src/protocols/gg/gg.c:668
 msgid "First name"
 msgstr "Nome"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3965
+#. Last Name
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:564
+#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
+msgid "Last Name"
+msgstr "Cognome"
+
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3894
 msgid "Nick"
 msgstr "Nickname"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
 msgstr "Anno di nascita"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "Sesso"
 
-#: src/protocols/gg/gg.c:737
+#. City
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:574
+#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
+#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+msgid "City"
+msgstr "Citt"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1240
+#: src/protocols/msn/msn.c:1482 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2583
+#: src/protocols/yahoo/yahoo.c:2605 src/protocols/yahoo/yahoo.c:2625
+#: src/protocols/yahoo/yahoo.c:2812 src/protocols/zephyr/zephyr.c:355
+msgid "Buddy Information"
+msgstr "Informazioni sul Contatto"
+
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Non c' nessuna Lista Contatti conservata sul server Gadu-Gadu."
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Impossibile importare la Lista Contatti dal Server"
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Lista Contatti trasferita con successo dal server Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Impossibile trasferire la Lista Contatti sul server Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Lista Contatti eliminata con successo dal server Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Impossibile eliminare la Lista Contatti dal server  Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "Password modificata con successo"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "La password non pu essere modificata"
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Errore di comunicazione col server Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4283,11 +4305,11 @@
 "Gaim non  in grado di portare a termine la tua richiesta a causa di un "
 "problema di comunicazione con il server HTTP di Gadu-Gadu. Riprova pi tardi."
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Impossibile importare la lista contatti di Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4295,26 +4317,26 @@
 "Gaim non  in grado di connettersi al server delle liste contatti di Gadu-"
 "Gadu. Riprova pi tardi."
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Impossibile esportare la lista contatti"
 
-#: src/protocols/gg/gg.c:1068 src/protocols/gg/gg.c:1091
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim non  in grado di connettersi al server delle liste contatti. Riprova "
 "pi tardi."
 
-#: src/protocols/gg/gg.c:1090
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Impossibile eliminare la lista contatti di Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1139
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "Impossibile accedere alla directory"
 
-#: src/protocols/gg/gg.c:1140
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4322,11 +4344,11 @@
 "Gaim non  in grado di cercare nella Directory poich non  in grado di "
 "connettersi al server delle directory. Riprova pi tardi."
 
-#: src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Impossibile cambiare la password di Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4334,27 +4356,32 @@
 "Gaim non  in grado di cambiare la tua password a causa di un errore di "
 "connessione con il server di Gadu-Gadu. Riprova pi tardi."
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "Ricerca nella Directory"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:981
+#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
+msgid "Change Password"
+msgstr "Cambia Password"
+
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "Importa la Lista Contatti dal Server"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "Esporta la Lista Contatti sul Server"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "Elimina la Lista Contatti dal Server"
 
-#: src/protocols/gg/gg.c:1251
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "Impossibile accedere al profilo dell'utente."
 
-#: src/protocols/gg/gg.c:1252
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4372,7 +4399,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1364 src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin per il Protocollo Gadu-Gadu"
 
@@ -4385,17 +4412,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Gli utenti %s (%s%s%s%s%s) richiedono la tua autorizzazione."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1806
-#: src/protocols/msn/notification.c:924 src/protocols/msn/notification.c:1245
-#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2617
-#: src/protocols/oscar/oscar.c:5152
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:181
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
+#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:5080
 msgid "Authorize"
 msgstr "Autorizza"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1807
-#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1247
-#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2619
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
+#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
+#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:5081
 msgid "Deny"
 msgstr "Blocca"
 
@@ -4447,21 +4474,42 @@
 msgid "No topic is set"
 msgstr "Non  impostato nessun argomento"
 
-#: src/protocols/irc/irc.c:121
+#: src/protocols/irc/irc.c:64
+msgid "Error displaying MOTD"
+msgstr "Errore di visualizzazione del MOTD"
+
+#: src/protocols/irc/irc.c:64
+msgid "No MOTD available"
+msgstr "Nessun MOTD disponibile"
+
+#: src/protocols/irc/irc.c:65
+msgid "There is no MOTD associated with this connection."
+msgstr "Non c' nessun MOTD associato con questa connessione."
+
+#: src/protocols/irc/irc.c:68
+#, c-format
+msgid "MOTD for %s"
+msgstr "MOTD per %s"
+
+#: src/protocols/irc/irc.c:137
+msgid "View MOTD"
+msgstr "Leggi il MOTD"
+
+#: src/protocols/irc/irc.c:156
 msgid "Channel:"
 msgstr "Canale:"
 
-#: src/protocols/irc/irc.c:145
+#: src/protocols/irc/irc.c:180
 msgid "IRC nicks may not contain whitespace"
 msgstr "I nick IRC non devono contenere spazi bianchi"
 
-#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:686
-#: src/protocols/toc/toc.c:232
+#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Connessione a: %s"
 
-#: src/protocols/irc/irc.c:173
+#: src/protocols/irc/irc.c:208
 msgid "Couldn't create socket"
 msgstr "Impossibile creare il socket"
 
@@ -4474,167 +4522,171 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:495
+#: src/protocols/irc/irc.c:530
 msgid "IRC Protocol Plugin"
 msgstr "Plugin per il Protocollo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:496
+#: src/protocols/irc/irc.c:531
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Il Plugin per il protocollo IRC che fa meno schifo"
 
-#. Splits
-#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4514 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1077 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:519
+#: src/protocols/irc/irc.c:554
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "Modalit sbagliata"
 
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sei stato cacciato da %s."
 
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "Cacciato"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificato)</i>"
 
-#: src/protocols/irc/msgs.c:193
+#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:534
 msgid "Username"
 msgstr "Nome Utente"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:2049
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2683
 msgid "Realname"
 msgstr "Vero Nome"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr "Attualmente su"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inattivo per:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "Online da"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Aggettivo descrittivo:</b> Glorioso<br>"
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:219
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "Informazioni sul Contatto per %s"
+
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha scelto come argomento: %s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "L'argomento di %s : %s"
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Messaggio sconosciuto '%s'"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "Messaggio sconosciuto"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ha inviato un messaggio che il server IRC non comprende."
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "canale sconosciuto"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "L'utente non  connesso"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "Nick/canale sconosciuto"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "Impossibile inviare"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Per entrare in %s  necessario un invito."
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "Solo Invito"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sei stato cacciato da %s: (%s)"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Cacciato da %s: (%s)"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modalit (%s %s) da %s"
 
-#: src/protocols/irc/msgs.c:658
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr "Impossibile cambiare nick"
 
-#: src/protocols/irc/msgs.c:659
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr "Impossibile cambiare nick"
 
-#: src/protocols/irc/msgs.c:680
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Hai abbandonato il canale%s%s"
 
-#: src/protocols/irc/msgs.c:718
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "Errore: PONG non valido dal server"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Risposta PING -- Ritardo: %lu secondi"
 
-#: src/protocols/irc/msgs.c:790
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Impossibile entrare in %s:"
 
-#: src/protocols/irc/msgs.c:791
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr "Impossibile entrare nel canale"
 
-#: src/protocols/irc/msgs.c:821
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops da %s"
@@ -4664,270 +4716,141 @@
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:574
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:601
-#: src/protocols/msn/msn.c:75 src/protocols/msn/msn.c:95
-#: src/protocols/msn/msn.c:153 src/protocols/msn/msn.c:253
-#: src/protocols/msn/msn.c:509 src/protocols/msn/msn.c:620
-#: src/protocols/msn/msn.c:636 src/protocols/msn/msn.c:684
-#: src/protocols/msn/msn.c:707 src/protocols/msn/msn.c:739
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:780
-#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:802
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:849 src/protocols/msn/msn.c:899
-#: src/protocols/msn/msn.c:937 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1087
-#: src/protocols/msn/msn.c:1098 src/protocols/msn/msn.c:1109
-#: src/protocols/msn/msn.c:1133 src/protocols/msn/msn.c:1145
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/notification.c:179
-#: src/protocols/msn/notification.c:206 src/protocols/msn/notification.c:1643
-#: src/protocols/msn/notification.c:1663 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
-#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
-#: src/protocols/trepia/trepia.c:1263
-msgid "Write error"
-msgstr "Errore di scrittura"
-
-#: src/protocols/jabber/jabber.c:1069 src/protocols/jabber/jabber.c:1076
-msgid "Unable to change password."
-msgstr "Impossibile cambiare la password."
-
-#: src/protocols/jabber/jabber.c:1070
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr ""
-"La password inserita non  corretta. La tua password non  stata cambiata."
-
-#: src/protocols/jabber/jabber.c:1077
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr ""
-"La password inserita  uguale a quella corrente. La tua password rimane la "
-"stessa."
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3530
-#: src/protocols/jabber/jabber.c:3581
-msgid "Chatty"
-msgstr "Sta chattando"
-
-#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3532
-#: src/protocols/jabber/jabber.c:3589
-msgid "Extended Away"
-msgstr "Ancora Assente"
-
-#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3593 src/protocols/oscar/oscar.c:2835
-#: src/protocols/oscar/oscar.c:4603 src/protocols/oscar/oscar.c:5913
-msgid "Do Not Disturb"
-msgstr "Non Disturbare"
-
-#: src/protocols/jabber/jabber.c:1513
-#, c-format
-msgid "Jabber Error %s"
-msgstr "Errore di Jabber %s"
-
-#: src/protocols/jabber/jabber.c:1618
-#, c-format
-msgid "Error %s: %s"
-msgstr "Errore %s: %s"
-
-#: src/protocols/jabber/jabber.c:1621
-msgid "Unknown Error in presence"
-msgstr "Errore sconosciuto nella presenza"
-
-#: src/protocols/jabber/jabber.c:1799
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "L'utente %s vuole aggiungerti nella sua lista dei contatti."
-
-#: src/protocols/jabber/jabber.c:1827
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr ""
-"L'utente di Jabber %s non esiste e pertanto non  stato aggiunto alla tua "
-"lista."
-
-#: src/protocols/jabber/jabber.c:1830
-msgid "No such user."
-msgstr "Utente sconosciuto."
-
-#: src/protocols/jabber/jabber.c:1994
-msgid "Authenticating"
-msgstr "Autenticazione"
-
-#: src/protocols/jabber/jabber.c:2028
-msgid "Unknown login error"
-msgstr "Errore di login sconosciuto"
-
-#: src/protocols/jabber/jabber.c:2378
-msgid "Password successfully changed."
-msgstr "Password modificata con successo."
-
-#: src/protocols/jabber/jabber.c:2423 src/protocols/jabber/jabber.c:4332
-msgid "Connection lost"
-msgstr "Connessione perduta"
-
-#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:2459
-#: src/protocols/jabber/jabber.c:4334 src/protocols/jabber/jabber.c:4383
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
-#: src/protocols/msn/notification.c:2100 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1304
-msgid "Unable to connect"
-msgstr "Impossibile connettersi"
-
-#: src/protocols/jabber/jabber.c:2430
-msgid "Connected"
-msgstr "Connesso"
-
-#: src/protocols/jabber/jabber.c:2433
-msgid "Requesting Authentication Method"
-msgstr "Richiesta di un Metodo di Autenticazione in corso"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2453 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1327
-msgid "Connecting"
-msgstr "Connessione in corso"
-
-#: src/protocols/jabber/jabber.c:2779
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr ""
-"L'utente %s ha un ID Jabber non valido e pertanto non  stato aggiunto."
-
-#: src/protocols/jabber/jabber.c:2781
-msgid "Unable to add buddy."
-msgstr "Impossibile aggiungere il contatto."
-
-#: src/protocols/jabber/jabber.c:2782
-msgid "Jabber Error"
-msgstr "Errore di Jabber"
-
-#: src/protocols/jabber/jabber.c:3041 src/protocols/yahoo/yahoochat.c:833
-msgid "Room:"
-msgstr "Stanza:"
-
-#: src/protocols/jabber/jabber.c:3046
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:3052
-msgid "Handle:"
-msgstr "Gestisci:"
-
-#: src/protocols/jabber/jabber.c:3082
-msgid "Unable to join chat"
-msgstr "Impossibile unirsi alla chat"
-
-#: src/protocols/jabber/jabber.c:3318 src/protocols/jabber/jabber.c:3369
-#: src/protocols/jabber/jabber.c:3791
-msgid "Jabber ID"
-msgstr "ID Jabber"
-
-#: src/protocols/jabber/jabber.c:3319
-msgid "Error"
-msgstr "Errore"
-
-#: src/protocols/jabber/jabber.c:3370 src/protocols/jabber/jabber.c:3429
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3817
-msgid "Status"
-msgstr "Stato"
-
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3462
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/jabber/auth.c:50
+msgid "Server requires SSL for login"
+msgstr "Il server richiede SSL per il login"
+
+#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
+#: src/protocols/jabber/auth.c:354
+msgid "Invalid response from server"
+msgstr "Risposta non valida dal server"
+
+#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
+msgid "Server does not use any supported authentication method"
+msgstr "Il server non usa nessun metodo di autenticazione supportato"
+
+#: src/protocols/jabber/auth.c:327
+msgid "Invalid challenge from server"
+msgstr "Challenge non valido dal server"
+
+#: src/protocols/jabber/auth.c:357
+msgid "Bad Protocol"
+msgstr "Protocollo non valido"
+
+#: src/protocols/jabber/auth.c:360
+msgid "Encryption Required"
+msgstr "Richiesta crittazione"
+
+#: src/protocols/jabber/auth.c:363
+msgid "Invalid authzid"
+msgstr "Authzid non valido"
+
+#: src/protocols/jabber/auth.c:366
+msgid "Invalid Mechanism"
+msgstr "Meccanismo non valido"
+
+#: src/protocols/jabber/auth.c:368
+msgid "Invalid Realm"
+msgstr "Realm non valido"
+
+#: src/protocols/jabber/auth.c:371
+msgid "Mechanism Too Weak"
+msgstr "Meccanismo troppo debole"
+
+#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:806 src/protocols/jabber/jabber.c:856
+#: src/protocols/oscar/oscar.c:5472
 msgid "Not Authorized"
 msgstr "Non Autorizzato"
 
-#: src/protocols/jabber/jabber.c:3479
-msgid "View Error Msg"
-msgstr "Visualizza il Messaggio di Errore"
-
-#: src/protocols/jabber/jabber.c:3498
-msgid "Un-hide From"
-msgstr "Annulla Nascondi Da"
-
-#: src/protocols/jabber/jabber.c:3501
-msgid "Temporarily Hide From"
-msgstr "Nascondi Temporaneamente Da"
-
-#: src/protocols/jabber/jabber.c:3508
-msgid "Cancel Presence Notification"
-msgstr "Elimina la Notifica di Presenza"
-
-#: src/protocols/jabber/jabber.c:3516
-msgid "Re-request authorization"
-msgstr "Richiedi nuovamente l'autorizzazione"
-
-#: src/protocols/jabber/jabber.c:3719
+#: src/protocols/jabber/auth.c:377
+msgid "Temporary Authentication Failure"
+msgstr "Autenticazione temporaneamente non riuscita"
+
+#: src/protocols/jabber/auth.c:379
+msgid "Authentication Failure"
+msgstr "Autenticazione fallita"
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "Nome"
 
-#: src/protocols/jabber/jabber.c:3720
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "Cognome"
 
-#: src/protocols/jabber/jabber.c:3721
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "Soprannome"
 
-#: src/protocols/jabber/jabber.c:3722 src/protocols/yahoo/yahoo.c:2045
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:631
+#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2677
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/jabber.c:3724
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: src/protocols/jabber/jabber.c:3725
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
 msgid "Extended Address"
 msgstr "Indirizzo esteso"
 
-#: src/protocols/jabber/jabber.c:3726
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
 msgid "Locality"
 msgstr "Localit"
 
-#: src/protocols/jabber/jabber.c:3727
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
 msgid "Region"
 msgstr "Regione"
 
-#: src/protocols/jabber/jabber.c:3728
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/jabber.c:584
 msgid "Postal Code"
 msgstr "Codice Postale"
 
-#: src/protocols/jabber/jabber.c:3730
+#. Country
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
+#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+msgid "Country"
+msgstr "Paese"
+
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:687
+#: src/protocols/jabber/buddy.c:694
 msgid "Telephone"
 msgstr "Telefono"
 
-#: src/protocols/jabber/jabber.c:3732
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:705
+#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2671
+msgid "Email"
+msgstr "Email"
+
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
 msgid "Organization Name"
 msgstr "Organizzazione"
 
-#: src/protocols/jabber/jabber.c:3733
+#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
 msgid "Organization Unit"
 msgstr "Ufficio"
 
-#: src/protocols/jabber/jabber.c:3734
+#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
 msgid "Title"
 msgstr "Titolo"
 
-#: src/protocols/jabber/jabber.c:3735
+#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
 msgid "Role"
 msgstr "Ruolo"
 
-#: src/protocols/jabber/jabber.c:3736 src/protocols/oscar/oscar.c:3997
+#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
+#: src/protocols/oscar/oscar.c:3926
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: src/protocols/jabber/jabber.c:4194 src/protocols/jabber/jabber.c:4195
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
 msgid "Edit Jabber vCard"
 msgstr "Modifica la vCard di Jabber"
 
-#: src/protocols/jabber/jabber.c:4196
+#: src/protocols/jabber/buddy.c:516
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4935,18 +4858,330 @@
 "Tutti i campi seguenti sono opzionali. Inserisci solamente le informazioni "
 "che desideri."
 
-#: src/protocols/jabber/jabber.c:4269
-msgid "Server Registration successful!"
-msgstr "Registrazione al Server avvenuta con successo!"
-
-#: src/protocols/jabber/jabber.c:4285
-#, c-format
-msgid "Error %d: %s"
-msgstr "Errore %d: %s"
-
-#: src/protocols/jabber/jabber.c:4290
-msgid "Unknown registration error"
-msgstr "Errore di registrazione sconosciuto"
+#: src/protocols/jabber/buddy.c:554
+msgid "Jabber ID"
+msgstr "ID Jabber"
+
+#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
+#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:843
+#: src/protocols/jabber/jabber.c:856
+msgid "Status"
+msgstr "Stato"
+
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1080
+msgid "Resource"
+msgstr "Risorsa"
+
+#: src/protocols/jabber/buddy.c:624
+msgid "Middle Name"
+msgstr "Secondo Nome"
+
+#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:569
+#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
+msgid "Address"
+msgstr "Indirizzo"
+
+#: src/protocols/jabber/buddy.c:651
+msgid "P.O. Box"
+msgstr "Codice Postale"
+
+#: src/protocols/jabber/buddy.c:757
+msgid "Photo"
+msgstr "Foto"
+
+#: src/protocols/jabber/buddy.c:757
+msgid "Logo"
+msgstr "Logo"
+
+#: src/protocols/jabber/buddy.c:771
+msgid "Jabber Profile"
+msgstr "Profilo di Jabber"
+
+#: src/protocols/jabber/buddy.c:866
+msgid "Un-hide From"
+msgstr "Annulla Nascondi Da"
+
+#: src/protocols/jabber/buddy.c:869
+msgid "Temporarily Hide From"
+msgstr "Nascondi Temporaneamente Da"
+
+#: src/protocols/jabber/buddy.c:877
+msgid "Cancel Presence Notification"
+msgstr "Elimina la Notifica di Presenza"
+
+#: src/protocols/jabber/buddy.c:885
+msgid "Re-request authorization"
+msgstr "Richiedi nuovamente l'autorizzazione"
+
+#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:870
+msgid "Room:"
+msgstr "Stanza:"
+
+#: src/protocols/jabber/chat.c:43
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/jabber/chat.c:49
+msgid "Handle:"
+msgstr "Gestisci:"
+
+#: src/protocols/jabber/jabber.c:80
+msgid "Error initializing session"
+msgstr "Errore nell'inizializzazione della sezione"
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Format"
+msgstr "Formato non valido"
+
+#: src/protocols/jabber/jabber.c:107
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:110
+msgid "Resource Conflict"
+msgstr "Conflitto di risorsa"
+
+#: src/protocols/jabber/jabber.c:112
+msgid "Connection Timeout"
+msgstr "Connessione scaduta"
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Gone"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:116
+msgid "Host Unknown"
+msgstr "Host sconosciuto"
+
+#: src/protocols/jabber/jabber.c:118
+msgid "Improper Addressing"
+msgstr "Indirizzamento sbagliato"
+
+#: src/protocols/jabber/jabber.c:120
+msgid "Internal Server Error"
+msgstr "Errore Interno del Server"
+
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid ID"
+msgstr "ID non valido"
+
+#: src/protocols/jabber/jabber.c:124
+msgid "Invalid Namespace"
+msgstr "Namespace non valido"
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Invalid XML"
+msgstr "XML non valido"
+
+#: src/protocols/jabber/jabber.c:128
+msgid "Non-matching Hosts"
+msgstr "Gli host non corrispondono"
+
+#: src/protocols/jabber/jabber.c:132
+msgid "Policy Violation"
+msgstr "Violazione delle regole di policy"
+
+#: src/protocols/jabber/jabber.c:134
+msgid "Remote Connection Failed"
+msgstr "Controllo Remoto fallito"
+
+#: src/protocols/jabber/jabber.c:136
+msgid "Resource Constraint"
+msgstr "Vincolo sulla risorsa"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Restricted XML"
+msgstr "XML limitato"
+
+#: src/protocols/jabber/jabber.c:140
+msgid "See Other Host"
+msgstr "Vedi gli altri Host"
+
+#: src/protocols/jabber/jabber.c:142
+msgid "System Shutdown"
+msgstr "Arresto del Sistema"
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Undefined Condition"
+msgstr "Condizione non definita"
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Condition"
+msgstr "Condizione non supportata"
+
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Stanza Type"
+msgstr "Tipo di Stanza non supportato"
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Unsupported Version"
+msgstr "Versione non supportata"
+
+#: src/protocols/jabber/jabber.c:152
+msgid "XML Not Well Formed"
+msgstr "XML non creato correttamente"
+
+#: src/protocols/jabber/jabber.c:154
+msgid "Stream Error"
+msgstr "Errore di stream"
+
+#: src/protocols/jabber/jabber.c:232 src/protocols/msn/msn.c:82
+#: src/protocols/msn/msn.c:102 src/protocols/msn/msn.c:160
+#: src/protocols/msn/msn.c:260 src/protocols/msn/msn.c:516
+#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
+#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
+#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
+#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
+#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1073
+#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1105
+#: src/protocols/msn/msn.c:1116 src/protocols/msn/msn.c:1140
+#: src/protocols/msn/msn.c:1152 src/protocols/msn/msn.c:1217
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
+#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
+#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+msgid "Write error"
+msgstr "Errore di scrittura"
+
+#: src/protocols/jabber/jabber.c:269 src/protocols/jabber/jabber.c:289
+msgid "Read Error"
+msgstr "Errore di lettura"
+
+#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:671
+#: src/protocols/trepia/trepia.c:1106
+msgid "Unable to create socket"
+msgstr "Impossibile creare il socket"
+
+#: src/protocols/jabber/jabber.c:419
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "Registrazione di %s@%s avvenuta con successo"
+
+#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:422
+msgid "Registration Successful"
+msgstr "Registrazione Riuscita"
+
+#: src/protocols/jabber/jabber.c:431
+msgid "Unknown Error"
+msgstr "Errore sconosciuto"
+
+#: src/protocols/jabber/jabber.c:434
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "Registrazione di %s@%s fallita: %s"
+
+#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+msgid "Registration Failed"
+msgstr "Registrazione Fallita"
+
+#: src/protocols/jabber/jabber.c:524 src/protocols/jabber/jabber.c:525
+msgid "Already Registered"
+msgstr "Gi registrato"
+
+#: src/protocols/jabber/jabber.c:538 src/protocols/jabber/jabber.c:951
+msgid "Password"
+msgstr "Password"
+
+#: src/protocols/jabber/jabber.c:549
+msgid "E-Mail"
+msgstr "Email"
+
+#. First Name
+#: src/protocols/jabber/jabber.c:559 src/protocols/oscar/oscar.c:3897
+#: src/protocols/trepia/trepia.c:258
+msgid "First Name"
+msgstr "Nome"
+
+#. State
+#: src/protocols/jabber/jabber.c:579 src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:430
+msgid "State"
+msgstr "Stato"
+
+#: src/protocols/jabber/jabber.c:589
+msgid "Phone"
+msgstr "Telefono"
+
+#: src/protocols/jabber/jabber.c:607
+msgid "Please fill out the information below to register your new account."
+msgstr "Riempi i campi qui sotto per registrare il tuo nuovo account."
+
+#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:611
+msgid "Register New Jabber Account"
+msgstr "Registra un nuovo Account Jabber"
+
+#: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1925
+msgid "Connecting"
+msgstr "Connessione in corso"
+
+#: src/protocols/jabber/jabber.c:714
+msgid "Initializing Stream"
+msgstr "Inizializzazione dello stream"
+
+#: src/protocols/jabber/jabber.c:720
+msgid "Authenticating"
+msgstr "Autenticazione"
+
+#: src/protocols/jabber/jabber.c:728
+msgid "Re-initializing Stream"
+msgstr "Reinizializzazione dello stream"
+
+#: src/protocols/jabber/jabber.c:851 src/protocols/jabber/jabber.c:902
+#: src/protocols/jabber/presence.c:257
+msgid "Error"
+msgstr "Errore"
+
+#: src/protocols/jabber/jabber.c:867 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
+msgid "Chatty"
+msgstr "Sta chattando"
+
+#: src/protocols/jabber/jabber.c:869 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
+msgid "Extended Away"
+msgstr "Ancora Assente"
+
+#: src/protocols/jabber/jabber.c:870 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
+msgid "Do Not Disturb"
+msgstr "Non Disturbare"
+
+#: src/protocols/jabber/jabber.c:884
+msgid "Password Changed"
+msgstr "Password Modificata"
+
+#: src/protocols/jabber/jabber.c:885
+msgid "Your password has been changed."
+msgstr "La tua password  stata modificata."
+
+#: src/protocols/jabber/jabber.c:895
+#, c-format
+msgid "Error changing password: %s"
+msgstr "Errore nella modifica della password: %s"
+
+#: src/protocols/jabber/jabber.c:899
+msgid "Unknown error occurred changing password"
+msgstr "Errore sconosciuto durante la modifica della password"
+
+#: src/protocols/jabber/jabber.c:956
+msgid "Password (again)"
+msgstr "Password (di nuovo)"
+
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:962
+msgid "Change Jabber Password"
+msgstr "Cambia la Password di Jabber"
+
+#: src/protocols/jabber/jabber.c:962
+msgid "Please enter your new password"
+msgstr "Inserisci la tua nuova password"
 
 #. *< api_version
 #. *< type
@@ -4958,36 +5193,73 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4493 src/protocols/jabber/jabber.c:4495
+#: src/protocols/jabber/jabber.c:1057 src/protocols/jabber/jabber.c:1059
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin per il Protocollo Jabber"
 
-#: src/protocols/jabber/jabber.c:4517
-msgid "Resource"
-msgstr "Risorsa"
-
-#: src/protocols/jabber/jabber.c:4523
-msgid "Use SSL"
-msgstr "Utilizza SSL"
-
-#: src/protocols/jabber/jabber.c:4532
+#: src/protocols/jabber/jabber.c:1083
+msgid "Force Old SSL"
+msgstr "Forza il vecchio SSL"
+
+#: src/protocols/jabber/jabber.c:1091
 msgid "Connect server"
 msgstr "Server di connessione"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:277
-#: src/protocols/msn/notification.c:498
+#: src/protocols/jabber/message.c:95
+#, c-format
+msgid "Message from %s"
+msgstr "Messaggio da %s"
+
+#: src/protocols/jabber/message.c:178
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "Invio del messaggio a %s fallito: %s"
+
+#: src/protocols/jabber/message.c:181
+msgid "Jabber Message Error"
+msgstr "Errore messaggio Jabber"
+
+#: src/protocols/jabber/message.c:244
+#, c-format
+msgid " (Code %s)"
+msgstr " (Codice %s)"
+
+#: src/protocols/jabber/parser.c:129
+msgid "XML Parse error"
+msgstr "Errore di parsing XML"
+
+#: src/protocols/jabber/presence.c:167
+#, c-format
+msgid "%s (Code %s)"
+msgstr "%s (Codice %s)"
+
+#: src/protocols/jabber/presence.c:172
+msgid "Unknown Error in presence"
+msgstr "Errore sconosciuto nella presenza"
+
+#: src/protocols/jabber/presence.c:176
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "L'utente %s vuole aggiungerti nella sua lista dei contatti."
+
+#: src/protocols/jabber/presence.c:253
+msgid "Unable to join chat"
+msgstr "Impossibile unirsi alla chat"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:499
 msgid "Unable to request USR\n"
 msgstr "Impossibile richiedere l'USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:294
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "Impossibile effettuare il login utilizzando MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:303
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "Impossibile inviare l'USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:308
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "Richiesta di invio password"
 
@@ -4995,15 +5267,15 @@
 msgid "Protocol version not supported"
 msgstr "Versione del protocollo non supportata"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:760
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
 msgid "Unable to request CVR\n"
 msgstr "Impossibile richiedere il CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:769
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
 msgid "Unable to request INF\n"
 msgstr "Impossibile richiedere l'INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1877
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
 msgid "Got invalid XFR"
 msgstr "Ricevuto un XFR non valido"
 
@@ -5015,16 +5287,23 @@
 msgid "Unable to parse message."
 msgstr "Impossibile inviare il messaggio."
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:865
-#: src/protocols/msn/notification.c:2122
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
+#: src/protocols/msn/notification.c:2102 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1748 src/protocols/yahoo/yahoo.c:1813
+msgid "Unable to connect"
+msgstr "Impossibile connettersi"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:2124
 msgid "Unable to write to server"
 msgstr "Impossibile scriver sul server"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2129
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2131
 msgid "Syncing with server"
 msgstr "Sincronizzazione col server"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2143
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2145
 msgid "Error reading from server"
 msgstr "Errore di lettura dal server"
 
@@ -5045,7 +5324,7 @@
 msgstr "Manca un nome di dominio corretto"
 
 #: src/protocols/msn/error.c:47
-msgid "Already Login"
+msgid "Already Logged In"
 msgstr "Gi connesso"
 
 #: src/protocols/msn/error.c:50
@@ -5106,7 +5385,7 @@
 
 #: src/protocols/msn/error.c:94
 msgid "Switchboard failed"
-msgstr ""
+msgstr "Switchboard fallito"
 
 #: src/protocols/msn/error.c:97
 msgid "Notify Transfer failed"
@@ -5120,7 +5399,7 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
 msgid "Not logged in"
 msgstr "Non connesso"
 
@@ -5173,8 +5452,8 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "I parametri CVR sono sconosciuti o non consentiti"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:612
-#: src/protocols/msn/notification.c:1258 src/protocols/msn/notification.c:1426
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
+#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
 msgid "Unable to write"
 msgstr "Impossibile scrivere"
 
@@ -5206,8 +5485,8 @@
 msgid "Server too busy"
 msgstr "Server occupato"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:662
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Autenticazione fallita"
 
@@ -5221,7 +5500,7 @@
 
 #: src/protocols/msn/error.c:205
 msgid "Kids Passport without parental consent"
-msgstr ""
+msgstr "Kids Passport senza il consenso parentale"
 
 #: src/protocols/msn/error.c:209
 msgid "Passport account not yet verified"
@@ -5232,35 +5511,35 @@
 msgid "Unknown Error Code %d"
 msgstr "Codice di errore sconosciuto %d"
 
-#: src/protocols/msn/msn.c:63
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "Il tuo nuovo alias MSN  troppo lungo."
 
-#: src/protocols/msn/msn.c:170
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "Imposta un Alias"
 
-#: src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:178
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Questo  il nome con il quale i contatti MSN ti vedranno."
 
-#: src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "Imposta il Telefono di Casa"
 
-#: src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "Imposta il Telefono dell'Ufficio"
 
-#: src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "Imposta il Numero di Cellulare"
 
-#: src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "Consenti le \"MSN Mobile Pages\"?"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:222
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5268,94 +5547,94 @@
 "Vuoi permettere ai contatti della tua lista di inviarti \"MSN Mobile pages\" "
 "sul tuo cellulare o su un altro dispositivo portatile?"
 
-#: src/protocols/msn/msn.c:219
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "Permetti"
 
-#: src/protocols/msn/msn.c:220
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "Vieta"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "Invia un messaggio ad un telefonino."
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2144
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Stato:</b> %s"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Lontano dal Computer"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:598
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1407
-#: src/protocols/yahoo/yahoo.c:1705 src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2010
+#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2408
 msgid "Be Right Back"
 msgstr "Torno subito"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:600
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1409
-#: src/protocols/yahoo/yahoo.c:1707 src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2012
+#: src/protocols/yahoo/yahoo.c:2310 src/protocols/yahoo/yahoo.c:2409
 msgid "Busy"
 msgstr "Occupato"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:602
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1417
-#: src/protocols/yahoo/yahoo.c:1715 src/protocols/yahoo/yahoo.c:1810
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:2318 src/protocols/yahoo/yahoo.c:2413
 msgid "On The Phone"
 msgstr "Al Telefono"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:604
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1421
-#: src/protocols/yahoo/yahoo.c:1719 src/protocols/yahoo/yahoo.c:1812
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2024
+#: src/protocols/yahoo/yahoo.c:2322 src/protocols/yahoo/yahoo.c:2415
 msgid "Out To Lunch"
 msgstr "A Pranzo"
 
-#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
-#: src/protocols/zephyr/zephyr.c:870 src/protocols/zephyr/zephyr.c:885
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: src/protocols/msn/msn.c:355
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "Imposta un Alias"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "Imposta il Telefono di Casa"
 
-#: src/protocols/msn/msn.c:369
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "Imposta il Telefono dell'Ufficio"
 
-#: src/protocols/msn/msn.c:375
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "Imposta il Numero di Cellulare"
 
-#: src/protocols/msn/msn.c:384
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "Abilita/Disabilita Mobile Devices"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Permetti/Vieta Mobile Pages"
 
-#: src/protocols/msn/msn.c:417
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "Invia ad un Cellulare"
 
-#: src/protocols/msn/msn.c:426
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "Inizia una Chat"
 
-#: src/protocols/msn/msn.c:720
+#: src/protocols/msn/msn.c:727
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5365,11 +5644,11 @@
 "volevi scrivere %s@hotmail.com. Non sono stati effettuati cambiamenti nella "
 "lista degli utenti ammessi."
 
-#: src/protocols/msn/msn.c:724 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
 msgid "Invalid MSN screenname"
 msgstr "Nome utente MSN non valido"
 
-#: src/protocols/msn/msn.c:760
+#: src/protocols/msn/msn.c:767
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5379,67 +5658,76 @@
 "volevi scrivere %s@hotmail.com. Non sono stati effettuati cambiamenti nella "
 "lista degli utenti bloccati."
 
-#: src/protocols/msn/msn.c:1228 src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/msn/msn.c:1241 src/protocols/yahoo/yahoo.c:2584
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Erorre nella ricezione del profilo</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1288 src/protocols/oscar/oscar.c:4002
-#: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:2057
+#: src/protocols/msn/msn.c:1309 src/protocols/oscar/oscar.c:3931
+#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:2695
 msgid "Age"
 msgstr "Et"
 
 #. Gender
-#: src/protocols/msn/msn.c:1292 src/protocols/oscar/oscar.c:3988
-#: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:2065
+#: src/protocols/msn/msn.c:1316 src/protocols/oscar/oscar.c:3917
+#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
+#: src/protocols/yahoo/yahoo.c:2707
 msgid "Gender"
 msgstr "Sesso"
 
-#: src/protocols/msn/msn.c:1296 src/protocols/yahoo/yahoo.c:2061
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo.c:2701
 msgid "Marital Status"
 msgstr "Stato Civile"
 
-#: src/protocols/msn/msn.c:1300 src/protocols/yahoo/yahoo.c:2053
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2689
 msgid "Location"
 msgstr "Localit"
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2069
+#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo.c:2713
 msgid "Occupation"
 msgstr "Occupazione"
 
-#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1324
-#: src/protocols/msn/msn.c:1332 src/protocols/msn/msn.c:1340
-#: src/protocols/msn/msn.c:1347
+#: src/protocols/msn/msn.c:1356 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1376
+#: src/protocols/msn/msn.c:1383
 msgid "A Little About Me"
 msgstr "Qualcosa su di me"
 
-#: src/protocols/msn/msn.c:1353 src/protocols/msn/msn.c:1366
-#: src/protocols/msn/msn.c:1373
+#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1412
 msgid "Favorite Things"
 msgstr "Preferenze"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1386
-#: src/protocols/msn/msn.c:1393
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "Hobbies and Interests"
 msgstr "Hobbies e Interessi"
 
-#: src/protocols/msn/msn.c:1399 src/protocols/msn/msn.c:1405
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1449
+#: src/protocols/yahoo/yahoo.c:2757
 msgid "Favorite Quote"
 msgstr "Frase preferita"
 
-#: src/protocols/msn/msn.c:1410 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/msn/msn.c:1457 src/protocols/yahoo/yahoo.c:2801
 msgid "Last Updated"
 msgstr "Ultima modifica"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1417 src/protocols/trepia/trepia.c:321
-#: src/protocols/trepia/trepia.c:489
+#: src/protocols/msn/msn.c:1468 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr "Homepage"
 
+#: src/protocols/msn/msn.c:1490 src/protocols/yahoo/yahoo.c:2819
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Informazioni sull'utente %s non disponibili"
+
+#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2821
+msgid "The user's profile is empty."
+msgstr "Il profilo dell'utente  vuoto."
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5450,84 +5738,85 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1505 src/protocols/msn/msn.c:1507
+#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1592
 msgid "MSN Protocol Plugin"
 msgstr "Plugin per il Protocollo MSN"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1611 src/protocols/trepia/trepia.c:1330
 msgid "Login server"
 msgstr "Sever di login"
 
-#: src/protocols/msn/notification.c:246
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Errore di MSN: %s\n"
 
-#: src/protocols/msn/notification.c:362 src/protocols/msn/notification.c:523
+#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
 msgid "Unable to write to MSN Nexus server."
 msgstr "Impossibile scriver sul server MSN Nexus."
 
-#: src/protocols/msn/notification.c:371 src/protocols/msn/notification.c:538
+#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
 msgid "Unable to read from MSN Nexus server."
 msgstr "Impossibile leggere dal server MSN Nexus."
 
-#: src/protocols/msn/notification.c:391
+#: src/protocols/msn/notification.c:392
 msgid "MSN Nexus server returned invalid redirect information."
-msgstr "Il server MSN Nexus ha risposto con una informazione di redirect "
-"non valida."
-
-#: src/protocols/msn/notification.c:437
+msgstr ""
+"Il server MSN Nexus ha risposto con una informazione di redirect non valida."
+
+#: src/protocols/msn/notification.c:438
 msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "Errore sconosciuto durante la richiesta di autorizzazione "
-"al server di login MSN."
-
-#: src/protocols/msn/notification.c:549
+msgstr ""
+"Errore sconosciuto durante la richiesta di autorizzazione al server di login "
+"MSN."
+
+#: src/protocols/msn/notification.c:550
 msgid "MSN Nexus server returned invalid information."
 msgstr "Il server MSN Nexus ha risposto con un'informazione non valida."
 
-#: src/protocols/msn/notification.c:617 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr "Ricezione della Lista Contatti in corso"
 
-#: src/protocols/msn/notification.c:679
+#: src/protocols/msn/notification.c:680
 msgid "Unable to connect to passport server"
 msgstr "Impossibile connettersi al server passport"
 
-#: src/protocols/msn/notification.c:684 src/protocols/msn/notification.c:716
+#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
 msgid "Password sent"
 msgstr "Password inviata"
 
-#: src/protocols/msn/notification.c:711
+#: src/protocols/msn/notification.c:712
 msgid "Unable to send password"
 msgstr "Impossibile inviare la password"
 
-#: src/protocols/msn/notification.c:747
+#: src/protocols/msn/notification.c:748
 msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
-#: src/protocols/msn/notification.c:789
+#: src/protocols/msn/notification.c:790
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Sei stato disconnesso: sei connesso da un'altra locazione."
 
-#: src/protocols/msn/notification.c:794
+#: src/protocols/msn/notification.c:795
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Sei stato disconnesso. I server MSN sono temporaneamente disattivi."
 
-#: src/protocols/msn/notification.c:920
+#: src/protocols/msn/notification.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "L'utente %s (%s )vuole aggiungere %s nella sua lista dei contatti."
 
-#: src/protocols/msn/notification.c:1239 src/protocols/msn/notification.c:1405
+#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "L'utente %s (%s) vuole aggiungerti nella sua lista dei contatti."
 
-#: src/protocols/msn/notification.c:1919
+#: src/protocols/msn/notification.c:1921
 msgid "Unable to transfer to notification server"
 msgstr "Impossibile trasferire al server di notifica"
 
-#: src/protocols/msn/notification.c:2063
+#: src/protocols/msn/notification.c:2065
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5567,39 +5856,39 @@
 msgid "An MSN message may not have been received."
 msgstr "Un messaggio MSN potrebbe non essere stato ricevuto."
 
-#: src/protocols/napster/napster.c:232
+#: src/protocols/napster/napster.c:228
 msgid "Unable to read header from server"
 msgstr "Impossibile leggere l'header dal server"
 
-#: src/protocols/napster/napster.c:246
-#, c-format
-msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
+#: src/protocols/napster/napster.c:242
+#, c-format
+msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr ""
 "Impossibile leggere il messaggio dal server.  Il comando  %hd, la lunghezza "
 " %hd."
 
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:303
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "Utenti: %s, file: %s, dimensione: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:314
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Impossibile aggiungere \"%s\" alla tua hotlist di Napster"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:322
 msgid "You were disconnected from the server."
 msgstr "Sei stato disconnesso dal server."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:382
+#: src/protocols/napster/napster.c:378
 #, c-format
 msgid "%s requested your information"
 msgstr "%s ha richiesto informazioni su di te"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:410
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -5607,13 +5896,13 @@
 "Sei stato disconnesso dal server poich sei connesso da un'altra locazione."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:416
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s ha richiesto un PING"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5223
-#: src/protocols/toc/toc.c:1261
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
+#: src/protocols/toc/toc.c:1258
 msgid "Join what group:"
 msgstr "Unisciti al gruppo:"
 
@@ -5627,178 +5916,178 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "Plugin per il Protocollo NAPSTER"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid error"
 msgstr "Errore non valido"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:176
 msgid "Invalid SNAC"
 msgstr "SNAC non valido"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to host"
 msgstr "Rate verso l'host"
 
+#: src/protocols/oscar/oscar.c:178
+msgid "Rate to client"
+msgstr "Rate verso il client"
+
+#: src/protocols/oscar/oscar.c:180
+msgid "Service unavailable"
+msgstr "Servizio non disponibile"
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Service not defined"
+msgstr "Servizio non definito"
+
+#: src/protocols/oscar/oscar.c:182
+msgid "Obsolete SNAC"
+msgstr "SNAC Obsoleto"
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by host"
+msgstr "Non supportato dall'host"
+
 #: src/protocols/oscar/oscar.c:184
-msgid "Rate to client"
-msgstr "Rate verso il client"
+msgid "Not supported by client"
+msgstr "Non supportato dal client"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Refused by client"
+msgstr "Rifiutato dal client"
 
 #: src/protocols/oscar/oscar.c:186
-msgid "Service unavailable"
-msgstr "Servizio non disponibile"
+msgid "Reply too big"
+msgstr "Risposta troppo grande"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Service not defined"
-msgstr "Servizio non definito"
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Obsolete SNAC"
-msgstr "SNAC Obsoleto"
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Not supported by host"
-msgstr "Non supportato dall'host"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by client"
-msgstr "Non supportato dal client"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Refused by client"
-msgstr "Rifiutato dal client"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr "Risposta troppo grande"
-
-#: src/protocols/oscar/oscar.c:193
 msgid "Responses lost"
 msgstr "Risposte perse"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:188
 msgid "Request denied"
 msgstr "Richiesta rifiutata"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:189
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:190
 msgid "Insufficient rights"
 msgstr "Permessi insufficienti"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:191
 msgid "In local permit/deny"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:192
 msgid "Too evil (sender)"
 msgstr "Troppo cattivo (mittente)"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:193
 msgid "Too evil (receiver)"
 msgstr "Troppo cattivo (ricevente)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:194
 msgid "User temporarily unavailable"
 msgstr "Utente temporaneamente non disponibile"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:195
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:196
 msgid "List overflow"
 msgstr "Lista troppo grande"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:197
 msgid "Request ambiguous"
 msgstr "Richiesta ambigua"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:198
 msgid "Queue full"
 msgstr "Coda piena"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:199
 msgid "Not while on AOL"
 msgstr "Non  possibile se connessi ad AOL"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "IM diretto con %s terminato"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "IM diretto con %s fallito"
 
-#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:222
-#: src/protocols/toc/toc.c:628 src/protocols/toc/toc.c:644
-#: src/protocols/toc/toc.c:712
+#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "Disconnesso."
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/toc/toc.c:888
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla chat room %s."
 
-#: src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:559
 msgid "Chat is currently unavailable"
 msgstr "La chat al momento non  disponibile"
 
-#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:697
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
 msgid "Couldn't connect to host"
 msgstr "Impossibile connettersi all'host"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:675
 msgid "Unable to login to AIM"
 msgstr "Impossibile effettuare il login su AIM"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
 msgid "Could Not Connect"
 msgstr "Impossibile Connettersi"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:785
 msgid "Connection established, cookie sent"
 msgstr "Connessione stabilita, cookie inviato"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
+#: src/protocols/oscar/oscar.c:870
 msgid "File Transfer Aborted"
 msgstr "Trasferimento File Abortito"
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:853
 msgid "Unable to establish listener socket."
 msgstr "Impossibile creare un socket in ascolto. "
 
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:866
 msgid "Unable to establish file descriptor."
 msgstr "Impossibile creare un descrittore di file."
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to create new connection."
 msgstr "Impossibile creare una nuova connessione."
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:574
+#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Password o Nickname non corretti."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "Il tuo account  attualmente sospeso."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger  temporaneamente non disponibile."
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1065
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -5806,18 +6095,18 @@
 "Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di pi."
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1070
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versione del client che stai usando  troppo vecchia. Aggiornala su %s"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1102
 msgid "Internal Error"
 msgstr "Errore Interno"
 
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
+#: src/protocols/oscar/oscar.c:1322
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5826,29 +6115,29 @@
 "Verrai disconnesso a breve. Potresti voler utilizzare TOC finch non  "
 "risolto il problema. Controlla %s per aggiornamenti."
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim non  in grado di ottenere un hash di login valido per AIM."
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1325
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim non  in grado di ottenere un hash di login valido."
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5626
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "IM diretto con %s avviato"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
 msgid "(There was an error receiving this message)"
 msgstr "(C' stato un errore nella ricezione di questo messaggio)"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2403
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ha chiesto di connettersi direttamente a %s"
 
-#: src/protocols/oscar/oscar.c:2414
+#: src/protocols/oscar/oscar.c:2406
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -5858,48 +6147,47 @@
 "per le Immagini IM. Poich verr rivelato il tuo indirizzo IP, devi "
 "considerare la cosa come un potenziale rischio per la tua privacy. "
 
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5941
 msgid "Connect"
 msgstr "Connetti"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2438
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorizzami ad includerti nella mia lista contatti."
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2446
 msgid "Authorization Request Message:"
 msgstr "Messaggio di Richiesta di Autorizzazione:"
 
-#: src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2447
 msgid "Please authorize me!"
 msgstr "Autorizzami per favore!"
 
-#: src/protocols/oscar/oscar.c:2483
+#: src/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
-"L'utente %s ha bisogno di essere autorizzato prima di poter essere aggiunto "
-"ad una lista contatti. Vuoi inviare una richiesta di autorizzazione?"
-
-#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
+"L'utente %s deve autorizzarti prima che tu possa aggiungerlo alla tua lista "
+"contatti. Vuoi inviare una richiesta di autorizzazione?"
+
+#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
 msgid "Request Authorization"
 msgstr "Richiesta Autorizzazione"
 
-#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2607
-#: src/protocols/oscar/oscar.c:2627 src/protocols/oscar/oscar.c:3002
-#: src/protocols/oscar/oscar.c:3054 src/protocols/oscar/oscar.c:5144
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
+#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
 msgid "No reason given."
 msgstr "Nessun motivo fornito."
 
-#: src/protocols/oscar/oscar.c:2534
+#: src/protocols/oscar/oscar.c:2526
 msgid "Authorization Denied Message:"
 msgstr "Messaggio di Autorizzazione Rifiutata:"
 
-#: src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5909,14 +6197,14 @@
 "motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2615 src/protocols/oscar/oscar.c:5150
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
 msgid "Authorization Request"
 msgstr "Autorizzazione Richiesta"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
@@ -5924,19 +6212,19 @@
 "seguente motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2620
 msgid "ICQ authorization denied."
 msgstr "Autorizzazione ICQ rifiutata."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2635
-#, c-format
-msgid "The user %u has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:2627
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "L'utente %u ha accolto la tua richiesta di aggiungerlo alla tua lista "
 "contatti."
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -5949,7 +6237,7 @@
 "Da: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5962,7 +6250,7 @@
 "Da: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2659
+#: src/protocols/oscar/oscar.c:2651
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5975,34 +6263,34 @@
 "Il messaggio :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2680
-#, c-format
-msgid "ICQ user %u has sent you a contact: %s (%s)"
+#: src/protocols/oscar/oscar.c:2672
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utente ICQ %u ti ha inviato un contatto: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2686
-msgid "Do you want to add this contact to your Buddy List?"
+#: src/protocols/oscar/oscar.c:2678
+msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vuoi aggiungere questo contatto alla tua lista?"
 
-#: src/protocols/oscar/oscar.c:2690
+#: src/protocols/oscar/oscar.c:2682
 msgid "Decline"
 msgstr "Declina"
 
-#: src/protocols/oscar/oscar.c:2772
+#: src/protocols/oscar/oscar.c:2764
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poich non era valido."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poich non erano validi."
 
-#: src/protocols/oscar/oscar.c:2781
+#: src/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poich era troppo grande."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poich erano troppo grandi."
 
-#: src/protocols/oscar/oscar.c:2790
+#: src/protocols/oscar/oscar.c:2782
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6015,7 +6303,7 @@
 "Non hai ricevuto %hu messaggi da %s poich sono stati spedito troppo "
 "velocemente."
 
-#: src/protocols/oscar/oscar.c:2799
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -6024,199 +6312,165 @@
 msgstr[1] ""
 "Non hai ricevuto %hu messaggi da %s poich l'utente  troppo \"cattivo\"."
 
-#: src/protocols/oscar/oscar.c:2808
+#: src/protocols/oscar/oscar.c:2800
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poich sei troppo \"cattivo\"."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poich sei troppo \"cattivo\"."
 
-#: src/protocols/oscar/oscar.c:2817
+#: src/protocols/oscar/oscar.c:2809
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s per un motivo sconosciuto"
 msgstr[1] "Non hai ricevuto %hu messaggi da %s per un motivo sconosciuto"
 
-#: src/protocols/oscar/oscar.c:2833 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
+#: src/protocols/oscar/oscar.c:6068
 msgid "Free For Chat"
 msgstr "Disponibile alla Chat"
 
-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:5914
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
+#: src/protocols/oscar/oscar.c:6066
 msgid "Not Available"
 msgstr "Non Disponibile"
 
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:5915
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
+#: src/protocols/oscar/oscar.c:6067
 msgid "Occupied"
 msgstr "Occupato"
 
-#: src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:2835
 msgid "Web Aware"
 msgstr "Informazioni sul Web"
 
-#: src/protocols/oscar/oscar.c:2903
+#: src/protocols/oscar/oscar.c:2878
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Stato:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2905
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>Stato:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2937
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2938
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Il tuo messaggio a %s non  stato spedito:"
 
-#: src/protocols/oscar/oscar.c:3052
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Informazioni sull'utente %s non disponibili:"
-
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3070
 msgid "Voice"
 msgstr "Voce"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:5945
-msgid "Direct IM"
-msgstr "Messaggio Istantaneo Diretto"
-
-#: src/protocols/oscar/oscar.c:3098 src/protocols/oscar/oscar.c:5961
+#: src/protocols/oscar/oscar.c:3073
+msgid "AIM Direct IM"
+msgstr "Messaggio Istantaneo Diretto AIM"
+
+#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
 msgid "Get File"
 msgstr "Ricevi il File"
 
-#: src/protocols/oscar/oscar.c:3101 src/protocols/oscar/oscar.c:5953
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
 msgid "Send File"
 msgstr "Invia il File"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3086
 msgid "Games"
 msgstr "Giochi"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3089
 msgid "Add-Ins"
 msgstr "Add-In"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3092
 msgid "Send Buddy List"
 msgstr "Invia la Lista Contatti"
 
-#: src/protocols/oscar/oscar.c:3114
-msgid "EveryBuddy Bug"
-msgstr "Bug di EveryBuddy"
-
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3095
+msgid "ICQ Direct Connect"
+msgstr "Connessione Diretta ICQ"
+
+#: src/protocols/oscar/oscar.c:3098
 msgid "AP User"
 msgstr "Utente AP"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3101
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3104
 msgid "Nihilist"
 msgstr "Nichilista"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3107
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3110
 msgid "Old ICQ UTF8"
 msgstr "Vecchio ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3113
 msgid "Trillian Encryption"
 msgstr "Crittazione di Trillian"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3116
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3138
-#, fuzzy
+#: src/protocols/oscar/oscar.c:3119
 msgid "Hiptop"
-msgstr "Storico"
-
-#: src/protocols/oscar/oscar.c:3141
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:3122
 msgid "Secure IM"
 msgstr "IM sicuri"
 
-#: src/protocols/oscar/oscar.c:3181
-msgid ""
-"<i>Unable to display information because it was sent in an unknown encoding."
-"</i>"
-msgstr ""
-"<i>Impossibile mostrare le informazioni poich sono state spedite in una "
-"codifica sconosciuta.</i>"
-
-#: src/protocols/oscar/oscar.c:3188
-#, c-format
-msgid "Online Since : <b>%s</b><br>\n"
-msgstr "Online Da : <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3193
-#, c-format
-msgid "Member Since : <b>%s</b><br>\n"
-msgstr "Membro Da : <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3199
-#, c-format
-msgid "Idle : <b>%s</b>"
+#: src/protocols/oscar/oscar.c:3151
+#, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "Username: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3152
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr "Livello di Richiamo: <b>%d%%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3155
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
+msgstr "Online Da: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3159
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
+msgstr "Membro Da: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3164
+#, c-format
+msgid "Idle: <b>%s</b>"
 msgstr "Inattivo: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3167
 msgid "Idle: <b>Active</b>"
 msgstr "Inattivo: <b>Attivo</b>"
 
-#: src/protocols/oscar/oscar.c:3204
-#, c-format
-msgid ""
-"Username : <b>%s</b>  %s <br>\n"
-"Warning Level : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-msgstr ""
-"Username : <b>%s</b>  %s <br>\n"
-"Livello dei Richiami : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-
-#: src/protocols/oscar/oscar.c:3236
-msgid "<i>User has no away message</i>"
-msgstr "<i>L'utente non ha un messaggio di assente</i>"
-
-#: src/protocols/oscar/oscar.c:3247
-msgid "Client Capabilities: "
-msgstr "Capacit del Client:"
-
-#: src/protocols/oscar/oscar.c:3253
-msgid "<i>No Information Provided</i>"
-msgstr "<i>Nessuna Informazione Fornita</i>"
-
-#: src/protocols/oscar/oscar.c:3277
+#: src/protocols/oscar/oscar.c:3206
 msgid "Your AIM connection may be lost."
 msgstr "La tua connessione ad AIM potrebbe essere perduta."
 
-#: src/protocols/oscar/oscar.c:3665
+#: src/protocols/oscar/oscar.c:3594
 msgid "Rate limiting error."
 msgstr "Rate massimo raggiunto."
 
-#: src/protocols/oscar/oscar.c:3666
+#: src/protocols/oscar/oscar.c:3595
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6224,7 +6478,7 @@
 "L'ultima operazione non  stata eseguita  poich sei al di sopra del rate "
 "consentito. Attendi 10 secondi e riprova."
 
-#: src/protocols/oscar/oscar.c:3727
+#: src/protocols/oscar/oscar.c:3656
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6232,105 +6486,105 @@
 "Sei stato disconnesso perch ti sei collegato con questo nome utente da "
 "un'altra locazione."
 
-#: src/protocols/oscar/oscar.c:3729
+#: src/protocols/oscar/oscar.c:3658
 msgid "You have been signed off for an unknown reason."
 msgstr "Sei stato disconnesso per un motivo sconosciuto."
 
-#: src/protocols/oscar/oscar.c:3974 src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
 msgid "Email Address"
 msgstr "Indirizzo email"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:3914
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:313
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
+#: src/protocols/trepia/trepia.c:413
 msgid "Female"
 msgstr "Femminile"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:312
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
+#: src/protocols/trepia/trepia.c:413
 msgid "Male"
 msgstr "Maschile"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:3934
 msgid "Personal Web Page"
 msgstr "Pagina web personale"
 
-#: src/protocols/oscar/oscar.c:4008
+#: src/protocols/oscar/oscar.c:3937
 msgid "Additional Information"
 msgstr "Informazioni aggiuntive"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:3941
 msgid "Home Address"
 msgstr "Indirizzo di casa"
 
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
-msgid "Address"
-msgstr "Indirizzo"
-
-#: src/protocols/oscar/oscar.c:4023 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
 msgid "Zip Code"
 msgstr "Codice postale"
 
-#: src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:3957
 msgid "Work Address"
 msgstr "Indirizzo di lavoro"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:3973
 msgid "Work Information"
 msgstr "Informazioni sul lavoro"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:3975
 msgid "Company"
 msgstr "Compagnia"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:3978
 msgid "Division"
 msgstr "Divisione"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:3981
 msgid "Position"
 msgstr "Posizione"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:3984
 msgid "Web Page"
 msgstr "Pagina web"
 
-#: src/protocols/oscar/oscar.c:4061
+#: src/protocols/oscar/oscar.c:3990
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "Informazioni ICQ per %s"
 
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4040
+msgid "Pop-Up Message"
+msgstr "Pop Up"
+
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "I seguenti nickname sono associati con %s"
 
-#: src/protocols/oscar/oscar.c:4131
+#: src/protocols/oscar/oscar.c:4065
 msgid "Search Results"
 msgstr "Risultati della ricerca"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4082
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nessun risultato trovato per l'indirizzo email %s"
 
-#: src/protocols/oscar/oscar.c:4169
+#: src/protocols/oscar/oscar.c:4103
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Dovresti ricevere un'email con la richiesta di conferma per %s."
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4105
 msgid "Account Confirmation Requested"
 msgstr "Conferma dell'Account Richiesta"
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4133
 msgid "Error Changing Account Info"
 msgstr "Errore nella modifica delle informazioni sull'Account"
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4136
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6339,7 +6593,7 @@
 "Errore 0x%04x: Impossibile formattare il nome utente poich il nome utente "
 "richiesto differisce dall'originale."
 
-#: src/protocols/oscar/oscar.c:4205
+#: src/protocols/oscar/oscar.c:4139
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6348,7 +6602,7 @@
 "Errore 0x%04x: Impossibile formattare il nome utente poich il nome utente "
 "richiesto finisce con uno spazio."
 
-#: src/protocols/oscar/oscar.c:4208
+#: src/protocols/oscar/oscar.c:4142
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6357,7 +6611,7 @@
 "Errore 0x%04x: Impossibile formattare il nome utente poich il nome utente "
 "richiesto  troppo lungo."
 
-#: src/protocols/oscar/oscar.c:4211
+#: src/protocols/oscar/oscar.c:4145
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6366,7 +6620,7 @@
 "Errore 0x%04x: Impossibile cambiare l'indirizzo email poich c' gi una "
 "richiesta in corso per questo nome utente."
 
-#: src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6375,7 +6629,7 @@
 "Errore 0x%04x: Impossibile cambiare l'indirizzo email poich l'indirizzo "
 "fornito ha troppi nomi utente associati."
 
-#: src/protocols/oscar/oscar.c:4217
+#: src/protocols/oscar/oscar.c:4151
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6384,12 +6638,12 @@
 "Errore 0x%04x: Impossibile cambiare l'indirizzo email poich l'indirizzo "
 "fornito non  valido."
 
-#: src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4154
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Errore 0x%04x: Errore sconosciuto."
 
-#: src/protocols/oscar/oscar.c:4230
+#: src/protocols/oscar/oscar.c:4164
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6398,20 +6652,20 @@
 "Il tuo nome utente  attualmente formattato nel seguente modo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4231 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
 msgid "Account Info"
 msgstr "Informazioni sull'Account"
 
-#: src/protocols/oscar/oscar.c:4236
+#: src/protocols/oscar/oscar.c:4170
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "L'indirizzo email di %s  %s"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4400
 msgid "Unable to set AIM profile."
 msgstr "Impossibile impostare il profilo AIM."
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4401
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -6421,7 +6675,7 @@
 "procedura di login fosse completata. Il tuo profilo rimane non impostato; "
 "prova ad impostarlo di nuovo quando sei connesso correttamente."
 
-#: src/protocols/oscar/oscar.c:4502
+#: src/protocols/oscar/oscar.c:4431
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6436,15 +6690,15 @@
 "La lunghezza massima del profilo di %d bytes  stata superata. Gaim l'ha "
 "troncato per te."
 
-#: src/protocols/oscar/oscar.c:4507
+#: src/protocols/oscar/oscar.c:4436
 msgid "Profile too long."
 msgstr "Profilo troppo lungo."
 
-#: src/protocols/oscar/oscar.c:4526
+#: src/protocols/oscar/oscar.c:4455
 msgid "Unable to set AIM away message."
 msgstr "Impossibile impostare un messaggio di assente per AIM."
 
-#: src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:4456
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6454,7 +6708,7 @@
 "che la procedura di login fosse ultimata. Rimani in uno stato di \"presente"
 "\". Prova ad impostarlo di nuovo quando sarai connesso correttamente."
 
-#: src/protocols/oscar/oscar.c:4567
+#: src/protocols/oscar/oscar.c:4496
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6469,15 +6723,15 @@
 "La lunghezza massima del messaggio di assente di %d bytes  stata superata. "
 "Gaim l'ha troncato per te e ti ha impostato come assente."
 
-#: src/protocols/oscar/oscar.c:4572
+#: src/protocols/oscar/oscar.c:4501
 msgid "Away message too long."
 msgstr "Messaggio di assente troppo lungo."
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4721
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossibile Ricevere la Lista Contatti"
 
-#: src/protocols/oscar/oscar.c:4793
+#: src/protocols/oscar/oscar.c:4722
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -6487,12 +6741,12 @@
 "server AIM. La tua lista contatti non  persa e sar probabilmente "
 "disponibile tra poche ore."
 
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4890
+#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
+#: src/protocols/oscar/oscar.c:4819
 msgid "Orphans"
 msgstr "Orfani"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:4985
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6501,15 +6755,15 @@
 "Impossibile aggiungere il contatto %s poich hai troppi contatti nella tua "
 "lista. Rimuovine uno e prova nuovamente."
 
-#: src/protocols/oscar/oscar.c:5057 src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4985 src/protocols/oscar/oscar.c:4998
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
 msgid "Unable To Add"
 msgstr "Impossibile aggiungere"
 
-#: src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4998
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6520,7 +6774,7 @@
 "pi comune di questo problema  che hai raggiunto il massimo numero "
 "consentito di contatti nella tua lista."
 
-#: src/protocols/oscar/oscar.c:5105
+#: src/protocols/oscar/oscar.c:5033
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6529,11 +6783,11 @@
 "L'utente %s ti ha dato il permesso di aggiungerti alla sua lista contatti. "
 "Vuoi aggiungerlo alla tua?"
 
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5039
 msgid "Authorization Given"
 msgstr "Autorizzazione Concessa"
 
-#: src/protocols/oscar/oscar.c:5144
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6544,22 +6798,22 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5186
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:5114
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "L'utente %s ha accolto la tua richiesta di aggiungerlo nella tua lista "
 "contatti."
 
-#: src/protocols/oscar/oscar.c:5187
+#: src/protocols/oscar/oscar.c:5115
 msgid "Authorization Granted"
 msgstr "Autorizzazione Concessa"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:5118
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
@@ -6567,52 +6821,56 @@
 "contatti per il seguente motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5119
 msgid "Authorization Denied"
 msgstr "Autorizzazione Rifiutata"
 
-#: src/protocols/oscar/oscar.c:5228 src/protocols/toc/toc.c:1266
+#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
 msgid "Exchange:"
 msgstr "Scambio:"
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5379
 msgid "<b>Status:</b> "
 msgstr "<b>Stato:</b> "
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5388
 msgid "<b>Logged In:</b> "
 msgstr "<b>Connesso:</b>"
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5400
 msgid "<b>IP Address:</b> "
 msgstr "<b>Indirizzo IP:</b>"
 
-#: src/protocols/oscar/oscar.c:5478
+#: src/protocols/oscar/oscar.c:5408
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Capacit:</b> "
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5415
 msgid "<b>Available:</b> "
 msgstr "<b>Disponibile:</b> "
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5431
+msgid "<b>Away Message:</b> "
+msgstr "<b>Messaggio di Assente:</b>"
+
+#: src/protocols/oscar/oscar.c:5440
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Stato:</b> Non Autorizzato"
 
-#: src/protocols/oscar/oscar.c:5528 src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2032
 msgid "Offline"
 msgstr "Non Connesso"
 
-#: src/protocols/oscar/oscar.c:5769
+#: src/protocols/oscar/oscar.c:5921
 msgid "Unable to open Direct IM"
 msgstr "Impossibile aprire un IM diretto"
 
-#: src/protocols/oscar/oscar.c:5782
+#: src/protocols/oscar/oscar.c:5934
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Hai scelto di aprire una connessione IM diretta con %s."
 
-#: src/protocols/oscar/oscar.c:5785
+#: src/protocols/oscar/oscar.c:5937
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6620,86 +6878,113 @@
 "Poich questo rivela il tuo indirizzo IP, deve essere considerato un rischio "
 "per la privacy. Vuoi continuare?"
 
-#: src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:6112
+msgid "Buddy Comment:"
+msgstr "Commento per il Contatto:"
+
+#: src/protocols/oscar/oscar.c:6128
+msgid "Edit Buddy Comment"
+msgstr "Modifica il Commento per il Contatto"
+
+#: src/protocols/oscar/oscar.c:6136
 msgid "Get Status Msg"
 msgstr "Ottieni Messaggio di Stato"
 
-#: src/protocols/oscar/oscar.c:5974
+#: src/protocols/oscar/oscar.c:6151
+msgid "Direct IM"
+msgstr "Messaggio Istantaneo Diretto"
+
+#: src/protocols/oscar/oscar.c:6180
 msgid "Re-request Authorization"
 msgstr "Richiedi nuovamente l'Autorizzazione"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6201
 msgid "The new formatting is invalid."
 msgstr "La nuova formattazione non  valida."
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:6202
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "La formattazione del nome utente pu modificare solo le maiuscole/minuscole "
 "e gli spazi bianchi."
 
-#: src/protocols/oscar/oscar.c:6002
+#: src/protocols/oscar/oscar.c:6208
 msgid "New screenname formatting:"
 msgstr "Nuova formattazione del nome utente:"
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6257
 msgid "Change Address To:"
 msgstr "Cambia l'Indirizzo in:"
 
-#: src/protocols/oscar/oscar.c:6095
+#: src/protocols/oscar/oscar.c:6301
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>non stai attendendo nessuna autorizzazione</i>"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6304
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Stai attendendo autorizzazione dai seguenti contatti"
 
-#: src/protocols/oscar/oscar.c:6099
+#: src/protocols/oscar/oscar.c:6305
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Puoi richiedere nuovamente autorizzazione da questi contatti "
-"cliccando col tasto destro su di essi e scegliendo \"Richiedi nuovamente "
-"autorizzazione\""
-
-#: src/protocols/oscar/oscar.c:6115
+"Puoi richiedere nuovamente autorizzazione da questi contatti cliccando col "
+"tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
+
+#: src/protocols/oscar/oscar.c:6319
+msgid "Find Buddy by E-mail"
+msgstr "Cerca un Contatto per Email"
+
+#: src/protocols/oscar/oscar.c:6320
+msgid "Search for a buddy by e-mail address"
+msgstr "Cerca un Contatto attraverso il suo indirizzo email"
+
+#: src/protocols/oscar/oscar.c:6321
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "Inserisci l'indirizzo email del contatto che stai cercando."
+
+#: src/protocols/oscar/oscar.c:6324
+msgid "Search"
+msgstr "Ricerca"
+
+#: src/protocols/oscar/oscar.c:6337
 msgid "Available Message:"
 msgstr "Messaggio di Disponibile:"
 
-#: src/protocols/oscar/oscar.c:6116
-msgid "Please talk to me, I'm lonely! (and single)"
-msgstr "Parla con me! Sono solo (e single)"
-
-#: src/protocols/oscar/oscar.c:6178
+#: src/protocols/oscar/oscar.c:6415
 msgid "Set Available Message"
 msgstr "Imposta un Messaggio di Disponibile"
 
-#: src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6429
 msgid "Change Password (URL)"
 msgstr "Cambia Password (URL)"
 
-#: src/protocols/oscar/oscar.c:6203
+#: src/protocols/oscar/oscar.c:6437
+msgid "Configure IM Forwarding (URL)"
+msgstr "Configura l'inoltro dei Messaggi Immediati (URL)"
+
+#: src/protocols/oscar/oscar.c:6448
 msgid "Format Screenname"
 msgstr "Formatta il Nome Utente"
 
-#: src/protocols/oscar/oscar.c:6209
+#: src/protocols/oscar/oscar.c:6454
 msgid "Confirm Account"
 msgstr "Conferma l'Account"
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6460
 msgid "Display Current Registered Address"
 msgstr "Mostra l'Indirizzo Registrato Attuale"
 
-#: src/protocols/oscar/oscar.c:6221
+#: src/protocols/oscar/oscar.c:6466
 msgid "Change Current Registered Address"
 msgstr "Modifica l'Indirizzo Registrato Attuale"
 
-#: src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:6475
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra i Contatti dai quali attendi Autorizzazione"
 
-#: src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:6483
 msgid "Search for Buddy by Email"
 msgstr "Cerca un Contatto per Email"
 
@@ -6713,127 +6998,127 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6359 src/protocols/oscar/oscar.c:6361
+#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin per il Protocollo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:6378
+#: src/protocols/oscar/oscar.c:6623
 msgid "Auth host"
 msgstr "Host Auth"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6628
 msgid "Auth port"
 msgstr "Porta Auth"
 
-#: src/protocols/toc/toc.c:171
+#: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
 msgstr "Sto cercando %s"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:510
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossibile scrivere il file %s."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossibile leggere il file %s."
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Messaggio troppo lungo. Troncati gli ultimi %s byte."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s non  attualmente connesso."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Richiamo a %s non consentito."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Un messaggio  stato rifiutato. Stai superando il limite di velocit del "
 "server."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "La chat in %s non  disponibile."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Stai inviando troppo velocemente messaggi a %s."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Non hai ricevuto un messaggio da %s poich era troppo grande."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Non hai ricevuto un messaggio da %s poich  stato spedito troppo "
 "velocemente."
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:540
 msgid "Failure."
 msgstr "Fallimento."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:543
 msgid "Too many matches."
 msgstr "Troppe corrispondenze."
 
+#: src/protocols/toc/toc.c:546
+msgid "Need more qualifiers."
+msgstr "Servono pi qualificatori."
+
 #: src/protocols/toc/toc.c:549
-msgid "Need more qualifiers."
-msgstr "Servono pi qualificatori."
+msgid "Dir service temporarily unavailable."
+msgstr "Servizio di directory temporaneamente non disponibile."
 
 #: src/protocols/toc/toc.c:552
-msgid "Dir service temporarily unavailable."
-msgstr "Servizio di directory temporaneamente non disponibile."
-
-#: src/protocols/toc/toc.c:555
 msgid "Email lookup restricted."
 msgstr "Ricerca email limitata."
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:555
 msgid "Keyword ignored."
 msgstr "Parola chiave ignorata."
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:558
 msgid "No keywords."
 msgstr "Nessuna parola chiave."
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:561
 msgid "User has no directory information."
 msgstr "Non c' nessuna informazione sull'utente nella directory."
 
+#: src/protocols/toc/toc.c:565
+msgid "Country not supported."
+msgstr "Paese non supportato."
+
 #: src/protocols/toc/toc.c:568
-msgid "Country not supported."
-msgstr "Paese non supportato."
-
-#: src/protocols/toc/toc.c:571
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Errore sconosciuto: %s."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
 msgstr "Il servizio  temporaneamente non disponibile."
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:577
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Il tuo livello di richiamo  attualmente troppo alto per poterti connettere."
 
-#: src/protocols/toc/toc.c:583
+#: src/protocols/toc/toc.c:580
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -6841,37 +7126,37 @@
 "Ti sei connesso e disconnesso troppo frequentemente. Attendi 10 minuti e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di pi."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Si  verificato un errore sconosciuto di connessione: %s."
 
-#: src/protocols/toc/toc.c:588
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Si  verificato un errore sconosciuto, %d. Info: %s"
 
-#: src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
 msgstr "Connessione Chiusa"
 
-#: src/protocols/toc/toc.c:648
+#: src/protocols/toc/toc.c:645
 msgid "Waiting for reply..."
 msgstr "In attesa di risposta..."
 
-#: src/protocols/toc/toc.c:718
+#: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC  ritornato dalla pausa. Puoi nuovamente inviare messaggi."
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
 msgstr "Password Modificata con Successo"
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:907
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ha inviato un comando PAUSE"
 
-#: src/protocols/toc/toc.c:911
+#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -6881,45 +7166,45 @@
 "disconnetterti se invii un messaggio. Gaim impedir che le cose vadano male. "
 " solo un problema temporaneo, sii paziente."
 
-#: src/protocols/toc/toc.c:1404
+#: src/protocols/toc/toc.c:1401
 msgid "Get Dir Info"
 msgstr "Ottieni Informazioni dalla Directory"
 
-#: src/protocols/toc/toc.c:1528
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "Imposta le Informazioni sulla Directory"
 
-#: src/protocols/toc/toc.c:1652
+#: src/protocols/toc/toc.c:1663
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Impossibile aprire %s per scrivere!"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1699
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Trasferimento file fallito: probabilmente  stato annullato dall'altra parte."
 
-#: src/protocols/toc/toc.c:1733 src/protocols/toc/toc.c:1773
-#: src/protocols/toc/toc.c:1985
+#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1996
 msgid "Could not connect for transfer."
 msgstr "Impossibile connettersi per il trasferimento."
 
-#: src/protocols/toc/toc.c:1897
+#: src/protocols/toc/toc.c:1908
 msgid "Could not connect for transfer!"
 msgstr "Impossibile connettersi per il trasferimento!"
 
-#: src/protocols/toc/toc.c:1930
+#: src/protocols/toc/toc.c:1941
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Impossibile scrivere l'header del file. Il file non verr inviato."
 
-#: src/protocols/toc/toc.c:2064
+#: src/protocols/toc/toc.c:2075
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
 msgstr[1] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2071
+#: src/protocols/toc/toc.c:2082
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s chiede che tu gli invii un file"
@@ -6934,95 +7219,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2147 src/protocols/toc/toc.c:2149
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "Plugin per il Protocollo TOC"
 
-#: src/protocols/toc/toc.c:2166
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "Host TOC"
 
-#: src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "Porta TOC"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:295
+#: src/protocols/trepia/trepia.c:254
 msgid "Basic Profile"
 msgstr "Profilo di Base"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:285
 msgid "E-Mail Address"
 msgstr "Indirizzo Email"
 
-#: src/protocols/trepia/trepia.c:332
+#: src/protocols/trepia/trepia.c:291
 msgid "Profile Information"
 msgstr "Informazioni sul Profilo"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:338
+#: src/protocols/trepia/trepia.c:297
 msgid "Instant Messagers"
 msgstr ""
 
 #. AIM
-#: src/protocols/trepia/trepia.c:342
+#: src/protocols/trepia/trepia.c:301
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:346
+#: src/protocols/trepia/trepia.c:305
 msgid "ICQ UIN"
 msgstr "UIN ICQ"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:350
+#: src/protocols/trepia/trepia.c:309
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:354
+#: src/protocols/trepia/trepia.c:313
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:359
+#: src/protocols/trepia/trepia.c:318
 msgid "I'm From"
 msgstr "Sono di"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:376
+#: src/protocols/trepia/trepia.c:335
 msgid "Set your Trepia profile data."
 msgstr "Imposta il tuo profilo Trepia"
 
-#: src/protocols/trepia/trepia.c:500
+#: src/protocols/trepia/trepia.c:459
 msgid "Profile"
 msgstr "Profilo"
 
-#: src/protocols/trepia/trepia.c:522
+#: src/protocols/trepia/trepia.c:481
 msgid "Set Profile"
 msgstr "Imposta il Profilo"
 
-#: src/protocols/trepia/trepia.c:558
+#: src/protocols/trepia/trepia.c:517
 msgid "Visit Homepage"
 msgstr "Visita l'Homepage"
 
-#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
+#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
 msgid "Local Users"
 msgstr "Utenti Locali"
 
-#: src/protocols/trepia/trepia.c:1003
+#: src/protocols/trepia/trepia.c:962
 msgid "Read error"
 msgstr "Errore di lettura"
 
-#: src/protocols/trepia/trepia.c:1104
+#: src/protocols/trepia/trepia.c:1063
 msgid "Logging in"
 msgstr "Login in corso"
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "Impossibile creare il socket"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7033,173 +7314,189 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
+#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
 msgid "Trepia Protocol Plugin"
 msgstr "Plugin per il Protocollo Trepia"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:702
 msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio di Yahoo! non  stato inviato."
 
-#: src/protocols/yahoo/yahoo.c:752
+#: src/protocols/yahoo/yahoo.c:760
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla "
-"tua lista contatti."
-
-#: src/protocols/yahoo/yahoo.c:754
+"%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua "
+"lista contatti."
+
+#: src/protocols/yahoo/yahoo.c:762
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla "
-"tua lista contatti per il seguente motivo: %s."
-
-#: src/protocols/yahoo/yahoo.c:755
+"%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua "
+"lista contatti per il seguente motivo: %s."
+
+#: src/protocols/yahoo/yahoo.c:763
 msgid "Add buddy rejected"
 msgstr "Aggiungi un contatto rifiutato"
 
-#: src/protocols/yahoo/yahoo.c:1046
+#: src/protocols/yahoo/yahoo.c:1383
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1386
+msgid "Failed Yahoo! Authentication"
+msgstr "Autenticazione Yahoo! fallita"
+
+#: src/protocols/yahoo/yahoo.c:1459
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1049
+"Hai cercato di ignorare %s, ma l'utente  nella tua lista contatti. "
+"Cliccando su \"S\" il contatto verr rimosso ed ignorato."
+
+#: src/protocols/yahoo/yahoo.c:1462
 msgid "Ignore buddy?"
 msgstr "Ignora il contatto?"
 
-#: src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:1491
 msgid "Invalid username."
 msgstr "Username non valido."
 
-#: src/protocols/yahoo/yahoo.c:1081
+#: src/protocols/yahoo/yahoo.c:1494
 msgid "Incorrect password."
 msgstr "Password non corretta."
 
-#: src/protocols/yahoo/yahoo.c:1084
+#: src/protocols/yahoo/yahoo.c:1497
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
-#: src/protocols/yahoo/yahoo.c:1132
+#: src/protocols/yahoo/yahoo.c:1544
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Impossibile aggiungere il contatto %s al gruppo %s alla lista del "
-"server per l'account %s."
-
-#: src/protocols/yahoo/yahoo.c:1134
+msgstr ""
+"Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per "
+"l'account %s."
+
+#: src/protocols/yahoo/yahoo.c:1546
 msgid "Could not add buddy to server list"
 msgstr "Impossibile aggiungere il contatto alla lista del server"
 
-#: src/protocols/yahoo/yahoo.c:1236
+#: src/protocols/yahoo/yahoo.c:1648 src/protocols/yahoo/yahoo.c:1778
 msgid "Unable to read"
 msgstr "Impossibile leggere"
 
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:1803 src/protocols/yahoo/yahoo.c:1912
+#: src/protocols/yahoo/yahoo.c:1936
 msgid "Connection problem"
 msgstr "Problema di connessione"
 
-#: src/protocols/yahoo/yahoo.c:1411 src/protocols/yahoo/yahoo.c:1709
-#: src/protocols/yahoo/yahoo.c:1807
+#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
+#: src/protocols/yahoo/yahoo.c:2410
 msgid "Not At Home"
 msgstr "Non A Casa"
 
-#: src/protocols/yahoo/yahoo.c:1413 src/protocols/yahoo/yahoo.c:1711
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
+#: src/protocols/yahoo/yahoo.c:2411
 msgid "Not At Desk"
 msgstr "Non Al Computer"
 
-#: src/protocols/yahoo/yahoo.c:1415 src/protocols/yahoo/yahoo.c:1713
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:2018 src/protocols/yahoo/yahoo.c:2316
+#: src/protocols/yahoo/yahoo.c:2412
 msgid "Not In Office"
 msgstr "Non In Ufficio"
 
-#: src/protocols/yahoo/yahoo.c:1419 src/protocols/yahoo/yahoo.c:1717
-#: src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/yahoo/yahoo.c:2022 src/protocols/yahoo/yahoo.c:2320
+#: src/protocols/yahoo/yahoo.c:2414
 msgid "On Vacation"
 msgstr "In Vacanza"
 
-#: src/protocols/yahoo/yahoo.c:1423 src/protocols/yahoo/yahoo.c:1721
-#: src/protocols/yahoo/yahoo.c:1813
+#: src/protocols/yahoo/yahoo.c:2026 src/protocols/yahoo/yahoo.c:2324
+#: src/protocols/yahoo/yahoo.c:2416
 msgid "Stepped Out"
 msgstr "A Fare 2 Passi"
 
-#: src/protocols/yahoo/yahoo.c:1487 src/protocols/yahoo/yahoo.c:1521
+#: src/protocols/yahoo/yahoo.c:2090 src/protocols/yahoo/yahoo.c:2124
 msgid "Not on server list"
 msgstr "Non  nella lista del server"
 
-#: src/protocols/yahoo/yahoo.c:1577
+#: src/protocols/yahoo/yahoo.c:2180
 msgid "Join in Chat"
 msgstr "Entra nella Chat"
 
-#: src/protocols/yahoo/yahoo.c:1583
+#: src/protocols/yahoo/yahoo.c:2186
 msgid "Initiate Conference"
 msgstr "Inizia una Conferenza"
 
-#: src/protocols/yahoo/yahoo.c:1629
+#: src/protocols/yahoo/yahoo.c:2232
 msgid "Active which ID?"
 msgstr "Quale ID vuoi attivare?"
 
-#: src/protocols/yahoo/yahoo.c:1640
+#: src/protocols/yahoo/yahoo.c:2243
 msgid "Activate ID"
 msgstr "Attiva l'ID"
 
-#: src/protocols/yahoo/yahoo.c:1987
+#: src/protocols/yahoo/yahoo.c:2601
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
-"<b>Spiacente, i profili contrassegnati come contenenti contenuti per "
-"soli adulti non sono attualmente supportati.</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:1989 src/protocols/yahoo/yahoo.c:2005
+"<b>Spiacente, i profili contrassegnati come contenenti contenuti per soli "
+"adulti non sono attualmente supportati.</b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:2622
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-"Se vuoi vedere questo profilo, puoi aprire questo link con il tuo "
-"browser"
-
-#: src/protocols/yahoo/yahoo.c:2003
+"web browser<br>"
+msgstr ""
+"Se vuoi vedere questo profilo, dovrai aprire questo link con il tuo browser "
+"<br>"
+
+#: src/protocols/yahoo/yahoo.c:2621
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
-"<b>Spiacente, i profili non inglesi non sono attualmente "
-"supportati.</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2037
+"<b>Spiacente, i profili non inglesi non sono attualmente supportati.</"
+"b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo.c:2666
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:2079 src/protocols/yahoo/yahoo.c:2081
-#: src/protocols/yahoo/yahoo.c:2083
+#: src/protocols/yahoo/yahoo.c:2726 src/protocols/yahoo/yahoo.c:2730
+#: src/protocols/yahoo/yahoo.c:2734
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo.c:2085 src/protocols/yahoo/yahoo.c:2087
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2749
 msgid "Latest News"
 msgstr "Ultime notizie"
 
-#: src/protocols/yahoo/yahoo.c:2096
+#: src/protocols/yahoo/yahoo.c:2767
 msgid "Home Page"
 msgstr "Homepage"
 
-#: src/protocols/yahoo/yahoo.c:2106
+#: src/protocols/yahoo/yahoo.c:2781
 msgid "Cool Link 1"
 msgstr "Link preferito 1"
 
-#: src/protocols/yahoo/yahoo.c:2108
+#: src/protocols/yahoo/yahoo.c:2786
 msgid "Cool Link 2"
 msgstr "Link preferito 2"
 
-#: src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2789
 msgid "Cool Link 3"
 msgstr "Link preferito 3"
 
-#: src/protocols/yahoo/yahoo.c:2114
+#: src/protocols/yahoo/yahoo.c:2795
 msgid "Member Since"
 msgstr "Membro da"
 
@@ -7213,72 +7510,73 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2250 src/protocols/yahoo/yahoo.c:2252
+#: src/protocols/yahoo/yahoo.c:2960 src/protocols/yahoo/yahoo.c:2962
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin per il Protocollo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:2269
+#: src/protocols/yahoo/yahoo.c:2979
 msgid "Pager host"
 msgstr "Host Pager"
 
-#: src/protocols/yahoo/yahoo.c:2274
+#: src/protocols/yahoo/yahoo.c:2984
 msgid "Pager port"
 msgstr "Porta Pager"
 
-#: src/protocols/yahoo/yahoochat.c:191
+#: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" "
-"per il seguente motivo \"%s\"."
-
-#: src/protocols/yahoo/yahoochat.c:193
+msgstr ""
+"%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" per il "
+"seguente motivo \"%s\"."
+
+#: src/protocols/yahoo/yahoochat.c:196
 msgid "Invitation Rejected"
 msgstr "Invito Rifiutato"
 
-#: src/protocols/yahoo/yahoochat.c:317
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Failed to join chat"
 msgstr "Impossibile unirsi alla chat"
 
-#: src/protocols/yahoo/yahoochat.c:317
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Maybe the room is full?"
 msgstr "Forse la stanza  piena?"
 
-#: src/protocols/yahoo/yahoochat.c:509
+#: src/protocols/yahoo/yahoochat.c:531
 msgid "Failed to join buddy in chat"
 msgstr "Impossibile unirsi alla chat tra i contatti"
 
-#: src/protocols/yahoo/yahoochat.c:510
+#: src/protocols/yahoo/yahoochat.c:532
 msgid "Maybe they're not in a chat?"
 msgstr "Forse non sono in chat?"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Utente:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Nascosto o non connesso"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>A %s da %s"
 
-#: src/protocols/zephyr/zephyr.c:575 src/protocols/zephyr/zephyr.c:576
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr "Chiunque"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "Gi connesso con Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:601
+#: src/protocols/zephyr/zephyr.c:610
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7286,19 +7584,19 @@
 "Poich Zephyr utilizza il tuo nome utente di sistema, non sei in grado di "
 "utilizzare contemporaneamente pi account."
 
-#: src/protocols/zephyr/zephyr.c:855
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:895
+#: src/protocols/zephyr/zephyr.c:908
 msgid "Class:"
 msgstr "Classe:"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:913
 msgid "Instance:"
 msgstr "Istanza:"
 
-#: src/protocols/zephyr/zephyr.c:905
+#: src/protocols/zephyr/zephyr.c:918
 msgid "Recipient:"
 msgstr "Destinatario:"
 
@@ -7312,7 +7610,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1037 src/protocols/zephyr/zephyr.c:1039
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin per il Protocollo Zephyr"
 
@@ -7326,38 +7624,15 @@
 "invalid."
 msgstr "Il nome dell'host o il numero della porta specificati non sono validi"
 
-#: src/prpl.c:143
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s ha aggiunto %s alla sua lista contatti%s%s%s"
-
-#: src/prpl.c:155
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Vuoi aggiungerlo alla tua lista dei contatti?"
-
-#: src/prpl.c:158
-msgid "Gaim - Information"
-msgstr "Gaim - Informazione"
-
-#: src/prpl.c:161
-msgid "Add buddy to your list?"
-msgstr "Vuoi aggiungere il contatto alla tua lista?"
-
 #. * Custom away message.
-#: src/prpl.h:186
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "Personalizzato"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:862
 msgid "Accept"
 msgstr "Accetta"
 
@@ -7365,28 +7640,28 @@
 msgid "Please enter your password"
 msgstr "Inserisci la tua password"
 
-#: src/server.c:956
+#: src/server.c:949
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d messaggi)"
 msgstr[1] "(%d messaggi)"
 
-#: src/server.c:969
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "(1 messaggio)"
 
-#: src/server.c:1156 src/server.c:1166
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s si  connesso."
 
-#: src/server.c:1184 src/server.c:1192
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s si  disconnesso."
 
-#: src/server.c:1240
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7395,11 +7670,11 @@
 "%s  stato appena richiamato da %s.\n"
 "Il tuo nuovo livello di richiamo  %d%%"
 
-#: src/server.c:1243
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "una persona anonima"
 
-#: src/server.c:1346
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7408,23 +7683,15 @@
 "L'utente '%s' invita %s nella chat room: '%s'\n"
 "%s"
 
-#: src/server.c:1350
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "L'utente '%s' invita %s nella chat room: '%s'\n"
 
-#: src/server.c:1356
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "Accetti l'invito alla chat?"
 
-#: src/server.c:1545
-msgid "Gaim - Popup"
-msgstr "Gaim - Popup"
-
-#: src/server.c:1572
-msgid "More Info"
-msgstr "Maggiori Informazioni"
-
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
@@ -7440,28 +7707,40 @@
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"
 
-#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+#: src/util.c:1527
+msgid "Calculating..."
+msgstr "Sto calcolando..."
+
+#: src/util.c:1530
+msgid "Unknown."
+msgstr "Sconosciuto."
+
+#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
 msgid "day"
 msgid_plural "days"
 msgstr[0] "giorno"
 msgstr[1] "giorni"
 
-#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ora"
 msgstr[1] "ore"
 
-#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minuti"
 
-#: src/util.c:950
-msgid "Calculating..."
-msgstr "Sto calcolando..."
-
-#: src/util.c:953
-msgid "Unknown."
-msgstr "Sconosciuto."
+#: src/util.c:1917
+msgid "g003: Error opening connection.\n"
+msgstr "g003: Errore di apertura della connessione.\n"
+
+#: src/win32/win32dep.c:474
+msgid "Notification"
+msgstr "Notifica"
+
+#: src/win32/win32dep.c:475
+msgid "Moving Gaim user settings directory to:"
+msgstr "Sto spostando la directory con le impostazioni utente di Gaim in:"
--- a/po/sr.po	Thu Oct 09 05:57:12 2003 +0000
+++ b/po/sr.po	Thu Oct 09 11:43:26 2003 +0000
@@ -7,10 +7,10 @@
 # This file is distributed under the same license as the Gaim package.
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.69\n"
+"Project-Id-Version: gaim 0.71\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2003-09-24 00:20+0200\n"
-"PO-Revision-Date: 2003-09-24 00:44+0200\n"
+"PO-Revision-Date: 2003-10-09 12:51+0200\n"
 "Last-Translator: Данило Шеган <dsegan@gmx.net>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,14 +25,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:105
 msgid "Auto-Reconnect"
 msgstr "Аутоматско очување везе"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:108 plugins/autorecon.c:110
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Када се веза прекине, аутоматски се поново успоставља."
 
@@ -69,12 +69,12 @@
 msgid "Gaim - Away"
 msgstr "Гаим — Одсутан"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1658
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:472 src/gtkaccount.c:1667
 msgid "Auto-login"
 msgstr "Аутоматска пријава"
 
 #: plugins/docklet/docklet.c:117
-msgid "New Message.."
+msgid "New Message..."
 msgstr "Нова порука..."
 
 #: plugins/docklet/docklet.c:118
@@ -85,12 +85,12 @@
 msgid "New..."
 msgstr "Нова..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1794 src/gtkpounce.c:461
-#: src/gtkprefs.c:1468 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3585 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:5518
-#: src/protocols/oscar/oscar.c:5912
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1915 src/gtkpounce.c:461
+#: src/gtkprefs.c:1474 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:838 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:4522 src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:6057
 msgid "Away"
 msgstr "Одсутан"
 
@@ -107,11 +107,11 @@
 msgstr "Преноси датотека"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1816 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1825 src/main.c:315
 msgid "Accounts"
 msgstr "Налози"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2322 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2338 src/main.c:325
 msgid "Preferences"
 msgstr "Поставке"
 
@@ -415,14 +415,17 @@
 #. *  summary
 #: plugins/ipc-test-client.c:87
 msgid "Test plugin IPC support, as a client."
-msgstr "Пробни додатак за подршку за МПК (међупроцесну комуникацију), као клијент."
+msgstr ""
+"Пробни додатак за подршку за МПК (међупроцесну комуникацију), као клијент."
 
 #. *  description
 #: plugins/ipc-test-client.c:89
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
-msgstr "Пробни додатак за подршку за МПК (међупроцесну комуникацију), као клијент. Ово проналази додатак за сервер и позива пријављене наредбе."
+msgstr ""
+"Пробни додатак за подршку за МПК (међупроцесну комуникацију), као клијент. "
+"Ово проналази додатак за сервер и позива пријављене наредбе."
 
 # МПК = МеђуПроцесна Комуникација
 #. *< api_version
@@ -457,60 +460,71 @@
 msgstr "Проверава да ли је пристигла нова локална пошта."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:707
+#: plugins/notify.c:572
 msgid "Notify For"
 msgstr "Обавештавај о"
 
-#: plugins/notify.c:711
+#: plugins/notify.c:576
 msgid "_IM windows"
 msgstr "_брзим порукама"
 
-#: plugins/notify.c:716
-msgid "_Chat windows"
-msgstr "прозорима _разговора"
+#: plugins/notify.c:583
+msgid "C_hat windows"
+msgstr "Прозори _разговора"
+
+#: plugins/notify.c:590
+msgid "_Focused windows"
+msgstr "_Фокусирани прозори"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:722
+#: plugins/notify.c:598
 msgid "Notification Methods"
 msgstr "Начини обавештавања"
 
-#: plugins/notify.c:728
+#: plugins/notify.c:605
 msgid "Prepend _string into window title:"
 msgstr "Додавање _текста у наслов прозора:"
 
-#: plugins/notify.c:739
-msgid "_Quote window title"
-msgstr "_Цитирај наслов прозора"
-
-#: plugins/notify.c:744
-msgid "Set Window Manager \"_URGENT\" Hint"
-msgstr "Пошаљи наговештај „_Хитно“ управнику прозора"
-
-#: plugins/notify.c:749
+#. Count method button
+#: plugins/notify.c:624
 msgid "Insert c_ount of new messages into window title"
 msgstr "Убаци _број нових порука у наслов прозора"
 
-#: plugins/notify.c:754
-msgid "_Notify even if conversation is in focus"
-msgstr "_Обавести чак и ако је разговор у току"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:760
+#. Urgent method button
+#: plugins/notify.c:633
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Пошаљи наговештај „_Хитно“ управнику прозора"
+
+#. ---------- "Notification Removals" ----------
+#: plugins/notify.c:640
 msgid "Notification Removal"
 msgstr "Уклањање обавештења"
 
-#: plugins/notify.c:764
-msgid "Remove when conversation window gains _focus"
-msgstr "Уклони када прозор разговора добије _фокус"
-
-#: plugins/notify.c:769
+#. Remove on focus button
+#: plugins/notify.c:646
+msgid "Remove when conversation window _gains focus"
+msgstr "Уклони када прозор разговора буде _фокусиран"
+
+#. Remove on click button
+#: plugins/notify.c:654
 msgid "Remove when conversation window _receives click"
 msgstr "Уклони по к_лику на прозор разговора"
 
-#: plugins/notify.c:774
+#. Remove on type button
+#: plugins/notify.c:662
 msgid "Remove when _typing in conversation window"
 msgstr "Уклони при _куцању у прозору разговора"
 
+#. Remove on message send button
+#: plugins/notify.c:670
+msgid "Remove when a _message gets sent"
+msgstr "Уклони када се _порука пошаље"
+
+#. Remove on conversation switch button
+#: plugins/notify.c:679
+msgid "Remove on conversation ta_b switch"
+msgstr "Уклони по _измени листа разговора"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -518,14 +532,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:858
+#: plugins/notify.c:762
 msgid "Message Notification"
 msgstr "Обавештење о порукама"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:861 plugins/notify.c:863
+#: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Омогућава разне начине за обавештавање о непрочитаним порукама."
 
@@ -631,6 +645,60 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Замењује текст у одлазећим порукама према корисничким правилима."
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:190
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+msgid "Provides SSL support through GNUTLS."
+msgstr "Обезбеђује ССЛ подршку кроз GNUTLS."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:286
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-nss.c:289 plugins/ssl/ssl-nss.c:291
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Обезбеђује ССЛ подршку кроз Мозилин NSS."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:91
+msgid "SSL"
+msgstr "ССЛ"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Обезбеђује оквир око библиотека за ССЛ подршку."
+
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
@@ -749,7 +817,7 @@
 msgstr "Прикажи _клизач у прозору разговора"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "Прозор са списком другара"
 
@@ -796,8 +864,8 @@
 msgstr "_Покрени Гаим при покретању Виндоуса."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1635
-#: src/gtkprefs.c:2255
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1755
+#: src/gtkprefs.c:2271
 msgid "Buddy List"
 msgstr "Списак другара"
 
@@ -816,8 +884,8 @@
 msgstr "_Одржавај прозор са списком другара на врху"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
-#: src/gtkprefs.c:2256
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:895
+#: src/gtkprefs.c:2272
 msgid "Conversations"
 msgstr "Разговори"
 
@@ -884,155 +952,232 @@
 msgid "Crazy Patch Writers"
 msgstr "Луди писци исправки"
 
-#: src/about.c:136
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "Пензионисани програмери"
 
-#: src/about.c:137
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "претходни одржавалац libfaim-а"
 
-#: src/about.c:138
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "бивши главни програмер"
 
-#: src/about.c:141
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "бивши одржавалац"
 
-#: src/about.c:142
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "бивши Џабер програмер"
 
-#: src/about.c:143
+#: src/about.c:151
 msgid "original author"
 msgstr "први аутор"
 
-#: src/about.c:146
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "хакер и одређени покретач [лења буба]"
 
-#: src/about.c:154
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "Текући преводиоци"
 
-#: src/about.c:155 src/about.c:184
+#: src/about.c:163 src/about.c:192
 msgid "Catalan"
 msgstr "Каталонски"
 
-#: src/about.c:156 src/about.c:185
+#: src/about.c:164 src/about.c:193
 msgid "Czech"
 msgstr "Чешки"
 
-#: src/about.c:157
-msgid "Danish"
-msgstr "Дански"
-
-#: src/about.c:158 src/about.c:186
-msgid "German"
-msgstr "Немачки"
-
-#: src/about.c:159 src/about.c:187
-msgid "Spanish"
-msgstr "Шпански"
-
-#: src/about.c:160 src/about.c:188
-msgid "French"
-msgstr "Француски"
-
-#: src/about.c:161
-msgid "Hindi"
-msgstr "Хинду"
-
-#: src/about.c:162
-msgid "Hungarian"
-msgstr "Мађарски"
-
-#: src/about.c:163 src/about.c:190
-msgid "Italian"
-msgstr "Италијански"
-
-#: src/about.c:164 src/about.c:192
-msgid "Korean"
-msgstr "Корејски"
-
 #: src/about.c:165
+msgid "Danish"
+msgstr "Дански"
+
+#: src/about.c:166 src/about.c:194
+msgid "German"
+msgstr "Немачки"
+
+#: src/about.c:167 src/about.c:195
+msgid "Spanish"
+msgstr "Шпански"
+
+#: src/about.c:168 src/about.c:196
+msgid "French"
+msgstr "Француски"
+
+#: src/about.c:169
+msgid "Hindi"
+msgstr "Хинду"
+
+#: src/about.c:170
+msgid "Hungarian"
+msgstr "Мађарски"
+
+#: src/about.c:171 src/about.c:198
+msgid "Italian"
+msgstr "Италијански"
+
+#: src/about.c:172 src/about.c:200
+msgid "Korean"
+msgstr "Корејски"
+
+#: src/about.c:173
 msgid "Dutch; Flemish"
 msgstr "Холандски; Фламански"
 
-#: src/about.c:166 src/about.c:194
+#: src/about.c:174 src/about.c:202
 msgid "Polish"
 msgstr "Пољски"
 
-#: src/about.c:167
+#: src/about.c:175
 msgid "Portuguese-Brazil"
 msgstr "Португалски у Бразилу"
 
-#: src/about.c:168
+#: src/about.c:176
 msgid "Portuguese-Portugal"
 msgstr "Португалски у Португалији"
 
-#: src/about.c:169
+#: src/about.c:177
 msgid "Romanian"
 msgstr "Румунски"
 
-#: src/about.c:170 src/about.c:195
+#: src/about.c:178 src/about.c:203
 msgid "Russian"
 msgstr "Руски"
 
-#: src/about.c:171
+#: src/about.c:179
 msgid "Serbian"
 msgstr "Српски"
 
-#: src/about.c:172 src/about.c:197
+#: src/about.c:180 src/about.c:205
 msgid "Swedish"
 msgstr "Шведски"
 
-#: src/about.c:173
+#: src/about.c:181
 msgid "Simplified Chinese"
 msgstr "Поједностављени кинески"
 
-#: src/about.c:174
+#: src/about.c:182
 msgid "Traditional Chinese"
 msgstr "Традиционални кинески"
 
-#: src/about.c:181
+#: src/about.c:189
 msgid "Past Translators"
 msgstr "Претходни преводиоци"
 
-#: src/about.c:182
+#: src/about.c:190
 msgid "Amharic"
 msgstr "Амхарски"
 
-#: src/about.c:183
-msgid "Bulgarian"
-msgstr "Бугарски"
-
-#: src/about.c:189
-msgid "Hebrew"
-msgstr "Хебрејски"
-
 #: src/about.c:191
+msgid "Bulgarian"
+msgstr "Бугарски"
+
+#: src/about.c:197
+msgid "Hebrew"
+msgstr "Хебрејски"
+
+#: src/about.c:199
 msgid "Japanese"
 msgstr "Јапански"
 
-#: src/about.c:193
+#: src/about.c:201
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: src/about.c:196
+#: src/about.c:204
 msgid "Slovak"
 msgstr "Словачки"
 
-#: src/about.c:198
+#: src/about.c:206
 msgid "Chinese"
 msgstr "Кинески"
 
-#: src/about.c:211 src/dialogs.c:3509 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:240 src/server.c:1567
+#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:200
+#: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Затвори"
 
+#: src/account.c:265 src/protocols/jabber/jabber.c:888
+msgid "New passwords do not match."
+msgstr "Нове лозинке се не поклапају."
+
+#: src/account.c:273
+msgid "Fill out all fields completely."
+msgstr "Попуните сва поља у потпуности."
+
+#: src/account.c:298
+msgid "Original password"
+msgstr "Стара лозинка"
+
+#: src/account.c:304
+msgid "New password"
+msgstr "Нова лозинка"
+
+#: src/account.c:310
+msgid "New password (again)"
+msgstr "Нова лозинка (поновите)"
+
+#: src/account.c:315
+#, c-format
+msgid "Change password for %s"
+msgstr "Измена лозинке за %s"
+
+#: src/account.c:321
+msgid "Please enter your current password and your new password."
+msgstr "Унесите текућу лозинку и нову лозинку."
+
+#. *
+#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#.
+#: src/account.c:324 src/connection.c:193 src/dialogs.c:1812
+#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
+#: src/gtkrequest.c:197 src/protocols/jabber/jabber.c:933
+#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
+#: src/protocols/oscar/oscar.c:2448 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:6149 src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6278 src/protocols/yahoo/yahoo.c:2038
+#: src/request.h:852
+msgid "OK"
+msgstr "У реду"
+
+#. Cancel button.
+#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
+#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
+#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
+#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1556
+#: src/gtkaccount.c:1988 src/gtkblist.c:1139 src/gtkblist.c:3037
+#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:198
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
+#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:934
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2412
+#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5935
+#: src/protocols/oscar/oscar.c:6150 src/protocols/oscar/oscar.c:6199
+#: src/protocols/oscar/oscar.c:6264 src/protocols/oscar/oscar.c:6279
+#: src/protocols/trepia/trepia.c:338 src/protocols/yahoo/yahoo.c:2039
+#: src/request.h:852 src/request.h:862
+msgid "Cancel"
+msgstr "Откажи"
+
+#: src/account.c:351
+#, c-format
+msgid "Change user information for %s"
+msgstr "Измени податке о кориснику за %s"
+
+#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
+#: src/gtkrequest.c:204 src/protocols/jabber/buddy.c:519
+#: src/protocols/trepia/trepia.c:337
+msgid "Save"
+msgstr "Сачувај"
+
 #: src/away.c:208
 msgid "Gaim - Away!"
 msgstr "Гаим — Одсутан!"
@@ -1053,16 +1198,16 @@
 msgid "Set All Away"
 msgstr "Постави одсуство за све"
 
-#: src/blist.c:542 src/gtkprefs.c:2258
+#: src/blist.c:547 src/gtkprefs.c:2274
 msgid "Chats"
 msgstr "Разговори"
 
-#: src/blist.c:637 src/blist.c:803 src/dialogs.c:872
-#: src/protocols/jabber/jabber.c:1917 src/protocols/msn/notification.c:1135
+#: src/blist.c:642 src/blist.c:814 src/gtkblist.c:2527
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
 msgid "Buddies"
 msgstr "Другари"
 
-#: src/blist.c:1069
+#: src/blist.c:1100
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1080,25 +1225,26 @@
 "%d другара из групе %s није уклоњено пошто њихови налози нису пријављени. "
 "Ови другари и њихова група нису уклоњени.\n"
 
-#: src/blist.c:1078
+#: src/blist.c:1109
 msgid "Group not removed"
 msgstr "Група није уклоњена"
 
-#: src/blist.c:1129 src/gtkaccount.c:140 src/gtkpounce.c:307
-#: src/gtkutils.c:842 src/protocols/jabber/jabber.c:1261
+#: src/blist.c:1160 src/gtkaccount.c:149 src/gtkpounce.c:307
+#: src/gtkutils.c:839 src/protocols/jabber/auth.c:93
+#: src/protocols/jabber/buddy.c:568
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/blist.c:1439
+#: src/blist.c:1481
 msgid "Invalid Groupname"
 msgstr "Неисправан назив групе"
 
-#: src/blist.c:2219
+#: src/blist.c:2261
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "Дошло је до грешке при обради списка другара. Списак није учитан."
 
-#: src/blist.c:2221
+#: src/blist.c:2263
 msgid "Buddy List Error"
 msgstr "Грешка у списку другара"
 
@@ -1106,7 +1252,9 @@
 msgid ""
 "Communication with the browser failed. Please close all windows and try "
 "again."
-msgstr "Неуспешно споразумевање са веб читачем. Затворите све прозоре и покушајте поново."
+msgstr ""
+"Неуспешно споразумевање са веб читачем. Затворите све прозоре и покушајте "
+"поново."
 
 #: src/browser.c:570 src/browser.c:590 src/browser.c:598
 msgid "Unable to open URL"
@@ -1127,7 +1275,7 @@
 msgid "Error launching \"command\": %s"
 msgstr "Грешка при извршавању „наредбе“: %s"
 
-#: src/buddy_chat.c:316 src/dialogs.c:1318
+#: src/buddy_chat.c:316 src/gtkblist.c:2930
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1151,27 +1299,6 @@
 msgid "Join"
 msgstr "Прикључи се"
 
-#. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:487
-#: src/dialogs.c:499 src/dialogs.c:512 src/dialogs.c:533 src/dialogs.c:910
-#: src/dialogs.c:1602 src/dialogs.c:1717 src/dialogs.c:1783 src/dialogs.c:2045
-#: src/dialogs.c:2194 src/dialogs.c:2866 src/dialogs.c:3033 src/dialogs.c:3075
-#: src/dialogs.c:3212 src/dialogs.c:3556 src/gtkaccount.c:1547
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4200
-#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
-#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
-#: src/protocols/msn/msn.c:221 src/protocols/oscar/oscar.c:2420
-#: src/protocols/oscar/oscar.c:2457 src/protocols/oscar/oscar.c:2492
-#: src/protocols/oscar/oscar.c:2537 src/protocols/oscar/oscar.c:5790
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
-#: src/protocols/oscar/oscar.c:6118 src/protocols/trepia/trepia.c:379
-#: src/protocols/yahoo/yahoo.c:1632 src/prpl.c:164 src/request.h:813
-#: src/request.h:823
-msgid "Cancel"
-msgstr "Откажи"
-
 #: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
@@ -1190,88 +1317,75 @@
 msgid "Enter password for %s"
 msgstr "Унесите лозинку за %s"
 
-#. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1713 src/dialogs.c:1853
-#: src/dialogs.c:2044 src/dialogs.c:2190 src/dialogs.c:3032 src/dialogs.c:3074
-#: src/dialogs.c:3205 src/dialogs.c:3555 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:185
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6004 src/protocols/oscar/oscar.c:6053
-#: src/protocols/oscar/oscar.c:6117 src/protocols/yahoo/yahoo.c:1631
-#: src/request.h:813
-msgid "OK"
-msgstr "У реду"
-
-#: src/conversation.c:424
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "Не могу да пошаљем поруку. Порука је превелика."
 
-#: src/conversation.c:432
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "Не могу да пошаљем поруку."
 
-#: src/conversation.c:1983
+#: src/conversation.c:1888
 #, c-format
 msgid "%s entered the room."
 msgstr "%s је ушао(ла) у причаоницу."
 
-#: src/conversation.c:1986
+#: src/conversation.c:1891
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] је ушао(ла) у причаоницу."
 
-#: src/conversation.c:2071
+#: src/conversation.c:1976
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s је променио(ла) име у %s"
 
-#: src/conversation.c:2113
+#: src/conversation.c:2018
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s је напустио(ла) причаоницу (%s)."
 
-#: src/conversation.c:2115
+#: src/conversation.c:2020
 #, c-format
 msgid "%s left the room."
 msgstr "%s је напустио(ла) причаоницу."
 
 # bug: plural-forms
-#: src/conversation.c:2188
+#: src/conversation.c:2093
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d порука)"
 
-#: src/conversation.c:2190
+#: src/conversation.c:2095
 #, c-format
 msgid " left the room (%s)."
 msgstr "напусти причаоницу (%s)."
 
-#: src/conversation.c:2472
+#: src/conversation.c:2377
 msgid "Last created window"
 msgstr "Последње направљени прозор"
 
-#: src/conversation.c:2474
+#: src/conversation.c:2379
 msgid "New window"
 msgstr "Нови прозор"
 
-#: src/conversation.c:2476
+#: src/conversation.c:2381
 msgid "By group"
 msgstr "Према групи"
 
-#: src/conversation.c:2478
+#: src/conversation.c:2383
 msgid "By account"
 msgstr "Према налогу"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr "Упозори корисника"
 
-#: src/dialogs.c:338
+#: src/dialogs.c:317
 msgid "_Warn"
 msgstr "_Упозори"
 
-#: src/dialogs.c:354
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1284,36 +1398,36 @@
 "Ово ће увећати ниво обазривости за „%s“ и он или она ће имати строжије "
 "ограничење брзине слања порука.\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr "Упозори _анонимно?"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Анонимна упозорења су мањег утицаја.</b>"
 
-#: src/dialogs.c:483
+#: src/dialogs.c:462
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Уклањате %s са списка другара. Да ли желите да наставите?"
 
-#: src/dialogs.c:485 src/dialogs.c:486
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr "Уклони другара"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:474
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Уклањате разговор %s са списка другара. Да ли желите да наставите?"
 
-#: src/dialogs.c:497 src/dialogs.c:498
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Chat"
 msgstr "Уклони разговор"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:486
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1322,261 +1436,73 @@
 "Уклањате групу %s и све њене чланове из списка другара. Да ли желите да "
 "наставите?"
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "Уклони групу"
 
 # bug: plural-forms
-#: src/dialogs.c:528
+#: src/dialogs.c:507
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr "Уклањате групу %s и %d осталих чланова из списка другара. Да ли желите да наставите?"
-
-#: src/dialogs.c:531 src/dialogs.c:532
+msgstr ""
+"Уклањате групу %s и %d осталих чланова из списка другара. Да ли желите да "
+"наставите?"
+
+#: src/dialogs.c:510 src/dialogs.c:511
 msgid "Remove Contact"
 msgstr "Уклони контакт"
 
-#: src/dialogs.c:680
+#: src/dialogs.c:659
 msgid "New Message"
 msgstr "Нова порука"
 
-#: src/dialogs.c:698
+#: src/dialogs.c:677
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Унесите име особе којој желите да упутите брзу поруку.\n"
 
-#: src/dialogs.c:714 src/dialogs.c:791
+#: src/dialogs.c:693 src/dialogs.c:770
 msgid "_Screenname:"
 msgstr "_Име:"
 
-#: src/dialogs.c:729 src/dialogs.c:807 src/gtkpounce.c:408
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "_Налог:"
 
-#: src/dialogs.c:760
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr "Прибави податке о кориснику"
 
-#: src/dialogs.c:779
+#: src/dialogs.c:758
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "Унесите име особе чије податке желите да видите.\n"
 
-#: src/dialogs.c:906
-msgid "Add Group"
-msgstr "Додај групу"
-
-#: src/dialogs.c:906
-msgid "Add a new group"
-msgstr "Додај нову групу"
-
-#: src/dialogs.c:907
-msgid "Please enter the name of the group to be added."
-msgstr "Унесите назив групе коју желите да додате."
-
-#: src/dialogs.c:909 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2689 src/prpl.c:163
-msgid "Add"
-msgstr "Додај"
-
-#: src/dialogs.c:935 src/protocols/yahoo/yahoo.c:1565
-msgid "Add Buddy"
-msgstr "Додај другара"
-
-#: src/dialogs.c:954
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Унесите име особе коју желите да додате у списак другара. Према жељи можете "
-"унети и алијас или надимак за другара. Алијас ће се приказивати уместо "
-"имена, кад год је то могуће.\n"
-
-#: src/dialogs.c:973 src/gtkaccount.c:1624
-msgid "Screen Name"
-msgstr "Име"
-
-#: src/dialogs.c:986
-msgid "Alias"
-msgstr "Надимак"
-
-#: src/dialogs.c:996
-msgid "Group"
-msgstr "Група"
-
-#. Set up stuff for the account box
-#: src/dialogs.c:1005
-msgid "Add To"
-msgstr "Додај у"
-
-#: src/dialogs.c:1325
-msgid "Add Chat"
-msgstr "Додај разговор"
-
-#: src/dialogs.c:1348
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Унесите име које желите да наденете разговору, и податке о разговору који "
-"желите да додате у списак другара.\n"
-
-#: src/dialogs.c:1357
-msgid "Account:"
-msgstr "Налог:"
-
-#: src/dialogs.c:1376 src/gtkaccount.c:450
-msgid "Alias:"
-msgstr "Надимак:"
-
-#: src/dialogs.c:1387
-msgid "Group:"
-msgstr "Група:"
-
-#: src/dialogs.c:1466
-msgid "Set Directory Info"
-msgstr "Постави податке у именику"
-
-#: src/dialogs.c:1474
-msgid "Directory Info"
-msgstr "Именик са подацима"
-
-#: src/dialogs.c:1484
-#, c-format
-msgid "Setting Dir Info for %s:"
-msgstr "Постављам податке у именику за %s:"
-
-#: src/dialogs.c:1497
-msgid "Allow Web Searches To Find Your Info"
-msgstr "Дозволи да претраге веба пронађу моје податке"
-
-#. Line 1
-#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3968
-#: src/protocols/trepia/trepia.c:299
-msgid "First Name"
-msgstr "Име"
-
-#. Line 2
-#: src/dialogs.c:1511 src/dialogs.c:2073
-msgid "Middle Name"
-msgstr "Име оца"
-
-#. Line 3
-#: src/dialogs.c:1523 src/dialogs.c:2083 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3971 src/protocols/trepia/trepia.c:306
-msgid "Last Name"
-msgstr "Презиме"
-
-#. Line 4
-#: src/dialogs.c:1534 src/dialogs.c:2093
-msgid "Maiden Name"
-msgstr "Девојачко презиме"
-
-#. Line 5
-#: src/dialogs.c:1545 src/dialogs.c:2103 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
-#: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
-msgid "City"
-msgstr "Град"
-
-#. Line 6
-#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4020
-#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:367
-#: src/protocols/trepia/trepia.c:471
-msgid "State"
-msgstr "Област"
-
-#. Line 7
-#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3729
-#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
-msgid "Country"
-msgstr "Држава"
-
-#: src/dialogs.c:1598 src/dialogs.c:1779 src/dialogs.c:2854 src/dialogs.c:3518
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4199
-#: src/protocols/trepia/trepia.c:378
-msgid "Save"
-msgstr "Сачувај"
-
-#: src/dialogs.c:1621
-msgid "New passwords do not match."
-msgstr "Нове лозинке се не поклапају."
-
-#: src/dialogs.c:1627
-msgid "Fill out all fields completely."
-msgstr "Попуните сва поља у потпуности."
-
-#: src/dialogs.c:1656 src/dialogs.c:1665 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4418 src/protocols/oscar/oscar.c:6185
-#: src/protocols/toc/toc.c:1534
-msgid "Change Password"
-msgstr "Промена лозинке"
-
-#: src/dialogs.c:1672
-#, c-format
-msgid "Changing password for %s:"
-msgstr "Измена лозинке за %s:"
-
-#: src/dialogs.c:1680
-msgid "Original Password"
-msgstr "Стара лозинка"
-
-#: src/dialogs.c:1691
-msgid "New Password"
-msgstr "Нова лозинка"
-
-#: src/dialogs.c:1702
-msgid "New Password (again)"
-msgstr "Нова лозинка (поновите)"
-
-#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4404
-#: src/protocols/oscar/oscar.c:6171 src/protocols/toc/toc.c:1522
+#: src/dialogs.c:852 src/protocols/jabber/jabber.c:944
+#: src/protocols/oscar/oscar.c:6347 src/protocols/toc/toc.c:1531
 msgid "Set User Info"
 msgstr "Постави податке о кориснику"
 
-#: src/dialogs.c:1751
+#: src/dialogs.c:861
 #, c-format
 msgid "Changing info for %s:"
 msgstr "Мењам податке за %s:"
 
-#: src/dialogs.c:1839
-msgid "Below are the results of your search: "
-msgstr "Доле су резултати претраге: "
-
-#: src/dialogs.c:1958
+#: src/dialogs.c:963
 msgid "Log Conversation"
 msgstr "Дневник разговора"
 
-#: src/dialogs.c:2039 src/dialogs.c:2172
-msgid "Search for Buddy"
-msgstr "Тражи другара"
-
-#: src/dialogs.c:2139
-msgid "Find Buddy By Info"
-msgstr "Пронађи другара према подацима"
-
-#: src/dialogs.c:2166
-msgid "Find Buddy By Email"
-msgstr "Пронађи другара помоћу адресе е-поште"
-
-#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3731
-#: src/protocols/yahoo/yahoo.c:2041
-msgid "Email"
-msgstr "Е-пошта"
-
-#: src/dialogs.c:2270
+#: src/dialogs.c:1059
 msgid "Insert Link"
 msgstr "Убаци везу"
 
-#: src/dialogs.c:2272
+#: src/dialogs.c:1061
 msgid "Insert"
 msgstr "Убаци"
 
-#: src/dialogs.c:2291
+#: src/dialogs.c:1083
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -1584,91 +1510,92 @@
 "Унесите Интернет адресу и опис везе коју желите да убаците. Опис није "
 "обавезан.\n"
 
-#: src/dialogs.c:2315 src/protocols/jabber/jabber.c:3723
+#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/jabber.c:577
 msgid "URL"
 msgstr "Интернет адреса"
 
-#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1804
-#: src/protocols/jabber/jabber.c:3737
+#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1810
+#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:739
 msgid "Description"
 msgstr "Опис"
 
-#: src/dialogs.c:2460 src/dialogs.c:2477
+#: src/dialogs.c:1247 src/dialogs.c:1264
 msgid "Select Text Color"
 msgstr "Изаберите боју текста"
 
-#: src/dialogs.c:2512 src/dialogs.c:2529
+#: src/dialogs.c:1299 src/dialogs.c:1316
 msgid "Select Background Color"
 msgstr "Изаберите боју позадине"
 
-#: src/dialogs.c:2626 src/dialogs.c:2652
+#: src/dialogs.c:1401 src/dialogs.c:1427
 msgid "Select Font"
 msgstr "Изаберите писмо"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:1493
 msgid "You cannot save an away message with a blank title"
 msgstr "Не можете снимити поруку за одсуство без наслова"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:1495
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Наведите и наслов поруке, или изаберите „Користи“ за коришћење без снимања."
 
-#: src/dialogs.c:2730
+#: src/dialogs.c:1505
 msgid "You cannot create an empty away message"
 msgstr "Не можете направити празну поруку за одсуство"
 
-#: src/dialogs.c:2795 src/dialogs.c:2803
+#: src/dialogs.c:1570 src/dialogs.c:1578
 msgid "New away message"
 msgstr "Нова порука за одсуство"
 
-#: src/dialogs.c:2813
+#: src/dialogs.c:1588
 msgid "Away title: "
 msgstr "Наслов одсуства: "
 
-#: src/dialogs.c:2858
+#: src/dialogs.c:1638
 msgid "Save & Use"
 msgstr "Сачувај и користи"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:1642
 msgid "Use"
 msgstr "Користи"
 
 #. show everything
-#: src/dialogs.c:3011
+#: src/dialogs.c:1791
 msgid "Smile!"
 msgstr "Смешак!"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias Chat"
 msgstr "Надени име разговору"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias chat"
 msgstr "Надени име разговору"
 
-#: src/dialogs.c:3030
+#: src/dialogs.c:1810
 msgid "Please enter an aliased name for this chat."
 msgstr "Унесите ново име за овај разговор."
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:1841
 msgid "_Screenname"
 msgstr "_Име:"
 
-#: src/dialogs.c:3065 src/gtkblist.c:477 src/gtkblist.c:536
+#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
 msgid "_Alias"
 msgstr "Н_адени име"
 
-#: src/dialogs.c:3069
+#: src/dialogs.c:1850
 msgid "Alias Buddy"
 msgstr "Надени име другару"
 
-#: src/dialogs.c:3070
+#: src/dialogs.c:1851
 msgid "Alias buddy"
 msgstr "Надени име другару"
 
-#: src/dialogs.c:3071
+#: src/dialogs.c:1852
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
@@ -1676,66 +1603,54 @@
 "Унесите име које желите да наденете изабраној особи, или преименујте овај "
 "контакт у списку другара."
 
-#: src/dialogs.c:3107 src/dialogs.c:3114
+#: src/dialogs.c:1888 src/dialogs.c:1895
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Не могу да пишем у %s."
 
-#: src/dialogs.c:3138
+#: src/dialogs.c:1919
 msgid "Save Log File"
 msgstr "Сачувај датотеку дневника"
 
-#: src/dialogs.c:3168
+#: src/dialogs.c:1949
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Не могу да уклоним датотеку %s."
 
-#: src/dialogs.c:3187
+#: src/dialogs.c:1968
 msgid "Clear Log"
 msgstr "Очисти дневник"
 
-#: src/dialogs.c:3196
+#: src/dialogs.c:1977
 msgid "Really clear log?"
 msgstr "Заиста желите да очистите дневник?"
 
-#: src/dialogs.c:3241 src/dialogs.c:3412
+#: src/dialogs.c:2022 src/dialogs.c:2193
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "Не могу да отворим датотеку дневника %s."
 
-#: src/dialogs.c:3389
+#: src/dialogs.c:2170
 #, c-format
 msgid "Conversations with %s"
 msgstr "Разговори са %s"
 
-#: src/dialogs.c:3391
+#: src/dialogs.c:2172
 msgid "System Log"
 msgstr "Системски дневник"
 
-#: src/dialogs.c:3433
+#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:582
 msgid "Date"
 msgstr "Датум"
 
-#: src/dialogs.c:3490
+#: src/dialogs.c:2271
 msgid "Log"
 msgstr "Дневник рада"
 
-#: src/dialogs.c:3513
+#: src/dialogs.c:2294
 msgid "Clear"
 msgstr "Очисти"
 
-#: src/dialogs.c:3552
-msgid "Rename Group"
-msgstr "Преименуј групу"
-
-#: src/dialogs.c:3552
-msgid "New group name"
-msgstr "Назив нове групе"
-
-#: src/dialogs.c:3553
-msgid "Please enter a new name for the selected group."
-msgstr "Унесите нови назив за изабрану групу."
-
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1848,15 +1763,15 @@
 msgid "boring default"
 msgstr "Подразумевано (не тако) досадно"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1595
+#: src/gaimrc.c:1267 src/gtkblist.c:1716
 msgid "Alphabetical"
 msgstr "По азбучном реду"
 
-#: src/gaimrc.c:1269
+#: src/gaimrc.c:1269 src/gtkblist.c:1717
 msgid "By status"
 msgstr "По стању"
 
-#: src/gaimrc.c:1271
+#: src/gaimrc.c:1271 src/gtkblist.c:1718
 msgid "By log size"
 msgstr "По величини дневника"
 
@@ -1865,7 +1780,7 @@
 msgid "Could not open config file %s."
 msgstr "Не могу да отворим датотеку %s за поставке."
 
-#: src/gtkaccount.c:268
+#: src/gtkaccount.c:277
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1876,316 +1791,364 @@
 "<b>Величина:</b> %s\n"
 "<b>Димензије слике:</b> %dx%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3086
+#: src/gtkaccount.c:308 src/protocols/oscar/oscar.c:3060
 msgid "Buddy Icon"
 msgstr "Сличица другара"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:350
+#: src/gtkaccount.c:359
 msgid "Login Options"
 msgstr "Избори пријава"
 
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:376
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:381
 msgid "Screenname:"
 msgstr "Име:"
 
-#: src/gtkaccount.c:445 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:454 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: src/gtkaccount.c:454
+#: src/gtkaccount.c:459 src/gtkblist.c:2988
+msgid "Alias:"
+msgstr "Надимак:"
+
+#: src/gtkaccount.c:463
 msgid "Remember password"
 msgstr "Запамти лозинку"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:517
 msgid "User Options"
 msgstr "Кориснички избори"
 
-#: src/gtkaccount.c:521
-msgid "New mail notifications"
-msgstr "Обавештења о новопристиглој е-пошти"
-
 #: src/gtkaccount.c:530
-msgid "Buddy icon file:"
-msgstr "Датотека иконице другара:"
+msgid "New mail notifications"
+msgstr "Обавештења о новопристиглој е-пошти"
 
 #: src/gtkaccount.c:539
+msgid "Buddy icon file:"
+msgstr "Датотека иконице другара:"
+
+#: src/gtkaccount.c:548
 msgid "_Browse"
 msgstr "_Тражи"
 
-#: src/gtkaccount.c:545
+#: src/gtkaccount.c:554
 msgid "_Reset"
 msgstr "_Одбаци"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:606
+#: src/gtkaccount.c:615
 #, c-format
 msgid "%s Options"
 msgstr "%s опције"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:727
+#: src/gtkaccount.c:736
 msgid "Use Global Proxy Settings"
 msgstr "Користи општа подешавања проксија"
 
 #. No Proxy
-#: src/gtkaccount.c:734
+#: src/gtkaccount.c:743
 msgid "No Proxy"
 msgstr "Без проксија"
 
 #. HTTP
-#: src/gtkaccount.c:741
+#: src/gtkaccount.c:750
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:748
+#: src/gtkaccount.c:757
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:755
+#: src/gtkaccount.c:764
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:762 src/gtkprefs.c:1107
+#: src/gtkaccount.c:771 src/gtkprefs.c:1113
 msgid "Use Environmental Settings"
 msgstr "Користи подешавања окружења"
 
-#: src/gtkaccount.c:795
+#: src/gtkaccount.c:804
 msgid "you can see the butterflies mating"
 msgstr "можете видети како се лептири паре"
 
-#: src/gtkaccount.c:799
+#: src/gtkaccount.c:808
 msgid "If you look real closely"
 msgstr "Уколико погледате изблиза"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:824
 msgid "Proxy Options"
 msgstr "Поставке проксија"
 
-#: src/gtkaccount.c:831 src/gtkprefs.c:1101
+#: src/gtkaccount.c:840 src/gtkprefs.c:1107
 msgid "Proxy _type:"
 msgstr "_Врста проксија:"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:849
 msgid "_Host:"
 msgstr "_Сервер:"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:853
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: src/gtkaccount.c:852
+#: src/gtkaccount.c:861
 msgid "_Username:"
 msgstr "_Корисничко име:"
 
-#: src/gtkaccount.c:857
+#: src/gtkaccount.c:866
 msgid "Pa_ssword:"
 msgstr "_Лозинка:"
 
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1199
 msgid "Add Account"
 msgstr "Додај налог"
 
-#: src/gtkaccount.c:1192
+#: src/gtkaccount.c:1201
 msgid "Modify Account"
 msgstr "Измени налог"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1216
+#: src/gtkaccount.c:1225
 msgid "Show more options"
 msgstr "Покажи више поставки"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1226
 msgid "Show fewer options"
 msgstr "Покажи мање поставки"
 
 #. Register button
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1253 src/protocols/jabber/jabber.c:595
 msgid "Register"
 msgstr "Региструј се"
 
-#: src/gtkaccount.c:1542
+#: src/gtkaccount.c:1551
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Да ли сте сигурни да желите обрисати %s?"
 
-#: src/gtkaccount.c:1546 src/gtkrequest.c:192
+#: src/gtkaccount.c:1555 src/gtkrequest.c:201
 msgid "Delete"
 msgstr "Обриши"
 
-#. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3529
-#: src/protocols/jabber/jabber.c:3579 src/protocols/oscar/oscar.c:2847
-#: src/protocols/oscar/oscar.c:4598 src/protocols/oscar/oscar.c:5911
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:873
-#: src/protocols/zephyr/zephyr.c:883
+#: src/gtkaccount.c:1633 src/gtkblist.c:2666
+msgid "Screen Name"
+msgstr "Име"
+
+#: src/gtkaccount.c:1656 src/protocols/jabber/jabber.c:836
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:6056 src/protocols/yahoo/yahoo.c:1838
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "На вези"
 
-#: src/gtkaccount.c:1665
+#: src/gtkaccount.c:1674
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/gtkblist.c:450
+#: src/gtkaccount.c:1963
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+msgstr "%s%s%s%s учини %s својим другаром%s%s%s"
+
+#: src/gtkaccount.c:1977
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"Да ли желите да додате њу или њега у свој списак другара?"
+
+#: src/gtkaccount.c:1981
+msgid "Gaim - Information"
+msgstr "Гаим — подаци"
+
+#: src/gtkaccount.c:1985
+msgid "Add buddy to your list?"
+msgstr "Додати другара у Ваш списак?"
+
+#: src/gtkaccount.c:1987 src/gtkblist.c:3036 src/gtkconv.c:1137
+#: src/gtkconv.c:2979 src/gtkconv.c:4154 src/gtkrequest.c:202
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+msgid "Add"
+msgstr "Додај"
+
+#: src/gtkblist.c:496
 msgid "_Get Info"
 msgstr "Прибави пода_тке"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:499
 msgid "_IM"
 msgstr "_Порука"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:501
 msgid "Add Buddy _Pounce"
 msgstr "Додај _заседу другару"
 
-#: src/gtkblist.c:457
+#: src/gtkblist.c:503
 msgid "View _Log"
 msgstr "Преглед дневни_ка"
 
-#: src/gtkblist.c:479 src/gtkblist.c:538 src/gtkblist.c:548
+#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: src/gtkblist.c:517
+#: src/gtkblist.c:597
 msgid "Add a _Buddy"
 msgstr "_Додај другара"
 
-#: src/gtkblist.c:519
+#: src/gtkblist.c:599
 msgid "Add a C_hat"
 msgstr "Додај _разговор"
 
-#: src/gtkblist.c:521
+#: src/gtkblist.c:601
 msgid "_Delete Group"
 msgstr "У_клони групу"
 
-#: src/gtkblist.c:523
+#: src/gtkblist.c:603
 msgid "_Rename"
 msgstr "Пре_именуј"
 
-#: src/gtkblist.c:531
+#: src/gtkblist.c:611
 msgid "_Join"
 msgstr "_Прикључи се"
 
-#: src/gtkblist.c:533
+#: src/gtkblist.c:613
 msgid "Auto-Join"
 msgstr "Аутоматска пријава"
 
-#: src/gtkblist.c:544 src/gtkblist.c:575
+#: src/gtkblist.c:622 src/gtkblist.c:653
 msgid "_Collapse"
 msgstr "_Скупи"
 
-#: src/gtkblist.c:580
+#: src/gtkblist.c:658
 msgid "_Expand"
 msgstr "_Разгранај"
 
 #. Buddies menu
-#: src/gtkblist.c:1005
+#: src/gtkblist.c:1088
 msgid "/_Buddies"
 msgstr "/_Другари"
 
-#: src/gtkblist.c:1006
+#: src/gtkblist.c:1089
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Другари/_Нова брза порука..."
 
-#: src/gtkblist.c:1007
+#: src/gtkblist.c:1090
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Другари/_Прикључи се разговору..."
 
-#: src/gtkblist.c:1008
+#: src/gtkblist.c:1091
 msgid "/Buddies/Get _User Info..."
 msgstr "/Другари/Прибави податке о _кориснику..."
 
-#: src/gtkblist.c:1010
+#: src/gtkblist.c:1093
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Другари/Прикажи неп_овезане другаре"
 
-#: src/gtkblist.c:1011
+#: src/gtkblist.c:1094
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Другари/Прикажи _празне групе"
 
-#: src/gtkblist.c:1012
+#: src/gtkblist.c:1095
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/Другари/_Додај другара..."
 
-#: src/gtkblist.c:1013
+#: src/gtkblist.c:1096
 msgid "/Buddies/Add a C_hat..."
 msgstr "/Другари/Додај разго_вор..."
 
-#: src/gtkblist.c:1014
+#: src/gtkblist.c:1097
 msgid "/Buddies/Add a _Group..."
 msgstr "/Другари/Додај _групу..."
 
-#: src/gtkblist.c:1016
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr "/Другари/_Одјава"
 
-#: src/gtkblist.c:1017
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr "/Другари/И_злаз"
 
 #. Tools
-#: src/gtkblist.c:1020
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "/_Алати"
 
-#: src/gtkblist.c:1021
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr "/Алати/_Одсутан"
 
-#: src/gtkblist.c:1022
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Алати/_Заседа другару"
 
-#: src/gtkblist.c:1023
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Алати/А_кције по протоколу"
 
-#: src/gtkblist.c:1025
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr "/Алати/_Налози"
 
-#: src/gtkblist.c:1026
+#: src/gtkblist.c:1109
 msgid "/Tools/_File Transfers..."
 msgstr "/Алати/Преноси _датотека..."
 
-#: src/gtkblist.c:1027
+#: src/gtkblist.c:1110
 msgid "/Tools/Preferences"
 msgstr "/Алати/Поставке"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr "/Алати/_Приватност"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr "/Алати/Преглед _системског дневника рада"
 
 #. Help
-#: src/gtkblist.c:1033
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "/_Помоћ"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr "/Помоћ/Помоћ из _програма"
 
-#: src/gtkblist.c:1035
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr "/Помоћ/Прозор за налажење _грешака"
 
-#: src/gtkblist.c:1036
+#: src/gtkblist.c:1119
 msgid "/Help/_About"
 msgstr "/Помоћ/_О програму"
 
-#: src/gtkblist.c:1066
+#: src/gtkblist.c:1135
+msgid "Rename Group"
+msgstr "Преименуј групу"
+
+#: src/gtkblist.c:1135
+msgid "New group name"
+msgstr "Назив нове групе"
+
+#: src/gtkblist.c:1136
+msgid "Please enter a new name for the selected group."
+msgstr "Унесите нови назив за изабрану групу."
+
+#: src/gtkblist.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -2194,16 +2157,16 @@
 "\n"
 "<b>Налог:</b> %s"
 
-#: src/gtkblist.c:1125 src/protocols/oscar/oscar.c:5498
+#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5437
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Стање:</b> Неповезан"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1236
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1151
+#: src/gtkblist.c:1250
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2211,7 +2174,7 @@
 "\n"
 "<b>Налог:</b>"
 
-#: src/gtkblist.c:1152
+#: src/gtkblist.c:1251
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2219,7 +2182,7 @@
 "\n"
 "<b>Познат као:</b>"
 
-#: src/gtkblist.c:1153
+#: src/gtkblist.c:1252
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2227,7 +2190,7 @@
 "\n"
 "<b>Надимак:</b>"
 
-#: src/gtkblist.c:1154
+#: src/gtkblist.c:1253
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2235,7 +2198,7 @@
 "\n"
 "<b>Неактиван:</b>"
 
-#: src/gtkblist.c:1155
+#: src/gtkblist.c:1254
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2243,7 +2206,7 @@
 "\n"
 "<b>Упозорен:</b>"
 
-#: src/gtkblist.c:1157
+#: src/gtkblist.c:1256
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2251,7 +2214,7 @@
 "\n"
 "<b>Опис:</b> сабласно"
 
-#: src/gtkblist.c:1158
+#: src/gtkblist.c:1257
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2259,7 +2222,7 @@
 "\n"
 "<b>Стање:</b> сјајно"
 
-#: src/gtkblist.c:1159
+#: src/gtkblist.c:1258
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2267,81 +2230,140 @@
 "\n"
 "<b>Стање:</b> разбија"
 
-#: src/gtkblist.c:1413
+#: src/gtkblist.c:1513
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Неактиван (%dh%02dm) "
 
-#: src/gtkblist.c:1415
+#: src/gtkblist.c:1515
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Неактиван (%dm) "
 
-#: src/gtkblist.c:1419
+#: src/gtkblist.c:1519
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Упозорен (%d%%) "
 
-#: src/gtkblist.c:1422
+#: src/gtkblist.c:1522
 msgid "Offline "
 msgstr "Неповезан"
 
-#: src/gtkblist.c:1594 src/gtkprefs.c:841 src/gtkprefs.c:1499
+#: src/gtkblist.c:1714 src/gtkprefs.c:842 src/gtkprefs.c:1502
 msgid "None"
 msgstr "Ништа"
 
-#: src/gtkblist.c:1659
+#: src/gtkblist.c:1779
 msgid "/Tools/Away"
 msgstr "/Алати/Одсутан"
 
-#: src/gtkblist.c:1662
+#: src/gtkblist.c:1782
 msgid "/Tools/Buddy Pounce"
 msgstr "/Алати/Заседа другару"
 
-#: src/gtkblist.c:1665
+#: src/gtkblist.c:1785
 msgid "/Tools/Protocol Actions"
 msgstr "/Алати/Акције по протоколу"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1748
+#: src/gtkblist.c:1869
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Другари/Прикажи неповезане другаре"
 
-#: src/gtkblist.c:1750
+#: src/gtkblist.c:1871
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Другари/Прикажи празне групе"
 
-#: src/gtkblist.c:1768 src/gtkconv.c:1073
+#: src/gtkblist.c:1889 src/gtkconv.c:1096
 msgid "IM"
 msgstr "Порука"
 
-#: src/gtkblist.c:1774
+#: src/gtkblist.c:1895
 msgid "Send a message to the selected buddy"
 msgstr "Пошаљи поруку изабраном другару"
 
-#: src/gtkblist.c:1777 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1898 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Подаци"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:1904
 msgid "Get information on the selected buddy"
 msgstr "Прибави податке о изабраном другару"
 
-#: src/gtkblist.c:1786 src/protocols/oscar/oscar.c:3095
+#: src/gtkblist.c:1907 src/protocols/oscar/oscar.c:3069
 msgid "Chat"
 msgstr "Разговор"
 
-#: src/gtkblist.c:1791
+#: src/gtkblist.c:1912
 msgid "Join a chat room"
 msgstr "Прикључи се причаоници"
 
-#: src/gtkblist.c:1799
+#: src/gtkblist.c:1920
 msgid "Set an away message"
 msgstr "Постави поруку за одсуство"
 
-#: src/gtkblist.c:2846
+#: src/gtkblist.c:2621 src/protocols/yahoo/yahoo.c:1972
+msgid "Add Buddy"
+msgstr "Додај другара"
+
+#: src/gtkblist.c:2644
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Унесите име особе коју желите да додате у списак другара. Према жељи можете "
+"унети и алијас или надимак за другара. Алијас ће се приказивати уместо "
+"имена, кад год је то могуће.\n"
+
+#: src/gtkblist.c:2679
+msgid "Alias"
+msgstr "Надимак"
+
+#: src/gtkblist.c:2692
+msgid "Group"
+msgstr "Група"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:2701
+msgid "Add To"
+msgstr "Додај у"
+
+#: src/gtkblist.c:2937
+msgid "Add Chat"
+msgstr "Додај разговор"
+
+#: src/gtkblist.c:2960
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Унесите име које желите да наденете разговору, и податке о разговору који "
+"желите да додате у списак другара.\n"
+
+#: src/gtkblist.c:2970
+msgid "Account:"
+msgstr "Налог:"
+
+#: src/gtkblist.c:2999
+msgid "Group:"
+msgstr "Група:"
+
+#: src/gtkblist.c:3033
+msgid "Add Group"
+msgstr "Додај групу"
+
+#: src/gtkblist.c:3033
+msgid "Add a new group"
+msgstr "Додај нову групу"
+
+#: src/gtkblist.c:3034
+msgid "Please enter the name of the group to be added."
+msgstr "Унесите назив групе коју желите да додате."
+
+#: src/gtkblist.c:3546
 msgid "No actions available"
 msgstr "Нема доступних акција"
 
@@ -2370,24 +2392,29 @@
 msgid "Reason Unknown."
 msgstr "Разлог непознат."
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:185
 msgid "That file already exists"
 msgstr "Датотека већ постоји."
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "Да ли желите да је препишете?"
 
-#: src/gtkconv.c:280
+#: src/gtkconv.c:241
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Не могу да сачувам слику: %s.\n"
+
+#: src/gtkconv.c:303
 msgid "Gaim - Insert Image"
 msgstr "Гаим — убаци слику"
 
-#: src/gtkconv.c:584
+#: src/gtkconv.c:607
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Гаим — позови другара у причаоницу"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:635
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2395,301 +2422,301 @@
 "Унесите име корисника кога желите да позовете, а по жељи додајте и поруку у "
 "позивницу."
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:656
 msgid "_Buddy:"
 msgstr "_Другар:"
 
-#: src/gtkconv.c:653
+#: src/gtkconv.c:676
 msgid "_Message:"
 msgstr "_Порука:"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1104
 msgid "Un-Ignore"
 msgstr "Не игнориши"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:773
+#: src/gtkconv.c:1106 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "Игнориши"
 
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2978
+#: src/gtkconv.c:1115 src/gtkconv.c:3002
 msgid "Info"
 msgstr "Подаци"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3491
+#: src/gtkconv.c:1124
 msgid "Get Away Msg"
 msgstr "Прибави поруку за одсуство"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2961 src/gtkconv.c:4123
-#: src/gtkrequest.c:194
+#: src/gtkconv.c:1135 src/gtkconv.c:2985 src/gtkconv.c:4139
+#: src/gtkrequest.c:203
 msgid "Remove"
 msgstr "Уклони"
 
-#: src/gtkconv.c:2187
+#: src/gtkconv.c:2210
 msgid "User is typing..."
 msgstr "Корисник куца..."
 
-#: src/gtkconv.c:2195
+#: src/gtkconv.c:2218
 msgid "User has typed something and paused"
 msgstr "Корисник је нешто укуцао и застао"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2297
+#: src/gtkconv.c:2321
 msgid "_Send As"
 msgstr "Пошаљи _као"
 
-#: src/gtkconv.c:2757
+#: src/gtkconv.c:2781
 msgid "Gaim - Save Conversation"
 msgstr "Гаим — сачувај разговор"
 
 #. Conversation menu
-#: src/gtkconv.c:2774
+#: src/gtkconv.c:2798
 msgid "/_Conversation"
 msgstr "/_Разговор"
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2800
 msgid "/Conversation/_Save As..."
 msgstr "/Разговор/_Сачувај као..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2802
 msgid "/Conversation/View _Log..."
 msgstr "/Разговор/Погледај _дневник..."
 
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2806
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Разговор/Додај _заседу другару..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2808
 msgid "/Conversation/A_lias..."
 msgstr "/Разговор/_Надени име..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2810
 msgid "/Conversation/_Get Info..."
 msgstr "/Разговор/При_бави податке..."
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:2812
 msgid "/Conversation/In_vite..."
 msgstr "/Разговор/_Позови..."
 
-#: src/gtkconv.c:2793
+#: src/gtkconv.c:2817
 msgid "/Conversation/Insert _URL..."
 msgstr "/Разговор/_Убаци Интернет адресу..."
 
-#: src/gtkconv.c:2795
+#: src/gtkconv.c:2819
 msgid "/Conversation/Insert _Image..."
 msgstr "/Разговор/Убаци с_лику..."
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2824
 msgid "/Conversation/_Warn..."
 msgstr "/Разговор/_Упозори..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2826
 msgid "/Conversation/_Block..."
 msgstr "/Разговор/_Блокирај..."
 
-#: src/gtkconv.c:2804
+#: src/gtkconv.c:2828
 msgid "/Conversation/_Add..."
 msgstr "/Разговор/_Додај..."
 
-#: src/gtkconv.c:2806
+#: src/gtkconv.c:2830
 msgid "/Conversation/_Remove..."
 msgstr "/Разговор/_Уклони..."
 
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2835
 msgid "/Conversation/_Close"
 msgstr "/Разговор/_Заврши"
 
 #. Options
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2839
 msgid "/_Options"
 msgstr "/_Избори"
 
-#: src/gtkconv.c:2816
+#: src/gtkconv.c:2840
 msgid "/Options/Enable _Logging"
 msgstr "/Избори/Омогући _дневник рада"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2841
 msgid "/Options/Enable _Sounds"
 msgstr "/Избори/Омогући з_вуке"
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2881
 msgid "/Conversation/View Log..."
 msgstr "/Разговор/Прикажи _дневник..."
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2886
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Разговор/Додај _заседу другару..."
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2890
 msgid "/Conversation/Alias..."
 msgstr "/Разговор/Надени име..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2894
 msgid "/Conversation/Get Info..."
 msgstr "/Разговор/Прибави податке..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2898
 msgid "/Conversation/Invite..."
 msgstr "/Разговор/Подаци..."
 
-#: src/gtkconv.c:2880
+#: src/gtkconv.c:2904
 msgid "/Conversation/Insert URL..."
 msgstr "/Разговор/Убаци Интернет адресу..."
 
-#: src/gtkconv.c:2884
+#: src/gtkconv.c:2908
 msgid "/Conversation/Insert Image..."
 msgstr "/Разговор/Убаци слику..."
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:2914
 msgid "/Conversation/Warn..."
 msgstr "/Разговор/Упозори..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2918
 msgid "/Conversation/Block..."
 msgstr "/Разговор/Блокирај..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2922
 msgid "/Conversation/Add..."
 msgstr "/Разговор/Додај..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2926
 msgid "/Conversation/Remove..."
 msgstr "/Разговор/Уклони..."
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2932
 msgid "/Options/Enable Logging"
 msgstr "/Избори/Омогући записе"
 
-#: src/gtkconv.c:2911
+#: src/gtkconv.c:2935
 msgid "/Options/Enable Sounds"
 msgstr "/Избори/Омогући звуке"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2935 src/gtkconv.c:2937 src/gtkconv.c:3035 src/gtkconv.c:3037
-#: src/gtkconv.c:5918
+#: src/gtkconv.c:2959 src/gtkconv.c:2961 src/gtkconv.c:3059 src/gtkconv.c:3061
+#: src/gtkconv.c:5925
 msgid "Send"
 msgstr "Пошаљи"
 
-#: src/gtkconv.c:2958 src/gtkconv.c:4141
+#: src/gtkconv.c:2982 src/gtkconv.c:4157
 msgid "Add the user to your buddy list"
 msgstr "Додавање корисника у Ваш списак другара"
 
-#: src/gtkconv.c:2964 src/gtkconv.c:4126
+#: src/gtkconv.c:2988 src/gtkconv.c:4142
 msgid "Remove the user from your buddy list"
 msgstr "Уклањање корисника са Вашег списак другара"
 
 #. Warn button
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:2995
 msgid "Warn"
 msgstr "Упозори"
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:2999
 msgid "Warn the user"
 msgstr "Упозори корисника"
 
-#: src/gtkconv.c:2982 src/gtkconv.c:3417
+#: src/gtkconv.c:3006 src/gtkconv.c:3441
 msgid "Get the user's information"
 msgstr "Прибави податке о кориснику"
 
 #. Block button
-#: src/gtkconv.c:2985 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3009 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Блокирај"
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:3013
 msgid "Block the user"
 msgstr "Блокирај корисника"
 
 #. Invite
-#: src/gtkconv.c:3047 src/gtkconv.c:5921
+#: src/gtkconv.c:3071 src/gtkconv.c:5928
 msgid "Invite"
 msgstr "Позови"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3074
 msgid "Invite a user"
 msgstr "Позови корисника"
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3113
 msgid "Bold"
 msgstr "Масно"
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3124
 msgid "Italic"
 msgstr "Курзив"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3135
 msgid "Underline"
 msgstr "Подвучено"
 
-#: src/gtkconv.c:3127
-msgid "Larger font size"
-msgstr "Већа слова"
-
-#: src/gtkconv.c:3139
-msgid "Normal font size"
-msgstr "Обична слова"
-
 #: src/gtkconv.c:3151
+msgid "Larger font size"
+msgstr "Већа слова"
+
+#: src/gtkconv.c:3163
+msgid "Normal font size"
+msgstr "Обична слова"
+
+#: src/gtkconv.c:3175
 msgid "Smaller font size"
 msgstr "Мања слова"
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3192
 msgid "Font Face"
 msgstr "Писмо"
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3204
 msgid "Foreground font color"
 msgstr "Боја текста"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3216
 msgid "Background color"
 msgstr "Боја позадине"
 
-#: src/gtkconv.c:3207
+#: src/gtkconv.c:3231
 msgid "Insert image"
 msgstr "Убаци слику"
 
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3242
 msgid "Insert link"
 msgstr "Убаци везу"
 
-#: src/gtkconv.c:3229
+#: src/gtkconv.c:3253
 msgid "Insert smiley"
 msgstr "Убаци смешак"
 
-#: src/gtkconv.c:3286
+#: src/gtkconv.c:3310
 msgid "Topic:"
 msgstr "Тема:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3337
+#: src/gtkconv.c:3361
 msgid "0 people in room"
 msgstr "Нема никога у причаоници"
 
-#: src/gtkconv.c:3394
+#: src/gtkconv.c:3418
 msgid "IM the user"
 msgstr "Пошаљи брзу поруку кориснику"
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3430
 msgid "Ignore the user"
 msgstr "Игнориши корисника"
 
-#: src/gtkconv.c:3908 src/server.c:1393
+#: src/gtkconv.c:3924 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> —— Нови разговор @ %s ——</H3><BR>\n"
 
-#: src/gtkconv.c:3912 src/server.c:1396
+#: src/gtkconv.c:3928 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "—— Нови разговори @  %s ——\n"
 
-#: src/gtkconv.c:3945
+#: src/gtkconv.c:3961
 msgid "Close conversation"
 msgstr "Окончај разговор"
 
-#: src/gtkconv.c:4619 src/gtkconv.c:4651 src/gtkconv.c:4772 src/gtkconv.c:4839
+#: src/gtkconv.c:4646 src/gtkconv.c:4678 src/gtkconv.c:4799 src/gtkconv.c:4866
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2697,23 +2724,23 @@
 msgstr[1] "%d особе у причаоници."
 msgstr[2] "%d особа у причаоници."
 
-#: src/gtkconv.c:5188
+#: src/gtkconv.c:5197
 msgid "Disable Animation"
 msgstr "Онемогући анимације"
 
-#: src/gtkconv.c:5197
+#: src/gtkconv.c:5206
 msgid "Enable Animation"
 msgstr "Омогући анимације"
 
-#: src/gtkconv.c:5204
+#: src/gtkconv.c:5213
 msgid "Hide Icon"
 msgstr "Сакриј иконицу"
 
-#: src/gtkconv.c:5210
+#: src/gtkconv.c:5219
 msgid "Save Icon As..."
 msgstr "Сачувај иконицу као..."
 
-#: src/gtkconv.c:5688 src/gtkconv.c:5691
+#: src/gtkconv.c:5695 src/gtkconv.c:5698
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Разговор/Заврши"
 
@@ -2821,7 +2848,7 @@
 msgid "Gaim - Open..."
 msgstr "Гаим — Отвори..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2030
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
 msgid "Gaim - Save As..."
 msgstr "Гаим — Сачувај као..."
 
@@ -2838,7 +2865,7 @@
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у прегледнику"
 
-#: src/gtkimhtml.c:1652
+#: src/gtkimhtml.c:1616
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2846,20 +2873,20 @@
 "Гаим није успео да погоди врсту записа слике на основу наведеног наставка "
 "датотеке. Подразумевано се ради о PNG запису."
 
-#: src/gtkimhtml.c:1660
+#: src/gtkimhtml.c:1624
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Грешка при снимању слике: %s"
 
-#: src/gtkimhtml.c:1669
+#: src/gtkimhtml.c:1633
 msgid "Save Image"
 msgstr "Сачувај слику"
 
-#: src/gtkimhtml.c:1691
+#: src/gtkimhtml.c:1656
 msgid "_Save Image..."
 msgstr "_Сачувај слику..."
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -2867,17 +2894,17 @@
 msgstr[1] "%s је примио %d нове поруке."
 msgstr[2] "%s је примио %d нових порука."
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Од:</span> %s\n"
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Тема:</span> %s\n"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2888,7 +2915,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2942,8 +2969,8 @@
 msgid "Return from away"
 msgstr "Врати се са одсуства"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1496 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1427
+#: src/gtkpounce.c:465 src/gtkprefs.c:1499 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Idle"
 msgstr "Неактиван"
 
@@ -2988,7 +3015,7 @@
 msgid "Browse"
 msgstr "Претражи"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2082
+#: src/gtkpounce.c:518 src/gtkprefs.c:2088
 msgid "Test"
 msgstr "Испробај"
 
@@ -3040,15 +3067,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Непозната заседа. Молимо Вас да ово пријавите!"
 
-#: src/gtkprefs.c:377
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr "Поставке сучеља"
 
-#: src/gtkprefs.c:379
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "Прикажи удаљене надимке уколико алијас није постављен"
 
-#: src/gtkprefs.c:560
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3056,180 +3083,180 @@
 "Изаберите скуп смешака који желите да користите из доњег списка. Нови "
 "скупови се могу додати превлачењем и пуштањем истих на списак скупова."
 
-#: src/gtkprefs.c:593
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "Иконица"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "Стил"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "_Масно"
 
-#: src/gtkprefs.c:670
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "_Курзивно"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "По_двучено"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "П_рецртано"
 
-#: src/gtkprefs.c:677
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "Писмо"
 
-#: src/gtkprefs.c:680
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "Користи _изабрано писмо"
 
-#: src/gtkprefs.c:697
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "Користи изабрану _величину"
 
-#: src/gtkprefs.c:710
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "Боја"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "Боја _текста"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "Боја _позадине"
 
-#: src/gtkprefs.c:761 src/gtkprefs.c:998 src/gtkprefs.c:1051
+#: src/gtkprefs.c:762 src/gtkprefs.c:1004 src/gtkprefs.c:1057
 msgid "Display"
 msgstr "Приказ"
 
-#: src/gtkprefs.c:762
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "Прикажи _графички смешак"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "Прикажи _временске ознаке порука"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "Прикажи _Интернет адресе као везе"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "Истакни гре_шке у куцању"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "Занемари _боје"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "Занемари _писмо"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "Занемари величину _слова"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "Слање поруке"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "Ентер _шаље поруку"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "Control+Ентер ш_аље поруку"
 
-#: src/gtkprefs.c:797
-msgid "Window Closing"
-msgstr "Затварање прозора"
-
 #: src/gtkprefs.c:798
+msgid "Window Closing"
+msgstr "Затварање прозора"
+
+#: src/gtkprefs.c:799
 msgid "_Escape closes window"
 msgstr "Esc затвара _прозор"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "Убацивање"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:803
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Control-{B/I/U/S} убацује HTML _ознаке"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(број) убацује _смешак"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "Поредак у списку другара"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "_Поредак:"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "Алатке у списку другара"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:837 src/gtkprefs.c:974 src/gtkprefs.c:1030
 msgid "Show _buttons as:"
 msgstr "Прикажи _дугмад као:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:839 src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "Pictures"
 msgstr "Слике"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:840 src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "Text"
 msgstr "Текст"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:841 src/gtkprefs.c:978 src/gtkprefs.c:1034
 msgid "Pictures and text"
 msgstr "Слике и текст"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:986 src/gtkprefs.c:1042
+#: src/gtkprefs.c:846 src/gtkprefs.c:992 src/gtkprefs.c:1048
 msgid "_Raise window on events"
 msgstr "_Издигни прозор на догађаје"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "Приказ група"
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr "Прикажи _бројеве у групама"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr "Приказ другара"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:993
+#: src/gtkprefs.c:855 src/gtkprefs.c:999
 msgid "Show buddy _icons"
 msgstr "Прикажи и_конице другара"
 
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr "Прикажи _нивое упозорења"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:860
 msgid "Show idle _times"
 msgstr "Прикажи _трајање неактивности"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:874
 msgid "Dim i_dle buddies"
 msgstr "_Осенчи неактивне другаре"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:899
 msgid "_Placement:"
 msgstr "_Размештај:"
 
@@ -3265,150 +3292,149 @@
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Прикажи брзе поруке и разговоре у прозорима помоћу _листова"
 
-#. XXX: grey this out when the above is unchecked
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:925
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Прикажи брзе поруке и разговоре у _истом лиснатом прозору"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:935
 msgid "Show _close button on tabs"
 msgstr "Прикажи дугме за затвара_ње на језичцима."
 
-#: src/gtkprefs.c:940
+#: src/gtkprefs.c:946
 msgid "Show status _icons on tabs"
 msgstr "Прикажи иконицу стања на језичцима."
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1023
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "Window"
 msgstr "Прозор"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:983 src/gtkprefs.c:1039
 msgid "New window _width:"
 msgstr "_Ширина новог прозора:"
 
-#: src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:986 src/gtkprefs.c:1042
 msgid "New window _height:"
 msgstr "_Висина новог прозора:"
 
-#: src/gtkprefs.c:983 src/gtkprefs.c:1039
+#: src/gtkprefs.c:989 src/gtkprefs.c:1045
 msgid "_Entry field height:"
 msgstr "Висина поља за _унос:"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:994
 msgid "Hide window on _send"
 msgstr "_Сакриј прозор при слању"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:998
 msgid "Buddy Icons"
 msgstr "Иконице другара"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:1001
 msgid "Enable buddy icon a_nimation"
 msgstr "Укључи _анимацију иконице другара"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1005
 msgid "Show _logins in window"
 msgstr "Прикажи _пријаве у прозору"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1007
 msgid "Show a_liases in tabs/titles"
 msgstr "Прикажи а_лијасе у језичцима/насловима"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1010
 msgid "Typing Notification"
 msgstr "Обавештење о куцању"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1011
 msgid "Notify buddies that you are _typing to them"
 msgstr "Слање обавештења другарима када им пише_те"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1051
 msgid "Tab Completion"
 msgstr "Довршавање табулатором"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1052
 msgid "_Tab-complete nicks"
 msgstr "Доврши надимке на притисак _табулатора"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1054
 msgid "_Old-style tab completion"
 msgstr "_Старомодно довршавање помоћу табулатора"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1058
 msgid "_Show people joining in window"
 msgstr "Прикажи у прозору људе који се _прикључују"
 
-#: src/gtkprefs.c:1054
+#: src/gtkprefs.c:1060
 msgid "_Show people leaving in window"
 msgstr "Прикажи у прозору људе који _одлазе"
 
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1062
 msgid "Co_lorize screennames"
 msgstr "_Бојење имена"
 
-#: src/gtkprefs.c:1100
+#: src/gtkprefs.c:1106
 msgid "Proxy Type"
 msgstr "Врста проксија"
 
-#: src/gtkprefs.c:1103
+#: src/gtkprefs.c:1109
 msgid "No proxy"
 msgstr "Без проксија"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1116
 msgid "Proxy Server"
 msgstr "Прокси сервер"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1137
 msgid "_Host"
 msgstr "_Име сервера"
 
-#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4528 src/protocols/msn/msn.c:1529
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
+#: src/gtkprefs.c:1154 src/protocols/irc/irc.c:516
+#: src/protocols/jabber/jabber.c:1057 src/protocols/msn/msn.c:1616
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
 msgid "Port"
 msgstr "Порт"
 
-#: src/gtkprefs.c:1166
+#: src/gtkprefs.c:1172
 msgid "_User"
 msgstr "_Корисник"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1189
 msgid "Pa_ssword"
 msgstr "_Лозинка"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1226
 msgid "Opera"
 msgstr "Опера"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1227
 msgid "Netscape"
 msgstr "Нетскејп"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1228
 msgid "Mozilla"
 msgstr "Мозила"
 
-#: src/gtkprefs.c:1223
+#: src/gtkprefs.c:1229
 msgid "Konqueror"
 msgstr "Конкверор"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1230
 msgid "Galeon"
 msgstr "Галеон"
 
-#: src/gtkprefs.c:1233
+#: src/gtkprefs.c:1239
 msgid "Manual"
 msgstr "Ручна поставка"
 
-#: src/gtkprefs.c:1274
+#: src/gtkprefs.c:1280
 msgid "Browser Selection"
 msgstr "Избор прегледника"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1284
 msgid "_Browser:"
 msgstr "_Веб прегледник:"
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1294
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3417,87 +3443,87 @@
 "_Ручно:\n"
 "(%s за адресу)"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1315
 msgid "Browser Options"
 msgstr "Поставке веб прегледника"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1316
 msgid "Open new _window by default"
 msgstr "Отварање новог _прозора је подразумевано"
 
-#: src/gtkprefs.c:1325
+#: src/gtkprefs.c:1331
 msgid "Message Logs"
 msgstr "Дневник порука"
 
-#: src/gtkprefs.c:1326
+#: src/gtkprefs.c:1332
 msgid "_Log all instant messages"
 msgstr "Бележи све _брзе поруке"
 
-#: src/gtkprefs.c:1328
+#: src/gtkprefs.c:1334
 msgid "Log all c_hats"
 msgstr "Бележи све _разговоре"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1336
 msgid "Strip _HTML from logs"
 msgstr "_Избаци HTML из дневника"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1339
 msgid "System Logs"
 msgstr "Системски дневник"
 
-#: src/gtkprefs.c:1334
-msgid "Log when buddies _sign on/sign off"
-msgstr "Бележи када се другари _пријављују/одјављују"
-
-#: src/gtkprefs.c:1336
-msgid "Log when buddies become _idle/un-idle"
-msgstr "Бележи када су другари _неактивни/активни"
-
-#: src/gtkprefs.c:1338
-msgid "Log when buddies go away/come _back"
-msgstr "Бележи када су другари _одсустни/присутни"
-
 #: src/gtkprefs.c:1340
+msgid "Log when buddies _sign on/sign off"
+msgstr "Бележи када се другари _пријављују/одјављују"
+
+#: src/gtkprefs.c:1342
+msgid "Log when buddies become _idle/un-idle"
+msgstr "Бележи када су другари _неактивни/активни"
+
+#: src/gtkprefs.c:1344
+msgid "Log when buddies go away/come _back"
+msgstr "Бележи када су другари _одсустни/присутни"
+
+#: src/gtkprefs.c:1346
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Бележи _личне пријаве/неактивност/одсуства"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1348
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Појединачна датотека денвника за _сваког другара"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1391
 msgid "Sound Options"
 msgstr "Поставке звука"
 
-#: src/gtkprefs.c:1386
-msgid "_No sounds when you log in"
-msgstr "_Без звука по пријави"
-
-#: src/gtkprefs.c:1388
-msgid "_Sounds while away"
-msgstr "Звук је _активан док сте одсутни"
-
 #: src/gtkprefs.c:1392
+msgid "_No sounds when you log in"
+msgstr "_Без звука по пријави"
+
+#: src/gtkprefs.c:1394
+msgid "_Sounds while away"
+msgstr "Звук је _активан док сте одсутни"
+
+#: src/gtkprefs.c:1398
 msgid "Sound Method"
 msgstr "Начин оглашавања"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1399
 msgid "_Method:"
 msgstr "_Начин:"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1401
 msgid "Console beep"
 msgstr "Конзолни звук"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1403
 msgid "Automatic"
 msgstr "Аутоматски"
 
-#: src/gtkprefs.c:1404
+#: src/gtkprefs.c:1410
 msgid "Command"
 msgstr "Наредба"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1420
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3506,67 +3532,67 @@
 "Наредба за звук:\n"
 "(%s за назив датотеке)"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1475
 msgid "_Sending messages removes away status"
 msgstr "Слање порука Вас враћа са _одсуства"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1477
 msgid "_Queue new messages when away"
 msgstr "Одлажи у _ред поруке на одсуству"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1480
 msgid "Auto-response"
 msgstr "Аутоматски одговор"
 
-#: src/gtkprefs.c:1477
+#: src/gtkprefs.c:1483
 msgid "Seconds before _resending:"
 msgstr "Број _секунди пре поновног слања:"
 
-#: src/gtkprefs.c:1480
+#: src/gtkprefs.c:1486
 msgid "_Send auto-response"
 msgstr "Слање _аутоматског одговор"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1488
 msgid "_Only send auto-response when idle"
 msgstr "Слање аутоматског одговора само када сте _неактивни"
 
-#: src/gtkprefs.c:1484
-msgid "Send auto-response in active conversations"
-msgstr "Слање аутоматског одговора када сте а_ктивни"
-
-#: src/gtkprefs.c:1497
+#: src/gtkprefs.c:1490
+msgid "Send auto-response in _active conversations"
+msgstr "Слање аутоматског одговора у а_ктивним разговорима"
+
+#: src/gtkprefs.c:1500
 msgid "Idle _time reporting:"
 msgstr "Пријављивање неак_тивности:"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1503
 msgid "Gaim usage"
 msgstr "Активност у Гаиму"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1506
 msgid "X usage"
 msgstr "Активност у ИКС-има"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1508
 msgid "Windows usage"
 msgstr "Активност у Виндоусу"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1516
 msgid "Auto-away"
 msgstr "Аутоматско одуство"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1517
 msgid "Set away _when idle"
 msgstr "Идете на о_дсуство када сте неактивни"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1519
 msgid "_Minutes before setting away:"
 msgstr "Број _минута пре одласка на одсуство:"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1526
 msgid "Away m_essage:"
 msgstr "_Порука за одсуство:"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1588
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3581,7 +3607,7 @@
 "<span weight=\"bold\">Веб страница:</span>\t\t%s\n"
 "<span weight=\"bold\">Датотека:</span>\t%s"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1593
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3596,97 +3622,97 @@
 "<span weight=\"bold\">Интернет адреса:</span>  %s\n"
 "<span weight=\"bold\">Датотека:</span>  %s"
 
-#: src/gtkprefs.c:1768
+#: src/gtkprefs.c:1774
 msgid "Load"
 msgstr "Учитај"
 
-#: src/gtkprefs.c:1775 src/protocols/msn/msn.c:1284
-#: src/protocols/trepia/trepia.c:433
+#: src/gtkprefs.c:1781 src/protocols/jabber/jabber.c:527
+#: src/protocols/msn/msn.c:1302 src/protocols/trepia/trepia.c:392
 msgid "Name"
 msgstr "Име"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:1828
 msgid "Details"
 msgstr "Детаљи"
 
-#: src/gtkprefs.c:1949
+#: src/gtkprefs.c:1955
 msgid "Sound Selection"
 msgstr "Избор звука"
 
-#: src/gtkprefs.c:2056
+#: src/gtkprefs.c:2062
 msgid "Play"
 msgstr "Пусти"
 
-#: src/gtkprefs.c:2063
+#: src/gtkprefs.c:2069
 msgid "Event"
 msgstr "Догађај"
 
-#: src/gtkprefs.c:2086
+#: src/gtkprefs.c:2092
 msgid "Reset"
 msgstr "Одбаци"
 
-#: src/gtkprefs.c:2090
+#: src/gtkprefs.c:2096
 msgid "Choose..."
 msgstr "Изабери..."
 
-#: src/gtkprefs.c:2214
+#: src/gtkprefs.c:2230
 msgid "_Edit"
 msgstr "_Уреди"
 
-#: src/gtkprefs.c:2250
+#: src/gtkprefs.c:2266
 msgid "Interface"
 msgstr "Сучеље"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2267
 msgid "Smiley Themes"
 msgstr "Скупови смешака"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2268
 msgid "Fonts"
 msgstr "Писма"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2269
 msgid "Message Text"
 msgstr "Текст поруке"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2270
 msgid "Shortcuts"
 msgstr "Пречице"
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2273
 msgid "IMs"
 msgstr "Брзе поруке"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2275
 msgid "Proxy"
 msgstr "Прокси"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2278
 msgid "Browser"
 msgstr "Прегледник"
 
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2280
 msgid "Logging"
 msgstr "Записивање"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2281
 msgid "Sounds"
 msgstr "Звук"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2282
 msgid "Sound Events"
 msgstr "Звучни догађаји"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2283
 msgid "Away / Idle"
 msgstr "Одсуство / Неактивност"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2284
 msgid "Away Messages"
 msgstr "Поруке за одсуство"
 
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2287
 msgid "Plugins"
 msgstr "Додаци"
 
@@ -3774,15 +3800,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:195 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "Да"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:196 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "Не"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:199
 msgid "Apply"
 msgstr "Примени"
 
@@ -3848,61 +3874,14 @@
 "Не могу репродуковати звук зато што се не може покренути постављена звучна "
 "наредба: %s"
 
-#: src/gtkutils.c:289
+#: src/gtkutils.c:286
 msgid "Can't save icon file to disk."
 msgstr "Не могу сачувати датотеку са иконицом на диск."
 
-#: src/gtkutils.c:324
+#: src/gtkutils.c:321
 msgid "Gaim - Save Icon"
 msgstr "Гаим — Сачувај иконицу"
 
-#. full help text
-#: src/gtkutils.c:1037
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Гаим %s\n"
-"Употреба: %s [ОПЦИЈА]...\n"
-"\n"
-"  -a, --acct           приказује уређивач налога\n"
-"  -w, --away[=ПОРУКА]  поставља одсуство по пријави (опциони аргумент "
-"ПОРУКА \n"
-"                       наводи име поруке која ће се користити за одсуство)\n"
-"  -l, --login[=ИМЕ]    аутоматска пријава (опциони аргумент ИМЕ наводи које "
-"налог(е) \n"
-"                       користити, раздвојене зарезима)\n"
-"  -n, --loginwin       без аутоматске пријаве; приказује прозор за пријаву\n"
-"  -u, --user=ИМЕ       користи налог ИМЕ\n"
-"  -f, --file=ДАТОТЕКА  користи ДАТОТЕКА за подешавања\n"
-"  -d, --debug          исписује поруке за проналажење грешака на стандардни "
-"излаз\n"
-"  -v, --version        приказује текуће издање и изађи\n"
-"  -h, --help           приказује ову помоћ и изађи\n"
-
-#. short message
-#: src/gtkutils.c:1052
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Гаим %s. Покушајте „%s -h“ за више података.\n"
-
-#: src/html.c:345
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Грешка при отварању везе.\n"
-
 #: src/log.c:30
 msgid "Error in specifying buddy conversation."
 msgstr "Грешка при навођењу другарског разговора."
@@ -4037,7 +4016,50 @@
 msgid "Screen Name:"
 msgstr "Корисничко име:"
 
-#: src/plugin.c:258
+#. full help text
+#: src/main.c:565
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Гаим %s\n"
+"Употреба: %s [ОПЦИЈА]...\n"
+"\n"
+"  -a, --acct           приказује уређивач налога\n"
+"  -w, --away[=ПОРУКА]  поставља одсуство по пријави (опциони аргумент "
+"ПОРУКА \n"
+"                       наводи име поруке која ће се користити за одсуство)\n"
+"  -l, --login[=ИМЕ]    аутоматска пријава (опциони аргумент ИМЕ наводи које "
+"налог(е) \n"
+"                       користити, раздвојене зарезима)\n"
+"  -n, --loginwin       без аутоматске пријаве; приказује прозор за пријаву\n"
+"  -u, --user=ИМЕ       користи налог ИМЕ\n"
+"  -f, --file=ДАТОТЕКА  користи ДАТОТЕКА за подешавања\n"
+"  -d, --debug          исписује поруке за проналажење грешака на стандардни "
+"излаз\n"
+"  -v, --version        приказује текуће издање и изађи\n"
+"  -h, --help           приказује ову помоћ и изађи\n"
+
+#. short message
+#: src/main.c:580
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Гаим %s. Покушајте „%s -h“ за више података.\n"
+
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4046,11 +4068,11 @@
 "Нисам нашао жељени додатак %s. Молим инсталирајте овај додатак и покушајте "
 "поново."
 
-#: src/plugin.c:263 src/plugin.c:291
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Гаим није успео да учита Ваш додатак."
 
-#: src/plugin.c:287
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Нисам успео да учитам жељени додатак %s."
@@ -4059,203 +4081,226 @@
 msgid "Slightly less boring default"
 msgstr "Уобичајено али не (тако) досадно"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1276
-#: src/protocols/msn/msn.c:337 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1703
-#: src/protocols/yahoo/yahoo.c:1804
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2211
 msgid "Available"
 msgstr "Доступан"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "Доступан само за пријатеље"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
 msgstr "Одсутан само за пријатеље"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3597 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4615
-#: src/protocols/oscar/oscar.c:5917 src/protocols/yahoo/yahoo.c:1425
-#: src/protocols/yahoo/yahoo.c:1723 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:841
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4510 src/protocols/oscar/oscar.c:4537
+#: src/protocols/oscar/oscar.c:6062 src/protocols/yahoo/yahoo.c:1832
+#: src/protocols/yahoo/yahoo.c:2130 src/protocols/yahoo/yahoo.c:2221
 msgid "Invisible"
 msgstr "Невидљив"
 
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "Невидљив само за пријатеље"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "Недоступан"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:136
 msgid "Unable to resolve hostname."
 msgstr "Не могу да растумачим адресу."
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:139
 msgid "Unable to connect to server."
 msgstr "Не могу да се повежем на сервер."
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:142
 msgid "Invalid response from server."
 msgstr "Неисправан одговор сервера."
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
 msgstr "Грешка при читању сокета."
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:148
 msgid "Error while writing to socket."
 msgstr "Грешка при писању у сокет."
 
-#: src/protocols/gg/gg.c:154
+#: src/protocols/gg/gg.c:151
 msgid "Authentication failed."
 msgstr "Неуспешна идентификација."
 
-#: src/protocols/gg/gg.c:157
+#: src/protocols/gg/gg.c:154
 msgid "Unknown Error Code."
 msgstr "Непозната ознака грешке."
 
-#: src/protocols/gg/gg.c:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "Стање: %s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "Не могу да се повежем"
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "Не могу да читам сокет"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:204
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr "Не могу да се повежем."
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:415
 msgid "Reading data"
 msgstr "Читање података"
 
 # Rukovanje/usaglasavanje ravnoteznika/balansera?
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:418
 msgid "Balancer handshake"
 msgstr "Равнотежно руковање"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:421
 msgid "Reading server key"
 msgstr "Читање кључа сервера"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:424
 msgid "Exchanging key hash"
 msgstr "Размењивање хеша кључа"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "Критична грешка у ГГ библиотеци\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:180
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Неуспешно повезивање на %s"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "Немогуће проналажење сервера"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "Пошаљи као поруку"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "Тражење ГГ сервера"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "Тражење ГГ сервера"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Наведен је неисправан Гаду-Гаду кориснички број"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Покушавате да пошаљете поруку на неисправан Гаду-Гаду кориснички број."
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "Немогуће преузимање резултата претраге"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Гаду-Гаду претрага"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "Активан"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3963
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3885
 msgid "UIN"
 msgstr "Кориснички број"
 
-#: src/protocols/gg/gg.c:671
+#: src/protocols/gg/gg.c:668
 msgid "First name"
 msgstr "Име"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3965
+#. Last Name
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:547
+#: src/protocols/oscar/oscar.c:3893 src/protocols/trepia/trepia.c:265
+msgid "Last Name"
+msgstr "Презиме"
+
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3887
 msgid "Nick"
 msgstr "Надимак"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
 msgstr "Година рођења"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "Пол"
 
-#: src/protocols/gg/gg.c:737
+#. City
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:557
+#: src/protocols/oscar/oscar.c:3939 src/protocols/oscar/oscar.c:3955
+#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+msgid "City"
+msgstr "Град"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1240
+#: src/protocols/msn/msn.c:1482 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3179
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2407 src/protocols/yahoo/yahoo.c:2424
+#: src/protocols/yahoo/yahoo.c:2608 src/protocols/zephyr/zephyr.c:355
+msgid "Buddy Information"
+msgstr "Подаци о другару"
+
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Не постоји списак другара ускладиштен на Гаду-Гаду серверу."
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Немогућ увоз списка другара са сервера"
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Списак другара успешно пребачен на Гаду-Гаду сервер"
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Немогућ пренос списка другара на Гаду-Гаду сервер"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Списак другара успешно уклоњен са Гаду-Гаду сервера"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Немогуће уклањање списка другара са Гаду-Гаду сервера"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "Лозинка је успешно измењена"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Неуспешна измена лозинке"
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Грешка при споразумевању са Гаду-Гаду сервером"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4263,11 +4308,11 @@
 "Гаим није могао да испуни Ваш захтев због проблема у приступању Гаду-Гаду "
 "веб серверу. Покушајте поново касније."
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Немогућ увоз Гаду-Гаду списка другара"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4275,27 +4320,27 @@
 "Гаим није могао да се повеже са Гаду-Гаду сервером са списком другара. "
 "Покушајте поново касније."
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Немогућ извоз списка другара"
 
-#: src/protocols/gg/gg.c:1068 src/protocols/gg/gg.c:1091
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Гаим није могао да се повеже на сервер са списком другара. Покушајте поново "
 "касније."
 
-#: src/protocols/gg/gg.c:1090
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Не могу да уклоним Гаду-Гаду списак другара"
 
 # Da nije mozda "imeniku" a ne "direktorijumu"?
-#: src/protocols/gg/gg.c:1139
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "Не могу приступити именику"
 
-#: src/protocols/gg/gg.c:1140
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4303,11 +4348,11 @@
 "Гаим није могао да претражи Именик зато што није успео да се повеже са "
 "сервером. Покушајте поново касније."
 
-#: src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Не могу да изменим Гаду-Гаду лозинку"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4315,27 +4360,32 @@
 "Гаим није успео да измени Вашу лозинку услед грешке при повезивању са Гаду-"
 "Гаду сервером. Покушајте поново касније."
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "Претрага именика"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:951
+#: src/protocols/oscar/oscar.c:6361 src/protocols/toc/toc.c:1545
+msgid "Change Password"
+msgstr "Промена лозинке"
+
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "Увези списак другара са сервера"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "Извези списак другара на сервер"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "Уклони списак другара са сервера"
 
-#: src/protocols/gg/gg.c:1251
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "Не могу да приступим подацима о кориснику."
 
-#: src/protocols/gg/gg.c:1252
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4353,7 +4403,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1364 src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Додатак за Гаду-Гаду протокол"
 
@@ -4368,17 +4418,17 @@
 "Корисник %s (%s%s%s%s%s) жели да Вас дода у свој списак другара и тражи Вашу "
 "дозволу за то."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1806
-#: src/protocols/msn/notification.c:924 src/protocols/msn/notification.c:1245
-#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2617
-#: src/protocols/oscar/oscar.c:5152
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:179
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
+#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:5073
 msgid "Authorize"
 msgstr "Овласти"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1807
-#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1247
-#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2619
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:180
+#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
+#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:5074
 msgid "Deny"
 msgstr "Одбиј"
 
@@ -4438,8 +4488,8 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC надимци не могу садржати белине"
 
-#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:686
-#: src/protocols/toc/toc.c:232
+#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:679
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Пријава: %s"
@@ -4466,9 +4516,8 @@
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Додатак за ИРЦ протокол"
 
-#. Splits
-#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4514 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1047 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Сервер"
 
@@ -4476,148 +4525,153 @@
 msgid "Encoding"
 msgstr "Начин записа"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "Лош мод"
 
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "Избачени сте са %s."
 
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "Избачени"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(оператер)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(идентификовани)</i>"
 
-#: src/protocols/irc/msgs.c:193
+#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:517
 msgid "Username"
 msgstr "Корисничко име"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:2049
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2479
 msgid "Realname"
 msgstr "Име"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr "Тренутно присутан"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Неактиван:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "На вези од"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Одређивање придева:</b> Знаменит<br>"
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:219
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "Подаци о другару за %s"
+
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s измени тему у: %s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Тема канала %s је: %s"
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Непозната порука „%s‟"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "Непозната грешка"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "ИРЦ сервер није разумео поруку коју је послао Гаим."
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "не постоји такав канал"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "Корисник није пријављен"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "Не постоји такав надимак/канал"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "Не могу да пошаљем"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Приступање на %s захтева позивање."
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "Само позивани"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Избацио Вас је %s: (%s)"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Избачени од стране %s: (%s)"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "мод (%s %s) од стране %s"
 
-#: src/protocols/irc/msgs.c:658
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr "Не могу да променим надимак"
 
-#: src/protocols/irc/msgs.c:659
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr "Не могу да променим надимак"
 
-#: src/protocols/irc/msgs.c:680
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Напустили сте причаоницу%s%s"
 
-#: src/protocols/irc/msgs.c:718
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "Грешка: погрешан одзив сервера (ПОНГ)"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "ПИНГ одговор — Лаг: %lu секунди"
 
-#: src/protocols/irc/msgs.c:790
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Не могу да се прикључим у %s:"
 
-#: src/protocols/irc/msgs.c:791
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr "Не могу да се прикључим каналу"
 
-#: src/protocols/irc/msgs.c:821
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops са %s"
@@ -4647,285 +4701,466 @@
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:574
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:601
-#: src/protocols/msn/msn.c:75 src/protocols/msn/msn.c:95
-#: src/protocols/msn/msn.c:153 src/protocols/msn/msn.c:253
-#: src/protocols/msn/msn.c:509 src/protocols/msn/msn.c:620
-#: src/protocols/msn/msn.c:636 src/protocols/msn/msn.c:684
-#: src/protocols/msn/msn.c:707 src/protocols/msn/msn.c:739
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:780
-#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:802
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:849 src/protocols/msn/msn.c:899
-#: src/protocols/msn/msn.c:937 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1087
-#: src/protocols/msn/msn.c:1098 src/protocols/msn/msn.c:1109
-#: src/protocols/msn/msn.c:1133 src/protocols/msn/msn.c:1145
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/notification.c:179
-#: src/protocols/msn/notification.c:206 src/protocols/msn/notification.c:1643
-#: src/protocols/msn/notification.c:1663 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
-#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
-#: src/protocols/trepia/trepia.c:1263
-msgid "Write error"
-msgstr "Грешка при писању"
-
-#: src/protocols/jabber/jabber.c:1069 src/protocols/jabber/jabber.c:1076
-msgid "Unable to change password."
-msgstr "Не могу да изменим лозинку."
-
-#: src/protocols/jabber/jabber.c:1070
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr "Тренутно унета лозинка је неисправна. Ваша лозинка није измењена."
-
-#: src/protocols/jabber/jabber.c:1077
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr ""
-"Лозинка коју сте унели је иста као и Ваша садашња лозинка. Ваша лозинка "
-"остаје иста."
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3530
-#: src/protocols/jabber/jabber.c:3581
-msgid "Chatty"
-msgstr "Причљив"
-
-#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3532
-#: src/protocols/jabber/jabber.c:3589
-msgid "Extended Away"
-msgstr "Продужено одсуство"
-
-#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3593 src/protocols/oscar/oscar.c:2835
-#: src/protocols/oscar/oscar.c:4603 src/protocols/oscar/oscar.c:5913
-msgid "Do Not Disturb"
-msgstr "Не узнемиравај"
-
-#: src/protocols/jabber/jabber.c:1513
-#, c-format
-msgid "Jabber Error %s"
-msgstr "Џабер грешка %s"
-
-#: src/protocols/jabber/jabber.c:1618
-#, c-format
-msgid "Error %s: %s"
-msgstr "Грешка %s: %s"
-
-#: src/protocols/jabber/jabber.c:1621
-msgid "Unknown Error in presence"
-msgstr "Непозната грешка у присуству"
-
-#: src/protocols/jabber/jabber.c:1799
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "Корисник %s жели да Вас дода на свој списак другара."
-
-#: src/protocols/jabber/jabber.c:1827
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr "Џабер корисник %s не постоји, и зато није додат у Ваш списак другара."
-
-#: src/protocols/jabber/jabber.c:1830
-msgid "No such user."
-msgstr "Нема таквог корисника."
-
-#: src/protocols/jabber/jabber.c:1994
-msgid "Authenticating"
-msgstr "Идентификација"
-
-#: src/protocols/jabber/jabber.c:2028
-msgid "Unknown login error"
-msgstr "Непозната грешка при пријави"
-
-#: src/protocols/jabber/jabber.c:2378
-msgid "Password successfully changed."
-msgstr "Лозинка успешно измењена."
-
-#: src/protocols/jabber/jabber.c:2423 src/protocols/jabber/jabber.c:4332
-msgid "Connection lost"
-msgstr "Веза прекинута"
-
-#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:2459
-#: src/protocols/jabber/jabber.c:4334 src/protocols/jabber/jabber.c:4383
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
-#: src/protocols/msn/notification.c:2100 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1304
-msgid "Unable to connect"
-msgstr "Немогуће повезивање"
-
-#: src/protocols/jabber/jabber.c:2430
-msgid "Connected"
-msgstr "Веза успостављена"
-
-#: src/protocols/jabber/jabber.c:2433
-msgid "Requesting Authentication Method"
-msgstr "Захтев начина идентификације"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2453 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1327
-msgid "Connecting"
-msgstr "Успостављање везе"
-
-#: src/protocols/jabber/jabber.c:2779
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "Корисник %s је неисправно Џабер име, и стога није додат."
-
-#: src/protocols/jabber/jabber.c:2781
-msgid "Unable to add buddy."
-msgstr "Не могу да додам другара."
-
-#: src/protocols/jabber/jabber.c:2782
-msgid "Jabber Error"
-msgstr "Џабер грешка"
-
-#: src/protocols/jabber/jabber.c:3041 src/protocols/yahoo/yahoochat.c:833
-msgid "Room:"
-msgstr "Соба:"
-
-#: src/protocols/jabber/jabber.c:3046
-msgid "Server:"
-msgstr "Сервер:"
-
-#: src/protocols/jabber/jabber.c:3052
-msgid "Handle:"
-msgstr "Надимак:"
-
-#: src/protocols/jabber/jabber.c:3082
-msgid "Unable to join chat"
-msgstr "Не могу приступити разговору"
-
-#: src/protocols/jabber/jabber.c:3318 src/protocols/jabber/jabber.c:3369
-#: src/protocols/jabber/jabber.c:3791
-msgid "Jabber ID"
-msgstr "Џабер ИД"
-
-#: src/protocols/jabber/jabber.c:3319
-msgid "Error"
-msgstr "Грешка"
-
-#: src/protocols/jabber/jabber.c:3370 src/protocols/jabber/jabber.c:3429
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3817
-msgid "Status"
-msgstr "Стање"
-
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3462
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/jabber/auth.c:54 src/protocols/jabber/auth.c:338
+#: src/protocols/jabber/auth.c:350
+msgid "Invalid response from server"
+msgstr "Неисправан одговор сервера"
+
+#: src/protocols/jabber/auth.c:73 src/protocols/jabber/auth.c:120
+msgid "Server does not use any supported authentication method"
+msgstr "Сервер не користи ниједан од подржаних начина идентификовања"
+
+#: src/protocols/jabber/auth.c:323
+msgid "Invalid challenge from server"
+msgstr "Неисправан изазов сервера"
+
+#: src/protocols/jabber/auth.c:353
+msgid "Bad Protocol"
+msgstr "Лош протокол"
+
+#: src/protocols/jabber/auth.c:356
+msgid "Encryption Required"
+msgstr "Обавезно је шифровање"
+
+#: src/protocols/jabber/auth.c:359
+msgid "Invalid authzid"
+msgstr "Неисправан authzid"
+
+#: src/protocols/jabber/auth.c:362
+msgid "Invalid Mechanism"
+msgstr "Неисправан механизам"
+
+#: src/protocols/jabber/auth.c:364
+msgid "Invalid Realm"
+msgstr "Неисправан домен"
+
+#: src/protocols/jabber/auth.c:367
+msgid "Mechanism Too Weak"
+msgstr "Механизам је преслаб"
+
+#: src/protocols/jabber/auth.c:370 src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:776 src/protocols/jabber/jabber.c:826
+#: src/protocols/oscar/oscar.c:5465
 msgid "Not Authorized"
 msgstr "Неовлашћен"
 
-#: src/protocols/jabber/jabber.c:3479
-msgid "View Error Msg"
-msgstr "Прикажи поруке о грешкама"
-
-#: src/protocols/jabber/jabber.c:3498
-msgid "Un-hide From"
-msgstr "Не сакривај од"
-
-#: src/protocols/jabber/jabber.c:3501
-msgid "Temporarily Hide From"
-msgstr "Привремено сакриј од"
-
-#: src/protocols/jabber/jabber.c:3508
-msgid "Cancel Presence Notification"
-msgstr "Откажи обавештења о присуству"
-
-#: src/protocols/jabber/jabber.c:3516
-msgid "Re-request authorization"
-msgstr "Поново захтевај овлашћење"
-
-#: src/protocols/jabber/jabber.c:3719
+#: src/protocols/jabber/auth.c:373
+msgid "Temporary Authentication Failure"
+msgstr "Привремено неуспешна идентификација"
+
+#: src/protocols/jabber/auth.c:375
+msgid "Authentication Failure"
+msgstr "Неуспешна идентификација"
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:598
 msgid "Full Name"
 msgstr "Пуно име"
 
-#: src/protocols/jabber/jabber.c:3720
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:611
 msgid "Family Name"
 msgstr "Презиме"
 
-#: src/protocols/jabber/jabber.c:3721
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:615
 msgid "Given Name"
 msgstr "Име"
 
-#: src/protocols/jabber/jabber.c:3722 src/protocols/yahoo/yahoo.c:2045
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/jabber.c:537 src/protocols/yahoo/yahoo.c:2473
 msgid "Nickname"
 msgstr "Надимак"
 
-#: src/protocols/jabber/jabber.c:3724
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:654
 msgid "Street Address"
 msgstr "Улица"
 
-#: src/protocols/jabber/jabber.c:3725
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:650
 msgid "Extended Address"
 msgstr "Проширена адреса"
 
-#: src/protocols/jabber/jabber.c:3726
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:658
 msgid "Locality"
 msgstr "Локалитет"
 
-#: src/protocols/jabber/jabber.c:3727
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:662
 msgid "Region"
 msgstr "Област"
 
-#: src/protocols/jabber/jabber.c:3728
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:666
+#: src/protocols/jabber/jabber.c:567
 msgid "Postal Code"
 msgstr "Поштански број"
 
-#: src/protocols/jabber/jabber.c:3730
+#. Country
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:671
+#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+msgid "Country"
+msgstr "Држава"
+
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:682
+#: src/protocols/jabber/buddy.c:689
 msgid "Telephone"
 msgstr "Телефон"
 
-#: src/protocols/jabber/jabber.c:3732
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:708 src/protocols/yahoo/yahoo.c:2467
+msgid "Email"
+msgstr "Е-пошта"
+
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:723
 msgid "Organization Name"
 msgstr "Назив организације"
 
-#: src/protocols/jabber/jabber.c:3733
+#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:727
 msgid "Organization Unit"
 msgstr "Одељење у организацији"
 
-#: src/protocols/jabber/jabber.c:3734
+#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:733
 msgid "Title"
 msgstr "Титула"
 
 # „радно место‟ у организацији?
-#: src/protocols/jabber/jabber.c:3735
+#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:736
 msgid "Role"
 msgstr "Улога"
 
-#: src/protocols/jabber/jabber.c:3736 src/protocols/oscar/oscar.c:3997
+#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:629
+#: src/protocols/oscar/oscar.c:3919
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: src/protocols/jabber/jabber.c:4194 src/protocols/jabber/jabber.c:4195
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
 msgid "Edit Jabber vCard"
 msgstr "Уређивање Џабер визит-карте"
 
-#: src/protocols/jabber/jabber.c:4196
+#: src/protocols/jabber/buddy.c:516
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "Све доле наведене опције нису обавезне. Унесите само податке које желите."
 
-#: src/protocols/jabber/jabber.c:4269
-msgid "Server Registration successful!"
-msgstr "Регистрација на серверу успешна!"
-
-#: src/protocols/jabber/jabber.c:4285
-#, c-format
-msgid "Error %d: %s"
-msgstr "Грешка %d: %s"
-
-#: src/protocols/jabber/jabber.c:4290
-msgid "Unknown registration error"
-msgstr "Непозната грешка при регистрацији"
+#: src/protocols/jabber/buddy.c:554
+msgid "Jabber ID"
+msgstr "Џабер ИД"
+
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:813
+#: src/protocols/jabber/jabber.c:826
+msgid "Status"
+msgstr "Стање"
+
+#: src/protocols/jabber/buddy.c:576 src/protocols/jabber/jabber.c:1050
+msgid "Resource"
+msgstr "Ресурс"
+
+#: src/protocols/jabber/buddy.c:619
+msgid "Middle Name"
+msgstr "Име оца"
+
+# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
+#: src/protocols/jabber/buddy.c:634 src/protocols/jabber/jabber.c:552
+#: src/protocols/oscar/oscar.c:3936 src/protocols/oscar/oscar.c:3952
+msgid "Address"
+msgstr "Улица"
+
+#: src/protocols/jabber/buddy.c:646
+msgid "P.O. Box"
+msgstr "Поштански фах"
+
+#: src/protocols/jabber/buddy.c:752
+msgid "Photo"
+msgstr "Слика"
+
+#: src/protocols/jabber/buddy.c:752
+msgid "Logo"
+msgstr "Логотип"
+
+#: src/protocols/jabber/buddy.c:766
+msgid "Jabber Profile"
+msgstr "Џабер профил"
+
+#: src/protocols/jabber/buddy.c:861
+msgid "Un-hide From"
+msgstr "Не сакривај од"
+
+#: src/protocols/jabber/buddy.c:864
+msgid "Temporarily Hide From"
+msgstr "Привремено сакриј од"
+
+#: src/protocols/jabber/buddy.c:872
+msgid "Cancel Presence Notification"
+msgstr "Откажи обавештења о присуству"
+
+#: src/protocols/jabber/buddy.c:880
+msgid "Re-request authorization"
+msgstr "Поново захтевај овлашћење"
+
+#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:833
+msgid "Room:"
+msgstr "Соба:"
+
+#: src/protocols/jabber/chat.c:43
+msgid "Server:"
+msgstr "Сервер:"
+
+#: src/protocols/jabber/chat.c:49
+msgid "Handle:"
+msgstr "Надимак:"
+
+#: src/protocols/jabber/jabber.c:80
+msgid "Error initializing session"
+msgstr "Грешка при покретању сесије"
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Format"
+msgstr "Лош облик"
+
+#: src/protocols/jabber/jabber.c:107
+msgid "Bad Namespace Prefix"
+msgstr "Лош предметак простора имена"
+
+#: src/protocols/jabber/jabber.c:110
+msgid "Resource Conflict"
+msgstr "Судар ресурса"
+
+#: src/protocols/jabber/jabber.c:112
+msgid "Connection Timeout"
+msgstr "Временски рок везе"
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Gone"
+msgstr "Домаћин је нестао"
+
+#: src/protocols/jabber/jabber.c:116
+msgid "Host Unknown"
+msgstr "Домаћин је непознат"
+
+#: src/protocols/jabber/jabber.c:118
+msgid "Improper Addressing"
+msgstr "Неодговарајуће адресирање"
+
+#: src/protocols/jabber/jabber.c:120
+msgid "Internal Server Error"
+msgstr "Унутрашња грешка сервера"
+
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid ID"
+msgstr "Неисправан ИБ"
+
+#: src/protocols/jabber/jabber.c:124
+msgid "Invalid Namespace"
+msgstr "Неисправан простор имена"
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Invalid XML"
+msgstr "Неисправан XML"
+
+#: src/protocols/jabber/jabber.c:128
+msgid "Non-matching Hosts"
+msgstr "Непоклапајући домаћини"
+
+#: src/protocols/jabber/jabber.c:132
+msgid "Policy Violation"
+msgstr "Прекорачење овлашћења"
+
+#: src/protocols/jabber/jabber.c:134
+msgid "Remote Connection Failed"
+msgstr "Удаљена веза неуспешна"
+
+#: src/protocols/jabber/jabber.c:136
+msgid "Resource Constraint"
+msgstr "Ограничење ресурса"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Restricted XML"
+msgstr "Ограничени XML"
+
+#: src/protocols/jabber/jabber.c:140
+msgid "See Other Host"
+msgstr "Погледајте другог домаћина"
+
+#: src/protocols/jabber/jabber.c:142
+msgid "System Shutdown"
+msgstr "Гашење система"
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Undefined Condition"
+msgstr "Недефинисани услов"
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Condition"
+msgstr "Неподржани услов"
+
+# строфа баш и није одговарајућа :-)
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Stanza Type"
+msgstr "Неподржана врста одељка"
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Unsupported Version"
+msgstr "Неподржано издање"
+
+#: src/protocols/jabber/jabber.c:152
+msgid "XML Not Well Formed"
+msgstr "XML није добро сачињен"
+
+#: src/protocols/jabber/jabber.c:154
+msgid "Stream Error"
+msgstr "Грешка тока"
+
+#: src/protocols/jabber/jabber.c:232 src/protocols/msn/msn.c:82
+#: src/protocols/msn/msn.c:102 src/protocols/msn/msn.c:160
+#: src/protocols/msn/msn.c:260 src/protocols/msn/msn.c:516
+#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
+#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
+#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
+#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
+#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1073
+#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1105
+#: src/protocols/msn/msn.c:1116 src/protocols/msn/msn.c:1140
+#: src/protocols/msn/msn.c:1152 src/protocols/msn/msn.c:1217
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
+#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
+#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+msgid "Write error"
+msgstr "Грешка при писању"
+
+#: src/protocols/jabber/jabber.c:377 src/protocols/jabber/jabber.c:641
+#: src/protocols/trepia/trepia.c:1106
+msgid "Unable to create socket"
+msgstr "Не могу начинити сокет"
+
+#: src/protocols/jabber/jabber.c:402
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "Регистрација %s@%s успешна"
+
+#: src/protocols/jabber/jabber.c:404 src/protocols/jabber/jabber.c:405
+msgid "Registration Successful"
+msgstr "Регистрација успешна"
+
+#: src/protocols/jabber/jabber.c:414
+msgid "Unknown Error"
+msgstr "Непозната грешка"
+
+#: src/protocols/jabber/jabber.c:417
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "Регистрација %s@%s неуспешна: %s"
+
+#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:420
+msgid "Registration Failed"
+msgstr "Грешка при регистрацији"
+
+#: src/protocols/jabber/jabber.c:507 src/protocols/jabber/jabber.c:508
+msgid "Already Registered"
+msgstr "Већ је регистрован"
+
+#: src/protocols/jabber/jabber.c:521 src/protocols/jabber/jabber.c:921
+msgid "Password"
+msgstr "Лозинка"
+
+#: src/protocols/jabber/jabber.c:532
+msgid "E-Mail"
+msgstr "Е-пошта"
+
+#. First Name
+#: src/protocols/jabber/jabber.c:542 src/protocols/oscar/oscar.c:3890
+#: src/protocols/trepia/trepia.c:258
+msgid "First Name"
+msgstr "Име"
+
+#. State
+#: src/protocols/jabber/jabber.c:562 src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3958 src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:430
+msgid "State"
+msgstr "Област"
+
+#: src/protocols/jabber/jabber.c:572
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/protocols/jabber/jabber.c:590
+msgid "Please fill out the information below to register your new account."
+msgstr "Молим испуните податке испод да региструјете нови налог."
+
+#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:594
+msgid "Register New Jabber Account"
+msgstr "Региструј нови Џабер налог"
+
+#: src/protocols/jabber/jabber.c:680 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1734
+msgid "Connecting"
+msgstr "Успостављање везе"
+
+#: src/protocols/jabber/jabber.c:684
+msgid "Initializing Stream"
+msgstr "Покретање тока"
+
+#: src/protocols/jabber/jabber.c:690
+msgid "Authenticating"
+msgstr "Идентификација"
+
+#: src/protocols/jabber/jabber.c:698
+msgid "Re-initializing Stream"
+msgstr "Поновно покретање тока"
+
+#: src/protocols/jabber/jabber.c:821 src/protocols/jabber/jabber.c:872
+#: src/protocols/jabber/presence.c:254
+msgid "Error"
+msgstr "Грешка"
+
+#: src/protocols/jabber/jabber.c:837 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
+msgid "Chatty"
+msgstr "Причљив"
+
+#: src/protocols/jabber/jabber.c:839 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
+msgid "Extended Away"
+msgstr "Продужено одсуство"
+
+#: src/protocols/jabber/jabber.c:840 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4525 src/protocols/oscar/oscar.c:6058
+msgid "Do Not Disturb"
+msgstr "Не узнемиравај"
+
+#: src/protocols/jabber/jabber.c:854
+msgid "Password Changed"
+msgstr "Лозинка измењена"
+
+#: src/protocols/jabber/jabber.c:855
+msgid "Your password has been changed."
+msgstr "Ваша лозинка је измењена."
+
+#: src/protocols/jabber/jabber.c:865
+#, c-format
+msgid "Error changing password: %s"
+msgstr "Грешка при измени лозинке: %s"
+
+#: src/protocols/jabber/jabber.c:869
+msgid "Unknown error occurred changing password"
+msgstr "Дошло је до непознате грешке при измени лозинке"
+
+#: src/protocols/jabber/jabber.c:926
+msgid "Password (again)"
+msgstr "Лозинка (поновите)"
+
+#: src/protocols/jabber/jabber.c:931 src/protocols/jabber/jabber.c:932
+msgid "Change Jabber Password"
+msgstr "Измените Џабер лозинку"
+
+#: src/protocols/jabber/jabber.c:932
+msgid "Please enter your new password"
+msgstr "Унесите нову лозинку"
 
 #. *< api_version
 #. *< type
@@ -4937,36 +5172,68 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4493 src/protocols/jabber/jabber.c:4495
+#: src/protocols/jabber/jabber.c:1027 src/protocols/jabber/jabber.c:1029
 msgid "Jabber Protocol Plugin"
 msgstr "Додатак за Џабер протокол"
 
-#: src/protocols/jabber/jabber.c:4517
-msgid "Resource"
-msgstr "Ресурс"
-
-#: src/protocols/jabber/jabber.c:4523
-msgid "Use SSL"
-msgstr "Користи ССЛ"
-
-#: src/protocols/jabber/jabber.c:4532
+#: src/protocols/jabber/jabber.c:1053
+msgid "Force Old SSL"
+msgstr "Наметни стари ССЛ"
+
+#: src/protocols/jabber/jabber.c:1061
 msgid "Connect server"
 msgstr "Повезивање са сервером"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:277
-#: src/protocols/msn/notification.c:498
+#: src/protocols/jabber/message.c:125
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "Испорука поруке за %s није успела: %s"
+
+#: src/protocols/jabber/message.c:128
+msgid "Jabber Message Error"
+msgstr "Џабер грешка поруке"
+
+#: src/protocols/jabber/message.c:191
+#, c-format
+msgid " (Code %s)"
+msgstr " (кôд %s)"
+
+#: src/protocols/jabber/parser.c:129
+msgid "XML Parse error"
+msgstr "Грешка при XML обради"
+
+#: src/protocols/jabber/presence.c:166
+#, c-format
+msgid "%s (Code %s)"
+msgstr "%s (кôд %s)"
+
+#: src/protocols/jabber/presence.c:170
+msgid "Unknown Error in presence"
+msgstr "Непозната грешка у присуству"
+
+#: src/protocols/jabber/presence.c:174
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "Корисник %s жели да Вас дода на свој списак другара."
+
+#: src/protocols/jabber/presence.c:250
+msgid "Unable to join chat"
+msgstr "Не могу приступити разговору"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:499
 msgid "Unable to request USR\n"
 msgstr "Не могу да затражим USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:294
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "Не могу да се пријавим помоћу MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:303
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "Не могу да пошаљем USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:308
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "Захтева се слање лозинке"
 
@@ -4974,15 +5241,15 @@
 msgid "Protocol version not supported"
 msgstr "Издање протокола није подржано"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:760
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
 msgid "Unable to request CVR\n"
 msgstr "Не могу да затражим CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:769
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
 msgid "Unable to request INF\n"
 msgstr "Не могу да затражим INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1877
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
 msgid "Got invalid XFR"
 msgstr "Примљен неисправан XFR"
 
@@ -4995,16 +5262,22 @@
 msgid "Unable to parse message."
 msgstr "Не могу да обрадим поруку."
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:865
-#: src/protocols/msn/notification.c:2122
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
+#: src/protocols/msn/notification.c:2102 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1711
+msgid "Unable to connect"
+msgstr "Немогуће повезивање"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:2124
 msgid "Unable to write to server"
 msgstr "Не могу да пишем на сервер"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2129
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2131
 msgid "Syncing with server"
 msgstr "Усклађивање са сервером"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2143
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2145
 msgid "Error reading from server"
 msgstr "Грешка при читању са сервера"
 
@@ -5025,7 +5298,7 @@
 msgstr "Недостаје пун назив домена (FQDN)"
 
 #: src/protocols/msn/error.c:47
-msgid "Already Login"
+msgid "Already Logged In"
 msgstr "Већ пријављен"
 
 #: src/protocols/msn/error.c:50
@@ -5100,7 +5373,7 @@
 msgid "Too many hits to a FND"
 msgstr "Превише погодака у FND"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
 msgid "Not logged in"
 msgstr "Непријављен"
 
@@ -5153,8 +5426,8 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR параметри су или непознати или недозвољени"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:612
-#: src/protocols/msn/notification.c:1258 src/protocols/msn/notification.c:1426
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
+#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
 msgid "Unable to write"
 msgstr "Не могу да пишем"
 
@@ -5186,8 +5459,8 @@
 msgid "Server too busy"
 msgstr "Сервер је презаузет"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:662
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Неуспешна идентификација"
 
@@ -5212,35 +5485,35 @@
 msgid "Unknown Error Code %d"
 msgstr "Непозната грешка са кодом %d"
 
-#: src/protocols/msn/msn.c:63
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше ново МСН пријатељско име је предугачко."
 
-#: src/protocols/msn/msn.c:170
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "Поставите Ваше пријатељско име."
 
-#: src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:178
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ово је име под којим ће Вас видети Ваши МСН другари."
 
-#: src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "Поставите Ваш кућни број телефона."
 
-#: src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "Поставите Ваш број телефона на послу."
 
-#: src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "Поставите Ваш број мобилног телефона."
 
-#: src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "Допусти МСН мобилне странице?"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:222
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5249,94 +5522,94 @@
 "Вам шаљу МСН мобилне странице на Ваш мобилни телефон или неки други преносни "
 "уређај?"
 
-#: src/protocols/msn/msn.c:219
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "Допусти"
 
-#: src/protocols/msn/msn.c:220
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "Забрани"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "Пошаљи мобилну поруку."
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "Страница"
 
-#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:1948
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Стање:</b> %s"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Одсутан од рачунара"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:598
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1407
-#: src/protocols/yahoo/yahoo.c:1705 src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2212
 msgid "Be Right Back"
 msgstr "Одмах се враћам"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:600
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1409
-#: src/protocols/yahoo/yahoo.c:1707 src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1816
+#: src/protocols/yahoo/yahoo.c:2114 src/protocols/yahoo/yahoo.c:2213
 msgid "Busy"
 msgstr "Заузет"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:602
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1417
-#: src/protocols/yahoo/yahoo.c:1715 src/protocols/yahoo/yahoo.c:1810
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1824
+#: src/protocols/yahoo/yahoo.c:2122 src/protocols/yahoo/yahoo.c:2217
 msgid "On The Phone"
 msgstr "Телефонирам"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:604
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1421
-#: src/protocols/yahoo/yahoo.c:1719 src/protocols/yahoo/yahoo.c:1812
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1828
+#: src/protocols/yahoo/yahoo.c:2126 src/protocols/yahoo/yahoo.c:2219
 msgid "Out To Lunch"
 msgstr "На ручку сам"
 
-#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
-#: src/protocols/zephyr/zephyr.c:870 src/protocols/zephyr/zephyr.c:885
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Скривен"
 
-#: src/protocols/msn/msn.c:355
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "Постави пријатељско име"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "Постави број кућног телефона"
 
-#: src/protocols/msn/msn.c:369
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "Постави број телефона на послу"
 
-#: src/protocols/msn/msn.c:375
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "Постави број мобилног телефона"
 
-#: src/protocols/msn/msn.c:384
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "Омогући/искључи мобилне уређаје"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Дозволи/забрани мобилне странице"
 
-#: src/protocols/msn/msn.c:417
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "Пошаљи на мобилни"
 
-#: src/protocols/msn/msn.c:426
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "Покрени разговор"
 
-#: src/protocols/msn/msn.c:720
+#: src/protocols/msn/msn.c:727
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5345,11 +5618,11 @@
 "МСН корисничко име мора бити облика „корисник@сервер.цс“. Вероватно сте "
 "желели „%s@hotmail.com“. У вашем списку дозвола нису учињене измене."
 
-#: src/protocols/msn/msn.c:724 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
 msgid "Invalid MSN screenname"
 msgstr "Неисправно МСН корисничко име"
 
-#: src/protocols/msn/msn.c:760
+#: src/protocols/msn/msn.c:767
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5358,67 +5631,76 @@
 "МСН корисничко име мора бити облика „корисник@сервер.цс“. Вероватно сте "
 "желели „%s@hotmail.com“. У вашем списку забрана нису учињене измене."
 
-#: src/protocols/msn/msn.c:1228 src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/msn/msn.c:1241 src/protocols/yahoo/yahoo.c:2388
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Грешка при преузимању профила</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1288 src/protocols/oscar/oscar.c:4002
-#: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:2057
+#: src/protocols/msn/msn.c:1309 src/protocols/oscar/oscar.c:3924
+#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:2491
 msgid "Age"
 msgstr "Старост"
 
 #. Gender
-#: src/protocols/msn/msn.c:1292 src/protocols/oscar/oscar.c:3988
-#: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:2065
+#: src/protocols/msn/msn.c:1316 src/protocols/oscar/oscar.c:3910
+#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
+#: src/protocols/yahoo/yahoo.c:2503
 msgid "Gender"
 msgstr "Пол"
 
-#: src/protocols/msn/msn.c:1296 src/protocols/yahoo/yahoo.c:2061
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo.c:2497
 msgid "Marital Status"
 msgstr "Брачно стање"
 
-#: src/protocols/msn/msn.c:1300 src/protocols/yahoo/yahoo.c:2053
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2485
 msgid "Location"
 msgstr "Место"
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2069
+#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo.c:2509
 msgid "Occupation"
 msgstr "Занимање"
 
-#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1324
-#: src/protocols/msn/msn.c:1332 src/protocols/msn/msn.c:1340
-#: src/protocols/msn/msn.c:1347
+#: src/protocols/msn/msn.c:1356 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1376
+#: src/protocols/msn/msn.c:1383
 msgid "A Little About Me"
 msgstr "Понешто о мени"
 
-#: src/protocols/msn/msn.c:1353 src/protocols/msn/msn.c:1366
-#: src/protocols/msn/msn.c:1373
+#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1412
 msgid "Favorite Things"
 msgstr "Омиљене ствари"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1386
-#: src/protocols/msn/msn.c:1393
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "Hobbies and Interests"
 msgstr "Хобији и интересовања"
 
-#: src/protocols/msn/msn.c:1399 src/protocols/msn/msn.c:1405
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1449
+#: src/protocols/yahoo/yahoo.c:2553
 msgid "Favorite Quote"
 msgstr "Омиљена изрека"
 
-#: src/protocols/msn/msn.c:1410 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/msn/msn.c:1457 src/protocols/yahoo/yahoo.c:2597
 msgid "Last Updated"
 msgstr "Последња допуна"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1417 src/protocols/trepia/trepia.c:321
-#: src/protocols/trepia/trepia.c:489
+#: src/protocols/msn/msn.c:1468 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr "Лична страница"
 
+#: src/protocols/msn/msn.c:1490 src/protocols/yahoo/yahoo.c:2615
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Подаци о кориснику %s недоступни"
+
+#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2617
+msgid "The user's profile is empty."
+msgstr "Профил корисника је празан."
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5429,83 +5711,84 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1505 src/protocols/msn/msn.c:1507
+#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1592
 msgid "MSN Protocol Plugin"
 msgstr "Додатак за МСН протокол"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1611 src/protocols/trepia/trepia.c:1330
 msgid "Login server"
 msgstr "Сервер за пријаву"
 
-#: src/protocols/msn/notification.c:246
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "МСН Грешка %s\n"
 
-#: src/protocols/msn/notification.c:362 src/protocols/msn/notification.c:523
+#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
 msgid "Unable to write to MSN Nexus server."
 msgstr "Не могу да пишем на МСН Нексус сервер"
 
-#: src/protocols/msn/notification.c:371 src/protocols/msn/notification.c:538
+#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
 msgid "Unable to read from MSN Nexus server."
 msgstr "Не могу да учитам заглавље са МСН Нексус сервера"
 
-#: src/protocols/msn/notification.c:391
+#: src/protocols/msn/notification.c:392
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "МСН Нексус сервер је вратио неисправне податке о преусмеравању."
 
-#: src/protocols/msn/notification.c:437
+#: src/protocols/msn/notification.c:438
 msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "Непозната грешка при покушају идентификације на МСН-овом серверу за пријаву."
-
-#: src/protocols/msn/notification.c:549
+msgstr ""
+"Непозната грешка при покушају идентификације на МСН-овом серверу за пријаву."
+
+#: src/protocols/msn/notification.c:550
 msgid "MSN Nexus server returned invalid information."
 msgstr "МСН Нексус сервер је вратио неисправне податке."
 
-#: src/protocols/msn/notification.c:617 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr "Преузимам списак другара"
 
-#: src/protocols/msn/notification.c:679
+#: src/protocols/msn/notification.c:680
 msgid "Unable to connect to passport server"
 msgstr "Не могу да се повежем на сервер пасоша"
 
-#: src/protocols/msn/notification.c:684 src/protocols/msn/notification.c:716
+#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
 msgid "Password sent"
 msgstr "Лозинка послата"
 
-#: src/protocols/msn/notification.c:711
+#: src/protocols/msn/notification.c:712
 msgid "Unable to send password"
 msgstr "Не могу да пошаљем лозинку"
 
-#: src/protocols/msn/notification.c:747
+#: src/protocols/msn/notification.c:748
 msgid "Protocol not supported"
 msgstr "Прокол није подржан"
 
-#: src/protocols/msn/notification.c:789
+#: src/protocols/msn/notification.c:790
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Веза Вам је прекинута, пријавили сте се са неког другог места."
 
-#: src/protocols/msn/notification.c:794
+#: src/protocols/msn/notification.c:795
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Веза Вам је прекинута. Привремено се гасе МСН сервери."
 
-#: src/protocols/msn/notification.c:920
+#: src/protocols/msn/notification.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Корисник %s (%s) жели да дода %s у свој списак другара."
 
-#: src/protocols/msn/notification.c:1239 src/protocols/msn/notification.c:1405
+#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Корисник %s (%s) жели да Вас дода у свој списак другара."
 
-#: src/protocols/msn/notification.c:1919
+#: src/protocols/msn/notification.c:1921
 msgid "Unable to transfer to notification server"
 msgstr "Не могу да се споразумем са сервером за обавештења"
 
 # bug: plural-forms
-#: src/protocols/msn/notification.c:2063
+#: src/protocols/msn/notification.c:2065
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5550,37 +5833,37 @@
 msgid "An MSN message may not have been received."
 msgstr "Могуће да није примљена МСН порука."
 
-#: src/protocols/napster/napster.c:232
+#: src/protocols/napster/napster.c:228
 msgid "Unable to read header from server"
 msgstr "Не могу учитати заглавље са сервера"
 
-#: src/protocols/napster/napster.c:246
-#, c-format
-msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
-msgstr "Не могу учитати заглавље са сервера. Команда је %hd, дужина је %hd."
-
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:242
+#, c-format
+msgid "Unable to read message from server.  Command is %hd, length is %hd."
+msgstr "Не могу да прочитам поруку са сервера. Команда је %hd, дужина је %hd."
+
+#: src/protocols/napster/napster.c:303
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "корисника: %s, датотека: %s, величина: %sГБ"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:314
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Не могу да додам „%s“ у Напстер списак"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:322
 msgid "You were disconnected from the server."
 msgstr "Веза са сервером је прекинута."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:382
+#: src/protocols/napster/napster.c:378
 #, c-format
 msgid "%s requested your information"
 msgstr "%s захтева Ваше податке"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:410
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -5588,13 +5871,13 @@
 "Веза са сервером је прекинута, јер сте се пријавили са неког другог места."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:416
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s захтева пинг"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5223
-#: src/protocols/toc/toc.c:1261
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5144
+#: src/protocols/toc/toc.c:1258
 msgid "Join what group:"
 msgstr "Прикључи се групи (којој?):"
 
@@ -5608,180 +5891,180 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "Додатак за Напстер протокол"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid error"
 msgstr "Неисправна грешка (!!!)"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:176
 msgid "Invalid SNAC"
 msgstr "Неисправан SNAC"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to host"
 msgstr "Брзина према серверу"
 
+#: src/protocols/oscar/oscar.c:178
+msgid "Rate to client"
+msgstr "Брзина према клијенту"
+
+#: src/protocols/oscar/oscar.c:180
+msgid "Service unavailable"
+msgstr "Услуга је недоступна"
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Service not defined"
+msgstr "Услуга није установљена"
+
+#: src/protocols/oscar/oscar.c:182
+msgid "Obsolete SNAC"
+msgstr "Превазиђени SNAC"
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by host"
+msgstr "Домаћин не подржава"
+
 #: src/protocols/oscar/oscar.c:184
-msgid "Rate to client"
-msgstr "Брзина према клијенту"
+msgid "Not supported by client"
+msgstr "Клијент не подржава"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Refused by client"
+msgstr "Клијент је одбио"
 
 #: src/protocols/oscar/oscar.c:186
-msgid "Service unavailable"
-msgstr "Услуга је недоступна"
+msgid "Reply too big"
+msgstr "Одговор је предугачак"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Service not defined"
-msgstr "Услуга није установљена"
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Obsolete SNAC"
-msgstr "Превазиђени SNAC"
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Not supported by host"
-msgstr "Домаћин не подржава"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by client"
-msgstr "Клијент не подржава"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Refused by client"
-msgstr "Клијент је одбио"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr "Одговор је предугачак"
-
-#: src/protocols/oscar/oscar.c:193
 msgid "Responses lost"
 msgstr "Одговори су изгубљени"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:188
 msgid "Request denied"
 msgstr "Захтев је одбијен"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:189
 msgid "Busted SNAC payload"
 msgstr "Упропашћен је SNAC користан пакет"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:190
 msgid "Insufficient rights"
 msgstr "Недовољно овлашћења"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:191
 msgid "In local permit/deny"
 msgstr "Дозволи/забрани у локалу"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:192
 msgid "Too evil (sender)"
 msgstr "Превише зао (пошиљалац)"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:193
 msgid "Too evil (receiver)"
 msgstr "Превише зао (прималац)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:194
 msgid "User temporarily unavailable"
 msgstr "Корисник привремено недоступан"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:195
 msgid "No match"
 msgstr "Нема поклапања"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:196
 msgid "List overflow"
 msgstr "Прекорачење списка"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:197
 msgid "Request ambiguous"
 msgstr "Захтев је двосмислен"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:198
 msgid "Queue full"
 msgstr "Ред је пун"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:199
 msgid "Not while on AOL"
 msgstr "Не док је на АОЛ-у"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Непосредан разговор са %s је затворен"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Непосредан разговор са %s је неуспешан"
 
-#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:222
-#: src/protocols/toc/toc.c:628 src/protocols/toc/toc.c:644
-#: src/protocols/toc/toc.c:712
+#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "Веза је прекинута."
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/toc/toc.c:888
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Веза са причаоницом %s је прекинута."
 
-#: src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:559
 msgid "Chat is currently unavailable"
 msgstr "Разговор тренутно није могућ"
 
-#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:697
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
 msgid "Couldn't connect to host"
 msgstr "Не могу да се повежем са домаћином"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:675
 msgid "Unable to login to AIM"
 msgstr "Не могу да се пријавим на АИМ"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
 msgid "Could Not Connect"
 msgstr "Не могу да се повежем"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:785
 msgid "Connection established, cookie sent"
 msgstr "Веза је успостављена, колачић је послат"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
+#: src/protocols/oscar/oscar.c:870
 msgid "File Transfer Aborted"
 msgstr "Пренос датотеке је обустваљен"
 
 # Mogu reci i "server soket", ali preveliko znacenje mogu ljudi dati "server" delu, i ne razumeti.
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:853
 msgid "Unable to establish listener socket."
 msgstr "Не могу да успоставим сокет за везу."
 
 # Ovo je FD kao broj koji je ekvivalentan "file handle"-u, odnosno, to je jedinstvena oznaka otvorenog fajla za pristup; sta znaci "establish" u ovom kontekstu mi nije jasno
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:866
 msgid "Unable to establish file descriptor."
 msgstr "Не могу да успоставим описник датотеке."
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to create new connection."
 msgstr "Не могу да успоставим нову везу."
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:574
+#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Неисправан надимак или лозинка."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "Ваш налог је тренутно недоступан."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Услуга АОЛ брзих порука је привремено недоступна."
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1065
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -5789,18 +6072,18 @@
 "Успостављали сте и прекидали везу сувише често. Сачекајте десет минута па "
 "покушајте поново. Ако наставите да покушавате, мораћете да сачекате још дуже."
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1070
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Издање клијента који користите је застарело. Освежите га на %s"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1102
 msgid "Internal Error"
 msgstr "Унутрашња грешка"
 
 # Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
+#: src/protocols/oscar/oscar.c:1322
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5809,29 +6092,29 @@
 "Веза се ускоро може прекинути. Можда желите да користите ТОЦ док се ово не "
 "исправи. Погледајте %s за допуне."
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Гаим није успео да преузме исправан хеш за пријаву на АИМ."
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1325
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Гаим није успео да преузме исправан хеш за пријаву."
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5626
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5565
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Непосредан разговор са %s је омогућен"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
 msgid "(There was an error receiving this message)"
 msgstr "(Дошло је до грешке при пријему ове поруке)"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2403
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s је управо затражио непосредну везу са %s"
 
-#: src/protocols/oscar/oscar.c:2414
+#: src/protocols/oscar/oscar.c:2406
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -5841,23 +6124,23 @@
 "слика. Пошто ће се Ваша ИП адреса приказати, ово се може сматрати "
 "нарушавањем приватности."
 
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5934
 msgid "Connect"
 msgstr "Успостави везу"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2438
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Дај ми овлашћење како бих могао да те додам у списак другара."
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2446
 msgid "Authorization Request Message:"
 msgstr "Порука уз захтев за овлашћење:"
 
-#: src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2447
 msgid "Please authorize me!"
 msgstr "Овласти ме!"
 
-#: src/protocols/oscar/oscar.c:2483
+#: src/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -5866,23 +6149,23 @@
 "Корисник %s захтева овлашћење пре него што га можете додати у списак "
 "другара. Да ли желите да пошаљете захтев за овлашћење?"
 
-#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
 msgid "Request Authorization"
 msgstr "Захтевај овлашћење"
 
-#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2607
-#: src/protocols/oscar/oscar.c:2627 src/protocols/oscar/oscar.c:3002
-#: src/protocols/oscar/oscar.c:3054 src/protocols/oscar/oscar.c:5144
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
+#: src/protocols/oscar/oscar.c:3027 src/protocols/oscar/oscar.c:5065
+#: src/protocols/oscar/oscar.c:5111
 msgid "No reason given."
 msgstr "Разлог није наведен."
 
-#: src/protocols/oscar/oscar.c:2534
+#: src/protocols/oscar/oscar.c:2526
 msgid "Authorization Denied Message:"
 msgstr "Разлог одбијања овлашћења:"
 
-#: src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5892,33 +6175,32 @@
 "разлог:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2615 src/protocols/oscar/oscar.c:5150
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5071
 msgid "Authorization Request"
 msgstr "Захтев за овлашћење"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Корисник %u је одбио Ваш захтев за овлашћење да га додате у списак "
-"контаката, а навео је следећи разлог:\n"
+"Корисник %u је одбио Ваш захтев за овлашћење да га додате у списак другара, а навео је следећи разлог:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2620
 msgid "ICQ authorization denied."
 msgstr "ICQ овлашћење одбијено."
 
 #. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2627
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "Korisnik %u је прихватио Ваш захтев да га додате у списак другара."
+
 #: src/protocols/oscar/oscar.c:2635
 #, c-format
-msgid "The user %u has granted your request to add them to your contact list."
-msgstr "Korisnik %u је прихватио Ваш захтев да га додате у списак контаката."
-
-#: src/protocols/oscar/oscar.c:2643
-#, c-format
 msgid ""
 "You have received a special message\n"
 "\n"
@@ -5930,7 +6212,7 @@
 "Од: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5943,7 +6225,7 @@
 "Од: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2659
+#: src/protocols/oscar/oscar.c:2651
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5956,20 +6238,20 @@
 "Порука гласи:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2680
-#, c-format
-msgid "ICQ user %u has sent you a contact: %s (%s)"
+#: src/protocols/oscar/oscar.c:2672
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ корисник %u Вам је послао контакт: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2686
-msgid "Do you want to add this contact to your Buddy List?"
+#: src/protocols/oscar/oscar.c:2678
+msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Да ли желите да додате овај контакт у списак другара?"
 
-#: src/protocols/oscar/oscar.c:2690
+#: src/protocols/oscar/oscar.c:2682
 msgid "Decline"
 msgstr "Одбиј"
 
-#: src/protocols/oscar/oscar.c:2772
+#: src/protocols/oscar/oscar.c:2764
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -5977,7 +6259,7 @@
 msgstr[1] "Пропустили сте %hu поруке од %s зато што су биле неисправне."
 msgstr[2] "Пропустили сте %hu порука од %s зато што су биле неисправне."
 
-#: src/protocols/oscar/oscar.c:2781
+#: src/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -5985,7 +6267,7 @@
 msgstr[1] "Пропустили сте %hu поруке од %s зато што су биле превелике."
 msgstr[2] "Пропустили сте %hu порука од %s зато што су биле превелике."
 
-#: src/protocols/oscar/oscar.c:2790
+#: src/protocols/oscar/oscar.c:2782
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -5995,7 +6277,7 @@
 msgstr[1] "Пропустили сте %hu поруке од %s зато што је ограничење прекорачено."
 msgstr[2] "Пропустили сте %hu порука од %s зато што је ограничење прекорачено."
 
-#: src/protocols/oscar/oscar.c:2799
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -6003,7 +6285,7 @@
 msgstr[1] "Пропустили сте %hu поруке од %s зато што је он/она превише злочест."
 msgstr[2] "Пропустили сте %hu порука од %s зато што је он/она превише злочест."
 
-#: src/protocols/oscar/oscar.c:2808
+#: src/protocols/oscar/oscar.c:2800
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -6011,7 +6293,7 @@
 msgstr[1] "Пропустили сте %hu поруке од %s зато што сте ви превише злочести."
 msgstr[2] "Пропустили сте %hu порука од %s зато што сте ви превише злочести."
 
-#: src/protocols/oscar/oscar.c:2817
+#: src/protocols/oscar/oscar.c:2809
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -6019,184 +6301,156 @@
 msgstr[1] "Пропустили сте %hu поруке од %s из непознатих разлога."
 msgstr[2] "Пропустили сте %hu порука од %s из непознатих разлога."
 
-#: src/protocols/oscar/oscar.c:2833 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4534
+#: src/protocols/oscar/oscar.c:6061
 msgid "Free For Chat"
 msgstr "Доступан за разговор"
 
-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:5914
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4528
+#: src/protocols/oscar/oscar.c:6059
 msgid "Not Available"
 msgstr "Недоступан"
 
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:5915
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4531
+#: src/protocols/oscar/oscar.c:6060
 msgid "Occupied"
 msgstr "Заузет"
 
-#: src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:2835
 msgid "Web Aware"
 msgstr "Пратим веб"
 
-#: src/protocols/oscar/oscar.c:2903
+#: src/protocols/oscar/oscar.c:2878
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>Кориснички број:</B> %s<BR><B>Стање:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2905
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>Стање:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2937
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC пријављује грешку: %s\n"
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2938
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Ваша порука за %s није послата:"
 
-#: src/protocols/oscar/oscar.c:3052
+#: src/protocols/oscar/oscar.c:3025
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Подаци о кориснику %s недоступни:"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3063
 msgid "Voice"
 msgstr "Глас"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:5945
+#: src/protocols/oscar/oscar.c:3066 src/protocols/oscar/oscar.c:6090
 msgid "Direct IM"
 msgstr "Непосредна порука"
 
-#: src/protocols/oscar/oscar.c:3098 src/protocols/oscar/oscar.c:5961
+#: src/protocols/oscar/oscar.c:3072 src/protocols/oscar/oscar.c:6106
 msgid "Get File"
 msgstr "Прибави датотеку"
 
-#: src/protocols/oscar/oscar.c:3101 src/protocols/oscar/oscar.c:5953
+#: src/protocols/oscar/oscar.c:3075 src/protocols/oscar/oscar.c:6098
 msgid "Send File"
 msgstr "Пошаљи датотеку"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3079
 msgid "Games"
 msgstr "Игре"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3082
 msgid "Add-Ins"
 msgstr "Додаци"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3085
 msgid "Send Buddy List"
 msgstr "Пошаљи списак другара"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3088
 msgid "EveryBuddy Bug"
 msgstr "ЕвриБади грешка ;-)"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3091
 msgid "AP User"
 msgstr "АП корисник"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3094
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3097
 msgid "Nihilist"
 msgstr "Нихилиста"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3100
 msgid "ICQ Server Relay"
 msgstr "ICQ преусмеравање сервера"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3103
 msgid "Old ICQ UTF8"
 msgstr "Стари ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3106
 msgid "Trillian Encryption"
 msgstr "Трилијан енкрипција"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3109
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3112
 msgid "Hiptop"
 msgstr "Врхкука"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3115
 msgid "Secure IM"
 msgstr "Безбедне брзе поруке"
 
-#: src/protocols/oscar/oscar.c:3181
-msgid ""
-"<i>Unable to display information because it was sent in an unknown encoding."
-"</i>"
-msgstr ""
-"<i>Не могу да прикажем податке зато што су послати у непознатом начину "
-"записа.</i>"
-
-#: src/protocols/oscar/oscar.c:3188
-#, c-format
-msgid "Online Since : <b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3143
+#, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "Корисничко име: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3144
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr "Ниво упозорења: <b>%d%%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3147
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
 msgstr "На вези од: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3193
-#, c-format
-msgid "Member Since : <b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3151
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Члан од: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3199
-#, c-format
-msgid "Idle : <b>%s</b>"
+#: src/protocols/oscar/oscar.c:3156
+#, c-format
+msgid "Idle: <b>%s</b>"
 msgstr "Неактивност: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3159
 msgid "Idle: <b>Active</b>"
 msgstr "Неактивност: <b>активан</b>"
 
-#: src/protocols/oscar/oscar.c:3204
-#, c-format
-msgid ""
-"Username : <b>%s</b>  %s <br>\n"
-"Warning Level : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-msgstr ""
-"Корисничко име: <b>%s</b>  %s <br>\n"
-"Ниво упозорења: <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-
-#: src/protocols/oscar/oscar.c:3236
-msgid "<i>User has no away message</i>"
-msgstr "<i>Корисник нема разлог за одсуство</i>"
-
-#: src/protocols/oscar/oscar.c:3247
-msgid "Client Capabilities: "
-msgstr "Могућности клијента: "
-
-#: src/protocols/oscar/oscar.c:3253
-msgid "<i>No Information Provided</i>"
-msgstr "<i>Подаци нису добављени</i>"
-
-#: src/protocols/oscar/oscar.c:3277
+#: src/protocols/oscar/oscar.c:3199
 msgid "Your AIM connection may be lost."
 msgstr "Можда АИМ веза прекинута."
 
-#: src/protocols/oscar/oscar.c:3665
+#: src/protocols/oscar/oscar.c:3587
 msgid "Rate limiting error."
 msgstr "Грешка при ограничавању брзине."
 
-#: src/protocols/oscar/oscar.c:3666
+#: src/protocols/oscar/oscar.c:3588
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6204,7 +6458,7 @@
 "Последња порука није послата зато што сте прекорачили дозвољену брзину. "
 "Сачекајте 10 секунди и пробајте поново."
 
-#: src/protocols/oscar/oscar.c:3727
+#: src/protocols/oscar/oscar.c:3649
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6212,106 +6466,105 @@
 "Веза је прекинута зато што сте се пријавили под овим именом са неког другог "
 "места."
 
-#: src/protocols/oscar/oscar.c:3729
+#: src/protocols/oscar/oscar.c:3651
 msgid "You have been signed off for an unknown reason."
 msgstr "Одјављени сте из непознатих разлога."
 
-#: src/protocols/oscar/oscar.c:3974 src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:3896 src/protocols/oscar/oscar.c:3902
 msgid "Email Address"
 msgstr "Адреса е-поште"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:3907
 msgid "Mobile Phone"
 msgstr "Мобилни телефон"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:313
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3910 src/protocols/trepia/trepia.c:272
+#: src/protocols/trepia/trepia.c:413
 msgid "Female"
 msgstr "Женски"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:312
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3910 src/protocols/trepia/trepia.c:271
+#: src/protocols/trepia/trepia.c:413
 msgid "Male"
 msgstr "Мушки"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:3927
 msgid "Personal Web Page"
 msgstr "Лична веб страница"
 
-#: src/protocols/oscar/oscar.c:4008
+#: src/protocols/oscar/oscar.c:3930
 msgid "Additional Information"
 msgstr "Додатни подаци"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:3934
 msgid "Home Address"
 msgstr "Кућна адреса"
 
-# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
-msgid "Address"
-msgstr "Улица"
-
-#: src/protocols/oscar/oscar.c:4023 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3961
 msgid "Zip Code"
 msgstr "Поштански број"
 
-#: src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:3950
 msgid "Work Address"
 msgstr "Адреса на послу"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:3966
 msgid "Work Information"
 msgstr "Подаци о послу"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:3968
 msgid "Company"
 msgstr "Предузеће"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:3971
 msgid "Division"
 msgstr "Одељење"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:3974
 msgid "Position"
 msgstr "Позиција"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:3977
 msgid "Web Page"
 msgstr "Веб страница"
 
-#: src/protocols/oscar/oscar.c:4061
+#: src/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ подаци за %s"
 
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4033
+msgid "Pop-Up Message"
+msgstr "Искачућа порука"
+
+#: src/protocols/oscar/oscar.c:4054
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "Наредни надимци су у вези са %s"
 
-#: src/protocols/oscar/oscar.c:4131
+#: src/protocols/oscar/oscar.c:4058
 msgid "Search Results"
 msgstr "Резултати претраге"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4075
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Није пронађено нити једно поклапање за адресу е-поште %s"
 
-#: src/protocols/oscar/oscar.c:4169
+#: src/protocols/oscar/oscar.c:4096
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Требате да примите е-пошту ради потврђивања %s."
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4098
 msgid "Account Confirmation Requested"
 msgstr "Захтева се потврда налога"
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4126
 msgid "Error Changing Account Info"
 msgstr "Грешка при измени података о налогу"
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4129
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6320,7 +6573,7 @@
 "Грешка 0x%04x: Не могу да испишем корисничко име зато што се тражено име "
 "разликује од оригинала."
 
-#: src/protocols/oscar/oscar.c:4205
+#: src/protocols/oscar/oscar.c:4132
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6329,7 +6582,7 @@
 "Грешка 0x%04x: Не могу да испишем корисничко име зато што се тражено име "
 "завршава размаком."
 
-#: src/protocols/oscar/oscar.c:4208
+#: src/protocols/oscar/oscar.c:4135
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6338,7 +6591,7 @@
 "Грешка 0x%04x: Не могу да испишем корисничко име зато што је тражено име "
 "предугачко."
 
-#: src/protocols/oscar/oscar.c:4211
+#: src/protocols/oscar/oscar.c:4138
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6347,7 +6600,7 @@
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је већ послат "
 "захтев за ово корисничко име."
 
-#: src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4141
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6356,7 +6609,7 @@
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је превише "
 "корисничких имена повезано са датом адресом."
 
-#: src/protocols/oscar/oscar.c:4217
+#: src/protocols/oscar/oscar.c:4144
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6365,12 +6618,12 @@
 "Грешка 0x%04x: Не могу променити адресу е-поште зато што је унета адреса "
 "неисправна."
 
-#: src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Грешка 0x%04x: Непозната грешка."
 
-#: src/protocols/oscar/oscar.c:4230
+#: src/protocols/oscar/oscar.c:4157
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6379,20 +6632,20 @@
 "Ваше корисничко име тренутно изгледа овако:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4231 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4158 src/protocols/oscar/oscar.c:4165
 msgid "Account Info"
 msgstr "Подаци о налогу"
 
-#: src/protocols/oscar/oscar.c:4236
+#: src/protocols/oscar/oscar.c:4163
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Адреса е-поште за %s је %s"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4393
 msgid "Unable to set AIM profile."
 msgstr "Не могу да поставим АИМ профил."
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4394
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -6403,7 +6656,7 @@
 "повежете."
 
 # bug: plural-forms
-#: src/protocols/oscar/oscar.c:4502
+#: src/protocols/oscar/oscar.c:4424
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6421,15 +6674,15 @@
 "Највећа дозвољена величина профила од %d бајтова је прекорачена. Гаим га је "
 "скратио и поставио."
 
-#: src/protocols/oscar/oscar.c:4507
+#: src/protocols/oscar/oscar.c:4429
 msgid "Profile too long."
 msgstr "Профил је предугачак."
 
-#: src/protocols/oscar/oscar.c:4526
+#: src/protocols/oscar/oscar.c:4448
 msgid "Unable to set AIM away message."
 msgstr "Не могу да поставим поруку за АИМ одсуство."
 
-#: src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:4449
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6440,7 +6693,7 @@
 "покушајте поново када се прописно повежете."
 
 # bug: plural-forms
-#: src/protocols/oscar/oscar.c:4567
+#: src/protocols/oscar/oscar.c:4489
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6458,15 +6711,15 @@
 "Највећа дозвољена дужина поруке за одсуство од %d бајтова је прекорачена. "
 "Гаим је скратио поруку, и започео одсуство."
 
-#: src/protocols/oscar/oscar.c:4572
+#: src/protocols/oscar/oscar.c:4494
 msgid "Away message too long."
 msgstr "Порука за одсуство је предугачка."
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4714
 msgid "Unable To Retrieve Buddy List"
 msgstr "Не могу преузети списак другара"
 
-#: src/protocols/oscar/oscar.c:4793
+#: src/protocols/oscar/oscar.c:4715
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -6475,12 +6728,12 @@
 "Привремено, Гаим није успео да преузме Ваш списак другара са АИМ сервера. "
 "Списак другара није нестао, и вероватно ће бити доступан за неколико сати."
 
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4890
+#: src/protocols/oscar/oscar.c:4806 src/protocols/oscar/oscar.c:4807
+#: src/protocols/oscar/oscar.c:4812
 msgid "Orphans"
 msgstr "Сирочићи"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:4978
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6489,15 +6742,15 @@
 "Не могу да додам другара %s зато што имате превише другара у списку. "
 "Уклоните некога и покушајте поново."
 
-#: src/protocols/oscar/oscar.c:5057 src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4978 src/protocols/oscar/oscar.c:4991
 msgid "(no name)"
 msgstr "(без имена)"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:4979 src/protocols/oscar/oscar.c:4992
 msgid "Unable To Add"
 msgstr "Не могу да додам"
 
-#: src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4991
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6508,7 +6761,7 @@
 "већ имате највише дозвољених другара у Вашем списку."
 
 # Is it "them"? Or "him/her"?
-#: src/protocols/oscar/oscar.c:5105
+#: src/protocols/oscar/oscar.c:5026
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6517,11 +6770,11 @@
 "Корисник %s Вам дозвољава да га додате у списак другара. Да ли желите да га "
 "додате?"
 
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5032
 msgid "Authorization Given"
 msgstr "Овлашћење је дато"
 
-#: src/protocols/oscar/oscar.c:5144
+#: src/protocols/oscar/oscar.c:5065
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6531,73 +6784,76 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5186
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
-msgstr "Корисник %s је одобрио Ваш захтев да га додате у списак контаката."
-
-#: src/protocols/oscar/oscar.c:5187
+#: src/protocols/oscar/oscar.c:5107
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr "Корисник %s је одобрио Ваш захтев да га додате у списак другара."
+
+#: src/protocols/oscar/oscar.c:5108
 msgid "Authorization Granted"
 msgstr "Захтев одобрен"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:5111
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Корисник %s је одбио Ваш захтев да га додате у списак контаката из следећег "
-"разлога:\n"
+"Корисник %s је одбио Ваш захтев да га додате у списак другара из следећег разлога:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5112
 msgid "Authorization Denied"
 msgstr "Захтев одбијен"
 
-#: src/protocols/oscar/oscar.c:5228 src/protocols/toc/toc.c:1266
+#: src/protocols/oscar/oscar.c:5149 src/protocols/toc/toc.c:1263
 msgid "Exchange:"
 msgstr "Размена:"
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5372
 msgid "<b>Status:</b> "
 msgstr "<b>Стање:</b> "
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5381
 msgid "<b>Logged In:</b> "
 msgstr "<b>Пријављен:</b> "
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5393
 msgid "<b>IP Address:</b> "
 msgstr "<b>ИП адреса:</b> "
 
-#: src/protocols/oscar/oscar.c:5478
+#: src/protocols/oscar/oscar.c:5401
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Могућности:</b> "
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5408
 msgid "<b>Available:</b> "
 msgstr "<b>Доступно:</b> "
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5423
+msgid "<b>Away Message:</b> "
+msgstr "<b>Порука за одсуство:</b>"
+
+#: src/protocols/oscar/oscar.c:5433
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Стање:</b> Неовлашћен"
 
-#: src/protocols/oscar/oscar.c:5528 src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/oscar/oscar.c:5467 src/protocols/yahoo/yahoo.c:1836
 msgid "Offline"
 msgstr "Неповезан"
 
-#: src/protocols/oscar/oscar.c:5769
+#: src/protocols/oscar/oscar.c:5914
 msgid "Unable to open Direct IM"
 msgstr "Не могу да пошаљем непосредну брзу поруку"
 
-#: src/protocols/oscar/oscar.c:5782
+#: src/protocols/oscar/oscar.c:5927
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Изабрали сте да успоставите везу за непосредне брзе поруке са %s."
 
-#: src/protocols/oscar/oscar.c:5785
+#: src/protocols/oscar/oscar.c:5930
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6605,83 +6861,101 @@
 "Како ово разоткрива Вашу ИП адресу, може се сматрати нарушавањем "
 "приватности. Желите ли да наставите?"
 
-#: src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:6075
 msgid "Get Status Msg"
 msgstr "Прибави поруку о стању"
 
-#: src/protocols/oscar/oscar.c:5974
+#: src/protocols/oscar/oscar.c:6119
 msgid "Re-request Authorization"
 msgstr "Понови захтев за овлашћење"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6140
 msgid "The new formatting is invalid."
 msgstr "Нови запис је неисправан."
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:6141
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "Запис корисничког имена се може променити само у величини слова и броју "
 "размака."
 
-#: src/protocols/oscar/oscar.c:6002
+#: src/protocols/oscar/oscar.c:6147
 msgid "New screenname formatting:"
 msgstr "Нови запис корисничког имена:"
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6196
 msgid "Change Address To:"
 msgstr "Промена адресе у:"
 
-#: src/protocols/oscar/oscar.c:6095
+#: src/protocols/oscar/oscar.c:6240
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>не чекате на овлашћење</i>"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6243
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Очекујете овлашћење од следећих другара"
 
-#: src/protocols/oscar/oscar.c:6099
+#: src/protocols/oscar/oscar.c:6244
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
-msgstr "Можете поновити захтев за овлашћење од ових другара десним кликом на њих и избором „Понови захтев за овлашћење“."
-
-#: src/protocols/oscar/oscar.c:6115
+msgstr ""
+"Можете поновити захтев за овлашћење од ових другара десним кликом на њих и "
+"избором „Понови захтев за овлашћење“."
+
+#: src/protocols/oscar/oscar.c:6258
+msgid "Find Buddy by E-mail"
+msgstr "Пронађи другара помоћу адресе е-поште"
+
+#: src/protocols/oscar/oscar.c:6259
+msgid "Search for a buddy by e-mail address"
+msgstr "Пронађи другара помоћу адресе е-поште"
+
+#: src/protocols/oscar/oscar.c:6260
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "Укуцајте е-поштанску адресу другара кога тражите."
+
+#: src/protocols/oscar/oscar.c:6263
+msgid "Search"
+msgstr "Тражи"
+
+#: src/protocols/oscar/oscar.c:6276
 msgid "Available Message:"
 msgstr "Порука за доступност:"
 
-#: src/protocols/oscar/oscar.c:6116
-msgid "Please talk to me, I'm lonely! (and single)"
-msgstr "Молим Вас причајте са мном. Усамљен сам! (и слободан)"
-
-#: src/protocols/oscar/oscar.c:6178
+#: src/protocols/oscar/oscar.c:6354
 msgid "Set Available Message"
 msgstr "Постави поруку за доступност"
 
-#: src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6368
 msgid "Change Password (URL)"
 msgstr "Измена лозинке (Интернет адреса)"
 
-#: src/protocols/oscar/oscar.c:6203
+#: src/protocols/oscar/oscar.c:6376
+msgid "Configure IM Forwarding (URL)"
+msgstr "Подеси прослеђивање брзих порука (адреса)"
+
+#: src/protocols/oscar/oscar.c:6387
 msgid "Format Screenname"
 msgstr "Запис корисничког имена"
 
-#: src/protocols/oscar/oscar.c:6209
+#: src/protocols/oscar/oscar.c:6393
 msgid "Confirm Account"
 msgstr "Потврдите налог"
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6399
 msgid "Display Current Registered Address"
 msgstr "Прикажи тренутно регистровану адресу"
 
-#: src/protocols/oscar/oscar.c:6221
+#: src/protocols/oscar/oscar.c:6405
 msgid "Change Current Registered Address"
 msgstr "Измени тренутно регистровану адресу"
 
-#: src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:6414
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Прикажи другаре за које се чека овлашћење"
 
-#: src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:6422
 msgid "Search for Buddy by Email"
 msgstr "Пронађи другара према адреси е-поште"
 
@@ -6695,123 +6969,123 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6359 src/protocols/oscar/oscar.c:6361
+#: src/protocols/oscar/oscar.c:6543 src/protocols/oscar/oscar.c:6545
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Додатак за AIM/ICQ протоколе"
 
-#: src/protocols/oscar/oscar.c:6378
+#: src/protocols/oscar/oscar.c:6562
 msgid "Auth host"
 msgstr "Домаћин за идентификацију"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6567
 msgid "Auth port"
 msgstr "Порт"
 
-#: src/protocols/toc/toc.c:171
+#: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
 msgstr "Тражим %s"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:510
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Не могу да пишем у датотеку %s."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Не могу да прочитам датотеку %s."
 
 # greska: plural
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Порука је предугачка, последњих %s бајтова је занемарено."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s није тренутно пријављен."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Није дозвољено упозорити %s."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Порука је одбачена, прекорачујете ограничења брзине сервера."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Није могућ разговор у %s."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Шаљете поруке пребрзо за %s."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Пропустили сте поруку од %s зато што је превелика."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Пропустили сте поруку од %s зато је послата превише брзо."
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:540
 msgid "Failure."
 msgstr "Неуспех."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:543
 msgid "Too many matches."
 msgstr "Превише поклапања."
 
+#: src/protocols/toc/toc.c:546
+msgid "Need more qualifiers."
+msgstr "Потребно више обележја."
+
 #: src/protocols/toc/toc.c:549
-msgid "Need more qualifiers."
-msgstr "Потребно више обележја."
+msgid "Dir service temporarily unavailable."
+msgstr "Услуге именика тренутно нису доступне."
 
 #: src/protocols/toc/toc.c:552
-msgid "Dir service temporarily unavailable."
-msgstr "Услуге именика тренутно нису доступне."
-
-#: src/protocols/toc/toc.c:555
 msgid "Email lookup restricted."
 msgstr "Ограничена претрага према адреси е-поште."
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:555
 msgid "Keyword ignored."
 msgstr "Кључне речи занемарене."
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:558
 msgid "No keywords."
 msgstr "Нема кључних речи."
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:561
 msgid "User has no directory information."
 msgstr "Корисник није уписан у именик."
 
+#: src/protocols/toc/toc.c:565
+msgid "Country not supported."
+msgstr "Држава није подржана."
+
 #: src/protocols/toc/toc.c:568
-msgid "Country not supported."
-msgstr "Држава није подржана."
-
-#: src/protocols/toc/toc.c:571
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Непознат неуспех: %s."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
 msgstr "Услуга је привремено недоступна."
 
+#: src/protocols/toc/toc.c:577
+msgid "Your warning level is currently too high to log in."
+msgstr "Имате превише упозорења да бисте се могли пријавити."
+
 #: src/protocols/toc/toc.c:580
-msgid "Your warning level is currently too high to log in."
-msgstr "Имате превише упозорења да бисте се могли пријавити."
-
-#: src/protocols/toc/toc.c:583
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -6819,37 +7093,37 @@
 "Успостављате и прекидате везу сувише често. Сачекајте десет минута и "
 "покушајте поново. Ако наставите са покушајима, мораћете сачекати чак и дуже."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Дошло је до непознате грешке при пријави: %s."
 
-#: src/protocols/toc/toc.c:588
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Догодила се непозната грешка %d. Подаци: %s"
 
-#: src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
 msgstr "Веза прекинута"
 
-#: src/protocols/toc/toc.c:648
+#: src/protocols/toc/toc.c:645
 msgid "Waiting for reply..."
 msgstr "Чекам за одговор..."
 
-#: src/protocols/toc/toc.c:718
+#: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "ТОЦ је прекинуо застој. Сада поново можете слати поруке."
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
 msgstr "Лозинка успешно измењена"
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:907
 msgid "TOC has sent a PAUSE command."
 msgstr "ТОЦ је послао наредбу PAUSE."
 
-#: src/protocols/toc/toc.c:911
+#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -6859,37 +7133,37 @@
 "избацити ако пошаљете поруку. Гаим ће спречити да било шта пролази. Ово је "
 "само привремено, будите стрпљиви."
 
-#: src/protocols/toc/toc.c:1404
+#: src/protocols/toc/toc.c:1401
 msgid "Get Dir Info"
 msgstr "Прибави податке из именика"
 
-#: src/protocols/toc/toc.c:1528
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "Постави податке у именик"
 
-#: src/protocols/toc/toc.c:1652
+#: src/protocols/toc/toc.c:1663
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Не могу да отворим %s за упис!"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1699
 msgid "File transfer failed; other side probably canceled."
 msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала."
 
-#: src/protocols/toc/toc.c:1733 src/protocols/toc/toc.c:1773
-#: src/protocols/toc/toc.c:1985
+#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1996
 msgid "Could not connect for transfer."
 msgstr "Не могу да успоставим везу за пренос."
 
-#: src/protocols/toc/toc.c:1897
+#: src/protocols/toc/toc.c:1908
 msgid "Could not connect for transfer!"
 msgstr "Не могу да успоставим везу за пренос!"
 
-#: src/protocols/toc/toc.c:1930
+#: src/protocols/toc/toc.c:1941
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Не могу да упишем заглавље датотеке. Датотека се неће пренети."
 
-#: src/protocols/toc/toc.c:2064
+#: src/protocols/toc/toc.c:2075
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
@@ -6897,7 +7171,7 @@
 msgstr[1] "%s захтева од %s да прими %d датотеке: %s (%.2f %s)%s%s"
 msgstr[2] "%s захтева од %s да прими %d датотека: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2071
+#: src/protocols/toc/toc.c:2082
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s захтева од Вас да пошаљете датотеку"
@@ -6912,95 +7186,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2147 src/protocols/toc/toc.c:2149
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "Додатак за ТОЦ протокол"
 
-#: src/protocols/toc/toc.c:2166
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "ТОЦ сервер"
 
-#: src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "ТОЦ порт"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:295
+#: src/protocols/trepia/trepia.c:254
 msgid "Basic Profile"
 msgstr "Основни профил"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:285
 msgid "E-Mail Address"
 msgstr "Адреса е-поште"
 
-#: src/protocols/trepia/trepia.c:332
+#: src/protocols/trepia/trepia.c:291
 msgid "Profile Information"
 msgstr "Подаци о профилу"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:338
+#: src/protocols/trepia/trepia.c:297
 msgid "Instant Messagers"
 msgstr "Брзи пошиљаоци"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:342
+#: src/protocols/trepia/trepia.c:301
 msgid "AIM"
 msgstr "АИМ"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:346
+#: src/protocols/trepia/trepia.c:305
 msgid "ICQ UIN"
 msgstr "ICQ број"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:350
+#: src/protocols/trepia/trepia.c:309
 msgid "MSN"
 msgstr "МСН"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:354
+#: src/protocols/trepia/trepia.c:313
 msgid "Yahoo"
 msgstr "Јаху"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:359
+#: src/protocols/trepia/trepia.c:318
 msgid "I'm From"
 msgstr "Ја сам из"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:376
+#: src/protocols/trepia/trepia.c:335
 msgid "Set your Trepia profile data."
 msgstr "Постави податке у Трепиа профилу."
 
-#: src/protocols/trepia/trepia.c:500
+#: src/protocols/trepia/trepia.c:459
 msgid "Profile"
 msgstr "Профил"
 
-#: src/protocols/trepia/trepia.c:522
+#: src/protocols/trepia/trepia.c:481
 msgid "Set Profile"
 msgstr "Постави профил"
 
-#: src/protocols/trepia/trepia.c:558
+#: src/protocols/trepia/trepia.c:517
 msgid "Visit Homepage"
 msgstr "Посети личну страницу"
 
-#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
+#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
 msgid "Local Users"
 msgstr "Локални корисници"
 
-#: src/protocols/trepia/trepia.c:1003
+#: src/protocols/trepia/trepia.c:962
 msgid "Read error"
 msgstr "Грешка при читању"
 
-#: src/protocols/trepia/trepia.c:1104
+#: src/protocols/trepia/trepia.c:1063
 msgid "Logging in"
 msgstr "Пријава"
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "Не могу начинити сокет"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7011,116 +7281,133 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
+#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
 msgid "Trepia Protocol Plugin"
 msgstr "Додатак за Трепиа протокол"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:696
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваша Јаху! порука није послата."
 
-#: src/protocols/yahoo/yahoo.c:752
+#: src/protocols/yahoo/yahoo.c:754
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "Корисник %s је (накнадно) одбио захтев да га додате у ваш списак другара."
-
-#: src/protocols/yahoo/yahoo.c:754
+msgstr ""
+"Корисник %s је (накнадно) одбио захтев да га додате у ваш списак другара."
+
+#: src/protocols/yahoo/yahoo.c:756
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr "Корисник %s је (накнадно) одбио захтев да га додате у ваш списак другара из следећег разлога: %s."
-
-#: src/protocols/yahoo/yahoo.c:755
+msgstr ""
+"Корисник %s је (накнадно) одбио захтев да га додате у ваш списак другара из "
+"следећег разлога: %s."
+
+#: src/protocols/yahoo/yahoo.c:757
 msgid "Add buddy rejected"
 msgstr "Одбијено додавање другара"
 
-#: src/protocols/yahoo/yahoo.c:1046
+#: src/protocols/yahoo/yahoo.c:1377
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr "Јаху сервер је захтевао употребу непрепознатог начина идентификације. Ово издање Гаима највероватније неће моћи да се пријави на Јаху. Проверите %s ради допуна."
+
+#: src/protocols/yahoo/yahoo.c:1380
+msgid "Failed Yahoo! Authentication"
+msgstr "Неуспешна Јаху! идентификација"
+
+#: src/protocols/yahoo/yahoo.c:1453
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
-msgstr "Покушали сте да игноришете %s, али тај корисник је већ у вашем списку другара. Кликом на „Да“ ћете уклонити и игнорисати овог другара."
-
-#: src/protocols/yahoo/yahoo.c:1049
+msgstr ""
+"Покушали сте да игноришете %s, али тај корисник је већ у вашем списку "
+"другара. Кликом на „Да“ ћете уклонити и игнорисати овог другара."
+
+#: src/protocols/yahoo/yahoo.c:1456
 msgid "Ignore buddy?"
 msgstr "Игнориши другара?"
 
-#: src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:1485
 msgid "Invalid username."
 msgstr "Неисправно корисничко име."
 
-#: src/protocols/yahoo/yahoo.c:1081
+#: src/protocols/yahoo/yahoo.c:1488
 msgid "Incorrect password."
 msgstr "Неисправна лозинка."
 
-#: src/protocols/yahoo/yahoo.c:1084
+#: src/protocols/yahoo/yahoo.c:1491
 msgid "Unknown error."
 msgstr "Непозната грешка."
 
-#: src/protocols/yahoo/yahoo.c:1132
+#: src/protocols/yahoo/yahoo.c:1539
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Не могу да додам другара %s у групу %s у списак сервера за налог %s."
 
-#: src/protocols/yahoo/yahoo.c:1134
+#: src/protocols/yahoo/yahoo.c:1541
 msgid "Could not add buddy to server list"
 msgstr "Не могу да додам другара у списак сервера"
 
-#: src/protocols/yahoo/yahoo.c:1236
+#: src/protocols/yahoo/yahoo.c:1643
 msgid "Unable to read"
 msgstr "Не могу да пишем"
 
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:1744
 msgid "Connection problem"
 msgstr "Грешка при повезивању"
 
-#: src/protocols/yahoo/yahoo.c:1411 src/protocols/yahoo/yahoo.c:1709
-#: src/protocols/yahoo/yahoo.c:1807
+#: src/protocols/yahoo/yahoo.c:1818 src/protocols/yahoo/yahoo.c:2116
+#: src/protocols/yahoo/yahoo.c:2214
 msgid "Not At Home"
 msgstr "Нисам код куће"
 
-#: src/protocols/yahoo/yahoo.c:1413 src/protocols/yahoo/yahoo.c:1711
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/yahoo/yahoo.c:2215
 msgid "Not At Desk"
 msgstr "Нисам за столом"
 
-#: src/protocols/yahoo/yahoo.c:1415 src/protocols/yahoo/yahoo.c:1713
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:1822 src/protocols/yahoo/yahoo.c:2120
+#: src/protocols/yahoo/yahoo.c:2216
 msgid "Not In Office"
 msgstr "Нисам у канцеларији"
 
-#: src/protocols/yahoo/yahoo.c:1419 src/protocols/yahoo/yahoo.c:1717
-#: src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/yahoo/yahoo.c:1826 src/protocols/yahoo/yahoo.c:2124
+#: src/protocols/yahoo/yahoo.c:2218
 msgid "On Vacation"
 msgstr "На распусту сам"
 
-#: src/protocols/yahoo/yahoo.c:1423 src/protocols/yahoo/yahoo.c:1721
-#: src/protocols/yahoo/yahoo.c:1813
+#: src/protocols/yahoo/yahoo.c:1830 src/protocols/yahoo/yahoo.c:2128
+#: src/protocols/yahoo/yahoo.c:2220
 msgid "Stepped Out"
 msgstr "Изашао сам на кратко"
 
-#: src/protocols/yahoo/yahoo.c:1487 src/protocols/yahoo/yahoo.c:1521
+#: src/protocols/yahoo/yahoo.c:1894 src/protocols/yahoo/yahoo.c:1928
 msgid "Not on server list"
 msgstr "Није на списку на серверу"
 
-#: src/protocols/yahoo/yahoo.c:1577
+#: src/protocols/yahoo/yahoo.c:1984
 msgid "Join in Chat"
 msgstr "Прикључи се разговору"
 
-#: src/protocols/yahoo/yahoo.c:1583
+#: src/protocols/yahoo/yahoo.c:1990
 msgid "Initiate Conference"
 msgstr "Покрени разговор"
 
-#: src/protocols/yahoo/yahoo.c:1629
+#: src/protocols/yahoo/yahoo.c:2036
 msgid "Active which ID?"
 msgstr "Активирај ИД (који)?"
 
-#: src/protocols/yahoo/yahoo.c:1640
+#: src/protocols/yahoo/yahoo.c:2047
 msgid "Activate ID"
 msgstr "Активирај ИД"
 
-#: src/protocols/yahoo/yahoo.c:1987
+#: src/protocols/yahoo/yahoo.c:2403
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7128,49 +7415,47 @@
 "<b>Нажалост, за сада нису подржани профили који садрже понешто само за "
 "одрасле.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:1989 src/protocols/yahoo/yahoo.c:2005
+#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2421
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-"Уколико желите да погледате овај профил, треба да посетите ову везу у вашем "
-"читачу веба."
-
-#: src/protocols/yahoo/yahoo.c:2003
+"web browser<br>"
+msgstr "Уколико желите да погледате овај профил, треба да посетите ову везу у вашем читачу веба.<br>"
+
+#: src/protocols/yahoo/yahoo.c:2420
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>Нажалост, не-енглески профили нису подржани за сада.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2037
+#: src/protocols/yahoo/yahoo.c:2462
 msgid "Yahoo! ID"
 msgstr "Јаху! ИД"
 
-#: src/protocols/yahoo/yahoo.c:2079 src/protocols/yahoo/yahoo.c:2081
-#: src/protocols/yahoo/yahoo.c:2083
+#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2526
+#: src/protocols/yahoo/yahoo.c:2530
 msgid "Hobbies"
 msgstr "Хобији"
 
-#: src/protocols/yahoo/yahoo.c:2085 src/protocols/yahoo/yahoo.c:2087
+#: src/protocols/yahoo/yahoo.c:2541 src/protocols/yahoo/yahoo.c:2545
 msgid "Latest News"
 msgstr "Најновије вести"
 
-#: src/protocols/yahoo/yahoo.c:2096
+#: src/protocols/yahoo/yahoo.c:2563
 msgid "Home Page"
 msgstr "Лична страница"
 
-#: src/protocols/yahoo/yahoo.c:2106
+#: src/protocols/yahoo/yahoo.c:2577
 msgid "Cool Link 1"
 msgstr "Занимљива веза 1"
 
-#: src/protocols/yahoo/yahoo.c:2108
+#: src/protocols/yahoo/yahoo.c:2582
 msgid "Cool Link 2"
 msgstr "Занимљива веза 2"
 
-#: src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Cool Link 3"
 msgstr "Занимљива веза 3"
 
-#: src/protocols/yahoo/yahoo.c:2114
+#: src/protocols/yahoo/yahoo.c:2591
 msgid "Member Since"
 msgstr "Члан од"
 
@@ -7184,15 +7469,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2250 src/protocols/yahoo/yahoo.c:2252
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2755
 msgid "Yahoo Protocol Plugin"
 msgstr "Додатак за Јаху протокол"
 
-#: src/protocols/yahoo/yahoo.c:2269
+#: src/protocols/yahoo/yahoo.c:2772
 msgid "Pager host"
 msgstr "Сервер"
 
-#: src/protocols/yahoo/yahoo.c:2274
+#: src/protocols/yahoo/yahoo.c:2777
 msgid "Pager port"
 msgstr "Порт"
 
@@ -7221,34 +7506,34 @@
 msgid "Maybe they're not in a chat?"
 msgstr "Можда не разговарају?"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Корисник:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Надимак:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Сакривен или непријављен"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>У %s од %s"
 
-#: src/protocols/zephyr/zephyr.c:575 src/protocols/zephyr/zephyr.c:576
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr "Било ко"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "Већ пријављен помоћу Зефира"
 
-#: src/protocols/zephyr/zephyr.c:601
+#: src/protocols/zephyr/zephyr.c:610
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7256,19 +7541,19 @@
 "Пошто Зефир користи Ваше корисничко име са система, не можете имати више "
 "налога на њему када сте пријављени као исти корисник."
 
-#: src/protocols/zephyr/zephyr.c:855
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr "Зефир претрага"
 
-#: src/protocols/zephyr/zephyr.c:895
+#: src/protocols/zephyr/zephyr.c:908
 msgid "Class:"
 msgstr "Разред:"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:913
 msgid "Instance:"
 msgstr "Инстанца:"
 
-#: src/protocols/zephyr/zephyr.c:905
+#: src/protocols/zephyr/zephyr.c:918
 msgid "Recipient:"
 msgstr "Прималац:"
 
@@ -7282,7 +7567,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1037 src/protocols/zephyr/zephyr.c:1039
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Додатак за Зефир протокол"
 
@@ -7298,38 +7583,15 @@
 "Неисправно је или име рачунара или број порта вашег посредника међу "
 "подешавањима."
 
-#: src/prpl.c:143
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s учини %s својим другаром%s%s%s"
-
-#: src/prpl.c:155
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Да ли желите да додате њу или њега у свој списак другара?"
-
-#: src/prpl.c:158
-msgid "Gaim - Information"
-msgstr "Гаим — подаци"
-
-#: src/prpl.c:161
-msgid "Add buddy to your list?"
-msgstr "Додати другара у Ваш списак?"
-
 #. * Custom away message.
-#: src/prpl.h:186
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "Прилагођено"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:862
 msgid "Accept"
 msgstr "Прихвати"
 
@@ -7337,7 +7599,7 @@
 msgid "Please enter your password"
 msgstr "Унесите Вашу лозинку"
 
-#: src/server.c:956
+#: src/server.c:949
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
@@ -7346,21 +7608,21 @@
 msgstr[2] "(%d порука)"
 
 # bug: plural-forms
-#: src/server.c:969
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "(1 порука)"
 
-#: src/server.c:1156 src/server.c:1166
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s је пријављен."
 
-#: src/server.c:1184 src/server.c:1192
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s је одјављен."
 
-#: src/server.c:1240
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7369,11 +7631,11 @@
 "%s је управо упозорен од стране %s.\n"
 "Ваш нови ниво обазривости је %d%%"
 
-#: src/server.c:1243
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "анонимна особа"
 
-#: src/server.c:1346
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7382,23 +7644,15 @@
 "Корисник „%s“ позива %s у причаоницу: „%s“\n"
 "%s"
 
-#: src/server.c:1350
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Корисник „%s“ позива %s у причаоницу: „%s“\n"
 
-#: src/server.c:1356
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "Прихвати позив на разговор?"
 
-#: src/server.c:1545
-msgid "Gaim - Popup"
-msgstr "Гаим — искачући прозор"
-
-#: src/server.c:1572
-msgid "More Info"
-msgstr "Више података"
-
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
@@ -7414,34 +7668,172 @@
 msgid "_Open Mail"
 msgstr "_Отвори пошту"
 
-#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+#: src/util.c:1527
+msgid "Calculating..."
+msgstr "Рачунам..."
+
+#: src/util.c:1530
+msgid "Unknown."
+msgstr "Непознато."
+
+#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
 msgid "day"
 msgid_plural "days"
 msgstr[0] "дан"
 msgstr[1] "дана"
 msgstr[2] "дана"
 
-#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часа"
 msgstr[2] "часова"
 
-#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
 msgstr[1] "минута"
 msgstr[2] "минута"
 
-#: src/util.c:950
-msgid "Calculating..."
-msgstr "Рачунам..."
-
-#: src/util.c:953
-msgid "Unknown."
-msgstr "Непознато."
+#: src/util.c:1917
+msgid "g003: Error opening connection.\n"
+msgstr "g003: Грешка при отварању везе.\n"
+
+#: src/win32/win32dep.c:474
+msgid "Notification"
+msgstr "Обавештење"
+
+#: src/win32/win32dep.c:475
+msgid "Moving Gaim user settings directory to:"
+msgstr "Премести директоријум подешавања Гаим корисника у:"
+
+#~ msgid "_Quote window title"
+#~ msgstr "_Цитирај наслов прозора"
+
+#~ msgid "_Notify even if conversation is in focus"
+#~ msgstr "_Обавести чак и ако је разговор у току"
+
+#~ msgid "Set Directory Info"
+#~ msgstr "Постави податке у именику"
+
+#~ msgid "Directory Info"
+#~ msgstr "Именик са подацима"
+
+#~ msgid "Setting Dir Info for %s:"
+#~ msgstr "Постављам податке у именику за %s:"
+
+#~ msgid "Allow Web Searches To Find Your Info"
+#~ msgstr "Дозволи да претраге веба пронађу моје податке"
+
+#~ msgid "Maiden Name"
+#~ msgstr "Девојачко презиме"
+
+#~ msgid "Below are the results of your search: "
+#~ msgstr "Доле су резултати претраге: "
+
+#~ msgid "Search for Buddy"
+#~ msgstr "Тражи другара"
+
+#~ msgid "Find Buddy By Info"
+#~ msgstr "Пронађи другара према подацима"
+
+#~ msgid "Unable to change password."
+#~ msgstr "Не могу да изменим лозинку."
+
+#~ msgid ""
+#~ "The current password you entered is incorrect.  Your password has not "
+#~ "been changed."
+#~ msgstr "Тренутно унета лозинка је неисправна. Ваша лозинка није измењена."
+
+#~ msgid ""
+#~ "The new password you entered is the same as your current password.  Your "
+#~ "password remains the same."
+#~ msgstr ""
+#~ "Лозинка коју сте унели је иста као и Ваша садашња лозинка. Ваша лозинка "
+#~ "остаје иста."
+
+#~ msgid "Jabber Error %s"
+#~ msgstr "Џабер грешка %s"
+
+#~ msgid "Error %s: %s"
+#~ msgstr "Грешка %s: %s"
+
+#~ msgid ""
+#~ "The Jabber user %s does not exist and was therefore not added to your "
+#~ "roster."
+#~ msgstr ""
+#~ "Џабер корисник %s не постоји, и зато није додат у Ваш списак другара."
+
+#~ msgid "No such user."
+#~ msgstr "Нема таквог корисника."
+
+#~ msgid "Unknown login error"
+#~ msgstr "Непозната грешка при пријави"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "Лозинка успешно измењена."
+
+#~ msgid "Connected"
+#~ msgstr "Веза успостављена"
+
+#~ msgid "Requesting Authentication Method"
+#~ msgstr "Захтев начина идентификације"
+
+#~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+#~ msgstr "Корисник %s је неисправно Џабер име, и стога није додат."
+
+#~ msgid "Unable to add buddy."
+#~ msgstr "Не могу да додам другара."
+
+#~ msgid "View Error Msg"
+#~ msgstr "Прикажи поруке о грешкама"
+
+#~ msgid "Error %d: %s"
+#~ msgstr "Грешка %d: %s"
+
+#~ msgid "Unknown registration error"
+#~ msgstr "Непозната грешка при регистрацији"
+
+#~ msgid "<B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>Стање:</B> %s<HR>%s"
+
+#~ msgid ""
+#~ "<i>Unable to display information because it was sent in an unknown "
+#~ "encoding.</i>"
+#~ msgstr ""
+#~ "<i>Не могу да прикажем податке зато што су послати у непознатом начину "
+#~ "записа.</i>"
+
+#~ msgid ""
+#~ "Username : <b>%s</b>  %s <br>\n"
+#~ "Warning Level : <b>%d %%</b><br>\n"
+#~ "%s%s%s\n"
+#~ "<hr>\n"
+#~ msgstr ""
+#~ "Корисничко име: <b>%s</b>  %s <br>\n"
+#~ "Ниво упозорења: <b>%d %%</b><br>\n"
+#~ "%s%s%s\n"
+#~ "<hr>\n"
+
+#~ msgid "<i>User has no away message</i>"
+#~ msgstr "<i>Корисник нема разлог за одсуство</i>"
+
+#~ msgid "Client Capabilities: "
+#~ msgstr "Могућности клијента: "
+
+#~ msgid "<i>No Information Provided</i>"
+#~ msgstr "<i>Подаци нису добављени</i>"
+
+#~ msgid "Please talk to me, I'm lonely! (and single)"
+#~ msgstr "Молим Вас причајте са мном. Усамљен сам! (и слободан)"
+
+#~ msgid "Gaim - Popup"
+#~ msgstr "Гаим — искачући прозор"
+
+#~ msgid "More Info"
+#~ msgstr "Више података"
 
 #~ msgid ""
 #~ "Gaim is converting your old buddy lists to a new format, which will now "
@@ -7496,18 +7888,12 @@
 #~ msgid "Second Name"
 #~ msgstr "Презиме"
 
-#~ msgid "Unable to change password"
-#~ msgstr "Не могу да изменим лозинку"
-
 #~ msgid "Unable to send USR\n"
 #~ msgstr "Не могу да пошаљем USR\n"
 
 #~ msgid "Got invalid XFR\n"
 #~ msgstr "Примљен неисправан XFR\n"
 
-#~ msgid "Authentication Failed"
-#~ msgstr "Неуспешна идентификација"
-
 #~ msgid "UIN:"
 #~ msgstr "Кориснички број:"
 
--- a/po/sr@Latn.po	Thu Oct 09 05:57:12 2003 +0000
+++ b/po/sr@Latn.po	Thu Oct 09 11:43:26 2003 +0000
@@ -7,10 +7,10 @@
 # This file is distributed under the same license as the Gaim package.
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.69\n"
+"Project-Id-Version: gaim 0.71\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2003-09-24 00:20+0200\n"
-"PO-Revision-Date: 2003-09-24 00:44+0200\n"
+"PO-Revision-Date: 2003-10-09 12:51+0200\n"
 "Last-Translator: Danilo Šegan <dsegan@gmx.net>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,14 +25,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:105
 msgid "Auto-Reconnect"
 msgstr "Automatsko očuvanje veze"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:108 plugins/autorecon.c:110
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Kada se veza prekine, automatski se ponovo uspostavlja."
 
@@ -69,12 +69,12 @@
 msgid "Gaim - Away"
 msgstr "Gaim — Odsutan"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1658
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:472 src/gtkaccount.c:1667
 msgid "Auto-login"
 msgstr "Automatska prijava"
 
 #: plugins/docklet/docklet.c:117
-msgid "New Message.."
+msgid "New Message..."
 msgstr "Nova poruka..."
 
 #: plugins/docklet/docklet.c:118
@@ -85,12 +85,12 @@
 msgid "New..."
 msgstr "Nova..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1794 src/gtkpounce.c:461
-#: src/gtkprefs.c:1468 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3585 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:5518
-#: src/protocols/oscar/oscar.c:5912
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1915 src/gtkpounce.c:461
+#: src/gtkprefs.c:1474 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:838 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:4522 src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:6057
 msgid "Away"
 msgstr "Odsutan"
 
@@ -107,11 +107,11 @@
 msgstr "Prenosi datoteka"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1816 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1825 src/main.c:315
 msgid "Accounts"
 msgstr "Nalozi"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2322 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2338 src/main.c:325
 msgid "Preferences"
 msgstr "Postavke"
 
@@ -415,14 +415,17 @@
 #. *  summary
 #: plugins/ipc-test-client.c:87
 msgid "Test plugin IPC support, as a client."
-msgstr "Probni dodatak za podršku za MPK (međuprocesnu komunikaciju), kao klijent."
+msgstr ""
+"Probni dodatak za podršku za MPK (međuprocesnu komunikaciju), kao klijent."
 
 #. *  description
 #: plugins/ipc-test-client.c:89
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
-msgstr "Probni dodatak za podršku za MPK (međuprocesnu komunikaciju), kao klijent. Ovo pronalazi dodatak za server i poziva prijavljene naredbe."
+msgstr ""
+"Probni dodatak za podršku za MPK (međuprocesnu komunikaciju), kao klijent. "
+"Ovo pronalazi dodatak za server i poziva prijavljene naredbe."
 
 # MPK = MeđuProcesna Komunikacija
 #. *< api_version
@@ -457,60 +460,71 @@
 msgstr "Proverava da li je pristigla nova lokalna pošta."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:707
+#: plugins/notify.c:572
 msgid "Notify For"
 msgstr "Obaveštavaj o"
 
-#: plugins/notify.c:711
+#: plugins/notify.c:576
 msgid "_IM windows"
 msgstr "_brzim porukama"
 
-#: plugins/notify.c:716
-msgid "_Chat windows"
-msgstr "prozorima _razgovora"
+#: plugins/notify.c:583
+msgid "C_hat windows"
+msgstr "Prozori _razgovora"
+
+#: plugins/notify.c:590
+msgid "_Focused windows"
+msgstr "_Fokusirani prozori"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:722
+#: plugins/notify.c:598
 msgid "Notification Methods"
 msgstr "Načini obaveštavanja"
 
-#: plugins/notify.c:728
+#: plugins/notify.c:605
 msgid "Prepend _string into window title:"
 msgstr "Dodavanje _teksta u naslov prozora:"
 
-#: plugins/notify.c:739
-msgid "_Quote window title"
-msgstr "_Citiraj naslov prozora"
-
-#: plugins/notify.c:744
-msgid "Set Window Manager \"_URGENT\" Hint"
-msgstr "Pošalji nagoveštaj „_Hitno“ upravniku prozora"
-
-#: plugins/notify.c:749
+#. Count method button
+#: plugins/notify.c:624
 msgid "Insert c_ount of new messages into window title"
 msgstr "Ubaci _broj novih poruka u naslov prozora"
 
-#: plugins/notify.c:754
-msgid "_Notify even if conversation is in focus"
-msgstr "_Obavesti čak i ako je razgovor u toku"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:760
+#. Urgent method button
+#: plugins/notify.c:633
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Pošalji nagoveštaj „_Hitno“ upravniku prozora"
+
+#. ---------- "Notification Removals" ----------
+#: plugins/notify.c:640
 msgid "Notification Removal"
 msgstr "Uklanjanje obaveštenja"
 
-#: plugins/notify.c:764
-msgid "Remove when conversation window gains _focus"
-msgstr "Ukloni kada prozor razgovora dobije _fokus"
-
-#: plugins/notify.c:769
+#. Remove on focus button
+#: plugins/notify.c:646
+msgid "Remove when conversation window _gains focus"
+msgstr "Ukloni kada prozor razgovora bude _fokusiran"
+
+#. Remove on click button
+#: plugins/notify.c:654
 msgid "Remove when conversation window _receives click"
 msgstr "Ukloni po k_liku na prozor razgovora"
 
-#: plugins/notify.c:774
+#. Remove on type button
+#: plugins/notify.c:662
 msgid "Remove when _typing in conversation window"
 msgstr "Ukloni pri _kucanju u prozoru razgovora"
 
+#. Remove on message send button
+#: plugins/notify.c:670
+msgid "Remove when a _message gets sent"
+msgstr "Ukloni kada se _poruka pošalje"
+
+#. Remove on conversation switch button
+#: plugins/notify.c:679
+msgid "Remove on conversation ta_b switch"
+msgstr "Ukloni po _izmeni lista razgovora"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -518,14 +532,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:858
+#: plugins/notify.c:762
 msgid "Message Notification"
 msgstr "Obaveštenje o porukama"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:861 plugins/notify.c:863
+#: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Omogućava razne načine za obaveštavanje o nepročitanim porukama."
 
@@ -631,6 +645,60 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Zamenjuje tekst u odlazećim porukama prema korisničkim pravilima."
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:190
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+msgid "Provides SSL support through GNUTLS."
+msgstr "Obezbeđuje SSL podršku kroz GNUTLS."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:286
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-nss.c:289 plugins/ssl/ssl-nss.c:291
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Obezbeđuje SSL podršku kroz Mozilin NSS."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:91
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Obezbeđuje okvir oko biblioteka za SSL podršku."
+
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
@@ -749,7 +817,7 @@
 msgstr "Prikaži _klizač u prozoru razgovora"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "Prozor sa spiskom drugara"
 
@@ -796,8 +864,8 @@
 msgstr "_Pokreni Gaim pri pokretanju Vindousa."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1635
-#: src/gtkprefs.c:2255
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1755
+#: src/gtkprefs.c:2271
 msgid "Buddy List"
 msgstr "Spisak drugara"
 
@@ -816,8 +884,8 @@
 msgstr "_Održavaj prozor sa spiskom drugara na vrhu"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
-#: src/gtkprefs.c:2256
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:895
+#: src/gtkprefs.c:2272
 msgid "Conversations"
 msgstr "Razgovori"
 
@@ -884,155 +952,232 @@
 msgid "Crazy Patch Writers"
 msgstr "Ludi pisci ispravki"
 
-#: src/about.c:136
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "Penzionisani programeri"
 
-#: src/about.c:137
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "prethodni održavalac libfaim-a"
 
-#: src/about.c:138
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "bivši glavni programer"
 
-#: src/about.c:141
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "bivši održavalac"
 
-#: src/about.c:142
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "bivši DŽaber programer"
 
-#: src/about.c:143
+#: src/about.c:151
 msgid "original author"
 msgstr "prvi autor"
 
-#: src/about.c:146
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "haker i određeni pokretač [lenja buba]"
 
-#: src/about.c:154
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "Tekući prevodioci"
 
-#: src/about.c:155 src/about.c:184
+#: src/about.c:163 src/about.c:192
 msgid "Catalan"
 msgstr "Katalonski"
 
-#: src/about.c:156 src/about.c:185
+#: src/about.c:164 src/about.c:193
 msgid "Czech"
 msgstr "Češki"
 
-#: src/about.c:157
-msgid "Danish"
-msgstr "Danski"
-
-#: src/about.c:158 src/about.c:186
-msgid "German"
-msgstr "Nemački"
-
-#: src/about.c:159 src/about.c:187
-msgid "Spanish"
-msgstr "Španski"
-
-#: src/about.c:160 src/about.c:188
-msgid "French"
-msgstr "Francuski"
-
-#: src/about.c:161
-msgid "Hindi"
-msgstr "Hindu"
-
-#: src/about.c:162
-msgid "Hungarian"
-msgstr "Mađarski"
-
-#: src/about.c:163 src/about.c:190
-msgid "Italian"
-msgstr "Italijanski"
-
-#: src/about.c:164 src/about.c:192
-msgid "Korean"
-msgstr "Korejski"
-
 #: src/about.c:165
+msgid "Danish"
+msgstr "Danski"
+
+#: src/about.c:166 src/about.c:194
+msgid "German"
+msgstr "Nemački"
+
+#: src/about.c:167 src/about.c:195
+msgid "Spanish"
+msgstr "Španski"
+
+#: src/about.c:168 src/about.c:196
+msgid "French"
+msgstr "Francuski"
+
+#: src/about.c:169
+msgid "Hindi"
+msgstr "Hindu"
+
+#: src/about.c:170
+msgid "Hungarian"
+msgstr "Mađarski"
+
+#: src/about.c:171 src/about.c:198
+msgid "Italian"
+msgstr "Italijanski"
+
+#: src/about.c:172 src/about.c:200
+msgid "Korean"
+msgstr "Korejski"
+
+#: src/about.c:173
 msgid "Dutch; Flemish"
 msgstr "Holandski; Flamanski"
 
-#: src/about.c:166 src/about.c:194
+#: src/about.c:174 src/about.c:202
 msgid "Polish"
 msgstr "Poljski"
 
-#: src/about.c:167
+#: src/about.c:175
 msgid "Portuguese-Brazil"
 msgstr "Portugalski u Brazilu"
 
-#: src/about.c:168
+#: src/about.c:176
 msgid "Portuguese-Portugal"
 msgstr "Portugalski u Portugaliji"
 
-#: src/about.c:169
+#: src/about.c:177
 msgid "Romanian"
 msgstr "Rumunski"
 
-#: src/about.c:170 src/about.c:195
+#: src/about.c:178 src/about.c:203
 msgid "Russian"
 msgstr "Ruski"
 
-#: src/about.c:171
+#: src/about.c:179
 msgid "Serbian"
 msgstr "Srpski"
 
-#: src/about.c:172 src/about.c:197
+#: src/about.c:180 src/about.c:205
 msgid "Swedish"
 msgstr "Švedski"
 
-#: src/about.c:173
+#: src/about.c:181
 msgid "Simplified Chinese"
 msgstr "Pojednostavljeni kineski"
 
-#: src/about.c:174
+#: src/about.c:182
 msgid "Traditional Chinese"
 msgstr "Tradicionalni kineski"
 
-#: src/about.c:181
+#: src/about.c:189
 msgid "Past Translators"
 msgstr "Prethodni prevodioci"
 
-#: src/about.c:182
+#: src/about.c:190
 msgid "Amharic"
 msgstr "Amharski"
 
-#: src/about.c:183
-msgid "Bulgarian"
-msgstr "Bugarski"
-
-#: src/about.c:189
-msgid "Hebrew"
-msgstr "Hebrejski"
-
 #: src/about.c:191
+msgid "Bulgarian"
+msgstr "Bugarski"
+
+#: src/about.c:197
+msgid "Hebrew"
+msgstr "Hebrejski"
+
+#: src/about.c:199
 msgid "Japanese"
 msgstr "Japanski"
 
-#: src/about.c:193
+#: src/about.c:201
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: src/about.c:196
+#: src/about.c:204
 msgid "Slovak"
 msgstr "Slovački"
 
-#: src/about.c:198
+#: src/about.c:206
 msgid "Chinese"
 msgstr "Kineski"
 
-#: src/about.c:211 src/dialogs.c:3509 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:240 src/server.c:1567
+#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:200
+#: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Zatvori"
 
+#: src/account.c:265 src/protocols/jabber/jabber.c:888
+msgid "New passwords do not match."
+msgstr "Nove lozinke se ne poklapaju."
+
+#: src/account.c:273
+msgid "Fill out all fields completely."
+msgstr "Popunite sva polja u potpunosti."
+
+#: src/account.c:298
+msgid "Original password"
+msgstr "Stara lozinka"
+
+#: src/account.c:304
+msgid "New password"
+msgstr "Nova lozinka"
+
+#: src/account.c:310
+msgid "New password (again)"
+msgstr "Nova lozinka (ponovite)"
+
+#: src/account.c:315
+#, c-format
+msgid "Change password for %s"
+msgstr "Izmena lozinke za %s"
+
+#: src/account.c:321
+msgid "Please enter your current password and your new password."
+msgstr "Unesite tekuću lozinku i novu lozinku."
+
+#. *
+#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#.
+#: src/account.c:324 src/connection.c:193 src/dialogs.c:1812
+#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
+#: src/gtkrequest.c:197 src/protocols/jabber/jabber.c:933
+#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
+#: src/protocols/oscar/oscar.c:2448 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:6149 src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6278 src/protocols/yahoo/yahoo.c:2038
+#: src/request.h:852
+msgid "OK"
+msgstr "U redu"
+
+#. Cancel button.
+#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
+#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
+#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
+#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1556
+#: src/gtkaccount.c:1988 src/gtkblist.c:1139 src/gtkblist.c:3037
+#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:198
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
+#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:934
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2412
+#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5935
+#: src/protocols/oscar/oscar.c:6150 src/protocols/oscar/oscar.c:6199
+#: src/protocols/oscar/oscar.c:6264 src/protocols/oscar/oscar.c:6279
+#: src/protocols/trepia/trepia.c:338 src/protocols/yahoo/yahoo.c:2039
+#: src/request.h:852 src/request.h:862
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: src/account.c:351
+#, c-format
+msgid "Change user information for %s"
+msgstr "Izmeni podatke o korisniku za %s"
+
+#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
+#: src/gtkrequest.c:204 src/protocols/jabber/buddy.c:519
+#: src/protocols/trepia/trepia.c:337
+msgid "Save"
+msgstr "Sačuvaj"
+
 #: src/away.c:208
 msgid "Gaim - Away!"
 msgstr "Gaim — Odsutan!"
@@ -1053,16 +1198,16 @@
 msgid "Set All Away"
 msgstr "Postavi odsustvo za sve"
 
-#: src/blist.c:542 src/gtkprefs.c:2258
+#: src/blist.c:547 src/gtkprefs.c:2274
 msgid "Chats"
 msgstr "Razgovori"
 
-#: src/blist.c:637 src/blist.c:803 src/dialogs.c:872
-#: src/protocols/jabber/jabber.c:1917 src/protocols/msn/notification.c:1135
+#: src/blist.c:642 src/blist.c:814 src/gtkblist.c:2527
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
 msgid "Buddies"
 msgstr "Drugari"
 
-#: src/blist.c:1069
+#: src/blist.c:1100
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1080,25 +1225,26 @@
 "%d drugara iz grupe %s nije uklonjeno pošto njihovi nalozi nisu prijavljeni. "
 "Ovi drugari i njihova grupa nisu uklonjeni.\n"
 
-#: src/blist.c:1078
+#: src/blist.c:1109
 msgid "Group not removed"
 msgstr "Grupa nije uklonjena"
 
-#: src/blist.c:1129 src/gtkaccount.c:140 src/gtkpounce.c:307
-#: src/gtkutils.c:842 src/protocols/jabber/jabber.c:1261
+#: src/blist.c:1160 src/gtkaccount.c:149 src/gtkpounce.c:307
+#: src/gtkutils.c:839 src/protocols/jabber/auth.c:93
+#: src/protocols/jabber/buddy.c:568
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/blist.c:1439
+#: src/blist.c:1481
 msgid "Invalid Groupname"
 msgstr "Neispravan naziv grupe"
 
-#: src/blist.c:2219
+#: src/blist.c:2261
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "Došlo je do greške pri obradi spiska drugara. Spisak nije učitan."
 
-#: src/blist.c:2221
+#: src/blist.c:2263
 msgid "Buddy List Error"
 msgstr "Greška u spisku drugara"
 
@@ -1106,7 +1252,9 @@
 msgid ""
 "Communication with the browser failed. Please close all windows and try "
 "again."
-msgstr "Neuspešno sporazumevanje sa veb čitačem. Zatvorite sve prozore i pokušajte ponovo."
+msgstr ""
+"Neuspešno sporazumevanje sa veb čitačem. Zatvorite sve prozore i pokušajte "
+"ponovo."
 
 #: src/browser.c:570 src/browser.c:590 src/browser.c:598
 msgid "Unable to open URL"
@@ -1127,7 +1275,7 @@
 msgid "Error launching \"command\": %s"
 msgstr "Greška pri izvršavanju „naredbe“: %s"
 
-#: src/buddy_chat.c:316 src/dialogs.c:1318
+#: src/buddy_chat.c:316 src/gtkblist.c:2930
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1151,27 +1299,6 @@
 msgid "Join"
 msgstr "Priključi se"
 
-#. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:487
-#: src/dialogs.c:499 src/dialogs.c:512 src/dialogs.c:533 src/dialogs.c:910
-#: src/dialogs.c:1602 src/dialogs.c:1717 src/dialogs.c:1783 src/dialogs.c:2045
-#: src/dialogs.c:2194 src/dialogs.c:2866 src/dialogs.c:3033 src/dialogs.c:3075
-#: src/dialogs.c:3212 src/dialogs.c:3556 src/gtkaccount.c:1547
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4200
-#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
-#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
-#: src/protocols/msn/msn.c:221 src/protocols/oscar/oscar.c:2420
-#: src/protocols/oscar/oscar.c:2457 src/protocols/oscar/oscar.c:2492
-#: src/protocols/oscar/oscar.c:2537 src/protocols/oscar/oscar.c:5790
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
-#: src/protocols/oscar/oscar.c:6118 src/protocols/trepia/trepia.c:379
-#: src/protocols/yahoo/yahoo.c:1632 src/prpl.c:164 src/request.h:813
-#: src/request.h:823
-msgid "Cancel"
-msgstr "Otkaži"
-
 #: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
@@ -1190,88 +1317,75 @@
 msgid "Enter password for %s"
 msgstr "Unesite lozinku za %s"
 
-#. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1713 src/dialogs.c:1853
-#: src/dialogs.c:2044 src/dialogs.c:2190 src/dialogs.c:3032 src/dialogs.c:3074
-#: src/dialogs.c:3205 src/dialogs.c:3555 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:185
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6004 src/protocols/oscar/oscar.c:6053
-#: src/protocols/oscar/oscar.c:6117 src/protocols/yahoo/yahoo.c:1631
-#: src/request.h:813
-msgid "OK"
-msgstr "U redu"
-
-#: src/conversation.c:424
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "Ne mogu da pošaljem poruku. Poruka je prevelika."
 
-#: src/conversation.c:432
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "Ne mogu da pošaljem poruku."
 
-#: src/conversation.c:1983
+#: src/conversation.c:1888
 #, c-format
 msgid "%s entered the room."
 msgstr "%s je ušao(la) u pričaonicu."
 
-#: src/conversation.c:1986
+#: src/conversation.c:1891
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] je ušao(la) u pričaonicu."
 
-#: src/conversation.c:2071
+#: src/conversation.c:1976
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je promenio(la) ime u %s"
 
-#: src/conversation.c:2113
+#: src/conversation.c:2018
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s je napustio(la) pričaonicu (%s)."
 
-#: src/conversation.c:2115
+#: src/conversation.c:2020
 #, c-format
 msgid "%s left the room."
 msgstr "%s je napustio(la) pričaonicu."
 
 # bug: plural-forms
-#: src/conversation.c:2188
+#: src/conversation.c:2093
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d poruka)"
 
-#: src/conversation.c:2190
+#: src/conversation.c:2095
 #, c-format
 msgid " left the room (%s)."
 msgstr "napusti pričaonicu (%s)."
 
-#: src/conversation.c:2472
+#: src/conversation.c:2377
 msgid "Last created window"
 msgstr "Poslednje napravljeni prozor"
 
-#: src/conversation.c:2474
+#: src/conversation.c:2379
 msgid "New window"
 msgstr "Novi prozor"
 
-#: src/conversation.c:2476
+#: src/conversation.c:2381
 msgid "By group"
 msgstr "Prema grupi"
 
-#: src/conversation.c:2478
+#: src/conversation.c:2383
 msgid "By account"
 msgstr "Prema nalogu"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr "Upozori korisnika"
 
-#: src/dialogs.c:338
+#: src/dialogs.c:317
 msgid "_Warn"
 msgstr "_Upozori"
 
-#: src/dialogs.c:354
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1284,36 +1398,36 @@
 "Ovo će uvećati nivo obazrivosti za „%s“ i on ili ona će imati strožije "
 "ograničenje brzine slanja poruka.\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr "Upozori _anonimno?"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonimna upozorenja su manjeg uticaja.</b>"
 
-#: src/dialogs.c:483
+#: src/dialogs.c:462
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Uklanjate %s sa spiska drugara. Da li želite da nastavite?"
 
-#: src/dialogs.c:485 src/dialogs.c:486
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr "Ukloni drugara"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:474
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Uklanjate razgovor %s sa spiska drugara. Da li želite da nastavite?"
 
-#: src/dialogs.c:497 src/dialogs.c:498
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Chat"
 msgstr "Ukloni razgovor"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:486
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1322,261 +1436,73 @@
 "Uklanjate grupu %s i sve njene članove iz spiska drugara. Da li želite da "
 "nastavite?"
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
 # bug: plural-forms
-#: src/dialogs.c:528
+#: src/dialogs.c:507
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr "Uklanjate grupu %s i %d ostalih članova iz spiska drugara. Da li želite da nastavite?"
-
-#: src/dialogs.c:531 src/dialogs.c:532
+msgstr ""
+"Uklanjate grupu %s i %d ostalih članova iz spiska drugara. Da li želite da "
+"nastavite?"
+
+#: src/dialogs.c:510 src/dialogs.c:511
 msgid "Remove Contact"
 msgstr "Ukloni kontakt"
 
-#: src/dialogs.c:680
+#: src/dialogs.c:659
 msgid "New Message"
 msgstr "Nova poruka"
 
-#: src/dialogs.c:698
+#: src/dialogs.c:677
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Unesite ime osobe kojoj želite da uputite brzu poruku.\n"
 
-#: src/dialogs.c:714 src/dialogs.c:791
+#: src/dialogs.c:693 src/dialogs.c:770
 msgid "_Screenname:"
 msgstr "_Ime:"
 
-#: src/dialogs.c:729 src/dialogs.c:807 src/gtkpounce.c:408
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: src/dialogs.c:760
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr "Pribavi podatke o korisniku"
 
-#: src/dialogs.c:779
+#: src/dialogs.c:758
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "Unesite ime osobe čije podatke želite da vidite.\n"
 
-#: src/dialogs.c:906
-msgid "Add Group"
-msgstr "Dodaj grupu"
-
-#: src/dialogs.c:906
-msgid "Add a new group"
-msgstr "Dodaj novu grupu"
-
-#: src/dialogs.c:907
-msgid "Please enter the name of the group to be added."
-msgstr "Unesite naziv grupe koju želite da dodate."
-
-#: src/dialogs.c:909 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2689 src/prpl.c:163
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/dialogs.c:935 src/protocols/yahoo/yahoo.c:1565
-msgid "Add Buddy"
-msgstr "Dodaj drugara"
-
-#: src/dialogs.c:954
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Unesite ime osobe koju želite da dodate u spisak drugara. Prema želji možete "
-"uneti i alijas ili nadimak za drugara. Alijas će se prikazivati umesto "
-"imena, kad god je to moguće.\n"
-
-#: src/dialogs.c:973 src/gtkaccount.c:1624
-msgid "Screen Name"
-msgstr "Ime"
-
-#: src/dialogs.c:986
-msgid "Alias"
-msgstr "Nadimak"
-
-#: src/dialogs.c:996
-msgid "Group"
-msgstr "Grupa"
-
-#. Set up stuff for the account box
-#: src/dialogs.c:1005
-msgid "Add To"
-msgstr "Dodaj u"
-
-#: src/dialogs.c:1325
-msgid "Add Chat"
-msgstr "Dodaj razgovor"
-
-#: src/dialogs.c:1348
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Unesite ime koje želite da nadenete razgovoru, i podatke o razgovoru koji "
-"želite da dodate u spisak drugara.\n"
-
-#: src/dialogs.c:1357
-msgid "Account:"
-msgstr "Nalog:"
-
-#: src/dialogs.c:1376 src/gtkaccount.c:450
-msgid "Alias:"
-msgstr "Nadimak:"
-
-#: src/dialogs.c:1387
-msgid "Group:"
-msgstr "Grupa:"
-
-#: src/dialogs.c:1466
-msgid "Set Directory Info"
-msgstr "Postavi podatke u imeniku"
-
-#: src/dialogs.c:1474
-msgid "Directory Info"
-msgstr "Imenik sa podacima"
-
-#: src/dialogs.c:1484
-#, c-format
-msgid "Setting Dir Info for %s:"
-msgstr "Postavljam podatke u imeniku za %s:"
-
-#: src/dialogs.c:1497
-msgid "Allow Web Searches To Find Your Info"
-msgstr "Dozvoli da pretrage veba pronađu moje podatke"
-
-#. Line 1
-#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3968
-#: src/protocols/trepia/trepia.c:299
-msgid "First Name"
-msgstr "Ime"
-
-#. Line 2
-#: src/dialogs.c:1511 src/dialogs.c:2073
-msgid "Middle Name"
-msgstr "Ime oca"
-
-#. Line 3
-#: src/dialogs.c:1523 src/dialogs.c:2083 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3971 src/protocols/trepia/trepia.c:306
-msgid "Last Name"
-msgstr "Prezime"
-
-#. Line 4
-#: src/dialogs.c:1534 src/dialogs.c:2093
-msgid "Maiden Name"
-msgstr "Devojačko prezime"
-
-#. Line 5
-#: src/dialogs.c:1545 src/dialogs.c:2103 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
-#: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
-msgid "City"
-msgstr "Grad"
-
-#. Line 6
-#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4020
-#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:367
-#: src/protocols/trepia/trepia.c:471
-msgid "State"
-msgstr "Oblast"
-
-#. Line 7
-#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3729
-#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
-msgid "Country"
-msgstr "Država"
-
-#: src/dialogs.c:1598 src/dialogs.c:1779 src/dialogs.c:2854 src/dialogs.c:3518
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4199
-#: src/protocols/trepia/trepia.c:378
-msgid "Save"
-msgstr "Sačuvaj"
-
-#: src/dialogs.c:1621
-msgid "New passwords do not match."
-msgstr "Nove lozinke se ne poklapaju."
-
-#: src/dialogs.c:1627
-msgid "Fill out all fields completely."
-msgstr "Popunite sva polja u potpunosti."
-
-#: src/dialogs.c:1656 src/dialogs.c:1665 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4418 src/protocols/oscar/oscar.c:6185
-#: src/protocols/toc/toc.c:1534
-msgid "Change Password"
-msgstr "Promena lozinke"
-
-#: src/dialogs.c:1672
-#, c-format
-msgid "Changing password for %s:"
-msgstr "Izmena lozinke za %s:"
-
-#: src/dialogs.c:1680
-msgid "Original Password"
-msgstr "Stara lozinka"
-
-#: src/dialogs.c:1691
-msgid "New Password"
-msgstr "Nova lozinka"
-
-#: src/dialogs.c:1702
-msgid "New Password (again)"
-msgstr "Nova lozinka (ponovite)"
-
-#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4404
-#: src/protocols/oscar/oscar.c:6171 src/protocols/toc/toc.c:1522
+#: src/dialogs.c:852 src/protocols/jabber/jabber.c:944
+#: src/protocols/oscar/oscar.c:6347 src/protocols/toc/toc.c:1531
 msgid "Set User Info"
 msgstr "Postavi podatke o korisniku"
 
-#: src/dialogs.c:1751
+#: src/dialogs.c:861
 #, c-format
 msgid "Changing info for %s:"
 msgstr "Menjam podatke za %s:"
 
-#: src/dialogs.c:1839
-msgid "Below are the results of your search: "
-msgstr "Dole su rezultati pretrage: "
-
-#: src/dialogs.c:1958
+#: src/dialogs.c:963
 msgid "Log Conversation"
 msgstr "Dnevnik razgovora"
 
-#: src/dialogs.c:2039 src/dialogs.c:2172
-msgid "Search for Buddy"
-msgstr "Traži drugara"
-
-#: src/dialogs.c:2139
-msgid "Find Buddy By Info"
-msgstr "Pronađi drugara prema podacima"
-
-#: src/dialogs.c:2166
-msgid "Find Buddy By Email"
-msgstr "Pronađi drugara pomoću adrese e-pošte"
-
-#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3731
-#: src/protocols/yahoo/yahoo.c:2041
-msgid "Email"
-msgstr "E-pošta"
-
-#: src/dialogs.c:2270
+#: src/dialogs.c:1059
 msgid "Insert Link"
 msgstr "Ubaci vezu"
 
-#: src/dialogs.c:2272
+#: src/dialogs.c:1061
 msgid "Insert"
 msgstr "Ubaci"
 
-#: src/dialogs.c:2291
+#: src/dialogs.c:1083
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -1584,91 +1510,92 @@
 "Unesite Internet adresu i opis veze koju želite da ubacite. Opis nije "
 "obavezan.\n"
 
-#: src/dialogs.c:2315 src/protocols/jabber/jabber.c:3723
+#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/jabber.c:577
 msgid "URL"
 msgstr "Internet adresa"
 
-#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1804
-#: src/protocols/jabber/jabber.c:3737
+#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1810
+#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:739
 msgid "Description"
 msgstr "Opis"
 
-#: src/dialogs.c:2460 src/dialogs.c:2477
+#: src/dialogs.c:1247 src/dialogs.c:1264
 msgid "Select Text Color"
 msgstr "Izaberite boju teksta"
 
-#: src/dialogs.c:2512 src/dialogs.c:2529
+#: src/dialogs.c:1299 src/dialogs.c:1316
 msgid "Select Background Color"
 msgstr "Izaberite boju pozadine"
 
-#: src/dialogs.c:2626 src/dialogs.c:2652
+#: src/dialogs.c:1401 src/dialogs.c:1427
 msgid "Select Font"
 msgstr "Izaberite pismo"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:1493
 msgid "You cannot save an away message with a blank title"
 msgstr "Ne možete snimiti poruku za odsustvo bez naslova"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:1495
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Navedite i naslov poruke, ili izaberite „Koristi“ za korišćenje bez snimanja."
 
-#: src/dialogs.c:2730
+#: src/dialogs.c:1505
 msgid "You cannot create an empty away message"
 msgstr "Ne možete napraviti praznu poruku za odsustvo"
 
-#: src/dialogs.c:2795 src/dialogs.c:2803
+#: src/dialogs.c:1570 src/dialogs.c:1578
 msgid "New away message"
 msgstr "Nova poruka za odsustvo"
 
-#: src/dialogs.c:2813
+#: src/dialogs.c:1588
 msgid "Away title: "
 msgstr "Naslov odsustva: "
 
-#: src/dialogs.c:2858
+#: src/dialogs.c:1638
 msgid "Save & Use"
 msgstr "Sačuvaj i koristi"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:1642
 msgid "Use"
 msgstr "Koristi"
 
 #. show everything
-#: src/dialogs.c:3011
+#: src/dialogs.c:1791
 msgid "Smile!"
 msgstr "Smešak!"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias Chat"
 msgstr "Nadeni ime razgovoru"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias chat"
 msgstr "Nadeni ime razgovoru"
 
-#: src/dialogs.c:3030
+#: src/dialogs.c:1810
 msgid "Please enter an aliased name for this chat."
 msgstr "Unesite novo ime za ovaj razgovor."
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:1841
 msgid "_Screenname"
 msgstr "_Ime:"
 
-#: src/dialogs.c:3065 src/gtkblist.c:477 src/gtkblist.c:536
+#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
 msgid "_Alias"
 msgstr "N_adeni ime"
 
-#: src/dialogs.c:3069
+#: src/dialogs.c:1850
 msgid "Alias Buddy"
 msgstr "Nadeni ime drugaru"
 
-#: src/dialogs.c:3070
+#: src/dialogs.c:1851
 msgid "Alias buddy"
 msgstr "Nadeni ime drugaru"
 
-#: src/dialogs.c:3071
+#: src/dialogs.c:1852
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
@@ -1676,66 +1603,54 @@
 "Unesite ime koje želite da nadenete izabranoj osobi, ili preimenujte ovaj "
 "kontakt u spisku drugara."
 
-#: src/dialogs.c:3107 src/dialogs.c:3114
+#: src/dialogs.c:1888 src/dialogs.c:1895
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Ne mogu da pišem u %s."
 
-#: src/dialogs.c:3138
+#: src/dialogs.c:1919
 msgid "Save Log File"
 msgstr "Sačuvaj datoteku dnevnika"
 
-#: src/dialogs.c:3168
+#: src/dialogs.c:1949
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Ne mogu da uklonim datoteku %s."
 
-#: src/dialogs.c:3187
+#: src/dialogs.c:1968
 msgid "Clear Log"
 msgstr "Očisti dnevnik"
 
-#: src/dialogs.c:3196
+#: src/dialogs.c:1977
 msgid "Really clear log?"
 msgstr "Zaista želite da očistite dnevnik?"
 
-#: src/dialogs.c:3241 src/dialogs.c:3412
+#: src/dialogs.c:2022 src/dialogs.c:2193
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "Ne mogu da otvorim datoteku dnevnika %s."
 
-#: src/dialogs.c:3389
+#: src/dialogs.c:2170
 #, c-format
 msgid "Conversations with %s"
 msgstr "Razgovori sa %s"
 
-#: src/dialogs.c:3391
+#: src/dialogs.c:2172
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: src/dialogs.c:3433
+#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:582
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3490
+#: src/dialogs.c:2271
 msgid "Log"
 msgstr "Dnevnik rada"
 
-#: src/dialogs.c:3513
+#: src/dialogs.c:2294
 msgid "Clear"
 msgstr "Očisti"
 
-#: src/dialogs.c:3552
-msgid "Rename Group"
-msgstr "Preimenuj grupu"
-
-#: src/dialogs.c:3552
-msgid "New group name"
-msgstr "Naziv nove grupe"
-
-#: src/dialogs.c:3553
-msgid "Please enter a new name for the selected group."
-msgstr "Unesite novi naziv za izabranu grupu."
-
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1848,15 +1763,15 @@
 msgid "boring default"
 msgstr "Podrazumevano (ne tako) dosadno"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1595
+#: src/gaimrc.c:1267 src/gtkblist.c:1716
 msgid "Alphabetical"
 msgstr "Po azbučnom redu"
 
-#: src/gaimrc.c:1269
+#: src/gaimrc.c:1269 src/gtkblist.c:1717
 msgid "By status"
 msgstr "Po stanju"
 
-#: src/gaimrc.c:1271
+#: src/gaimrc.c:1271 src/gtkblist.c:1718
 msgid "By log size"
 msgstr "Po veličini dnevnika"
 
@@ -1865,7 +1780,7 @@
 msgid "Could not open config file %s."
 msgstr "Ne mogu da otvorim datoteku %s za postavke."
 
-#: src/gtkaccount.c:268
+#: src/gtkaccount.c:277
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1876,316 +1791,364 @@
 "<b>Veličina:</b> %s\n"
 "<b>Dimenzije slike:</b> %dx%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3086
+#: src/gtkaccount.c:308 src/protocols/oscar/oscar.c:3060
 msgid "Buddy Icon"
 msgstr "Sličica drugara"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:350
+#: src/gtkaccount.c:359
 msgid "Login Options"
 msgstr "Izbori prijava"
 
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:376
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:381
 msgid "Screenname:"
 msgstr "Ime:"
 
-#: src/gtkaccount.c:445 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:454 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: src/gtkaccount.c:454
+#: src/gtkaccount.c:459 src/gtkblist.c:2988
+msgid "Alias:"
+msgstr "Nadimak:"
+
+#: src/gtkaccount.c:463
 msgid "Remember password"
 msgstr "Zapamti lozinku"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:517
 msgid "User Options"
 msgstr "Korisnički izbori"
 
-#: src/gtkaccount.c:521
-msgid "New mail notifications"
-msgstr "Obaveštenja o novopristigloj e-pošti"
-
 #: src/gtkaccount.c:530
-msgid "Buddy icon file:"
-msgstr "Datoteka ikonice drugara:"
+msgid "New mail notifications"
+msgstr "Obaveštenja o novopristigloj e-pošti"
 
 #: src/gtkaccount.c:539
+msgid "Buddy icon file:"
+msgstr "Datoteka ikonice drugara:"
+
+#: src/gtkaccount.c:548
 msgid "_Browse"
 msgstr "_Traži"
 
-#: src/gtkaccount.c:545
+#: src/gtkaccount.c:554
 msgid "_Reset"
 msgstr "_Odbaci"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:606
+#: src/gtkaccount.c:615
 #, c-format
 msgid "%s Options"
 msgstr "%s opcije"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:727
+#: src/gtkaccount.c:736
 msgid "Use Global Proxy Settings"
 msgstr "Koristi opšta podešavanja proksija"
 
 #. No Proxy
-#: src/gtkaccount.c:734
+#: src/gtkaccount.c:743
 msgid "No Proxy"
 msgstr "Bez proksija"
 
 #. HTTP
-#: src/gtkaccount.c:741
+#: src/gtkaccount.c:750
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:748
+#: src/gtkaccount.c:757
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:755
+#: src/gtkaccount.c:764
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:762 src/gtkprefs.c:1107
+#: src/gtkaccount.c:771 src/gtkprefs.c:1113
 msgid "Use Environmental Settings"
 msgstr "Koristi podešavanja okruženja"
 
-#: src/gtkaccount.c:795
+#: src/gtkaccount.c:804
 msgid "you can see the butterflies mating"
 msgstr "možete videti kako se leptiri pare"
 
-#: src/gtkaccount.c:799
+#: src/gtkaccount.c:808
 msgid "If you look real closely"
 msgstr "Ukoliko pogledate izbliza"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:824
 msgid "Proxy Options"
 msgstr "Postavke proksija"
 
-#: src/gtkaccount.c:831 src/gtkprefs.c:1101
+#: src/gtkaccount.c:840 src/gtkprefs.c:1107
 msgid "Proxy _type:"
 msgstr "_Vrsta proksija:"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:849
 msgid "_Host:"
 msgstr "_Server:"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:853
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:852
+#: src/gtkaccount.c:861
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
-#: src/gtkaccount.c:857
+#: src/gtkaccount.c:866
 msgid "Pa_ssword:"
 msgstr "_Lozinka:"
 
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1199
 msgid "Add Account"
 msgstr "Dodaj nalog"
 
-#: src/gtkaccount.c:1192
+#: src/gtkaccount.c:1201
 msgid "Modify Account"
 msgstr "Izmeni nalog"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1216
+#: src/gtkaccount.c:1225
 msgid "Show more options"
 msgstr "Pokaži više postavki"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1226
 msgid "Show fewer options"
 msgstr "Pokaži manje postavki"
 
 #. Register button
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1253 src/protocols/jabber/jabber.c:595
 msgid "Register"
 msgstr "Registruj se"
 
-#: src/gtkaccount.c:1542
+#: src/gtkaccount.c:1551
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Da li ste sigurni da želite obrisati %s?"
 
-#: src/gtkaccount.c:1546 src/gtkrequest.c:192
+#: src/gtkaccount.c:1555 src/gtkrequest.c:201
 msgid "Delete"
 msgstr "Obriši"
 
-#. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3529
-#: src/protocols/jabber/jabber.c:3579 src/protocols/oscar/oscar.c:2847
-#: src/protocols/oscar/oscar.c:4598 src/protocols/oscar/oscar.c:5911
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:873
-#: src/protocols/zephyr/zephyr.c:883
+#: src/gtkaccount.c:1633 src/gtkblist.c:2666
+msgid "Screen Name"
+msgstr "Ime"
+
+#: src/gtkaccount.c:1656 src/protocols/jabber/jabber.c:836
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:6056 src/protocols/yahoo/yahoo.c:1838
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Na vezi"
 
-#: src/gtkaccount.c:1665
+#: src/gtkaccount.c:1674
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkblist.c:450
+#: src/gtkaccount.c:1963
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+msgstr "%s%s%s%s učini %s svojim drugarom%s%s%s"
+
+#: src/gtkaccount.c:1977
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"Da li želite da dodate nju ili njega u svoj spisak drugara?"
+
+#: src/gtkaccount.c:1981
+msgid "Gaim - Information"
+msgstr "Gaim — podaci"
+
+#: src/gtkaccount.c:1985
+msgid "Add buddy to your list?"
+msgstr "Dodati drugara u Vaš spisak?"
+
+#: src/gtkaccount.c:1987 src/gtkblist.c:3036 src/gtkconv.c:1137
+#: src/gtkconv.c:2979 src/gtkconv.c:4154 src/gtkrequest.c:202
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+msgid "Add"
+msgstr "Dodaj"
+
+#: src/gtkblist.c:496
 msgid "_Get Info"
 msgstr "Pribavi poda_tke"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:499
 msgid "_IM"
 msgstr "_Poruka"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:501
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _zasedu drugaru"
 
-#: src/gtkblist.c:457
+#: src/gtkblist.c:503
 msgid "View _Log"
 msgstr "Pregled dnevni_ka"
 
-#: src/gtkblist.c:479 src/gtkblist.c:538 src/gtkblist.c:548
+#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: src/gtkblist.c:517
+#: src/gtkblist.c:597
 msgid "Add a _Buddy"
 msgstr "_Dodaj drugara"
 
-#: src/gtkblist.c:519
+#: src/gtkblist.c:599
 msgid "Add a C_hat"
 msgstr "Dodaj _razgovor"
 
-#: src/gtkblist.c:521
+#: src/gtkblist.c:601
 msgid "_Delete Group"
 msgstr "U_kloni grupu"
 
-#: src/gtkblist.c:523
+#: src/gtkblist.c:603
 msgid "_Rename"
 msgstr "Pre_imenuj"
 
-#: src/gtkblist.c:531
+#: src/gtkblist.c:611
 msgid "_Join"
 msgstr "_Priključi se"
 
-#: src/gtkblist.c:533
+#: src/gtkblist.c:613
 msgid "Auto-Join"
 msgstr "Automatska prijava"
 
-#: src/gtkblist.c:544 src/gtkblist.c:575
+#: src/gtkblist.c:622 src/gtkblist.c:653
 msgid "_Collapse"
 msgstr "_Skupi"
 
-#: src/gtkblist.c:580
+#: src/gtkblist.c:658
 msgid "_Expand"
 msgstr "_Razgranaj"
 
 #. Buddies menu
-#: src/gtkblist.c:1005
+#: src/gtkblist.c:1088
 msgid "/_Buddies"
 msgstr "/_Drugari"
 
-#: src/gtkblist.c:1006
+#: src/gtkblist.c:1089
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Drugari/_Nova brza poruka..."
 
-#: src/gtkblist.c:1007
+#: src/gtkblist.c:1090
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Drugari/_Priključi se razgovoru..."
 
-#: src/gtkblist.c:1008
+#: src/gtkblist.c:1091
 msgid "/Buddies/Get _User Info..."
 msgstr "/Drugari/Pribavi podatke o _korisniku..."
 
-#: src/gtkblist.c:1010
+#: src/gtkblist.c:1093
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Drugari/Prikaži nep_ovezane drugare"
 
-#: src/gtkblist.c:1011
+#: src/gtkblist.c:1094
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Drugari/Prikaži _prazne grupe"
 
-#: src/gtkblist.c:1012
+#: src/gtkblist.c:1095
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/Drugari/_Dodaj drugara..."
 
-#: src/gtkblist.c:1013
+#: src/gtkblist.c:1096
 msgid "/Buddies/Add a C_hat..."
 msgstr "/Drugari/Dodaj razgo_vor..."
 
-#: src/gtkblist.c:1014
+#: src/gtkblist.c:1097
 msgid "/Buddies/Add a _Group..."
 msgstr "/Drugari/Dodaj _grupu..."
 
-#: src/gtkblist.c:1016
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr "/Drugari/_Odjava"
 
-#: src/gtkblist.c:1017
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr "/Drugari/I_zlaz"
 
 #. Tools
-#: src/gtkblist.c:1020
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/gtkblist.c:1021
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr "/Alati/_Odsutan"
 
-#: src/gtkblist.c:1022
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Alati/_Zaseda drugaru"
 
-#: src/gtkblist.c:1023
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Alati/A_kcije po protokolu"
 
-#: src/gtkblist.c:1025
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr "/Alati/_Nalozi"
 
-#: src/gtkblist.c:1026
+#: src/gtkblist.c:1109
 msgid "/Tools/_File Transfers..."
 msgstr "/Alati/Prenosi _datoteka..."
 
-#: src/gtkblist.c:1027
+#: src/gtkblist.c:1110
 msgid "/Tools/Preferences"
 msgstr "/Alati/Postavke"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr "/Alati/_Privatnost"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr "/Alati/Pregled _sistemskog dnevnika rada"
 
 #. Help
-#: src/gtkblist.c:1033
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr "/Pomoć/Pomoć iz _programa"
 
-#: src/gtkblist.c:1035
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr "/Pomoć/Prozor za nalaženje _grešaka"
 
-#: src/gtkblist.c:1036
+#: src/gtkblist.c:1119
 msgid "/Help/_About"
 msgstr "/Pomoć/_O programu"
 
-#: src/gtkblist.c:1066
+#: src/gtkblist.c:1135
+msgid "Rename Group"
+msgstr "Preimenuj grupu"
+
+#: src/gtkblist.c:1135
+msgid "New group name"
+msgstr "Naziv nove grupe"
+
+#: src/gtkblist.c:1136
+msgid "Please enter a new name for the selected group."
+msgstr "Unesite novi naziv za izabranu grupu."
+
+#: src/gtkblist.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -2194,16 +2157,16 @@
 "\n"
 "<b>Nalog:</b> %s"
 
-#: src/gtkblist.c:1125 src/protocols/oscar/oscar.c:5498
+#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5437
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Stanje:</b> Nepovezan"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1236
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1151
+#: src/gtkblist.c:1250
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2211,7 +2174,7 @@
 "\n"
 "<b>Nalog:</b>"
 
-#: src/gtkblist.c:1152
+#: src/gtkblist.c:1251
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2219,7 +2182,7 @@
 "\n"
 "<b>Poznat kao:</b>"
 
-#: src/gtkblist.c:1153
+#: src/gtkblist.c:1252
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2227,7 +2190,7 @@
 "\n"
 "<b>Nadimak:</b>"
 
-#: src/gtkblist.c:1154
+#: src/gtkblist.c:1253
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2235,7 +2198,7 @@
 "\n"
 "<b>Neaktivan:</b>"
 
-#: src/gtkblist.c:1155
+#: src/gtkblist.c:1254
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2243,7 +2206,7 @@
 "\n"
 "<b>Upozoren:</b>"
 
-#: src/gtkblist.c:1157
+#: src/gtkblist.c:1256
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2251,7 +2214,7 @@
 "\n"
 "<b>Opis:</b> sablasno"
 
-#: src/gtkblist.c:1158
+#: src/gtkblist.c:1257
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2259,7 +2222,7 @@
 "\n"
 "<b>Stanje:</b> sjajno"
 
-#: src/gtkblist.c:1159
+#: src/gtkblist.c:1258
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2267,81 +2230,140 @@
 "\n"
 "<b>Stanje:</b> razbija"
 
-#: src/gtkblist.c:1413
+#: src/gtkblist.c:1513
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Neaktivan (%dh%02dm) "
 
-#: src/gtkblist.c:1415
+#: src/gtkblist.c:1515
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Neaktivan (%dm) "
 
-#: src/gtkblist.c:1419
+#: src/gtkblist.c:1519
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Upozoren (%d%%) "
 
-#: src/gtkblist.c:1422
+#: src/gtkblist.c:1522
 msgid "Offline "
 msgstr "Nepovezan"
 
-#: src/gtkblist.c:1594 src/gtkprefs.c:841 src/gtkprefs.c:1499
+#: src/gtkblist.c:1714 src/gtkprefs.c:842 src/gtkprefs.c:1502
 msgid "None"
 msgstr "Ništa"
 
-#: src/gtkblist.c:1659
+#: src/gtkblist.c:1779
 msgid "/Tools/Away"
 msgstr "/Alati/Odsutan"
 
-#: src/gtkblist.c:1662
+#: src/gtkblist.c:1782
 msgid "/Tools/Buddy Pounce"
 msgstr "/Alati/Zaseda drugaru"
 
-#: src/gtkblist.c:1665
+#: src/gtkblist.c:1785
 msgid "/Tools/Protocol Actions"
 msgstr "/Alati/Akcije po protokolu"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1748
+#: src/gtkblist.c:1869
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Drugari/Prikaži nepovezane drugare"
 
-#: src/gtkblist.c:1750
+#: src/gtkblist.c:1871
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Drugari/Prikaži prazne grupe"
 
-#: src/gtkblist.c:1768 src/gtkconv.c:1073
+#: src/gtkblist.c:1889 src/gtkconv.c:1096
 msgid "IM"
 msgstr "Poruka"
 
-#: src/gtkblist.c:1774
+#: src/gtkblist.c:1895
 msgid "Send a message to the selected buddy"
 msgstr "Pošalji poruku izabranom drugaru"
 
-#: src/gtkblist.c:1777 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1898 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Podaci"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:1904
 msgid "Get information on the selected buddy"
 msgstr "Pribavi podatke o izabranom drugaru"
 
-#: src/gtkblist.c:1786 src/protocols/oscar/oscar.c:3095
+#: src/gtkblist.c:1907 src/protocols/oscar/oscar.c:3069
 msgid "Chat"
 msgstr "Razgovor"
 
-#: src/gtkblist.c:1791
+#: src/gtkblist.c:1912
 msgid "Join a chat room"
 msgstr "Priključi se pričaonici"
 
-#: src/gtkblist.c:1799
+#: src/gtkblist.c:1920
 msgid "Set an away message"
 msgstr "Postavi poruku za odsustvo"
 
-#: src/gtkblist.c:2846
+#: src/gtkblist.c:2621 src/protocols/yahoo/yahoo.c:1972
+msgid "Add Buddy"
+msgstr "Dodaj drugara"
+
+#: src/gtkblist.c:2644
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Unesite ime osobe koju želite da dodate u spisak drugara. Prema želji možete "
+"uneti i alijas ili nadimak za drugara. Alijas će se prikazivati umesto "
+"imena, kad god je to moguće.\n"
+
+#: src/gtkblist.c:2679
+msgid "Alias"
+msgstr "Nadimak"
+
+#: src/gtkblist.c:2692
+msgid "Group"
+msgstr "Grupa"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:2701
+msgid "Add To"
+msgstr "Dodaj u"
+
+#: src/gtkblist.c:2937
+msgid "Add Chat"
+msgstr "Dodaj razgovor"
+
+#: src/gtkblist.c:2960
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Unesite ime koje želite da nadenete razgovoru, i podatke o razgovoru koji "
+"želite da dodate u spisak drugara.\n"
+
+#: src/gtkblist.c:2970
+msgid "Account:"
+msgstr "Nalog:"
+
+#: src/gtkblist.c:2999
+msgid "Group:"
+msgstr "Grupa:"
+
+#: src/gtkblist.c:3033
+msgid "Add Group"
+msgstr "Dodaj grupu"
+
+#: src/gtkblist.c:3033
+msgid "Add a new group"
+msgstr "Dodaj novu grupu"
+
+#: src/gtkblist.c:3034
+msgid "Please enter the name of the group to be added."
+msgstr "Unesite naziv grupe koju želite da dodate."
+
+#: src/gtkblist.c:3546
 msgid "No actions available"
 msgstr "Nema dostupnih akcija"
 
@@ -2370,24 +2392,29 @@
 msgid "Reason Unknown."
 msgstr "Razlog nepoznat."
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:185
 msgid "That file already exists"
 msgstr "Datoteka već postoji."
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "Da li želite da je prepišete?"
 
-#: src/gtkconv.c:280
+#: src/gtkconv.c:241
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Ne mogu da sačuvam sliku: %s.\n"
+
+#: src/gtkconv.c:303
 msgid "Gaim - Insert Image"
 msgstr "Gaim — ubaci sliku"
 
-#: src/gtkconv.c:584
+#: src/gtkconv.c:607
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim — pozovi drugara u pričaonicu"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:635
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2395,301 +2422,301 @@
 "Unesite ime korisnika koga želite da pozovete, a po želji dodajte i poruku u "
 "pozivnicu."
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:656
 msgid "_Buddy:"
 msgstr "_Drugar:"
 
-#: src/gtkconv.c:653
+#: src/gtkconv.c:676
 msgid "_Message:"
 msgstr "_Poruka:"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1104
 msgid "Un-Ignore"
 msgstr "Ne ignoriši"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:773
+#: src/gtkconv.c:1106 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "Ignoriši"
 
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2978
+#: src/gtkconv.c:1115 src/gtkconv.c:3002
 msgid "Info"
 msgstr "Podaci"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3491
+#: src/gtkconv.c:1124
 msgid "Get Away Msg"
 msgstr "Pribavi poruku za odsustvo"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2961 src/gtkconv.c:4123
-#: src/gtkrequest.c:194
+#: src/gtkconv.c:1135 src/gtkconv.c:2985 src/gtkconv.c:4139
+#: src/gtkrequest.c:203
 msgid "Remove"
 msgstr "Ukloni"
 
-#: src/gtkconv.c:2187
+#: src/gtkconv.c:2210
 msgid "User is typing..."
 msgstr "Korisnik kuca..."
 
-#: src/gtkconv.c:2195
+#: src/gtkconv.c:2218
 msgid "User has typed something and paused"
 msgstr "Korisnik je nešto ukucao i zastao"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2297
+#: src/gtkconv.c:2321
 msgid "_Send As"
 msgstr "Pošalji _kao"
 
-#: src/gtkconv.c:2757
+#: src/gtkconv.c:2781
 msgid "Gaim - Save Conversation"
 msgstr "Gaim — sačuvaj razgovor"
 
 #. Conversation menu
-#: src/gtkconv.c:2774
+#: src/gtkconv.c:2798
 msgid "/_Conversation"
 msgstr "/_Razgovor"
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2800
 msgid "/Conversation/_Save As..."
 msgstr "/Razgovor/_Sačuvaj kao..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2802
 msgid "/Conversation/View _Log..."
 msgstr "/Razgovor/Pogledaj _dnevnik..."
 
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2806
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Razgovor/Dodaj _zasedu drugaru..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2808
 msgid "/Conversation/A_lias..."
 msgstr "/Razgovor/_Nadeni ime..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2810
 msgid "/Conversation/_Get Info..."
 msgstr "/Razgovor/Pri_bavi podatke..."
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:2812
 msgid "/Conversation/In_vite..."
 msgstr "/Razgovor/_Pozovi..."
 
-#: src/gtkconv.c:2793
+#: src/gtkconv.c:2817
 msgid "/Conversation/Insert _URL..."
 msgstr "/Razgovor/_Ubaci Internet adresu..."
 
-#: src/gtkconv.c:2795
+#: src/gtkconv.c:2819
 msgid "/Conversation/Insert _Image..."
 msgstr "/Razgovor/Ubaci s_liku..."
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2824
 msgid "/Conversation/_Warn..."
 msgstr "/Razgovor/_Upozori..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2826
 msgid "/Conversation/_Block..."
 msgstr "/Razgovor/_Blokiraj..."
 
-#: src/gtkconv.c:2804
+#: src/gtkconv.c:2828
 msgid "/Conversation/_Add..."
 msgstr "/Razgovor/_Dodaj..."
 
-#: src/gtkconv.c:2806
+#: src/gtkconv.c:2830
 msgid "/Conversation/_Remove..."
 msgstr "/Razgovor/_Ukloni..."
 
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2835
 msgid "/Conversation/_Close"
 msgstr "/Razgovor/_Završi"
 
 #. Options
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2839
 msgid "/_Options"
 msgstr "/_Izbori"
 
-#: src/gtkconv.c:2816
+#: src/gtkconv.c:2840
 msgid "/Options/Enable _Logging"
 msgstr "/Izbori/Omogući _dnevnik rada"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2841
 msgid "/Options/Enable _Sounds"
 msgstr "/Izbori/Omogući z_vuke"
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2881
 msgid "/Conversation/View Log..."
 msgstr "/Razgovor/Prikaži _dnevnik..."
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2886
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Razgovor/Dodaj _zasedu drugaru..."
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2890
 msgid "/Conversation/Alias..."
 msgstr "/Razgovor/Nadeni ime..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2894
 msgid "/Conversation/Get Info..."
 msgstr "/Razgovor/Pribavi podatke..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2898
 msgid "/Conversation/Invite..."
 msgstr "/Razgovor/Podaci..."
 
-#: src/gtkconv.c:2880
+#: src/gtkconv.c:2904
 msgid "/Conversation/Insert URL..."
 msgstr "/Razgovor/Ubaci Internet adresu..."
 
-#: src/gtkconv.c:2884
+#: src/gtkconv.c:2908
 msgid "/Conversation/Insert Image..."
 msgstr "/Razgovor/Ubaci sliku..."
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:2914
 msgid "/Conversation/Warn..."
 msgstr "/Razgovor/Upozori..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2918
 msgid "/Conversation/Block..."
 msgstr "/Razgovor/Blokiraj..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2922
 msgid "/Conversation/Add..."
 msgstr "/Razgovor/Dodaj..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2926
 msgid "/Conversation/Remove..."
 msgstr "/Razgovor/Ukloni..."
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2932
 msgid "/Options/Enable Logging"
 msgstr "/Izbori/Omogući zapise"
 
-#: src/gtkconv.c:2911
+#: src/gtkconv.c:2935
 msgid "/Options/Enable Sounds"
 msgstr "/Izbori/Omogući zvuke"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2935 src/gtkconv.c:2937 src/gtkconv.c:3035 src/gtkconv.c:3037
-#: src/gtkconv.c:5918
+#: src/gtkconv.c:2959 src/gtkconv.c:2961 src/gtkconv.c:3059 src/gtkconv.c:3061
+#: src/gtkconv.c:5925
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/gtkconv.c:2958 src/gtkconv.c:4141
+#: src/gtkconv.c:2982 src/gtkconv.c:4157
 msgid "Add the user to your buddy list"
 msgstr "Dodavanje korisnika u Vaš spisak drugara"
 
-#: src/gtkconv.c:2964 src/gtkconv.c:4126
+#: src/gtkconv.c:2988 src/gtkconv.c:4142
 msgid "Remove the user from your buddy list"
 msgstr "Uklanjanje korisnika sa Vašeg spisak drugara"
 
 #. Warn button
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:2995
 msgid "Warn"
 msgstr "Upozori"
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:2999
 msgid "Warn the user"
 msgstr "Upozori korisnika"
 
-#: src/gtkconv.c:2982 src/gtkconv.c:3417
+#: src/gtkconv.c:3006 src/gtkconv.c:3441
 msgid "Get the user's information"
 msgstr "Pribavi podatke o korisniku"
 
 #. Block button
-#: src/gtkconv.c:2985 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3009 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Blokiraj"
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:3013
 msgid "Block the user"
 msgstr "Blokiraj korisnika"
 
 #. Invite
-#: src/gtkconv.c:3047 src/gtkconv.c:5921
+#: src/gtkconv.c:3071 src/gtkconv.c:5928
 msgid "Invite"
 msgstr "Pozovi"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3074
 msgid "Invite a user"
 msgstr "Pozovi korisnika"
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3113
 msgid "Bold"
 msgstr "Masno"
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3124
 msgid "Italic"
 msgstr "Kurziv"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3135
 msgid "Underline"
 msgstr "Podvučeno"
 
-#: src/gtkconv.c:3127
-msgid "Larger font size"
-msgstr "Veća slova"
-
-#: src/gtkconv.c:3139
-msgid "Normal font size"
-msgstr "Obična slova"
-
 #: src/gtkconv.c:3151
+msgid "Larger font size"
+msgstr "Veća slova"
+
+#: src/gtkconv.c:3163
+msgid "Normal font size"
+msgstr "Obična slova"
+
+#: src/gtkconv.c:3175
 msgid "Smaller font size"
 msgstr "Manja slova"
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3192
 msgid "Font Face"
 msgstr "Pismo"
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3204
 msgid "Foreground font color"
 msgstr "Boja teksta"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3216
 msgid "Background color"
 msgstr "Boja pozadine"
 
-#: src/gtkconv.c:3207
+#: src/gtkconv.c:3231
 msgid "Insert image"
 msgstr "Ubaci sliku"
 
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3242
 msgid "Insert link"
 msgstr "Ubaci vezu"
 
-#: src/gtkconv.c:3229
+#: src/gtkconv.c:3253
 msgid "Insert smiley"
 msgstr "Ubaci smešak"
 
-#: src/gtkconv.c:3286
+#: src/gtkconv.c:3310
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3337
+#: src/gtkconv.c:3361
 msgid "0 people in room"
 msgstr "Nema nikoga u pričaonici"
 
-#: src/gtkconv.c:3394
+#: src/gtkconv.c:3418
 msgid "IM the user"
 msgstr "Pošalji brzu poruku korisniku"
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3430
 msgid "Ignore the user"
 msgstr "Ignoriši korisnika"
 
-#: src/gtkconv.c:3908 src/server.c:1393
+#: src/gtkconv.c:3924 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> —— Novi razgovor @ %s ——</H3><BR>\n"
 
-#: src/gtkconv.c:3912 src/server.c:1396
+#: src/gtkconv.c:3928 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "—— Novi razgovori @  %s ——\n"
 
-#: src/gtkconv.c:3945
+#: src/gtkconv.c:3961
 msgid "Close conversation"
 msgstr "Okončaj razgovor"
 
-#: src/gtkconv.c:4619 src/gtkconv.c:4651 src/gtkconv.c:4772 src/gtkconv.c:4839
+#: src/gtkconv.c:4646 src/gtkconv.c:4678 src/gtkconv.c:4799 src/gtkconv.c:4866
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2697,23 +2724,23 @@
 msgstr[1] "%d osobe u pričaonici."
 msgstr[2] "%d osoba u pričaonici."
 
-#: src/gtkconv.c:5188
+#: src/gtkconv.c:5197
 msgid "Disable Animation"
 msgstr "Onemogući animacije"
 
-#: src/gtkconv.c:5197
+#: src/gtkconv.c:5206
 msgid "Enable Animation"
 msgstr "Omogući animacije"
 
-#: src/gtkconv.c:5204
+#: src/gtkconv.c:5213
 msgid "Hide Icon"
 msgstr "Sakrij ikonicu"
 
-#: src/gtkconv.c:5210
+#: src/gtkconv.c:5219
 msgid "Save Icon As..."
 msgstr "Sačuvaj ikonicu kao..."
 
-#: src/gtkconv.c:5688 src/gtkconv.c:5691
+#: src/gtkconv.c:5695 src/gtkconv.c:5698
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Razgovor/Završi"
 
@@ -2821,7 +2848,7 @@
 msgid "Gaim - Open..."
 msgstr "Gaim — Otvori..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2030
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
 msgid "Gaim - Save As..."
 msgstr "Gaim — Sačuvaj kao..."
 
@@ -2838,7 +2865,7 @@
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: src/gtkimhtml.c:1652
+#: src/gtkimhtml.c:1616
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2846,20 +2873,20 @@
 "Gaim nije uspeo da pogodi vrstu zapisa slike na osnovu navedenog nastavka "
 "datoteke. Podrazumevano se radi o PNG zapisu."
 
-#: src/gtkimhtml.c:1660
+#: src/gtkimhtml.c:1624
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Greška pri snimanju slike: %s"
 
-#: src/gtkimhtml.c:1669
+#: src/gtkimhtml.c:1633
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#: src/gtkimhtml.c:1691
+#: src/gtkimhtml.c:1656
 msgid "_Save Image..."
 msgstr "_Sačuvaj sliku..."
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -2867,17 +2894,17 @@
 msgstr[1] "%s je primio %d nove poruke."
 msgstr[2] "%s je primio %d novih poruka."
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Od:</span> %s\n"
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Tema:</span> %s\n"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2888,7 +2915,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2942,8 +2969,8 @@
 msgid "Return from away"
 msgstr "Vrati se sa odsustva"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1496 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1427
+#: src/gtkpounce.c:465 src/gtkprefs.c:1499 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Idle"
 msgstr "Neaktivan"
 
@@ -2988,7 +3015,7 @@
 msgid "Browse"
 msgstr "Pretraži"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2082
+#: src/gtkpounce.c:518 src/gtkprefs.c:2088
 msgid "Test"
 msgstr "Isprobaj"
 
@@ -3040,15 +3067,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Nepoznata zaseda. Molimo Vas da ovo prijavite!"
 
-#: src/gtkprefs.c:377
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr "Postavke sučelja"
 
-#: src/gtkprefs.c:379
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "Prikaži udaljene nadimke ukoliko alijas nije postavljen"
 
-#: src/gtkprefs.c:560
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3056,180 +3083,180 @@
 "Izaberite skup smešaka koji želite da koristite iz donjeg spiska. Novi "
 "skupovi se mogu dodati prevlačenjem i puštanjem istih na spisak skupova."
 
-#: src/gtkprefs.c:593
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "Ikonica"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "Stil"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "_Masno"
 
-#: src/gtkprefs.c:670
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "_Kurzivno"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "Po_dvučeno"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "P_recrtano"
 
-#: src/gtkprefs.c:677
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "Pismo"
 
-#: src/gtkprefs.c:680
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "Koristi _izabrano pismo"
 
-#: src/gtkprefs.c:697
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "Koristi izabranu _veličinu"
 
-#: src/gtkprefs.c:710
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "Boja"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "Boja _teksta"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "Boja _pozadine"
 
-#: src/gtkprefs.c:761 src/gtkprefs.c:998 src/gtkprefs.c:1051
+#: src/gtkprefs.c:762 src/gtkprefs.c:1004 src/gtkprefs.c:1057
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/gtkprefs.c:762
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "Prikaži _grafički smešak"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "Prikaži _vremenske oznake poruka"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "Prikaži _Internet adrese kao veze"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "Istakni gre_ške u kucanju"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "Zanemari _boje"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "Zanemari _pismo"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "Zanemari veličinu _slova"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "Slanje poruke"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "Enter _šalje poruku"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "Control+Enter š_alje poruku"
 
-#: src/gtkprefs.c:797
-msgid "Window Closing"
-msgstr "Zatvaranje prozora"
-
 #: src/gtkprefs.c:798
+msgid "Window Closing"
+msgstr "Zatvaranje prozora"
+
+#: src/gtkprefs.c:799
 msgid "_Escape closes window"
 msgstr "Esc zatvara _prozor"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "Ubacivanje"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:803
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Control-{B/I/U/S} ubacuje HTML _oznake"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(broj) ubacuje _smešak"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "Poredak u spisku drugara"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "_Poredak:"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "Alatke u spisku drugara"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:837 src/gtkprefs.c:974 src/gtkprefs.c:1030
 msgid "Show _buttons as:"
 msgstr "Prikaži _dugmad kao:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:839 src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "Pictures"
 msgstr "Slike"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:840 src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:841 src/gtkprefs.c:978 src/gtkprefs.c:1034
 msgid "Pictures and text"
 msgstr "Slike i tekst"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:986 src/gtkprefs.c:1042
+#: src/gtkprefs.c:846 src/gtkprefs.c:992 src/gtkprefs.c:1048
 msgid "_Raise window on events"
 msgstr "_Izdigni prozor na događaje"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "Prikaz grupa"
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr "Prikaži _brojeve u grupama"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr "Prikaz drugara"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:993
+#: src/gtkprefs.c:855 src/gtkprefs.c:999
 msgid "Show buddy _icons"
 msgstr "Prikaži i_konice drugara"
 
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr "Prikaži _nivoe upozorenja"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:860
 msgid "Show idle _times"
 msgstr "Prikaži _trajanje neaktivnosti"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:874
 msgid "Dim i_dle buddies"
 msgstr "_Osenči neaktivne drugare"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:899
 msgid "_Placement:"
 msgstr "_Razmeštaj:"
 
@@ -3265,150 +3292,149 @@
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prikaži brze poruke i razgovore u prozorima pomoću _listova"
 
-#. XXX: grey this out when the above is unchecked
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:925
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Prikaži brze poruke i razgovore u _istom lisnatom prozoru"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:935
 msgid "Show _close button on tabs"
 msgstr "Prikaži dugme za zatvara_nje na jezičcima."
 
-#: src/gtkprefs.c:940
+#: src/gtkprefs.c:946
 msgid "Show status _icons on tabs"
 msgstr "Prikaži ikonicu stanja na jezičcima."
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1023
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "Window"
 msgstr "Prozor"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:983 src/gtkprefs.c:1039
 msgid "New window _width:"
 msgstr "_Širina novog prozora:"
 
-#: src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:986 src/gtkprefs.c:1042
 msgid "New window _height:"
 msgstr "_Visina novog prozora:"
 
-#: src/gtkprefs.c:983 src/gtkprefs.c:1039
+#: src/gtkprefs.c:989 src/gtkprefs.c:1045
 msgid "_Entry field height:"
 msgstr "Visina polja za _unos:"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:994
 msgid "Hide window on _send"
 msgstr "_Sakrij prozor pri slanju"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:998
 msgid "Buddy Icons"
 msgstr "Ikonice drugara"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:1001
 msgid "Enable buddy icon a_nimation"
 msgstr "Uključi _animaciju ikonice drugara"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1005
 msgid "Show _logins in window"
 msgstr "Prikaži _prijave u prozoru"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1007
 msgid "Show a_liases in tabs/titles"
 msgstr "Prikaži a_lijase u jezičcima/naslovima"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1010
 msgid "Typing Notification"
 msgstr "Obaveštenje o kucanju"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1011
 msgid "Notify buddies that you are _typing to them"
 msgstr "Slanje obaveštenja drugarima kada im piše_te"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1051
 msgid "Tab Completion"
 msgstr "Dovršavanje tabulatorom"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1052
 msgid "_Tab-complete nicks"
 msgstr "Dovrši nadimke na pritisak _tabulatora"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1054
 msgid "_Old-style tab completion"
 msgstr "_Staromodno dovršavanje pomoću tabulatora"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1058
 msgid "_Show people joining in window"
 msgstr "Prikaži u prozoru ljude koji se _priključuju"
 
-#: src/gtkprefs.c:1054
+#: src/gtkprefs.c:1060
 msgid "_Show people leaving in window"
 msgstr "Prikaži u prozoru ljude koji _odlaze"
 
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1062
 msgid "Co_lorize screennames"
 msgstr "_Bojenje imena"
 
-#: src/gtkprefs.c:1100
+#: src/gtkprefs.c:1106
 msgid "Proxy Type"
 msgstr "Vrsta proksija"
 
-#: src/gtkprefs.c:1103
+#: src/gtkprefs.c:1109
 msgid "No proxy"
 msgstr "Bez proksija"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1116
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1137
 msgid "_Host"
 msgstr "_Ime servera"
 
-#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4528 src/protocols/msn/msn.c:1529
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
+#: src/gtkprefs.c:1154 src/protocols/irc/irc.c:516
+#: src/protocols/jabber/jabber.c:1057 src/protocols/msn/msn.c:1616
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
 msgid "Port"
 msgstr "Port"
 
-#: src/gtkprefs.c:1166
+#: src/gtkprefs.c:1172
 msgid "_User"
 msgstr "_Korisnik"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1189
 msgid "Pa_ssword"
 msgstr "_Lozinka"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1226
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1227
 msgid "Netscape"
 msgstr "Netskejp"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1228
 msgid "Mozilla"
 msgstr "Mozila"
 
-#: src/gtkprefs.c:1223
+#: src/gtkprefs.c:1229
 msgid "Konqueror"
 msgstr "Konkveror"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1230
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1233
+#: src/gtkprefs.c:1239
 msgid "Manual"
 msgstr "Ručna postavka"
 
-#: src/gtkprefs.c:1274
+#: src/gtkprefs.c:1280
 msgid "Browser Selection"
 msgstr "Izbor preglednika"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1284
 msgid "_Browser:"
 msgstr "_Veb preglednik:"
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1294
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3417,87 +3443,87 @@
 "_Ručno:\n"
 "(%s za adresu)"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1315
 msgid "Browser Options"
 msgstr "Postavke veb preglednika"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1316
 msgid "Open new _window by default"
 msgstr "Otvaranje novog _prozora je podrazumevano"
 
-#: src/gtkprefs.c:1325
+#: src/gtkprefs.c:1331
 msgid "Message Logs"
 msgstr "Dnevnik poruka"
 
-#: src/gtkprefs.c:1326
+#: src/gtkprefs.c:1332
 msgid "_Log all instant messages"
 msgstr "Beleži sve _brze poruke"
 
-#: src/gtkprefs.c:1328
+#: src/gtkprefs.c:1334
 msgid "Log all c_hats"
 msgstr "Beleži sve _razgovore"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1336
 msgid "Strip _HTML from logs"
 msgstr "_Izbaci HTML iz dnevnika"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1339
 msgid "System Logs"
 msgstr "Sistemski dnevnik"
 
-#: src/gtkprefs.c:1334
-msgid "Log when buddies _sign on/sign off"
-msgstr "Beleži kada se drugari _prijavljuju/odjavljuju"
-
-#: src/gtkprefs.c:1336
-msgid "Log when buddies become _idle/un-idle"
-msgstr "Beleži kada su drugari _neaktivni/aktivni"
-
-#: src/gtkprefs.c:1338
-msgid "Log when buddies go away/come _back"
-msgstr "Beleži kada su drugari _odsustni/prisutni"
-
 #: src/gtkprefs.c:1340
+msgid "Log when buddies _sign on/sign off"
+msgstr "Beleži kada se drugari _prijavljuju/odjavljuju"
+
+#: src/gtkprefs.c:1342
+msgid "Log when buddies become _idle/un-idle"
+msgstr "Beleži kada su drugari _neaktivni/aktivni"
+
+#: src/gtkprefs.c:1344
+msgid "Log when buddies go away/come _back"
+msgstr "Beleži kada su drugari _odsustni/prisutni"
+
+#: src/gtkprefs.c:1346
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Beleži _lične prijave/neaktivnost/odsustva"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1348
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Pojedinačna datoteka denvnika za _svakog drugara"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1391
 msgid "Sound Options"
 msgstr "Postavke zvuka"
 
-#: src/gtkprefs.c:1386
-msgid "_No sounds when you log in"
-msgstr "_Bez zvuka po prijavi"
-
-#: src/gtkprefs.c:1388
-msgid "_Sounds while away"
-msgstr "Zvuk je _aktivan dok ste odsutni"
-
 #: src/gtkprefs.c:1392
+msgid "_No sounds when you log in"
+msgstr "_Bez zvuka po prijavi"
+
+#: src/gtkprefs.c:1394
+msgid "_Sounds while away"
+msgstr "Zvuk je _aktivan dok ste odsutni"
+
+#: src/gtkprefs.c:1398
 msgid "Sound Method"
 msgstr "Način oglašavanja"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1399
 msgid "_Method:"
 msgstr "_Način:"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1401
 msgid "Console beep"
 msgstr "Konzolni zvuk"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1403
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/gtkprefs.c:1404
+#: src/gtkprefs.c:1410
 msgid "Command"
 msgstr "Naredba"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1420
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3506,67 +3532,67 @@
 "Naredba za zvuk:\n"
 "(%s za naziv datoteke)"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1475
 msgid "_Sending messages removes away status"
 msgstr "Slanje poruka Vas vraća sa _odsustva"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1477
 msgid "_Queue new messages when away"
 msgstr "Odlaži u _red poruke na odsustvu"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1480
 msgid "Auto-response"
 msgstr "Automatski odgovor"
 
-#: src/gtkprefs.c:1477
+#: src/gtkprefs.c:1483
 msgid "Seconds before _resending:"
 msgstr "Broj _sekundi pre ponovnog slanja:"
 
-#: src/gtkprefs.c:1480
+#: src/gtkprefs.c:1486
 msgid "_Send auto-response"
 msgstr "Slanje _automatskog odgovor"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1488
 msgid "_Only send auto-response when idle"
 msgstr "Slanje automatskog odgovora samo kada ste _neaktivni"
 
-#: src/gtkprefs.c:1484
-msgid "Send auto-response in active conversations"
-msgstr "Slanje automatskog odgovora kada ste a_ktivni"
-
-#: src/gtkprefs.c:1497
+#: src/gtkprefs.c:1490
+msgid "Send auto-response in _active conversations"
+msgstr "Slanje automatskog odgovora u a_ktivnim razgovorima"
+
+#: src/gtkprefs.c:1500
 msgid "Idle _time reporting:"
 msgstr "Prijavljivanje neak_tivnosti:"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1503
 msgid "Gaim usage"
 msgstr "Aktivnost u Gaimu"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1506
 msgid "X usage"
 msgstr "Aktivnost u IKS-ima"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1508
 msgid "Windows usage"
 msgstr "Aktivnost u Vindousu"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1516
 msgid "Auto-away"
 msgstr "Automatsko odustvo"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1517
 msgid "Set away _when idle"
 msgstr "Idete na o_dsustvo kada ste neaktivni"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1519
 msgid "_Minutes before setting away:"
 msgstr "Broj _minuta pre odlaska na odsustvo:"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1526
 msgid "Away m_essage:"
 msgstr "_Poruka za odsustvo:"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1588
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3581,7 +3607,7 @@
 "<span weight=\"bold\">Veb stranica:</span>\t\t%s\n"
 "<span weight=\"bold\">Datoteka:</span>\t%s"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1593
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3596,97 +3622,97 @@
 "<span weight=\"bold\">Internet adresa:</span>  %s\n"
 "<span weight=\"bold\">Datoteka:</span>  %s"
 
-#: src/gtkprefs.c:1768
+#: src/gtkprefs.c:1774
 msgid "Load"
 msgstr "Učitaj"
 
-#: src/gtkprefs.c:1775 src/protocols/msn/msn.c:1284
-#: src/protocols/trepia/trepia.c:433
+#: src/gtkprefs.c:1781 src/protocols/jabber/jabber.c:527
+#: src/protocols/msn/msn.c:1302 src/protocols/trepia/trepia.c:392
 msgid "Name"
 msgstr "Ime"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:1828
 msgid "Details"
 msgstr "Detalji"
 
-#: src/gtkprefs.c:1949
+#: src/gtkprefs.c:1955
 msgid "Sound Selection"
 msgstr "Izbor zvuka"
 
-#: src/gtkprefs.c:2056
+#: src/gtkprefs.c:2062
 msgid "Play"
 msgstr "Pusti"
 
-#: src/gtkprefs.c:2063
+#: src/gtkprefs.c:2069
 msgid "Event"
 msgstr "Događaj"
 
-#: src/gtkprefs.c:2086
+#: src/gtkprefs.c:2092
 msgid "Reset"
 msgstr "Odbaci"
 
-#: src/gtkprefs.c:2090
+#: src/gtkprefs.c:2096
 msgid "Choose..."
 msgstr "Izaberi..."
 
-#: src/gtkprefs.c:2214
+#: src/gtkprefs.c:2230
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: src/gtkprefs.c:2250
+#: src/gtkprefs.c:2266
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2267
 msgid "Smiley Themes"
 msgstr "Skupovi smešaka"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2268
 msgid "Fonts"
 msgstr "Pisma"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2269
 msgid "Message Text"
 msgstr "Tekst poruke"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2270
 msgid "Shortcuts"
 msgstr "Prečice"
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2273
 msgid "IMs"
 msgstr "Brze poruke"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2275
 msgid "Proxy"
 msgstr "Proksi"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2278
 msgid "Browser"
 msgstr "Preglednik"
 
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2280
 msgid "Logging"
 msgstr "Zapisivanje"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2281
 msgid "Sounds"
 msgstr "Zvuk"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2282
 msgid "Sound Events"
 msgstr "Zvučni događaji"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2283
 msgid "Away / Idle"
 msgstr "Odsustvo / Neaktivnost"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2284
 msgid "Away Messages"
 msgstr "Poruke za odsustvo"
 
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2287
 msgid "Plugins"
 msgstr "Dodaci"
 
@@ -3774,15 +3800,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:195 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "Da"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:196 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "Ne"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:199
 msgid "Apply"
 msgstr "Primeni"
 
@@ -3848,61 +3874,14 @@
 "Ne mogu reprodukovati zvuk zato što se ne može pokrenuti postavljena zvučna "
 "naredba: %s"
 
-#: src/gtkutils.c:289
+#: src/gtkutils.c:286
 msgid "Can't save icon file to disk."
 msgstr "Ne mogu sačuvati datoteku sa ikonicom na disk."
 
-#: src/gtkutils.c:324
+#: src/gtkutils.c:321
 msgid "Gaim - Save Icon"
 msgstr "Gaim — Sačuvaj ikonicu"
 
-#. full help text
-#: src/gtkutils.c:1037
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Upotreba: %s [OPCIJA]...\n"
-"\n"
-"  -a, --acct           prikazuje uređivač naloga\n"
-"  -w, --away[=PORUKA]  postavlja odsustvo po prijavi (opcioni argument "
-"PORUKA \n"
-"                       navodi ime poruke koja će se koristiti za odsustvo)\n"
-"  -l, --login[=IME]    automatska prijava (opcioni argument IME navodi koje "
-"nalog(e) \n"
-"                       koristiti, razdvojene zarezima)\n"
-"  -n, --loginwin       bez automatske prijave; prikazuje prozor za prijavu\n"
-"  -u, --user=IME       koristi nalog IME\n"
-"  -f, --file=DATOTEKA  koristi DATOTEKA za podešavanja\n"
-"  -d, --debug          ispisuje poruke za pronalaženje grešaka na standardni "
-"izlaz\n"
-"  -v, --version        prikazuje tekuće izdanje i izađi\n"
-"  -h, --help           prikazuje ovu pomoć i izađi\n"
-
-#. short message
-#: src/gtkutils.c:1052
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Pokušajte „%s -h“ za više podataka.\n"
-
-#: src/html.c:345
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Greška pri otvaranju veze.\n"
-
 #: src/log.c:30
 msgid "Error in specifying buddy conversation."
 msgstr "Greška pri navođenju drugarskog razgovora."
@@ -4037,7 +4016,50 @@
 msgid "Screen Name:"
 msgstr "Korisničko ime:"
 
-#: src/plugin.c:258
+#. full help text
+#: src/main.c:565
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"Upotreba: %s [OPCIJA]...\n"
+"\n"
+"  -a, --acct           prikazuje uređivač naloga\n"
+"  -w, --away[=PORUKA]  postavlja odsustvo po prijavi (opcioni argument "
+"PORUKA \n"
+"                       navodi ime poruke koja će se koristiti za odsustvo)\n"
+"  -l, --login[=IME]    automatska prijava (opcioni argument IME navodi koje "
+"nalog(e) \n"
+"                       koristiti, razdvojene zarezima)\n"
+"  -n, --loginwin       bez automatske prijave; prikazuje prozor za prijavu\n"
+"  -u, --user=IME       koristi nalog IME\n"
+"  -f, --file=DATOTEKA  koristi DATOTEKA za podešavanja\n"
+"  -d, --debug          ispisuje poruke za pronalaženje grešaka na standardni "
+"izlaz\n"
+"  -v, --version        prikazuje tekuće izdanje i izađi\n"
+"  -h, --help           prikazuje ovu pomoć i izađi\n"
+
+#. short message
+#: src/main.c:580
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Pokušajte „%s -h“ za više podataka.\n"
+
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4046,11 +4068,11 @@
 "Nisam našao željeni dodatak %s. Molim instalirajte ovaj dodatak i pokušajte "
 "ponovo."
 
-#: src/plugin.c:263 src/plugin.c:291
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim nije uspeo da učita Vaš dodatak."
 
-#: src/plugin.c:287
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Nisam uspeo da učitam željeni dodatak %s."
@@ -4059,203 +4081,226 @@
 msgid "Slightly less boring default"
 msgstr "Uobičajeno ali ne (tako) dosadno"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1276
-#: src/protocols/msn/msn.c:337 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1703
-#: src/protocols/yahoo/yahoo.c:1804
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2211
 msgid "Available"
 msgstr "Dostupan"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "Dostupan samo za prijatelje"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
 msgstr "Odsutan samo za prijatelje"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3597 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4615
-#: src/protocols/oscar/oscar.c:5917 src/protocols/yahoo/yahoo.c:1425
-#: src/protocols/yahoo/yahoo.c:1723 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:841
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4510 src/protocols/oscar/oscar.c:4537
+#: src/protocols/oscar/oscar.c:6062 src/protocols/yahoo/yahoo.c:1832
+#: src/protocols/yahoo/yahoo.c:2130 src/protocols/yahoo/yahoo.c:2221
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "Nevidljiv samo za prijatelje"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "Nedostupan"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:136
 msgid "Unable to resolve hostname."
 msgstr "Ne mogu da rastumačim adresu."
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:139
 msgid "Unable to connect to server."
 msgstr "Ne mogu da se povežem na server."
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:142
 msgid "Invalid response from server."
 msgstr "Neispravan odgovor servera."
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
 msgstr "Greška pri čitanju soketa."
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:148
 msgid "Error while writing to socket."
 msgstr "Greška pri pisanju u soket."
 
-#: src/protocols/gg/gg.c:154
+#: src/protocols/gg/gg.c:151
 msgid "Authentication failed."
 msgstr "Neuspešna identifikacija."
 
-#: src/protocols/gg/gg.c:157
+#: src/protocols/gg/gg.c:154
 msgid "Unknown Error Code."
 msgstr "Nepoznata oznaka greške."
 
-#: src/protocols/gg/gg.c:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "Ne mogu da se povežem"
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "Ne mogu da čitam soket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:204
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr "Ne mogu da se povežem."
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:415
 msgid "Reading data"
 msgstr "Čitanje podataka"
 
 # Rukovanje/usaglasavanje ravnoteznika/balansera?
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:418
 msgid "Balancer handshake"
 msgstr "Ravnotežno rukovanje"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:421
 msgid "Reading server key"
 msgstr "Čitanje ključa servera"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:424
 msgid "Exchanging key hash"
 msgstr "Razmenjivanje heša ključa"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "Kritična greška u GG biblioteci\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:180
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Neuspešno povezivanje na %s"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "Nemoguće pronalaženje servera"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "Pošalji kao poruku"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "Traženje GG servera"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "Traženje GG servera"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Naveden je neispravan Gadu-Gadu korisnički broj"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Pokušavate da pošaljete poruku na neispravan Gadu-Gadu korisnički broj."
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "Nemoguće preuzimanje rezultata pretrage"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu pretraga"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "Aktivan"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3963
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3885
 msgid "UIN"
 msgstr "Korisnički broj"
 
-#: src/protocols/gg/gg.c:671
+#: src/protocols/gg/gg.c:668
 msgid "First name"
 msgstr "Ime"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3965
+#. Last Name
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:547
+#: src/protocols/oscar/oscar.c:3893 src/protocols/trepia/trepia.c:265
+msgid "Last Name"
+msgstr "Prezime"
+
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3887
 msgid "Nick"
 msgstr "Nadimak"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
 msgstr "Godina rođenja"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "Pol"
 
-#: src/protocols/gg/gg.c:737
+#. City
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:557
+#: src/protocols/oscar/oscar.c:3939 src/protocols/oscar/oscar.c:3955
+#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+msgid "City"
+msgstr "Grad"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1240
+#: src/protocols/msn/msn.c:1482 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3179
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2407 src/protocols/yahoo/yahoo.c:2424
+#: src/protocols/yahoo/yahoo.c:2608 src/protocols/zephyr/zephyr.c:355
+msgid "Buddy Information"
+msgstr "Podaci o drugaru"
+
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Ne postoji spisak drugara uskladišten na Gadu-Gadu serveru."
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Nemoguć uvoz spiska drugara sa servera"
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Spisak drugara uspešno prebačen na Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nemoguć prenos spiska drugara na Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Spisak drugara uspešno uklonjen sa Gadu-Gadu servera"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Nemoguće uklanjanje spiska drugara sa Gadu-Gadu servera"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "Lozinka je uspešno izmenjena"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Neuspešna izmena lozinke"
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Greška pri sporazumevanju sa Gadu-Gadu serverom"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4263,11 +4308,11 @@
 "Gaim nije mogao da ispuni Vaš zahtev zbog problema u pristupanju Gadu-Gadu "
 "veb serveru. Pokušajte ponovo kasnije."
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Nemoguć uvoz Gadu-Gadu spiska drugara"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4275,27 +4320,27 @@
 "Gaim nije mogao da se poveže sa Gadu-Gadu serverom sa spiskom drugara. "
 "Pokušajte ponovo kasnije."
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Nemoguć izvoz spiska drugara"
 
-#: src/protocols/gg/gg.c:1068 src/protocols/gg/gg.c:1091
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim nije mogao da se poveže na server sa spiskom drugara. Pokušajte ponovo "
 "kasnije."
 
-#: src/protocols/gg/gg.c:1090
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Ne mogu da uklonim Gadu-Gadu spisak drugara"
 
 # Da nije mozda "imeniku" a ne "direktorijumu"?
-#: src/protocols/gg/gg.c:1139
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "Ne mogu pristupiti imeniku"
 
-#: src/protocols/gg/gg.c:1140
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4303,11 +4348,11 @@
 "Gaim nije mogao da pretraži Imenik zato što nije uspeo da se poveže sa "
 "serverom. Pokušajte ponovo kasnije."
 
-#: src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Ne mogu da izmenim Gadu-Gadu lozinku"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4315,27 +4360,32 @@
 "Gaim nije uspeo da izmeni Vašu lozinku usled greške pri povezivanju sa Gadu-"
 "Gadu serverom. Pokušajte ponovo kasnije."
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "Pretraga imenika"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:951
+#: src/protocols/oscar/oscar.c:6361 src/protocols/toc/toc.c:1545
+msgid "Change Password"
+msgstr "Promena lozinke"
+
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "Uvezi spisak drugara sa servera"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "Izvezi spisak drugara na server"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "Ukloni spisak drugara sa servera"
 
-#: src/protocols/gg/gg.c:1251
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "Ne mogu da pristupim podacima o korisniku."
 
-#: src/protocols/gg/gg.c:1252
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4353,7 +4403,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1364 src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Dodatak za Gadu-Gadu protokol"
 
@@ -4368,17 +4418,17 @@
 "Korisnik %s (%s%s%s%s%s) želi da Vas doda u svoj spisak drugara i traži Vašu "
 "dozvolu za to."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1806
-#: src/protocols/msn/notification.c:924 src/protocols/msn/notification.c:1245
-#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2617
-#: src/protocols/oscar/oscar.c:5152
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:179
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
+#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:5073
 msgid "Authorize"
 msgstr "Ovlasti"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1807
-#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1247
-#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2619
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:180
+#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
+#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:5074
 msgid "Deny"
 msgstr "Odbij"
 
@@ -4438,8 +4488,8 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nadimci ne mogu sadržati beline"
 
-#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:686
-#: src/protocols/toc/toc.c:232
+#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:679
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Prijava: %s"
@@ -4466,9 +4516,8 @@
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Dodatak za IRC protokol"
 
-#. Splits
-#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4514 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1047 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Server"
 
@@ -4476,148 +4525,153 @@
 msgid "Encoding"
 msgstr "Način zapisa"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "Loš mod"
 
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "Izbačeni ste sa %s."
 
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "Izbačeni"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(operater)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikovani)</i>"
 
-#: src/protocols/irc/msgs.c:193
+#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:517
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:2049
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2479
 msgid "Realname"
 msgstr "Ime"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr "Trenutno prisutan"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Neaktivan:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "Na vezi od"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Određivanje prideva:</b> Znamenit<br>"
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:219
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "Podaci o drugaru za %s"
+
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s izmeni temu u: %s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Tema kanala %s je: %s"
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Nepoznata poruka „%s‟"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "Nepoznata greška"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "IRC server nije razumeo poruku koju je poslao Gaim."
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "ne postoji takav kanal"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "Korisnik nije prijavljen"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "Ne postoji takav nadimak/kanal"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "Ne mogu da pošaljem"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pristupanje na %s zahteva pozivanje."
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "Samo pozivani"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Izbacio Vas je %s: (%s)"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Izbačeni od strane %s: (%s)"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mod (%s %s) od strane %s"
 
-#: src/protocols/irc/msgs.c:658
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr "Ne mogu da promenim nadimak"
 
-#: src/protocols/irc/msgs.c:659
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr "Ne mogu da promenim nadimak"
 
-#: src/protocols/irc/msgs.c:680
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Napustili ste pričaonicu%s%s"
 
-#: src/protocols/irc/msgs.c:718
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "Greška: pogrešan odziv servera (PONG)"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor — Lag: %lu sekundi"
 
-#: src/protocols/irc/msgs.c:790
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne mogu da se priključim u %s:"
 
-#: src/protocols/irc/msgs.c:791
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr "Ne mogu da se priključim kanalu"
 
-#: src/protocols/irc/msgs.c:821
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops sa %s"
@@ -4647,285 +4701,466 @@
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:574
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:601
-#: src/protocols/msn/msn.c:75 src/protocols/msn/msn.c:95
-#: src/protocols/msn/msn.c:153 src/protocols/msn/msn.c:253
-#: src/protocols/msn/msn.c:509 src/protocols/msn/msn.c:620
-#: src/protocols/msn/msn.c:636 src/protocols/msn/msn.c:684
-#: src/protocols/msn/msn.c:707 src/protocols/msn/msn.c:739
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:780
-#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:802
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:849 src/protocols/msn/msn.c:899
-#: src/protocols/msn/msn.c:937 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1087
-#: src/protocols/msn/msn.c:1098 src/protocols/msn/msn.c:1109
-#: src/protocols/msn/msn.c:1133 src/protocols/msn/msn.c:1145
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/notification.c:179
-#: src/protocols/msn/notification.c:206 src/protocols/msn/notification.c:1643
-#: src/protocols/msn/notification.c:1663 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
-#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
-#: src/protocols/trepia/trepia.c:1263
-msgid "Write error"
-msgstr "Greška pri pisanju"
-
-#: src/protocols/jabber/jabber.c:1069 src/protocols/jabber/jabber.c:1076
-msgid "Unable to change password."
-msgstr "Ne mogu da izmenim lozinku."
-
-#: src/protocols/jabber/jabber.c:1070
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr "Trenutno uneta lozinka je neispravna. Vaša lozinka nije izmenjena."
-
-#: src/protocols/jabber/jabber.c:1077
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr ""
-"Lozinka koju ste uneli je ista kao i Vaša sadašnja lozinka. Vaša lozinka "
-"ostaje ista."
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3530
-#: src/protocols/jabber/jabber.c:3581
-msgid "Chatty"
-msgstr "Pričljiv"
-
-#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3532
-#: src/protocols/jabber/jabber.c:3589
-msgid "Extended Away"
-msgstr "Produženo odsustvo"
-
-#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3593 src/protocols/oscar/oscar.c:2835
-#: src/protocols/oscar/oscar.c:4603 src/protocols/oscar/oscar.c:5913
-msgid "Do Not Disturb"
-msgstr "Ne uznemiravaj"
-
-#: src/protocols/jabber/jabber.c:1513
-#, c-format
-msgid "Jabber Error %s"
-msgstr "DŽaber greška %s"
-
-#: src/protocols/jabber/jabber.c:1618
-#, c-format
-msgid "Error %s: %s"
-msgstr "Greška %s: %s"
-
-#: src/protocols/jabber/jabber.c:1621
-msgid "Unknown Error in presence"
-msgstr "Nepoznata greška u prisustvu"
-
-#: src/protocols/jabber/jabber.c:1799
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "Korisnik %s želi da Vas doda na svoj spisak drugara."
-
-#: src/protocols/jabber/jabber.c:1827
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr "DŽaber korisnik %s ne postoji, i zato nije dodat u Vaš spisak drugara."
-
-#: src/protocols/jabber/jabber.c:1830
-msgid "No such user."
-msgstr "Nema takvog korisnika."
-
-#: src/protocols/jabber/jabber.c:1994
-msgid "Authenticating"
-msgstr "Identifikacija"
-
-#: src/protocols/jabber/jabber.c:2028
-msgid "Unknown login error"
-msgstr "Nepoznata greška pri prijavi"
-
-#: src/protocols/jabber/jabber.c:2378
-msgid "Password successfully changed."
-msgstr "Lozinka uspešno izmenjena."
-
-#: src/protocols/jabber/jabber.c:2423 src/protocols/jabber/jabber.c:4332
-msgid "Connection lost"
-msgstr "Veza prekinuta"
-
-#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:2459
-#: src/protocols/jabber/jabber.c:4334 src/protocols/jabber/jabber.c:4383
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
-#: src/protocols/msn/notification.c:2100 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1304
-msgid "Unable to connect"
-msgstr "Nemoguće povezivanje"
-
-#: src/protocols/jabber/jabber.c:2430
-msgid "Connected"
-msgstr "Veza uspostavljena"
-
-#: src/protocols/jabber/jabber.c:2433
-msgid "Requesting Authentication Method"
-msgstr "Zahtev načina identifikacije"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2453 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1327
-msgid "Connecting"
-msgstr "Uspostavljanje veze"
-
-#: src/protocols/jabber/jabber.c:2779
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "Korisnik %s je neispravno DŽaber ime, i stoga nije dodat."
-
-#: src/protocols/jabber/jabber.c:2781
-msgid "Unable to add buddy."
-msgstr "Ne mogu da dodam drugara."
-
-#: src/protocols/jabber/jabber.c:2782
-msgid "Jabber Error"
-msgstr "DŽaber greška"
-
-#: src/protocols/jabber/jabber.c:3041 src/protocols/yahoo/yahoochat.c:833
-msgid "Room:"
-msgstr "Soba:"
-
-#: src/protocols/jabber/jabber.c:3046
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:3052
-msgid "Handle:"
-msgstr "Nadimak:"
-
-#: src/protocols/jabber/jabber.c:3082
-msgid "Unable to join chat"
-msgstr "Ne mogu pristupiti razgovoru"
-
-#: src/protocols/jabber/jabber.c:3318 src/protocols/jabber/jabber.c:3369
-#: src/protocols/jabber/jabber.c:3791
-msgid "Jabber ID"
-msgstr "DŽaber ID"
-
-#: src/protocols/jabber/jabber.c:3319
-msgid "Error"
-msgstr "Greška"
-
-#: src/protocols/jabber/jabber.c:3370 src/protocols/jabber/jabber.c:3429
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3817
-msgid "Status"
-msgstr "Stanje"
-
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3462
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/jabber/auth.c:54 src/protocols/jabber/auth.c:338
+#: src/protocols/jabber/auth.c:350
+msgid "Invalid response from server"
+msgstr "Neispravan odgovor servera"
+
+#: src/protocols/jabber/auth.c:73 src/protocols/jabber/auth.c:120
+msgid "Server does not use any supported authentication method"
+msgstr "Server ne koristi nijedan od podržanih načina identifikovanja"
+
+#: src/protocols/jabber/auth.c:323
+msgid "Invalid challenge from server"
+msgstr "Neispravan izazov servera"
+
+#: src/protocols/jabber/auth.c:353
+msgid "Bad Protocol"
+msgstr "Loš protokol"
+
+#: src/protocols/jabber/auth.c:356
+msgid "Encryption Required"
+msgstr "Obavezno je šifrovanje"
+
+#: src/protocols/jabber/auth.c:359
+msgid "Invalid authzid"
+msgstr "Neispravan authzid"
+
+#: src/protocols/jabber/auth.c:362
+msgid "Invalid Mechanism"
+msgstr "Neispravan mehanizam"
+
+#: src/protocols/jabber/auth.c:364
+msgid "Invalid Realm"
+msgstr "Neispravan domen"
+
+#: src/protocols/jabber/auth.c:367
+msgid "Mechanism Too Weak"
+msgstr "Mehanizam je preslab"
+
+#: src/protocols/jabber/auth.c:370 src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:776 src/protocols/jabber/jabber.c:826
+#: src/protocols/oscar/oscar.c:5465
 msgid "Not Authorized"
 msgstr "Neovlašćen"
 
-#: src/protocols/jabber/jabber.c:3479
-msgid "View Error Msg"
-msgstr "Prikaži poruke o greškama"
-
-#: src/protocols/jabber/jabber.c:3498
-msgid "Un-hide From"
-msgstr "Ne sakrivaj od"
-
-#: src/protocols/jabber/jabber.c:3501
-msgid "Temporarily Hide From"
-msgstr "Privremeno sakrij od"
-
-#: src/protocols/jabber/jabber.c:3508
-msgid "Cancel Presence Notification"
-msgstr "Otkaži obaveštenja o prisustvu"
-
-#: src/protocols/jabber/jabber.c:3516
-msgid "Re-request authorization"
-msgstr "Ponovo zahtevaj ovlašćenje"
-
-#: src/protocols/jabber/jabber.c:3719
+#: src/protocols/jabber/auth.c:373
+msgid "Temporary Authentication Failure"
+msgstr "Privremeno neuspešna identifikacija"
+
+#: src/protocols/jabber/auth.c:375
+msgid "Authentication Failure"
+msgstr "Neuspešna identifikacija"
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:598
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: src/protocols/jabber/jabber.c:3720
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:611
 msgid "Family Name"
 msgstr "Prezime"
 
-#: src/protocols/jabber/jabber.c:3721
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:615
 msgid "Given Name"
 msgstr "Ime"
 
-#: src/protocols/jabber/jabber.c:3722 src/protocols/yahoo/yahoo.c:2045
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/jabber.c:537 src/protocols/yahoo/yahoo.c:2473
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: src/protocols/jabber/jabber.c:3724
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:654
 msgid "Street Address"
 msgstr "Ulica"
 
-#: src/protocols/jabber/jabber.c:3725
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:650
 msgid "Extended Address"
 msgstr "Proširena adresa"
 
-#: src/protocols/jabber/jabber.c:3726
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:658
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3727
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:662
 msgid "Region"
 msgstr "Oblast"
 
-#: src/protocols/jabber/jabber.c:3728
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:666
+#: src/protocols/jabber/jabber.c:567
 msgid "Postal Code"
 msgstr "Poštanski broj"
 
-#: src/protocols/jabber/jabber.c:3730
+#. Country
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:671
+#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+msgid "Country"
+msgstr "Država"
+
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:682
+#: src/protocols/jabber/buddy.c:689
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3732
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:708 src/protocols/yahoo/yahoo.c:2467
+msgid "Email"
+msgstr "E-pošta"
+
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:723
 msgid "Organization Name"
 msgstr "Naziv organizacije"
 
-#: src/protocols/jabber/jabber.c:3733
+#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:727
 msgid "Organization Unit"
 msgstr "Odeljenje u organizaciji"
 
-#: src/protocols/jabber/jabber.c:3734
+#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:733
 msgid "Title"
 msgstr "Titula"
 
 # „radno mesto‟ u organizaciji?
-#: src/protocols/jabber/jabber.c:3735
+#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:736
 msgid "Role"
 msgstr "Uloga"
 
-#: src/protocols/jabber/jabber.c:3736 src/protocols/oscar/oscar.c:3997
+#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:629
+#: src/protocols/oscar/oscar.c:3919
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: src/protocols/jabber/jabber.c:4194 src/protocols/jabber/jabber.c:4195
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
 msgid "Edit Jabber vCard"
 msgstr "Uređivanje DŽaber vizit-karte"
 
-#: src/protocols/jabber/jabber.c:4196
+#: src/protocols/jabber/buddy.c:516
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "Sve dole navedene opcije nisu obavezne. Unesite samo podatke koje želite."
 
-#: src/protocols/jabber/jabber.c:4269
-msgid "Server Registration successful!"
-msgstr "Registracija na serveru uspešna!"
-
-#: src/protocols/jabber/jabber.c:4285
-#, c-format
-msgid "Error %d: %s"
-msgstr "Greška %d: %s"
-
-#: src/protocols/jabber/jabber.c:4290
-msgid "Unknown registration error"
-msgstr "Nepoznata greška pri registraciji"
+#: src/protocols/jabber/buddy.c:554
+msgid "Jabber ID"
+msgstr "DŽaber ID"
+
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:813
+#: src/protocols/jabber/jabber.c:826
+msgid "Status"
+msgstr "Stanje"
+
+#: src/protocols/jabber/buddy.c:576 src/protocols/jabber/jabber.c:1050
+msgid "Resource"
+msgstr "Resurs"
+
+#: src/protocols/jabber/buddy.c:619
+msgid "Middle Name"
+msgstr "Ime oca"
+
+# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
+#: src/protocols/jabber/buddy.c:634 src/protocols/jabber/jabber.c:552
+#: src/protocols/oscar/oscar.c:3936 src/protocols/oscar/oscar.c:3952
+msgid "Address"
+msgstr "Ulica"
+
+#: src/protocols/jabber/buddy.c:646
+msgid "P.O. Box"
+msgstr "Poštanski fah"
+
+#: src/protocols/jabber/buddy.c:752
+msgid "Photo"
+msgstr "Slika"
+
+#: src/protocols/jabber/buddy.c:752
+msgid "Logo"
+msgstr "Logotip"
+
+#: src/protocols/jabber/buddy.c:766
+msgid "Jabber Profile"
+msgstr "DŽaber profil"
+
+#: src/protocols/jabber/buddy.c:861
+msgid "Un-hide From"
+msgstr "Ne sakrivaj od"
+
+#: src/protocols/jabber/buddy.c:864
+msgid "Temporarily Hide From"
+msgstr "Privremeno sakrij od"
+
+#: src/protocols/jabber/buddy.c:872
+msgid "Cancel Presence Notification"
+msgstr "Otkaži obaveštenja o prisustvu"
+
+#: src/protocols/jabber/buddy.c:880
+msgid "Re-request authorization"
+msgstr "Ponovo zahtevaj ovlašćenje"
+
+#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:833
+msgid "Room:"
+msgstr "Soba:"
+
+#: src/protocols/jabber/chat.c:43
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/jabber/chat.c:49
+msgid "Handle:"
+msgstr "Nadimak:"
+
+#: src/protocols/jabber/jabber.c:80
+msgid "Error initializing session"
+msgstr "Greška pri pokretanju sesije"
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Format"
+msgstr "Loš oblik"
+
+#: src/protocols/jabber/jabber.c:107
+msgid "Bad Namespace Prefix"
+msgstr "Loš predmetak prostora imena"
+
+#: src/protocols/jabber/jabber.c:110
+msgid "Resource Conflict"
+msgstr "Sudar resursa"
+
+#: src/protocols/jabber/jabber.c:112
+msgid "Connection Timeout"
+msgstr "Vremenski rok veze"
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Gone"
+msgstr "Domaćin je nestao"
+
+#: src/protocols/jabber/jabber.c:116
+msgid "Host Unknown"
+msgstr "Domaćin je nepoznat"
+
+#: src/protocols/jabber/jabber.c:118
+msgid "Improper Addressing"
+msgstr "Neodgovarajuće adresiranje"
+
+#: src/protocols/jabber/jabber.c:120
+msgid "Internal Server Error"
+msgstr "Unutrašnja greška servera"
+
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid ID"
+msgstr "Neispravan IB"
+
+#: src/protocols/jabber/jabber.c:124
+msgid "Invalid Namespace"
+msgstr "Neispravan prostor imena"
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Invalid XML"
+msgstr "Neispravan XML"
+
+#: src/protocols/jabber/jabber.c:128
+msgid "Non-matching Hosts"
+msgstr "Nepoklapajući domaćini"
+
+#: src/protocols/jabber/jabber.c:132
+msgid "Policy Violation"
+msgstr "Prekoračenje ovlašćenja"
+
+#: src/protocols/jabber/jabber.c:134
+msgid "Remote Connection Failed"
+msgstr "Udaljena veza neuspešna"
+
+#: src/protocols/jabber/jabber.c:136
+msgid "Resource Constraint"
+msgstr "Ograničenje resursa"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Restricted XML"
+msgstr "Ograničeni XML"
+
+#: src/protocols/jabber/jabber.c:140
+msgid "See Other Host"
+msgstr "Pogledajte drugog domaćina"
+
+#: src/protocols/jabber/jabber.c:142
+msgid "System Shutdown"
+msgstr "Gašenje sistema"
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Undefined Condition"
+msgstr "Nedefinisani uslov"
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Condition"
+msgstr "Nepodržani uslov"
+
+# strofa baš i nije odgovarajuća :-)
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Stanza Type"
+msgstr "Nepodržana vrsta odeljka"
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Unsupported Version"
+msgstr "Nepodržano izdanje"
+
+#: src/protocols/jabber/jabber.c:152
+msgid "XML Not Well Formed"
+msgstr "XML nije dobro sačinjen"
+
+#: src/protocols/jabber/jabber.c:154
+msgid "Stream Error"
+msgstr "Greška toka"
+
+#: src/protocols/jabber/jabber.c:232 src/protocols/msn/msn.c:82
+#: src/protocols/msn/msn.c:102 src/protocols/msn/msn.c:160
+#: src/protocols/msn/msn.c:260 src/protocols/msn/msn.c:516
+#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
+#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
+#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
+#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
+#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1073
+#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1105
+#: src/protocols/msn/msn.c:1116 src/protocols/msn/msn.c:1140
+#: src/protocols/msn/msn.c:1152 src/protocols/msn/msn.c:1217
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
+#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
+#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+msgid "Write error"
+msgstr "Greška pri pisanju"
+
+#: src/protocols/jabber/jabber.c:377 src/protocols/jabber/jabber.c:641
+#: src/protocols/trepia/trepia.c:1106
+msgid "Unable to create socket"
+msgstr "Ne mogu načiniti soket"
+
+#: src/protocols/jabber/jabber.c:402
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "Registracija %s@%s uspešna"
+
+#: src/protocols/jabber/jabber.c:404 src/protocols/jabber/jabber.c:405
+msgid "Registration Successful"
+msgstr "Registracija uspešna"
+
+#: src/protocols/jabber/jabber.c:414
+msgid "Unknown Error"
+msgstr "Nepoznata greška"
+
+#: src/protocols/jabber/jabber.c:417
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "Registracija %s@%s neuspešna: %s"
+
+#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:420
+msgid "Registration Failed"
+msgstr "Greška pri registraciji"
+
+#: src/protocols/jabber/jabber.c:507 src/protocols/jabber/jabber.c:508
+msgid "Already Registered"
+msgstr "Već je registrovan"
+
+#: src/protocols/jabber/jabber.c:521 src/protocols/jabber/jabber.c:921
+msgid "Password"
+msgstr "Lozinka"
+
+#: src/protocols/jabber/jabber.c:532
+msgid "E-Mail"
+msgstr "E-pošta"
+
+#. First Name
+#: src/protocols/jabber/jabber.c:542 src/protocols/oscar/oscar.c:3890
+#: src/protocols/trepia/trepia.c:258
+msgid "First Name"
+msgstr "Ime"
+
+#. State
+#: src/protocols/jabber/jabber.c:562 src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3958 src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:430
+msgid "State"
+msgstr "Oblast"
+
+#: src/protocols/jabber/jabber.c:572
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/protocols/jabber/jabber.c:590
+msgid "Please fill out the information below to register your new account."
+msgstr "Molim ispunite podatke ispod da registrujete novi nalog."
+
+#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:594
+msgid "Register New Jabber Account"
+msgstr "Registruj novi DŽaber nalog"
+
+#: src/protocols/jabber/jabber.c:680 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1734
+msgid "Connecting"
+msgstr "Uspostavljanje veze"
+
+#: src/protocols/jabber/jabber.c:684
+msgid "Initializing Stream"
+msgstr "Pokretanje toka"
+
+#: src/protocols/jabber/jabber.c:690
+msgid "Authenticating"
+msgstr "Identifikacija"
+
+#: src/protocols/jabber/jabber.c:698
+msgid "Re-initializing Stream"
+msgstr "Ponovno pokretanje toka"
+
+#: src/protocols/jabber/jabber.c:821 src/protocols/jabber/jabber.c:872
+#: src/protocols/jabber/presence.c:254
+msgid "Error"
+msgstr "Greška"
+
+#: src/protocols/jabber/jabber.c:837 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
+msgid "Chatty"
+msgstr "Pričljiv"
+
+#: src/protocols/jabber/jabber.c:839 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
+msgid "Extended Away"
+msgstr "Produženo odsustvo"
+
+#: src/protocols/jabber/jabber.c:840 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4525 src/protocols/oscar/oscar.c:6058
+msgid "Do Not Disturb"
+msgstr "Ne uznemiravaj"
+
+#: src/protocols/jabber/jabber.c:854
+msgid "Password Changed"
+msgstr "Lozinka izmenjena"
+
+#: src/protocols/jabber/jabber.c:855
+msgid "Your password has been changed."
+msgstr "Vaša lozinka je izmenjena."
+
+#: src/protocols/jabber/jabber.c:865
+#, c-format
+msgid "Error changing password: %s"
+msgstr "Greška pri izmeni lozinke: %s"
+
+#: src/protocols/jabber/jabber.c:869
+msgid "Unknown error occurred changing password"
+msgstr "Došlo je do nepoznate greške pri izmeni lozinke"
+
+#: src/protocols/jabber/jabber.c:926
+msgid "Password (again)"
+msgstr "Lozinka (ponovite)"
+
+#: src/protocols/jabber/jabber.c:931 src/protocols/jabber/jabber.c:932
+msgid "Change Jabber Password"
+msgstr "Izmenite DŽaber lozinku"
+
+#: src/protocols/jabber/jabber.c:932
+msgid "Please enter your new password"
+msgstr "Unesite novu lozinku"
 
 #. *< api_version
 #. *< type
@@ -4937,36 +5172,68 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4493 src/protocols/jabber/jabber.c:4495
+#: src/protocols/jabber/jabber.c:1027 src/protocols/jabber/jabber.c:1029
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatak za DŽaber protokol"
 
-#: src/protocols/jabber/jabber.c:4517
-msgid "Resource"
-msgstr "Resurs"
-
-#: src/protocols/jabber/jabber.c:4523
-msgid "Use SSL"
-msgstr "Koristi SSL"
-
-#: src/protocols/jabber/jabber.c:4532
+#: src/protocols/jabber/jabber.c:1053
+msgid "Force Old SSL"
+msgstr "Nametni stari SSL"
+
+#: src/protocols/jabber/jabber.c:1061
 msgid "Connect server"
 msgstr "Povezivanje sa serverom"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:277
-#: src/protocols/msn/notification.c:498
+#: src/protocols/jabber/message.c:125
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "Isporuka poruke za %s nije uspela: %s"
+
+#: src/protocols/jabber/message.c:128
+msgid "Jabber Message Error"
+msgstr "DŽaber greška poruke"
+
+#: src/protocols/jabber/message.c:191
+#, c-format
+msgid " (Code %s)"
+msgstr " (kôd %s)"
+
+#: src/protocols/jabber/parser.c:129
+msgid "XML Parse error"
+msgstr "Greška pri XML obradi"
+
+#: src/protocols/jabber/presence.c:166
+#, c-format
+msgid "%s (Code %s)"
+msgstr "%s (kôd %s)"
+
+#: src/protocols/jabber/presence.c:170
+msgid "Unknown Error in presence"
+msgstr "Nepoznata greška u prisustvu"
+
+#: src/protocols/jabber/presence.c:174
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "Korisnik %s želi da Vas doda na svoj spisak drugara."
+
+#: src/protocols/jabber/presence.c:250
+msgid "Unable to join chat"
+msgstr "Ne mogu pristupiti razgovoru"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:499
 msgid "Unable to request USR\n"
 msgstr "Ne mogu da zatražim USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:294
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "Ne mogu da se prijavim pomoću MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:303
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "Ne mogu da pošaljem USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:308
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "Zahteva se slanje lozinke"
 
@@ -4974,15 +5241,15 @@
 msgid "Protocol version not supported"
 msgstr "Izdanje protokola nije podržano"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:760
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
 msgid "Unable to request CVR\n"
 msgstr "Ne mogu da zatražim CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:769
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
 msgid "Unable to request INF\n"
 msgstr "Ne mogu da zatražim INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1877
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
 msgid "Got invalid XFR"
 msgstr "Primljen neispravan XFR"
 
@@ -4995,16 +5262,22 @@
 msgid "Unable to parse message."
 msgstr "Ne mogu da obradim poruku."
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:865
-#: src/protocols/msn/notification.c:2122
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
+#: src/protocols/msn/notification.c:2102 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1711
+msgid "Unable to connect"
+msgstr "Nemoguće povezivanje"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:2124
 msgid "Unable to write to server"
 msgstr "Ne mogu da pišem na server"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2129
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2131
 msgid "Syncing with server"
 msgstr "Usklađivanje sa serverom"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2143
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2145
 msgid "Error reading from server"
 msgstr "Greška pri čitanju sa servera"
 
@@ -5025,7 +5298,7 @@
 msgstr "Nedostaje pun naziv domena (FQDN)"
 
 #: src/protocols/msn/error.c:47
-msgid "Already Login"
+msgid "Already Logged In"
 msgstr "Već prijavljen"
 
 #: src/protocols/msn/error.c:50
@@ -5100,7 +5373,7 @@
 msgid "Too many hits to a FND"
 msgstr "Previše pogodaka u FND"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
@@ -5153,8 +5426,8 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametri su ili nepoznati ili nedozvoljeni"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:612
-#: src/protocols/msn/notification.c:1258 src/protocols/msn/notification.c:1426
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
+#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
 msgid "Unable to write"
 msgstr "Ne mogu da pišem"
 
@@ -5186,8 +5459,8 @@
 msgid "Server too busy"
 msgstr "Server je prezauzet"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:662
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Neuspešna identifikacija"
 
@@ -5212,35 +5485,35 @@
 msgid "Unknown Error Code %d"
 msgstr "Nepoznata greška sa kodom %d"
 
-#: src/protocols/msn/msn.c:63
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN prijateljsko ime je predugačko."
 
-#: src/protocols/msn/msn.c:170
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "Postavite Vaše prijateljsko ime."
 
-#: src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:178
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ovo je ime pod kojim će Vas videti Vaši MSN drugari."
 
-#: src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "Postavite Vaš kućni broj telefona."
 
-#: src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "Postavite Vaš broj telefona na poslu."
 
-#: src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "Postavite Vaš broj mobilnog telefona."
 
-#: src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "Dopusti MSN mobilne stranice?"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:222
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5249,94 +5522,94 @@
 "Vam šalju MSN mobilne stranice na Vaš mobilni telefon ili neki drugi prenosni "
 "uređaj?"
 
-#: src/protocols/msn/msn.c:219
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "Dopusti"
 
-#: src/protocols/msn/msn.c:220
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "Zabrani"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "Pošalji mobilnu poruku."
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "Stranica"
 
-#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:1948
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Stanje:</b> %s"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Odsutan od računara"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:598
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1407
-#: src/protocols/yahoo/yahoo.c:1705 src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2212
 msgid "Be Right Back"
 msgstr "Odmah se vraćam"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:600
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1409
-#: src/protocols/yahoo/yahoo.c:1707 src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1816
+#: src/protocols/yahoo/yahoo.c:2114 src/protocols/yahoo/yahoo.c:2213
 msgid "Busy"
 msgstr "Zauzet"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:602
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1417
-#: src/protocols/yahoo/yahoo.c:1715 src/protocols/yahoo/yahoo.c:1810
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1824
+#: src/protocols/yahoo/yahoo.c:2122 src/protocols/yahoo/yahoo.c:2217
 msgid "On The Phone"
 msgstr "Telefoniram"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:604
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1421
-#: src/protocols/yahoo/yahoo.c:1719 src/protocols/yahoo/yahoo.c:1812
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1828
+#: src/protocols/yahoo/yahoo.c:2126 src/protocols/yahoo/yahoo.c:2219
 msgid "Out To Lunch"
 msgstr "Na ručku sam"
 
-#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
-#: src/protocols/zephyr/zephyr.c:870 src/protocols/zephyr/zephyr.c:885
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Skriven"
 
-#: src/protocols/msn/msn.c:355
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "Postavi prijateljsko ime"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "Postavi broj kućnog telefona"
 
-#: src/protocols/msn/msn.c:369
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "Postavi broj telefona na poslu"
 
-#: src/protocols/msn/msn.c:375
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "Postavi broj mobilnog telefona"
 
-#: src/protocols/msn/msn.c:384
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "Omogući/isključi mobilne uređaje"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Dozvoli/zabrani mobilne stranice"
 
-#: src/protocols/msn/msn.c:417
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "Pošalji na mobilni"
 
-#: src/protocols/msn/msn.c:426
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "Pokreni razgovor"
 
-#: src/protocols/msn/msn.c:720
+#: src/protocols/msn/msn.c:727
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5345,11 +5618,11 @@
 "MSN korisničko ime mora biti oblika „korisnik@server.cs“. Verovatno ste "
 "želeli „%s@hotmail.com“. U vašem spisku dozvola nisu učinjene izmene."
 
-#: src/protocols/msn/msn.c:724 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
 msgid "Invalid MSN screenname"
 msgstr "Neispravno MSN korisničko ime"
 
-#: src/protocols/msn/msn.c:760
+#: src/protocols/msn/msn.c:767
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5358,67 +5631,76 @@
 "MSN korisničko ime mora biti oblika „korisnik@server.cs“. Verovatno ste "
 "želeli „%s@hotmail.com“. U vašem spisku zabrana nisu učinjene izmene."
 
-#: src/protocols/msn/msn.c:1228 src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/msn/msn.c:1241 src/protocols/yahoo/yahoo.c:2388
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Greška pri preuzimanju profila</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1288 src/protocols/oscar/oscar.c:4002
-#: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:2057
+#: src/protocols/msn/msn.c:1309 src/protocols/oscar/oscar.c:3924
+#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:2491
 msgid "Age"
 msgstr "Starost"
 
 #. Gender
-#: src/protocols/msn/msn.c:1292 src/protocols/oscar/oscar.c:3988
-#: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:2065
+#: src/protocols/msn/msn.c:1316 src/protocols/oscar/oscar.c:3910
+#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
+#: src/protocols/yahoo/yahoo.c:2503
 msgid "Gender"
 msgstr "Pol"
 
-#: src/protocols/msn/msn.c:1296 src/protocols/yahoo/yahoo.c:2061
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo.c:2497
 msgid "Marital Status"
 msgstr "Bračno stanje"
 
-#: src/protocols/msn/msn.c:1300 src/protocols/yahoo/yahoo.c:2053
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2485
 msgid "Location"
 msgstr "Mesto"
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2069
+#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo.c:2509
 msgid "Occupation"
 msgstr "Zanimanje"
 
-#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1324
-#: src/protocols/msn/msn.c:1332 src/protocols/msn/msn.c:1340
-#: src/protocols/msn/msn.c:1347
+#: src/protocols/msn/msn.c:1356 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1376
+#: src/protocols/msn/msn.c:1383
 msgid "A Little About Me"
 msgstr "Ponešto o meni"
 
-#: src/protocols/msn/msn.c:1353 src/protocols/msn/msn.c:1366
-#: src/protocols/msn/msn.c:1373
+#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1412
 msgid "Favorite Things"
 msgstr "Omiljene stvari"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1386
-#: src/protocols/msn/msn.c:1393
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "Hobbies and Interests"
 msgstr "Hobiji i interesovanja"
 
-#: src/protocols/msn/msn.c:1399 src/protocols/msn/msn.c:1405
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1449
+#: src/protocols/yahoo/yahoo.c:2553
 msgid "Favorite Quote"
 msgstr "Omiljena izreka"
 
-#: src/protocols/msn/msn.c:1410 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/msn/msn.c:1457 src/protocols/yahoo/yahoo.c:2597
 msgid "Last Updated"
 msgstr "Poslednja dopuna"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1417 src/protocols/trepia/trepia.c:321
-#: src/protocols/trepia/trepia.c:489
+#: src/protocols/msn/msn.c:1468 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr "Lična stranica"
 
+#: src/protocols/msn/msn.c:1490 src/protocols/yahoo/yahoo.c:2615
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Podaci o korisniku %s nedostupni"
+
+#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2617
+msgid "The user's profile is empty."
+msgstr "Profil korisnika je prazan."
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5429,83 +5711,84 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1505 src/protocols/msn/msn.c:1507
+#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1592
 msgid "MSN Protocol Plugin"
 msgstr "Dodatak za MSN protokol"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1611 src/protocols/trepia/trepia.c:1330
 msgid "Login server"
 msgstr "Server za prijavu"
 
-#: src/protocols/msn/notification.c:246
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Greška %s\n"
 
-#: src/protocols/msn/notification.c:362 src/protocols/msn/notification.c:523
+#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
 msgid "Unable to write to MSN Nexus server."
 msgstr "Ne mogu da pišem na MSN Neksus server"
 
-#: src/protocols/msn/notification.c:371 src/protocols/msn/notification.c:538
+#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
 msgid "Unable to read from MSN Nexus server."
 msgstr "Ne mogu da učitam zaglavlje sa MSN Neksus servera"
 
-#: src/protocols/msn/notification.c:391
+#: src/protocols/msn/notification.c:392
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Neksus server je vratio neispravne podatke o preusmeravanju."
 
-#: src/protocols/msn/notification.c:437
+#: src/protocols/msn/notification.c:438
 msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "Nepoznata greška pri pokušaju identifikacije na MSN-ovom serveru za prijavu."
-
-#: src/protocols/msn/notification.c:549
+msgstr ""
+"Nepoznata greška pri pokušaju identifikacije na MSN-ovom serveru za prijavu."
+
+#: src/protocols/msn/notification.c:550
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN Neksus server je vratio neispravne podatke."
 
-#: src/protocols/msn/notification.c:617 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr "Preuzimam spisak drugara"
 
-#: src/protocols/msn/notification.c:679
+#: src/protocols/msn/notification.c:680
 msgid "Unable to connect to passport server"
 msgstr "Ne mogu da se povežem na server pasoša"
 
-#: src/protocols/msn/notification.c:684 src/protocols/msn/notification.c:716
+#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
 msgid "Password sent"
 msgstr "Lozinka poslata"
 
-#: src/protocols/msn/notification.c:711
+#: src/protocols/msn/notification.c:712
 msgid "Unable to send password"
 msgstr "Ne mogu da pošaljem lozinku"
 
-#: src/protocols/msn/notification.c:747
+#: src/protocols/msn/notification.c:748
 msgid "Protocol not supported"
 msgstr "Prokol nije podržan"
 
-#: src/protocols/msn/notification.c:789
+#: src/protocols/msn/notification.c:790
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Veza Vam je prekinuta, prijavili ste se sa nekog drugog mesta."
 
-#: src/protocols/msn/notification.c:794
+#: src/protocols/msn/notification.c:795
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Veza Vam je prekinuta. Privremeno se gase MSN serveri."
 
-#: src/protocols/msn/notification.c:920
+#: src/protocols/msn/notification.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Korisnik %s (%s) želi da doda %s u svoj spisak drugara."
 
-#: src/protocols/msn/notification.c:1239 src/protocols/msn/notification.c:1405
+#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Korisnik %s (%s) želi da Vas doda u svoj spisak drugara."
 
-#: src/protocols/msn/notification.c:1919
+#: src/protocols/msn/notification.c:1921
 msgid "Unable to transfer to notification server"
 msgstr "Ne mogu da se sporazumem sa serverom za obaveštenja"
 
 # bug: plural-forms
-#: src/protocols/msn/notification.c:2063
+#: src/protocols/msn/notification.c:2065
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5550,37 +5833,37 @@
 msgid "An MSN message may not have been received."
 msgstr "Moguće da nije primljena MSN poruka."
 
-#: src/protocols/napster/napster.c:232
+#: src/protocols/napster/napster.c:228
 msgid "Unable to read header from server"
 msgstr "Ne mogu učitati zaglavlje sa servera"
 
-#: src/protocols/napster/napster.c:246
-#, c-format
-msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
-msgstr "Ne mogu učitati zaglavlje sa servera. Komanda je %hd, dužina je %hd."
-
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:242
+#, c-format
+msgid "Unable to read message from server.  Command is %hd, length is %hd."
+msgstr "Ne mogu da pročitam poruku sa servera. Komanda je %hd, dužina je %hd."
+
+#: src/protocols/napster/napster.c:303
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "korisnika: %s, datoteka: %s, veličina: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:314
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Ne mogu da dodam „%s“ u Napster spisak"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:322
 msgid "You were disconnected from the server."
 msgstr "Veza sa serverom je prekinuta."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:382
+#: src/protocols/napster/napster.c:378
 #, c-format
 msgid "%s requested your information"
 msgstr "%s zahteva Vaše podatke"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:410
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -5588,13 +5871,13 @@
 "Veza sa serverom je prekinuta, jer ste se prijavili sa nekog drugog mesta."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:416
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s zahteva ping"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5223
-#: src/protocols/toc/toc.c:1261
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5144
+#: src/protocols/toc/toc.c:1258
 msgid "Join what group:"
 msgstr "Priključi se grupi (kojoj?):"
 
@@ -5608,180 +5891,180 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "Dodatak za Napster protokol"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid error"
 msgstr "Neispravna greška (!!!)"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:176
 msgid "Invalid SNAC"
 msgstr "Neispravan SNAC"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to host"
 msgstr "Brzina prema serveru"
 
+#: src/protocols/oscar/oscar.c:178
+msgid "Rate to client"
+msgstr "Brzina prema klijentu"
+
+#: src/protocols/oscar/oscar.c:180
+msgid "Service unavailable"
+msgstr "Usluga je nedostupna"
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Service not defined"
+msgstr "Usluga nije ustanovljena"
+
+#: src/protocols/oscar/oscar.c:182
+msgid "Obsolete SNAC"
+msgstr "Prevaziđeni SNAC"
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by host"
+msgstr "Domaćin ne podržava"
+
 #: src/protocols/oscar/oscar.c:184
-msgid "Rate to client"
-msgstr "Brzina prema klijentu"
+msgid "Not supported by client"
+msgstr "Klijent ne podržava"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Refused by client"
+msgstr "Klijent je odbio"
 
 #: src/protocols/oscar/oscar.c:186
-msgid "Service unavailable"
-msgstr "Usluga je nedostupna"
+msgid "Reply too big"
+msgstr "Odgovor je predugačak"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Service not defined"
-msgstr "Usluga nije ustanovljena"
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Obsolete SNAC"
-msgstr "Prevaziđeni SNAC"
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Not supported by host"
-msgstr "Domaćin ne podržava"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by client"
-msgstr "Klijent ne podržava"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Refused by client"
-msgstr "Klijent je odbio"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr "Odgovor je predugačak"
-
-#: src/protocols/oscar/oscar.c:193
 msgid "Responses lost"
 msgstr "Odgovori su izgubljeni"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:188
 msgid "Request denied"
 msgstr "Zahtev je odbijen"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:189
 msgid "Busted SNAC payload"
 msgstr "Upropašćen je SNAC koristan paket"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:190
 msgid "Insufficient rights"
 msgstr "Nedovoljno ovlašćenja"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:191
 msgid "In local permit/deny"
 msgstr "Dozvoli/zabrani u lokalu"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:192
 msgid "Too evil (sender)"
 msgstr "Previše zao (pošiljalac)"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:193
 msgid "Too evil (receiver)"
 msgstr "Previše zao (primalac)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:194
 msgid "User temporarily unavailable"
 msgstr "Korisnik privremeno nedostupan"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:195
 msgid "No match"
 msgstr "Nema poklapanja"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:196
 msgid "List overflow"
 msgstr "Prekoračenje spiska"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:197
 msgid "Request ambiguous"
 msgstr "Zahtev je dvosmislen"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:198
 msgid "Queue full"
 msgstr "Red je pun"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:199
 msgid "Not while on AOL"
 msgstr "Ne dok je na AOL-u"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Neposredan razgovor sa %s je zatvoren"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Neposredan razgovor sa %s je neuspešan"
 
-#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:222
-#: src/protocols/toc/toc.c:628 src/protocols/toc/toc.c:644
-#: src/protocols/toc/toc.c:712
+#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "Veza je prekinuta."
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/toc/toc.c:888
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Veza sa pričaonicom %s je prekinuta."
 
-#: src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:559
 msgid "Chat is currently unavailable"
 msgstr "Razgovor trenutno nije moguć"
 
-#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:697
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
 msgid "Couldn't connect to host"
 msgstr "Ne mogu da se povežem sa domaćinom"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:675
 msgid "Unable to login to AIM"
 msgstr "Ne mogu da se prijavim na AIM"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
 msgid "Could Not Connect"
 msgstr "Ne mogu da se povežem"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:785
 msgid "Connection established, cookie sent"
 msgstr "Veza je uspostavljena, kolačić je poslat"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
+#: src/protocols/oscar/oscar.c:870
 msgid "File Transfer Aborted"
 msgstr "Prenos datoteke je obustvaljen"
 
 # Mogu reci i "server soket", ali preveliko znacenje mogu ljudi dati "server" delu, i ne razumeti.
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:853
 msgid "Unable to establish listener socket."
 msgstr "Ne mogu da uspostavim soket za vezu."
 
 # Ovo je FD kao broj koji je ekvivalentan "file handle"-u, odnosno, to je jedinstvena oznaka otvorenog fajla za pristup; sta znaci "establish" u ovom kontekstu mi nije jasno
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:866
 msgid "Unable to establish file descriptor."
 msgstr "Ne mogu da uspostavim opisnik datoteke."
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to create new connection."
 msgstr "Ne mogu da uspostavim novu vezu."
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:574
+#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Neispravan nadimak ili lozinka."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "Vaš nalog je trenutno nedostupan."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Usluga AOL brzih poruka je privremeno nedostupna."
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1065
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -5789,18 +6072,18 @@
 "Uspostavljali ste i prekidali vezu suviše često. Sačekajte deset minuta pa "
 "pokušajte ponovo. Ako nastavite da pokušavate, moraćete da sačekate još duže."
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1070
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Izdanje klijenta koji koristite je zastarelo. Osvežite ga na %s"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1102
 msgid "Internal Error"
 msgstr "Unutrašnja greška"
 
 # Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
+#: src/protocols/oscar/oscar.c:1322
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5809,29 +6092,29 @@
 "Veza se uskoro može prekinuti. Možda želite da koristite TOC dok se ovo ne "
 "ispravi. Pogledajte %s za dopune."
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim nije uspeo da preuzme ispravan heš za prijavu na AIM."
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1325
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim nije uspeo da preuzme ispravan heš za prijavu."
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5626
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5565
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Neposredan razgovor sa %s je omogućen"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
 msgid "(There was an error receiving this message)"
 msgstr "(Došlo je do greške pri prijemu ove poruke)"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2403
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s je upravo zatražio neposrednu vezu sa %s"
 
-#: src/protocols/oscar/oscar.c:2414
+#: src/protocols/oscar/oscar.c:2406
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -5841,23 +6124,23 @@
 "slika. Pošto će se Vaša IP adresa prikazati, ovo se može smatrati "
 "narušavanjem privatnosti."
 
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5934
 msgid "Connect"
 msgstr "Uspostavi vezu"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2438
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Daj mi ovlašćenje kako bih mogao da te dodam u spisak drugara."
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2446
 msgid "Authorization Request Message:"
 msgstr "Poruka uz zahtev za ovlašćenje:"
 
-#: src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2447
 msgid "Please authorize me!"
 msgstr "Ovlasti me!"
 
-#: src/protocols/oscar/oscar.c:2483
+#: src/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -5866,23 +6149,23 @@
 "Korisnik %s zahteva ovlašćenje pre nego što ga možete dodati u spisak "
 "drugara. Da li želite da pošaljete zahtev za ovlašćenje?"
 
-#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
 msgid "Request Authorization"
 msgstr "Zahtevaj ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2607
-#: src/protocols/oscar/oscar.c:2627 src/protocols/oscar/oscar.c:3002
-#: src/protocols/oscar/oscar.c:3054 src/protocols/oscar/oscar.c:5144
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
+#: src/protocols/oscar/oscar.c:3027 src/protocols/oscar/oscar.c:5065
+#: src/protocols/oscar/oscar.c:5111
 msgid "No reason given."
 msgstr "Razlog nije naveden."
 
-#: src/protocols/oscar/oscar.c:2534
+#: src/protocols/oscar/oscar.c:2526
 msgid "Authorization Denied Message:"
 msgstr "Razlog odbijanja ovlašćenja:"
 
-#: src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5892,33 +6175,32 @@
 "razlog:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2615 src/protocols/oscar/oscar.c:5150
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5071
 msgid "Authorization Request"
 msgstr "Zahtev za ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Korisnik %u je odbio Vaš zahtev za ovlašćenje da ga dodate u spisak "
-"kontakata, a naveo je sledeći razlog:\n"
+"Korisnik %u je odbio Vaš zahtev za ovlašćenje da ga dodate u spisak drugara, a naveo je sledeći razlog:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2620
 msgid "ICQ authorization denied."
 msgstr "ICQ ovlašćenje odbijeno."
 
 #. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2627
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "Korisnik %u je prihvatio Vaš zahtev da ga dodate u spisak drugara."
+
 #: src/protocols/oscar/oscar.c:2635
 #, c-format
-msgid "The user %u has granted your request to add them to your contact list."
-msgstr "Korisnik %u je prihvatio Vaš zahtev da ga dodate u spisak kontakata."
-
-#: src/protocols/oscar/oscar.c:2643
-#, c-format
 msgid ""
 "You have received a special message\n"
 "\n"
@@ -5930,7 +6212,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5943,7 +6225,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2659
+#: src/protocols/oscar/oscar.c:2651
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5956,20 +6238,20 @@
 "Poruka glasi:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2680
-#, c-format
-msgid "ICQ user %u has sent you a contact: %s (%s)"
+#: src/protocols/oscar/oscar.c:2672
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ korisnik %u Vam je poslao kontakt: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2686
-msgid "Do you want to add this contact to your Buddy List?"
+#: src/protocols/oscar/oscar.c:2678
+msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Da li želite da dodate ovaj kontakt u spisak drugara?"
 
-#: src/protocols/oscar/oscar.c:2690
+#: src/protocols/oscar/oscar.c:2682
 msgid "Decline"
 msgstr "Odbij"
 
-#: src/protocols/oscar/oscar.c:2772
+#: src/protocols/oscar/oscar.c:2764
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -5977,7 +6259,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato što su bile neispravne."
 msgstr[2] "Propustili ste %hu poruka od %s zato što su bile neispravne."
 
-#: src/protocols/oscar/oscar.c:2781
+#: src/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -5985,7 +6267,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato što su bile prevelike."
 msgstr[2] "Propustili ste %hu poruka od %s zato što su bile prevelike."
 
-#: src/protocols/oscar/oscar.c:2790
+#: src/protocols/oscar/oscar.c:2782
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -5995,7 +6277,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato što je ograničenje prekoračeno."
 msgstr[2] "Propustili ste %hu poruka od %s zato što je ograničenje prekoračeno."
 
-#: src/protocols/oscar/oscar.c:2799
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -6003,7 +6285,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato što je on/ona previše zločest."
 msgstr[2] "Propustili ste %hu poruka od %s zato što je on/ona previše zločest."
 
-#: src/protocols/oscar/oscar.c:2808
+#: src/protocols/oscar/oscar.c:2800
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -6011,7 +6293,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato što ste vi previše zločesti."
 msgstr[2] "Propustili ste %hu poruka od %s zato što ste vi previše zločesti."
 
-#: src/protocols/oscar/oscar.c:2817
+#: src/protocols/oscar/oscar.c:2809
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -6019,184 +6301,156 @@
 msgstr[1] "Propustili ste %hu poruke od %s iz nepoznatih razloga."
 msgstr[2] "Propustili ste %hu poruka od %s iz nepoznatih razloga."
 
-#: src/protocols/oscar/oscar.c:2833 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4534
+#: src/protocols/oscar/oscar.c:6061
 msgid "Free For Chat"
 msgstr "Dostupan za razgovor"
 
-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:5914
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4528
+#: src/protocols/oscar/oscar.c:6059
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:5915
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4531
+#: src/protocols/oscar/oscar.c:6060
 msgid "Occupied"
 msgstr "Zauzet"
 
-#: src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:2835
 msgid "Web Aware"
 msgstr "Pratim veb"
 
-#: src/protocols/oscar/oscar.c:2903
+#: src/protocols/oscar/oscar.c:2878
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>Korisnički broj:</B> %s<BR><B>Stanje:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2905
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>Stanje:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2937
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC prijavljuje grešku: %s\n"
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2938
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Vaša poruka za %s nije poslata:"
 
-#: src/protocols/oscar/oscar.c:3052
+#: src/protocols/oscar/oscar.c:3025
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podaci o korisniku %s nedostupni:"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3063
 msgid "Voice"
 msgstr "Glas"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:5945
+#: src/protocols/oscar/oscar.c:3066 src/protocols/oscar/oscar.c:6090
 msgid "Direct IM"
 msgstr "Neposredna poruka"
 
-#: src/protocols/oscar/oscar.c:3098 src/protocols/oscar/oscar.c:5961
+#: src/protocols/oscar/oscar.c:3072 src/protocols/oscar/oscar.c:6106
 msgid "Get File"
 msgstr "Pribavi datoteku"
 
-#: src/protocols/oscar/oscar.c:3101 src/protocols/oscar/oscar.c:5953
+#: src/protocols/oscar/oscar.c:3075 src/protocols/oscar/oscar.c:6098
 msgid "Send File"
 msgstr "Pošalji datoteku"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3079
 msgid "Games"
 msgstr "Igre"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3082
 msgid "Add-Ins"
 msgstr "Dodaci"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3085
 msgid "Send Buddy List"
 msgstr "Pošalji spisak drugara"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3088
 msgid "EveryBuddy Bug"
 msgstr "EvriBadi greška ;-)"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3091
 msgid "AP User"
 msgstr "AP korisnik"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3094
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3097
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3100
 msgid "ICQ Server Relay"
 msgstr "ICQ preusmeravanje servera"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3103
 msgid "Old ICQ UTF8"
 msgstr "Stari ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3106
 msgid "Trillian Encryption"
 msgstr "Trilijan enkripcija"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3109
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3112
 msgid "Hiptop"
 msgstr "Vrhkuka"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3115
 msgid "Secure IM"
 msgstr "Bezbedne brze poruke"
 
-#: src/protocols/oscar/oscar.c:3181
-msgid ""
-"<i>Unable to display information because it was sent in an unknown encoding."
-"</i>"
-msgstr ""
-"<i>Ne mogu da prikažem podatke zato što su poslati u nepoznatom načinu "
-"zapisa.</i>"
-
-#: src/protocols/oscar/oscar.c:3188
-#, c-format
-msgid "Online Since : <b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3143
+#, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "Korisničko ime: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3144
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr "Nivo upozorenja: <b>%d%%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3147
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Na vezi od: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3193
-#, c-format
-msgid "Member Since : <b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3151
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Član od: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3199
-#, c-format
-msgid "Idle : <b>%s</b>"
+#: src/protocols/oscar/oscar.c:3156
+#, c-format
+msgid "Idle: <b>%s</b>"
 msgstr "Neaktivnost: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3159
 msgid "Idle: <b>Active</b>"
 msgstr "Neaktivnost: <b>aktivan</b>"
 
-#: src/protocols/oscar/oscar.c:3204
-#, c-format
-msgid ""
-"Username : <b>%s</b>  %s <br>\n"
-"Warning Level : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-msgstr ""
-"Korisničko ime: <b>%s</b>  %s <br>\n"
-"Nivo upozorenja: <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-
-#: src/protocols/oscar/oscar.c:3236
-msgid "<i>User has no away message</i>"
-msgstr "<i>Korisnik nema razlog za odsustvo</i>"
-
-#: src/protocols/oscar/oscar.c:3247
-msgid "Client Capabilities: "
-msgstr "Mogućnosti klijenta: "
-
-#: src/protocols/oscar/oscar.c:3253
-msgid "<i>No Information Provided</i>"
-msgstr "<i>Podaci nisu dobavljeni</i>"
-
-#: src/protocols/oscar/oscar.c:3277
+#: src/protocols/oscar/oscar.c:3199
 msgid "Your AIM connection may be lost."
 msgstr "Možda AIM veza prekinuta."
 
-#: src/protocols/oscar/oscar.c:3665
+#: src/protocols/oscar/oscar.c:3587
 msgid "Rate limiting error."
 msgstr "Greška pri ograničavanju brzine."
 
-#: src/protocols/oscar/oscar.c:3666
+#: src/protocols/oscar/oscar.c:3588
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6204,7 +6458,7 @@
 "Poslednja poruka nije poslata zato što ste prekoračili dozvoljenu brzinu. "
 "Sačekajte 10 sekundi i probajte ponovo."
 
-#: src/protocols/oscar/oscar.c:3727
+#: src/protocols/oscar/oscar.c:3649
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6212,106 +6466,105 @@
 "Veza je prekinuta zato što ste se prijavili pod ovim imenom sa nekog drugog "
 "mesta."
 
-#: src/protocols/oscar/oscar.c:3729
+#: src/protocols/oscar/oscar.c:3651
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste iz nepoznatih razloga."
 
-#: src/protocols/oscar/oscar.c:3974 src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:3896 src/protocols/oscar/oscar.c:3902
 msgid "Email Address"
 msgstr "Adresa e-pošte"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:3907
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:313
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3910 src/protocols/trepia/trepia.c:272
+#: src/protocols/trepia/trepia.c:413
 msgid "Female"
 msgstr "Ženski"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:312
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3910 src/protocols/trepia/trepia.c:271
+#: src/protocols/trepia/trepia.c:413
 msgid "Male"
 msgstr "Muški"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:3927
 msgid "Personal Web Page"
 msgstr "Lična veb stranica"
 
-#: src/protocols/oscar/oscar.c:4008
+#: src/protocols/oscar/oscar.c:3930
 msgid "Additional Information"
 msgstr "Dodatni podaci"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:3934
 msgid "Home Address"
 msgstr "Kućna adresa"
 
-# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
-msgid "Address"
-msgstr "Ulica"
-
-#: src/protocols/oscar/oscar.c:4023 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3961
 msgid "Zip Code"
 msgstr "Poštanski broj"
 
-#: src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:3950
 msgid "Work Address"
 msgstr "Adresa na poslu"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:3966
 msgid "Work Information"
 msgstr "Podaci o poslu"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:3968
 msgid "Company"
 msgstr "Preduzeće"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:3971
 msgid "Division"
 msgstr "Odeljenje"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:3974
 msgid "Position"
 msgstr "Pozicija"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:3977
 msgid "Web Page"
 msgstr "Veb stranica"
 
-#: src/protocols/oscar/oscar.c:4061
+#: src/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ podaci za %s"
 
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4033
+msgid "Pop-Up Message"
+msgstr "Iskačuća poruka"
+
+#: src/protocols/oscar/oscar.c:4054
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "Naredni nadimci su u vezi sa %s"
 
-#: src/protocols/oscar/oscar.c:4131
+#: src/protocols/oscar/oscar.c:4058
 msgid "Search Results"
 msgstr "Rezultati pretrage"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4075
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nije pronađeno niti jedno poklapanje za adresu e-pošte %s"
 
-#: src/protocols/oscar/oscar.c:4169
+#: src/protocols/oscar/oscar.c:4096
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Trebate da primite e-poštu radi potvrđivanja %s."
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4098
 msgid "Account Confirmation Requested"
 msgstr "Zahteva se potvrda naloga"
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4126
 msgid "Error Changing Account Info"
 msgstr "Greška pri izmeni podataka o nalogu"
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4129
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6320,7 +6573,7 @@
 "Greška 0x%04x: Ne mogu da ispišem korisničko ime zato što se traženo ime "
 "razlikuje od originala."
 
-#: src/protocols/oscar/oscar.c:4205
+#: src/protocols/oscar/oscar.c:4132
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6329,7 +6582,7 @@
 "Greška 0x%04x: Ne mogu da ispišem korisničko ime zato što se traženo ime "
 "završava razmakom."
 
-#: src/protocols/oscar/oscar.c:4208
+#: src/protocols/oscar/oscar.c:4135
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6338,7 +6591,7 @@
 "Greška 0x%04x: Ne mogu da ispišem korisničko ime zato što je traženo ime "
 "predugačko."
 
-#: src/protocols/oscar/oscar.c:4211
+#: src/protocols/oscar/oscar.c:4138
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6347,7 +6600,7 @@
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je već poslat "
 "zahtev za ovo korisničko ime."
 
-#: src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4141
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6356,7 +6609,7 @@
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je previše "
 "korisničkih imena povezano sa datom adresom."
 
-#: src/protocols/oscar/oscar.c:4217
+#: src/protocols/oscar/oscar.c:4144
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6365,12 +6618,12 @@
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je uneta adresa "
 "neispravna."
 
-#: src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Greška 0x%04x: Nepoznata greška."
 
-#: src/protocols/oscar/oscar.c:4230
+#: src/protocols/oscar/oscar.c:4157
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6379,20 +6632,20 @@
 "Vaše korisničko ime trenutno izgleda ovako:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4231 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4158 src/protocols/oscar/oscar.c:4165
 msgid "Account Info"
 msgstr "Podaci o nalogu"
 
-#: src/protocols/oscar/oscar.c:4236
+#: src/protocols/oscar/oscar.c:4163
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Adresa e-pošte za %s je %s"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4393
 msgid "Unable to set AIM profile."
 msgstr "Ne mogu da postavim AIM profil."
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4394
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -6403,7 +6656,7 @@
 "povežete."
 
 # bug: plural-forms
-#: src/protocols/oscar/oscar.c:4502
+#: src/protocols/oscar/oscar.c:4424
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6421,15 +6674,15 @@
 "Najveća dozvoljena veličina profila od %d bajtova je prekoračena. Gaim ga je "
 "skratio i postavio."
 
-#: src/protocols/oscar/oscar.c:4507
+#: src/protocols/oscar/oscar.c:4429
 msgid "Profile too long."
 msgstr "Profil je predugačak."
 
-#: src/protocols/oscar/oscar.c:4526
+#: src/protocols/oscar/oscar.c:4448
 msgid "Unable to set AIM away message."
 msgstr "Ne mogu da postavim poruku za AIM odsustvo."
 
-#: src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:4449
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6440,7 +6693,7 @@
 "pokušajte ponovo kada se propisno povežete."
 
 # bug: plural-forms
-#: src/protocols/oscar/oscar.c:4567
+#: src/protocols/oscar/oscar.c:4489
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6458,15 +6711,15 @@
 "Najveća dozvoljena dužina poruke za odsustvo od %d bajtova je prekoračena. "
 "Gaim je skratio poruku, i započeo odsustvo."
 
-#: src/protocols/oscar/oscar.c:4572
+#: src/protocols/oscar/oscar.c:4494
 msgid "Away message too long."
 msgstr "Poruka za odsustvo je predugačka."
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4714
 msgid "Unable To Retrieve Buddy List"
 msgstr "Ne mogu preuzeti spisak drugara"
 
-#: src/protocols/oscar/oscar.c:4793
+#: src/protocols/oscar/oscar.c:4715
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -6475,12 +6728,12 @@
 "Privremeno, Gaim nije uspeo da preuzme Vaš spisak drugara sa AIM servera. "
 "Spisak drugara nije nestao, i verovatno će biti dostupan za nekoliko sati."
 
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4890
+#: src/protocols/oscar/oscar.c:4806 src/protocols/oscar/oscar.c:4807
+#: src/protocols/oscar/oscar.c:4812
 msgid "Orphans"
 msgstr "Siročići"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:4978
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6489,15 +6742,15 @@
 "Ne mogu da dodam drugara %s zato što imate previše drugara u spisku. "
 "Uklonite nekoga i pokušajte ponovo."
 
-#: src/protocols/oscar/oscar.c:5057 src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4978 src/protocols/oscar/oscar.c:4991
 msgid "(no name)"
 msgstr "(bez imena)"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:4979 src/protocols/oscar/oscar.c:4992
 msgid "Unable To Add"
 msgstr "Ne mogu da dodam"
 
-#: src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4991
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6508,7 +6761,7 @@
 "već imate najviše dozvoljenih drugara u Vašem spisku."
 
 # Is it "them"? Or "him/her"?
-#: src/protocols/oscar/oscar.c:5105
+#: src/protocols/oscar/oscar.c:5026
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6517,11 +6770,11 @@
 "Korisnik %s Vam dozvoljava da ga dodate u spisak drugara. Da li želite da ga "
 "dodate?"
 
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5032
 msgid "Authorization Given"
 msgstr "Ovlašćenje je dato"
 
-#: src/protocols/oscar/oscar.c:5144
+#: src/protocols/oscar/oscar.c:5065
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6531,73 +6784,76 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5186
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
-msgstr "Korisnik %s je odobrio Vaš zahtev da ga dodate u spisak kontakata."
-
-#: src/protocols/oscar/oscar.c:5187
+#: src/protocols/oscar/oscar.c:5107
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr "Korisnik %s je odobrio Vaš zahtev da ga dodate u spisak drugara."
+
+#: src/protocols/oscar/oscar.c:5108
 msgid "Authorization Granted"
 msgstr "Zahtev odobren"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:5111
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Korisnik %s je odbio Vaš zahtev da ga dodate u spisak kontakata iz sledećeg "
-"razloga:\n"
+"Korisnik %s je odbio Vaš zahtev da ga dodate u spisak drugara iz sledećeg razloga:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5112
 msgid "Authorization Denied"
 msgstr "Zahtev odbijen"
 
-#: src/protocols/oscar/oscar.c:5228 src/protocols/toc/toc.c:1266
+#: src/protocols/oscar/oscar.c:5149 src/protocols/toc/toc.c:1263
 msgid "Exchange:"
 msgstr "Razmena:"
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5372
 msgid "<b>Status:</b> "
 msgstr "<b>Stanje:</b> "
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5381
 msgid "<b>Logged In:</b> "
 msgstr "<b>Prijavljen:</b> "
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5393
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP adresa:</b> "
 
-#: src/protocols/oscar/oscar.c:5478
+#: src/protocols/oscar/oscar.c:5401
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Mogućnosti:</b> "
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5408
 msgid "<b>Available:</b> "
 msgstr "<b>Dostupno:</b> "
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5423
+msgid "<b>Away Message:</b> "
+msgstr "<b>Poruka za odsustvo:</b>"
+
+#: src/protocols/oscar/oscar.c:5433
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Stanje:</b> Neovlašćen"
 
-#: src/protocols/oscar/oscar.c:5528 src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/oscar/oscar.c:5467 src/protocols/yahoo/yahoo.c:1836
 msgid "Offline"
 msgstr "Nepovezan"
 
-#: src/protocols/oscar/oscar.c:5769
+#: src/protocols/oscar/oscar.c:5914
 msgid "Unable to open Direct IM"
 msgstr "Ne mogu da pošaljem neposrednu brzu poruku"
 
-#: src/protocols/oscar/oscar.c:5782
+#: src/protocols/oscar/oscar.c:5927
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izabrali ste da uspostavite vezu za neposredne brze poruke sa %s."
 
-#: src/protocols/oscar/oscar.c:5785
+#: src/protocols/oscar/oscar.c:5930
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6605,83 +6861,101 @@
 "Kako ovo razotkriva Vašu IP adresu, može se smatrati narušavanjem "
 "privatnosti. Želite li da nastavite?"
 
-#: src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:6075
 msgid "Get Status Msg"
 msgstr "Pribavi poruku o stanju"
 
-#: src/protocols/oscar/oscar.c:5974
+#: src/protocols/oscar/oscar.c:6119
 msgid "Re-request Authorization"
 msgstr "Ponovi zahtev za ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6140
 msgid "The new formatting is invalid."
 msgstr "Novi zapis je neispravan."
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:6141
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "Zapis korisničkog imena se može promeniti samo u veličini slova i broju "
 "razmaka."
 
-#: src/protocols/oscar/oscar.c:6002
+#: src/protocols/oscar/oscar.c:6147
 msgid "New screenname formatting:"
 msgstr "Novi zapis korisničkog imena:"
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6196
 msgid "Change Address To:"
 msgstr "Promena adrese u:"
 
-#: src/protocols/oscar/oscar.c:6095
+#: src/protocols/oscar/oscar.c:6240
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čekate na ovlašćenje</i>"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6243
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Očekujete ovlašćenje od sledećih drugara"
 
-#: src/protocols/oscar/oscar.c:6099
+#: src/protocols/oscar/oscar.c:6244
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
-msgstr "Možete ponoviti zahtev za ovlašćenje od ovih drugara desnim klikom na njih i izborom „Ponovi zahtev za ovlašćenje“."
-
-#: src/protocols/oscar/oscar.c:6115
+msgstr ""
+"Možete ponoviti zahtev za ovlašćenje od ovih drugara desnim klikom na njih i "
+"izborom „Ponovi zahtev za ovlašćenje“."
+
+#: src/protocols/oscar/oscar.c:6258
+msgid "Find Buddy by E-mail"
+msgstr "Pronađi drugara pomoću adrese e-pošte"
+
+#: src/protocols/oscar/oscar.c:6259
+msgid "Search for a buddy by e-mail address"
+msgstr "Pronađi drugara pomoću adrese e-pošte"
+
+#: src/protocols/oscar/oscar.c:6260
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "Ukucajte e-poštansku adresu drugara koga tražite."
+
+#: src/protocols/oscar/oscar.c:6263
+msgid "Search"
+msgstr "Traži"
+
+#: src/protocols/oscar/oscar.c:6276
 msgid "Available Message:"
 msgstr "Poruka za dostupnost:"
 
-#: src/protocols/oscar/oscar.c:6116
-msgid "Please talk to me, I'm lonely! (and single)"
-msgstr "Molim Vas pričajte sa mnom. Usamljen sam! (i slobodan)"
-
-#: src/protocols/oscar/oscar.c:6178
+#: src/protocols/oscar/oscar.c:6354
 msgid "Set Available Message"
 msgstr "Postavi poruku za dostupnost"
 
-#: src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6368
 msgid "Change Password (URL)"
 msgstr "Izmena lozinke (Internet adresa)"
 
-#: src/protocols/oscar/oscar.c:6203
+#: src/protocols/oscar/oscar.c:6376
+msgid "Configure IM Forwarding (URL)"
+msgstr "Podesi prosleđivanje brzih poruka (adresa)"
+
+#: src/protocols/oscar/oscar.c:6387
 msgid "Format Screenname"
 msgstr "Zapis korisničkog imena"
 
-#: src/protocols/oscar/oscar.c:6209
+#: src/protocols/oscar/oscar.c:6393
 msgid "Confirm Account"
 msgstr "Potvrdite nalog"
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6399
 msgid "Display Current Registered Address"
 msgstr "Prikaži trenutno registrovanu adresu"
 
-#: src/protocols/oscar/oscar.c:6221
+#: src/protocols/oscar/oscar.c:6405
 msgid "Change Current Registered Address"
 msgstr "Izmeni trenutno registrovanu adresu"
 
-#: src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:6414
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Prikaži drugare za koje se čeka ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:6422
 msgid "Search for Buddy by Email"
 msgstr "Pronađi drugara prema adresi e-pošte"
 
@@ -6695,123 +6969,123 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6359 src/protocols/oscar/oscar.c:6361
+#: src/protocols/oscar/oscar.c:6543 src/protocols/oscar/oscar.c:6545
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Dodatak za AIM/ICQ protokole"
 
-#: src/protocols/oscar/oscar.c:6378
+#: src/protocols/oscar/oscar.c:6562
 msgid "Auth host"
 msgstr "Domaćin za identifikaciju"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6567
 msgid "Auth port"
 msgstr "Port"
 
-#: src/protocols/toc/toc.c:171
+#: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
 msgstr "Tražim %s"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:510
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Ne mogu da pišem u datoteku %s."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Ne mogu da pročitam datoteku %s."
 
 # greska: plural
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Poruka je predugačka, poslednjih %s bajtova je zanemareno."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nije trenutno prijavljen."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Nije dozvoljeno upozoriti %s."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Poruka je odbačena, prekoračujete ograničenja brzine servera."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Nije moguć razgovor u %s."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Šaljete poruke prebrzo za %s."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Propustili ste poruku od %s zato što je prevelika."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Propustili ste poruku od %s zato je poslata previše brzo."
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:540
 msgid "Failure."
 msgstr "Neuspeh."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:543
 msgid "Too many matches."
 msgstr "Previše poklapanja."
 
+#: src/protocols/toc/toc.c:546
+msgid "Need more qualifiers."
+msgstr "Potrebno više obeležja."
+
 #: src/protocols/toc/toc.c:549
-msgid "Need more qualifiers."
-msgstr "Potrebno više obeležja."
+msgid "Dir service temporarily unavailable."
+msgstr "Usluge imenika trenutno nisu dostupne."
 
 #: src/protocols/toc/toc.c:552
-msgid "Dir service temporarily unavailable."
-msgstr "Usluge imenika trenutno nisu dostupne."
-
-#: src/protocols/toc/toc.c:555
 msgid "Email lookup restricted."
 msgstr "Ograničena pretraga prema adresi e-pošte."
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:555
 msgid "Keyword ignored."
 msgstr "Ključne reči zanemarene."
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:558
 msgid "No keywords."
 msgstr "Nema ključnih reči."
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:561
 msgid "User has no directory information."
 msgstr "Korisnik nije upisan u imenik."
 
+#: src/protocols/toc/toc.c:565
+msgid "Country not supported."
+msgstr "Država nije podržana."
+
 #: src/protocols/toc/toc.c:568
-msgid "Country not supported."
-msgstr "Država nije podržana."
-
-#: src/protocols/toc/toc.c:571
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Nepoznat neuspeh: %s."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
 msgstr "Usluga je privremeno nedostupna."
 
+#: src/protocols/toc/toc.c:577
+msgid "Your warning level is currently too high to log in."
+msgstr "Imate previše upozorenja da biste se mogli prijaviti."
+
 #: src/protocols/toc/toc.c:580
-msgid "Your warning level is currently too high to log in."
-msgstr "Imate previše upozorenja da biste se mogli prijaviti."
-
-#: src/protocols/toc/toc.c:583
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -6819,37 +7093,37 @@
 "Uspostavljate i prekidate vezu suviše često. Sačekajte deset minuta i "
 "pokušajte ponovo. Ako nastavite sa pokušajima, moraćete sačekati čak i duže."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Došlo je do nepoznate greške pri prijavi: %s."
 
-#: src/protocols/toc/toc.c:588
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Dogodila se nepoznata greška %d. Podaci: %s"
 
-#: src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
 msgstr "Veza prekinuta"
 
-#: src/protocols/toc/toc.c:648
+#: src/protocols/toc/toc.c:645
 msgid "Waiting for reply..."
 msgstr "Čekam za odgovor..."
 
-#: src/protocols/toc/toc.c:718
+#: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC je prekinuo zastoj. Sada ponovo možete slati poruke."
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
 msgstr "Lozinka uspešno izmenjena"
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:907
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC je poslao naredbu PAUSE."
 
-#: src/protocols/toc/toc.c:911
+#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -6859,37 +7133,37 @@
 "izbaciti ako pošaljete poruku. Gaim će sprečiti da bilo šta prolazi. Ovo je "
 "samo privremeno, budite strpljivi."
 
-#: src/protocols/toc/toc.c:1404
+#: src/protocols/toc/toc.c:1401
 msgid "Get Dir Info"
 msgstr "Pribavi podatke iz imenika"
 
-#: src/protocols/toc/toc.c:1528
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "Postavi podatke u imenik"
 
-#: src/protocols/toc/toc.c:1652
+#: src/protocols/toc/toc.c:1663
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Ne mogu da otvorim %s za upis!"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1699
 msgid "File transfer failed; other side probably canceled."
 msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala."
 
-#: src/protocols/toc/toc.c:1733 src/protocols/toc/toc.c:1773
-#: src/protocols/toc/toc.c:1985
+#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1996
 msgid "Could not connect for transfer."
 msgstr "Ne mogu da uspostavim vezu za prenos."
 
-#: src/protocols/toc/toc.c:1897
+#: src/protocols/toc/toc.c:1908
 msgid "Could not connect for transfer!"
 msgstr "Ne mogu da uspostavim vezu za prenos!"
 
-#: src/protocols/toc/toc.c:1930
+#: src/protocols/toc/toc.c:1941
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Ne mogu da upišem zaglavlje datoteke. Datoteka se neće preneti."
 
-#: src/protocols/toc/toc.c:2064
+#: src/protocols/toc/toc.c:2075
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
@@ -6897,7 +7171,7 @@
 msgstr[1] "%s zahteva od %s da primi %d datoteke: %s (%.2f %s)%s%s"
 msgstr[2] "%s zahteva od %s da primi %d datoteka: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2071
+#: src/protocols/toc/toc.c:2082
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s zahteva od Vas da pošaljete datoteku"
@@ -6912,95 +7186,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2147 src/protocols/toc/toc.c:2149
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "Dodatak za TOC protokol"
 
-#: src/protocols/toc/toc.c:2166
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "TOC server"
 
-#: src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "TOC port"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:295
+#: src/protocols/trepia/trepia.c:254
 msgid "Basic Profile"
 msgstr "Osnovni profil"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:285
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
-#: src/protocols/trepia/trepia.c:332
+#: src/protocols/trepia/trepia.c:291
 msgid "Profile Information"
 msgstr "Podaci o profilu"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:338
+#: src/protocols/trepia/trepia.c:297
 msgid "Instant Messagers"
 msgstr "Brzi pošiljaoci"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:342
+#: src/protocols/trepia/trepia.c:301
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:346
+#: src/protocols/trepia/trepia.c:305
 msgid "ICQ UIN"
 msgstr "ICQ broj"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:350
+#: src/protocols/trepia/trepia.c:309
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:354
+#: src/protocols/trepia/trepia.c:313
 msgid "Yahoo"
 msgstr "Jahu"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:359
+#: src/protocols/trepia/trepia.c:318
 msgid "I'm From"
 msgstr "Ja sam iz"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:376
+#: src/protocols/trepia/trepia.c:335
 msgid "Set your Trepia profile data."
 msgstr "Postavi podatke u Trepia profilu."
 
-#: src/protocols/trepia/trepia.c:500
+#: src/protocols/trepia/trepia.c:459
 msgid "Profile"
 msgstr "Profil"
 
-#: src/protocols/trepia/trepia.c:522
+#: src/protocols/trepia/trepia.c:481
 msgid "Set Profile"
 msgstr "Postavi profil"
 
-#: src/protocols/trepia/trepia.c:558
+#: src/protocols/trepia/trepia.c:517
 msgid "Visit Homepage"
 msgstr "Poseti ličnu stranicu"
 
-#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
+#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
 msgid "Local Users"
 msgstr "Lokalni korisnici"
 
-#: src/protocols/trepia/trepia.c:1003
+#: src/protocols/trepia/trepia.c:962
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
-#: src/protocols/trepia/trepia.c:1104
+#: src/protocols/trepia/trepia.c:1063
 msgid "Logging in"
 msgstr "Prijava"
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "Ne mogu načiniti soket"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7011,116 +7281,133 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
+#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
 msgid "Trepia Protocol Plugin"
 msgstr "Dodatak za Trepia protokol"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:696
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaša Jahu! poruka nije poslata."
 
-#: src/protocols/yahoo/yahoo.c:752
+#: src/protocols/yahoo/yahoo.c:754
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "Korisnik %s je (naknadno) odbio zahtev da ga dodate u vaš spisak drugara."
-
-#: src/protocols/yahoo/yahoo.c:754
+msgstr ""
+"Korisnik %s je (naknadno) odbio zahtev da ga dodate u vaš spisak drugara."
+
+#: src/protocols/yahoo/yahoo.c:756
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr "Korisnik %s je (naknadno) odbio zahtev da ga dodate u vaš spisak drugara iz sledećeg razloga: %s."
-
-#: src/protocols/yahoo/yahoo.c:755
+msgstr ""
+"Korisnik %s je (naknadno) odbio zahtev da ga dodate u vaš spisak drugara iz "
+"sledećeg razloga: %s."
+
+#: src/protocols/yahoo/yahoo.c:757
 msgid "Add buddy rejected"
 msgstr "Odbijeno dodavanje drugara"
 
-#: src/protocols/yahoo/yahoo.c:1046
+#: src/protocols/yahoo/yahoo.c:1377
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr "Jahu server je zahtevao upotrebu neprepoznatog načina identifikacije. Ovo izdanje Gaima najverovatnije neće moći da se prijavi na Jahu. Proverite %s radi dopuna."
+
+#: src/protocols/yahoo/yahoo.c:1380
+msgid "Failed Yahoo! Authentication"
+msgstr "Neuspešna Jahu! identifikacija"
+
+#: src/protocols/yahoo/yahoo.c:1453
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
-msgstr "Pokušali ste da ignorišete %s, ali taj korisnik je već u vašem spisku drugara. Klikom na „Da“ ćete ukloniti i ignorisati ovog drugara."
-
-#: src/protocols/yahoo/yahoo.c:1049
+msgstr ""
+"Pokušali ste da ignorišete %s, ali taj korisnik je već u vašem spisku "
+"drugara. Klikom na „Da“ ćete ukloniti i ignorisati ovog drugara."
+
+#: src/protocols/yahoo/yahoo.c:1456
 msgid "Ignore buddy?"
 msgstr "Ignoriši drugara?"
 
-#: src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:1485
 msgid "Invalid username."
 msgstr "Neispravno korisničko ime."
 
-#: src/protocols/yahoo/yahoo.c:1081
+#: src/protocols/yahoo/yahoo.c:1488
 msgid "Incorrect password."
 msgstr "Neispravna lozinka."
 
-#: src/protocols/yahoo/yahoo.c:1084
+#: src/protocols/yahoo/yahoo.c:1491
 msgid "Unknown error."
 msgstr "Nepoznata greška."
 
-#: src/protocols/yahoo/yahoo.c:1132
+#: src/protocols/yahoo/yahoo.c:1539
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Ne mogu da dodam drugara %s u grupu %s u spisak servera za nalog %s."
 
-#: src/protocols/yahoo/yahoo.c:1134
+#: src/protocols/yahoo/yahoo.c:1541
 msgid "Could not add buddy to server list"
 msgstr "Ne mogu da dodam drugara u spisak servera"
 
-#: src/protocols/yahoo/yahoo.c:1236
+#: src/protocols/yahoo/yahoo.c:1643
 msgid "Unable to read"
 msgstr "Ne mogu da pišem"
 
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:1744
 msgid "Connection problem"
 msgstr "Greška pri povezivanju"
 
-#: src/protocols/yahoo/yahoo.c:1411 src/protocols/yahoo/yahoo.c:1709
-#: src/protocols/yahoo/yahoo.c:1807
+#: src/protocols/yahoo/yahoo.c:1818 src/protocols/yahoo/yahoo.c:2116
+#: src/protocols/yahoo/yahoo.c:2214
 msgid "Not At Home"
 msgstr "Nisam kod kuće"
 
-#: src/protocols/yahoo/yahoo.c:1413 src/protocols/yahoo/yahoo.c:1711
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/yahoo/yahoo.c:2215
 msgid "Not At Desk"
 msgstr "Nisam za stolom"
 
-#: src/protocols/yahoo/yahoo.c:1415 src/protocols/yahoo/yahoo.c:1713
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:1822 src/protocols/yahoo/yahoo.c:2120
+#: src/protocols/yahoo/yahoo.c:2216
 msgid "Not In Office"
 msgstr "Nisam u kancelariji"
 
-#: src/protocols/yahoo/yahoo.c:1419 src/protocols/yahoo/yahoo.c:1717
-#: src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/yahoo/yahoo.c:1826 src/protocols/yahoo/yahoo.c:2124
+#: src/protocols/yahoo/yahoo.c:2218
 msgid "On Vacation"
 msgstr "Na raspustu sam"
 
-#: src/protocols/yahoo/yahoo.c:1423 src/protocols/yahoo/yahoo.c:1721
-#: src/protocols/yahoo/yahoo.c:1813
+#: src/protocols/yahoo/yahoo.c:1830 src/protocols/yahoo/yahoo.c:2128
+#: src/protocols/yahoo/yahoo.c:2220
 msgid "Stepped Out"
 msgstr "Izašao sam na kratko"
 
-#: src/protocols/yahoo/yahoo.c:1487 src/protocols/yahoo/yahoo.c:1521
+#: src/protocols/yahoo/yahoo.c:1894 src/protocols/yahoo/yahoo.c:1928
 msgid "Not on server list"
 msgstr "Nije na spisku na serveru"
 
-#: src/protocols/yahoo/yahoo.c:1577
+#: src/protocols/yahoo/yahoo.c:1984
 msgid "Join in Chat"
 msgstr "Priključi se razgovoru"
 
-#: src/protocols/yahoo/yahoo.c:1583
+#: src/protocols/yahoo/yahoo.c:1990
 msgid "Initiate Conference"
 msgstr "Pokreni razgovor"
 
-#: src/protocols/yahoo/yahoo.c:1629
+#: src/protocols/yahoo/yahoo.c:2036
 msgid "Active which ID?"
 msgstr "Aktiviraj ID (koji)?"
 
-#: src/protocols/yahoo/yahoo.c:1640
+#: src/protocols/yahoo/yahoo.c:2047
 msgid "Activate ID"
 msgstr "Aktiviraj ID"
 
-#: src/protocols/yahoo/yahoo.c:1987
+#: src/protocols/yahoo/yahoo.c:2403
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7128,49 +7415,47 @@
 "<b>Nažalost, za sada nisu podržani profili koji sadrže ponešto samo za "
 "odrasle.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:1989 src/protocols/yahoo/yahoo.c:2005
+#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2421
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-"Ukoliko želite da pogledate ovaj profil, treba da posetite ovu vezu u vašem "
-"čitaču veba."
-
-#: src/protocols/yahoo/yahoo.c:2003
+"web browser<br>"
+msgstr "Ukoliko želite da pogledate ovaj profil, treba da posetite ovu vezu u vašem čitaču veba.<br>"
+
+#: src/protocols/yahoo/yahoo.c:2420
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>Nažalost, ne-engleski profili nisu podržani za sada.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2037
+#: src/protocols/yahoo/yahoo.c:2462
 msgid "Yahoo! ID"
 msgstr "Jahu! ID"
 
-#: src/protocols/yahoo/yahoo.c:2079 src/protocols/yahoo/yahoo.c:2081
-#: src/protocols/yahoo/yahoo.c:2083
+#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2526
+#: src/protocols/yahoo/yahoo.c:2530
 msgid "Hobbies"
 msgstr "Hobiji"
 
-#: src/protocols/yahoo/yahoo.c:2085 src/protocols/yahoo/yahoo.c:2087
+#: src/protocols/yahoo/yahoo.c:2541 src/protocols/yahoo/yahoo.c:2545
 msgid "Latest News"
 msgstr "Najnovije vesti"
 
-#: src/protocols/yahoo/yahoo.c:2096
+#: src/protocols/yahoo/yahoo.c:2563
 msgid "Home Page"
 msgstr "Lična stranica"
 
-#: src/protocols/yahoo/yahoo.c:2106
+#: src/protocols/yahoo/yahoo.c:2577
 msgid "Cool Link 1"
 msgstr "Zanimljiva veza 1"
 
-#: src/protocols/yahoo/yahoo.c:2108
+#: src/protocols/yahoo/yahoo.c:2582
 msgid "Cool Link 2"
 msgstr "Zanimljiva veza 2"
 
-#: src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Cool Link 3"
 msgstr "Zanimljiva veza 3"
 
-#: src/protocols/yahoo/yahoo.c:2114
+#: src/protocols/yahoo/yahoo.c:2591
 msgid "Member Since"
 msgstr "Član od"
 
@@ -7184,15 +7469,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2250 src/protocols/yahoo/yahoo.c:2252
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2755
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatak za Jahu protokol"
 
-#: src/protocols/yahoo/yahoo.c:2269
+#: src/protocols/yahoo/yahoo.c:2772
 msgid "Pager host"
 msgstr "Server"
 
-#: src/protocols/yahoo/yahoo.c:2274
+#: src/protocols/yahoo/yahoo.c:2777
 msgid "Pager port"
 msgstr "Port"
 
@@ -7221,34 +7506,34 @@
 msgid "Maybe they're not in a chat?"
 msgstr "Možda ne razgovaraju?"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Korisnik:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Nadimak:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Sakriven ili neprijavljen"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>U %s od %s"
 
-#: src/protocols/zephyr/zephyr.c:575 src/protocols/zephyr/zephyr.c:576
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr "Bilo ko"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "Već prijavljen pomoću Zefira"
 
-#: src/protocols/zephyr/zephyr.c:601
+#: src/protocols/zephyr/zephyr.c:610
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7256,19 +7541,19 @@
 "Pošto Zefir koristi Vaše korisničko ime sa sistema, ne možete imati više "
 "naloga na njemu kada ste prijavljeni kao isti korisnik."
 
-#: src/protocols/zephyr/zephyr.c:855
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr "Zefir pretraga"
 
-#: src/protocols/zephyr/zephyr.c:895
+#: src/protocols/zephyr/zephyr.c:908
 msgid "Class:"
 msgstr "Razred:"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:913
 msgid "Instance:"
 msgstr "Instanca:"
 
-#: src/protocols/zephyr/zephyr.c:905
+#: src/protocols/zephyr/zephyr.c:918
 msgid "Recipient:"
 msgstr "Primalac:"
 
@@ -7282,7 +7567,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1037 src/protocols/zephyr/zephyr.c:1039
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Dodatak za Zefir protokol"
 
@@ -7298,38 +7583,15 @@
 "Neispravno je ili ime računara ili broj porta vašeg posrednika među "
 "podešavanjima."
 
-#: src/prpl.c:143
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s učini %s svojim drugarom%s%s%s"
-
-#: src/prpl.c:155
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Da li želite da dodate nju ili njega u svoj spisak drugara?"
-
-#: src/prpl.c:158
-msgid "Gaim - Information"
-msgstr "Gaim — podaci"
-
-#: src/prpl.c:161
-msgid "Add buddy to your list?"
-msgstr "Dodati drugara u Vaš spisak?"
-
 #. * Custom away message.
-#: src/prpl.h:186
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "Prilagođeno"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:862
 msgid "Accept"
 msgstr "Prihvati"
 
@@ -7337,7 +7599,7 @@
 msgid "Please enter your password"
 msgstr "Unesite Vašu lozinku"
 
-#: src/server.c:956
+#: src/server.c:949
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
@@ -7346,21 +7608,21 @@
 msgstr[2] "(%d poruka)"
 
 # bug: plural-forms
-#: src/server.c:969
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "(1 poruka)"
 
-#: src/server.c:1156 src/server.c:1166
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s je prijavljen."
 
-#: src/server.c:1184 src/server.c:1192
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s je odjavljen."
 
-#: src/server.c:1240
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7369,11 +7631,11 @@
 "%s je upravo upozoren od strane %s.\n"
 "Vaš novi nivo obazrivosti je %d%%"
 
-#: src/server.c:1243
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "anonimna osoba"
 
-#: src/server.c:1346
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7382,23 +7644,15 @@
 "Korisnik „%s“ poziva %s u pričaonicu: „%s“\n"
 "%s"
 
-#: src/server.c:1350
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Korisnik „%s“ poziva %s u pričaonicu: „%s“\n"
 
-#: src/server.c:1356
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "Prihvati poziv na razgovor?"
 
-#: src/server.c:1545
-msgid "Gaim - Popup"
-msgstr "Gaim — iskačući prozor"
-
-#: src/server.c:1572
-msgid "More Info"
-msgstr "Više podataka"
-
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
@@ -7414,34 +7668,172 @@
 msgid "_Open Mail"
 msgstr "_Otvori poštu"
 
-#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+#: src/util.c:1527
+msgid "Calculating..."
+msgstr "Računam..."
+
+#: src/util.c:1530
+msgid "Unknown."
+msgstr "Nepoznato."
+
+#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
 msgstr[1] "dana"
 msgstr[2] "dana"
 
-#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "čas"
 msgstr[1] "časa"
 msgstr[2] "časova"
 
-#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuta"
 msgstr[2] "minuta"
 
-#: src/util.c:950
-msgid "Calculating..."
-msgstr "Računam..."
-
-#: src/util.c:953
-msgid "Unknown."
-msgstr "Nepoznato."
+#: src/util.c:1917
+msgid "g003: Error opening connection.\n"
+msgstr "g003: Greška pri otvaranju veze.\n"
+
+#: src/win32/win32dep.c:474
+msgid "Notification"
+msgstr "Obaveštenje"
+
+#: src/win32/win32dep.c:475
+msgid "Moving Gaim user settings directory to:"
+msgstr "Premesti direktorijum podešavanja Gaim korisnika u:"
+
+#~ msgid "_Quote window title"
+#~ msgstr "_Citiraj naslov prozora"
+
+#~ msgid "_Notify even if conversation is in focus"
+#~ msgstr "_Obavesti čak i ako je razgovor u toku"
+
+#~ msgid "Set Directory Info"
+#~ msgstr "Postavi podatke u imeniku"
+
+#~ msgid "Directory Info"
+#~ msgstr "Imenik sa podacima"
+
+#~ msgid "Setting Dir Info for %s:"
+#~ msgstr "Postavljam podatke u imeniku za %s:"
+
+#~ msgid "Allow Web Searches To Find Your Info"
+#~ msgstr "Dozvoli da pretrage veba pronađu moje podatke"
+
+#~ msgid "Maiden Name"
+#~ msgstr "Devojačko prezime"
+
+#~ msgid "Below are the results of your search: "
+#~ msgstr "Dole su rezultati pretrage: "
+
+#~ msgid "Search for Buddy"
+#~ msgstr "Traži drugara"
+
+#~ msgid "Find Buddy By Info"
+#~ msgstr "Pronađi drugara prema podacima"
+
+#~ msgid "Unable to change password."
+#~ msgstr "Ne mogu da izmenim lozinku."
+
+#~ msgid ""
+#~ "The current password you entered is incorrect.  Your password has not "
+#~ "been changed."
+#~ msgstr "Trenutno uneta lozinka je neispravna. Vaša lozinka nije izmenjena."
+
+#~ msgid ""
+#~ "The new password you entered is the same as your current password.  Your "
+#~ "password remains the same."
+#~ msgstr ""
+#~ "Lozinka koju ste uneli je ista kao i Vaša sadašnja lozinka. Vaša lozinka "
+#~ "ostaje ista."
+
+#~ msgid "Jabber Error %s"
+#~ msgstr "DŽaber greška %s"
+
+#~ msgid "Error %s: %s"
+#~ msgstr "Greška %s: %s"
+
+#~ msgid ""
+#~ "The Jabber user %s does not exist and was therefore not added to your "
+#~ "roster."
+#~ msgstr ""
+#~ "DŽaber korisnik %s ne postoji, i zato nije dodat u Vaš spisak drugara."
+
+#~ msgid "No such user."
+#~ msgstr "Nema takvog korisnika."
+
+#~ msgid "Unknown login error"
+#~ msgstr "Nepoznata greška pri prijavi"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "Lozinka uspešno izmenjena."
+
+#~ msgid "Connected"
+#~ msgstr "Veza uspostavljena"
+
+#~ msgid "Requesting Authentication Method"
+#~ msgstr "Zahtev načina identifikacije"
+
+#~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+#~ msgstr "Korisnik %s je neispravno DŽaber ime, i stoga nije dodat."
+
+#~ msgid "Unable to add buddy."
+#~ msgstr "Ne mogu da dodam drugara."
+
+#~ msgid "View Error Msg"
+#~ msgstr "Prikaži poruke o greškama"
+
+#~ msgid "Error %d: %s"
+#~ msgstr "Greška %d: %s"
+
+#~ msgid "Unknown registration error"
+#~ msgstr "Nepoznata greška pri registraciji"
+
+#~ msgid "<B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>Stanje:</B> %s<HR>%s"
+
+#~ msgid ""
+#~ "<i>Unable to display information because it was sent in an unknown "
+#~ "encoding.</i>"
+#~ msgstr ""
+#~ "<i>Ne mogu da prikažem podatke zato što su poslati u nepoznatom načinu "
+#~ "zapisa.</i>"
+
+#~ msgid ""
+#~ "Username : <b>%s</b>  %s <br>\n"
+#~ "Warning Level : <b>%d %%</b><br>\n"
+#~ "%s%s%s\n"
+#~ "<hr>\n"
+#~ msgstr ""
+#~ "Korisničko ime: <b>%s</b>  %s <br>\n"
+#~ "Nivo upozorenja: <b>%d %%</b><br>\n"
+#~ "%s%s%s\n"
+#~ "<hr>\n"
+
+#~ msgid "<i>User has no away message</i>"
+#~ msgstr "<i>Korisnik nema razlog za odsustvo</i>"
+
+#~ msgid "Client Capabilities: "
+#~ msgstr "Mogućnosti klijenta: "
+
+#~ msgid "<i>No Information Provided</i>"
+#~ msgstr "<i>Podaci nisu dobavljeni</i>"
+
+#~ msgid "Please talk to me, I'm lonely! (and single)"
+#~ msgstr "Molim Vas pričajte sa mnom. Usamljen sam! (i slobodan)"
+
+#~ msgid "Gaim - Popup"
+#~ msgstr "Gaim — iskačući prozor"
+
+#~ msgid "More Info"
+#~ msgstr "Više podataka"
 
 #~ msgid ""
 #~ "Gaim is converting your old buddy lists to a new format, which will now "
@@ -7496,18 +7888,12 @@
 #~ msgid "Second Name"
 #~ msgstr "Prezime"
 
-#~ msgid "Unable to change password"
-#~ msgstr "Ne mogu da izmenim lozinku"
-
 #~ msgid "Unable to send USR\n"
 #~ msgstr "Ne mogu da pošaljem USR\n"
 
 #~ msgid "Got invalid XFR\n"
 #~ msgstr "Primljen neispravan XFR\n"
 
-#~ msgid "Authentication Failed"
-#~ msgstr "Neuspešna identifikacija"
-
 #~ msgid "UIN:"
 #~ msgstr "Korisnički broj:"