diff po/sr@Latn.po @ 11412:4be6232ffcd3

[gaim-migrate @ 13649] sync the oldstatus translations to head because I have not been updating head, and while head _is_ significantly different, there now exist translations in oldstatus that don't in head, and even where they exist in both, the oldstatus one is often more updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 01 Sep 2005 19:24:17 +0000
parents 67a929d50cfe
children 81e26b7f262e
line wrap: on
line diff
--- a/po/sr@Latn.po	Thu Sep 01 18:47:49 2005 +0000
+++ b/po/sr@Latn.po	Thu Sep 01 19:24:17 2005 +0000
@@ -1,6 +1,6 @@
 # Gaim Serbian translation
-# Copyright © 2003, 2004:
-#   Danilo Segan <dsegan@gmx.net>, 2003, 2004
+# Copyright © 2003, 2004, 2005:
+#   Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005
 #   Aleksandar Urosevic <urke@users.sourceforge.net>, 2003, 2004
 #   Filip Miletic <f.miletic@ewi.tudelft.nl>, 2004
 #   Prevod.org web site.
@@ -8,11 +8,11 @@
 # This file is distributed under the same license as the Gaim package.
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.82\n"
+"Project-Id-Version: gaim 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-15 12:01-0400\n"
-"PO-Revision-Date: 2004-08-29 00:30+0200\n"
-"Last-Translator: Filip Miletić <f.miletic@ewi.tudelft.nl>\n"
+"POT-Creation-Date: 2005-07-10 16:02-0400\n"
+"PO-Revision-Date: 2005-07-06 19:22+0200\n"
+"Last-Translator: Danilo Šegan <danilo@gnome.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +20,21 @@
 "Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: plugins/autorecon.c:291
+#: plugins/autorecon.c:240
 msgid "Error Message Suppression"
 msgstr "Sakrij poruke o greškama"
 
-#: plugins/autorecon.c:295
+#: plugins/autorecon.c:244
 msgid "Hide Disconnect Errors"
 msgstr "Sakrij poruke o isključenju"
 
-#: plugins/autorecon.c:299
+#: plugins/autorecon.c:248
 msgid "Hide Login Errors"
 msgstr "Sakrij greške o prijavi"
 
-#: plugins/autorecon.c:303
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "Sakrij poruke o isključenju"
+#: plugins/autorecon.c:252
+msgid "Restore Away State On Reconnect"
+msgstr "Vrati zapamćeno stanje veze pri povezivanju"
 
 #. *< type
 #. *< ui_requirement
@@ -43,7 +42,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:327
+#: plugins/autorecon.c:276
 msgid "Auto-Reconnect"
 msgstr "Automatsko očuvanje veze"
 
@@ -51,10 +50,28 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:330 plugins/autorecon.c:332
+#: plugins/autorecon.c:279 plugins/autorecon.c:281
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Kada se veza prekine, automatski se ponovo uspostavlja."
 
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
+msgid "Mail Server"
+msgstr "Server za e-poštu"
+
+# bug: plural-forms
+#: plugins/chkmail.c:136
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr "%s (novih: %d/ukupno: %d)"
+
+#: plugins/chkmail.c:199
+msgid "Check Mail"
+msgstr "Proveri poštu"
+
+#: plugins/chkmail.c:203
+msgid "Check email every X seconds.\n"
+msgstr "Proveravaj e-poštu svakih N sekundi.\n"
+
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Vrednosti poena koji se koriste kada je..."
@@ -77,13 +94,12 @@
 
 #. Explanation
 #: plugins/contact_priority.c:141
-#, fuzzy
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
 msgstr ""
 "Drugar sa najmanjim rezultatom je drugar koji će imati prvenstvo za stupanje "
 "u vezu.\n"
@@ -92,8 +108,7 @@
 ">odsutan+miran->nepovezan."
 
 #: plugins/contact_priority.c:144
-#, fuzzy
-msgid "Point values to use for account..."
+msgid "Point values to use for Account..."
 msgstr "Vrednosti poena koji se koriste za nalog..."
 
 #. *< type
@@ -123,6 +138,103 @@
 "Dozvoljava izmenu vrednosti poena za mirna/odsutna/nepovezana stanja drugara "
 "pri računanju prvenstva kontakta."
 
+#: plugins/docklet/docklet.c:137 src/gtkaccount.c:751 src/gtkaccount.c:2179
+msgid "Auto-login"
+msgstr "Automatska prijava"
+
+#: plugins/docklet/docklet.c:140
+msgid "New Message..."
+msgstr "Nova poruka..."
+
+#: plugins/docklet/docklet.c:141
+msgid "Join A Chat..."
+msgstr "Priključi se razgovoru..."
+
+#: plugins/docklet/docklet.c:173
+msgid "New..."
+msgstr "Nova..."
+
+#: plugins/docklet/docklet.c:177 src/gtkprefs.c:1813 src/protocols/gg/gg.c:52
+#: src/protocols/irc/msgs.c:227 src/protocols/jabber/jabber.c:998
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
+#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
+#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
+#: src/protocols/oscar/oscar.c:684 src/protocols/oscar/oscar.c:5788
+#: src/protocols/oscar/oscar.c:6785 src/protocols/oscar/oscar.c:6985
+#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:81
+msgid "Away"
+msgstr "Odsutan"
+
+#. else...
+#: plugins/docklet/docklet.c:183 src/away.c:595
+#: src/protocols/oscar/oscar.c:5706 src/protocols/oscar/oscar.c:6993
+msgid "Back"
+msgstr "Nazad"
+
+#: plugins/docklet/docklet.c:191
+msgid "Mute Sounds"
+msgstr "Isključi zvuk"
+
+#: plugins/docklet/docklet.c:196 src/gtkft.c:659
+msgid "File Transfers"
+msgstr "Prenosi datoteka"
+
+#: plugins/docklet/docklet.c:197 src/gtkaccount.c:2391
+msgid "Accounts"
+msgstr "Nalozi"
+
+#: plugins/docklet/docklet.c:198 src/gtkprefs.c:2514
+msgid "Preferences"
+msgstr "Postavke"
+
+#: plugins/docklet/docklet.c:207
+msgid "Signoff"
+msgstr "Odjavi se"
+
+#: plugins/docklet/docklet.c:211
+msgid "Quit"
+msgstr "Izlaz"
+
+#: plugins/docklet/docklet.c:527
+msgid "Tray Icon Configuration"
+msgstr "Podešavanja ikonice na panelu"
+
+#: plugins/docklet/docklet.c:531
+msgid "_Hide new messages until tray icon is clicked"
+msgstr "_Prikrij nove poruke dok se ne klikne na ikonicu na panelu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:557
+msgid "System Tray Icon"
+msgstr "Ikonica na panelu"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:560
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "Prikazuje ikonicu za Gaim u obaveštajnoj zoni panela."
+
+#. *  description
+#: plugins/docklet/docklet.c:562
+msgid ""
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+msgstr ""
+"Sarađuje sa apletom za Obaveštajnu zonu panela (na primer u Gnomu, KDE-u ili "
+"Vindouzu) kako bi se prikazalo trenutno stanje Gaim-a, omogućio brži pristup "
+"često korišćenim funkcijama, i da se brzo prikaže ili sakrije prozor sa "
+"spiskom drugara ili za prijavu. Takođe, omogućava i odlaganje poruka dok se "
+"ne klikne na ikonicu, slično kao i ICQ."
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -138,93 +250,13 @@
 msgid "Gaim - Away"
 msgstr "Gaim — Odsutan"
 
-#: plugins/docklet/docklet.c:136
-msgid "New Message..."
-msgstr "Nova poruka..."
-
-#: plugins/docklet/docklet.c:137
-msgid "Join A Chat..."
-msgstr "Priključi se razgovoru..."
-
-#: plugins/docklet/docklet.c:172
-msgid "New..."
-msgstr "Nova..."
-
-#: plugins/docklet/docklet.c:176 src/gtkprefs.c:1757 src/gtkstatusbox.c:247
-#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:180
-#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1089
-#: src/protocols/jabber/jabber.c:1000 src/protocols/msn/msn.c:538
-#: src/protocols/novell/novell.c:2813 src/protocols/novell/novell.c:2951
-#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:698
-#: src/protocols/oscar/oscar.c:5868 src/protocols/oscar/oscar.c:6906
-#: src/protocols/oscar/oscar.c:7063 src/protocols/silc/buddy.c:1412
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3214
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:159
-msgid "Away"
-msgstr "Odsutan"
-
-#: plugins/docklet/docklet.c:184
-msgid "Back"
-msgstr "Nazad"
-
-#: plugins/docklet/docklet.c:191
-msgid "Mute Sounds"
-msgstr "Isključi zvuk"
-
-#: plugins/docklet/docklet.c:198 src/gtkft.c:694
-msgid "File Transfers"
-msgstr "Prenosi datoteka"
-
-#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2327
-msgid "Accounts"
-msgstr "Nalozi"
-
-#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2144
-msgid "Preferences"
-msgstr "Postavke"
-
-#: plugins/docklet/docklet.c:204
-msgid "Quit"
-msgstr "Izlaz"
-
-#: plugins/docklet/docklet.c:529
-msgid "Tray Icon Configuration"
-msgstr "Podešavanja ikonice na panelu"
-
-#: plugins/docklet/docklet.c:533
-msgid "_Hide new messages until tray icon is clicked"
-msgstr "_Prikrij nove poruke dok se ne klikne na ikonicu na panelu"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:559
-msgid "System Tray Icon"
-msgstr "Ikonica na panelu"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:562
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Prikazuje ikonicu za Gaim u obaveštajnoj zoni panela."
-
-#. *  description
-#: plugins/docklet/docklet.c:564
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"Sarađuje sa apletom za Obaveštajnu zonu panela (na primer u Gnomu, KDE-u ili "
-"Vindouzu) kako bi se prikazalo trenutno stanje Gaim-a, omogućio brži pristup "
-"često korišćenim funkcijama, i da se brzo prikaže ili sakrije prozor sa "
-"spiskom drugara ili za prijavu. Takođe, omogućava i odlaganje poruka dok se "
-"ne klikne na ikonicu, slično kao i ICQ."
+#: plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr "Usmerenje"
+
+#: plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr "Usmerenje fioke."
 
 #: plugins/extplacement.c:77
 msgid "By conversation count"
@@ -275,7 +307,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: plugins/filectl.c:224
 msgid "Gaim File Control"
 msgstr "Kontrola Gaim-a datotekom"
 
@@ -283,10 +315,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: plugins/filectl.c:227 plugins/filectl.c:229
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Omogućava Vam da upravljate Gaimom unosom naredbi u datoteku."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaiminc.c:90
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim dodatak za primer"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaiminc.c:93
+msgid "An example plugin that does stuff - see the description."
+msgstr "Primer dodatka koji radi neke stvari — videti opis."
+
+#. *  description
+#: plugins/gaiminc.c:95
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Ovo je zaista moćan dodatak koji radi dosta stvari:\n"
+"— Obaveštava Vas ko je napisao program kada se prijavite\n"
+"— Izvrće sav prispeli tekst\n"
+"— Šalje poruku ljudima iz vašeg spiska čim se oni prijave"
+
 #: plugins/gaim-remote/remote.c:91
 msgid "Not connected to AIM"
 msgstr "Nepovezan na AIM"
@@ -303,7 +365,7 @@
 msgid "Invalid AIM URI"
 msgstr "Neispravna AIM Internet adresa"
 
-#: plugins/gaim-remote/remote.c:750
+#: plugins/gaim-remote/remote.c:673
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -312,7 +374,7 @@
 "Ne mogu da dodelim %s za priključak:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:774
+#: plugins/gaim-remote/remote.c:697
 msgid "Unable to open socket"
 msgstr "Ne mogu da čitam soket"
 
@@ -322,19 +384,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:824
+#: plugins/gaim-remote/remote.c:747
 msgid "Remote Control"
 msgstr "Udaljeno upravljanje"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:827
+#: plugins/gaim-remote/remote.c:750
 msgid "Provides remote control for gaim applications."
 msgstr "Omogućava udaljeno upravljanje Gaim programima."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:829
+#: plugins/gaim-remote/remote.c:752
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -342,132 +404,21 @@
 "Omogućava Gaimu da se njime upravlja sa udaljenih mesta pomoću nezavisnih "
 "programa, ili pomoću gaim-remote alata."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim dodatak za primer"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Primer dodatka koji radi neke stvari — videti opis."
-
-#. *  description
-#: plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Ovo je zaista moćan dodatak koji radi dosta stvari:\n"
-"— Obaveštava Vas ko je napisao program kada se prijavite\n"
-"— Izvrće sav prispeli tekst\n"
-"— Šalje poruku ljudima iz vašeg spiska čim se oni prijave"
-
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:42
-#, fuzzy
-msgid "Hyperlink Color"
-msgstr "Boja nad-veze"
-
-#: plugins/gaimrc.c:53
-#, fuzzy
-msgid "GtkTreeView Expander Size"
-msgstr "Veličina proširivača"
-
-#: plugins/gaimrc.c:72
-#, fuzzy
-msgid "Conversation Entry"
-msgstr "Razgovori"
-
-#: plugins/gaimrc.c:73
-#, fuzzy
-msgid "Conversation History"
-msgstr "Razgovori"
-
-#: plugins/gaimrc.c:74
-#, fuzzy
-msgid "Log Viewer"
-msgstr "Server za prijavu"
-
-#: plugins/gaimrc.c:75
-#, fuzzy
-msgid "Request Dialog"
-msgstr "Zahtev je dvosmislen"
-
-#: plugins/gaimrc.c:76
-#, fuzzy
-msgid "Notify Dialog"
-msgstr "Obaveštavaj o"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
-msgid "Select Color for %s"
-msgstr "Izaberite boju teksta"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
-msgid "Select Color"
-msgstr "Izaberite boju teksta"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
-msgid "Select Font for %s"
-msgstr "Izaberite pismo"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
-msgid "Select Interface Font"
-msgstr "Izaberite pismo"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
-msgid "GTK+ Interface Font"
-msgstr "Postavke sučelja"
-
-#: plugins/gaimrc.c:362
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: plugins/gaimrc.c:460
-#, fuzzy
-msgid "Gaim GTK+ Theme Control"
-msgstr "Kontrola Gaim-a datotekom"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
-
 #. Configuration frame
-#: plugins/gestures/gestures.c:241
+#: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
 msgstr "Podešavanje ponašanja miša"
 
-#: plugins/gestures/gestures.c:248
+#: plugins/gestures/gestures.c:228
 msgid "Middle mouse button"
 msgstr "Srednje dugme miša"
 
-#: plugins/gestures/gestures.c:253
+#: plugins/gestures/gestures.c:233
 msgid "Right mouse button"
 msgstr "Desno dugme miša"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:265
+#: plugins/gestures/gestures.c:245
 msgid "_Visual gesture display"
 msgstr "_Vizuelni prikaz ponašanja miša"
 
@@ -477,19 +428,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:294
+#: plugins/gestures/gestures.c:274
 msgid "Mouse Gestures"
 msgstr "Ponašanje miša"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:297
+#: plugins/gestures/gestures.c:277
 msgid "Provides support for mouse gestures"
 msgstr "Omogućava podršku za praćenje ponašanja miša"
 
 #. *  description
-#: plugins/gestures/gestures.c:299
+#: plugins/gestures/gestures.c:279
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -506,9 +457,9 @@
 "Povucite gore i onda na desno da pređete na sledeći razgovor."
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2003
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:613
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2168
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:609
+#: src/protocols/msn/msn.c:1474 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Ime"
 
@@ -517,30 +468,30 @@
 msgstr "Brze poruke"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:459
+#: plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Izaberite osobu iz adresara, ili dodajte unos za novu osobu."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:472
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7427
+#: plugins/gevolution/add_buddy_dialog.c:468
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7269
 msgid "Search"
 msgstr "Traži"
 
-#: plugins/gevolution/add_buddy_dialog.c:553
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4400
-#: src/gtkblist.c:4777
+#: plugins/gevolution/add_buddy_dialog.c:549
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4186
+#: src/gtkblist.c:4534
 msgid "Group:"
 msgstr "Grupa:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:579
+#: plugins/gevolution/add_buddy_dialog.c:575
 #: plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "Nova osoba"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:596
+#: plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Izaberi drugara"
 
@@ -567,45 +518,33 @@
 msgid "_Associate Buddy"
 msgstr "Pridruži drugara"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1242 src/blist.c:1458 src/gtkblist.c:4217
-#: src/protocols/jabber/roster.c:66
+#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
+#: src/gtkblist.c:3122 src/gtkprefs.c:962 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1827 src/protocols/jabber/jabber.c:949
+msgid "None"
+msgstr "Ništa"
+
+#: plugins/gevolution/gevolution.c:93 plugins/gevolution/gevo-util.c:64
+#: src/blist.c:776 src/blist.c:983 src/blist.c:1933 src/gtkblist.c:4001
+#: src/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "Drugari"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
-msgid "Unable to send e-mail"
-msgstr "Ne mogu da pošaljem poruku."
-
-#: plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+#: plugins/gevolution/gevolution.c:225
 msgid "Add to Address Book"
 msgstr "Dodaj u adresar"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
-msgid "Send E-Mail"
-msgstr "E-pošta"
-
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:348
 msgid "Evolution Integration Configuration"
 msgstr "Podešavanje saradnje sa Evolucijom"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:351
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Odredite naloge u koje se drugari automatski dodaju."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:52 src/gtkconn.c:431
+#: plugins/gevolution/gevolution.c:381 plugins/idle.c:52 src/gtkconn.c:627
 msgid "Account"
 msgstr "Nalog"
 
@@ -615,7 +554,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:464
 msgid "Evolution Integration"
 msgstr "Saradnja sa Evolucijom"
 
@@ -623,87 +562,90 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
-msgid "Provides integration with Evolution."
+#: plugins/gevolution/gevolution.c:467 plugins/gevolution/gevolution.c:469
+msgid "Provides integration with Ximian Evolution."
 msgstr "Omogućava uzajamnu vezu sa programom Gzimijan evolucija."
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: plugins/gevolution/new_person_dialog.c:264
 msgid "Please enter the person's information below."
 msgstr "Molim unesite podatke o korisniku"
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Unesite nadimak drugara i tip naloga ispod."
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: plugins/gevolution/new_person_dialog.c:288
 msgid "Account type:"
 msgstr "Vrsta naloga:"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Screenname:"
 msgstr "Ime:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
 msgstr "Dodatni podaci"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:395
-#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:604
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
+#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:590
 msgid "Buddy Icon"
 msgstr "Sličica drugara"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr "Ime"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr "Prezime:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr "E-pošta"
 
-#: plugins/history.c:137
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:138
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:177
-msgid "History"
-msgstr "Istorijat"
-
-#: plugins/history.c:179
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Prikazuje poslednje zabeležene razgovore među novim razgovorima."
-
-#: plugins/history.c:180
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:106
+#: plugins/gtk-signals-test.c:102
+msgid "GTK Signals Test"
+msgstr "Proba Gtk signala"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
+msgid "Test to see that all ui signals are working properly."
+msgstr "Proverava da li svi signali sučelja ispravno rade."
+
+#: plugins/history.c:92
+msgid "History"
+msgstr "Istorijat"
+
+#: plugins/history.c:94
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Prikazuje poslednje zabeležene razgovore među novim razgovorima."
+
+#: plugins/history.c:95
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Kada se pokrene novi razgovor, ovaj dodatak će ubaciti poslednji razgovor u "
+"tekući."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/iconaway.c:104
 msgid "Iconify on Away"
 msgstr "Umanji pri odsutnosti"
 
@@ -711,7 +653,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:109 plugins/iconaway.c:111
+#: plugins/iconaway.c:107 plugins/iconaway.c:109
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Umanjuje spisak drugara i Vaše razgovore kada ste odsutni."
 
@@ -719,7 +661,7 @@
 msgid "Minutes"
 msgstr "minuta."
 
-#: plugins/idle.c:63 plugins/idle.c:97
+#: plugins/idle.c:63 plugins/idle.c:98
 msgid "I'dle Mak'er"
 msgstr "Kontrolor neaktivnosti"
 
@@ -731,11 +673,11 @@
 msgid "_Set"
 msgstr "_Postavi"
 
-#: plugins/idle.c:68
+#: plugins/idle.c:68 src/away.c:922
 msgid "_Cancel"
 msgstr "Otkaži"
 
-#: plugins/idle.c:99 plugins/idle.c:100
+#: plugins/idle.c:100 plugins/idle.c:101
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Omogućava Vam da odredite koliko dugo traje period neaktivnosti"
 
@@ -802,74 +744,68 @@
 msgstr "Dodaje kutijicu u spisak drugara koja pokazuje da li imate novu poštu."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:642
+#: plugins/notify.c:614
 msgid "Notify For"
 msgstr "Obaveštavaj o"
 
-#: plugins/notify.c:646
+#: plugins/notify.c:618
 msgid "_IM windows"
 msgstr "_brzim porukama"
 
-#: plugins/notify.c:653
+#: plugins/notify.c:625
 msgid "C_hat windows"
 msgstr "Prozori _razgovora"
 
-#: plugins/notify.c:660
+#: plugins/notify.c:632
 msgid "_Focused windows"
 msgstr "_Fokusirani prozori"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:668
+#: plugins/notify.c:640
 msgid "Notification Methods"
 msgstr "Načini obaveštavanja"
 
-#: plugins/notify.c:675
+#: plugins/notify.c:647
 msgid "Prepend _string into window title:"
 msgstr "Dodavanje _teksta u naslov prozora:"
 
 #. Count method button
-#: plugins/notify.c:694
+#: plugins/notify.c:666
 msgid "Insert c_ount of new messages into window title"
 msgstr "Ubaci _broj novih poruka u naslov prozora"
 
 #. Urgent method button
-#: plugins/notify.c:702
+#: plugins/notify.c:674
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Pošalji nagoveštaj „_Hitno“ upravniku prozora"
 
-#. Raise window method button
-#: plugins/notify.c:710
-#, fuzzy
-msgid "R_aise conversation window"
-msgstr "Prozor razgovora"
-
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:718
+#: plugins/notify.c:682
 msgid "Notification Removal"
 msgstr "Uklanjanje obaveštenja"
 
 #. Remove on focus button
-#: plugins/notify.c:723
+#: plugins/notify.c:687
 msgid "Remove when conversation window _gains focus"
 msgstr "Ukloni kada prozor razgovora bude _fokusiran"
 
 #. Remove on click button
-#: plugins/notify.c:730
+#: plugins/notify.c:694
 msgid "Remove when conversation window _receives click"
 msgstr "Ukloni po k_liku na prozor razgovora"
 
 #. Remove on type button
-#: plugins/notify.c:738
+#: plugins/notify.c:702
 msgid "Remove when _typing in conversation window"
 msgstr "Ukloni pri _kucanju u prozoru razgovora"
 
 #. Remove on message send button
-#: plugins/notify.c:746
+#: plugins/notify.c:710
 msgid "Remove when a _message gets sent"
 msgstr "Ukloni kada se _poruka pošalje"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:755
+#: plugins/notify.c:719
 msgid "Remove on switch to conversation ta_b"
 msgstr "Ukloni po _izmeni lista razgovora"
 
@@ -879,7 +815,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:845
+#: plugins/notify.c:809
 msgid "Message Notification"
 msgstr "Obaveštenje o porukama"
 
@@ -887,7 +823,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:848 plugins/notify.c:850
+#: plugins/notify.c:812 plugins/notify.c:814
 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."
 
@@ -897,14 +833,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:567
+#: plugins/perl/perl.c:535
 msgid "Perl Plugin Loader"
 msgstr "Upravnik za učitavanje Perl dodataka"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:569 plugins/perl/perl.c:570
+#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
 msgid "Provides support for loading perl plugins."
 msgstr "Omogućava podršku za učitavanje Perl dodataka."
 
@@ -984,7 +920,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:626
+#: plugins/signals-test.c:601
 msgid "Signals Test"
 msgstr "Proba signala"
 
@@ -992,7 +928,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:629 plugins/signals-test.c:631
+#: plugins/signals-test.c:604 plugins/signals-test.c:606
 msgid "Test to see that all signals are working properly."
 msgstr "Proverava da li svi signali ispravno rade."
 
@@ -1014,43 +950,35 @@
 msgid "Tests to see that most things are working."
 msgstr "Proverava da li većina stvari radi."
 
-#: plugins/spellchk.c:1680
-msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1681
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1826
+#: plugins/spellchk.c:416
 msgid "Text Replacements"
 msgstr "Zamena teksta"
 
-#: plugins/spellchk.c:1850
+#: plugins/spellchk.c:440
 msgid "You type"
 msgstr "Vi otkucate"
 
-#: plugins/spellchk.c:1862
+#: plugins/spellchk.c:452
 msgid "You send"
 msgstr "Pošalje se"
 
-#: plugins/spellchk.c:1888
+#: plugins/spellchk.c:478
 msgid "Add a new text replacement"
 msgstr "Dodavanje nove zamene teksta"
 
-#: plugins/spellchk.c:1895
+#: plugins/spellchk.c:485
 msgid "You _type:"
 msgstr "Vi _otkucate:"
 
-#: plugins/spellchk.c:1909
+#: plugins/spellchk.c:499
 msgid "You _send:"
 msgstr "_Pošalje se:"
 
-#: plugins/spellchk.c:1951
+#: plugins/spellchk.c:541
 msgid "Text replacement"
 msgstr "Zamena teksta"
 
-#: plugins/spellchk.c:1953 plugins/spellchk.c:1954
+#: plugins/spellchk.c:543 plugins/spellchk.c:544
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Zamenjuje tekst u odlazećim porukama prema korisničkim pravilima."
 
@@ -1060,42 +988,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
-msgid "Provides SSL support through GNUTLS."
-msgstr "Obezbeđuje SSL podršku kroz GNUTLS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-nss.c:319
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Obezbeđuje SSL podršku kroz Mozilin NSS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
 #: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
@@ -1108,35 +1000,71 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Obezbeđuje okvir oko biblioteka za SSL podršku."
 
-#: plugins/statenotify.c:42
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:226
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
+msgid "Provides SSL support through GNUTLS."
+msgstr "Obezbeđuje SSL podršku kroz GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:318
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Obezbeđuje SSL podršku kroz Mozilin NSS."
+
+#: plugins/statenotify.c:41
 #, c-format
 msgid "%s has gone away."
 msgstr "%s je odišao(la) na odsustvo."
 
-#: plugins/statenotify.c:49
+#: plugins/statenotify.c:48
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s više nije na odsustvu."
 
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:55
 #, c-format
 msgid "%s has become idle."
 msgstr "%s se uspavao(la)."
 
-#: plugins/statenotify.c:63
+#: plugins/statenotify.c:62
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s više nije neaktivan."
 
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:73
 msgid "Notify When"
 msgstr "Obaveštavaj o"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:76
 msgid "Buddy Goes _Away"
 msgstr "Drugar odsutan:"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:79
 msgid "Buddy Goes _Idle"
 msgstr "Drugar miran:"
 
@@ -1146,7 +1074,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:119
 msgid "Buddy State Notification"
 msgstr "Obaveštenja o stanju drugara"
 
@@ -1154,7 +1082,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: plugins/statenotify.c:122 plugins/statenotify.c:125
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1188,19 +1116,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodoravna varijanta spiska drugara."
 
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "Vremenska oznaka razgovora"
 
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:193
 msgid "Delay"
 msgstr "Odlaganje"
 
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:200
 msgid "minutes."
 msgstr "minuta."
 
-#: plugins/timestamp.c:222
+#: plugins/timestamp.c:206
 msgid "_Apply"
 msgstr "_Primeni"
 
@@ -1210,7 +1138,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:287
+#: plugins/timestamp.c:271
 msgid "Timestamp"
 msgstr "Vremenska oznaka"
 
@@ -1218,7 +1146,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:290 plugins/timestamp.c:292
+#: plugins/timestamp.c:274 plugins/timestamp.c:276
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 "Dodavanje vremenske oznake u razgovor na svakih N minuta, u iČet stilu."
@@ -1243,7 +1171,7 @@
 msgstr "Prikaži _klizač u prozoru razgovora"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:430
+#: plugins/win32/transparency/win2ktrans.c:430 src/gtkprefs.c:956
 msgid "Buddy List Window"
 msgstr "Prozor sa spiskom drugara"
 
@@ -1280,210 +1208,225 @@
 "\n"
 "Napomena: Ovaj dodatak zahteva Vindous 2000 ili IksPe."
 
-#: plugins/win32/winprefs/winprefs.c:401
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
-msgstr "GTK+ biblioteka izdanje"
+msgstr "Gtk+ biblioteka izdanje"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:409
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "Pokretanje"
 
-#: plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "_Pokreni Gaim pri pokretanju Vindousa."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:421 src/gtkblist.c:3514
-#: src/gtkprefs.c:2099
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3167
+#: src/gtkprefs.c:2421
 msgid "Buddy List"
 msgstr "Spisak drugara"
 
-#: plugins/win32/winprefs/winprefs.c:422
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "_Lepljivi spisak drugara"
 
+#. Docked Blist On Top
+#: plugins/win32/winprefs/winprefs.c:367
+msgid "Docked _Buddy List is always on top"
+msgstr "Održavaj _lepljivi prozor sa spiskom drugara na vrhu"
+
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:426
-#, fuzzy
-msgid "_Keep Buddy List window on top:"
+#: plugins/win32/winprefs/winprefs.c:377
+msgid "_Keep Buddy List window on top"
 msgstr "_Održavaj prozor sa spiskom drugara na vrhu"
 
-#: plugins/win32/winprefs/winprefs.c:428 src/gtkprefs.c:1763
-msgid "Never"
-msgstr "Nikada"
-
-#: plugins/win32/winprefs/winprefs.c:429
-#, fuzzy
-msgid "Always"
-msgstr "Odsutan"
-
-#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:431
-msgid "Only when docked"
-msgstr ""
-
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:435 src/gtkprefs.c:883
-#: src/gtkprefs.c:2100
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
+#: src/gtkprefs.c:2422 src/protocols/msn/msn.c:1811
 msgid "Conversations"
 msgstr "Razgovori"
 
-#: plugins/win32/winprefs/winprefs.c:436
-#, fuzzy
-msgid "_Flash window when messages are received"
+#: plugins/win32/winprefs/winprefs.c:383
+msgid "_Flash Window when messages are received"
 msgstr "_Izdigni prozor kada pristigne nova poruka"
 
-#: plugins/win32/winprefs/winprefs.c:459
+#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "Postavke Vindous Gaima"
 
-#: plugins/win32/winprefs/winprefs.c:461
+#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr "Postavke svojstvene za Vindous Gaim."
 
-#: plugins/win32/winprefs/winprefs.c:462
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-#, fuzzy
-msgid "accounts"
-msgstr "Nalozi"
-
-#: src/account.c:913
-#, fuzzy
-msgid "Password is required to sign on."
-msgstr "Lozinka je istekla"
-
-#: src/account.c:939
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Unesite lozinku za %s (%s)"
-
-#: src/account.c:946
-#, fuzzy
-msgid "Enter Password"
-msgstr "Promena lozinke"
-
-#: src/account.c:951
-#, fuzzy
-msgid "Save password"
+#: src/account.c:298 src/protocols/jabber/jabber.c:1039
+msgid "New passwords do not match."
+msgstr "Nove lozinke se ne poklapaju."
+
+#: src/account.c:307
+msgid "Fill out all fields completely."
+msgstr "Popunite sva polja u potpunosti."
+
+#: src/account.c:332
+msgid "Original password"
+msgstr "Stara lozinka"
+
+#: src/account.c:339
+msgid "New password"
 msgstr "Nova lozinka"
 
+#: src/account.c:346
+msgid "New password (again)"
+msgstr "Nova lozinka (ponovite)"
+
+#: src/account.c:352
+#, c-format
+msgid "Change password for %s"
+msgstr "Izmena lozinke za %s"
+
+#: src/account.c:360
+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:959 src/account.c:1111 src/gtkdialogs.c:504
-#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
-#: src/protocols/jabber/jabber.c:1103 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
-#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:3774
-#: src/protocols/oscar/oscar.c:3855 src/protocols/oscar/oscar.c:7156
-#: src/protocols/oscar/oscar.c:7281 src/protocols/oscar/oscar.c:7306
-#: src/protocols/oscar/oscar.c:7358 src/protocols/silc/buddy.c:460
-#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1700
-#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2931 src/request.h:1266
+#: src/account.c:363 src/connection.c:198 src/gtkblist.c:2492
+#: src/gtkdialogs.c:505 src/gtkdialogs.c:647 src/gtkdialogs.c:701
+#: src/gtkrequest.c:243 src/protocols/jabber/jabber.c:1086
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:3686 src/protocols/oscar/oscar.c:3780
+#: src/protocols/oscar/oscar.c:7056 src/protocols/oscar/oscar.c:7148
+#: src/protocols/oscar/oscar.c:7200 src/protocols/oscar/oscar.c:7286
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1699 src/protocols/silc/silc.c:711
+#: src/protocols/yahoo/yahoo.c:2938 src/protocols/yahoo/yahoo.c:2947
+#: src/request.h:1245
 msgid "OK"
 msgstr "U redu"
 
-#: src/account.c:960 src/account.c:1112 src/account.c:1150
-#: src/gtkaccount.c:2012 src/gtkaccount.c:2491 src/gtkblist.c:4815
-#: src/gtkdialogs.c:505 src/gtkdialogs.c:648 src/gtkdialogs.c:704
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
-#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:413 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:569 src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:1104
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
-#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
-#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1594 src/protocols/oscar/oscar.c:2477
-#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3775
-#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:3856
-#: src/protocols/oscar/oscar.c:7157 src/protocols/oscar/oscar.c:7282
-#: src/protocols/oscar/oscar.c:7307 src/protocols/oscar/oscar.c:7359
-#: src/protocols/oscar/oscar.c:7428 src/protocols/silc/buddy.c:461
-#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1701 src/protocols/silc/silc.c:726
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2923
-#: src/protocols/yahoo/yahoo.c:2932 src/request.h:1266 src/request.h:1276
+#: src/account.c:364 src/account.c:402 src/away.c:367 src/connection.c:199
+#: src/gtkaccount.c:2029 src/gtkaccount.c:2568 src/gtkaccount.c:2599
+#: src/gtkblist.c:2493 src/gtkblist.c:4572 src/gtkconn.c:169
+#: src/gtkdialogs.c:506 src/gtkdialogs.c:648 src/gtkdialogs.c:702
+#: src/gtkdialogs.c:800 src/gtkdialogs.c:822 src/gtkdialogs.c:842
+#: src/gtkdialogs.c:879 src/gtkdialogs.c:939 src/gtkdialogs.c:982
+#: src/gtkdialogs.c:1023 src/gtkimhtmltoolbar.c:437 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:610 src/gtkprivacy.c:635 src/gtkprivacy.c:646
+#: src/gtkrequest.c:244 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:754
+#: src/protocols/jabber/jabber.c:678 src/protocols/jabber/jabber.c:1087
+#: src/protocols/jabber/presence.c:213 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1534
+#: src/protocols/oscar/oscar.c:2414 src/protocols/oscar/oscar.c:3644
+#: src/protocols/oscar/oscar.c:3687 src/protocols/oscar/oscar.c:3724
+#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7149 src/protocols/oscar/oscar.c:7201
+#: src/protocols/oscar/oscar.c:7270 src/protocols/oscar/oscar.c:7287
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
+#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1700
+#: src/protocols/silc/silc.c:712 src/protocols/trepia/trepia.c:348
+#: src/protocols/yahoo/yahoo.c:2939 src/protocols/yahoo/yahoo.c:2948
+#: src/request.h:1245 src/request.h:1255
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: src/account.c:982 src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Nedostaje dodatak za protokol %s"
-
-#: src/account.c:984 src/connection.c:99
-msgid "Connection Error"
-msgstr "Greška pri povezivanju"
-
-#: src/account.c:1046 src/protocols/jabber/jabber.c:1056
-msgid "New passwords do not match."
-msgstr "Nove lozinke se ne poklapaju."
-
-#: src/account.c:1055
-msgid "Fill out all fields completely."
-msgstr "Popunite sva polja u potpunosti."
-
-#: src/account.c:1080
-msgid "Original password"
-msgstr "Stara lozinka"
-
-#: src/account.c:1087
-msgid "New password"
-msgstr "Nova lozinka"
-
-#: src/account.c:1094
-msgid "New password (again)"
-msgstr "Nova lozinka (ponovite)"
-
-#: src/account.c:1100
-#, c-format
-msgid "Change password for %s"
-msgstr "Izmena lozinke za %s"
-
-#: src/account.c:1108
-msgid "Please enter your current password and your new password."
-msgstr "Unesite tekuću lozinku i novu lozinku."
-
-#: src/account.c:1141
+#: src/account.c:393
 #, c-format
 msgid "Change user information for %s"
 msgstr "Izmeni podatke o korisniku za %s"
 
-#: src/account.c:1149 src/gtkdebug.c:669 src/gtkrequest.c:267
-#: src/protocols/jabber/buddy.c:568 src/protocols/trepia/trepia.c:347
+#: src/account.c:401 src/gtkrequest.c:250 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Sačuvaj"
 
-#: src/account.c:1605 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
-#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/buddy.c:1096
-#: src/protocols/novell/novell.c:2825
+#: src/account.c:760 src/gtkft.c:159 src/protocols/jabber/buddy.c:573
+#: src/protocols/novell/novell.c:2812
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/blist.c:545
-#, fuzzy
-msgid "buddy list"
-msgstr "Spisak drugara"
-
-#: src/blist.c:1145
+#: src/away.c:233
+msgid "Away!"
+msgstr "Odsutan!"
+
+#: src/away.c:303
+msgid "Edit This Message"
+msgstr "Uredi ovu poruku"
+
+#: src/away.c:308
+msgid "I'm Back!"
+msgstr "Vratio sam se!"
+
+#: src/away.c:362
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Da li ste sigurni da želite da uklonite poruku „%s‟?"
+
+#: src/away.c:364 src/away.c:442
+msgid "Remove Away Message"
+msgstr "Ukloni poruku za odsustvo"
+
+#. Remove button
+#: src/away.c:366 src/gtkconv.c:1520 src/gtkconv.c:3902 src/gtkconv.c:3973
+#: src/gtkrequest.c:249
+msgid "Remove"
+msgstr "Ukloni"
+
+#: src/away.c:436
+msgid "New Away Message"
+msgstr "Nova poruka za odsustvo"
+
+#: src/away.c:663
+msgid "Set All Away"
+msgstr "Postavi odsustvo za sve"
+
+#: src/away.c:770
+msgid "You cannot save an away message with a blank title"
+msgstr "Ne možete snimiti poruku za odsustvo bez naslova"
+
+#: src/away.c:772
+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/away.c:782
+msgid "You cannot create an empty away message"
+msgstr "Ne možete napraviti praznu poruku za odsustvo"
+
+#: src/away.c:847
+msgid "New away message"
+msgstr "Nova poruka za odsustvo"
+
+#: src/away.c:862
+msgid "Away title: "
+msgstr "Naslov odsustva: "
+
+#: src/away.c:910
+msgid "_Save"
+msgstr "Sačuvaj"
+
+#: src/away.c:914
+msgid "Sa_ve & Use"
+msgstr "Sačuvaj i koristi"
+
+#: src/away.c:918
+msgid "_Use"
+msgstr "Koristi"
+
+#: src/blist.c:682
 msgid "Chats"
 msgstr "Razgovori"
 
-#: src/blist.c:1835
+#: src/blist.c:1354
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1501,95 +1444,120 @@
 "%d drugara iz grupe %s nije uklonjeno pošto njihovi nalozi nisu prijavljeni. "
 "Ovi drugari i njihova grupa nisu uklonjeni.\n"
 
-#: src/blist.c:1844
+#: src/blist.c:1363
 msgid "Group not removed"
 msgstr "Grupa nije uklonjena"
 
-#: src/connection.c:98
+#: src/blist.c:2066
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+"Došlo je do greške pri obradi spiska drugara. Spisak nije učitan a stari "
+"spisak je pomeren u blist.xml~."
+
+#: src/blist.c:2069
+msgid "Buddy List Error"
+msgstr "Greška u spisku drugara"
+
+#: src/connection.c:118 src/connection.c:169
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Nedostaje dodatak za protokol %s"
+
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "Greška pri registraciji"
 
-#: src/conversation.c:237
-#, fuzzy
-msgid "Unable to send message: The message is too large."
+#: src/connection.c:174
+msgid "Connection Error"
+msgstr "Greška pri povezivanju"
+
+#: src/connection.c:195
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Unesite lozinku za %s (%s)"
+
+#: src/conversation.c:233
+msgid "Unable to send message. The message is too large."
 msgstr "Ne mogu da pošaljem poruku. Poruka je prevelika."
 
-#: src/conversation.c:240 src/conversation.c:253
-#, fuzzy, c-format
-msgid "Unable to send message to %s."
+#: src/conversation.c:237 src/conversation.c:251
+#: src/protocols/oscar/oscar.c:4247
+#, c-format
+msgid "Unable to send message to %s:"
 msgstr "Ne mogu da pošaljem poruku za %s:"
 
-#: src/conversation.c:241
-#, fuzzy
+#: src/conversation.c:239
 msgid "The message is too large."
-msgstr "Poruka za odsustvo je predugačka."
-
-#: src/conversation.c:250
+msgstr "Poruka je predugačka."
+
+#: src/conversation.c:248
 msgid "Unable to send message."
 msgstr "Ne mogu da pošaljem poruku."
 
-#: src/conversation.c:1962
+#: src/conversation.c:2070
 #, c-format
 msgid "%s entered the room."
 msgstr "%s je ušao(la) u pričaonicu."
 
-#: src/conversation.c:1965
+#: src/conversation.c:2073
 #, 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:2062
+#: src/conversation.c:2171
 #, c-format
 msgid "You are now known as %s"
 msgstr "Promenili ste ime u %s"
 
-#: src/conversation.c:2065
+#: src/conversation.c:2174
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je promenio(la) ime u %s"
 
-#: src/conversation.c:2107
+#: src/conversation.c:2216
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s je napustio(la) pričaonicu (%s)."
 
-#: src/conversation.c:2109
+#: src/conversation.c:2218
 #, c-format
 msgid "%s left the room."
 msgstr "%s je napustio(la) pričaonicu."
 
 # bug: plural-forms
-#: src/conversation.c:2186
+#: src/conversation.c:2291
 #, c-format
 msgid "(+%d more)"
-msgstr "(+%d poruka)"
-
-#: src/conversation.c:2188
+msgstr "(preostalo +%d)"
+
+#: src/conversation.c:2293
 #, c-format
 msgid " left the room (%s)."
-msgstr "napusti pričaonicu (%s)."
-
-#: src/conversation.c:2596
+msgstr " napusti pričaonicu (%s)."
+
+#: src/conversation.c:2698
 msgid "Last created window"
 msgstr "Poslednje napravljeni prozor"
 
-#: src/conversation.c:2598
+#: src/conversation.c:2700
 msgid "Separate IM and Chat windows"
 msgstr "Razdvoj prozore sa brzim porukama i razgovorima"
 
-#: src/conversation.c:2600 src/gtkprefs.c:1279
+#: src/conversation.c:2702 src/gtkprefs.c:1387
 msgid "New window"
 msgstr "Novi prozor"
 
-#: src/conversation.c:2602
+#: src/conversation.c:2704
 msgid "By group"
 msgstr "Prema grupi"
 
-#: src/conversation.c:2604
+#: src/conversation.c:2706
 msgid "By account"
 msgstr "Prema nalogu"
 
-#: src/ft.c:150 src/protocols/msn/msn.c:369
+#: src/ft.c:148 src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1598,7 +1566,7 @@
 "Greška pri čitanju %s: \n"
 "%s.\n"
 
-#: src/ft.c:154
+#: src/ft.c:152
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1607,7 +1575,7 @@
 "Greška pri upisu %s: \n"
 "%s.\n"
 
-#: src/ft.c:158
+#: src/ft.c:156
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1616,35 +1584,35 @@
 "Greška pri pristupu %s: \n"
 "%s.\n"
 
-#: src/ft.c:191
+#: src/ft.c:189
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ne mogu da pošaljem datoteku od 0 bajtova."
 
-#: src/ft.c:201
+#: src/ft.c:199
 msgid "Cannot send a directory."
 msgstr "Ne mogu da pošaljem direktorijum."
 
-#: src/ft.c:210
+#: src/ft.c:208
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nije obična datoteka i zato je GAIM neće prepisivati.\n"
 
-#: src/ft.c:268
+#: src/ft.c:265
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s želi da Vam pošalje %s (%s)"
 
-#: src/ft.c:275
-#, fuzzy, c-format
+#: src/ft.c:273
+#, c-format
 msgid "%s wants to send you a file"
-msgstr "%s želi da Vam pošalje %s (%s)"
-
-#: src/ft.c:316
+msgstr "%s želi da vam pošalje datoteku"
+
+#: src/ft.c:311
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Da li da prihvatim zahtev za prenos datoteke od drugara %s?"
 
-#: src/ft.c:320
+#: src/ft.c:315
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1655,87 +1623,80 @@
 "računara: %s\n"
 "na portu: %d"
 
-#: src/ft.c:344
+#: src/ft.c:338
 #, fuzzy, c-format
 msgid "%s is offering to send file %s"
-msgstr "Ne mogu da pošaljem poruku za %s:"
-
-#: src/ft.c:384
+msgstr "Ponuda slanja %s za %s"
+
+#: src/ft.c:374
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s nije ispravan naziv datoteke.\n"
 
-#: src/ft.c:405
-#, fuzzy, c-format
+#: src/ft.c:395
+#, c-format
 msgid "Offering to send %s to %s"
-msgstr "Ne mogu da pošaljem poruku za %s:"
-
-#: src/ft.c:416
-#, fuzzy, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Postavljam podatke u imeniku za %s:"
-
-#: src/ft.c:570
-#, fuzzy, c-format
+msgstr "Ponuda slanja %s za %s"
+
+#: src/ft.c:890
+#, c-format
 msgid "Transfer of file %s complete"
-msgstr "Prenos datoteke do %s prekinut.\n"
-
-#: src/ft.c:573
-#, fuzzy
+msgstr "Prenos datoteke %s završen"
+
+#: src/ft.c:893
 msgid "File transfer complete"
-msgstr "Domaćin za prenos datoteka"
-
-#: src/ft.c:957
-#, fuzzy, c-format
+msgstr "Prenos datoteke završen"
+
+#: src/ft.c:942
+#, c-format
 msgid "You canceled the transfer of %s"
-msgstr "%s je obustavio prenos za: %s"
-
-#: src/ft.c:962
-#, fuzzy
+msgstr "Obustavili ste prenos %s"
+
+#: src/ft.c:948
 msgid "File transfer cancelled"
-msgstr "Prenos datoteke je već počeo"
-
-#: src/ft.c:1019
+msgstr "Obustavljen je prenos"
+
+#: src/ft.c:1001
 #, c-format
 msgid "%s canceled the transfer of %s"
-msgstr "%s je obustavio prenos za: %s"
-
-#: src/ft.c:1024
-#, fuzzy, c-format
+msgstr "%s obustavi prenos %s"
+
+#: src/ft.c:1007
+#, c-format
 msgid "%s canceled the file transfer"
-msgstr "%s je obustavio prenos za: %s"
-
-#: src/ft.c:1081
-#, fuzzy, c-format
-msgid "File transfer to %s failed."
+msgstr "%s obustavi prenos datoteke"
+
+#: src/ft.c:1056
+#, c-format
+msgid "File transfer to %s aborted.\n"
 msgstr "Prenos datoteke do %s prekinut.\n"
 
-#: src/ft.c:1083
-#, fuzzy, c-format
-msgid "File transfer from %s failed."
+#: src/ft.c:1058
+#, c-format
+msgid "File transfer from %s aborted.\n"
 msgstr "Prenos datoteke od %s prekinut.\n"
 
-#: src/gaim-remote.c:104
-#, fuzzy, c-format
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr "Veličina proširivača"
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr "Veličina strelice proširivača"
+
+#: src/gaim-remote.c:108
+#, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
-"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -m, --message=MESG       Message to send or show in conversation "
-"window\n"
-"       -t, --to=SCREENNAME      Select a target for command\n"
-"       -p, --protocol=PROTO     Specify protocol to use\n"
-"       -f, --from=SCREENNAME    Specify screen name to use\n"
-"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
 "Upotreba: %s naredba [IZBORI] [URI]\n"
@@ -1748,22 +1709,15 @@
 "    IZBORI:\n"
 "       -h, --help [naredba]     Prikaži pomoć za naredbu\n"
 
-#: src/gaim-remote.c:195
-#, fuzzy, c-format
-msgid ""
-"Gaim not running (on session %d)\n"
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
 "Gaim nije pokrenut (u sesiji 0)\n"
 "Da li je pokrenut „daljinski upravljač‟?\n"
 
-#: src/gaim-remote.c:282
-msgid ""
-"Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-"greater than 9999 chars\n"
-msgstr ""
-
-#: src/gaim-remote.c:293
+#: src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1806,14 +1760,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Pingvin'\n"
 "Bićete upitani da dodate „Pingvina“ u Vaš spisak drugara.\n"
 
-#: src/gaim-remote.c:313
-#, fuzzy
-msgid ""
-"\n"
-"Log out all accounts\n"
-msgstr "Beleži sve _razgovore"
-
-#: src/gaim-remote.c:317
+#: src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1821,7 +1768,7 @@
 "\n"
 "Zatvori pokrenutu instancu Gaima\n"
 
-#: src/gaim-remote.c:321
+#: src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1829,7 +1776,7 @@
 "\n"
 "Objavi odsustvo sa svih naloga i stavi podrazumevanu poruku.\n"
 
-#: src/gaim-remote.c:325
+#: src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1837,14 +1784,7 @@
 "\n"
 "Vrati sve naloge sa odsustva.\n"
 
-#: src/gaim-remote.c:329
-#, fuzzy
-msgid ""
-"\n"
-"Send instant message\n"
-msgstr "Pošalji poruku"
-
-#: src/gtkaccount.c:345
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1856,153 +1796,165 @@
 "<b>Dimenzije slike:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:665
+#: src/gtkaccount.c:638
 msgid "Login Options"
 msgstr "Izbori prijava"
 
-#: src/gtkaccount.c:682 src/gtkft.c:626
+#: src/gtkaccount.c:655 src/gtkft.c:585
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:687 src/gtkblist.c:4369
+#: src/gtkaccount.c:660 src/gtkblist.c:4158
 msgid "Screen Name:"
 msgstr "Korisničko ime:"
 
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:733
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: src/gtkaccount.c:765 src/gtkblist.c:4383 src/gtkblist.c:4762
+#: src/gtkaccount.c:738 src/gtkblist.c:4172 src/gtkblist.c:4519
 msgid "Alias:"
 msgstr "Nadimak:"
 
-#: src/gtkaccount.c:769
+#: src/gtkaccount.c:742
 msgid "Remember password"
 msgstr "Zapamti lozinku"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:814
+#: src/gtkaccount.c:798
 msgid "User Options"
 msgstr "Korisnički izbori"
 
-#: src/gtkaccount.c:827
+#: src/gtkaccount.c:811
 msgid "New mail notifications"
 msgstr "Obaveštenja o novopristigloj e-pošti"
 
-#: src/gtkaccount.c:836
+#: src/gtkaccount.c:820
 msgid "Buddy icon:"
 msgstr "Sličica drugara"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:925
+#: src/gtkaccount.c:909
 #, c-format
 msgid "%s Options"
 msgstr "%s opcije"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1063 src/gtkaccount.c:1110
+#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr "Koristi opšta podešavanja proksija"
 
 #. No Proxy
-#: src/gtkaccount.c:1069 src/gtkaccount.c:1117
+#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr "Bez proksija"
 
 #. HTTP
-#: src/gtkaccount.c:1075 src/gtkaccount.c:1124
+#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1081 src/gtkaccount.c:1131
+#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1087 src/gtkaccount.c:1138
+#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1080
+#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1190
 msgid "Use Environmental Settings"
 msgstr "Koristi podešavanja okruženja"
 
-#: src/gtkaccount.c:1184
+#: src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr "možete videti kako se leptiri pare"
 
-#: src/gtkaccount.c:1188
+#: src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr "Ukoliko pogledate izbliza"
 
-#: src/gtkaccount.c:1204
+#: src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "Postavke proksija"
 
-#: src/gtkaccount.c:1222 src/gtkprefs.c:1074
+#: src/gtkaccount.c:1207 src/gtkprefs.c:1184
 msgid "Proxy _type:"
 msgstr "_Vrsta proksija:"
 
-#: src/gtkaccount.c:1231 src/gtkprefs.c:1101
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1211
 msgid "_Host:"
 msgstr "_Server:"
 
-#: src/gtkaccount.c:1235 src/gtkprefs.c:1119
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1229
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1243
+#: src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
-#: src/gtkaccount.c:1248 src/gtkprefs.c:1156
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1266
 msgid "Pa_ssword:"
 msgstr "_Lozinka:"
 
-#: src/gtkaccount.c:1625
+#: src/gtkaccount.c:1604
 msgid "Add Account"
 msgstr "Dodaj nalog"
 
-#: src/gtkaccount.c:1627
+#: src/gtkaccount.c:1606
 msgid "Modify Account"
 msgstr "Izmeni nalog"
 
+#. Add the disclosure
+#: src/gtkaccount.c:1630
+msgid "Show more options"
+msgstr "Pokaži više postavki"
+
+#: src/gtkaccount.c:1631
+msgid "Show fewer options"
+msgstr "Pokaži manje postavki"
+
 #. Register button
-#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:681
+#: src/gtkaccount.c:1658 src/protocols/jabber/jabber.c:677
 msgid "Register"
 msgstr "Registruj se"
 
-#: src/gtkaccount.c:2006 src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:2023
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Da li ste sigurni da želite obrisati %s?"
 
-#: src/gtkaccount.c:2011 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2028 src/gtkrequest.c:247
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4420
+#: src/gtkaccount.c:2142 src/protocols/oscar/oscar.c:4331
 msgid "Screen Name"
 msgstr "Ime"
 
-#: src/gtkaccount.c:2115
-#, fuzzy
-msgid "Enabled"
-msgstr "Neuspeh"
-
-#: src/gtkaccount.c:2123
+#: src/gtkaccount.c:2166 src/protocols/jabber/jabber.c:996
+#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:5786
+#: src/protocols/oscar/oscar.c:6984 src/protocols/silc/silc.c:45
+#: src/protocols/yahoo/yahoo.c:2701 src/protocols/zephyr/zephyr.c:2122
+#: src/protocols/zephyr/zephyr.c:2141
+msgid "Online"
+msgstr "Na vezi"
+
+#: src/gtkaccount.c:2187
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2466
+#. XXX: Tidy this up when not in string freeze
+#: src/gtkaccount.c:2521 src/protocols/jabber/presence.c:202
 #, 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:2480
+#: src/gtkaccount.c:2535 src/protocols/jabber/presence.c:208
 msgid ""
 "\n"
 "\n"
@@ -2012,239 +1964,247 @@
 "\n"
 "Da li želite da dodate nju ili njega u svoj spisak drugara?"
 
-#: src/gtkaccount.c:2488
+#: src/gtkaccount.c:2561
+msgid "Information"
+msgstr "Podaci"
+
+#: src/gtkaccount.c:2565 src/gtkaccount.c:2596
+#: src/protocols/jabber/presence.c:210
 msgid "Add buddy to your list?"
 msgstr "Dodati drugara u spisak?"
 
-#: src/gtkaccount.c:2490 src/gtkblist.c:4814 src/gtkconv.c:1580
-#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:4045
-#: src/protocols/silc/chat.c:594
+#. Add button
+#: src/gtkaccount.c:2567 src/gtkaccount.c:2598 src/gtkblist.c:4571
+#: src/gtkconv.c:1522 src/gtkconv.c:3895 src/gtkconv.c:3966
+#: src/gtkrequest.c:248 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/presence.c:212 src/protocols/oscar/oscar.c:3958
+#: src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gtkblist.c:888
+#: src/gtkblist.c:846
 msgid "Join a Chat"
 msgstr "Priključi se razgovoru"
 
-#: src/gtkblist.c:909
+#: src/gtkblist.c:867
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Unesite podatke o razgovoru kojem želite da se priključite.\n"
 
-#: src/gtkblist.c:920 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:878 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: src/gtkblist.c:1225
+#: src/gtkblist.c:1173 src/gtkblist.c:3323
 msgid "Get _Info"
 msgstr "Podaci"
 
-#: src/gtkblist.c:1228
+#: src/gtkblist.c:1176 src/gtkblist.c:3313
 msgid "I_M"
 msgstr "Poruka"
 
-#: src/gtkblist.c:1234
+#: src/gtkblist.c:1182
 msgid "_Send File"
 msgstr "Pošalji datoteku"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1188
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _zasedu drugaru"
 
-#: src/gtkblist.c:1244 src/gtkblist.c:1248 src/gtkblist.c:1346
-#: src/gtkblist.c:1369
+#: src/gtkblist.c:1190 src/gtkblist.c:1287
 msgid "View _Log"
 msgstr "Pregled dnevni_ka"
 
+#: src/gtkblist.c:1200
+msgid "_Alias Buddy..."
+msgstr "N_adeni ime drugaru..."
+
+#: src/gtkblist.c:1202
+msgid "_Remove Buddy"
+msgstr "U_kloni drugara"
+
+#: src/gtkblist.c:1204
+msgid "Alias Contact..."
+msgstr "Nadeni ime kontaktu..."
+
+#: src/gtkblist.c:1207 src/gtkdialogs.c:876 src/gtkdialogs.c:878
+msgid "Remove Contact"
+msgstr "Ukloni kontakt"
+
+#: src/gtkblist.c:1211 src/gtkblist.c:1295 src/gtkblist.c:1309
+msgid "_Alias..."
+msgstr "N_adeni ime..."
+
+#: src/gtkblist.c:1213 src/gtkblist.c:1297 src/gtkblist.c:1314
+#: src/gtkconn.c:367
+msgid "_Remove"
+msgstr "_Ukloni"
+
 #: src/gtkblist.c:1259
-#, fuzzy
-msgid "_Alias Buddy..."
-msgstr "Nadeni ime drugaru"
+msgid "Add a _Buddy"
+msgstr "_Dodaj drugara"
 
 #: src/gtkblist.c:1261
-#, fuzzy
-msgid "_Remove Buddy"
-msgstr "Ukloni drugara"
+msgid "Add a C_hat"
+msgstr "Dodaj _razgovor"
 
 #: src/gtkblist.c:1263
-#, fuzzy
-msgid "Alias Contact..."
-msgstr "Nadeni ime kontaktu"
-
-#: src/gtkblist.c:1266 src/gtkdialogs.c:807 src/gtkdialogs.c:808
-msgid "Remove Contact"
-msgstr "Ukloni kontakt"
-
-#: src/gtkblist.c:1270 src/gtkblist.c:1354 src/gtkblist.c:1375
-msgid "_Alias..."
-msgstr "N_adeni ime..."
-
-#: src/gtkblist.c:1272 src/gtkblist.c:1356 src/gtkblist.c:1377
-#: src/gtkconn.c:171
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: src/gtkblist.c:1318
-msgid "Add a _Buddy"
-msgstr "_Dodaj drugara"
-
-#: src/gtkblist.c:1320
-msgid "Add a C_hat"
-msgstr "Dodaj _razgovor"
-
-#: src/gtkblist.c:1322
 msgid "_Delete Group"
 msgstr "U_kloni grupu"
 
-#: src/gtkblist.c:1324
+#: src/gtkblist.c:1265
 msgid "_Rename"
 msgstr "Pre_imenuj"
 
 #. join button
-#: src/gtkblist.c:1342 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:102
+#: src/gtkblist.c:1283 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
 msgid "_Join"
 msgstr "_Priključi se"
 
-#: src/gtkblist.c:1344
+#: src/gtkblist.c:1285
 msgid "Auto-Join"
 msgstr "Automatska prijava"
 
-#: src/gtkblist.c:1382 src/gtkblist.c:1405
+#: src/gtkblist.c:1311 src/gtkblist.c:1336
 msgid "_Collapse"
 msgstr "_Skupi"
 
-#: src/gtkblist.c:1410
+#: src/gtkblist.c:1341
 msgid "_Expand"
 msgstr "_Razgranaj"
 
-#: src/gtkblist.c:1637 src/gtkblist.c:1647 src/gtkblist.c:3646
-#: src/gtkblist.c:3649
-#, fuzzy
-msgid "/Tools/Mute Sounds"
-msgstr "Isključi zvuk"
-
-#: src/gtkblist.c:2106 src/gtkconv.c:4255 src/gtkpounce.c:314
+#: src/gtkblist.c:2016 src/gtkconv.c:4538 src/gtkpounce.c:316
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Trenutno niste prijavljeni na nalog koji omogućava dodavanje tog drugara."
 
 #. Buddies menu
-#: src/gtkblist.c:2675
+#: src/gtkblist.c:2437
 msgid "/_Buddies"
 msgstr "/_Drugari"
 
-#: src/gtkblist.c:2676
+#: src/gtkblist.c:2438
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Drugari/_Nova brza poruka..."
 
-#: src/gtkblist.c:2677
+#: src/gtkblist.c:2439
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Drugari/_Priključi se razgovoru..."
 
-#: src/gtkblist.c:2678
+#: src/gtkblist.c:2440
 msgid "/Buddies/Get User _Info..."
 msgstr "/Drugari/Pribavi podatke o _korisniku..."
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:2441
 msgid "/Buddies/View User _Log..."
 msgstr "/Drugari/Pogledaj dnevnik za _korisnika..."
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:2443
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Drugari/Prikaži nep_ovezane drugare"
 
-#: src/gtkblist.c:2682
+#: src/gtkblist.c:2444
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Drugari/Prikaži _prazne grupe"
 
-#: src/gtkblist.c:2683
+#: src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Drugari/_Dodaj drugara..."
 
-#: src/gtkblist.c:2684
+#: src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/Drugari/Dodaj razgo_vor..."
 
-#: src/gtkblist.c:2685
+#: src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/Drugari/Dodaj _grupu..."
 
-#: src/gtkblist.c:2687
+#: src/gtkblist.c:2449
+msgid "/Buddies/_Signoff"
+msgstr "/Drugari/_Odjava"
+
+#: src/gtkblist.c:2450
 msgid "/Buddies/_Quit"
 msgstr "/Drugari/I_zlaz"
 
 #. Tools
-#: src/gtkblist.c:2690
+#: src/gtkblist.c:2453
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/gtkblist.c:2691
+#: src/gtkblist.c:2454
+msgid "/Tools/_Away"
+msgstr "/Alati/_Odsutan"
+
+#: src/gtkblist.c:2455
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Alati/_Zaseda drugaru"
 
-#: src/gtkblist.c:2692
+#: src/gtkblist.c:2456
 msgid "/Tools/Account Ac_tions"
 msgstr "/Alati/_Akcije po nalogu"
 
-#: src/gtkblist.c:2693
+#: src/gtkblist.c:2457
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Alati/Akcije po protokolu"
 
-#: src/gtkblist.c:2695
-#, fuzzy
-msgid "/Tools/_Statuses"
-msgstr "Stanje"
-
-#: src/gtkblist.c:2696
+#: src/gtkblist.c:2459
 msgid "/Tools/A_ccounts"
 msgstr "/Alati/_Nalozi"
 
-#: src/gtkblist.c:2697
-msgid "/Tools/Pr_eferences"
-msgstr "/Alati/_Postavke"
-
-#: src/gtkblist.c:2698
-msgid "/Tools/Pr_ivacy"
-msgstr "/Alati/_Privatnost"
-
-#: src/gtkblist.c:2699
+#: src/gtkblist.c:2460
 msgid "/Tools/_File Transfers"
 msgstr "/Alati/Prenosi _datoteka..."
 
-#: src/gtkblist.c:2700
+#: src/gtkblist.c:2461
 msgid "/Tools/R_oom List"
 msgstr "/Alati/S_pisak soba"
 
-#: src/gtkblist.c:2702
-#, fuzzy
-msgid "/Tools/Mute _Sounds"
-msgstr "Isključi zvuk"
-
-#: src/gtkblist.c:2703
+#: src/gtkblist.c:2462
+msgid "/Tools/Pr_eferences"
+msgstr "/Alati/_Postavke"
+
+#: src/gtkblist.c:2463
+msgid "/Tools/Pr_ivacy"
+msgstr "/Alati/_Privatnost"
+
+#: src/gtkblist.c:2465
 msgid "/Tools/View System _Log"
 msgstr "/Alati/Pregled _sistemskog dnevnika rada"
 
 #. Help
-#: src/gtkblist.c:2706
+#: src/gtkblist.c:2468
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/gtkblist.c:2707
+#: src/gtkblist.c:2469
 msgid "/Help/Online _Help"
 msgstr "/Pomoć/Pomoć iz _programa"
 
-#: src/gtkblist.c:2708
+#: src/gtkblist.c:2470
 msgid "/Help/_Debug Window"
 msgstr "/Pomoć/Prozor za nalaženje _grešaka"
 
-#: src/gtkblist.c:2709
+#: src/gtkblist.c:2471
 msgid "/Help/_About"
 msgstr "/Pomoć/_O programu"
 
-#: src/gtkblist.c:2741 src/gtkblist.c:2808
+#: src/gtkblist.c:2489
+msgid "Rename Group"
+msgstr "Preimenuj grupu"
+
+#: src/gtkblist.c:2489
+msgid "New group name"
+msgstr "Naziv nove grupe"
+
+#: src/gtkblist.c:2490
+msgid "Please enter a new name for the selected group."
+msgstr "Unesite novi naziv za izabranu grupu."
+
+#: src/gtkblist.c:2519
 #, c-format
 msgid ""
 "\n"
@@ -2253,61 +2213,7 @@
 "\n"
 "<b>Nalog:</b> %s"
 
-#: src/gtkblist.c:2817
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Kontakt poznat kao:</b>"
-
-#: src/gtkblist.c:2825
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Poznat kao:</b>"
-
-#: src/gtkblist.c:2833
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Nadimak:</b>"
-
-#: src/gtkblist.c:2842
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Prijavljen:</b> "
-
-#: src/gtkblist.c:2854
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Neaktivan:</b>"
-
-#: src/gtkblist.c:2889
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/gtkblist.c:2897
+#: src/gtkblist.c:2585
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2315,7 +2221,68 @@
 "\n"
 "<b>Stanje:</b> Nepovezan"
 
-#: src/gtkblist.c:2919
+#: src/gtkblist.c:2600
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:2616
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>Nalog:</b>"
+
+#: src/gtkblist.c:2617
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>Kontakt poznat kao:</b>"
+
+#: src/gtkblist.c:2618
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>Poznat kao:</b>"
+
+#: src/gtkblist.c:2619
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>Nadimak:</b>"
+
+#: src/gtkblist.c:2620
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>Prijavljen:</b> "
+
+#: src/gtkblist.c:2621
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+"\n"
+"<b>Neaktivan:</b>"
+
+#: src/gtkblist.c:2622
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>Upozoren:</b>"
+
+#: src/gtkblist.c:2624
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2323,127 +2290,124 @@
 "\n"
 "<b>Opis:</b> sablasno"
 
-#: src/gtkblist.c:2921
-#, fuzzy
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
+#: src/gtkblist.c:2625
+msgid ""
+"\n"
+"<b>Status</b>: Awesome"
 msgstr ""
 "\n"
 "<b>Stanje:</b> sjajno"
 
-#: src/gtkblist.c:2923
-#, fuzzy
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
+#: src/gtkblist.c:2626
+msgid ""
+"\n"
+"<b>Status</b>: Rockin'"
 msgstr ""
 "\n"
 "<b>Stanje:</b> razbija"
 
-#: src/gtkblist.c:3185
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
+#: src/gtkblist.c:2908
+#, c-format
+msgid "Idle (%dh%02dm) "
 msgstr "Neaktivan (%dh%02dm) "
 
-#: src/gtkblist.c:3187
+#: src/gtkblist.c:2910
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Neaktivan (%dm) "
 
-#: src/gtkblist.c:3190
-#, fuzzy
-msgid "Idle "
-msgstr "Neaktivan"
-
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:2915
+#, c-format
+msgid "Warned (%d%%) "
+msgstr "Upozoren (%d%%) "
+
+#: src/gtkblist.c:2918
 msgid "Offline "
 msgstr "Nepovezan"
 
-#: src/gtkblist.c:3310
-#, fuzzy
-msgid "/Buddies/New Instant Message..."
-msgstr "/Drugari/_Nova brza poruka..."
-
-#: src/gtkblist.c:3311 src/gtkblist.c:3345
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:3036
 msgid "/Buddies/Join a Chat..."
 msgstr "/Drugari/_Priključi se razgovoru..."
 
-#: src/gtkblist.c:3312
-#, fuzzy
-msgid "/Buddies/Get User Info..."
-msgstr "/Drugari/Pribavi podatke o _korisniku..."
-
-#: src/gtkblist.c:3313
-#, fuzzy
-msgid "/Buddies/Add Buddy..."
-msgstr "/Drugari/_Dodaj drugara..."
-
-#: src/gtkblist.c:3314
-#, fuzzy
-msgid "/Buddies/Add Chat..."
-msgstr "/Drugari/Dodaj razgo_vor..."
-
-#: src/gtkblist.c:3315
-#, fuzzy
-msgid "/Buddies/Add Group..."
-msgstr "/Drugari/Dodaj _grupu..."
-
-#: src/gtkblist.c:3348
+#: src/gtkblist.c:3039
 msgid "/Tools/Room List"
 msgstr "/Alati/S_pisak soba"
 
-#: src/gtkblist.c:3351
+#: src/gtkblist.c:3042
 msgid "/Tools/Privacy"
 msgstr "/Alati/_Privatnost"
 
-#: src/gtkblist.c:3427 src/gtkprefs.c:1771 src/protocols/jabber/jabber.c:941
-#: src/protocols/yahoo/yahoo.c:2749
-msgid "None"
-msgstr "Ništa"
-
-#: src/gtkblist.c:3429
+#: src/gtkblist.c:3124
 msgid "Alphabetical"
 msgstr "Po azbučnom redu"
 
-#: src/gtkblist.c:3430
+#: src/gtkblist.c:3125
 msgid "By status"
 msgstr "Po stanju"
 
-#: src/gtkblist.c:3431
+#: src/gtkblist.c:3126
 msgid "By log size"
 msgstr "Po veličini dnevnika"
 
-#: src/gtkblist.c:3542
+#: src/gtkblist.c:3192
+msgid "/Tools/Away"
+msgstr "/Alati/Odsutan"
+
+#: src/gtkblist.c:3195
 msgid "/Tools/Buddy Pounce"
 msgstr "/Alati/Zaseda drugaru"
 
-#: src/gtkblist.c:3543
+#: src/gtkblist.c:3198
 msgid "/Tools/Account Actions"
 msgstr "/Alati/_Akcije po nalozima"
 
-#: src/gtkblist.c:3544
+#: src/gtkblist.c:3201
 msgid "/Tools/Plugin 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:3642
+#: src/gtkblist.c:3292
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Drugari/Prikaži nepovezane drugare"
 
-#: src/gtkblist.c:3644
+#: src/gtkblist.c:3294
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Drugari/Prikaži prazne grupe"
 
-#: src/gtkblist.c:4323 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3319
+msgid "Send a message to the selected buddy"
+msgstr "Pošalji poruku izabranom drugaru"
+
+#: src/gtkblist.c:3329
+msgid "Get information on the selected buddy"
+msgstr "Pribavi podatke o izabranom drugaru"
+
+#: src/gtkblist.c:3333
+msgid "_Chat"
+msgstr "Razgovor"
+
+#: src/gtkblist.c:3338
+msgid "Join a chat room"
+msgstr "Priključi se pričaonici"
+
+#: src/gtkblist.c:3343
+msgid "_Away"
+msgstr "Odsutan"
+
+#: src/gtkblist.c:3348
+msgid "Set an away message"
+msgstr "Postavi poruku za odsustvo"
+
+#: src/gtkblist.c:4112 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2847
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2868
 msgid "Add Buddy"
 msgstr "Dodaj drugara"
 
-#: src/gtkblist.c:4347
+#: src/gtkblist.c:4136
 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. "
@@ -2454,26 +2418,26 @@
 "imena, kad god je to moguće.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4410 src/gtkblist.c:4742
+#: src/gtkblist.c:4196 src/gtkblist.c:4499
 msgid "Account:"
 msgstr "Nalog:"
 
-#: src/gtkblist.c:4675
+#: src/gtkblist.c:4432
 msgid "This protocol does not support chat rooms."
 msgstr "Ovo izdanje protokola ne podržava sobe za razgovor."
 
-#: src/gtkblist.c:4691
+#: src/gtkblist.c:4448
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 "Trenutno niste povezani niti na jedan protokol koji omogućava razgovore."
 
-#: src/gtkblist.c:4708
+#: src/gtkblist.c:4465
 msgid "Add Chat"
 msgstr "Dodaj razgovor"
 
-#: src/gtkblist.c:4732
+#: src/gtkblist.c:4489
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2481,24 +2445,39 @@
 "Unesite ime koje želite da nadenete razgovoru, i podatke o razgovoru koji "
 "želite da dodate u spisak drugara.\n"
 
-#: src/gtkblist.c:4811
+#: src/gtkblist.c:4568
 msgid "Add Group"
 msgstr "Dodaj grupu"
 
-#: src/gtkblist.c:4812
+#: src/gtkblist.c:4569
 msgid "Please enter the name of the group to be added."
 msgstr "Unesite naziv grupe koju želite da dodate."
 
-#: src/gtkblist.c:5362 src/gtkblist.c:5458
+#: src/gtkblist.c:5138 src/gtkblist.c:5235
 msgid "No actions available"
 msgstr "Nema dostupnih akcija"
 
-#: src/gtkconn.c:171
-#, fuzzy
-msgid "Reconnect"
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
+msgid "Done."
+msgstr "Gotovo."
+
+#: src/gtkconn.c:158
+msgid "Signon: "
+msgstr "Prijava:"
+
+#: src/gtkconn.c:204
+msgid "Signon"
+msgstr "Prijava"
+
+#: src/gtkconn.c:216
+msgid "Cancel All"
+msgstr "Otkaži sve"
+
+#: src/gtkconn.c:367 src/gtkconn.c:600
+msgid "_Reconnect"
 msgstr "Po_novo se poveži"
 
-#: src/gtkconn.c:368
+#: src/gtkconn.c:564
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2511,50 +2490,32 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:370
+#: src/gtkconn.c:566
 msgid "Reason Unknown."
 msgstr "Razlog nepoznat."
 
-#: src/gtkconn.c:378
-msgid "Disconnected"
-msgstr "Veza je prekinuta"
-
-#: src/gtkconn.c:404
-msgid "_Reconnect"
-msgstr "Po_novo se poveži"
-
-#: src/gtkconn.c:409
+#: src/gtkconn.c:605
 msgid "Reconnect _All"
 msgstr "Ponovo poveži _sve"
 
-#: src/gtkconn.c:439
+#: src/gtkconn.c:635
 msgid "Time"
 msgstr "Vreme"
 
-#: src/gtkconv.c:148
-#, fuzzy
-msgid "Confirm close"
-msgstr "Potvrdite nalog"
-
-#: src/gtkconv.c:180
-#, fuzzy
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Da li ste sigurni da želite obrisati %s?"
-
-#: src/gtkconv.c:410
+#: src/gtkconv.c:342
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me koristi GAIM v%s."
 
-#: src/gtkconv.c:419
+#: src/gtkconv.c:351
 msgid "Supported debug options are:  version"
 msgstr "Podržane opcije za debagiranje su:  version"
 
-#: src/gtkconv.c:456
+#: src/gtkconv.c:375
 msgid "No such command (in this context)."
 msgstr "U ovom delu programa takva komanda ne postoji."
 
-#: src/gtkconv.c:459
+#: src/gtkconv.c:378
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2562,49 +2523,45 @@
 "Koristite \"/help &lt;komanda&gt;\" za pomoć za posebnu komandu.\n"
 "U ovom delu programa postoje sledeće komande:\n"
 
-#: src/gtkconv.c:531
+#: src/gtkconv.c:450
 msgid "No such command."
 msgstr "Komanda ne postoji"
 
-#: src/gtkconv.c:538
+#: src/gtkconv.c:457
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Greška u sintaksi: uneli ste neispravan broj argumenata."
 
-#: src/gtkconv.c:543
+#: src/gtkconv.c:462
 msgid "Your command failed for an unknown reason."
 msgstr "Komanda nije izvršena iz nepoznatih razloga."
 
-#: src/gtkconv.c:550
-#, fuzzy
-msgid "That command only works in chats, not IMs."
+#: src/gtkconv.c:469
+msgid "That command only works in Chats, not IMs."
 msgstr "Ova komanda radi samo sa Razgovorima, a ne sa Brzim porukama."
 
-#: src/gtkconv.c:553
-#, fuzzy
-msgid "That command only works in IMs, not chats."
+#: src/gtkconv.c:472
+msgid "That command only works in IMs, not Chats."
 msgstr "Ova komanda radi samo sa Brzim porukama, a ne sa Razgovorima."
 
-#: src/gtkconv.c:557
+#: src/gtkconv.c:476
 msgid "That command doesn't work on this protocol."
 msgstr "Ova komanda ne postoji u ovom protokolu."
 
-#: src/gtkconv.c:783 src/gtkconv.c:809
-msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-
-#: src/gtkconv.c:803
-#, fuzzy
+#: src/gtkconv.c:719 src/gtkconv.c:745
+msgid "That buddy is not on the same protocol as this chat"
+msgstr "Taj drugar ne koristi isti protokol kao ovaj razgovor"
+
+#: src/gtkconv.c:739
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Trenutno niste prijavljeni na nalog koji omogućava dodavanje tog drugara."
-
-#: src/gtkconv.c:858
+msgstr "Trenutno niste prijavljeni na nalog koji omogućava poziv tog drugara."
+
+#: src/gtkconv.c:793
 msgid "Invite Buddy Into Chat Room"
 msgstr "Pozovi drugara u pričaonicu"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:888
+#: src/gtkconv.c:823
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2612,285 +2569,336 @@
 "Unesite ime korisnika koga želite da pozovete, a po želji dodajte i poruku u "
 "pozivnicu."
 
-#: src/gtkconv.c:909
+#: src/gtkconv.c:844
 msgid "_Buddy:"
 msgstr "_Drugar:"
 
-#: src/gtkconv.c:929 src/gtksavedstatuses.c:774
+#: src/gtkconv.c:864
 msgid "_Message:"
 msgstr "_Poruka:"
 
-#: src/gtkconv.c:986 src/gtkconv.c:2636 src/gtkdebug.c:215 src/gtkft.c:473
+#: src/gtkconv.c:920 src/gtkconv.c:2645 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "Ne mogu da pročitam datoteku."
 
-#: src/gtkconv.c:992
+#: src/gtkconv.c:925
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Razgovor sa %s</h1>\n"
 
-#: src/gtkconv.c:1016
+#: src/gtkconv.c:939
 msgid "Save Conversation"
 msgstr "Sačuvaj razgovor"
 
-#: src/gtkconv.c:1117 src/gtkdebug.c:163 src/gtkdebug.c:663
+#: src/gtkconv.c:1024 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Nađi"
 
-#: src/gtkconv.c:1143 src/gtkdebug.c:191
+#: src/gtkconv.c:1050 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Traži izraz:"
 
-#: src/gtkconv.c:1541
+#: src/gtkconv.c:1466
 msgid "IM"
 msgstr "Poruka"
 
-#: src/gtkconv.c:1547 src/protocols/oscar/oscar.c:619
+#. Send File button
+#: src/gtkconv.c:1475 src/gtkconv.c:3888 src/protocols/oscar/oscar.c:605
 msgid "Send File"
 msgstr "Pošalji datoteku"
 
-#: src/gtkconv.c:1554
+#: src/gtkconv.c:1484
 msgid "Un-Ignore"
 msgstr "Ne ignoriši"
 
-#: src/gtkconv.c:1557
+#: src/gtkconv.c:1486 src/gtkprefs.c:831
 msgid "Ignore"
 msgstr "Ignoriši"
 
-#: src/gtkconv.c:1562
+#. Info button
+#: src/gtkconv.c:1495 src/gtkconv.c:3909
 msgid "Info"
 msgstr "Podaci"
 
-#: src/gtkconv.c:1568
-#, fuzzy
-msgid "Get Away Message"
-msgstr "Nova poruka za odsustvo"
-
-#: src/gtkconv.c:1577 src/gtkrequest.c:266
-msgid "Remove"
-msgstr "Ukloni"
-
-#: src/gtkconv.c:2644
+#: src/gtkconv.c:1504
+msgid "Get Away Msg"
+msgstr "Pribavi poruku za odsustvo"
+
+#: src/gtkconv.c:2653
 msgid "Unable to save icon file to disk."
 msgstr "Ne mogu sačuvati datoteku sa ikonicom na disk."
 
-#: src/gtkconv.c:2667
+#: src/gtkconv.c:2675
 msgid "Save Icon"
 msgstr "Sačuvaj ikonu"
 
-#: src/gtkconv.c:2695
+#: src/gtkconv.c:2705
 msgid "Animate"
 msgstr "Animiraj"
 
-#: src/gtkconv.c:2700
+#: src/gtkconv.c:2710
 msgid "Hide Icon"
 msgstr "Sakrij ikonicu"
 
-#: src/gtkconv.c:2706
+#: src/gtkconv.c:2716
 msgid "Save Icon As..."
 msgstr "Sačuvaj ikonicu kao..."
 
-#: src/gtkconv.c:3067
+#: src/gtkconv.c:3093
 msgid "User is typing..."
 msgstr "Korisnik kuca..."
 
-#: src/gtkconv.c:3072
+#: src/gtkconv.c:3101
 msgid "User has typed something and paused"
 msgstr "Korisnik je nešto ukucao i zastao"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3204
 msgid "_Send As"
 msgstr "Pošalji _kao"
 
 #. Conversation menu
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3658
 msgid "/_Conversation"
 msgstr "/_Razgovor"
 
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3660
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Razgovor/Nova _brza poruka..."
 
-#: src/gtkconv.c:3635
+#: src/gtkconv.c:3665
 msgid "/Conversation/_Find..."
 msgstr "/Razgovor/_Nađi..."
 
-#: src/gtkconv.c:3637
+#: src/gtkconv.c:3667
 msgid "/Conversation/View _Log"
 msgstr "/Razgovor/Pogledaj _dnevnik"
 
-#: src/gtkconv.c:3638
+#: src/gtkconv.c:3668
 msgid "/Conversation/_Save As..."
 msgstr "/Razgovor/_Sačuvaj kao..."
 
-#: src/gtkconv.c:3640
+#: src/gtkconv.c:3670
 msgid "/Conversation/Clear"
 msgstr "/Razgovor/_Obriši"
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3674
 msgid "/Conversation/Se_nd File..."
 msgstr "/Razgovor/_Pošalji datoteku..."
 
-#: src/gtkconv.c:3645
+#: src/gtkconv.c:3675
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Razgovor/Dodaj _zasedu drugaru..."
 
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3677
 msgid "/Conversation/_Get Info"
 msgstr "/Razgovor/Priba_vi podatke..."
 
-#: src/gtkconv.c:3649
+#: src/gtkconv.c:3679
+msgid "/Conversation/_Warn..."
+msgstr "/Razgovor/_Upozori..."
+
+#: src/gtkconv.c:3681
 msgid "/Conversation/In_vite..."
 msgstr "/Razgovor/_Pozovi..."
 
-#: src/gtkconv.c:3654
-msgid "/Conversation/Al_ias..."
+#: src/gtkconv.c:3686
+msgid "/Conversation/A_lias..."
 msgstr "/Razgovor/_Nadeni ime..."
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3688
 msgid "/Conversation/_Block..."
 msgstr "/Razgovor/_Blokiraj..."
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3690
 msgid "/Conversation/_Add..."
 msgstr "/Razgovor/_Dodaj..."
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3692
 msgid "/Conversation/_Remove..."
 msgstr "/Razgovor/_Ukloni..."
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3697
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Razgovor/Um_etni vezu..."
 
-#: src/gtkconv.c:3667
+#: src/gtkconv.c:3699
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Razgovor/Umetni _sliku..."
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3704
 msgid "/Conversation/_Close"
 msgstr "/Razgovor/_Završi"
 
 #. Options
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3708
 msgid "/_Options"
 msgstr "/_Izbori"
 
-#: src/gtkconv.c:3677
+#: src/gtkconv.c:3709
 msgid "/Options/Enable _Logging"
 msgstr "/Izbori/Omogući _dnevnik rada"
 
-#: src/gtkconv.c:3678
+#: src/gtkconv.c:3710
 msgid "/Options/Enable _Sounds"
 msgstr "/Izbori/Omogući z_vuke"
 
-#: src/gtkconv.c:3679
-#, fuzzy
-msgid "/Options/Show Formatting _Toolbars"
+#: src/gtkconv.c:3711
+msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Izbori/Prikaži _alatke za formatiranje"
 
-#: src/gtkconv.c:3680
-msgid "/Options/Show Ti_mestamps"
+#: src/gtkconv.c:3712
+msgid "/Options/Show T_imestamps"
 msgstr "/Izbori/Prikazuj vremenske oznake"
 
-#: src/gtkconv.c:3681
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "Prikaži i_konice drugara"
-
-#: src/gtkconv.c:3725
+#: src/gtkconv.c:3754
 msgid "/Conversation/View Log"
 msgstr "/Razgovor/Prikaži dnevnik"
 
-#: src/gtkconv.c:3731
+#: src/gtkconv.c:3759
 msgid "/Conversation/Send File..."
 msgstr "/Razgovor/Pošalji datoteku..."
 
-#: src/gtkconv.c:3735
+#: src/gtkconv.c:3763
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Razgovor/Dodaj _zasedu drugaru..."
 
-#: src/gtkconv.c:3741
+#: src/gtkconv.c:3769
 msgid "/Conversation/Get Info"
 msgstr "/Razgovor/Pribavi podatke..."
 
-#: src/gtkconv.c:3745
+#: src/gtkconv.c:3773
+msgid "/Conversation/Warn..."
+msgstr "/Razgovor/Upozori..."
+
+#: src/gtkconv.c:3777
 msgid "/Conversation/Invite..."
 msgstr "/Razgovor/Podaci..."
 
-#: src/gtkconv.c:3751
+#: src/gtkconv.c:3783
 msgid "/Conversation/Alias..."
 msgstr "/Razgovor/Nadeni ime..."
 
-#: src/gtkconv.c:3755
+#: src/gtkconv.c:3787
 msgid "/Conversation/Block..."
 msgstr "/Razgovor/Blokiraj..."
 
-#: src/gtkconv.c:3759
+#: src/gtkconv.c:3791
 msgid "/Conversation/Add..."
 msgstr "/Razgovor/Dodaj..."
 
-#: src/gtkconv.c:3763
+#: src/gtkconv.c:3795
 msgid "/Conversation/Remove..."
 msgstr "/Razgovor/Ukloni..."
 
-#: src/gtkconv.c:3769
+#: src/gtkconv.c:3801
 msgid "/Conversation/Insert Link..."
 msgstr "/Razgovor/Ubaci vezu..."
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3805
 msgid "/Conversation/Insert Image..."
 msgstr "/Razgovor/Ubaci sliku..."
 
-#: src/gtkconv.c:3779
+#: src/gtkconv.c:3811
 msgid "/Options/Enable Logging"
 msgstr "/Izbori/Omogući zapise"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3814
 msgid "/Options/Enable Sounds"
 msgstr "/Izbori/Omogući zvuke"
 
-#: src/gtkconv.c:3785
-#, fuzzy
-msgid "/Options/Show Formatting Toolbars"
+#: src/gtkconv.c:3817
+msgid "/Options/Show Formatting Toolbar"
 msgstr "/Izbori/Prikaži alatke za formatiranje"
 
-#: src/gtkconv.c:3788
+#: src/gtkconv.c:3820
 msgid "/Options/Show Timestamps"
 msgstr "/Izbori/Prikazuj vremenske oznake"
 
-#: src/gtkconv.c:3791
-#, fuzzy
-msgid "/Options/Show Buddy Icon"
-msgstr "Prikaži i_konice drugara"
-
-#: src/gtkconv.c:3911
+#. The buttons, from left to right
+#. Warn button
+#: src/gtkconv.c:3874
+msgid "Warn"
+msgstr "Upozori"
+
+#: src/gtkconv.c:3875
+msgid "Warn the user"
+msgstr "Upozori korisnika"
+
+#. Block button
+#: src/gtkconv.c:3881 src/gtkprivacy.c:634 src/gtkprivacy.c:645
+msgid "Block"
+msgstr "Blokiraj"
+
+#: src/gtkconv.c:3882
+msgid "Block the user"
+msgstr "Blokiraj korisnika"
+
+#: src/gtkconv.c:3889
+msgid "Send a file to the user"
+msgstr "Pošalji datoteku korisniku"
+
+#: src/gtkconv.c:3896
+msgid "Add the user to your buddy list"
+msgstr "Dodavanje korisnika u Vaš spisak drugara"
+
+#: src/gtkconv.c:3903
+msgid "Remove the user from your buddy list"
+msgstr "Uklanjanje korisnika sa Vašeg spisak drugara"
+
+#: src/gtkconv.c:3910 src/gtkconv.c:4245
+msgid "Get the user's information"
+msgstr "Pribavi podatke o korisniku"
+
+#. Send button
+#: src/gtkconv.c:3916 src/gtkconv.c:3980
+msgid "Send"
+msgstr "Pošalji"
+
+#: src/gtkconv.c:3917 src/gtkconv.c:3981
+msgid "Send message"
+msgstr "Slanje poruke"
+
+#. The buttons, from left to right
+#. Invite
+#: src/gtkconv.c:3959
+msgid "Invite"
+msgstr "Pozovi"
+
+#: src/gtkconv.c:3960
+msgid "Invite a user"
+msgstr "Pozovi korisnika"
+
+#: src/gtkconv.c:3967
+msgid "Add the chat to your buddy list"
+msgstr "Dodavanje razgovora u Vaš spisak drugara"
+
+#: src/gtkconv.c:3974
+msgid "Remove the chat from your buddy list"
+msgstr "Uklanjanje razgovora sa Vašeg spiska drugara"
+
+#: src/gtkconv.c:4098
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3959
+#: src/gtkconv.c:4161
 msgid "0 people in room"
 msgstr "Nema nikoga u pričaonici"
 
-#: src/gtkconv.c:4021
+#: src/gtkconv.c:4222
 msgid "IM the user"
 msgstr "Pošalji brzu poruku korisniku"
 
-#: src/gtkconv.c:4034
+#: src/gtkconv.c:4234
 msgid "Ignore the user"
 msgstr "Ignoriši korisnika"
 
-#: src/gtkconv.c:4046
-msgid "Get the user's information"
-msgstr "Pribavi podatke o korisniku"
-
-#: src/gtkconv.c:4569
+#: src/gtkconv.c:4833
 msgid "Close conversation"
 msgstr "Okončaj razgovor"
 
-#: src/gtkconv.c:5192 src/gtkconv.c:5220 src/gtkconv.c:5316 src/gtkconv.c:5373
+#: src/gtkconv.c:5370 src/gtkconv.c:5399 src/gtkconv.c:5495 src/gtkconv.c:5553
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2898,19 +2906,23 @@
 msgstr[1] "%d osobe u pričaonici."
 msgstr[2] "%d osoba u pričaonici."
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6130 src/gtkconv.c:6133
+msgid "<main>/Conversation/Close"
+msgstr "<main>/Razgovor/Završi"
+
+#: src/gtkconv.c:6505
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 "say &lt;poruka&gt;:  Pošalji poruku normalno, kao da nije korišćena komanda."
 
-#: src/gtkconv.c:6282
+#: src/gtkconv.c:6508
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;akcija&gt;:  Pošalji drugaru ili u razgovor akciju u stilu IRC-a."
 
-#: src/gtkconv.c:6285
+#: src/gtkconv.c:6511
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2918,311 +2930,323 @@
 "debug &lt;opcija&gt;:  Pošalji razne podatke za ispravljanje grešaka u "
 "trenutni razgovor."
 
-#: src/gtkconv.c:6288
-#, fuzzy
-msgid "clear: Clears the conversation scrollback."
-msgstr "%s zatvori prozor razgovora."
-
-#: src/gtkconv.c:6291
+#: src/gtkconv.c:6515
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komanda&gt;:  Pomoć za određenu komandu."
 
-#: src/gtkdebug.c:230
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Snimi dnevnik za ispravljanje grešaka"
 
-#: src/gtkdebug.c:571
-#, fuzzy
-msgid "Invert"
-msgstr "U_metni"
-
-#: src/gtkdebug.c:574
-msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:621
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Prozor za poruke o greškama"
 
-#: src/gtkdebug.c:674
-msgid "Clear"
-msgstr "Očisti"
-
-#: src/gtkdebug.c:683
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Zastani"
 
-#: src/gtkdebug.c:690 src/gtkdebug.c:691
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Vremenska oznaka"
 
-#: src/gtkdebug.c:709
-#, fuzzy
-msgid "Filter"
-msgstr "Neuspeh"
-
-#: src/gtkdebug.c:722
-#, fuzzy
-msgid "Right click for more options."
-msgstr "Pokaži više postavki"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:89
+#: src/gtkdialogs.c:63
 msgid "lead developer"
 msgstr "glavni programer"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:64 src/gtkdialogs.c:67 src/gtkdialogs.c:68
 #: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75
 msgid "developer"
 msgstr "programer"
 
-#: src/gtkdialogs.c:61
+#: src/gtkdialogs.c:65
 msgid "developer & webmaster"
 msgstr "programer i zadužen za veb"
 
-#: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:66
 msgid "win32 port"
 msgstr "Windows izdanje"
 
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:72
 msgid "support"
 msgstr "podrška"
 
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:90
+#: src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "održavalac"
 
-#: src/gtkdialogs.c:88
-#, fuzzy
-msgid "libfaim maintainer"
+#: src/gtkdialogs.c:92
+msgid "former libfaim maintainer"
 msgstr "prethodni održavalac libfaim-a"
 
-#: src/gtkdialogs.c:91
-#, fuzzy
-msgid "Jabber developer"
-msgstr "bivši DŽaber programer"
-
-#: src/gtkdialogs.c:92
-msgid "original author"
-msgstr "prvi autor"
-
 #: src/gtkdialogs.c:93
+msgid "former lead developer"
+msgstr "bivši glavni programer"
+
+#: src/gtkdialogs.c:94
+msgid "former maintainer"
+msgstr "bivši održavalac"
+
+#: src/gtkdialogs.c:95
+msgid "former Jabber developer"
+msgstr "bivši DŽaber programer"
+
+#: src/gtkdialogs.c:96
+msgid "original author"
+msgstr "prvi autor"
+
+#: src/gtkdialogs.c:97
 msgid "hacker and designated driver [lazy bum]"
 msgstr "haker i određeni pokretač [lenja buba]"
 
-#: src/gtkdialogs.c:98 src/gtkdialogs.c:99 src/gtkdialogs.c:141
-msgid "Bulgarian"
-msgstr "bugarski"
-
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:142 src/gtkdialogs.c:143
-msgid "Catalan"
-msgstr "katalonski"
-
-#: src/gtkdialogs.c:101 src/gtkdialogs.c:144
-msgid "Czech"
-msgstr "češki"
-
 #: src/gtkdialogs.c:102
-msgid "Danish"
-msgstr "danski"
-
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
-msgid "German"
-msgstr "nemački"
-
-#: src/gtkdialogs.c:104
-#, fuzzy
-msgid "Australian English"
-msgstr "kanadski engleski"
-
-#: src/gtkdialogs.c:105
-msgid "British English"
-msgstr "britanski engleski"
+msgid "Azerbaijani"
+msgstr "azerbejdžanski"
+
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:149
+msgid "Bulgarian"
+msgstr "bugarski"
+
+#: src/gtkdialogs.c:103
+msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+msgstr "Vladimira Girginova i Vladimir (Kaladan) Petkov"
+
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:150 src/gtkdialogs.c:151
+msgid "Catalan"
+msgstr "katalonski"
+
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:152
+msgid "Czech"
+msgstr "češki"
 
 #: src/gtkdialogs.c:106
+msgid "Danish"
+msgstr "danski"
+
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:153
+msgid "German"
+msgstr "nemački"
+
+#: src/gtkdialogs.c:108
+msgid "Australian English"
+msgstr "australijski engleski"
+
+#: src/gtkdialogs.c:109
 msgid "Canadian English"
 msgstr "kanadski engleski"
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:146
+#: src/gtkdialogs.c:110
+msgid "British English"
+msgstr "britanski engleski"
+
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:154
 msgid "Spanish"
 msgstr "španski"
 
-#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:112
+msgid "Estonian"
+msgstr "estonski"
+
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:155
 msgid "Finnish"
 msgstr "finski"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:156
 msgid "French"
 msgstr "francuski"
 
-#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:115
 msgid "Hebrew"
 msgstr "hebrejski"
 
-#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:116 src/gtkdialogs.c:157
 msgid "Hindi"
 msgstr "hindu"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:158
 msgid "Hungarian"
 msgstr "mađarski"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:159
 msgid "Italian"
 msgstr "italijanski"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:160
 msgid "Japanese"
 msgstr "japanski"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:120
+msgid "Georgian"
+msgstr "gruzijski"
+
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:161
+msgid "Korean"
+msgstr "korejski"
+
+#: src/gtkdialogs.c:122
 msgid "Lithuanian"
 msgstr "litvanski"
 
-#: src/gtkdialogs.c:116
-#, fuzzy
-msgid "Georgian"
-msgstr "nemački"
-
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:151
-msgid "Korean"
-msgstr "korejski"
-
-#: src/gtkdialogs.c:118
-#, fuzzy
-msgid "Dutch, Flemish"
-msgstr "holandski; flamanski"
-
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:123
 msgid "Macedonian"
 msgstr "makedonski"
 
-#: src/gtkdialogs.c:120
+# hm, hm... ovo smo imali nešto baš naše
+#: src/gtkdialogs.c:124
+msgid "Burmese"
+msgstr "burmski"
+
+#: src/gtkdialogs.c:125
+msgid "Dutch; Flemish"
+msgstr "holandski; flamanski"
+
+#: src/gtkdialogs.c:126
+#, fuzzy
+msgid "Norwegian (Nynorsk)"
+msgstr "norveški"
+
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:162
 msgid "Norwegian"
 msgstr "norveški"
 
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:122 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:128
+msgid "Punjabi"
+msgstr "pandžabi"
+
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:163
 msgid "Polish"
 msgstr "poljski"
 
-#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:130
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: src/gtkdialogs.c:124
+#: src/gtkdialogs.c:131
 msgid "Portuguese-Brazil"
 msgstr "portugalski u Brazilu"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:132
 msgid "Romanian"
 msgstr "rumunski"
 
-#: src/gtkdialogs.c:126 src/gtkdialogs.c:153 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:133 src/gtkdialogs.c:164 src/gtkdialogs.c:165
 msgid "Russian"
 msgstr "ruski"
 
-#: src/gtkdialogs.c:127 src/gtkdialogs.c:128
+#: src/gtkdialogs.c:134
+msgid "Slovenian"
+msgstr "slovenački"
+
+#: src/gtkdialogs.c:135
+msgid "Albanian"
+msgstr "albanski"
+
+#: src/gtkdialogs.c:136
 msgid "Serbian"
 msgstr "srpski"
 
-#: src/gtkdialogs.c:129
-msgid "Slovenian"
-msgstr "slovenački"
-
-#: src/gtkdialogs.c:130 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:137 src/gtkdialogs.c:167 src/gtkdialogs.c:168
 msgid "Swedish"
 msgstr "švedski"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:138
+msgid "Turkish"
+msgstr "turski"
+
+#: src/gtkdialogs.c:139
+msgid "Ukrainian"
+msgstr "ukrajinski"
+
+#: src/gtkdialogs.c:140
 msgid "Vietnamese"
 msgstr "vijetnamski"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:140
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh i Vijetnamski Gnom tim"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:141
 msgid "Simplified Chinese"
 msgstr "uprošćeni kineski"
 
-#: src/gtkdialogs.c:133 src/gtkdialogs.c:134 src/gtkdialogs.c:158
+#: src/gtkdialogs.c:142
 msgid "Traditional Chinese"
 msgstr "tradicionalni kineski"
 
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:148
 msgid "Amharic"
 msgstr "amharski"
 
-#: src/gtkdialogs.c:155
+#: src/gtkdialogs.c:166
 msgid "Slovak"
 msgstr "slovački"
 
-#: src/gtkdialogs.c:199
+#: src/gtkdialogs.c:169
+msgid "Chinese"
+msgstr "kineski"
+
+#: src/gtkdialogs.c:211
 msgid "About Gaim"
 msgstr "O Gaimu"
 
-#: src/gtkdialogs.c:223
-#, fuzzy
+#: src/gtkdialogs.c:226
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: src/gtkdialogs.c:248
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim je proširivi klijent za brze poruke koji može da koristi AIM, ICQ, "
 "Jahu, MSN, IRC, DŽaber, Napster, Zefir i Gadu-Gadu istovremeno. Napisan je "
-"pomoću GTK+ i licenciran pod Gnuovom Opštom javnom licencom (GPL).<BR><BR>"
-
-#: src/gtkdialogs.c:232
-#, fuzzy
+"pomoću Gtk+ i licenciran pod Gnuovom Opštom javnom licencom (GPL).<BR><BR>"
+
+#: src/gtkdialogs.c:258
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim na irc.freenode.net<BR><BR>"
-
-#: src/gtkdialogs.c:235
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+
+#: src/gtkdialogs.c:261
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim na irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:241
+#: src/gtkdialogs.c:267
 msgid "Active Developers"
 msgstr "Aktivni programeri"
 
-#: src/gtkdialogs.c:256
+#: src/gtkdialogs.c:282
 msgid "Crazy Patch Writers"
 msgstr "Ludi pisci ispravki"
 
-#: src/gtkdialogs.c:271
+#: src/gtkdialogs.c:297
 msgid "Retired Developers"
 msgstr "Penzionisani programeri"
 
-#: src/gtkdialogs.c:286
+#: src/gtkdialogs.c:312
 msgid "Current Translators"
 msgstr "Tekući prevodioci"
 
-#: src/gtkdialogs.c:306
+#: src/gtkdialogs.c:332
 msgid "Past Translators"
 msgstr "Prethodni prevodioci"
 
-#: src/gtkdialogs.c:324
-#, fuzzy
-msgid "Debugging Information"
-msgstr "Podaci o korisniku"
-
-#: src/gtkdialogs.c:486 src/gtkdialogs.c:629 src/gtkdialogs.c:684
-#, fuzzy
-msgid "_Name"
-msgstr "Ime"
-
-#: src/gtkdialogs.c:491 src/gtkdialogs.c:634 src/gtkdialogs.c:689
+#: src/gtkdialogs.c:487 src/gtkdialogs.c:629 src/gtkdialogs.c:682
+msgid "_Screen name"
+msgstr "_Ime:"
+
+#: src/gtkdialogs.c:493 src/gtkdialogs.c:635 src/gtkdialogs.c:688
 msgid "_Account"
 msgstr "_Nalog:"
 
-#: src/gtkdialogs.c:499
+#: src/gtkdialogs.c:500
 msgid "New Instant Message"
 msgstr "Nova brza poruka"
 
-#: src/gtkdialogs.c:501
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: src/gtkdialogs.c:502
+msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Unesite ime osobe kojoj želite da uputite brzu poruku."
 
 #: src/gtkdialogs.c:642
@@ -3230,74 +3254,85 @@
 msgstr "Pribavi podatke o korisniku"
 
 #: src/gtkdialogs.c:644
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
 msgstr "Unesite ime osobe čije podatke želite da vidite."
 
+#: src/gtkdialogs.c:696
+msgid "Get User Log"
+msgstr "Pribavi dnevnik o korisniku"
+
 #: src/gtkdialogs.c:698
-#, fuzzy
-msgid "View User Log"
-msgstr "Pribavi dnevnik o korisniku"
-
-#: src/gtkdialogs.c:700
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
 msgstr "Unesite ime osobe čije podatke želite da vidite."
 
-#: src/gtkdialogs.c:719
+#: src/gtkdialogs.c:738
+msgid "Warn User"
+msgstr "Upozori korisnika"
+
+#: src/gtkdialogs.c:759
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Upozorenje za %s?</span>\n"
+"\n"
+"Ovo će uvećati nivo obazrivosti za „%s“ i on ili ona će imati strožije "
+"ograničenje brzine slanja poruka.\n"
+
+#: src/gtkdialogs.c:768
+msgid "Warn _anonymously?"
+msgstr "Upozori _anonimno?"
+
+#: src/gtkdialogs.c:775
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr "<b>Anonimna upozorenja su manjeg uticaja.</b>"
+
+#: src/gtkdialogs.c:796
 msgid "Alias Contact"
 msgstr "Nadeni ime kontaktu"
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:797
 msgid "Enter an alias for this contact."
 msgstr "Unesite nadimak za ovaj kontakt."
 
-#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
-#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:799 src/gtkdialogs.c:821 src/gtkdialogs.c:841
+#: src/gtkrequest.c:251 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "Nadimak"
 
-#: src/gtkdialogs.c:740
+#: src/gtkdialogs.c:817
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Unesite nadimak za %s."
 
-#: src/gtkdialogs.c:742
+#: src/gtkdialogs.c:819
 msgid "Alias Buddy"
 msgstr "Nadeni ime drugaru"
 
-#: src/gtkdialogs.c:761
+#: src/gtkdialogs.c:838
 msgid "Alias Chat"
 msgstr "Nadeni ime razgovoru"
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:839
 msgid "Enter an alias for this chat."
 msgstr "Unesite nadimak za ovaj razgovor."
 
 # bug: plural-forms
-#: src/gtkdialogs.c:799
-#, fuzzy, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
+#: src/gtkdialogs.c:873
+#, 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[0] ""
-"Uklanjate grupu %s i %d ostalih članova iz spiska drugara. Da li želite da "
-"nastavite?"
-msgstr[1] ""
+msgstr ""
 "Uklanjate grupu %s i %d ostalih članova iz spiska drugara. Da li želite da "
 "nastavite?"
-msgstr[2] ""
-"Uklanjate grupu %s i %d ostalih članova iz spiska drugara. Da li želite da "
-"nastavite?"
-
-#: src/gtkdialogs.c:866
+
+#: src/gtkdialogs.c:934
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3306,28 +3341,28 @@
 "Uklanjate grupu %s i sve njene članove iz spiska drugara. Da li želite da "
 "nastavite?"
 
-#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
+#: src/gtkdialogs.c:937 src/gtkdialogs.c:938
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: src/gtkdialogs.c:908
+#: src/gtkdialogs.c:976
 #, 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/gtkdialogs.c:911 src/gtkdialogs.c:912
+#: src/gtkdialogs.c:979 src/gtkdialogs.c:981
 msgid "Remove Buddy"
 msgstr "Ukloni drugara"
 
-#: src/gtkdialogs.c:950
+#: src/gtkdialogs.c:1018
 #, 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/gtkdialogs.c:953 src/gtkdialogs.c:954
+#: src/gtkdialogs.c:1021 src/gtkdialogs.c:1022
 msgid "Remove Chat"
 msgstr "Ukloni razgovor"
 
@@ -3336,15 +3371,15 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:162 src/gtkft.c:1046
+#: src/gtkft.c:162 src/gtkft.c:1012
 msgid "Finished"
 msgstr "Završeno"
 
-#: src/gtkft.c:165 src/gtkft.c:997
+#: src/gtkft.c:165 src/gtkft.c:963
 msgid "Canceled"
 msgstr "Otkaži"
 
-#: src/gtkft.c:168 src/gtkft.c:916
+#: src/gtkft.c:168 src/gtkft.c:882
 msgid "Waiting for transfer to begin"
 msgstr "Čekam da prenos počne"
 
@@ -3364,205 +3399,181 @@
 msgid "<b>Sending As:</b>"
 msgstr "<b>Slanje kao:</b>"
 
-#: src/gtkft.c:445
+#: src/gtkft.c:436
 msgid "There is no application configured to open this type of file."
 msgstr "Nijedan program nije namenjen za otvaranje ove vrste datoteka."
 
-#: src/gtkft.c:450
+#: src/gtkft.c:441
 msgid "An error occurred while opening the file."
 msgstr "Došlo je do greške pri otvaranju datoteke."
 
-#: src/gtkft.c:470
-#, fuzzy, c-format
-msgid "Error launching %s: %s"
-msgstr "Greška pri pokretanju<b>%s</b>: %s"
-
-#: src/gtkft.c:479
-#, fuzzy, c-format
-msgid "Error running %s"
-msgstr "Greška pri uključenju u razgovor: %s"
-
-#: src/gtkft.c:480
-#, c-format
-msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:575
+#: src/gtkft.c:533
 msgid "Progress"
 msgstr "Napredak"
 
-#: src/gtkft.c:582
+#: src/gtkft.c:540
 msgid "Filename"
 msgstr "Naziv datoteke"
 
-#: src/gtkft.c:589
+#: src/gtkft.c:547
 msgid "Size"
 msgstr "Veličina"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:554
 msgid "Remaining"
 msgstr "Preostalo"
 
-#: src/gtkft.c:627
+#: src/gtkft.c:586
 msgid "Filename:"
 msgstr "Naziv datoteke:"
 
-#: src/gtkft.c:628
-#, fuzzy
+#: src/gtkft.c:587
 msgid "Local File:"
-msgstr "Lokalni korisnici"
-
-#: src/gtkft.c:629
+msgstr "Lokalna datoteka:"
+
+#: src/gtkft.c:588
 msgid "Status:"
 msgstr "Stanje:"
 
-#: src/gtkft.c:630
+#: src/gtkft.c:589
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: src/gtkft.c:631
+#: src/gtkft.c:590
 msgid "Time Elapsed:"
 msgstr "Proteklo vreme:"
 
-#: src/gtkft.c:632
+#: src/gtkft.c:591
 msgid "Time Remaining:"
 msgstr "Preostalo vreme:"
 
-#: src/gtkft.c:718
+#: src/gtkft.c:683
 msgid "_Keep the dialog open"
 msgstr "_Ostavi prozor otvoren"
 
-#: src/gtkft.c:728
+#: src/gtkft.c:693
 msgid "_Clear finished transfers"
 msgstr "_Izbaci završene prenose"
 
 #. "Download Details" arrow
-#: src/gtkft.c:737
+#: src/gtkft.c:702
 msgid "Show transfer details"
 msgstr "Prikaži detalje prenosa"
 
-#: src/gtkft.c:738
+#: src/gtkft.c:703
 msgid "Hide transfer details"
 msgstr "Sakrij detalje prenosa"
 
 #. Pause button
-#: src/gtkft.c:775 src/gtkstock.c:106
+#: src/gtkft.c:745 src/stock.c:92
 msgid "_Pause"
 msgstr "_Zastani"
 
 #. Resume button
-#: src/gtkft.c:785
+#: src/gtkft.c:755
 msgid "_Resume"
 msgstr "_Nastavi"
 
-#: src/gtkft.c:999
+#: src/gtkft.c:965
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: src/gtkgaim-disclosure.c:258
-msgid "Expander Size"
-msgstr "Veličina proširivača"
-
-#: src/gtkgaim-disclosure.c:259
-msgid "Size of the expander arrow"
-msgstr "Veličina strelice proširivača"
-
-#: src/gtkimhtml.c:816
+#: src/gtkimhtml.c:693
 msgid "Pa_ste As Text"
 msgstr "Zalepi kao tekst"
 
-#: src/gtkimhtml.c:1263
+#: src/gtkimhtml.c:1087
 msgid "Hyperlink color"
 msgstr "Boja nad-veze"
 
-#: src/gtkimhtml.c:1264
+#: src/gtkimhtml.c:1088
 msgid "Color to draw hyperlinks."
 msgstr "Boja za iscrtavanje nad-veza."
 
-#: src/gtkimhtml.c:1267
-#, fuzzy
-msgid "Hyperlink prelight color"
-msgstr "Boja nad-veze"
-
-#: src/gtkimhtml.c:1268
-#, fuzzy
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Boja za iscrtavanje nad-veza."
-
-#: src/gtkimhtml.c:1486
+#: src/gtkimhtml.c:1296
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj adresu e-pošte"
 
-#: src/gtkimhtml.c:1498
+#: src/gtkimhtml.c:1308
+msgid "_Copy Link Location"
+msgstr "_Kopiraj adresu veze"
+
+#: src/gtkimhtml.c:1318
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: src/gtkimhtml.c:1508
-msgid "_Copy Link Location"
-msgstr "_Kopiraj adresu veze"
-
-#: src/gtkimhtml.c:3182
+#: src/gtkimhtml.c:2915
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: src/gtkimhtml.c:3185
+"<span size='larger' weight='bold'>Neprepoznata vrsta datoteke</span>\n"
+"\n"
+"Podrazumevam PNG."
+
+#: src/gtkimhtml.c:2918
+#, fuzzy
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: src/gtkimhtml.c:3198
-#, fuzzy, c-format
+"Neprepoznata vrsta datoteke\n"
+"\n"
+"Podrazumevam PNG."
+
+#: src/gtkimhtml.c:2931
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Stigla Vam je pošta!</span>\n"
+"<span size='larger' weight='bold'>Greška pri čuvanju slike</span>\n"
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3201
+#: src/gtkimhtml.c:2934
 #, fuzzy, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr "Greška pri snimanju slike: %s"
-
-#: src/gtkimhtml.c:3281 src/gtkimhtml.c:3293
+msgstr ""
+"Greška pri čuvanju slike\n"
+"\n"
+"%s"
+
+#: src/gtkimhtml.c:3014 src/gtkimhtml.c:3026
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#: src/gtkimhtml.c:3321
+#: src/gtkimhtml.c:3054
 msgid "_Save Image..."
 msgstr "_Sačuvaj sliku..."
 
-#: src/gtkimhtmltoolbar.c:141
+#: src/gtkimhtmltoolbar.c:176
 msgid "Select Font"
 msgstr "Izaberite pismo"
 
-#: src/gtkimhtmltoolbar.c:220
+#: src/gtkimhtmltoolbar.c:254
 msgid "Select Text Color"
 msgstr "Izaberite boju teksta"
 
-#: src/gtkimhtmltoolbar.c:299
+#: src/gtkimhtmltoolbar.c:328
 msgid "Select Background Color"
 msgstr "Izaberite boju pozadine"
 
-#: src/gtkimhtmltoolbar.c:388
+#: src/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_Adresa:"
 
-#: src/gtkimhtmltoolbar.c:396
+#: src/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Opis:"
 
-#: src/gtkimhtmltoolbar.c:399
+#: src/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3570,154 +3581,92 @@
 "Unesite Internet adresu i opis veze koju želite da ubacite. Opis nije "
 "obavezan."
 
-#: src/gtkimhtmltoolbar.c:403
+#: src/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Unesite Internet adresu i opis veze koju želite da ubacite."
 
-#: src/gtkimhtmltoolbar.c:408
+#: src/gtkimhtmltoolbar.c:432
 msgid "Insert Link"
 msgstr "Umetni vezu"
 
-#: src/gtkimhtmltoolbar.c:412
+#: src/gtkimhtmltoolbar.c:436
 msgid "_Insert"
 msgstr "U_metni"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:505
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Ne mogu da sačuvam sliku: %s.\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
 msgid "Insert Image"
 msgstr "Umetni sliku"
 
-#: src/gtkimhtmltoolbar.c:715
+#: src/gtkimhtmltoolbar.c:679
 msgid "This theme has no available smileys."
 msgstr "Ova tema ne sadrži određen skup smešaka."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:729
+#: src/gtkimhtmltoolbar.c:694
 msgid "Smile!"
 msgstr "Smešak!"
 
-#: src/gtkimhtmltoolbar.c:917
+#: src/gtkimhtmltoolbar.c:912
 msgid "Bold"
 msgstr "Masno"
 
-#: src/gtkimhtmltoolbar.c:928
+#: src/gtkimhtmltoolbar.c:923
 msgid "Italic"
 msgstr "Kurziv"
 
-#: src/gtkimhtmltoolbar.c:939
+#: src/gtkimhtmltoolbar.c:934
 msgid "Underline"
 msgstr "Podvučeno"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:950
 msgid "Larger font size"
 msgstr "Veća slova"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:962
 msgid "Smaller font size"
 msgstr "Manja slova"
 
-#: src/gtkimhtmltoolbar.c:984
+#: src/gtkimhtmltoolbar.c:979
 msgid "Font Face"
 msgstr "Pismo"
 
-#: src/gtkimhtmltoolbar.c:996
+#: src/gtkimhtmltoolbar.c:991
 msgid "Foreground font color"
 msgstr "Boja teksta"
 
-#: src/gtkimhtmltoolbar.c:1008
+#: src/gtkimhtmltoolbar.c:1003
 msgid "Background color"
 msgstr "Boja pozadine"
 
-#: src/gtkimhtmltoolbar.c:1024
-#, fuzzy
-msgid "Clear formatting"
-msgstr "Očisti formatiranje"
-
-#: src/gtkimhtmltoolbar.c:1039
+#: src/gtkimhtmltoolbar.c:1018
 msgid "Insert link"
 msgstr "Ubaci vezu"
 
-#: src/gtkimhtmltoolbar.c:1049
+#: src/gtkimhtmltoolbar.c:1028
 msgid "Insert image"
 msgstr "Ubaci sliku"
 
-#: src/gtkimhtmltoolbar.c:1060
+#: src/gtkimhtmltoolbar.c:1039
 msgid "Insert smiley"
 msgstr "Ubaci smešak"
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "Razgovori sa %s"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "Razgovori sa %s"
-
-#: src/gtklog.c:397
-msgid ""
-"System events will only be logged if the <span style=\"italic\">Enable "
-"system log preference</span> is set."
-msgstr ""
-
-#: src/gtklog.c:401
-msgid ""
-"Instant messages will only be logged if the <span style=\"italic\">Log all "
-"instant messages</span> preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:404
-msgid ""
-"Chats will only be logged if the <span style=\"italic\">Log all chats "
-"preference</span> is enabled."
-msgstr ""
-
-#: src/gtklog.c:409
-msgid "No logs were found."
-msgstr ""
-
-#: src/gtklog.c:455
-#, fuzzy, c-format
-msgid "Conversations in %s"
-msgstr "Razgovori sa %s"
-
-#: src/gtklog.c:463 src/gtklog.c:513
+#: src/gtklog.c:316
 #, c-format
 msgid "Conversations with %s"
 msgstr "Razgovori sa %s"
 
-#: src/gtklog.c:538
+#. Window **********
+#: src/gtklog.c:412 src/gtklog.c:429
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: src/gtkmain.c:323
-#, 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/gtkmain.c:325
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-
 #. Descriptive label
-#: src/gtknotify.c:267
+#: src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -3725,17 +3674,17 @@
 msgstr[1] "%s je primio %d nove poruke."
 msgstr[2] "%s je primio %d novih poruka."
 
-#: src/gtknotify.c:281
+#: src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Od:</span> %s\n"
 
-#: src/gtknotify.c:290
+#: src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Tema:</span> %s\n"
 
-#: src/gtknotify.c:295
+#: src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3746,7 +3695,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:311
+#: src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3757,26 +3706,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:456
-msgid "Search Results"
-msgstr "Rezultati pretrage"
-
-#: src/gtknotify.c:617
+#: src/gtknotify.c:430
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Komanda čitaču <b>%s</b> nije ispravna."
 
-#: src/gtknotify.c:619 src/gtknotify.c:631 src/gtknotify.c:644
-#: src/gtknotify.c:768
+#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "Ne mogu da otvorim adresu"
 
-#: src/gtknotify.c:629 src/gtknotify.c:642
+#: src/gtknotify.c:442 src/gtknotify.c:455
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Greška pri pokretanju<b>%s</b>: %s"
 
-#: src/gtknotify.c:769
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Izabrana je „ručna“ naredba za veb čitač, a naredba nije postavljena."
@@ -3790,7 +3735,7 @@
 msgstr "Unesite drugara kome želite da postavite zasedu."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:391 src/gtkpounce.c:895
 msgid "New Buddy Pounce"
 msgstr "Nova zaseda drugaru"
 
@@ -3886,55 +3831,63 @@
 msgstr "_Snimi ovu zasedu nakon aktiviranja"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
+#: src/gtkpounce.c:902
 msgid "Remove Buddy Pounce"
 msgstr "Ukloni zasedu drugaru"
 
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s počinje da Vam piše poruku (%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se prijavio(la) (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s se aktivirao(la) (%s)"
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se vratio(la) sa odsustva (%s)"
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s je prestao(la) da Vam piše (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se odjavio(la) (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se uspavao(la) (%s)"
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je odišao(la) na odsustvo. (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:978
 msgid "Unknown pounce event. Please report this!"
 msgstr "Nepoznata zaseda. Molimo Vas da ovo prijavite!"
 
-#: src/gtkprefs.c:685
+#: src/gtkprefs.c:447
+msgid "Interface Options"
+msgstr "Postavke sučelja"
+
+#: src/gtkprefs.c:449
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "Prikaži udaljene nadimke ukoliko alijas nije postavljen"
+
+#: src/gtkprefs.c:681
 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."
@@ -3942,58 +3895,48 @@
 "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:725
+#: src/gtkprefs.c:721
 msgid "Icon"
 msgstr "Ikonica"
 
-#: src/gtkprefs.c:732 src/gtkprefs.c:2040 src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:728 src/gtkprefs.c:2205 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:757 src/protocols/jabber/chat.c:743
 msgid "Description"
 msgstr "Opis"
 
+#: src/gtkprefs.c:824
+msgid "Display"
+msgstr "Prikaz"
+
+#: src/gtkprefs.c:825
+msgid "Show _timestamp on messages"
+msgstr "Prikaži _vremenske oznake poruka"
+
+#: src/gtkprefs.c:828
+msgid "_Highlight misspelled words"
+msgstr "Istakni gre_ške u kucanju"
+
 #: src/gtkprefs.c:832
-msgid "Buddy List Sorting"
-msgstr "Poredak u spisku drugara"
+msgid "Ignore c_olors"
+msgstr "Zanemari _boje"
+
+#: src/gtkprefs.c:834
+msgid "Ignore font _faces"
+msgstr "Zanemari _pismo"
+
+#: src/gtkprefs.c:836
+msgid "Ignore font si_zes"
+msgstr "Zanemari veličinu _slova"
+
+#: src/gtkprefs.c:839
+msgid "Default Formatting"
+msgstr "Podrazumevano formatiranje"
 
 #: src/gtkprefs.c:841
-msgid "_Sorting:"
-msgstr "_Poredak:"
-
-#: src/gtkprefs.c:846
-msgid "Buddy Display"
-msgstr "Prikaz drugara"
-
-#: src/gtkprefs.c:847
-#, fuzzy
-msgid "Show more buddy details"
-msgstr "Prikaži detalje o korisniku"
-
-#: src/gtkprefs.c:885
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Neprepoznate komande \"_sa crtom\" šalji kao poruke"
-
-#: src/gtkprefs.c:887
-#, fuzzy
-msgid "Show _formatting on incoming messages"
-msgstr "Prikaži alatke za formatiranje"
-
-#: src/gtkprefs.c:889
-msgid "Show buddy _icons"
-msgstr "Prikaži i_konice drugara"
-
-#: src/gtkprefs.c:891
-msgid "Enable buddy ic_on animation"
-msgstr "Uključi _animaciju ikonice drugara"
-
-#: src/gtkprefs.c:893
-msgid "_Notify buddies that you are typing to them"
-msgstr "Slanje obaveštenja drugarima kada im piše_te"
-
-#: src/gtkprefs.c:896
-msgid "_Highlight misspelled words"
-msgstr "Istakni gre_ške u kucanju"
-
-#: src/gtkprefs.c:914
+msgid "_Send default formatting with outgoing messages"
+msgstr "Pošalji podrazumevano formatiranje sa odlazećim porukama"
+
+#: src/gtkprefs.c:873
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4001,152 +3944,274 @@
 "Ovako će se vaše poruke pojavljivati u protokolima koji podržavaju "
 "formatiranje. :)"
 
+#: src/gtkprefs.c:876
+msgid "_Clear Formatting"
+msgstr "Očisti formatiranje"
+
+#: src/gtkprefs.c:913
+msgid "Send Message"
+msgstr "Slanje poruke"
+
+#: src/gtkprefs.c:914
+msgid "Enter _sends message"
+msgstr "Enter _šalje poruku"
+
+#: src/gtkprefs.c:916
+msgid "C_ontrol-Enter sends message"
+msgstr "Control+Enter š_alje poruku"
+
+#: src/gtkprefs.c:919
+msgid "Window Closing"
+msgstr "Zatvaranje prozora"
+
+#: src/gtkprefs.c:920
+msgid "_Escape closes window"
+msgstr "Esc zatvara _prozor"
+
+#: src/gtkprefs.c:923
+msgid "Insertions"
+msgstr "Ubacivanje"
+
+#: src/gtkprefs.c:924
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U/S} ubacuje HTML _oznake"
+
+#: src/gtkprefs.c:926
+msgid "Control-(number) _inserts smileys"
+msgstr "Control-(broj) ubacuje _smešak"
+
+#: src/gtkprefs.c:942
+msgid "Buddy List Sorting"
+msgstr "Poredak u spisku drugara"
+
+#: src/gtkprefs.c:951
+msgid "_Sorting:"
+msgstr "_Poredak:"
+
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr "Prikaži _dugmad kao:"
+
+#: src/gtkprefs.c:959 src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr "Slike"
+
+#: src/gtkprefs.c:960 src/gtkprefs.c:1012
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gtkprefs.c:961 src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr "Slike i tekst"
+
+#: src/gtkprefs.c:964
+msgid "_Raise window on events"
+msgstr "_Izdigni prozor na događaje"
+
+#: src/gtkprefs.c:967
+msgid "Buddy Display"
+msgstr "Prikaz drugara"
+
+#: src/gtkprefs.c:968 src/gtkprefs.c:1030
+msgid "Show buddy _icons"
+msgstr "Prikaži i_konice drugara"
+
+#: src/gtkprefs.c:970
+msgid "Show _warning levels"
+msgstr "Prikaži _nivoe upozorenja"
+
+#: src/gtkprefs.c:972
+msgid "Show idle _times"
+msgstr "Prikaži _trajanje neaktivnosti"
+
+#: src/gtkprefs.c:974
+msgid "Dim i_dle buddies"
+msgstr "_Osenči neaktivne drugare"
+
+#: src/gtkprefs.c:976
+msgid "_Automatically expand contacts"
+msgstr "_Sam razgranaj kontakte"
+
+#: src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr "Dozvoli komande \"_sa crtom\""
+
+#: src/gtkprefs.c:1023
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Neprepoznate komande \"_sa crtom\" šalji kao poruke"
+
+#: src/gtkprefs.c:1026
+msgid "Show _formatting toolbar"
+msgstr "Prikaži alatke za formatiranje"
+
+#: src/gtkprefs.c:1028
+msgid "Show _aliases in tabs/titles"
+msgstr "Prikaži a_lijase u jezičcima/naslovima"
+
+#: src/gtkprefs.c:1032
+msgid "Enable buddy ic_on animation"
+msgstr "Uključi _animaciju ikonice drugara"
+
+#: src/gtkprefs.c:1034
+msgid "_Notify buddies that you are typing to them"
+msgstr "Slanje obaveštenja drugarima kada im piše_te"
+
+#: src/gtkprefs.c:1036
+msgid "_Raise IM window on events"
+msgstr "_Izdigni prozor na događaje"
+
+#: src/gtkprefs.c:1039
+msgid "Raise chat _window on events"
+msgstr "_Izdigni prozor na događaje"
+
+#: src/gtkprefs.c:1041
+msgid "Use _multi-colored screen names in chats"
+msgstr "Koristi _višebojne nadimke u razgovorima"
+
 #. All the tab options!
-#: src/gtkprefs.c:935
+#: src/gtkprefs.c:1045
 msgid "Tab Options"
 msgstr "Postavke listova"
 
-#: src/gtkprefs.c:937
+#: src/gtkprefs.c:1047
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prikaži brze poruke i razgovore u prozorima pomoću _listova"
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:1062
 msgid "Show close b_utton on tabs"
 msgstr "Prikaži dugme za zatvara_nje na jezičcima"
 
-#: src/gtkprefs.c:957
-#, fuzzy
-msgid "_Placement:"
-msgstr "Dodatni razmeštaj"
-
-#: src/gtkprefs.c:959
+#: src/gtkprefs.c:1065
+msgid "Tab p_lacement:"
+msgstr "Postavka _jezičaka:"
+
+#: src/gtkprefs.c:1067
 msgid "Top"
 msgstr "Na vrhu"
 
-#: src/gtkprefs.c:960
+#: src/gtkprefs.c:1068
 msgid "Bottom"
 msgstr "Na dnu"
 
-#: src/gtkprefs.c:961
+#: src/gtkprefs.c:1069
 msgid "Left"
 msgstr "Levo"
 
-#: src/gtkprefs.c:962
+#: src/gtkprefs.c:1070
 msgid "Right"
 msgstr "Desno"
 
-#: src/gtkprefs.c:966
-#, fuzzy
-msgid "N_ew conversations:"
-msgstr "Okončaj razgovor"
+#: src/gtkprefs.c:1076
+msgid "New conversation _placement:"
+msgstr "Smeštanje novih razgovora"
 
 # Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-#: src/gtkprefs.c:1017 src/protocols/oscar/oscar.c:772
-#: src/protocols/oscar/oscar.c:5310
+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:5198
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: src/gtkprefs.c:1019
+#: src/gtkprefs.c:1129
 msgid "_Autodetect IP Address"
 msgstr "Sam odredi IP adresu"
 
-#: src/gtkprefs.c:1028
+#: src/gtkprefs.c:1138
 msgid "Public _IP:"
 msgstr "Javni _IP broj:"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1162
 msgid "Ports"
 msgstr "Portovi"
 
-#: src/gtkprefs.c:1055
+#: src/gtkprefs.c:1165
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ručno odredi opseg portova za slušanje"
 
-#: src/gtkprefs.c:1058
+#: src/gtkprefs.c:1168
 msgid "_Start Port:"
 msgstr "_Prvi port:"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1175
 msgid "_End Port:"
 msgstr "_Poslednji port:"
 
-#: src/gtkprefs.c:1072
+#: src/gtkprefs.c:1182
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: src/gtkprefs.c:1076
+#: src/gtkprefs.c:1186
 msgid "No proxy"
 msgstr "Bez proksija"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1248
 msgid "_User:"
 msgstr "_Korisnik:"
 
-#: src/gtkprefs.c:1194
+#: src/gtkprefs.c:1304
 msgid "Epiphany"
 msgstr "Spoznaja"
 
-#: src/gtkprefs.c:1195
+#: src/gtkprefs.c:1305
 msgid "Firebird"
 msgstr "Žar-ptica"
 
-#: src/gtkprefs.c:1196
+#: src/gtkprefs.c:1306
 msgid "Firefox"
 msgstr "Žar-lija"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1307
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1198
+#: src/gtkprefs.c:1308
 msgid "Gnome Default"
 msgstr "Gnom podrazumevano"
 
-#: src/gtkprefs.c:1199
+#: src/gtkprefs.c:1309
 msgid "Konqueror"
 msgstr "Konkveror"
 
-#: src/gtkprefs.c:1200
+#: src/gtkprefs.c:1310
 msgid "Mozilla"
 msgstr "Mozila"
 
-#: src/gtkprefs.c:1201
+#: src/gtkprefs.c:1311
 msgid "Netscape"
 msgstr "Netskejp"
 
-#: src/gtkprefs.c:1202
+#: src/gtkprefs.c:1312
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1211
+#: src/gtkprefs.c:1321
 msgid "Manual"
 msgstr "Ručna postavka"
 
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1372
 msgid "Browser Selection"
 msgstr "Izbor preglednika"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1376
 msgid "_Browser:"
 msgstr "_Veb preglednik:"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1383
 msgid "_Open link in:"
 msgstr "_Otvori vezu u:"
 
-#: src/gtkprefs.c:1277
+#: src/gtkprefs.c:1385
 msgid "Browser default"
 msgstr "Podrazumevano u pregledniku"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1386
 msgid "Existing window"
 msgstr "Postojeći prozor"
 
-#: src/gtkprefs.c:1280
+#: src/gtkprefs.c:1388
 msgid "New tab"
 msgstr "Novi jezičak"
 
-#: src/gtkprefs.c:1294
+#: src/gtkprefs.c:1402
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4155,78 +4220,83 @@
 "_Ručno:\n"
 "(%s za adresu)"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1439
 msgid "Message Logs"
 msgstr "Dnevnik poruka"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1442
 msgid "Log _Format:"
 msgstr "Oblik _dnevnika:"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1445
 msgid "_Log all instant messages"
 msgstr "Beleži sve _brze poruke"
 
-#: src/gtkprefs.c:1341
+#: src/gtkprefs.c:1447
 msgid "Log all c_hats"
 msgstr "Beleži sve _razgovore"
 
-#: src/gtkprefs.c:1344
+#: src/gtkprefs.c:1450
 msgid "System Logs"
 msgstr "Sistemski dnevnik"
 
-#: src/gtkprefs.c:1346
+#: src/gtkprefs.c:1452
 msgid "_Enable system log"
 msgstr "_Omogući sistemski dnevnik"
 
-#: src/gtkprefs.c:1349
-#, fuzzy
-msgid "Log when buddies log in/log _out"
+#: src/gtkprefs.c:1455
+msgid "Log when buddies _sign on/sign off"
 msgstr "Beleži kada se drugari _prijavljuju/odjavljuju"
 
-#: src/gtkprefs.c:1355
+#: src/gtkprefs.c:1461
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Beleži kada su drugari _neaktivni/aktivni"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1467
 msgid "Log when buddies go away/come _back"
 msgstr "Beleži kada su drugari _odsustni/prisutni"
 
-#: src/gtkprefs.c:1367
-#, fuzzy
-msgid "Log your own _signons/idleness/awayness"
+#: src/gtkprefs.c:1473
+msgid "Log your _own signons/idleness/awayness"
 msgstr "Beleži _lične prijave/neaktivnost/odsustva"
 
-#: src/gtkprefs.c:1504
+#: src/gtkprefs.c:1600
 msgid "Sound Selection"
 msgstr "Izbor zvuka"
 
-#: src/gtkprefs.c:1558
+#: src/gtkprefs.c:1651
+msgid "Sound Options"
+msgstr "Postavke zvuka"
+
+#: src/gtkprefs.c:1652
+msgid "Sounds when conversation has _focus"
+msgstr "Zvuk kada prozor razgovora bude _fokusiran"
+
+#: src/gtkprefs.c:1654
+msgid "_Sounds while away"
+msgstr "Zvuk je _aktivan dok ste odsutni"
+
+#: src/gtkprefs.c:1658
 msgid "Sound Method"
 msgstr "Način oglašavanja"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1659
 msgid "_Method:"
 msgstr "_Način:"
 
-#: src/gtkprefs.c:1561
+#: src/gtkprefs.c:1661
 msgid "Console beep"
 msgstr "Konzolni zvuk"
 
-#: src/gtkprefs.c:1563
+#: src/gtkprefs.c:1663
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/gtkprefs.c:1568
+#: src/gtkprefs.c:1670
 msgid "Command"
 msgstr "Naredba"
 
-#: src/gtkprefs.c:1569
-#, fuzzy
-msgid "No sounds"
-msgstr "Zvuk"
-
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1678
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4235,99 +4305,90 @@
 "Naredba za zvuk:\n"
 "(%s za naziv datoteke)"
 
-#: src/gtkprefs.c:1604
-msgid "Sound Options"
-msgstr "Postavke zvuka"
-
-#: src/gtkprefs.c:1605
-msgid "Sounds when conversation has _focus"
-msgstr "Zvuk kada prozor razgovora bude _fokusiran"
-
-#: src/gtkprefs.c:1607
-msgid "_Sounds while away"
-msgstr "Zvuk je _aktivan dok ste odsutni"
-
-#: src/gtkprefs.c:1617
+#: src/gtkprefs.c:1705
 msgid "Sound Events"
 msgstr "Zvučni događaji"
 
-#: src/gtkprefs.c:1668
+#: src/gtkprefs.c:1756
 msgid "Play"
 msgstr "Pusti"
 
-#: src/gtkprefs.c:1675
+#: src/gtkprefs.c:1763
 msgid "Event"
 msgstr "Događaj"
 
-#: src/gtkprefs.c:1694
+#: src/gtkprefs.c:1782
 msgid "Test"
 msgstr "Isprobaj"
 
-#: src/gtkprefs.c:1698
+#: src/gtkprefs.c:1786
 msgid "Reset"
 msgstr "Odbaci"
 
-#: src/gtkprefs.c:1702
+#: src/gtkprefs.c:1790
 msgid "Choose..."
 msgstr "Izaberi..."
 
-#: src/gtkprefs.c:1758
+#: src/gtkprefs.c:1814
 msgid "_Queue new messages when away"
 msgstr "Odlaži u _red poruke na odsustvu"
 
-#: src/gtkprefs.c:1761
+#: src/gtkprefs.c:1817
 msgid "_Auto-reply:"
 msgstr "Automatski odgovor"
 
-#: src/gtkprefs.c:1764
+#: src/gtkprefs.c:1819
+msgid "Never"
+msgstr "Nikada"
+
+#: src/gtkprefs.c:1820
 msgid "When away"
 msgstr "Pri odsustvu"
 
-#: src/gtkprefs.c:1765
-#, fuzzy
-msgid "When both away and idle"
+#: src/gtkprefs.c:1821
+msgid "When away and idle"
 msgstr "Kada ste odsutni ili spavate"
 
-#: src/gtkprefs.c:1768 src/protocols/msn/msn.c:503
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2819
-#: src/protocols/oscar/oscar.c:4435 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/gtkprefs.c:1824 src/protocols/msn/msn.c:1327
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
+#: src/protocols/oscar/oscar.c:4346 src/protocols/yahoo/yahoo.c:2697
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Neaktivan"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1825
 msgid "Idle _time reporting:"
 msgstr "Prijavljivanje neak_tivnosti:"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1828
 msgid "Gaim usage"
 msgstr "Aktivnost u Gaimu"
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1831
 msgid "X usage"
 msgstr "Aktivnost u IKS-ima"
 
-#: src/gtkprefs.c:1777
+#: src/gtkprefs.c:1833
 msgid "Windows usage"
 msgstr "Aktivnost u Vindousu"
 
-#: src/gtkprefs.c:1785
+#: src/gtkprefs.c:1841
 msgid "Auto-away"
 msgstr "Automatsko odustvo"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1842
 msgid "Set away _when idle"
 msgstr "Idete na o_dsustvo kada ste neaktivni"
 
-#: src/gtkprefs.c:1790
+#: src/gtkprefs.c:1846
 msgid "_Minutes before setting away:"
 msgstr "Broj _minuta pre odlaska na odsustvo:"
 
-#: src/gtkprefs.c:1798
+#: src/gtkprefs.c:1854
 msgid "Away m_essage:"
 msgstr "_Poruka za odsustvo:"
 
-#: src/gtkprefs.c:1856
+#: src/gtkprefs.c:1923
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4342,7 +4403,7 @@
 "<span weight=\"bold\">Veb stranica:</span>\t\t%s\n"
 "<span weight=\"bold\">Datoteka:</span>\t%s"
 
-#: src/gtkprefs.c:1861
+#: src/gtkprefs.c:1928
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4357,43 +4418,63 @@
 "<span weight=\"bold\">Internet adresa:</span>  %s\n"
 "<span weight=\"bold\">Datoteka:</span>  %s"
 
-#: src/gtkprefs.c:1996
+#: src/gtkprefs.c:2161
 msgid "Load"
 msgstr "Učitaj"
 
-#: src/gtkprefs.c:2010
+#: src/gtkprefs.c:2175
 msgid "Summary"
 msgstr "Sažetak"
 
-#: src/gtkprefs.c:2058
+#: src/gtkprefs.c:2223
 msgid "Details"
 msgstr "Detalji"
 
-#: src/gtkprefs.c:2101
+#: src/gtkprefs.c:2384
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: src/gtkprefs.c:2420
+msgid "Interface"
+msgstr "Sučelje"
+
+#: src/gtkprefs.c:2423
+msgid "Message Text"
+msgstr "Tekst poruke"
+
+#: src/gtkprefs.c:2424
+msgid "Shortcuts"
+msgstr "Prečice"
+
+#: src/gtkprefs.c:2425
 msgid "Smiley Themes"
 msgstr "Skupovi smešaka"
 
-#: src/gtkprefs.c:2102
+#: src/gtkprefs.c:2426
 msgid "Sounds"
 msgstr "Zvuk"
 
-#: src/gtkprefs.c:2103 src/protocols/silc/silc.c:1598
+#: src/gtkprefs.c:2427 src/protocols/silc/silc.c:1588
 msgid "Network"
 msgstr "Mreža"
 
-#: src/gtkprefs.c:2108
+#: src/gtkprefs.c:2432
 msgid "Browser"
 msgstr "Preglednik"
 
-#: src/gtkprefs.c:2111
+#: src/gtkprefs.c:2435
 msgid "Logging"
 msgstr "Zapisivanje"
 
-#: src/gtkprefs.c:2112
+#: src/gtkprefs.c:2436
 msgid "Away / Idle"
 msgstr "Odsustvo / Neaktivnost"
 
-#: src/gtkprefs.c:2115
+#: src/gtkprefs.c:2437
+msgid "Away Messages"
+msgstr "Poruke za odsustvo"
+
+#: src/gtkprefs.c:2440
 msgid "Plugins"
 msgstr "Dodaci"
 
@@ -4417,67 +4498,63 @@
 msgid "Block only the users below"
 msgstr "Blokiraj niže navedene korisnike"
 
-#: src/gtkprivacy.c:398
+#: src/gtkprivacy.c:397 src/protocols/jabber/jabber.c:1504
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/gtkprivacy.c:411
+#: src/gtkprivacy.c:410
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Izmene postavki privatnosti se primenjuju trenutno."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: src/gtkprivacy.c:422
 msgid "Set privacy for:"
 msgstr "Postavi privatnost za:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: src/gtkprivacy.c:591 src/gtkprivacy.c:607
 msgid "Permit User"
 msgstr "Dozvole korisnicima"
 
-#: src/gtkprivacy.c:590
+#: src/gtkprivacy.c:592
 msgid "Type a user you permit to contact you."
 msgstr "Unesite korisnika kome dozvoljavate da može da Vas kontaktira."
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:593
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Unesite ime korisnika za koga želite da može da Vas kontaktira."
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:596 src/gtkprivacy.c:609
 msgid "Permit"
 msgstr "Dozvole"
 
-#: src/gtkprivacy.c:599
+#: src/gtkprivacy.c:601
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Dozvolte %s da Vas kontaktira?"
 
-#: src/gtkprivacy.c:601
+#: src/gtkprivacy.c:603
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Da li ste sigurni da želite da %s može da Vas kontaktira?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: src/gtkprivacy.c:630 src/gtkprivacy.c:643
 msgid "Block User"
 msgstr "Blokiranje korisnika"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:631
 msgid "Type a user to block."
 msgstr "Unesite korisnika koga želite da blokirate."
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:632
 msgid "Please enter the name of the user you wish to block."
 msgstr "Unesite ime korisnika koga želite da blokirate."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643
-msgid "Block"
-msgstr "Blokiraj"
-
-#: src/gtkprivacy.c:637
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Block %s?"
 msgstr "Blokiranje korisnika %s?"
 
-#: src/gtkprivacy.c:639
+#: src/gtkprivacy.c:641
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Da li ste sigurni da želite da blokirate korisnika %s?"
@@ -4485,44 +4562,44 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1903
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1892
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1257
+#: src/request.h:1236
 msgid "Yes"
 msgstr "Da"
 
-#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1904
+#: src/gtkrequest.c:242 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1893
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1257
+#: src/request.h:1236
 msgid "No"
 msgstr "Ne"
 
-#: src/gtkrequest.c:262
+#: src/gtkrequest.c:245
 msgid "Apply"
 msgstr "Primeni"
 
-#: src/gtkrequest.c:263 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:246 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/gtkrequest.c:1764
+#: src/gtkrequest.c:1421
 msgid "That file already exists"
 msgstr "Datoteka već postoji."
 
-#: src/gtkrequest.c:1765
+#: src/gtkrequest.c:1422
 msgid "Would you like to overwrite it?"
 msgstr "Da li želite da je prepišete?"
 
-#: src/gtkrequest.c:1807 src/gtkrequest.c:1848
+#: src/gtkrequest.c:1460 src/gtkrequest.c:1481
 msgid "Save File..."
 msgstr "Sačuvaj kao..."
 
-#: src/gtkrequest.c:1808 src/gtkrequest.c:1849
+#: src/gtkrequest.c:1461 src/gtkrequest.c:1482
 msgid "Open File..."
 msgstr "Otvori..."
 
@@ -4535,118 +4612,52 @@
 msgid "_Get List"
 msgstr "_Dobavi spisak"
 
-#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:799 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Titula"
-
-#: src/gtksavedstatuses.c:325
-msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:316
-#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
-#: src/protocols/gg/gg.c:334 src/protocols/gg/gg.c:340
-#: src/protocols/gg/gg.c:346 src/protocols/gg/gg.c:352
-#: src/protocols/irc/irc.c:181 src/protocols/jabber/jabber.c:977
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
-#: src/protocols/jabber/jabber.c:995 src/protocols/jabber/jabber.c:1001
-#: src/protocols/jabber/jabber.c:1007 src/protocols/jabber/jabber.c:1013
-#: src/protocols/novell/novell.c:2833 src/protocols/oscar/oscar.c:7057
-#: src/protocols/oscar/oscar.c:7064 src/protocols/yahoo/yahoo.c:3181
-#: src/protocols/yahoo/yahoo.c:3215 src/protocols/zephyr/zephyr.c:2260
-msgid "Message"
-msgstr "_Poruka:"
-
-#: src/gtksavedstatuses.c:399
-#, fuzzy
-msgid "Saved Statuses"
-msgstr "Stanje"
-
-#: src/gtksavedstatuses.c:520
-msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:611
-#, fuzzy
-msgid "Custom status"
-msgstr "Po stanju"
-
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:620
-#: src/protocols/jabber/buddy.c:627 src/protocols/jabber/buddy.c:638
-#: src/protocols/jabber/jabber.c:956 src/protocols/msn/msn.c:501
-#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2836
-#: src/protocols/oscar/oscar.c:754 src/protocols/oscar/oscar.c:760
-#: src/protocols/oscar/oscar.c:762 src/protocols/yahoo/yahoo.c:2756
-msgid "Status"
-msgstr "Stanje"
-
-#: src/gtksavedstatuses.c:733
-#, fuzzy
-msgid "_Title:"
-msgstr "Titula"
-
-#: src/gtksavedstatuses.c:744
-#, fuzzy
-msgid "Out of the office"
-msgstr "Nema dovoljno memorije"
-
-#: src/gtksavedstatuses.c:755
-#, fuzzy
-msgid "_Status:"
-msgstr "Stanje:"
-
-#. Custom status message disclosure
-#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
-msgid "Use a different status for some accounts"
-msgstr ""
-
-#: src/gtksound.c:60
+#: src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Drugar se prijavio"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Drugar se odjavio"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:65
 msgid "Message received"
 msgstr "Poruka primljena"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Primljena poruka započinje razgovor"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:67
 msgid "Message sent"
 msgstr "Poruka poslata"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Osoba se priključuje razgovoru"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Osoba napušta razgovor"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Najglasniji ste trenutno u razgovoru"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Ostali su glasniji trenutno u razgovoru"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "Neko pominje Vaše ime u razgovoru"
 
-#: src/gtksound.c:257
+#: src/gtksound.c:173
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Ne mogu reprodukovati zvuk zato što izabrana datoteka (%s) ne postoji."
 
-#: src/gtksound.c:273
+#: src/gtksound.c:189
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4654,7 +4665,7 @@
 "Ne mogu reprodukovati zvuk zato što je izabrana „Naredba“ za način "
 "oglašavanja, ali naredba nije postavljena."
 
-#: src/gtksound.c:285
+#: src/gtksound.c:201
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4663,164 +4674,15 @@
 "Ne mogu reprodukovati zvuk zato što se ne može pokrenuti postavljena zvučna "
 "naredba: %s"
 
-#: src/gtkstatusbox.c:132
-#, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
-#. connect to the server
-#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:262
-#: src/protocols/jabber/jabber.c:807 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2165
-#: src/protocols/oscar/oscar.c:1819 src/protocols/trepia/trepia.c:1069
-#: src/protocols/yahoo/yahoo.c:2426 src/protocols/zephyr/zephyr.c:1546
-msgid "Connecting"
-msgstr "Uspostavljanje veze"
-
-#. hacks
-#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:176
-#: src/protocols/jabber/jabber.c:988 src/protocols/msn/msn.c:534
-#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
-#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
-#: src/protocols/novell/novell.c:2810 src/protocols/novell/novell.c:2948
-#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:801
-#: src/protocols/oscar/oscar.c:7056 src/protocols/silc/silc.c:50
-#: src/protocols/yahoo/yahoo.c:3175 src/status.c:156
-msgid "Available"
-msgstr "Dostupan"
-
-#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:54
-#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7070
-#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:3219
-msgid "Invisible"
-msgstr "Nevidljiv"
-
-#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:306
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1083
-#: src/protocols/jabber/jabber.c:977 src/protocols/msn/msn.c:526
-#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2941 src/protocols/oscar/oscar.c:762
-#: src/protocols/oscar/oscar.c:6892 src/protocols/oscar/oscar.c:7046
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2606
-#: src/protocols/yahoo/yahoo.c:3169 src/status.c:154
-msgid "Offline"
-msgstr "Nepovezan"
-
-#. TODO: Add saved statuses here?
-#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
-#, fuzzy
-msgid "New Status"
-msgstr "Stanje"
-
-#: src/gtkstock.c:101
-msgid "_Alias"
-msgstr "Nadimak"
-
-#: src/gtkstock.c:103
-msgid "_Invite"
-msgstr "Pozovi"
-
-#: src/gtkstock.c:104
-msgid "_Modify"
-msgstr "_Izmeni"
-
-#: src/gtkstock.c:105
-msgid "_Open Mail"
-msgstr "_Otvori poštu"
-
-#: src/gtkstock.c:107
-msgid "_Warn"
-msgstr "_Upozori"
-
-#: src/gtkutils.c:1386 src/gtkutils.c:1411
-#, fuzzy, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "Došlo je do nepoznate greške pri prijavi: %s."
-
-#: src/gtkutils.c:1388 src/gtkutils.c:1413
-#, fuzzy
-msgid "Failed to load image"
-msgstr "Ne mogu da sačuvam sliku: %s.\n"
-
-#: src/gtkutils.c:1488
-#, fuzzy, c-format
-msgid "Cannot send folder %s."
-msgstr "Ne mogu da pošaljem datoteku"
-
-#: src/gtkutils.c:1490
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: src/gtkutils.c:1518 src/gtkutils.c:1527 src/gtkutils.c:1532
-#, fuzzy
-msgid "You have dragged an image"
-msgstr "Uneli ste neispravno korisničko ime"
-
-#: src/gtkutils.c:1519
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1523 src/gtkutils.c:1538
-#, fuzzy
-msgid "Set as buddy icon"
-msgstr "Prikaži i_konice drugara"
-
-#: src/gtkutils.c:1524 src/gtkutils.c:1539
-#, fuzzy
-msgid "Send image file"
-msgstr "Slanje poruke"
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1539
-#, fuzzy
-msgid "Insert in message"
-msgstr "Ubaci sliku"
-
-#: src/gtkutils.c:1528
-#, fuzzy
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Da li želite da se priključite razgovoru?"
-
-#: src/gtkutils.c:1533
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1535
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1589
-#, fuzzy
-msgid "Cannot send launcher"
-msgstr "Ne mogu da pošaljem datoteku"
-
-#: src/gtkutils.c:1589
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: src/log.c:105
+#: src/log.c:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Dnevnik ne omogućava čitanje</font></b>"
 
-#: src/log.c:746
+#: src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:811
+#: src/log.c:608
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4829,7 +4691,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMO-"
 "ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:813
+#: src/log.c:610
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4838,29 +4700,115 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMO-"
 "ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:864 src/log.c:995
+#: src/log.c:661 src/log.c:791
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Ne mogu da nađem putanju dnevnika!</b></font>"
 
-#: src/log.c:874 src/log.c:1007
+#: src/log.c:671 src/log.c:803
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ne mogu da čitam datoteku: %s</b></font>"
 
-#: src/log.c:878
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:940
+#: src/log.c:736
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <SAMO-ODGOVOR>: %s\n"
 
-#: src/log.c:1011
+#: src/log.c:807
 msgid "Plain text"
 msgstr "Običan tekst"
 
-#: src/plugin.c:324
+#: src/main.c:150
+msgid "Please create an account."
+msgstr "Načinite nalog."
+
+#: src/main.c:232
+msgid "Login"
+msgstr "Prijava"
+
+#: src/main.c:248
+msgid "<b>_Account:</b>"
+msgstr "<b>_Nalog:</b>"
+
+#: src/main.c:262
+msgid "<b>_Password:</b>"
+msgstr "<b>_Lozinka:</b>"
+
+#. And now for the buttons
+#: src/main.c:279
+msgid "A_ccounts"
+msgstr "_Nalozi"
+
+#: src/main.c:285
+msgid "P_references"
+msgstr "_Postavke"
+
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "Prijavi _se"
+
+#. full help text
+#: src/main.c:513
+#, 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"
+"  -c, --config=DIR    use DIR for config files\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"
+"  -c, --config=DIR     koristi DIR za datoteke 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:528
+#, 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/main.c:895
+msgid "Unable to load preferences"
+msgstr "Ne mogu da učitam podešavanja"
+
+#: src/main.c:895
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"Gaim nije uspeo da učita podešavanja koja imate, jer su snimljena u starom "
+"formatu koji se više ne koristi. Molimo Vas da ponovite podešavanja "
+"koristeći prozor Postavke."
+
+#: src/plugin.c:295
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4869,19 +4817,29 @@
 "Nisam našao željeni dodatak %s. Molim instalirajte ovaj dodatak i pokušajte "
 "ponovo."
 
-#: src/plugin.c:329 src/plugin.c:357
+#: src/plugin.c:300 src/plugin.c:328
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim nije uspeo da učita Vaš dodatak."
 
-#: src/plugin.c:353
+#: src/plugin.c:324
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Nisam uspeo da učitam željeni dodatak %s."
 
-#: src/prefs.c:1094
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr "Uobičajeno ali ne (tako) dosadno"
 
+#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:513 src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2797
+#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
+#: src/protocols/oscar/oscar.c:770 src/protocols/yahoo/yahoo.c:3042
+#: src/protocols/yahoo/yahoo.c:3158
+msgid "Available"
+msgstr "Dostupan"
+
 #: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "Dostupan samo za prijatelje"
@@ -4890,241 +4848,228 @@
 msgid "Away for friends only"
 msgstr "Odsutan samo za prijatelje"
 
+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:1002
+#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:688
+#: src/protocols/oscar/oscar.c:5701 src/protocols/oscar/oscar.c:5779
+#: src/protocols/oscar/oscar.c:5803 src/protocols/oscar/oscar.c:6990
+#: src/protocols/oscar/oscar.c:6995 src/protocols/yahoo/yahoo.c:2695
+#: src/protocols/yahoo/yahoo.c:3062 src/protocols/yahoo/yahoo.c:3170
+msgid "Invisible"
+msgstr "Nevidljiv"
+
 #: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "Nevidljiv samo za prijatelje"
 
-#: src/protocols/gg/gg.c:56 src/status.c:157
+#: src/protocols/gg/gg.c:56
 msgid "Unavailable"
 msgstr "Nedostupan"
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:137
 msgid "Unable to resolve hostname."
 msgstr "Ne mogu da rastumačim adresu."
 
-#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1711
 msgid "Unable to connect to server."
 msgstr "Ne mogu da se povežem na server."
 
-#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
-#: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
-#: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
-#: src/protocols/jabber/jabber.c:109
+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134
+#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
+#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
+#: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "Neispravan odgovor servera."
 
-#: src/protocols/gg/gg.c:160
+#: src/protocols/gg/gg.c:146
 msgid "Error while reading from socket."
 msgstr "Greška pri čitanju soketa."
 
-#: src/protocols/gg/gg.c:163
+#: src/protocols/gg/gg.c:149
 msgid "Error while writing to socket."
 msgstr "Greška pri pisanju u soket."
 
-#: src/protocols/gg/gg.c:166
+#: src/protocols/gg/gg.c:152
 msgid "Authentication failed."
 msgstr "Neuspešna identifikacija."
 
-#: src/protocols/gg/gg.c:169
+#: src/protocols/gg/gg.c:155
 msgid "Unknown Error Code."
 msgstr "Nepoznata oznaka greške."
 
-#: src/protocols/gg/gg.c:271 src/protocols/oscar/oscar.c:4234
+#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4147
 #, 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"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:272 src/protocols/gg/gg.c:1134
-#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4238
-#: src/protocols/oscar/oscar.c:4464 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:470
-#: src/protocols/zephyr/zephyr.c:730 src/protocols/zephyr/zephyr.c:1145
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
+#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1013
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4375 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1130
 msgid "Buddy Information"
 msgstr "Podaci o drugaru"
 
-#. TODO: Do we need both an "online" and an "available" state?
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:310 src/protocols/irc/irc.c:172
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:982
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:579
-#: src/protocols/novell/novell.c:2945 src/protocols/oscar/oscar.c:704
-#: src/protocols/oscar/oscar.c:7051 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:3172
-#: src/protocols/zephyr/zephyr.c:2252 src/status.c:155
-msgid "Online"
-msgstr "Na vezi"
-
-#: src/protocols/gg/gg.c:365
+#: src/protocols/gg/gg.c:294
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: src/protocols/gg/gg.c:519
+#: src/protocols/gg/gg.c:447
 msgid "Could not connect"
 msgstr "Ne mogu da se povežem"
 
-#: src/protocols/gg/gg.c:526
+#: src/protocols/gg/gg.c:454
 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:818 src/protocols/napster/napster.c:502
-#: src/protocols/napster/napster.c:533 src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
+#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2335
+#: src/protocols/yahoo/yahoo.c:2364 src/protocols/yahoo/yahoo.c:2427
+#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "Ne mogu da se povežem."
 
-#: src/protocols/gg/gg.c:834
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Čitanje podataka"
 
 # Rukovanje/usaglasavanje ravnoteznika/balansera?
-#: src/protocols/gg/gg.c:837
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Ravnotežno rukovanje"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Čitanje ključa servera"
 
-#: src/protocols/gg/gg.c:843
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Razmenjivanje heša ključa"
 
-#: src/protocols/gg/gg.c:853
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Kritična greška u GG biblioteci\n"
 
-#: src/protocols/gg/gg.c:871 src/protocols/gg/gg.c:964
-#: src/protocols/toc/toc.c:148
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Neuspešno povezivanje na %s"
 
-#: src/protocols/gg/gg.c:921
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Nemoguće pronalaženje servera"
 
-#: src/protocols/gg/gg.c:933
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Pošalji kao poruku"
 
-#: src/protocols/gg/gg.c:938
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Traženje GG servera"
 
-#: src/protocols/gg/gg.c:941
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Naveden je neispravan Gadu-Gadu korisnički broj"
 
-#: src/protocols/gg/gg.c:987
+#: src/protocols/gg/gg.c:841
 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:1040
+#: src/protocols/gg/gg.c:919
 msgid "Couldn't get search results"
 msgstr "Nemoguće preuzimanje rezultata pretrage"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:924
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu pretraga"
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:950
 msgid "Active"
 msgstr "Aktivan"
 
-#: src/protocols/gg/gg.c:1076 src/protocols/oscar/oscar.c:5302
+#: src/protocols/gg/gg.c:955 src/protocols/oscar/oscar.c:5190
 msgid "UIN"
 msgstr "Korisnički broj"
 
 #. First Name
-#: src/protocols/gg/gg.c:1080 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:5313 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:959 src/protocols/jabber/jabber.c:624
+#: src/protocols/oscar/oscar.c:5201 src/protocols/silc/ops.c:808
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "Ime"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1085 src/protocols/jabber/jabber.c:633
-#: src/protocols/oscar/oscar.c:5314 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:964 src/protocols/jabber/jabber.c:629
+#: src/protocols/oscar/oscar.c:5202 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Prezime"
 
-#: src/protocols/gg/gg.c:1089 src/protocols/gg/gg.c:1833
-#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5303
-#: src/protocols/silc/ops.c:1202
+#: src/protocols/gg/gg.c:968 src/protocols/gg/gg.c:1712
+#: src/protocols/irc/msgs.c:219 src/protocols/oscar/oscar.c:5191
+#: src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr "Nadimak"
 
-#: src/protocols/gg/gg.c:1096 src/protocols/gg/gg.c:1099
+#: src/protocols/gg/gg.c:975 src/protocols/gg/gg.c:978
 msgid "Birth Year"
 msgstr "Godina rođenja"
 
-#: src/protocols/gg/gg.c:1105 src/protocols/gg/gg.c:1107
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:988
 msgid "Sex"
 msgstr "Pol"
 
 #. City
-#: src/protocols/gg/gg.c:1113 src/protocols/jabber/jabber.c:643
-#: src/protocols/oscar/oscar.c:5357 src/protocols/oscar/oscar.c:5365
+#: src/protocols/gg/gg.c:992 src/protocols/jabber/jabber.c:639
+#: src/protocols/oscar/oscar.c:5245 src/protocols/oscar/oscar.c:5253
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "Grad"
 
-#: src/protocols/gg/gg.c:1156
+#: src/protocols/gg/gg.c:1035
 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:1164
+#: src/protocols/gg/gg.c:1043
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Nemoguć uvoz spiska drugara sa servera"
 
-#: src/protocols/gg/gg.c:1226
+#: src/protocols/gg/gg.c:1105
 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:1234
+#: src/protocols/gg/gg.c:1113
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Nemoguć prenos spiska drugara na Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1242
+#: src/protocols/gg/gg.c:1121
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Spisak drugara uspešno uklonjen sa Gadu-Gadu servera"
 
-#: src/protocols/gg/gg.c:1250
+#: src/protocols/gg/gg.c:1129
 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:1259
+#: src/protocols/gg/gg.c:1138
 msgid "Password changed successfully"
 msgstr "Lozinka je uspešno izmenjena"
 
-#: src/protocols/gg/gg.c:1266
+#: src/protocols/gg/gg.c:1145
 msgid "Password couldn't be changed"
 msgstr "Neuspešna izmena lozinke"
 
-#: src/protocols/gg/gg.c:1385
+#: src/protocols/gg/gg.c:1264
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Greška pri sporazumevanju sa Gadu-Gadu serverom"
 
-#: src/protocols/gg/gg.c:1386
+#: src/protocols/gg/gg.c:1265
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -5132,11 +5077,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:1415
+#: src/protocols/gg/gg.c:1294
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Nemoguć uvoz Gadu-Gadu spiska drugara"
 
-#: src/protocols/gg/gg.c:1416
+#: src/protocols/gg/gg.c:1295
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -5144,27 +5089,27 @@
 "Gaim nije mogao da se poveže sa Gadu-Gadu serverom sa spiskom drugara. "
 "Pokušajte ponovo kasnije."
 
-#: src/protocols/gg/gg.c:1489
+#: src/protocols/gg/gg.c:1368
 msgid "Couldn't export buddy list"
 msgstr "Nemoguć izvoz spiska drugara"
 
-#: src/protocols/gg/gg.c:1490 src/protocols/gg/gg.c:1513
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1392
 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:1512
+#: src/protocols/gg/gg.c:1391
 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:1563
+#: src/protocols/gg/gg.c:1442
 msgid "Unable to access directory"
 msgstr "Ne mogu pristupiti imeniku"
 
-#: src/protocols/gg/gg.c:1564
+#: src/protocols/gg/gg.c:1443
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -5172,11 +5117,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:1598
+#: src/protocols/gg/gg.c:1477
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Ne mogu da izmenim Gadu-Gadu lozinku"
 
-#: src/protocols/gg/gg.c:1599
+#: src/protocols/gg/gg.c:1478
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -5184,33 +5129,33 @@
 "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:1615
+#: src/protocols/gg/gg.c:1494
 msgid "Directory Search"
 msgstr "Pretraga imenika"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1620 src/protocols/jabber/jabber.c:1117
-#: src/protocols/toc/toc.c:1694
+#: src/protocols/gg/gg.c:1499 src/protocols/jabber/jabber.c:1100
+#: src/protocols/toc/toc.c:1564
 msgid "Change Password"
 msgstr "Promena lozinke"
 
-#: src/protocols/gg/gg.c:1624
+#: src/protocols/gg/gg.c:1503
 msgid "Import Buddy List from Server"
 msgstr "Uvezi spisak drugara sa servera"
 
-#: src/protocols/gg/gg.c:1628
+#: src/protocols/gg/gg.c:1507
 msgid "Export Buddy List to Server"
 msgstr "Izvezi spisak drugara na server"
 
-#: src/protocols/gg/gg.c:1632
+#: src/protocols/gg/gg.c:1511
 msgid "Delete Buddy List from Server"
 msgstr "Ukloni spisak drugara sa servera"
 
-#: src/protocols/gg/gg.c:1665
+#: src/protocols/gg/gg.c:1544
 msgid "Unable to access user profile."
 msgstr "Ne mogu da pristupim podacima o korisniku."
 
-#: src/protocols/gg/gg.c:1666
+#: src/protocols/gg/gg.c:1545
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5228,118 +5173,150 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1812 src/protocols/gg/gg.c:1814
+#: src/protocols/gg/gg.c:1691 src/protocols/gg/gg.c:1693
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Dodatak za Gadu-Gadu protokol"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1322
+#: src/protocols/icq/gaim_icq.c:223
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr "Gaim je naišao na grešku pri sporazumevanju sa ICQ serverom."
+
+#: src/protocols/icq/gaim_icq.c:293
+#, c-format
+msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+msgstr ""
+"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:296 src/protocols/jabber/presence.c:300
+#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3886
+#: src/protocols/oscar/oscar.c:6438
+msgid "Authorize"
+msgstr "Ovlasti"
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:301
+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3888
+#: src/protocols/oscar/oscar.c:6439
+msgid "Deny"
+msgstr "Odbij"
+
+#: src/protocols/icq/gaim_icq.c:309
+msgid "Send message through server"
+msgstr "Pošalji poruku kroz server"
+
+#: src/protocols/icq/gaim_icq.c:351
+msgid "Connecting..."
+msgstr "Uspostavljam vezu..."
+
+#: src/protocols/icq/gaim_icq.c:497
+msgid "Nick:"
+msgstr "Nadimak:"
+
+#: src/protocols/icq/gaim_icq.c:498
+msgid "Gaim User"
+msgstr "Gaim korisnik"
+
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1311
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nepoznata naredba: %s"
 
-#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1030
+#: src/protocols/irc/cmds.c:464 src/protocols/jabber/chat.c:576
+#: src/protocols/silc/silc.c:1019
 #, c-format
 msgid "current topic is: %s"
 msgstr "trenutna tema: %s"
 
-#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1034
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:580
+#: src/protocols/silc/silc.c:1023
 msgid "No topic is set"
 msgstr "Tema nije postavljena"
 
 #: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
 #: src/protocols/yahoo/yahoo_filexfer.c:185
 #: src/protocols/yahoo/yahoo_filexfer.c:194
-#, fuzzy
-msgid "File Transfer Failed"
+msgid "File Transfer Aborted"
 msgstr "Prenos datoteke je obustvaljen"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "GAIM nije uspeo da otvori port za slušanje."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "Greška pri prikazivanju poruke dana"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "Nije dostupna poruka dana"
 
-#: src/protocols/irc/irc.c:80
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "Nema poruke dana za ovu vezu."
 
-#: src/protocols/irc/irc.c:83
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "Poruka dana za %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:530
-#: src/protocols/irc/irc.c:552
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:405
 msgid "Server has disconnected"
 msgstr "Server se isključio"
 
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "Pogledajte poruku dana"
 
-#: src/protocols/irc/irc.c:204 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: src/protocols/irc/irc.c:210 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: src/protocols/irc/irc.c:242
+#: src/protocols/irc/irc.c:217
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nadimci ne mogu sadržati beline"
 
-#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:410
-#: src/protocols/jabber/jabber.c:745
-msgid "SSL support unavailable"
-msgstr "SSL podrška je nedostupna"
-
-#: src/protocols/irc/irc.c:281
+#. connect to the server
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:798
+#: src/protocols/msn/session.c:364 src/protocols/napster/napster.c:510
+#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1759
+#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2558
+#: src/protocols/zephyr/zephyr.c:1452
+msgid "Connecting"
+msgstr "Uspostavljanje veze"
+
+#: src/protocols/irc/irc.c:244
 msgid "Couldn't create socket"
 msgstr "Ne mogu da načinim soket"
 
-#: src/protocols/irc/irc.c:352 src/protocols/jabber/jabber.c:305
-#: src/protocols/oscar/oscar.c:1739 src/protocols/oscar/oscar.c:1815
+#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:304
+#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1755
 msgid "Couldn't connect to host"
 msgstr "Ne mogu da se povežem sa domaćinom"
 
-#: src/protocols/irc/irc.c:377 src/protocols/jabber/jabber.c:332
-msgid "Connection Failed"
-msgstr "Udaljena veza neuspešna"
-
-#: src/protocols/irc/irc.c:380 src/protocols/jabber/jabber.c:335
-msgid "SSL Handshake Failed"
-msgstr "Neuspešno SSL rukovanje"
-
-#: src/protocols/irc/irc.c:527 src/protocols/irc/irc.c:549
-#: src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:402 src/protocols/trepia/trepia.c:927
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
-#: src/protocols/irc/irc.c:698 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1400
+#: src/protocols/irc/irc.c:557 src/protocols/silc/chat.c:1373
+#: src/protocols/yahoo/yahoochat.c:1444
 msgid "Users"
 msgstr "Korisnici"
 
-#: src/protocols/irc/irc.c:701 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1409
+#: src/protocols/irc/irc.c:560 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1453
 msgid "Topic"
 msgstr "Tema:"
 
-#: src/protocols/irc/irc.c:738
+#: src/protocols/irc/irc.c:597
 msgid "IRC"
 msgstr ""
 
 # bug: plural-forms
-#: src/protocols/irc/irc.c:742
+#: src/protocols/irc/irc.c:601
 #, fuzzy
 msgid "Quit message"
 msgstr "(1 poruka)"
@@ -5352,249 +5329,247 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:828
+#: src/protocols/irc/irc.c:688
 msgid "IRC Protocol Plugin"
 msgstr "Dodatak za IRC protokol"
 
 #. *  summary
-#: src/protocols/irc/irc.c:829
+#: src/protocols/irc/irc.c:689
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Dodatak za IRC protokol"
 
-#: src/protocols/irc/irc.c:848 src/protocols/irc/msgs.c:234
-#: src/protocols/jabber/jabber.c:1612 src/protocols/napster/napster.c:708
-#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
+#: src/protocols/irc/irc.c:708 src/protocols/irc/msgs.c:239
+#: src/protocols/jabber/jabber.c:1617 src/protocols/napster/napster.c:672
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:851 src/protocols/jabber/jabber.c:1636
-#: src/protocols/msn/msn.c:1925 src/protocols/napster/napster.c:713
-#: src/protocols/silc/silc.c:1606 src/protocols/trepia/trepia.c:1304
+#: src/protocols/irc/irc.c:711 src/protocols/jabber/jabber.c:1638
+#: src/protocols/msn/msn.c:1934 src/protocols/napster/napster.c:677
+#: src/protocols/silc/silc.c:1596 src/protocols/trepia/trepia.c:1301
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:854
-#, fuzzy
+#: src/protocols/irc/irc.c:714
 msgid "Encodings"
-msgstr "Način zapisa"
-
-#: src/protocols/irc/irc.c:857 src/protocols/irc/msgs.c:228
-#: src/protocols/jabber/jabber.c:603 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
+msgstr "Kodiranja"
+
+#: src/protocols/irc/irc.c:717 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:599 src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: src/protocols/irc/irc.c:860
-#, fuzzy
+#: src/protocols/irc/irc.c:720
 msgid "Real name"
-msgstr "Ime"
-
-#: src/protocols/irc/irc.c:863
-#, fuzzy
-msgid "Use SSL"
-msgstr "SSL"
-
-#: src/protocols/irc/msgs.c:105
+msgstr "Pravo ime"
+
+#: src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Loš mod"
 
-#: src/protocols/irc/msgs.c:116
+#: src/protocols/irc/msgs.c:120
 #, c-format
 msgid "You are banned from %s."
 msgstr "Izbačeni ste sa %s."
 
-#: src/protocols/irc/msgs.c:117
+#: src/protocols/irc/msgs.c:121
 msgid "Banned"
 msgstr "Izbačeni"
 
-#: src/protocols/irc/msgs.c:134
+#: src/protocols/irc/msgs.c:139
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:234
-#: src/protocols/irc/msgs.c:247
+msgstr "Ne mogu da zabranim %s: spisak zabrana je popunjen"
+
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:239
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:222
 msgid " <i>(ircop)</i>"
 msgstr " <i>(operater)</i>"
 
-#: src/protocols/irc/msgs.c:218
+#: src/protocols/irc/msgs.c:223
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikovani)</i>"
 
-#: src/protocols/irc/msgs.c:222 src/protocols/irc/msgs.c:228
-#: src/protocols/irc/msgs.c:229 src/protocols/irc/msgs.c:240
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/irc/msgs.c:227 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:234 src/protocols/irc/msgs.c:245
+#: src/protocols/msn/msn.c:1327 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:229 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1014
+#: src/protocols/irc/msgs.c:234 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Realname"
 msgstr "Ime"
 
-#: src/protocols/irc/msgs.c:240 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:245 src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "Trenutno prisutan"
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:250
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Neaktivan:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:252
 msgid "Online since"
 msgstr "Na vezi od"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:255
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Određivanje prideva:</b> Znamenit<br>"
 
-#: src/protocols/irc/msgs.c:257
+#: src/protocols/irc/msgs.c:262
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Podaci o drugaru za %s"
 
-#: src/protocols/irc/msgs.c:320
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s izmeni temu u: %s"
 
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Tema kanala %s je: %s"
 
-#: src/protocols/irc/msgs.c:342
+#: src/protocols/irc/msgs.c:348
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Nepoznata poruka „%s‟"
 
-#: src/protocols/irc/msgs.c:343
+#: src/protocols/irc/msgs.c:349
 msgid "Unknown message"
 msgstr "Nepoznata greška"
 
-#: src/protocols/irc/msgs.c:343
+#: src/protocols/irc/msgs.c:349
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "IRC server nije razumeo poruku koju je poslao Gaim."
 
-#: src/protocols/irc/msgs.c:366
+#: src/protocols/irc/msgs.c:373
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Korisnika na %s: %s"
 
-#: src/protocols/irc/msgs.c:463
-#, fuzzy
+#: src/protocols/irc/msgs.c:473
 msgid "Time Response"
-msgstr "Vr. zona"
-
-#: src/protocols/irc/msgs.c:464
+msgstr "Odgovor sa vremenom"
+
+#: src/protocols/irc/msgs.c:474
 msgid "The IRC server's local time is:"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:475
+msgstr "Lokalno vreme IRC servera je:"
+
+#: src/protocols/irc/msgs.c:488
 msgid "No such channel"
 msgstr "Nema takvog kanala"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:486
+#: src/protocols/irc/msgs.c:501
 msgid "no such channel"
 msgstr "ne postoji takav kanal"
 
-#: src/protocols/irc/msgs.c:489
+#: src/protocols/irc/msgs.c:504
 msgid "User is not logged in"
 msgstr "Korisnik nije prijavljen"
 
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:510
 msgid "No such nick or channel"
 msgstr "Ne postoji takav nadimak/kanal"
 
-#: src/protocols/irc/msgs.c:514
+#: src/protocols/irc/msgs.c:531
 msgid "Could not send"
 msgstr "Ne mogu da pošaljem"
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:587
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pristupanje na %s zahteva pozivanje."
 
-#: src/protocols/irc/msgs.c:571
+#: src/protocols/irc/msgs.c:588
 msgid "Invitation only"
 msgstr "Samo pozivani"
 
-#: src/protocols/irc/msgs.c:673
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Izbacio Vas je %s: (%s)"
 
-#: src/protocols/irc/msgs.c:678
+#: src/protocols/irc/msgs.c:697
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Izbačeni od strane %s: (%s)"
 
-#: src/protocols/irc/msgs.c:702
+#: src/protocols/irc/msgs.c:721
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mod (%s %s) od strane %s"
 
-#: src/protocols/irc/msgs.c:786
+#: src/protocols/irc/msgs.c:808
+#, c-format
+msgid "Invalid nickname '%s'"
+msgstr "Neispravan nadimak „%s“"
+
+#: src/protocols/irc/msgs.c:809
+msgid "Invalid nickname"
+msgstr "Neispravan nadimak"
+
+#: src/protocols/irc/msgs.c:811 src/protocols/irc/msgs.c:816
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-
-#: src/protocols/irc/msgs.c:825
+"Izabrali ste ime naloga koje je server odbio. Verovatno sadrži nedozvoljene "
+"znake."
+
+#: src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "Ne mogu da promenim nadimak"
 
-#: src/protocols/irc/msgs.c:825
+#: src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "Ne mogu da promenim nadimak"
 
-#: src/protocols/irc/msgs.c:846
+#: src/protocols/irc/msgs.c:880
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Napustili ste pričaonicu%s%s"
 
-#: src/protocols/irc/msgs.c:888
+#: src/protocols/irc/msgs.c:922
 msgid "Error: invalid PONG from server"
 msgstr "Greška: pogrešan odziv servera (PONG)"
 
-#: src/protocols/irc/msgs.c:890
+#: src/protocols/irc/msgs.c:924
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor — Lag: %lu sekundi"
 
-#: src/protocols/irc/msgs.c:965
+#: src/protocols/irc/msgs.c:999
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne mogu da se priključim u %s:"
 
-#: src/protocols/irc/msgs.c:966 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:1001 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "Ne mogu da se priključim kanalu"
 
-#: src/protocols/irc/msgs.c:1000
-#, fuzzy
-msgid "Nick or channel is temporarily unavailable."
-msgstr "Usluga je privremeno nedostupna."
-
-#: src/protocols/irc/msgs.c:1012
+#: src/protocols/irc/msgs.c:1038
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops sa %s"
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:113
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;akcija&gt;:  Izvedi određenu akciju."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:114
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5602,7 +5577,7 @@
 "away [poruka]:  Postavi poruku o odsustvu ili samo objavi odsustvo bez "
 "poruke."
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:115
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5610,7 +5585,7 @@
 "deop &lt;nadimak1&gt; [nadimak2] ...:  Oduzima nekome čin operatora Morate "
 "biti operator kanala da biste ovo uradili."
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:116
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5620,7 +5595,7 @@
 "sprečava da se oglasi kada je kanal moderisan (+m). Morate biti operator "
 "kanala da biste ovo uradili."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:117
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5628,7 +5603,7 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:118
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5636,7 +5611,7 @@
 "j &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Unošenje jednog ili "
 "više kanala, ako je potrebno navodeći i ključ."
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:119
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5644,7 +5619,7 @@
 "join &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Unošenje jednog "
 "ili više kanala, ako je potrebno navodeći i ključ."
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:120
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5652,7 +5627,7 @@
 "kick &lt;nadimak&gt; [poruka]:  Uklanja nekoga sa kanala. Morate biti "
 "operator da biste ovo uradili."
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:121
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5660,20 +5635,19 @@
 "list:  Prikazuje spisak soba na mreži. <i>Upozorenje: neki serveri zbog toga "
 "mogu da Vas isključe sa mreže.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:122
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;radnja&gt;:  Izvrši radnju."
 
-#: src/protocols/irc/parse.c:124
-#, fuzzy
+#: src/protocols/irc/parse.c:123
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;nadimak|kanal&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Postavi ili ukini "
-"načim pristupa za kanal ili za korisnika."
-
-#: src/protocols/irc/parse.c:125
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nadimak|kanal&gt;:  Postavi ili ukini "
+"način pristupa za kanal ili za korisnika."
+
+#: src/protocols/irc/parse.c:124
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5681,15 +5655,15 @@
 "msg &lt;nadimak&gt; &lt;poruka&gt;:  Šalje privatnu poruku korisniku (dakle "
 "ne na kanal)."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:125
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Ispisuje nadimke korisnika koji su trenutno na kanalu."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1465
+#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1448
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novi nadimak&gt;:  Menja Vaš nadimak."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:127
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5697,7 +5671,7 @@
 "op &lt;nadimak1&gt; [nadimak2] ...:  Dodeljuje nekome operatorski čin. "
 "Morate biti operator kanala da biste ovo moglu da uradite."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:128
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5705,7 +5679,7 @@
 "operwall &lt;poruka&gt;:  Ako ne znate šta ova komanda predstavlja, "
 "verovatno ne možete da je koristite."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5713,7 +5687,7 @@
 "part [soba] [poruka]:  Napušta trenutni kanal, ili navedeni kanal, po želji "
 "pritom ispisuje i poruku."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5721,7 +5695,7 @@
 "ping [nadimak]:  Ispisuje koliko je mrežno kašnjenje datog korisnika (ili "
 "servera, ako nijedan nadimak nije naveden)."
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:131
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5729,16 +5703,16 @@
 "query &lt;nadimak&gt; &lt;poruka&gt;:  Šalje privatnu poruku korisniku "
 "(dakle ne na kanal)."
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:132
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [poruka]:  Isključuje se sa servera i po želji pritom ostavlja poruku."
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:133
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Šalje sirovu komandu serveru."
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:134
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5746,19 +5720,19 @@
 "remove &lt;nadimak&gt; [poruka]:  Ukloni nekoga iz sobe. Morate biti "
 "operator kanala da biste ovo uradili."
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:135
 msgid "time: Displays the current local time at the IRC server."
-msgstr ""
-
-#: src/protocols/irc/parse.c:137
+msgstr "time: Prikazuje tekuće lokalno vreme na IRC serveru."
+
+#: src/protocols/irc/parse.c:136
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nova tema]:  Pregleda ili menja temu kanala."
 
-#: src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:137
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Postavlja ili ukida korisnikov mod."
 
-#: src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:138
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5766,7 +5740,7 @@
 "voice &lt;nick1&gt; [nick2] ...:  Daje nekome glas. Morate biti operator "
 "kanala da biste ovo mogli da uradite."
 
-#: src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:139
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5774,54 +5748,54 @@
 "wallops &lt;message&gt;:  Ako ne znate čemu služi ova komanda, verovatno ni "
 "ne možete da je koristite."
 
-#: src/protocols/irc/parse.c:141
-#, fuzzy
+#: src/protocols/irc/parse.c:140
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois &lt;nadimak&gt;:  Uzmi podatke o korisniku."
-
-#: src/protocols/irc/parse.c:422
+msgstr "whois [server] &lt;nadimak&gt;:  Uzmi podatke o korisniku."
+
+#: src/protocols/irc/parse.c:421
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vreme odziva od %s: %lu sekundi"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:422
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:422
 msgid "CTCP PING reply"
 msgstr "CTCP PING odgovor"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1648 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
+#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:188
+#: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
+#: src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr "Veza je prekinuta."
 
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:52
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
 msgstr ""
-
-#: src/protocols/jabber/auth.c:53
-#, fuzzy
+"Server zahteva TLS/SSL za prijavu. Izaberite „Koristi TLS ako je dostupan“ u "
+"osobinama naloga"
+
+#: src/protocols/jabber/auth.c:54
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Server zahteva SSL za prijavu"
-
-#: src/protocols/jabber/auth.c:114
+msgstr "Server zahteva TLS/SSL za prijavu. Nije nađena podrška za TLS/SSL."
+
+#: src/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Server zahteva slanje lozinke u običnom tekstu preko veze koja nije "
 "šifrovana."
 
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
 msgid "Plaintext Authentication"
 msgstr "Identifikacija običnim tekstom"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5829,682 +5803,707 @@
 "Ovaj server zahteva prijavu preko veze koja nije šifrovana. Da li da "
 "nastavim sa prijavom?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
 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:396
+#: src/protocols/jabber/auth.c:390
 msgid "Invalid challenge from server"
 msgstr "Neispravan izazov servera"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:661
-#: src/protocols/silc/ops.c:806
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:613
+#: src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:674
-#: src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:626
+#: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "Prezime"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:678
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:630
 msgid "Given Name"
 msgstr "Ime"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/jabber.c:623 src/protocols/msn/msn.c:1348
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1009
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:619 src/protocols/msn/msn.c:1317
+#: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
+#: src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:659
 msgid "URL"
 msgstr "Internet adresa"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:720
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
 msgid "Street Address"
 msgstr "Ulica"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:668
 msgid "Extended Address"
 msgstr "Proširena adresa"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:724
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:676
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:680
 msgid "Region"
 msgstr "Oblast"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/jabber.c:649
 msgid "Postal Code"
 msgstr "Poštanski broj"
 
 #. Country
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:689
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "Država"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:748
-#: src/protocols/jabber/buddy.c:755
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:707
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:766
-#: src/protocols/jabber/buddy.c:774 src/protocols/silc/silc.c:670
-#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1004
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:726 src/protocols/silc/silc.c:656
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Email"
 msgstr "E-pošta"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:789
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:741
 msgid "Organization Name"
 msgstr "Naziv organizacije"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:793
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:745
 msgid "Organization Unit"
 msgstr "Odeljenje u organizaciji"
 
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:751
+#: src/protocols/novell/novell.c:1451
+msgid "Title"
+msgstr "Titula"
+
 # „radno mesto‟ u organizaciji?
 # Uloga je zvanični termin i u UML-u, prim. prev.
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:802
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:754
 msgid "Role"
 msgstr "Uloga"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
-#: src/protocols/oscar/oscar.c:5338
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:647
+#: src/protocols/oscar/oscar.c:5226
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:564
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Uređivanje DŽaber vizit-karte"
 
-#: src/protocols/jabber/buddy.c:565
+#: src/protocols/jabber/buddy.c:511
 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/buddy.c:610
+#: src/protocols/jabber/buddy.c:556
 msgid "Jabber ID"
 msgstr "DŽaber ID"
 
-#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1615
-msgid "Resource"
-msgstr "Resurs"
+#: src/protocols/jabber/buddy.c:566 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:586 src/protocols/jabber/jabber.c:971
+#: src/protocols/msn/msn.c:489 src/protocols/novell/novell.c:2819
+#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:738
+#: src/protocols/yahoo/yahoo.c:2820
+msgid "Status"
+msgstr "Stanje"
 
 # Ovde je nekada stajalo 'ime oca'. Kod nas je srednje ime uglavnom ime
 # oca, ali to definitivno ne mora da bude slučaj na drugim mestima. Npr
 # u Holandiji je vrlo uobičajeno da ljudi imaju po 4-5 imena; uvek se zna
 # koje je prvo, zvanično, ime ali svako može da izabere bilo koje od njih
 # kao omiljeno. Onda se tako predstavlja, tako ga zovu prijatelji itd.
-#: src/protocols/jabber/buddy.c:682 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:634 src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr "Srednje ime"
 
 # Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:638
-#: src/protocols/oscar/oscar.c:5356 src/protocols/oscar/oscar.c:5364
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:652 src/protocols/jabber/jabber.c:634
+#: src/protocols/oscar/oscar.c:5244 src/protocols/oscar/oscar.c:5252
+#: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "Ulica"
 
-#: src/protocols/jabber/buddy.c:712
+#: src/protocols/jabber/buddy.c:664
 msgid "P.O. Box"
 msgstr "Poštanski fah"
 
-#: src/protocols/jabber/buddy.c:824
+#: src/protocols/jabber/buddy.c:770
 msgid "Photo"
 msgstr "Slika"
 
-#: src/protocols/jabber/buddy.c:824
+#: src/protocols/jabber/buddy.c:770
 msgid "Logo"
 msgstr "Logotip"
 
-#: src/protocols/jabber/buddy.c:849
+#: src/protocols/jabber/buddy.c:786
 msgid "Jabber Profile"
 msgstr "DŽaber profil"
 
-#: src/protocols/jabber/buddy.c:1031
+#: src/protocols/jabber/buddy.c:941
 msgid "Un-hide From"
 msgstr "Ne sakrivaj od"
 
-#: src/protocols/jabber/buddy.c:1034
+#: src/protocols/jabber/buddy.c:944
 msgid "Temporarily Hide From"
 msgstr "Privremeno sakrij od"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1041
+#: src/protocols/jabber/buddy.c:951
 msgid "Cancel Presence Notification"
 msgstr "Otkaži obaveštenja o prisustvu"
 
-#: src/protocols/jabber/buddy.c:1047
+#: src/protocols/jabber/buddy.c:957
 msgid "(Re-)Request authorization"
 msgstr "(Ponovo) zahtevaj ovlašćenje"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1055
+#: src/protocols/jabber/buddy.c:965
 msgid "Unsubscribe"
 msgstr "Odjavi se"
 
-#: src/protocols/jabber/buddy.c:1081 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:964
-#: src/protocols/silc/ops.c:1239
-msgid "Error"
-msgstr "Greška"
-
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:994
-msgid "Chatty"
-msgstr "Pričljiv"
-
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1006
-#: src/status.c:160
-msgid "Extended Away"
-msgstr "Produženo odsustvo"
-
-#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1012
-#: src/protocols/oscar/oscar.c:692 src/protocols/oscar/oscar.c:7090
-msgid "Do Not Disturb"
-msgstr "Ne uznemiravaj"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6619
-#: src/protocols/yahoo/yahoochat.c:995
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6509
+#: src/protocols/yahoo/yahoochat.c:1040
 msgid "_Room:"
 msgstr "_Soba:"
 
-#: src/protocols/jabber/chat.c:47
+#: src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr "Se_rver:"
 
-#: src/protocols/jabber/chat.c:53
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "_Ručka:"
 
-#: src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s nije ispravan naziv sobe"
 
-#: src/protocols/jabber/chat.c:224
+#: src/protocols/jabber/chat.c:213
 msgid "Invalid Room Name"
 msgstr "Neispravno ime sobe"
 
-#: src/protocols/jabber/chat.c:229
+#: src/protocols/jabber/chat.c:218
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s nije ispravan naziv servera"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:219 src/protocols/jabber/chat.c:220
 msgid "Invalid Server Name"
 msgstr "Neispravno ime servera"
 
-#: src/protocols/jabber/chat.c:235
+#: src/protocols/jabber/chat.c:224
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s nije ispravna ručka sobe"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:225 src/protocols/jabber/chat.c:226
 msgid "Invalid Room Handle"
 msgstr "Neispravna ručka sobe"
 
-#: src/protocols/jabber/chat.c:395
+#: src/protocols/jabber/chat.c:379
 msgid "Configuration error"
 msgstr "Greška pri povezivanju"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
 msgid "Unable to configure"
 msgstr "Podešavanje nije uspelo"
 
-#: src/protocols/jabber/chat.c:420
+#: src/protocols/jabber/chat.c:404
 msgid "Room Configuration Error"
 msgstr "Greška pri podešavanju sobe"
 
-#: src/protocols/jabber/chat.c:421
+#: src/protocols/jabber/chat.c:405
 msgid "This room is not capable of being configured"
 msgstr "Ova soba nema mogućnosti podešavanja"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
 msgid "Registration error"
 msgstr "Greška pri registraciji"
 
-#: src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:607
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Promena nadimka nije podržana u sobama za razgovor koje nisu MUC."
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1239
-#, fuzzy
-msgid "Error retrieving room list"
+#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662
+msgid "Roomlist Error"
+msgstr "Greška u spisku soba"
+
+#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663
+msgid "Error retreiving roomlist"
 msgstr "Greška pri čitanju spiska soba"
 
-#: src/protocols/jabber/chat.c:737
+#: src/protocols/jabber/chat.c:711
 msgid "Invalid Server"
 msgstr "Neispravno ime servera"
 
-#: src/protocols/jabber/chat.c:775
+#: src/protocols/jabber/chat.c:749
 msgid "Enter a Conference Server"
 msgstr "Server za razgovore"
 
-#: src/protocols/jabber/chat.c:776
+#: src/protocols/jabber/chat.c:750
 msgid "Select a conference server to query"
 msgstr "Izaberite server za konferencije koji se upituje"
 
-#: src/protocols/jabber/chat.c:779
+#: src/protocols/jabber/chat.c:753
 msgid "Find Rooms"
 msgstr "Pronađi sobe"
 
-#: src/protocols/jabber/jabber.c:78
+#: src/protocols/jabber/jabber.c:77
 msgid "Error initializing session"
 msgstr "Greška pri pokretanju sesije"
 
-#: src/protocols/jabber/jabber.c:214 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:991
-#: src/protocols/trepia/trepia.c:1036 src/protocols/trepia/trepia.c:1135
-#: src/protocols/trepia/trepia.c:1181
+#: src/protocols/jabber/jabber.c:213 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988
+#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131
+#: src/protocols/trepia/trepia.c:1177
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
-#: src/protocols/jabber/jabber.c:252 src/protocols/jabber/jabber.c:272
+#: src/protocols/jabber/jabber.c:251 src/protocols/jabber/jabber.c:271
 msgid "Read Error"
 msgstr "Greška pri čitanju"
 
-#: src/protocols/jabber/jabber.c:379 src/protocols/jabber/jabber.c:715
+#: src/protocols/jabber/jabber.c:331
+msgid "Connection Failed"
+msgstr "Udaljena veza neuspešna"
+
+#: src/protocols/jabber/jabber.c:334
+msgid "SSL Handshake Failed"
+msgstr "Neuspešno SSL rukovanje"
+
+#: src/protocols/jabber/jabber.c:378 src/protocols/jabber/jabber.c:711
 msgid "Invalid Jabber ID"
 msgstr "Neispravan DŽaber IB"
 
-#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:755
-#: src/protocols/trepia/trepia.c:1075
+#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:741
+msgid "SSL support unavailable"
+msgstr "SSL podrška je nedostupna"
+
+#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:751
+#: src/protocols/trepia/trepia.c:1071
 msgid "Unable to create socket"
 msgstr "Ne mogu načiniti soket"
 
-#: src/protocols/jabber/jabber.c:448
+#: src/protocols/jabber/jabber.c:444
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspešna"
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:451
+#: src/protocols/jabber/jabber.c:446 src/protocols/jabber/jabber.c:447
 msgid "Registration Successful"
 msgstr "Registracija uspešna"
 
-#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:1219
 msgid "Unknown Error"
 msgstr "Nepoznata greška"
 
-#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
+#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:456
 msgid "Registration Failed"
 msgstr "Greška pri registraciji"
 
-#: src/protocols/jabber/jabber.c:571 src/protocols/jabber/jabber.c:572
+#: src/protocols/jabber/jabber.c:567 src/protocols/jabber/jabber.c:568
 msgid "Already Registered"
 msgstr "Već je registrovan"
 
-#: src/protocols/jabber/jabber.c:607 src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/jabber.c:603 src/protocols/jabber/jabber.c:1074
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/protocols/jabber/jabber.c:618
+#: src/protocols/jabber/jabber.c:614
 msgid "E-Mail"
 msgstr "E-pošta"
 
 #. State
-#: src/protocols/jabber/jabber.c:648 src/protocols/oscar/oscar.c:5358
-#: src/protocols/oscar/oscar.c:5366 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:644 src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:5254 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "Oblast"
 
-#: src/protocols/jabber/jabber.c:658 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:654 src/protocols/silc/ops.c:853
+#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:668
+#: src/protocols/jabber/jabber.c:664
 msgid "Date"
 msgstr "Datum"
 
-#: src/protocols/jabber/jabber.c:676
+#: src/protocols/jabber/jabber.c:672
 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:679 src/protocols/jabber/jabber.c:680
+#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:676
 msgid "Register New Jabber Account"
 msgstr "Registruj novi DŽaber nalog"
 
-#: src/protocols/jabber/jabber.c:811
+#: src/protocols/jabber/jabber.c:759
+msgid "Logged out"
+msgstr "Odjavljen"
+
+#: src/protocols/jabber/jabber.c:802
 msgid "Initializing Stream"
 msgstr "Pokretanje toka"
 
-#: src/protocols/jabber/jabber.c:817 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:808 src/protocols/msn/session.c:370
 msgid "Authenticating"
 msgstr "Identifikacija"
 
-#: src/protocols/jabber/jabber.c:826
+#: src/protocols/jabber/jabber.c:817
 msgid "Re-initializing Stream"
 msgstr "Ponovno pokretanje toka"
 
-#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1214
-#: src/protocols/jabber/jabber.c:1255 src/protocols/jabber/jabber.c:1288
-#: src/protocols/oscar/oscar.c:760 src/protocols/oscar/oscar.c:6890
+#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1238 src/protocols/jabber/jabber.c:1271
+#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:6793
 msgid "Not Authorized"
 msgstr "Neovlašćen"
 
-#: src/protocols/jabber/jabber.c:930
+#: src/protocols/jabber/jabber.c:938
 msgid "Both"
 msgstr "Oba"
 
-#: src/protocols/jabber/jabber.c:932
+#: src/protocols/jabber/jabber.c:940
 msgid "From (To pending)"
 msgstr "Od (čekanje)"
 
-#: src/protocols/jabber/jabber.c:934
+#: src/protocols/jabber/jabber.c:942
 msgid "From"
 msgstr "Od"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:945
 msgid "To"
 msgstr "Za"
 
-#: src/protocols/jabber/jabber.c:939
+#: src/protocols/jabber/jabber.c:947
 msgid "None (To pending)"
 msgstr "Nijedan (čekanje)"
 
-#: src/protocols/jabber/jabber.c:943
+#: src/protocols/jabber/jabber.c:951
 msgid "Subscription"
 msgstr "Pretplata"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/jabber/jabber.c:1006 src/protocols/jabber/jabber.c:1012
-#, fuzzy
-msgid "Priority"
-msgstr "Port"
-
-#: src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:984
+msgid "Error"
+msgstr "Greška"
+
+#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
+msgid "Chatty"
+msgstr "Pričljiv"
+
+#: src/protocols/jabber/jabber.c:999 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
+msgid "Extended Away"
+msgstr "Produženo odsustvo"
+
+#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
+#: src/protocols/oscar/oscar.c:678 src/protocols/oscar/oscar.c:5791
+#: src/protocols/oscar/oscar.c:6986
+msgid "Do Not Disturb"
+msgstr "Ne uznemiravaj"
+
+#: src/protocols/jabber/jabber.c:1017
 msgid "Password Changed"
 msgstr "Lozinka izmenjena"
 
-#: src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:1018
 msgid "Your password has been changed."
 msgstr "Vaša lozinka je izmenjena."
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1022 src/protocols/jabber/jabber.c:1023
 msgid "Error changing password"
 msgstr "Greška pri izmeni lozinke"
 
-#: src/protocols/jabber/jabber.c:1096
+#: src/protocols/jabber/jabber.c:1079
 msgid "Password (again)"
 msgstr "Lozinka (ponovite)"
 
-#: src/protocols/jabber/jabber.c:1101 src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1084 src/protocols/jabber/jabber.c:1085
 msgid "Change Jabber Password"
 msgstr "Izmenite DŽaber lozinku"
 
-#: src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1085
 msgid "Please enter your new password"
 msgstr "Unesite novu lozinku"
 
-#: src/protocols/jabber/jabber.c:1112 src/protocols/toc/toc.c:1684
+#: src/protocols/jabber/jabber.c:1095 src/protocols/toc/toc.c:1554
 msgid "Set User Info"
 msgstr "Postavi podatke o korisniku"
 
-#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1177
 msgid "Bad Request"
 msgstr "Loš zahtev"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1179
 msgid "Conflict"
 msgstr "Sukob"
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1181
 msgid "Feature Not Implemented"
 msgstr "Mogućnost nije podržana"
 
-#: src/protocols/jabber/jabber.c:1200
+#: src/protocols/jabber/jabber.c:1183
 msgid "Forbidden"
 msgstr "Zabranjen"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1185
 msgid "Gone"
 msgstr "Otišao"
 
-#: src/protocols/jabber/jabber.c:1204 src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1187 src/protocols/jabber/jabber.c:1261
 msgid "Internal Server Error"
 msgstr "Unutrašnja greška servera"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1189
 msgid "Item Not Found"
 msgstr "Nije nađeno"
 
-#: src/protocols/jabber/jabber.c:1208
+#: src/protocols/jabber/jabber.c:1191
 msgid "Malformed Jabber ID"
 msgstr "Neispravan DŽaber IB"
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1193
 msgid "Not Acceptable"
 msgstr "Neprihvatljiv"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1195
 msgid "Not Allowed"
 msgstr "Nedozvoljen"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1199
 msgid "Payment Required"
 msgstr "Potrebna je uplata"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1201
 msgid "Recipient Unavailable"
 msgstr "Primalac nedostupan"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1205
 msgid "Registration Required"
 msgstr "Potrebna je registracija"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1207
 msgid "Remote Server Not Found"
 msgstr "Udaljeni računar nije pronađen"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1209
 msgid "Remote Server Timeout"
 msgstr "Isteklo je vreme za čekanje na udaljeni server."
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1211
 msgid "Server Overloaded"
 msgstr "Server je preopterećen"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1213
 msgid "Service Unavailable"
 msgstr "Usluga je nedostupna"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1215
 msgid "Subscription Required"
 msgstr "Potrebna je pretplate"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1217
 msgid "Unexpected Request"
 msgstr "Neočekivani zahtev"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1224
 msgid "Authorization Aborted"
 msgstr "Prijava prekinuta"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1226
 msgid "Incorrect encoding in authorization"
 msgstr "Pogrešno kodiranje ovlašćenja"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid authzid"
 msgstr "Neispravan authzid"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1232
 msgid "Invalid Authorization Mechanism"
 msgstr "Neispravan mehanizam za ovlašćenje"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1235
 msgid "Authorization mechanism too weak"
 msgstr "Način ovlašćenja nedovoljno siguran"
 
+#: src/protocols/jabber/jabber.c:1240
+msgid "Temporary Authentication Failure"
+msgstr "Privremeno neuspešna identifikacija"
+
+#: src/protocols/jabber/jabber.c:1242
+msgid "Authentication Failure"
+msgstr "Neuspešna identifikacija"
+
+#: src/protocols/jabber/jabber.c:1246
+msgid "Bad Format"
+msgstr "Loš oblik"
+
+#: src/protocols/jabber/jabber.c:1248
+msgid "Bad Namespace Prefix"
+msgstr "Loš predmetak prostora imena"
+
+#: src/protocols/jabber/jabber.c:1251
+msgid "Resource Conflict"
+msgstr "Sudar resursa"
+
+#: src/protocols/jabber/jabber.c:1253 src/protocols/silc/ops.c:1519
+msgid "Connection Timeout"
+msgstr "Vremenski rok veze"
+
+#: src/protocols/jabber/jabber.c:1255
+msgid "Host Gone"
+msgstr "Domaćin je nestao"
+
 #: src/protocols/jabber/jabber.c:1257
-msgid "Temporary Authentication Failure"
-msgstr "Privremeno neuspešna identifikacija"
+msgid "Host Unknown"
+msgstr "Domaćin je nepoznat"
 
 #: src/protocols/jabber/jabber.c:1259
-msgid "Authentication Failure"
-msgstr "Neuspešna identifikacija"
+msgid "Improper Addressing"
+msgstr "Neodgovarajuće adresiranje"
 
 #: src/protocols/jabber/jabber.c:1263
-msgid "Bad Format"
-msgstr "Loš oblik"
+msgid "Invalid ID"
+msgstr "Neispravan IB"
 
 #: src/protocols/jabber/jabber.c:1265
-msgid "Bad Namespace Prefix"
-msgstr "Loš predmetak prostora imena"
-
-#: src/protocols/jabber/jabber.c:1268
-msgid "Resource Conflict"
-msgstr "Sudar resursa"
-
-#: src/protocols/jabber/jabber.c:1270 src/protocols/silc/ops.c:1518
-msgid "Connection Timeout"
-msgstr "Vremenski rok veze"
-
-#: src/protocols/jabber/jabber.c:1272
-msgid "Host Gone"
-msgstr "Domaćin je nestao"
-
-#: src/protocols/jabber/jabber.c:1274
-msgid "Host Unknown"
-msgstr "Domaćin je nepoznat"
-
-#: src/protocols/jabber/jabber.c:1276
-msgid "Improper Addressing"
-msgstr "Neodgovarajuće adresiranje"
-
-#: src/protocols/jabber/jabber.c:1280
-msgid "Invalid ID"
-msgstr "Neispravan IB"
-
-#: src/protocols/jabber/jabber.c:1282
 msgid "Invalid Namespace"
 msgstr "Neispravan prostor imena"
 
-#: src/protocols/jabber/jabber.c:1284
+#: src/protocols/jabber/jabber.c:1267
 msgid "Invalid XML"
 msgstr "Neispravan XML"
 
-#: src/protocols/jabber/jabber.c:1286
+#: src/protocols/jabber/jabber.c:1269
 msgid "Non-matching Hosts"
 msgstr "Nepoklapajući domaćini"
 
-#: src/protocols/jabber/jabber.c:1290
+#: src/protocols/jabber/jabber.c:1273
 msgid "Policy Violation"
 msgstr "Prekoračenje ovlašćenja"
 
-#: src/protocols/jabber/jabber.c:1292
+#: src/protocols/jabber/jabber.c:1275
 msgid "Remote Connection Failed"
 msgstr "Udaljena veza neuspešna"
 
-#: src/protocols/jabber/jabber.c:1294
+#: src/protocols/jabber/jabber.c:1277
 msgid "Resource Constraint"
 msgstr "Ograničenje resursa"
 
-#: src/protocols/jabber/jabber.c:1296
+#: src/protocols/jabber/jabber.c:1279
 msgid "Restricted XML"
 msgstr "Ograničeni XML"
 
-#: src/protocols/jabber/jabber.c:1298
+#: src/protocols/jabber/jabber.c:1281
 msgid "See Other Host"
 msgstr "Pogledajte drugog domaćina"
 
-#: src/protocols/jabber/jabber.c:1300
+#: src/protocols/jabber/jabber.c:1283
 msgid "System Shutdown"
 msgstr "Gašenje sistema"
 
-#: src/protocols/jabber/jabber.c:1302
+#: src/protocols/jabber/jabber.c:1285
 msgid "Undefined Condition"
 msgstr "Nedefinisani uslov"
 
-#: src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1287
 msgid "Unsupported Encoding"
 msgstr "Nepodržano kodiranje"
 
 # strofa baš i nije odgovarajuća :-)
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1289
 msgid "Unsupported Stanza Type"
 msgstr "Nepodržana vrsta odeljka"
 
-#: src/protocols/jabber/jabber.c:1308
+#: src/protocols/jabber/jabber.c:1291
 msgid "Unsupported Version"
 msgstr "Nepodržano izdanje"
 
-#: src/protocols/jabber/jabber.c:1310
+#: src/protocols/jabber/jabber.c:1293
 msgid "XML Not Well Formed"
 msgstr "XML nije dobro sačinjen"
 
-#: src/protocols/jabber/jabber.c:1312
+#: src/protocols/jabber/jabber.c:1295
 msgid "Stream Error"
 msgstr "Greška toka"
 
-#: src/protocols/jabber/jabber.c:1379
+#: src/protocols/jabber/jabber.c:1362
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ne mogu da zabranim korsinika %s"
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1414
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ne mogu da odstranim korisnika %s"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1440
 msgid "config:  Configure a chat room."
 msgstr "config:  Podesi sobu za razgovor."
 
-#: src/protocols/jabber/jabber.c:1461
+#: src/protocols/jabber/jabber.c:1444
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Podesi sobu za razgovor."
 
-#: src/protocols/jabber/jabber.c:1470
+#: src/protocols/jabber/jabber.c:1453
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Napuštanje sobe."
 
-#: src/protocols/jabber/jabber.c:1475
+#: src/protocols/jabber/jabber.c:1458
 msgid "register:  Register with a chat room."
 msgstr "register:  Prijava u sobu."
 
-#: src/protocols/jabber/jabber.c:1481
+#: src/protocols/jabber/jabber.c:1464
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Pregled ili promena teme."
 
-#: src/protocols/jabber/jabber.c:1487
+#: src/protocols/jabber/jabber.c:1470
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;nadimak&gt; [soba]:  Brani pristup korisniku u sobu."
 
+#: src/protocols/jabber/jabber.c:1476
+msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+msgstr "invite &lt;korisnik&gt; [soba]:  Poziva korisnika u sobu."
+
+#: src/protocols/jabber/jabber.c:1482
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr "join: &lt;soba&gt; [server]:  Pridruži se razgovoru na ovom serveru."
+
+#: src/protocols/jabber/jabber.c:1488
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr "kick &lt;korisnik&gt; [soba]:  Izbacuje korisnika iz sobe."
+
 #: src/protocols/jabber/jabber.c:1493
-#, fuzzy
-msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;korisnik&gt; [soba]:  Poziva korisnika u sobu."
-
-#: src/protocols/jabber/jabber.c:1499
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;soba&gt; [server]:  Pridruži se razgovoru na ovom serveru."
-
-#: src/protocols/jabber/jabber.c:1505
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;korisnik&gt; [soba]:  Izbacuje korisnika iz sobe."
-
-#: src/protocols/jabber/jabber.c:1510
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;nadimak&gt; &lt;poruka&gt;:  Šalje privatnu poruku drugom korisniku."
 
+#: src/protocols/jabber/jabber.c:1508
+msgid "Hide Operating System"
+msgstr "Sakrij ime operativnog sistema"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6515,43 +6514,42 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1590 src/protocols/jabber/jabber.c:1592
+#: src/protocols/jabber/jabber.c:1595 src/protocols/jabber/jabber.c:1597
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatak za DŽaber protokol"
 
-#: src/protocols/jabber/jabber.c:1618
-msgid "Use TLS if available"
-msgstr "Koristi TLS ako je dostupan"
+#: src/protocols/jabber/jabber.c:1620
+msgid "Resource"
+msgstr "Resurs"
 
 #: src/protocols/jabber/jabber.c:1623
-msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1626
-#, fuzzy
-msgid "Force old (port 5223) SSL"
+msgid "Use TLS if available"
+msgstr "Koristi TLS ako je dostupan"
+
+#: src/protocols/jabber/jabber.c:1628
+msgid "Force old SSL"
 msgstr "Nametni stari SSL"
 
-#: src/protocols/jabber/jabber.c:1631
+#: src/protocols/jabber/jabber.c:1633
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dozvoli neskrivene lozinke na nešifrovanim tokovima"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1640 src/protocols/silc/silc.c:1602
+#: src/protocols/jabber/jabber.c:1642 src/protocols/silc/silc.c:1592
 msgid "Connect server"
 msgstr "Povezivanje sa serverom"
 
-#: src/protocols/jabber/message.c:114
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr "Poruka od %s"
 
-#: src/protocols/jabber/message.c:178
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s izmeni temu u: %s"
 
-#: src/protocols/jabber/message.c:180
+#: src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "Tema je: %s"
@@ -6574,32 +6572,20 @@
 msgid "XML Parse error"
 msgstr "Greška pri XML obradi"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Nepoznata greška u prisustvu"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "Korisnik %s želi da doda %s u svoj spisak drugara."
-
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:6549
-#: src/protocols/yahoo/yahoo.c:861
-msgid "Authorize"
-msgstr "Ovlasti"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:6550
-#: src/protocols/yahoo/yahoo.c:863
-msgid "Deny"
-msgstr "Odbij"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:293
+#, 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:348 src/protocols/jabber/presence.c:349
 msgid "Create New Room"
 msgstr "Napravi novu sobu"
 
-#: src/protocols/jabber/presence.c:347
+#: src/protocols/jabber/presence.c:350
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6607,39 +6593,39 @@
 "Želite da napravite novu sobu. Da li želite da je podesite, ili prihvatate "
 "podrazumevane postavke?"
 
-#: src/protocols/jabber/presence.c:349
+#: src/protocols/jabber/presence.c:352
 msgid "Configure Room"
 msgstr "Postavke za sobu"
 
-#: src/protocols/jabber/presence.c:351
+#: src/protocols/jabber/presence.c:354
 msgid "Accept Defaults"
 msgstr "Prihvati podrazumevano"
 
-#: src/protocols/jabber/presence.c:388
+#: src/protocols/jabber/presence.c:384
 #, c-format
 msgid "Error in chat %s"
 msgstr "Greška pri razgovoru: %s"
 
-#: src/protocols/jabber/presence.c:391
+#: src/protocols/jabber/presence.c:387
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Greška pri uključenju u razgovor: %s"
 
-#: src/protocols/jabber/si.c:591
+#: src/protocols/jabber/si.c:594
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Slanje datoteke korisniku %s nije uspelo. Korisnik ne podržava prenos "
 "datoteka"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: src/protocols/jabber/si.c:595 src/protocols/jabber/si.c:596
 msgid "File Send Failed"
 msgstr "Neuspešno slanje datoteke"
 
 #: src/protocols/msn/dialog.c:91
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr ""
+msgstr "Neprilike pri usklađivanju spiska drugara za %s (%s)"
 
 #: src/protocols/msn/dialog.c:97
 #, c-format
@@ -6647,6 +6633,8 @@
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
+"%s na lokalnom spisku je u grupi „%s“ ali nije na spisku servera. Želite li "
+"da dodate ovog drugara?"
 
 #: src/protocols/msn/dialog.c:105
 #, c-format
@@ -6654,6 +6642,8 @@
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
+"%s je u lokalnom spisku ali nije na spisku servera. Želite li da dodate ovog "
+"drugara?"
 
 # Mozda "razume poruku"
 #: src/protocols/msn/error.c:35
@@ -6700,7 +6690,7 @@
 msgid "Not on list"
 msgstr "Nije na spisku"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:680
 msgid "User is offline"
 msgstr "Korisnik nije na vezi"
 
@@ -6752,7 +6742,7 @@
 msgid "Too many hits to a FND"
 msgstr "Previše pogodaka u FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:200
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:192
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
@@ -6845,8 +6835,8 @@
 msgid "Server too busy"
 msgstr "Server je prezauzet"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2338
-#: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2272
+#: src/protocols/silc/ops.c:1508 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Neuspešna identifikacija"
 
@@ -6933,9 +6923,8 @@
 msgid "Page"
 msgstr "Stranica"
 
-#: src/protocols/msn/msn.c:501 src/protocols/msn/msn.c:508
-#: src/protocols/msn/msn.c:511 src/protocols/yahoo/yahoo.c:2756
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/msn/msn.c:489 src/protocols/msn/msn.c:497
+#: src/protocols/msn/msn.c:500 src/protocols/yahoo/yahoo.c:2820
 #, c-format
 msgid ""
 "\n"
@@ -6944,76 +6933,84 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:508
+#: src/protocols/msn/msn.c:497
 msgid "Has you"
-msgstr ""
-
-#: src/protocols/msn/msn.c:511
-#, fuzzy
+msgstr "Ima vas"
+
+#: src/protocols/msn/msn.c:500
 msgid "Blocked"
-msgstr "Blokiraj"
-
-#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2584 src/protocols/yahoo/yahoo.c:3186
+msgstr "Blokiran"
+
+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:801
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Odsutan od računara"
+
+#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:803
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3160
 msgid "Be Right Back"
 msgstr "Odmah se vraćam"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2816 src/protocols/novell/novell.c:2954
-#: src/protocols/novell/novell.c:3042 src/protocols/silc/buddy.c:1416
-#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2586
-#: src/protocols/yahoo/yahoo.c:3189
+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:805
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
+#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
+#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2679
+#: src/protocols/yahoo/yahoo.c:3046 src/protocols/yahoo/yahoo.c:3161
 msgid "Busy"
 msgstr "Zauzet"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2594 src/protocols/yahoo/yahoo.c:3201
+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:807
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/yahoo/yahoo.c:3054 src/protocols/yahoo/yahoo.c:3165
 msgid "On The Phone"
 msgstr "Telefoniram"
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:3207
+#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:809
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2691
+#: src/protocols/yahoo/yahoo.c:3058 src/protocols/yahoo/yahoo.c:3167
 msgid "Out To Lunch"
 msgstr "Na ručku sam"
 
-#: src/protocols/msn/msn.c:558 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:158
+#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:811
+#: src/protocols/zephyr/zephyr.c:2111 src/protocols/zephyr/zephyr.c:2143
 msgid "Hidden"
 msgstr "Skriven"
 
-#: src/protocols/msn/msn.c:570
+#: src/protocols/msn/msn.c:530
 msgid "Set Friendly Name"
 msgstr "Postavi prijateljsko ime"
 
-#: src/protocols/msn/msn.c:575
+#: src/protocols/msn/msn.c:535
 msgid "Set Home Phone Number"
 msgstr "Postavi broj kućnog telefona"
 
-#: src/protocols/msn/msn.c:579
+#: src/protocols/msn/msn.c:539
 msgid "Set Work Phone Number"
 msgstr "Postavi broj telefona na poslu"
 
-#: src/protocols/msn/msn.c:583
+#: src/protocols/msn/msn.c:543
 msgid "Set Mobile Phone Number"
 msgstr "Postavi broj mobilnog telefona"
 
-#: src/protocols/msn/msn.c:589
+#: src/protocols/msn/msn.c:549
 msgid "Enable/Disable Mobile Devices"
 msgstr "Omogući/isključi mobilne uređaje"
 
-#: src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:554
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Dozvoli/zabrani mobilne stranice"
 
-#: src/protocols/msn/msn.c:617
+#: src/protocols/msn/msn.c:577
 msgid "Send to Mobile"
 msgstr "Pošalji na mobilni"
 
-#: src/protocols/msn/msn.c:626 src/protocols/novell/novell.c:3440
+#: src/protocols/msn/msn.c:586 src/protocols/novell/novell.c:3369
 msgid "Initiate _Chat"
 msgstr "Pokreni razgovor"
 
-#: src/protocols/msn/msn.c:663
+#: src/protocols/msn/msn.c:623
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7022,96 +7019,95 @@
 "od podržanih biblioteka ѕa SSL. Više informacija se može pronaći na: http://"
 "gaim.sf.net/faq-ssl.php"
 
-#: src/protocols/msn/msn.c:691
-#, fuzzy
+#: src/protocols/msn/msn.c:651
 msgid "Failed to connect to server."
 msgstr "Ne mogu da se povežem na server."
 
-#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1120
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Nadimak:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1695
-#: src/protocols/yahoo/yahoo_profile.c:1176 src/util.c:801
+#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1675
+#: src/protocols/yahoo/yahoo_profile.c:1174 src/util.c:796
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1405
 msgid "MSN Profile"
 msgstr "MSN profil"
 
-#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
-#: src/protocols/yahoo/yahoo_profile.c:765
+#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1662
+#: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "Greška pri čitanju sa servera"
 
 #. Age
-#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5343
+#: src/protocols/msn/msn.c:1481 src/protocols/oscar/oscar.c:5231
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1024
+#: src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Age"
 msgstr "Starost"
 
 #. Gender
-#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5330
+#: src/protocols/msn/msn.c:1488 src/protocols/oscar/oscar.c:5217
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1034
+#: src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Gender"
 msgstr "Pol"
 
-#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1029
+#: src/protocols/msn/msn.c:1497 src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Marital Status"
 msgstr "Bračno stanje"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1019
+#: src/protocols/msn/msn.c:1504 src/protocols/novell/novell.c:1445
+#: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Location"
 msgstr "Mesto"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1039
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1037
 msgid "Occupation"
 msgstr "Zanimanje"
 
-#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
-#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
-#: src/protocols/msn/msn.c:1577
+#: src/protocols/msn/msn.c:1529 src/protocols/msn/msn.c:1535
+#: src/protocols/msn/msn.c:1542 src/protocols/msn/msn.c:1550
+#: src/protocols/msn/msn.c:1557
 msgid "A Little About Me"
 msgstr "Ponešto o meni"
 
-#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
-#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
+#: src/protocols/msn/msn.c:1566 src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1579 src/protocols/msn/msn.c:1586
 msgid "Favorite Things"
 msgstr "Omiljene stvari"
 
-#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
-#: src/protocols/msn/msn.c:1628
+#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
+#: src/protocols/msn/msn.c:1608
 msgid "Hobbies and Interests"
 msgstr "Hobiji i interesovanja"
 
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
-#: src/protocols/yahoo/yahoo_profile.c:1081
+#: src/protocols/msn/msn.c:1617 src/protocols/msn/msn.c:1623
+#: src/protocols/yahoo/yahoo_profile.c:1079
 msgid "Favorite Quote"
 msgstr "Omiljena izreka"
 
-#: src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1631
 msgid "Last Updated"
 msgstr "Poslednja dopuna"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1642 src/protocols/silc/ops.c:844
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Lična stranica"
 
-#: src/protocols/msn/msn.c:1684
+#: src/protocols/msn/msn.c:1664
 msgid "The user has not created a public profile."
 msgstr "Korisnik nije napravio javni profil."
 
-#: src/protocols/msn/msn.c:1685
+#: src/protocols/msn/msn.c:1665
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7120,7 +7116,7 @@
 "MSN je izvestio da ne može da pronađe korisnikov profil. To znači da ili "
 "korisnik s datim imenom ne postoji, ili da postoji ali da nema javni profil."
 
-#: src/protocols/msn/msn.c:1689
+#: src/protocols/msn/msn.c:1669
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7128,10 +7124,18 @@
 "GAIM nije uspeo da pronađe informacije u korisnikovom profilu. Korisnik sa "
 "ovim imenom najverovatnije ne postoji."
 
-#: src/protocols/msn/msn.c:1695 src/protocols/yahoo/yahoo_profile.c:1176
+#: src/protocols/msn/msn.c:1675 src/protocols/yahoo/yahoo_profile.c:1174
 msgid "Profile URL"
 msgstr "Profil"
 
+#: src/protocols/msn/msn.c:1816
+msgid "Display conversation closed notices"
+msgstr "Obavesti o kraju razgovora."
+
+#: src/protocols/msn/msn.c:1821
+msgid "Display timeout notices"
+msgstr "Obavesti o isteku vremena."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7142,76 +7146,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1899 src/protocols/msn/msn.c:1901
+#: src/protocols/msn/msn.c:1908 src/protocols/msn/msn.c:1910
 msgid "MSN Protocol Plugin"
 msgstr "Dodatak za MSN protokol"
 
-#: src/protocols/msn/msn.c:1920 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1929 src/protocols/trepia/trepia.c:1296
 msgid "Login server"
 msgstr "Server za prijavu"
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:1938
 msgid "Use HTTP Method"
 msgstr "Koristi HTTP režim"
 
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/yahoo/yahoochat.c:1394
 msgid "Unable to connect"
 msgstr "Nemoguće povezivanje"
 
 #: src/protocols/msn/notification.c:178
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a valid group."
-msgstr "%s nije ispravan naziv sobe"
-
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
-#: src/protocols/msn/session.c:347
-#, fuzzy
+msgstr "%s nije dozvoljena grupa."
+
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:523
+#: src/protocols/msn/session.c:349
 msgid "Unknown error."
-msgstr "Nepoznata greška"
+msgstr "Nepoznata greška."
 
 #: src/protocols/msn/notification.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "%s on %s (%s)"
-msgstr "Korisnika na %s: %s"
-
-#: src/protocols/msn/notification.c:496
-#, fuzzy, c-format
+msgstr "%s na %s (%s)"
+
+#: src/protocols/msn/notification.c:493
+#, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "Ne mogu da dodam korisnika u lični spisak (%s)."
-
-#: src/protocols/msn/notification.c:500
-#, fuzzy, c-format
+msgstr "Ne mogu da dodam korisnika na %s (%s)"
+
+#: src/protocols/msn/notification.c:497
+#, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "Ne mogu da odstranim korisnika %s"
-
-#: src/protocols/msn/notification.c:504
-#, fuzzy, c-format
+msgstr "Ne mogu da odstranim korisnika na %s (%s)"
+
+#: src/protocols/msn/notification.c:501
+#, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "Ne mogu da pozovem korisnika (%s)."
-
-#: src/protocols/msn/notification.c:512
+msgstr "Ne mogu da dozvolim korisnika na %s (%s)"
+
+#: src/protocols/msn/notification.c:509
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#: src/protocols/msn/notification.c:521
-#, fuzzy, c-format
+msgstr "%s se ne može dodati pošto vam je spisak drugara popunjen."
+
+#: src/protocols/msn/notification.c:518
+#, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s nije ispravan naziv servera"
-
-#: src/protocols/msn/notification.c:809
-#, fuzzy
+msgstr "%s nije ispravan nalog pasoša."
+
+#: src/protocols/msn/notification.c:805
 msgid "Unable to rename group"
-msgstr "Ne mogu da pišem"
-
-#: src/protocols/msn/notification.c:864
-#, fuzzy
+msgstr "Ne mogu da preimenujem grupu"
+
+#: src/protocols/msn/notification.c:860
 msgid "Unable to delete group"
-msgstr "Ne mogu načiniti soket"
-
-# bug: plural-forms
-#: src/protocols/msn/notification.c:1297
+msgstr "Ne mogu da uklonim grupu"
+
+#: src/protocols/msn/notification.c:1287
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7244,199 +7244,183 @@
 "Nakon što se održavanje završi, moći ćete se ponovo prijaviti."
 
 #: src/protocols/msn/servconn.c:129
-#, fuzzy
 msgid "Writing error"
 msgstr "Greška pri pisanju"
 
 #: src/protocols/msn/servconn.c:131
-#, fuzzy
 msgid "Reading error"
 msgstr "Greška pri čitanju"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4296
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:341
+#: src/protocols/oscar/oscar.c:4209
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
 #: src/protocols/msn/servconn.c:136
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection error from %s server (%s):\n"
 "%s"
-msgstr "Greška nije prepoznata sa servera: %s"
-
-#: src/protocols/msn/session.c:317
-#, fuzzy
+msgstr ""
+"Greška pri povezivanju sa servera %s (%s):\n"
+"%s"
+
+#: src/protocols/msn/session.c:319
 msgid "Our protocol is not supported by the server."
-msgstr "Ovo izdanje protokola ne podržava sobe za razgovor."
-
-#: src/protocols/msn/session.c:321
-#, fuzzy
+msgstr "Naš protokol nije podržan na serveru."
+
+#: src/protocols/msn/session.c:323
 msgid "Error parsing HTTP."
-msgstr "Greška pri prikazivanju poruke dana"
-
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:451
-#: src/protocols/oscar/oscar.c:4995 src/protocols/yahoo/yahoo.c:188
+msgstr "Greška pri obradi HTTP-a."
+
+#: src/protocols/msn/session.c:327
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se sa nekog drugog mesta."
 
-#: src/protocols/msn/session.c:328
-#, fuzzy
+#: src/protocols/msn/session.c:330
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "Usluga je privremeno nedostupna."
-
-#: src/protocols/msn/session.c:333
+msgstr ""
+"MSN serveri su privremeno nedostupni. Sačekajte malo pa pokušajte ponovo."
+
+#: src/protocols/msn/session.c:335
 msgid "The MSN servers are going down temporarily."
 msgstr "Veza Vam je prekinuta. Privremeno se gase MSN serveri."
 
-#: src/protocols/msn/session.c:337
-#, fuzzy, c-format
+#: src/protocols/msn/session.c:339
+#, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Ne mogu da pošaljem poruku: %s"
-
-#: src/protocols/msn/session.c:342
+msgstr "Ne mogu da identifikujem: %s"
+
+#: src/protocols/msn/session.c:344
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+"Vaš spisak MSN drugara je privremeno nedostupan. Sačekajte malo pa pokušajte "
+"ponovo."
+
+#: src/protocols/msn/session.c:365 src/protocols/msn/session.c:367
 msgid "Handshaking"
-msgstr ""
-
-#: src/protocols/msn/session.c:364
-#, fuzzy
-msgid "Transferring"
-msgstr "Prenosi datoteka"
+msgstr "Rukovanje"
 
 #: src/protocols/msn/session.c:366
-#, fuzzy
+msgid "Transferring"
+msgstr "Prenosim"
+
+#: src/protocols/msn/session.c:368
 msgid "Starting authentication"
-msgstr "Identifikacija običnim tekstom"
-
-#: src/protocols/msn/session.c:367
-msgid "Getting cookie"
-msgstr ""
+msgstr "Počinjem identifikaciju"
 
 #: src/protocols/msn/session.c:369
-#, fuzzy
+msgid "Getting cookie"
+msgstr "Primam kolačić"
+
+#: src/protocols/msn/session.c:371
 msgid "Sending cookie"
-msgstr "Pošalji na mobilni"
-
-#: src/protocols/msn/session.c:370 src/protocols/trepia/trepia.c:637
+msgstr "Šaljem kolačić"
+
+#: src/protocols/msn/session.c:372 src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
 msgstr "Preuzimam spisak drugara"
 
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "Odsutan od računara"
-
-#: src/protocols/msn/switchboard.c:405
+#: src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr ""
+msgstr "Poruka možda nije poslata zato što je istekao rok:"
+
+#: src/protocols/msn/switchboard.c:409
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "Poruka se ne može poslati pošto to nije moguće dok ste nevidljivi:"
 
 #: src/protocols/msn/switchboard.c:413
-#, fuzzy
-msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Odjavljeni ste iz nepoznatih razloga."
+msgid "Message could not be sent because the user is offline:"
+msgstr "Poruka se ne može poslati pošto je korisnik nepovezan:"
 
 #: src/protocols/msn/switchboard.c:417
-#, fuzzy
-msgid "Message could not be sent because the user is offline:"
-msgstr "Odjavljeni ste iz nepoznatih razloga."
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "Poruka se ne može poslati zbog greške u vezi:"
 
 #: src/protocols/msn/switchboard.c:421
-#, fuzzy
-msgid "Message could not be sent because a connection error occurred:"
-msgstr "Odjavljeni ste iz nepoznatih razloga."
-
-#: src/protocols/msn/switchboard.c:425
-#, fuzzy
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Odjavljeni ste iz nepoznatih razloga."
-
-#: src/protocols/msn/switchboard.c:433
-#, fuzzy
+msgstr "Poruka se ne može poslati zbog greške sa prebacivačem:"
+
+#: src/protocols/msn/switchboard.c:429
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Odjavljeni ste iz nepoznatih razloga."
-
-#: src/protocols/msn/switchboard.c:689
+msgstr "Poruka možda nije poslata zato što je došlo do nepoznate greške:"
+
+#: src/protocols/msn/switchboard.c:678
+msgid "The conversation has become inactive and timed out."
+msgstr "Razgovor nije vođen, i istekao je."
+
+#: src/protocols/msn/switchboard.c:697
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s zatvori prozor razgovora."
 
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/userlist.c:87
 #, 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/userlist.c:276
-#, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
+#: src/protocols/msn/userlist.c:96
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Korisnik %s želi da doda %s u svoj spisak drugara."
 
-#: src/protocols/msn/userlist.c:340
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:655
+#: src/protocols/msn/userlist.c:627
 #, fuzzy, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Ne mogu da dodam drugara."
 
-#: src/protocols/msn/userlist.c:657
+#: src/protocols/msn/userlist.c:629
 #, fuzzy
 msgid "The screen name specified is invalid."
-msgstr "Novi zapis je neispravan."
-
-#: src/protocols/napster/napster.c:260
+msgstr "Uneti SecurID ključ je neispravan."
+
+#: src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
 msgstr "Ne mogu učitati zaglavlje sa servera"
 
-#: src/protocols/napster/napster.c:274
+#: src/protocols/napster/napster.c:255
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "Ne mogu da pročitam poruku sa servera: %s. Komanda je %hd, dužina je %hd."
 
-#: src/protocols/napster/napster.c:290
-#, fuzzy
-msgid "Unknown server error."
-msgstr "Nepoznata greška"
-
-#: src/protocols/napster/napster.c:339
+#: src/protocols/napster/napster.c:318
 #, 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:350
+#: src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Ne mogu da dodam „%s“ u Napster spisak"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
+#: src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr "Veza sa serverom je prekinuta."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
 msgstr "%s zahteva Vaše podatke"
 
+#: src/protocols/napster/napster.c:433
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr ""
+"Veza sa serverom je prekinuta, jer ste se prijavili sa nekog drugog mesta."
+
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:455
+#: src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s zahteva ping"
 
-#: src/protocols/napster/napster.c:591 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1268
 msgid "_Group:"
 msgstr "_Grupa:"
 
@@ -7450,7 +7434,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:688 src/protocols/napster/napster.c:690
+#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
 msgid "NAPSTER Protocol Plugin"
 msgstr "Dodatak za Napster protokol"
 
@@ -7586,40 +7570,40 @@
 msgid "Login failed (%s)."
 msgstr "Prijava nije uspela (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Ne mogu da pošaljem poruku. Ne mogu da dobavim podatke o korisniku (%s)."
 
-#: src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Ne mogu da dodam „%s“ u spisak drugara (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Ne mogu da pošaljem poruku. (%s)"
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ne mogu da pozovem korisnika (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Ne mogu da pošaljem poruku za %s. Ne mogu da načinim konferenciju (%s)."
 
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Ne mogu da pošaljem poruku. Ne mogu danačinim konverenciju (%s)."
 
-#: src/protocols/novell/novell.c:569
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7628,7 +7612,7 @@
 "Neuspelo pomeranje %s u folder %s u serverovom spisku. Greška pri pravljenju "
 "foldera (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7637,68 +7621,68 @@
 "Ne mogu da dodam %s u spisak drugara. Greška pri pravljenju foldera na "
 "serveru (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:688
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Ne mogu da dobavim detalje o korisniku %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:734 src/protocols/novell/novell.c:880
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Ne mogu da dodam korisnika u lični spisak (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:781
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Ne mogu da dodam %s u spisak odbijenih (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:834
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Ne mogu da dodam %s u spisak prihvaćenih (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:902
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Ne mogu da uklonim %s iz ličnog spiska (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1629
+#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1620
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Nije moguće promeniti podešavanja privatnosti na serveru (%s)."
 
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:997
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ne mogu da načinim konferenciju (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1659
 msgid "Error communicating with server. Closing connection."
 msgstr "Greška pri povezivanju sa serverom. Prekidam vezu."
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1443
 msgid "Telephone Number"
 msgstr "Telefon"
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1447
 msgid "Department"
 msgstr "Odeljenje"
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1449
 msgid "Personal Title"
 msgstr "Zvanje"
 
 # Šta je ovo?!
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1453
 msgid "Mailstop"
 msgstr "Pošta"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5316
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5204
+#: src/protocols/oscar/oscar.c:5211
 msgid "Email Address"
 msgstr "Adresa e-pošte"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1471
 msgid "User ID"
 msgstr "Korisnikov ID"
 
@@ -7709,46 +7693,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1485
 msgid "Full name"
 msgstr "Puno ime"
 
-#: src/protocols/novell/novell.c:1515
+#: src/protocols/novell/novell.c:1506
 msgid "User Properties"
 msgstr "Korisničke postavke"
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1610
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Grupna konferencija %d"
 
-#: src/protocols/novell/novell.c:1644
+#: src/protocols/novell/novell.c:1635
 msgid "Unable to make SSL connection to server."
 msgstr "Ne mogu da se povežem na SSL server."
 
-#: src/protocols/novell/novell.c:1674
+#: src/protocols/novell/novell.c:1665
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Greška pri obradi događaja ili odgovora (%s)."
 
-#: src/protocols/novell/novell.c:1708
+#: src/protocols/novell/novell.c:1699
 msgid "Authenticating..."
 msgstr "Identifikacija"
 
-#: src/protocols/novell/novell.c:1723
+#: src/protocols/novell/novell.c:1714
 msgid "Waiting for response..."
 msgstr "Čekam na odgovor..."
 
-#: src/protocols/novell/novell.c:1858
+#: src/protocols/novell/novell.c:1849
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s je pozvan na ovaj razgovor."
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1876
 msgid "Invitation to Conversation"
 msgstr "Poziv na razgovor"
 
-#: src/protocols/novell/novell.c:1887
+#: src/protocols/novell/novell.c:1877
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7759,17 +7743,17 @@
 "\n"
 "Poslato: %s"
 
-#: src/protocols/novell/novell.c:1889
+#: src/protocols/novell/novell.c:1879
 msgid "Would you like to join the conversation?"
 msgstr "Da li želite da se priključite razgovoru?"
 
-#: src/protocols/novell/novell.c:1996
+#: src/protocols/novell/novell.c:1985
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Veza je prekinuta zato što ste se prijavili pod ovim imenom sa nekog drugog "
 "mesta."
 
-#: src/protocols/novell/novell.c:2052
+#: src/protocols/novell/novell.c:2039
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7779,7 +7763,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2150
+#: src/protocols/novell/novell.c:2137
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7787,16 +7771,24 @@
 "Ne mogu da se povežem na seerver. Unesite adresu servera na kog želite da se "
 "povežem."
 
-#: src/protocols/novell/novell.c:2172
+#: src/protocols/novell/novell.c:2159
 msgid "Error. SSL support is not installed."
 msgstr "SSL podrška je neophodna. Instalirajte je."
 
-#: src/protocols/novell/novell.c:2476
+#: src/protocols/novell/novell.c:2463
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ova konferencija je zatvorena. Poruke se više ne mogu slati."
 
-#: src/protocols/novell/novell.c:2957 src/protocols/novell/novell.c:3045
-#: src/protocols/yahoo/yahoo.c:2808
+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:738
+#: src/protocols/oscar/oscar.c:6795 src/protocols/yahoo/yahoo.c:2699
+msgid "Offline"
+msgstr "Nepovezan"
+
+#: src/protocols/novell/novell.c:2820
+msgid "Message"
+msgstr "_Poruka:"
+
+#: src/protocols/novell/novell.c:2919 src/protocols/novell/novell.c:2975
 msgid "Appear Offline"
 msgstr "Kao nepovezan"
 
@@ -7810,275 +7802,273 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3538 src/protocols/novell/novell.c:3540
+#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3559
+#: src/protocols/novell/novell.c:3489
 msgid "Server address"
 msgstr "Adresa servera"
 
-#: src/protocols/novell/novell.c:3563
+#: src/protocols/novell/novell.c:3493
 msgid "Server port"
 msgstr "Port servera"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:188
 msgid "Invalid error"
 msgstr "Neispravna greška (!!!)"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:189
 msgid "Invalid SNAC"
 msgstr "Neispravan SNAC"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:190
 msgid "Rate to host"
 msgstr "Brzina prema serveru"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:191
 msgid "Rate to client"
 msgstr "Brzina prema klijentu"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:193
 msgid "Service unavailable"
 msgstr "Usluga je nedostupna"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:194
 msgid "Service not defined"
 msgstr "Usluga nije ustanovljena"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:195
 msgid "Obsolete SNAC"
 msgstr "Prevaziđeni SNAC"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:196
 msgid "Not supported by host"
 msgstr "Domaćin ne podržava"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:197
 msgid "Not supported by client"
 msgstr "Klijent ne podržava"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:198
 msgid "Refused by client"
 msgstr "Klijent je odbio"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:199
 msgid "Reply too big"
 msgstr "Odgovor je predugačak"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:200
 msgid "Responses lost"
 msgstr "Odgovori su izgubljeni"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:201
 msgid "Request denied"
 msgstr "Zahtev je odbijen"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:202
 msgid "Busted SNAC payload"
 msgstr "Upropašćen je SNAC koristan paket"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:203
 msgid "Insufficient rights"
 msgstr "Nedovoljno ovlašćenja"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:204
 msgid "In local permit/deny"
 msgstr "Dozvoli/zabrani u lokalu"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:205
 msgid "Too evil (sender)"
 msgstr "Previše zao (pošiljalac)"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:206
 msgid "Too evil (receiver)"
 msgstr "Previše zao (primalac)"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:207
 msgid "User temporarily unavailable"
 msgstr "Korisnik privremeno nedostupan"
 
-#: src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:208
 msgid "No match"
 msgstr "Nema poklapanja"
 
-#: src/protocols/oscar/oscar.c:217
+#: src/protocols/oscar/oscar.c:209
 msgid "List overflow"
 msgstr "Prekoračenje spiska"
 
-#: src/protocols/oscar/oscar.c:218
+#: src/protocols/oscar/oscar.c:210
 msgid "Request ambiguous"
 msgstr "Zahtev je dvosmislen"
 
-#: src/protocols/oscar/oscar.c:219
+#: src/protocols/oscar/oscar.c:211
 msgid "Queue full"
 msgstr "Red je pun"
 
-#: src/protocols/oscar/oscar.c:220
+#: src/protocols/oscar/oscar.c:212
 msgid "Not while on AOL"
 msgstr "Ne dok je na AOL-u"
 
-#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:493
-#, fuzzy
+#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:491
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr ""
-"(Došlo je do greške pri pretvaranju ove poruke. Drugar s kojim pričate "
-"verovatno koristi neispravan program.)"
-
-#: src/protocols/oscar/oscar.c:607
+"(Došlo je do greške pri prijemu ove poruke. Drugar s kojim pričate verovatno "
+"koristi neispravan program.)"
+
+#: src/protocols/oscar/oscar.c:593
 msgid "Voice"
 msgstr "Glas"
 
-#: src/protocols/oscar/oscar.c:610
+#: src/protocols/oscar/oscar.c:596
 msgid "AIM Direct IM"
 msgstr "Neposredna AIM poruka"
 
-#: src/protocols/oscar/oscar.c:613 src/protocols/silc/silc.c:668
+#: src/protocols/oscar/oscar.c:599 src/protocols/silc/silc.c:654
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Razgovor"
 
-#: src/protocols/oscar/oscar.c:616 src/protocols/oscar/oscar.c:7197
+#: src/protocols/oscar/oscar.c:602 src/protocols/oscar/oscar.c:7097
 msgid "Get File"
 msgstr "Pribavi datoteku"
 
-#: src/protocols/oscar/oscar.c:623
+#: src/protocols/oscar/oscar.c:609
 msgid "Games"
 msgstr "Igre"
 
-#: src/protocols/oscar/oscar.c:626
+#: src/protocols/oscar/oscar.c:612
 msgid "Add-Ins"
 msgstr "Dodaci"
 
-#: src/protocols/oscar/oscar.c:629
+#: src/protocols/oscar/oscar.c:615
 msgid "Send Buddy List"
 msgstr "Pošalji spisak drugara"
 
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:618
 msgid "ICQ Direct Connect"
 msgstr "Neposredna ICQ veza"
 
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:621
 msgid "AP User"
 msgstr "AP korisnik"
 
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:624
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:627
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:630
 msgid "ICQ Server Relay"
 msgstr "ICQ preusmeravanje servera"
 
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:633
 msgid "Old ICQ UTF8"
 msgstr "Stari ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:636
 msgid "Trillian Encryption"
 msgstr "Trilijan enkripcija"
 
-#: src/protocols/oscar/oscar.c:653
+#: src/protocols/oscar/oscar.c:639
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:642
 msgid "Hiptop"
 msgstr "Vrhkuka"
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:645
 msgid "Security Enabled"
 msgstr "Bezbednost uključena"
 
-#: src/protocols/oscar/oscar.c:662
+#: src/protocols/oscar/oscar.c:648
 msgid "Video Chat"
 msgstr "Video razgovor"
 
-#: src/protocols/oscar/oscar.c:666
+#: src/protocols/oscar/oscar.c:652
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:669
+#: src/protocols/oscar/oscar.c:655
 msgid "Live Video"
 msgstr "Živa slika"
 
-#: src/protocols/oscar/oscar.c:672
+#: src/protocols/oscar/oscar.c:658
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:7080
+#: src/protocols/oscar/oscar.c:676 src/protocols/oscar/oscar.c:5800
+#: src/protocols/oscar/oscar.c:6989
 msgid "Free For Chat"
 msgstr "Dostupan za razgovor"
 
-#: src/protocols/oscar/oscar.c:694 src/protocols/oscar/oscar.c:7095
+#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:5794
+#: src/protocols/oscar/oscar.c:6987
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: src/protocols/oscar/oscar.c:696 src/protocols/oscar/oscar.c:7085
+#: src/protocols/oscar/oscar.c:682 src/protocols/oscar/oscar.c:5797
+#: src/protocols/oscar/oscar.c:6988
 msgid "Occupied"
 msgstr "Zauzet"
 
-#: src/protocols/oscar/oscar.c:700
+#: src/protocols/oscar/oscar.c:686
 msgid "Web Aware"
 msgstr "Pratim veb"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:4421
-msgid "Warning Level"
-msgstr "_Nivoi upozorenja"
-
-#: src/protocols/oscar/oscar.c:785
+#: src/protocols/oscar/oscar.c:754
 msgid "Capabilities"
 msgstr "Mogućnosti"
 
-#: src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:763
 msgid "Buddy Comment"
 msgstr "Primedba za drugara:"
 
-#: src/protocols/oscar/oscar.c:951
+#: src/protocols/oscar/oscar.c:898
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Neposredan razgovor sa %s je zatvoren"
 
-#: src/protocols/oscar/oscar.c:953
+#: src/protocols/oscar/oscar.c:900
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Neposredan razgovor sa %s je neuspešan"
 
-#: src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:907
 msgid "Direct Connect failed"
 msgstr "Neposredna veza nije uspela"
 
-#: src/protocols/oscar/oscar.c:1038 src/protocols/oscar/oscar.c:1169
+#: src/protocols/oscar/oscar.c:984 src/protocols/oscar/oscar.c:1115
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Neposredan razgovor sa %s je omogućen"
 
-#: src/protocols/oscar/oscar.c:1119
+#: src/protocols/oscar/oscar.c:1065
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Pokušavam da se povežem sa %s na %s:%hu za neposredne brze poruke."
 
-#: src/protocols/oscar/oscar.c:1545
+#: src/protocols/oscar/oscar.c:1485
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Tražim od %s da se poveže na %s:%hu za neposredne brze poruke."
 
-#: src/protocols/oscar/oscar.c:1550
+#: src/protocols/oscar/oscar.c:1490
 msgid "Unable to open Direct IM"
 msgstr "Ne mogu da pošaljem neposrednu brzu poruku"
 
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1525
 #, 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:1589
+#: src/protocols/oscar/oscar.c:1529
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8086,24 +8076,24 @@
 "Kako ovo razotkriva Vašu IP adresu, može se smatrati narušavanjem "
 "privatnosti. Želite li da nastavite?"
 
-#: src/protocols/oscar/oscar.c:1593 src/protocols/oscar/oscar.c:3731
+#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3643
 msgid "Connect"
 msgstr "Uspostavi vezu"
 
-#: src/protocols/oscar/oscar.c:1657
-#, fuzzy, c-format
-msgid "You have lost your connection to chat room %s."
+#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:874
+#, c-format
+msgid "You have been disconnected from chat room %s."
 msgstr "Veza sa pričaonicom %s je prekinuta."
 
-#: src/protocols/oscar/oscar.c:1680
+#: src/protocols/oscar/oscar.c:1619
 msgid "Chat is currently unavailable"
 msgstr "Razgovor trenutno nije moguć"
 
-#: src/protocols/oscar/oscar.c:1749
+#: src/protocols/oscar/oscar.c:1700
 msgid "Screen name sent"
 msgstr "Nadimak poslat"
 
-#: src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:1714
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8114,53 +8104,53 @@
 "nije važeće. Korisnička imena moraju ili početi slovom i sadržati samo "
 "slova, brojeve i razmake, ili mogu sadržati samo brojeve."
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1742
 msgid "Unable to login to AIM"
 msgstr "Ne mogu da se prijavim na AIM"
 
-#: src/protocols/oscar/oscar.c:1906 src/protocols/oscar/oscar.c:2428
+#: src/protocols/oscar/oscar.c:1844 src/protocols/oscar/oscar.c:2365
 msgid "Could Not Connect"
 msgstr "Ne mogu da se povežem"
 
-#: src/protocols/oscar/oscar.c:1914
+#: src/protocols/oscar/oscar.c:1852
 msgid "Connection established, cookie sent"
 msgstr "Veza je uspostavljena, kolačić je poslat"
 
-#: src/protocols/oscar/oscar.c:2027
+#: src/protocols/oscar/oscar.c:1963
 #, fuzzy, c-format
 msgid "Transfer of file %s timed out."
-msgstr "Prenos datoteke do %s prekinut.\n"
+msgstr "Prenos datoteke %s završen"
 
 # 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:2106 src/protocols/yahoo/yahoo_filexfer.c:177
+#: src/protocols/oscar/oscar.c:2047 src/protocols/yahoo/yahoo_filexfer.c:177
 #: src/protocols/yahoo/yahoo_filexfer.c:186
 #: src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr "Ne mogu da uspostavim opisnik datoteke."
 
-#: src/protocols/oscar/oscar.c:2111
+#: src/protocols/oscar/oscar.c:2052
 msgid "Unable to create new connection."
 msgstr "Ne mogu da uspostavim novu vezu."
 
 # Mogu reci i "server soket", ali preveliko znacenje mogu ljudi dati "server" delu, i ne razumeti.
-#: src/protocols/oscar/oscar.c:2190
+#: src/protocols/oscar/oscar.c:2124
 msgid "Unable to establish listener socket."
 msgstr "Ne mogu da uspostavim soket za vezu."
 
-#: src/protocols/oscar/oscar.c:2315 src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2249 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Neispravan nadimak ili lozinka."
 
-#: src/protocols/oscar/oscar.c:2320
+#: src/protocols/oscar/oscar.c:2254
 msgid "Your account is currently suspended."
 msgstr "Vaš nalog je trenutno nedostupan."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2324
+#: src/protocols/oscar/oscar.c:2258
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Usluga AOL brzih poruka je privremeno nedostupna."
 
-#: src/protocols/oscar/oscar.c:2329
+#: src/protocols/oscar/oscar.c:2263
 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."
@@ -8168,34 +8158,34 @@
 "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:2334
+#: src/protocols/oscar/oscar.c:2268
 #, 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:2365
+#: src/protocols/oscar/oscar.c:2300
 msgid "Internal Error"
 msgstr "Unutrašnja greška"
 
-#: src/protocols/oscar/oscar.c:2435
+#: src/protocols/oscar/oscar.c:2372
 msgid "Received authorization"
 msgstr "Primio ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:2459
+#: src/protocols/oscar/oscar.c:2396
 msgid "The SecurID key entered is invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2473
+msgstr "Uneti SecurID ključ je neispravan."
+
+#: src/protocols/oscar/oscar.c:2410
 msgid "Enter SecurID"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2474
+msgstr "Unesite SecurID"
+
+#: src/protocols/oscar/oscar.c:2411
 msgid "Enter the 6 digit number from the digital display."
-msgstr ""
+msgstr "Unesite šestocifreni broj sa digitalnog ekrana."
 
 # 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:2514 src/protocols/oscar/oscar.c:2544
-#: src/protocols/oscar/oscar.c:2633
+#: src/protocols/oscar/oscar.c:2451 src/protocols/oscar/oscar.c:2481
+#: src/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8204,24 +8194,24 @@
 "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:2517 src/protocols/oscar/oscar.c:2547
+#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2484
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim nije uspeo da primi ispravan heš za prijavu na AIM."
 
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2573
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim nije uspeo da primi ispravan heš za prijavu."
 
-#: src/protocols/oscar/oscar.c:2667
+#: src/protocols/oscar/oscar.c:2605
 msgid "Password sent"
 msgstr "Lozinka poslata"
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3635
 #, 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:3725
+#: src/protocols/oscar/oscar.c:3638
 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 "
@@ -8231,19 +8221,19 @@
 "slika. Pošto će se Vaša IP adresa prikazati, ovo se može smatrati "
 "narušavanjem privatnosti."
 
-#: src/protocols/oscar/oscar.c:3764
+#: src/protocols/oscar/oscar.c:3676
 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:3772
+#: src/protocols/oscar/oscar.c:3684
 msgid "Authorization Request Message:"
 msgstr "Poruka uz zahtev za ovlašćenje:"
 
-#: src/protocols/oscar/oscar.c:3773
+#: src/protocols/oscar/oscar.c:3685
 msgid "Please authorize me!"
 msgstr "Ovlasti me!"
 
-#: src/protocols/oscar/oscar.c:3803
+#: src/protocols/oscar/oscar.c:3715
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8252,35 +8242,36 @@
 "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:3808 src/protocols/oscar/oscar.c:3810
+#: src/protocols/oscar/oscar.c:3720 src/protocols/oscar/oscar.c:3722
 msgid "Request Authorization"
 msgstr "Zahtevaj ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:3854
-#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3983
-#: src/protocols/oscar/oscar.c:6535 src/protocols/oscar/oscar.c:6587
+#: src/protocols/oscar/oscar.c:3770 src/protocols/oscar/oscar.c:3772
+#: src/protocols/oscar/oscar.c:3779 src/protocols/oscar/oscar.c:3876
+#: src/protocols/oscar/oscar.c:3896 src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:6476
 msgid "No reason given."
 msgstr "Razlog nije naveden."
 
-#: src/protocols/oscar/oscar.c:3853
+#: src/protocols/oscar/oscar.c:3778
 msgid "Authorization Denied Message:"
 msgstr "Razlog odbijanja ovlašćenja:"
 
-#: src/protocols/oscar/oscar.c:3961
-#, fuzzy, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:3876
+#, c-format
+msgid ""
+"The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "Korisnik %u želi da Vas doda u svoj spisak drugara i naveo je sledeći "
 "razlog:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:6547
+#: src/protocols/oscar/oscar.c:3884 src/protocols/oscar/oscar.c:6436
 msgid "Authorization Request"
 msgstr "Zahtev za ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:3896
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8291,17 +8282,17 @@
 "a naveo je sledeći razlog:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:3897
 msgid "ICQ authorization denied."
 msgstr "ICQ ovlašćenje odbijeno."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:3904
 #, 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:3999
+#: src/protocols/oscar/oscar.c:3912
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8314,7 +8305,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8327,7 +8318,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:3928
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8340,20 +8331,20 @@
 "Poruka glasi:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4036
+#: src/protocols/oscar/oscar.c:3949
 #, 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:4042
+#: src/protocols/oscar/oscar.c:3955
 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:4046
+#: src/protocols/oscar/oscar.c:3959
 msgid "Decline"
 msgstr "Odbij"
 
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:4043
 #, 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."
@@ -8361,7 +8352,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:4139
+#: src/protocols/oscar/oscar.c:4052
 #, 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."
@@ -8369,7 +8360,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:4148
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8382,7 +8373,7 @@
 msgstr[2] ""
 "Propustili ste %hu poruka od %s zato što je ograničenje prekoračeno."
 
-#: src/protocols/oscar/oscar.c:4157
+#: src/protocols/oscar/oscar.c:4070
 #, 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."
@@ -8390,7 +8381,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:4166
+#: src/protocols/oscar/oscar.c:4079
 #, 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."
@@ -8398,7 +8389,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:4175
+#: src/protocols/oscar/oscar.c:4088
 #, 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."
@@ -8406,68 +8397,66 @@
 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:4229 src/protocols/oscar/oscar.c:4463
-#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
+#: src/protocols/oscar/oscar.c:4142 src/protocols/oscar/oscar.c:4374
 #, c-format
 msgid "Info for %s"
 msgstr "Podaci za %s"
 
-#: src/protocols/oscar/oscar.c:4295
+#: src/protocols/oscar/oscar.c:4208
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC prijavljuje grešku: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4332
+#: src/protocols/oscar/oscar.c:4244
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ne mogu da pošaljem poruku: %s"
 
-#: src/protocols/oscar/oscar.c:4332 src/protocols/oscar/oscar.c:4337
-#: src/protocols/oscar/oscar.c:4395 src/protocols/oscar/oscar.c:4399
+#: src/protocols/oscar/oscar.c:4244 src/protocols/oscar/oscar.c:4249
+#: src/protocols/oscar/oscar.c:4307 src/protocols/oscar/oscar.c:4311
 msgid "Unknown reason."
 msgstr "Nepoznat razlog."
 
-#: src/protocols/oscar/oscar.c:4335
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr "Ne mogu da pošaljem poruku za %s:"
-
-#: src/protocols/oscar/oscar.c:4395
+#: src/protocols/oscar/oscar.c:4307
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podaci o korisniku %s nedostupni:"
 
-#: src/protocols/oscar/oscar.c:4398
+#: src/protocols/oscar/oscar.c:4310
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podaci o korisniku %s nedostupni:"
 
-#: src/protocols/oscar/oscar.c:4425
+#: src/protocols/oscar/oscar.c:4332
+msgid "Warning Level"
+msgstr "_Nivoi upozorenja"
+
+#: src/protocols/oscar/oscar.c:4336
 msgid "Online Since"
 msgstr "Na vezi od"
 
-#: src/protocols/oscar/oscar.c:4430 src/protocols/yahoo/yahoo_profile.c:1127
+#: src/protocols/oscar/oscar.c:4341 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Member Since"
 msgstr "Član od"
 
-#: src/protocols/oscar/oscar.c:4514
+#: src/protocols/oscar/oscar.c:4425
 msgid "Your AIM connection may be lost."
 msgstr "Možda AIM veza prekinuta."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4700
+#: src/protocols/oscar/oscar.c:4611
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 "[Nije moguće prikazati poruku jer sadrži znake koji se ne mogu prikazati.]"
 
-#: src/protocols/oscar/oscar.c:4925
+#: src/protocols/oscar/oscar.c:4836
 msgid "Rate limiting error."
 msgstr "Greška pri ograničavanju brzine."
 
-#: src/protocols/oscar/oscar.c:4926
+#: src/protocols/oscar/oscar.c:4837
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8475,108 +8464,117 @@
 "Poslednja poruka nije poslata zato što ste prekoračili dozvoljenu brzinu. "
 "Sačekajte 10 sekundi i probajte ponovo."
 
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4900
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr ""
+"Veza je prekinuta zato što ste se prijavili pod ovim imenom sa nekog drugog "
+"mesta."
+
+#: src/protocols/oscar/oscar.c:4902
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste iz nepoznatih razloga."
 
-#: src/protocols/oscar/oscar.c:5010 src/protocols/toc/toc.c:971
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "Veza sa pričaonicom %s je prekinuta."
-
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5035
+#: src/protocols/oscar/oscar.c:4933
 msgid "Finalizing connection"
 msgstr "Dovršava povezivanje"
 
-#: src/protocols/oscar/oscar.c:5328 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5216 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5217
+msgid "Not specified"
+msgstr "Nije naznačeno"
+
+#: src/protocols/oscar/oscar.c:5218 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Ženski"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5218 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Muški"
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5234
 msgid "Personal Web Page"
 msgstr "Lična veb stranica"
 
-#: src/protocols/oscar/oscar.c:5350
+#: src/protocols/oscar/oscar.c:5238
 msgid "Additional Information"
 msgstr "Dodatni podaci"
 
-#: src/protocols/oscar/oscar.c:5355
+#: src/protocols/oscar/oscar.c:5243
 msgid "Home Address"
 msgstr "Kućna adresa"
 
-#: src/protocols/oscar/oscar.c:5359 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5247 src/protocols/oscar/oscar.c:5255
 msgid "Zip Code"
 msgstr "Poštanski broj"
 
-#: src/protocols/oscar/oscar.c:5363
+#: src/protocols/oscar/oscar.c:5251
 msgid "Work Address"
 msgstr "Adresa na poslu"
 
-#: src/protocols/oscar/oscar.c:5371
+#: src/protocols/oscar/oscar.c:5259
 msgid "Work Information"
 msgstr "Podaci o poslu"
 
-#: src/protocols/oscar/oscar.c:5372
+#: src/protocols/oscar/oscar.c:5260
 msgid "Company"
 msgstr "Preduzeće"
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5261
 msgid "Division"
 msgstr "Odeljenje"
 
-#: src/protocols/oscar/oscar.c:5374
+#: src/protocols/oscar/oscar.c:5262
 msgid "Position"
 msgstr "Pozicija"
 
-#: src/protocols/oscar/oscar.c:5376
+#: src/protocols/oscar/oscar.c:5264
 msgid "Web Page"
 msgstr "Veb stranica"
 
-#: src/protocols/oscar/oscar.c:5386
+#: src/protocols/oscar/oscar.c:5274
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ podaci za %s"
 
-#: src/protocols/oscar/oscar.c:5435
+#: src/protocols/oscar/oscar.c:5323
 msgid "Pop-Up Message"
 msgstr "Iskačuća poruka"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:5344
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Naredni nadimci su u vezi sa %s"
 
-#: src/protocols/oscar/oscar.c:5482
+#: src/protocols/oscar/oscar.c:5348
+msgid "Search Results"
+msgstr "Rezultati pretrage"
+
+#: src/protocols/oscar/oscar.c:5365
 #, 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:5503
+#: src/protocols/oscar/oscar.c:5386
 #, 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:5505
+#: src/protocols/oscar/oscar.c:5388
 msgid "Account Confirmation Requested"
 msgstr "Zahteva se potvrda naloga"
 
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:5419
 msgid "Error Changing Account Info"
 msgstr "Greška pri izmeni podataka o nalogu"
 
-#: src/protocols/oscar/oscar.c:5539
+#: src/protocols/oscar/oscar.c:5422
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8585,7 +8583,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:5542
+#: src/protocols/oscar/oscar.c:5425
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8594,7 +8592,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:5545
+#: src/protocols/oscar/oscar.c:5428
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8603,7 +8601,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:5548
+#: src/protocols/oscar/oscar.c:5431
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8612,7 +8610,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:5551
+#: src/protocols/oscar/oscar.c:5434
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8621,7 +8619,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:5554
+#: src/protocols/oscar/oscar.c:5437
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8630,12 +8628,12 @@
 "Greška 0x%04x: Ne mogu promeniti adresu e-pošte zato što je uneta adresa "
 "neispravna."
 
-#: src/protocols/oscar/oscar.c:5557
+#: src/protocols/oscar/oscar.c:5440
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Greška 0x%04x: Nepoznata greška."
 
-#: src/protocols/oscar/oscar.c:5567
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8644,27 +8642,27 @@
 "Vaše korisničko ime trenutno izgleda ovako:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5568 src/protocols/oscar/oscar.c:5575
+#: src/protocols/oscar/oscar.c:5451 src/protocols/oscar/oscar.c:5458
 msgid "Account Info"
 msgstr "Podaci o nalogu"
 
-#: src/protocols/oscar/oscar.c:5573
+#: src/protocols/oscar/oscar.c:5456
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Adresa e-pošte za %s je %s"
 
-#: src/protocols/oscar/oscar.c:5640
+#: src/protocols/oscar/oscar.c:5521
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Slika u brzoj poruci nije poslata. Morate biti neposredno povezani za slanje "
 "slika."
 
-#: src/protocols/oscar/oscar.c:5780
+#: src/protocols/oscar/oscar.c:5649
 msgid "Unable to set AIM profile."
 msgstr "Ne mogu da postavim AIM profil."
 
-#: src/protocols/oscar/oscar.c:5781
+#: src/protocols/oscar/oscar.c:5650
 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 "
@@ -8674,8 +8672,7 @@
 "prijave završen. Profil nije postavljen. Pokušajte ponovo, kada se propisno "
 "povežete."
 
-# bug: plural-forms
-#: src/protocols/oscar/oscar.c:5808
+#: src/protocols/oscar/oscar.c:5677
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8684,24 +8681,28 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr[0] ""
-"Najveća dozvoljena veličina profila od %d bajta je prekoračena. Gaim ga je "
+"Najveća dozvoljena veličina profila od %d bajt je prekoračena. Gaim ga je "
 "skratio i postavio."
 msgstr[1] ""
-"Najveća dozvoljena veličina profila od %d bajtova je prekoračena. Gaim ga je "
+"Najveća dozvoljena veličina profila od %d bajta je prekoračena. Gaim ga je "
 "skratio i postavio."
 msgstr[2] ""
 "Najveća dozvoljena veličina profila od %d bajtova je prekoračena. Gaim ga je "
 "skratio i postavio."
 
-#: src/protocols/oscar/oscar.c:5813
+#: src/protocols/oscar/oscar.c:5682
 msgid "Profile too long."
 msgstr "Profil je predugačak."
 
-#: src/protocols/oscar/oscar.c:5843
+#: src/protocols/oscar/oscar.c:5698 src/protocols/oscar/oscar.c:6994
+msgid "Visible"
+msgstr "Vidljiv"
+
+#: src/protocols/oscar/oscar.c:5716
 msgid "Unable to set AIM away message."
 msgstr "Ne mogu da postavim poruku za AIM odsustvo."
 
-#: src/protocols/oscar/oscar.c:5844
+#: src/protocols/oscar/oscar.c:5717
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8711,8 +8712,7 @@
 "postupak prijave u potpunosti završen. Ostajete u „trenutnom“ stanju; "
 "pokušajte ponovo kada se propisno povežete."
 
-# bug: plural-forms
-#: src/protocols/oscar/oscar.c:5891
+#: src/protocols/oscar/oscar.c:5757
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8721,20 +8721,20 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr[0] ""
+"Najveća dozvoljena dužina poruke za odsustvo od %d bajt je prekoračena. Gaim "
+"je skratio poruku, i započeo odsustvo."
+msgstr[1] ""
 "Najveća dozvoljena dužina poruke za odsustvo od %d bajta je prekoračena. "
 "Gaim je skratio poruku, i započeo odsustvo."
-msgstr[1] ""
-"Najveća dozvoljena dužina poruke za odsustvo od %d bajtova je prekoračena. "
-"Gaim je skratio poruku, i započeo odsustvo."
 msgstr[2] ""
 "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:5896
+#: src/protocols/oscar/oscar.c:5762
 msgid "Away message too long."
 msgstr "Poruka za odsustvo je predugačka."
 
-#: src/protocols/oscar/oscar.c:5994
+#: src/protocols/oscar/oscar.c:5839
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8745,16 +8745,16 @@
 "moraju da ili počnu slovom i zatim sadrže slova, brojeve i razmake, ili mogu "
 "sadržati samo brojeve."
 
-#: src/protocols/oscar/oscar.c:5996 src/protocols/oscar/oscar.c:6394
-#: src/protocols/oscar/oscar.c:6408
+#: src/protocols/oscar/oscar.c:5841 src/protocols/oscar/oscar.c:6296
+#: src/protocols/oscar/oscar.c:6310
 msgid "Unable To Add"
 msgstr "Ne mogu da dodam"
 
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/oscar/oscar.c:6008
 msgid "Unable To Retrieve Buddy List"
 msgstr "Ne mogu preuzeti spisak drugara"
 
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/oscar/oscar.c:6009
 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 "
@@ -8763,13 +8763,13 @@
 "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:6285 src/protocols/oscar/oscar.c:6286
-#: src/protocols/oscar/oscar.c:6291 src/protocols/oscar/oscar.c:6452
-#: src/protocols/oscar/oscar.c:6453 src/protocols/oscar/oscar.c:6458
+#: src/protocols/oscar/oscar.c:6191 src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6354
+#: src/protocols/oscar/oscar.c:6355 src/protocols/oscar/oscar.c:6360
 msgid "Orphans"
 msgstr "Siročići"
 
-#: src/protocols/oscar/oscar.c:6392
+#: src/protocols/oscar/oscar.c:6294
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8778,11 +8778,11 @@
 "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:6392 src/protocols/oscar/oscar.c:6406
+#: src/protocols/oscar/oscar.c:6294 src/protocols/oscar/oscar.c:6308
 msgid "(no name)"
 msgstr "(bez imena)"
 
-#: src/protocols/oscar/oscar.c:6406
+#: src/protocols/oscar/oscar.c:6308
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8793,7 +8793,7 @@
 "već imate najviše dozvoljenih drugara u Vašem spisku."
 
 # Is it "them"? Or "him/her"?
-#: src/protocols/oscar/oscar.c:6489
+#: src/protocols/oscar/oscar.c:6391
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8802,31 +8802,31 @@
 "Korisnik %s Vam dozvoljava da ga dodate u spisak drugara. Da li želite da ga "
 "dodate?"
 
-#: src/protocols/oscar/oscar.c:6495
+#: src/protocols/oscar/oscar.c:6397
 msgid "Authorization Given"
 msgstr "Ovlašćenje je dato"
 
-#: src/protocols/oscar/oscar.c:6538
-#, fuzzy, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:6430
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "Korisnik %s želi da Vas doda u svoj spisak drugara iz sledećih razloga:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6583
+#: src/protocols/oscar/oscar.c:6472
 #, 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:6584
+#: src/protocols/oscar/oscar.c:6473
 msgid "Authorization Granted"
 msgstr "Zahtev odobren"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6587
+#: src/protocols/oscar/oscar.c:6476
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8837,99 +8837,78 @@
 "razloga:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6588
+#: src/protocols/oscar/oscar.c:6477
 msgid "Authorization Denied"
 msgstr "Zahtev odbijen"
 
-#: src/protocols/oscar/oscar.c:6625 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:6514 src/protocols/toc/toc.c:1273
 msgid "_Exchange:"
 msgstr "Raz_mena:"
 
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:6552
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neispravno ime razgovora."
 
-#: src/protocols/oscar/oscar.c:6731
+#: src/protocols/oscar/oscar.c:6641
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Slika nije poslata. Ne možete slati slike za vreme AIM razgovora."
 
-#: src/protocols/oscar/oscar.c:6866
+#: src/protocols/oscar/oscar.c:6767
 msgid "Away Message"
 msgstr "Poruke za odsustvo"
 
-#: src/protocols/oscar/oscar.c:7153
+#: src/protocols/oscar/oscar.c:7053
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Primedba za drugara %s"
 
-#: src/protocols/oscar/oscar.c:7154
+#: src/protocols/oscar/oscar.c:7054
 msgid "Buddy Comment:"
 msgstr "Primedba za drugara:"
 
-#: src/protocols/oscar/oscar.c:7173
+#: src/protocols/oscar/oscar.c:7073
 msgid "Edit Buddy Comment"
 msgstr "Uredi primedbu za drugara"
 
-#: src/protocols/oscar/oscar.c:7179
+#: src/protocols/oscar/oscar.c:7079
 msgid "Get Status Msg"
 msgstr "Pribavi poruku o stanju"
 
-#: src/protocols/oscar/oscar.c:7191
+#: src/protocols/oscar/oscar.c:7091
 msgid "Direct IM"
 msgstr "Neposredna poruka"
 
-#: src/protocols/oscar/oscar.c:7208
+#: src/protocols/oscar/oscar.c:7108
 msgid "Re-request Authorization"
 msgstr "Ponovi zahtev za ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:7268
-#, fuzzy
-msgid "Require authorization"
-msgstr "Zahtevaj ovlašćenje"
-
-# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-#: src/protocols/oscar/oscar.c:7271
-#, fuzzy
-msgid "Hide IP address"
-msgstr "IP adresa"
-
-#: src/protocols/oscar/oscar.c:7274
-#, fuzzy
-msgid "Web aware"
-msgstr "Pratim veb"
-
-#: src/protocols/oscar/oscar.c:7279
-#, fuzzy
-msgid "ICQ Privacy Options"
-msgstr "Postavke proksija"
-
-#: src/protocols/oscar/oscar.c:7296
+#: src/protocols/oscar/oscar.c:7138
 msgid "The new formatting is invalid."
 msgstr "Novi zapis je neispravan."
 
-#: src/protocols/oscar/oscar.c:7297
+#: src/protocols/oscar/oscar.c:7139
 msgid "Screen name 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:7304
+#: src/protocols/oscar/oscar.c:7146
 msgid "New screen name formatting:"
 msgstr "Novi zapis korisničkog imena:"
 
-#: src/protocols/oscar/oscar.c:7356
+#: src/protocols/oscar/oscar.c:7198
 msgid "Change Address To:"
 msgstr "Promena adrese u:"
 
-#: src/protocols/oscar/oscar.c:7401
+#: src/protocols/oscar/oscar.c:7243
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čekate na ovlašćenje</i>"
 
-#: src/protocols/oscar/oscar.c:7404
+#: src/protocols/oscar/oscar.c:7246
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Očekujete ovlašćenje od sledećih drugara"
 
-#: src/protocols/oscar/oscar.c:7405
+#: src/protocols/oscar/oscar.c:7247
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8937,83 +8916,78 @@
 "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:7422
+#: src/protocols/oscar/oscar.c:7264
 msgid "Find Buddy by E-mail"
 msgstr "Pronađi drugara pomoću adrese e-pošte"
 
-#: src/protocols/oscar/oscar.c:7423
+#: src/protocols/oscar/oscar.c:7265
 msgid "Search for a buddy by e-mail address"
 msgstr "Pronađi drugara pomoću adrese e-pošte"
 
-#: src/protocols/oscar/oscar.c:7424
+#: src/protocols/oscar/oscar.c:7266
 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:7505 src/protocols/silc/silc.c:826
+#: src/protocols/oscar/oscar.c:7283
+msgid "Available Message:"
+msgstr "Poruka za dostupnost:"
+
+#: src/protocols/oscar/oscar.c:7284
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr "Obavljam posao i nadam se ometanju — šibni mi poruku!"
+
+#: src/protocols/oscar/oscar.c:7365 src/protocols/silc/silc.c:812
 msgid "Set User Info..."
 msgstr "Postavi podatke o korisniku..."
 
-#: src/protocols/oscar/oscar.c:7511
+#: src/protocols/oscar/oscar.c:7370
 msgid "Set User Info (URL)..."
 msgstr "Postavi podatke o korisniku..."
 
-#: src/protocols/oscar/oscar.c:7516 src/protocols/silc/silc.c:822
+#: src/protocols/oscar/oscar.c:7376
+msgid "Set Available Message..."
+msgstr "Postavi poruku za dostupnost..."
+
+#: src/protocols/oscar/oscar.c:7381 src/protocols/silc/silc.c:808
 msgid "Change Password..."
 msgstr "Promeni lozinku..."
 
-#: src/protocols/oscar/oscar.c:7522
+#: src/protocols/oscar/oscar.c:7386
 msgid "Change Password (URL)"
 msgstr "Izmena lozinke (Internet adresa)"
 
-#: src/protocols/oscar/oscar.c:7526
+#: src/protocols/oscar/oscar.c:7390
 msgid "Configure IM Forwarding (URL)"
 msgstr "Podesi prosleđivanje brzih poruka (adresa)"
 
-#. ICQ actions
-#: src/protocols/oscar/oscar.c:7536
-#, fuzzy
-msgid "Show privacy options..."
-msgstr "Pokaži više postavki"
-
-#. AIM actions
-#: src/protocols/oscar/oscar.c:7543
+#: src/protocols/oscar/oscar.c:7399
 msgid "Format Screen Name..."
 msgstr "Zapis ekranskog imena..."
 
-#: src/protocols/oscar/oscar.c:7547
+#: src/protocols/oscar/oscar.c:7403
 msgid "Confirm Account"
 msgstr "Potvrdite nalog"
 
-#: src/protocols/oscar/oscar.c:7551
+#: src/protocols/oscar/oscar.c:7407
 msgid "Display Currently Registered Address"
 msgstr "Prikaži trenutno registrovanu adresu"
 
-#: src/protocols/oscar/oscar.c:7555
+#: src/protocols/oscar/oscar.c:7411
 msgid "Change Currently Registered Address..."
 msgstr "Izmeni trenutno registrovanu adresu..."
 
-#: src/protocols/oscar/oscar.c:7562
+#: src/protocols/oscar/oscar.c:7418
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Prikaži drugare za koje se čeka ovlašćenje"
 
-#: src/protocols/oscar/oscar.c:7568
+#: src/protocols/oscar/oscar.c:7424
 msgid "Search for Buddy by Email..."
 msgstr "Pronađi drugara prema e-adresi..."
 
-#: src/protocols/oscar/oscar.c:7573
+#: src/protocols/oscar/oscar.c:7429
 msgid "Search for Buddy by Information"
 msgstr "Pronađi drugara prema podacima"
 
-#: src/protocols/oscar/oscar.c:7643
-#, fuzzy
-msgid "Use recent buddies group"
-msgstr "Korisnik nije u grupi"
-
-#: src/protocols/oscar/oscar.c:7646
-#, fuzzy
-msgid "Show how long you have been idle"
-msgstr "Omogućava Vam da odredite koliko dugo traje period neaktivnosti"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9024,19 +8998,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7763 src/protocols/oscar/oscar.c:7765
+#: src/protocols/oscar/oscar.c:7550 src/protocols/oscar/oscar.c:7552
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Dodatak za AIM/ICQ protokole"
 
-#: src/protocols/oscar/oscar.c:7788
+#: src/protocols/oscar/oscar.c:7571
 msgid "Auth host"
 msgstr "Domaćin za identifikaciju"
 
-#: src/protocols/oscar/oscar.c:7791
+#: src/protocols/oscar/oscar.c:7574
 msgid "Auth port"
 msgstr "Port"
 
-#: src/protocols/oscar/oscar.c:7794 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:7577 src/protocols/zephyr/zephyr.c:2760
 msgid "Encoding"
 msgstr "Način zapisa"
 
@@ -9125,32 +9099,32 @@
 msgstr "Postavi lozinku"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1293
+#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1295
 msgid "Get Public Key"
 msgstr "Dobavi javni ključ"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1283
-#: src/protocols/silc/ops.c:1294
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1296
 msgid "Cannot fetch the public key"
 msgstr "Ne mogu da dobavim javni ključ"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1578
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
 msgid "Show Public Key"
 msgstr "Prikaži javni ključ"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr "Ne mogu da učitam javni ključ"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1101
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
+#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
 msgid "User Information"
 msgstr "Podaci o korisniku"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1102
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr "Ne mogu da dobavim podatke o korisniku"
 
@@ -9210,213 +9184,216 @@
 "Pronađeno je više od jednog korisnika sa istim imenom. Izaberite ispravnog "
 "korisnika kog treba dodati u spisak drugara."
 
-#: src/protocols/silc/buddy.c:1410
+#: src/protocols/silc/buddy.c:1386
 msgid "Detached"
 msgstr "Otkačen"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:85
 msgid "Indisposed"
 msgstr "Neobjavljen"
 
-#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:60
+#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
+#: src/protocols/silc/silc.c:87
 msgid "Wake Me Up"
 msgstr "Probudi me"
 
-#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:52
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:79
 msgid "Hyper Active"
 msgstr "Suviše aktivan"
 
-#: src/protocols/silc/buddy.c:1422
+#: src/protocols/silc/buddy.c:1398
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1429 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:629
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Srećan"
 
-#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:631
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Tužan"
 
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:633
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Ljut"
 
-#: src/protocols/silc/buddy.c:1435 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:651
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Stidan"
 
-#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:653
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Nepobediv"
 
-#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:655
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:657
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:659
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Dosadan"
 
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:661
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:663
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Nervozan"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "Korisnički izbori"
 
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "Raspoloženje"
 
-#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "Stanje"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "Željeni kontakt"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "Željeni jezik"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "Uređaj"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:713
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
+#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:699
 msgid "Timezone"
 msgstr "Vr. zona"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "Mesto"
 
-#: src/protocols/silc/buddy.c:1562
+#: src/protocols/silc/buddy.c:1538
 msgid "Reset IM Key"
 msgstr "Poništi ključ za brze poruke"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1543
 msgid "IM with Key Exchange"
 msgstr "Brze poruke sa razmenom ključeva"
 
-#: src/protocols/silc/buddy.c:1571
+#: src/protocols/silc/buddy.c:1547
 msgid "IM with Password"
 msgstr "Lozinka"
 
-#: src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:1558
 msgid "Get Public Key..."
 msgstr "Dobavi javni ključ..."
 
-#: src/protocols/silc/buddy.c:1590 src/protocols/silc/ops.c:1413
+#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1417
 msgid "Kill User"
 msgstr "Odstrani korisnika"
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/chat.c:37
 msgid "_Passphrase:"
 msgstr "_Lozinka:"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanal %s ne postoji na mreži"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
 msgid "Channel Information"
 msgstr "Podaci o kanalu"
 
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
 msgstr "Ne mogu da dobavim podatke o kanalu"
 
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Ime kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Broj korisnika:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Osnivač kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Šifra kanala:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC za kanal:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema kanala:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modovi kanala:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:162
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Otisak osnivačevog ključa:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Tekstualni otisak:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr "Dodaj javni ključ kanala"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr "Otvori javni ključ..."
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "Lozinka za kanal"
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr "Spisak javnih ključeva kanala"
 
-#: src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9430,123 +9407,123 @@
 "postavljeni javni ključevi za kanal, onda jedino korisnici sa navedenim "
 "javnim ključevima mogu da pristupe."
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr "Prijava na kanal"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr "Dodaj / Ukloni"
 
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "Grupa"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1698
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1697
 msgid "Passphrase"
 msgstr "Lozinka"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Unesite ime i lozinku za privatnu grupu na kanalu %s"
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr "Dodaj novu privatnu grupu"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:719
 msgid "User Limit"
 msgstr "Broj korisnika"
 
-#: src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:720
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Najveći dozvoljeni broj korisnika. Ako je nula, ne postoji granica."
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr "Podaci"
 
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr "Spisak pozvanih"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr "Spisak zabrana"
 
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr "Dodaj privatnu grupu"
 
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr "Ukini stalnost"
 
+#: src/protocols/silc/chat.c:895
+msgid "Set Permanent"
+msgstr "Postavi stalnost"
+
 #: src/protocols/silc/chat.c:902
-msgid "Set Permanent"
-msgstr "Postavi stalnost"
-
-#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "Postavi broj korisnika"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr "Ukini ograničenje teme"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:911
 msgid "Set Topic Restriction"
 msgstr "Postavi ograničenje za temu"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:917
 msgid "Reset Private Channel"
 msgstr "Ukini privatnost kanala"
 
-#: src/protocols/silc/chat.c:933
+#: src/protocols/silc/chat.c:921
 msgid "Set Private Channel"
 msgstr "Postavi privatnost kanala"
 
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr "Ukini tajnost kanala"
 
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr "Postavi tajnost kanala"
 
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vi ste osnivač kanala na <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:997
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Osnivač kanala <I>%s</I> je <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: src/protocols/silc/chat.c:1056
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Morate se priključiti kanalu %s pre nego što se priključite privatnoj grupi"
 
-#: src/protocols/silc/chat.c:1073
+#: src/protocols/silc/chat.c:1058
 msgid "Join Private Group"
 msgstr "Priključi se privatnoj grupi"
 
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr "Nije moguće ući na privatnu grupu"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:926
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:911
 msgid "Cannot call command"
 msgstr "Nije uspelo pozivanje komande"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:927
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:912
 msgid "Unknown command"
 msgstr "Nepoznata naredba"
 
@@ -9573,8 +9550,7 @@
 msgstr "Pregovor o ključevima nije uspeo"
 
 #: src/protocols/silc/ft.c:102
-#, fuzzy
-msgid "File transfer session does not exist"
+msgid "File transfer sessions does not exist"
 msgstr "Sesije prenosa datoteka ne postoje"
 
 #: src/protocols/silc/ft.c:206
@@ -9597,151 +9573,151 @@
 msgid "Cannot send file"
 msgstr "Ne mogu da pošaljem datoteku"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s je promenio temu <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:423
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> postavlja pristup za kanal <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:427
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> uklanja sve pristupe za kanal <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:460
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> postavlja pristup za <I>%s</I> na: %s"
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:468
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> ukida sve pristupe za <I>%s</I>"
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:497
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sa kanala <I>%s</I> vas je izbacio <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Uklonio vas je %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Uklonio vas je %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr "Odjavi se"
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:801
 msgid "Personal Information"
 msgstr "Podaci o profilu"
 
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr "Rođendan"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr "Titula"
 
 # „radno mesto‟ u organizaciji?
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr "Uloga"
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr "Jedinica"
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "E-pošta"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "Beleška"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr "Priključi se razgovoru"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr "Otisak javnog ključa"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr "Sažetak javnog ključa"
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr "Više..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:814
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:800
 msgid "Detach From Server"
 msgstr "Isključi se sa servera"
 
-#: src/protocols/silc/ops.c:1159
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "Ne mogu da se isključim"
 
-#: src/protocols/silc/ops.c:1170
+#: src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "Ne mogu da postavim temu"
 
-#: src/protocols/silc/ops.c:1202
+#: src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr "Ne mogu da promenim nadimak"
 
-#: src/protocols/silc/ops.c:1250
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
 msgid "Roomlist"
 msgstr "Sobe"
 
-#: src/protocols/silc/ops.c:1250
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
 msgid "Cannot get room list"
 msgstr "Ne mogu da dobavim spisak soba"
 
-#: src/protocols/silc/ops.c:1295
+#: src/protocols/silc/ops.c:1297
 msgid "No public key was received"
 msgstr "Nije primljen javni ključ"
 
-#: src/protocols/silc/ops.c:1308 src/protocols/silc/ops.c:1321
+#: src/protocols/silc/ops.c:1310 src/protocols/silc/ops.c:1324
 msgid "Server Information"
 msgstr "Podaci o serveru"
 
-#: src/protocols/silc/ops.c:1309
+#: src/protocols/silc/ops.c:1311
 msgid "Cannot get server information"
 msgstr "Ne mogu da dobavim podatke o serveru"
 
-#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1347
+#: src/protocols/silc/ops.c:1342 src/protocols/silc/ops.c:1351
 msgid "Server Statistics"
 msgstr "Statistike o serveru"
 
-#: src/protocols/silc/ops.c:1339
+#: src/protocols/silc/ops.c:1343
 msgid "Cannot get server statistics"
 msgstr "Ne mogu da dobavim statistike o serveru"
 
-#: src/protocols/silc/ops.c:1348
+#: src/protocols/silc/ops.c:1352
 msgid "No server statistics available"
 msgstr "Nema dostupnih statistika"
 
-#: src/protocols/silc/ops.c:1370
+#: src/protocols/silc/ops.c:1374
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9776,99 +9752,99 @@
 "Ukupno operatora servera: %d\n"
 "Ukupno operatora rutera: %d\n"
 
-#: src/protocols/silc/ops.c:1393
+#: src/protocols/silc/ops.c:1397
 msgid "Network Statistics"
 msgstr "Mrežne statistike"
 
-#: src/protocols/silc/ops.c:1401 src/protocols/silc/ops.c:1406
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/ops.c:1410
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1401
+#: src/protocols/silc/ops.c:1405
 msgid "Ping failed"
 msgstr "Ping nije uspeo"
 
-#: src/protocols/silc/ops.c:1406
+#: src/protocols/silc/ops.c:1410
 msgid "Ping reply received from server"
 msgstr "Primljen je odgovor na PING sa servera"
 
-#: src/protocols/silc/ops.c:1414
+#: src/protocols/silc/ops.c:1418
 msgid "Could not kill user"
 msgstr "Ne mogu da uklonim korisnika"
 
-#: src/protocols/silc/ops.c:1498
+#: src/protocols/silc/ops.c:1499
 msgid "Error during connecting to SILC Server"
 msgstr "Greška pri povezivanju na SILC server"
 
-#: src/protocols/silc/ops.c:1503
+#: src/protocols/silc/ops.c:1504
 msgid "Key Exchange failed"
 msgstr "Razmena ključeva nije uspela"
 
-#: src/protocols/silc/ops.c:1512
+#: src/protocols/silc/ops.c:1513
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Nastavljam prekinutu sesiju. Pritisnite Ponovno povezivanje da napravite "
 "novu vezu."
 
-#: src/protocols/silc/ops.c:1547
+#: src/protocols/silc/ops.c:1548
 msgid "Disconnected by server"
 msgstr "Server Vas je isključio"
 
-#: src/protocols/silc/ops.c:1609 src/protocols/silc/ops.c:1656
-#: src/protocols/silc/silc.c:203
+#: src/protocols/silc/ops.c:1608 src/protocols/silc/ops.c:1655
+#: src/protocols/silc/silc.c:178
 msgid "Resuming session"
 msgstr "Nastavljam sesiju"
 
-#: src/protocols/silc/ops.c:1611
+#: src/protocols/silc/ops.c:1610
 msgid "Authenticating connection"
 msgstr "Identifikacija"
 
-#: src/protocols/silc/ops.c:1658
+#: src/protocols/silc/ops.c:1657
 msgid "Verifying server public key"
 msgstr "Čitanje javnog ključa za server"
 
-#: src/protocols/silc/ops.c:1699
+#: src/protocols/silc/ops.c:1698
 msgid "Passphrase required"
 msgstr "Obavezno je šifrovanje"
 
-#: src/protocols/silc/ops.c:1728
+#: src/protocols/silc/ops.c:1727
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Greška: izdanja se ne slažu, obnovite vašeg klijenta"
 
-#: src/protocols/silc/ops.c:1731
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Greška: druga strana nema poverenja ili ne podržava vaš javni ključ"
 
-#: src/protocols/silc/ops.c:1734
+#: src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Greška: druga strana ne podržava predloženu KE grupu"
 
-#: src/protocols/silc/ops.c:1737
+#: src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Greška: druga strana ne podržava predloženu šifru"
 
-#: src/protocols/silc/ops.c:1740
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Greška: druga strana ne podršava predložen PKCS"
 
-#: src/protocols/silc/ops.c:1743
+#: src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Greška: druga strana ne podržava predloženu heš funkciju"
 
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1745
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Greška: druga strana ne podržava predložen HMAC"
 
-#: src/protocols/silc/ops.c:1748
+#: src/protocols/silc/ops.c:1747
 msgid "Failure: Incorrect signature"
 msgstr "Greška: potpis je neispravan"
 
-#: src/protocols/silc/ops.c:1750
+#: src/protocols/silc/ops.c:1749
 msgid "Failure: Invalid cookie"
 msgstr "Greška: kolačić je neispravan."
 
-#: src/protocols/silc/ops.c:1761
+#: src/protocols/silc/ops.c:1760
 msgid "Failure: Authentication failed"
 msgstr "Neuspešna identifikacija"
 
@@ -9913,36 +9889,36 @@
 msgid "Unsupported public key type"
 msgstr "Nepodržana vrsta javnog ključa"
 
-#: src/protocols/silc/silc.c:163
+#: src/protocols/silc/silc.c:138
 msgid "Connection failed"
 msgstr "Veza neuspešna"
 
-#: src/protocols/silc/silc.c:195
+#: src/protocols/silc/silc.c:170
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ne može se pokrenuti SILC klijentska veza"
 
-#: src/protocols/silc/silc.c:206
+#: src/protocols/silc/silc.c:181
 msgid "Performing key exchange"
 msgstr "Razmena ključeva je u toku"
 
-#: src/protocols/silc/silc.c:279
+#: src/protocols/silc/silc.c:254
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
 #. Progress
-#: src/protocols/silc/silc.c:318
+#: src/protocols/silc/silc.c:293
 msgid "Connecting to SILC Server"
 msgstr "Povezivanje sa SILC serverom"
 
-#: src/protocols/silc/silc.c:639
+#: src/protocols/silc/silc.c:625
 msgid "Your Current Mood"
 msgstr "Trenutno raspoloženje"
 
-#: src/protocols/silc/silc.c:641
+#: src/protocols/silc/silc.c:627
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/silc.c:652
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9950,43 +9926,43 @@
 "\n"
 "Omiljeni načini povezivanja"
 
-#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Video razgovor"
 
-#: src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:669
 msgid "Your Current Status"
 msgstr "Vaš trenutni status"
 
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:676
 msgid "Online Services"
 msgstr "Mrežne usluge"
 
-#: src/protocols/silc/silc.c:693
+#: src/protocols/silc/silc.c:679
 msgid "Let others see what services you are using"
 msgstr "Objavi spisak mrežnih usluga"
 
-#: src/protocols/silc/silc.c:699
+#: src/protocols/silc/silc.c:685
 msgid "Let others see what computer you are using"
 msgstr "Objavi ime računara kog koristite"
 
-#: src/protocols/silc/silc.c:706
+#: src/protocols/silc/silc.c:692
 msgid "Your VCard File"
 msgstr "Vaša elektronska posetnica"
 
-#: src/protocols/silc/silc.c:719 src/protocols/silc/silc.c:720
+#: src/protocols/silc/silc.c:705 src/protocols/silc/silc.c:706
 msgid "User Online Status Attributes"
 msgstr "Osobine mrežnog statusa"
 
-#: src/protocols/silc/silc.c:721
+#: src/protocols/silc/silc.c:707
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9995,129 +9971,133 @@
 "Možete dopustiti drugim korisnicima da vide da li ste na vezi ili ne, kako i "
 "vaše privatne podatke. Popunite vaše podatke koje biste želeli da drugi vide."
 
-#: src/protocols/silc/silc.c:761 src/protocols/silc/silc.c:767
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:747 src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:1160
 msgid "Message of the Day"
 msgstr "Poruka dana"
 
-#: src/protocols/silc/silc.c:761
+#: src/protocols/silc/silc.c:747
 msgid "No Message of the Day available"
 msgstr "Nije dostupna poruka dana"
 
-#: src/protocols/silc/silc.c:762 src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:748 src/protocols/silc/silc.c:1155
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nema poruke dana za ovu vezu."
 
-#: src/protocols/silc/silc.c:809
+#: src/protocols/silc/silc.c:795
 msgid "Online Status"
 msgstr "Na vezi od"
 
-#: src/protocols/silc/silc.c:818
+#: src/protocols/silc/silc.c:804
 msgid "View Message of the Day"
 msgstr "Pogledaj poruku dana"
 
-#: src/protocols/silc/silc.c:891
+#: src/protocols/silc/silc.c:876
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Korisnik <I>%s</I> nije prijavljen na mrežu"
 
-#: src/protocols/silc/silc.c:1042
+#: src/protocols/silc/silc.c:985
+msgid "Failed to leave channel"
+msgstr "Neuspešna odjava sa kanala"
+
+#: src/protocols/silc/silc.c:1031
 msgid "Topic too long"
 msgstr "Tema je predugačka."
 
-#: src/protocols/silc/silc.c:1123
+#: src/protocols/silc/silc.c:1112
 msgid "You must specify a nick"
 msgstr "Morate navesti nadimak"
 
-#: src/protocols/silc/silc.c:1225
+#: src/protocols/silc/silc.c:1214
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanal %s nije pronađen"
 
-#: src/protocols/silc/silc.c:1230
+#: src/protocols/silc/silc.c:1219
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Tema kanala %s je: %s"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1221
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "Nijedan pristup nije podešen za %s"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1234
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ne mogu da sačuvam pristupe za: %s"
 
-#: src/protocols/silc/silc.c:1275
+#: src/protocols/silc/silc.c:1264
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Nepoznata naredba: %s (može biti i greška u GAIM-u)"
 
-#: src/protocols/silc/silc.c:1338
+#: src/protocols/silc/silc.c:1327
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  Napušta razgovor"
 
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1331
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]:  Napušta razgovor"
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1335
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nova tema&gt;]:  Pregleda ili menja temu"
 
-#: src/protocols/silc/silc.c:1351
+#: src/protocols/silc/silc.c:1340
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;kanal&gt; [&lt;lozinka&gt;]:  Pristupa razgovoru na ovoj mreži"
 
-#: src/protocols/silc/silc.c:1355
+#: src/protocols/silc/silc.c:1344
 msgid "list:  List channels on this network"
 msgstr "list:  Ispisuje kanale na ovoj mreži"
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1348
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nadimak&gt;:  Pregleda podatke o nadimku"
 
-#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1352 src/protocols/zephyr/zephyr.c:2478
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nadimak&gt; &lt;poruka&gt;:  Šalje privatnu poruku korisniku"
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1356
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nadimak&gt; [&lt;poruka&gt;]:  Šalje privatnu poruku korisniku"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1360
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Ispisuje poruku dana sa servera"
 
-#: src/protocols/silc/silc.c:1375
+#: src/protocols/silc/silc.c:1364
 msgid "detach:  Detach this session"
 msgstr "detach:  Otkači ovu sesiju"
 
-#: src/protocols/silc/silc.c:1379
+#: src/protocols/silc/silc.c:1368
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [poruka]:  Isključuje sa servera i pritom po želji ispisuje poruku"
 
-#: src/protocols/silc/silc.c:1383
+#: src/protocols/silc/silc.c:1372
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komanda&gt;:  Izvrši bilo koju komandu SILC klijenta"
 
-#: src/protocols/silc/silc.c:1389
+#: src/protocols/silc/silc.c:1378
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nadimak&gt; [-pubkey|&lt;razlog&gt;]:  Ukloni korisnika"
 
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1382
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novi nadimak&gt;:  Menja Vaš nadimak"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1386
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nadimak&gt;:  Prikazuje podatke o nadimku"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1390
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10125,7 +10105,7 @@
 "cmode &lt;kanal&gt; [+|-&lt;pristup&gt;] [argument]:  Menja ili prikazuje "
 "pristupe kanala"
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1394
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10133,15 +10113,15 @@
 "cumode &lt;kanal&gt; +|-&lt;pristupi&gt; &lt;nadimak&gt;:  Menja pristupe za "
 "dati nadimak na kanalu"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1398
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;pristupi&gt;:  Postavlja Vaše pristupe na mreži"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1402
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nadimak&gt; [-pubkey]:  Dobavlja čin operatora servera"
 
-#: src/protocols/silc/silc.c:1417
+#: src/protocols/silc/silc.c:1406
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10149,37 +10129,37 @@
 "invite &lt;kanal&gt; [-|+]&lt;nadimak&gt;:  Poziva nadimak ili dodaje, "
 "odnosno uklanja sa spiska pozvanih"
 
-#: src/protocols/silc/silc.c:1421
+#: src/protocols/silc/silc.c:1410
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanal&gt; &lt;nadimak&gt; [komentar]:  Odstrani nadimak sa kanala"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1414
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Pregledaj administrativne detalje servera"
 
-#: src/protocols/silc/silc.c:1429
+#: src/protocols/silc/silc.c:1418
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;nadimak&gt;]:  Zabrani pristup nadimku"
 
-#: src/protocols/silc/silc.c:1433
+#: src/protocols/silc/silc.c:1422
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nadimak|server&gt;:  Dobavi korisnikov ili serverov javni ključ"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1426
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Pregledaj serverske statistike"
 
-#: src/protocols/silc/silc.c:1441
+#: src/protocols/silc/silc.c:1430
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Šalje PING povezanom serveru"
 
-#: src/protocols/silc/silc.c:1446
+#: src/protocols/silc/silc.c:1435
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Ispisuje korisnike na kanalu"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1439
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10187,27 +10167,27 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(i)&gt;:  Ispisuje "
 "određene korisnike na kanalu, odn. kanalima"
 
-#: src/protocols/silc/silc.c:1462
+#: src/protocols/silc/silc.c:1451
 msgid "Instant Messages"
 msgstr "Brze poruke"
 
-#: src/protocols/silc/silc.c:1467
+#: src/protocols/silc/silc.c:1456
 msgid "Digitally sign all IM messages"
 msgstr "Digitalno potpiši sve _brze poruke"
 
-#: src/protocols/silc/silc.c:1472
+#: src/protocols/silc/silc.c:1461
 msgid "Verify all IM message signatures"
 msgstr "Proveri sve potpise brzih poruka"
 
-#: src/protocols/silc/silc.c:1475
+#: src/protocols/silc/silc.c:1464
 msgid "Channel Messages"
 msgstr "Poruke za kanal"
 
-#: src/protocols/silc/silc.c:1480
+#: src/protocols/silc/silc.c:1469
 msgid "Digitally sign all channel messages"
 msgstr "Digitalno potpiši sve poruke za kanal"
 
-#: src/protocols/silc/silc.c:1485
+#: src/protocols/silc/silc.c:1474
 msgid "Verify all channel message signatures"
 msgstr "Proveri potpise svih poruka na kanalu"
 
@@ -10220,42 +10200,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1573
+#: src/protocols/silc/silc.c:1563
 msgid "SILC Protocol Plugin"
 msgstr "Dodatak za SILC protokol"
 
 #. *  description
-#: src/protocols/silc/silc.c:1575
+#: src/protocols/silc/silc.c:1565
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokol"
 
-#: src/protocols/silc/silc.c:1609
-#, fuzzy
+#: src/protocols/silc/silc.c:1599
 msgid "Public Key file"
 msgstr "Datoteka sa javnim ključem"
 
+#: src/protocols/silc/silc.c:1603
+msgid "Private Key file"
+msgstr "Datoteka sa privatnim ključem"
+
+#: src/protocols/silc/silc.c:1606
+msgid "Public key authentication"
+msgstr "Prijava sa javnim ključem"
+
+#: src/protocols/silc/silc.c:1610
+msgid "Reject watching by other users"
+msgstr "Odbij posmatranje od drugih korisnika"
+
 #: src/protocols/silc/silc.c:1613
-#, fuzzy
-msgid "Private Key file"
-msgstr "Datoteka sa javnim ključem"
+msgid "Block invites"
+msgstr "Blokiraj pozive"
 
 #: src/protocols/silc/silc.c:1616
-msgid "Public key authentication"
-msgstr "Prijava sa javnim ključem"
-
-#: src/protocols/silc/silc.c:1620
-msgid "Reject watching by other users"
-msgstr "Odbij posmatranje od drugih korisnika"
-
-#: src/protocols/silc/silc.c:1623
-msgid "Block invites"
-msgstr "Blokiraj pozive"
-
-#: src/protocols/silc/silc.c:1626
 msgid "Block IMs without Key Exchange"
 msgstr "Blokiraj brze poruke bez razmene ključeva"
 
-#: src/protocols/silc/silc.c:1629
+#: src/protocols/silc/silc.c:1619
 msgid "Reject online status attribute requests"
 msgstr "Odbij zahteve za objavu statusa"
 
@@ -10346,116 +10324,116 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:139
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "Tražim %s"
 
-#: src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Prijava: %s"
 
-#: src/protocols/toc/toc.c:482
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Ne mogu da pišem u datoteku %s."
 
-#: src/protocols/toc/toc.c:485
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Ne mogu da pročitam datoteku %s."
 
 # greska: plural
-#: src/protocols/toc/toc.c:488
+#: src/protocols/toc/toc.c:486
 #, 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:491
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nije trenutno prijavljen."
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Nije dozvoljeno upozoriti %s."
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:495
 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:500
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Nije moguć razgovor u %s."
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Šaljete poruke prebrzo za %s."
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:504
 #, 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:509
+#: src/protocols/toc/toc.c:507
 #, 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:512
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "Neuspeh."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "Previše poklapanja."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "Potrebno više obeležja."
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "Usluge imenika trenutno nisu dostupne."
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "Ograničena pretraga prema adresi e-pošte."
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "Ključne reči zanemarene."
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "Nema ključnih reči."
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "Korisnik nije upisan u imenik."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "Država nije podržana."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Nepoznat neuspeh: %s."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "Usluga je privremeno nedostupna."
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:547
 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:552
+#: src/protocols/toc/toc.c:550
 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."
@@ -10463,41 +10441,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:554
+#: src/protocols/toc/toc.c:552
 #, 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:557
+#: src/protocols/toc/toc.c:555
 #, 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:584
-msgid "Invalid Groupname"
-msgstr "Neispravan naziv grupe"
-
-#: src/protocols/toc/toc.c:668
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "Veza prekinuta"
 
-#: src/protocols/toc/toc.c:708
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "Čekam za odgovor..."
 
-#: src/protocols/toc/toc.c:786
+#: src/protocols/toc/toc.c:695
 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:989
+#: src/protocols/toc/toc.c:892
 msgid "Password Change Successful"
 msgstr "Lozinka uspešno izmenjena"
 
-#: src/protocols/toc/toc.c:993
+#: src/protocols/toc/toc.c:896
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC je poslao naredbu PAUSE."
 
-#: src/protocols/toc/toc.c:994
+#: src/protocols/toc/toc.c:897
 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 "
@@ -10507,37 +10481,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:1549
+#: src/protocols/toc/toc.c:1423
 msgid "Get Dir Info"
 msgstr "Pribavi podatke iz imenika"
 
-#: src/protocols/toc/toc.c:1689
+#: src/protocols/toc/toc.c:1559
 msgid "Set Dir Info"
 msgstr "Postavi podatke u imenik"
 
-#: src/protocols/toc/toc.c:1811
+#: src/protocols/toc/toc.c:1681
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Ne mogu da otvorim %s za upis!"
 
-#: src/protocols/toc/toc.c:1847
+#: src/protocols/toc/toc.c:1717
 msgid "File transfer failed; other side probably canceled."
 msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala."
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: src/protocols/toc/toc.c:1762 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1926 src/protocols/toc/toc.c:2014
 msgid "Could not connect for transfer."
 msgstr "Ne mogu da uspostavim vezu za prenos."
 
-#: src/protocols/toc/toc.c:2089
+#: src/protocols/toc/toc.c:1959
 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:2189
+#: src/protocols/toc/toc.c:2059
 msgid "Gaim - Save As..."
 msgstr "Gaim — Sačuvaj kao..."
 
-#: src/protocols/toc/toc.c:2223
+#: src/protocols/toc/toc.c:2093
 #, 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"
@@ -10545,7 +10519,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:2230
+#: src/protocols/toc/toc.c:2100
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s zahteva od Vas da pošaljete datoteku"
@@ -10560,15 +10534,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2187 src/protocols/toc/toc.c:2189
 msgid "TOC Protocol Plugin"
 msgstr "Dodatak za TOC protokol"
 
-#: src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2208
 msgid "TOC host"
 msgstr "TOC server"
 
-#: src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2212
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -10637,7 +10611,7 @@
 msgid "Local Users"
 msgstr "Lokalni korisnici"
 
-#: src/protocols/trepia/trepia.c:1032
+#: src/protocols/trepia/trepia.c:1028
 msgid "Logging in"
 msgstr "Prijava"
 
@@ -10651,43 +10625,36 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
 msgid "Trepia Protocol Plugin"
 msgstr "Dodatak za Trepia protokol"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:419
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr "Isključeni ste jer ste se prijavili sa drugog računara ili uređaja."
+
+#: src/protocols/yahoo/yahoo.c:912
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaša Jahu! poruka nije poslata."
 
-#: src/protocols/yahoo/yahoo.c:718 src/protocols/yahoo/yahoo.c:3462
+#: src/protocols/yahoo/yahoo.c:936 src/protocols/yahoo/yahoo.c:3437
 msgid "Buzz!!"
 msgstr "Zvrnd!"
 
-#: src/protocols/yahoo/yahoo.c:763
+#: src/protocols/yahoo/yahoo.c:981
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Jahu! sistemska poruka za %s:"
 
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#. *
-#: src/protocols/yahoo/yahoo.c:853
-#, fuzzy, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "Korisnik %s želi da doda %s u svoj spisak drugara."
-
-#: src/protocols/yahoo/yahoo.c:859
-#, fuzzy
-msgid "Message (optional) :"
-msgstr "Obaveštenje o porukama"
-
-#: src/protocols/yahoo/yahoo.c:901
+#: src/protocols/yahoo/yahoo.c:1048
 #, 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:904
+#: src/protocols/yahoo/yahoo.c:1051
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10696,11 +10663,11 @@
 "Korisnik %s je (naknadno) odbio zahtev da ga dodate u vaš spisak drugara iz "
 "sledećeg razloga: %s."
 
-#: src/protocols/yahoo/yahoo.c:907
+#: src/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Odbijeno dodavanje drugara"
 
-#: src/protocols/yahoo/yahoo.c:1659
+#: src/protocols/yahoo/yahoo.c:1815
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10711,11 +10678,11 @@
 "izdanje Gaima najverovatnije neće moći da se prijavi na Jahu. Proverite %s "
 "radi dopuna."
 
-#: src/protocols/yahoo/yahoo.c:1662
+#: src/protocols/yahoo/yahoo.c:1818
 msgid "Failed Yahoo! Authentication"
 msgstr "Neuspešna Jahu! identifikacija"
 
-#: src/protocols/yahoo/yahoo.c:1735
+#: src/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10724,19 +10691,19 @@
 "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:1738
+#: src/protocols/yahoo/yahoo.c:1893
 msgid "Ignore buddy?"
 msgstr "Ignoriši drugara?"
 
-#: src/protocols/yahoo/yahoo.c:1772
+#: src/protocols/yahoo/yahoo.c:1927
 msgid "Invalid username."
 msgstr "Neispravno korisničko ime."
 
-#: src/protocols/yahoo/yahoo.c:1783
+#: src/protocols/yahoo/yahoo.c:1938
 msgid "Normal authentication failed!"
 msgstr "Obična identifikacija neuspešna"
 
-#: src/protocols/yahoo/yahoo.c:1784
+#: src/protocols/yahoo/yahoo.c:1939
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10748,120 +10715,100 @@
 "da se poveže koristeći metodu Web Messenger, što ima za posledicu smanjenu "
 "funkcionalnost."
 
-#: src/protocols/yahoo/yahoo.c:1792
+#: src/protocols/yahoo/yahoo.c:1947
 msgid "Incorrect password."
 msgstr "Neispravna lozinka."
 
-#: src/protocols/yahoo/yahoo.c:1795
+#: src/protocols/yahoo/yahoo.c:1950
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Vaš nalog je zaključan, prijavite se na Jahu! veb stranicu."
 
-#: src/protocols/yahoo/yahoo.c:1798
+#: src/protocols/yahoo/yahoo.c:1953
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Nepoznat broj greške: %d. Prijava na Yahoo! možda može da to otkloni."
 
-#: src/protocols/yahoo/yahoo.c:1852
+#: src/protocols/yahoo/yahoo.c:2007
 #, 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:1855
+#: src/protocols/yahoo/yahoo.c:2010
 msgid "Could not add buddy to server list"
 msgstr "Ne mogu da dodam drugara u spisak servera"
 
-#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo.c:2243
-#: src/protocols/yahoo/ycht.c:415
+#: src/protocols/yahoo/yahoo.c:2247 src/protocols/yahoo/yahoo.c:2395
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "Ne mogu da pišem"
 
-#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2393
-#: src/protocols/yahoo/yahoo.c:2477 src/protocols/yahoo/yahoo.c:2487
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-#: src/protocols/yahoo/ycht.c:519
+#: src/protocols/yahoo/yahoo.c:2417 src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2577 src/protocols/yahoo/yahoo.c:2587
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Greška pri povezivanju"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:3192
+#: src/protocols/yahoo/yahoo.c:2681 src/protocols/yahoo/yahoo.c:3048
+#: src/protocols/yahoo/yahoo.c:3162
 msgid "Not At Home"
 msgstr "Nisam kod kuće"
 
-#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:3195
+#: src/protocols/yahoo/yahoo.c:2683 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3163
 msgid "Not At Desk"
 msgstr "Nisam za stolom"
 
-#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:3198
+#: src/protocols/yahoo/yahoo.c:2685 src/protocols/yahoo/yahoo.c:3052
+#: src/protocols/yahoo/yahoo.c:3164
 msgid "Not In Office"
 msgstr "Nisam u kancelariji"
 
-#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:3204
+#: src/protocols/yahoo/yahoo.c:2689 src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/yahoo/yahoo.c:3166
 msgid "On Vacation"
 msgstr "Na raspustu sam"
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:3210
+#: src/protocols/yahoo/yahoo.c:2693 src/protocols/yahoo/yahoo.c:3060
+#: src/protocols/yahoo/yahoo.c:3168
 msgid "Stepped Out"
 msgstr "Izašao sam na kratko"
 
-#: src/protocols/yahoo/yahoo.c:2692 src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2774 src/protocols/yahoo/yahoo.c:2800
 msgid "Not on server list"
 msgstr "Nije na spisku na serveru"
 
-#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2802
-#, fuzzy
-msgid "Appear Online"
-msgstr "Kao nepovezan"
-
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2824
-#, fuzzy
-msgid "Appear Permanently Offline"
-msgstr "Kao nepovezan"
-
-#: src/protocols/yahoo/yahoo.c:2763
-#, fuzzy
-msgid "Stealth"
-msgstr "Oblast"
-
-#: src/protocols/yahoo/yahoo.c:2818
-#, fuzzy
-msgid "Don't Appear Permanently Offline"
-msgstr "Kao nepovezan"
-
-#: src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2879
 msgid "Join in Chat"
 msgstr "Priključi se razgovoru"
 
-#: src/protocols/yahoo/yahoo.c:2862
+#: src/protocols/yahoo/yahoo.c:2884
 msgid "Initiate Conference"
 msgstr "Pokreni razgovor"
 
-#: src/protocols/yahoo/yahoo.c:2887
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/yahoo/yahoo.c:2936
 msgid "Active which ID?"
 msgstr "Aktiviraj ID (koji)?"
 
-#: src/protocols/yahoo/yahoo.c:2929
+#: src/protocols/yahoo/yahoo.c:2945
 msgid "Join who in chat?"
 msgstr "Priključi se kome razgovoru?"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2955
 msgid "Activate ID..."
 msgstr "Aktiviraj ID..."
 
-#: src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:2959
 msgid "Join user in chat..."
 msgstr "Priključi korisnika razgovoru..."
 
-#: src/protocols/yahoo/yahoo.c:3505
-#, fuzzy
+#: src/protocols/yahoo/yahoo.c:3479
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;soba&gt; [server]:  Pridruži se razgovoru na ovom serveru."
-
-#: src/protocols/yahoo/yahoo.c:3509
+msgstr "join &lt;soba&gt;:  Priključi se pričaonici na Jahu mreži"
+
+#: src/protocols/yahoo/yahoo.c:3483
 msgid "buzz: Buzz a contact to get their attention"
-msgstr ""
+msgstr "buzz: sirenom privuci pažnju kontaktu"
 
 #. *< type
 #. *< ui_requirement
@@ -10873,76 +10820,125 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3588 src/protocols/yahoo/yahoo.c:3590
+#: src/protocols/yahoo/yahoo.c:3562 src/protocols/yahoo/yahoo.c:3564
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatak za Jahu protokol"
 
-#: src/protocols/yahoo/yahoo.c:3609
+#: src/protocols/yahoo/yahoo.c:3583
 msgid "Yahoo Japan"
 msgstr "Jahu Japan"
 
-#: src/protocols/yahoo/yahoo.c:3612
+#: src/protocols/yahoo/yahoo.c:3586
 msgid "Pager host"
 msgstr "Server"
 
-#: src/protocols/yahoo/yahoo.c:3615
+#: src/protocols/yahoo/yahoo.c:3589
 msgid "Japan Pager host"
 msgstr "Japanski pejdžer"
 
-#: src/protocols/yahoo/yahoo.c:3618
+#: src/protocols/yahoo/yahoo.c:3592
 msgid "Pager port"
 msgstr "Port"
 
-#: src/protocols/yahoo/yahoo.c:3621
+#: src/protocols/yahoo/yahoo.c:3595
 msgid "File transfer host"
 msgstr "Domaćin za prenos datoteka"
 
-#: src/protocols/yahoo/yahoo.c:3624
+#: src/protocols/yahoo/yahoo.c:3598
 msgid "Japan File transfer host"
 msgstr "Japanski domaćin za prenos datoteka"
 
-#: src/protocols/yahoo/yahoo.c:3627
+#: src/protocols/yahoo/yahoo.c:3601
 msgid "File transfer port"
 msgstr "Port za prenos datoteka"
 
-#: src/protocols/yahoo/yahoo.c:3630
-#, fuzzy
+#: src/protocols/yahoo/yahoo.c:3604
 msgid "Chat Room Locale"
-msgstr "URL za spisak soba"
-
-#: src/protocols/yahoo/yahoo.c:3633
+msgstr "Lokalitet za pričaonicu"
+
+#: src/protocols/yahoo/yahoo.c:3607
 msgid "Chat Room List Url"
 msgstr "URL za spisak soba"
 
-#: src/protocols/yahoo/yahoo.c:3636
+#: src/protocols/yahoo/yahoo.c:3610
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3639
+#: src/protocols/yahoo/yahoo.c:3613
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
-#: src/protocols/yahoo/yahoo_profile.c:677
+#: src/protocols/yahoo/yahoochat.c:206
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s je odbio vaš poziv na razgovor u sobi „%s“ zbog „%s“."
+
+#: src/protocols/yahoo/yahoochat.c:208
+msgid "Invitation Rejected"
+msgstr "Poziv odbijen"
+
+#: src/protocols/yahoo/yahoochat.c:363
+msgid "Failed to join chat"
+msgstr "Neuspešno priključenje razgovoru"
+
+#: src/protocols/yahoo/yahoochat.c:363
+msgid "Maybe the room is full?"
+msgstr "Možda je soba popunjena?"
+
+#: src/protocols/yahoo/yahoochat.c:441
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Razgovarate na %s."
+
+#: src/protocols/yahoo/yahoochat.c:616
+msgid "Failed to join buddy in chat"
+msgstr "Neuspešno priključivanje drugara razgovoru"
+
+#: src/protocols/yahoo/yahoochat.c:617
+msgid "Maybe they're not in a chat?"
+msgstr "Možda ne razgovaraju?"
+
+#: src/protocols/yahoo/yahoochat.c:1394
+msgid "Fetching the room list failed."
+msgstr "Dobavljanje spiska soba nije uspelo."
+
+#: src/protocols/yahoo/yahoochat.c:1447
+msgid "Voices"
+msgstr "Glas"
+
+#: src/protocols/yahoo/yahoochat.c:1450
+msgid "Webcams"
+msgstr "Kamere"
+
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+msgid "Unable to fetch room list."
+msgstr "Ne mogu da dobavim spisak soba."
+
+#: src/protocols/yahoo/yahoochat.c:1521
+msgid "User Rooms"
+msgstr "Korisničke sobe"
+
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP adresa:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:753
+#: src/protocols/yahoo/yahoo_profile.c:751
 msgid "Yahoo! Japan Profile"
 msgstr "Profil za Yahoo! Japan"
 
-#: src/protocols/yahoo/yahoo_profile.c:754
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Profile"
 msgstr "Jahu profil"
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 "Na žalost, profili koji imaju sadržaj za odrasle trenutno nisu podržani."
 
-#: src/protocols/yahoo/yahoo_profile.c:800
+#: src/protocols/yahoo/yahoo_profile.c:798
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10950,54 +10946,53 @@
 "Ukoliko želite da pogledate ovaj profil, treba da posetite ovu vezu u vašem "
 "čitaču veba."
 
-#: src/protocols/yahoo/yahoo_profile.c:978
+#: src/protocols/yahoo/yahoo_profile.c:976
 msgid "Yahoo! ID"
 msgstr "Jahu! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1052
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
+#: src/protocols/yahoo/yahoo_profile.c:1050
+#: src/protocols/yahoo/yahoo_profile.c:1054
+#: src/protocols/yahoo/yahoo_profile.c:1058
 msgid "Hobbies"
 msgstr "Hobiji"
 
-#: src/protocols/yahoo/yahoo_profile.c:1070
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: src/protocols/yahoo/yahoo_profile.c:1068
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Latest News"
 msgstr "Najnovije vesti"
 
-#: src/protocols/yahoo/yahoo_profile.c:1095
+#: src/protocols/yahoo/yahoo_profile.c:1093
 msgid "Home Page"
 msgstr "Lična stranica"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/yahoo/yahoo_profile.c:1108
 msgid "Cool Link 1"
 msgstr "Zanimljiva veza 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1115
+#: src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Cool Link 2"
 msgstr "Zanimljiva veza 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1119
+#: src/protocols/yahoo/yahoo_profile.c:1117
 msgid "Cool Link 3"
 msgstr "Zanimljiva veza 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1132
-#, fuzzy
+#: src/protocols/yahoo/yahoo_profile.c:1130
 msgid "Last Update"
 msgstr "Poslednja dopuna"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1136
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Podaci o korisniku %s nedostupni"
 
-#: src/protocols/yahoo/yahoo_profile.c:1144
+#: src/protocols/yahoo/yahoo_profile.c:1142
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "Ovaj profil je napisan na jeziku koji trenutno nije podržan."
 
-#: src/protocols/yahoo/yahoo_profile.c:1160
+#: src/protocols/yahoo/yahoo_profile.c:1158
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -11005,7 +11000,7 @@
 "Nije moguće dobaviti korisnikov profil. To je verovatno prolazni problem na "
 "serveru. Molimo pokušajte kasnije."
 
-#: src/protocols/yahoo/yahoo_profile.c:1163
+#: src/protocols/yahoo/yahoo_profile.c:1161
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11015,65 +11010,15 @@
 "postoji; međutim, Yahoo! ponekada ne uspe da pronađe korisnikov profil. Ako "
 "ste sigurni da korisnik postoji, probajte kasnije."
 
-#: src/protocols/yahoo/yahoo_profile.c:1171
+#: src/protocols/yahoo/yahoo_profile.c:1169
 msgid "The user's profile is empty."
 msgstr "Profil korisnika je prazan."
 
-#: src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s je odbio vaš poziv na razgovor u sobi „%s“ zbog „%s“."
-
-#: src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Poziv odbijen"
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Failed to join chat"
-msgstr "Neuspešno priključenje razgovoru"
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Maybe the room is full?"
-msgstr "Možda je soba popunjena?"
-
-#: src/protocols/yahoo/yahoochat.c:438
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Razgovarate na %s."
-
-#: src/protocols/yahoo/yahoochat.c:613
-msgid "Failed to join buddy in chat"
-msgstr "Neuspešno priključivanje drugara razgovoru"
-
-#: src/protocols/yahoo/yahoochat.c:614
-msgid "Maybe they're not in a chat?"
-msgstr "Možda ne razgovaraju?"
-
-#: src/protocols/yahoo/yahoochat.c:1350
-msgid "Fetching the room list failed."
-msgstr "Dobavljanje spiska soba nije uspelo."
-
-#: src/protocols/yahoo/yahoochat.c:1403
-msgid "Voices"
-msgstr "Glas"
-
-#: src/protocols/yahoo/yahoochat.c:1406
-msgid "Webcams"
-msgstr "Kamere"
-
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-msgid "Unable to fetch room list."
-msgstr "Ne mogu da dobavim spisak soba."
-
-#: src/protocols/yahoo/yahoochat.c:1477
-msgid "User Rooms"
-msgstr "Korisničke sobe"
-
-#: src/protocols/yahoo/ycht.c:402
+#: src/protocols/yahoo/ycht.c:401
 msgid "Connection problem with the YCHT server."
 msgstr "Problem pri povezivanju na YCHT server."
 
-#: src/protocols/zephyr/zephyr.c:331
+#: src/protocols/zephyr/zephyr.c:328
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -11081,80 +11026,75 @@
 "(Došlo je do greške pri pretvaranju ove poruke.\t Proverite opciju „Način "
 "zapisa“ u Uredniku naloga)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
-msgid "Unable to send to chat %s,%s,%s"
+#: src/protocols/zephyr/zephyr.c:676
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
 msgstr "Ne mogu da pošaljem razgovor %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1118
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Korisnik:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1123
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Sakriven ili neprijavljen"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1125
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>U %s od %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1408 src/protocols/zephyr/zephyr.c:1409
 msgid "Anyone"
 msgstr "Bilo ko"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: src/protocols/zephyr/zephyr.c:2155
 msgid "_Class:"
 msgstr "_Razred:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: src/protocols/zephyr/zephyr.c:2161
 msgid "_Instance:"
 msgstr "_Primerak:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2167
 msgid "_Recipient:"
 msgstr "Pri_malac:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: src/protocols/zephyr/zephyr.c:2178
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Nije uspeo pokušaj prijave na %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: src/protocols/zephyr/zephyr.c:2483
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nadimak&gt;: Lociraj korisnika"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: src/protocols/zephyr/zephyr.c:2488
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nadimak&gt;: Lociraj korisnika"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: src/protocols/zephyr/zephyr.c:2493
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;primerak&gt;: Postavlja primerak koji se koristi za ovu klasu"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2498
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;primerak&gt;: Postavlja primerak koji se koristi za ovu klasu"
 
-#: src/protocols/zephyr/zephyr.c:2622
-#, fuzzy
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;primerak&gt;: Postavlja primerak koji se koristi za ovu klasu"
-
-#: src/protocols/zephyr/zephyr.c:2628
+#: src/protocols/zephyr/zephyr.c:2504
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;klasa&gt; &lt;primerak&gt; &lt;primalac&gt;: Pridružuje se novom "
 "razgovoru"
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: src/protocols/zephyr/zephyr.c:2509
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;primerak&gt;: Šalje poruku &lt;poruka,<i>primerak</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: src/protocols/zephyr/zephyr.c:2515
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11162,7 +11102,7 @@
 "zci &lt;klasa&gt; &lt;primerak&gt;: Šaljnj poruku za &lt;<i>klasa</i>,"
 "<i>primerak</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: src/protocols/zephyr/zephyr.c:2521
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11170,7 +11110,7 @@
 "zcir &lt;klasa&gt; &lt;primerak&gt; &lt;primalac&gt;: Šalje poruke za &lt;"
 "<i>klasa</i>,<i>primerak</i>,<i>primalac</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: src/protocols/zephyr/zephyr.c:2527
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11178,15 +11118,15 @@
 "zir &lt;primerak&gt; &lt;primalac&gt;: Šalje poruku &lt;PORUKA,<i>primerak</"
 "i>,<i>primalac</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: src/protocols/zephyr/zephyr.c:2532
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;klasa&gt;: Šalje poruku za &lt;<i>klasa</i>,LIČNO,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: src/protocols/zephyr/zephyr.c:2638
 msgid "Resubscribe"
 msgstr "Opet se prijavi"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: src/protocols/zephyr/zephyr.c:2641
 msgid "Retrieve subscriptions from server"
 msgstr "Dobavi prijave sa servera"
 
@@ -11200,55 +11140,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2724 src/protocols/zephyr/zephyr.c:2726
 msgid "Zephyr Protocol Plugin"
 msgstr "Dodatak za Zefir protokol"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2751
 msgid "Export to .anyone"
 msgstr "Izvezi u .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2754
 msgid "Export to .zephyr.subs"
 msgstr "Izvezi u .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
-msgid "Import from .anyone"
-msgstr "Izvezi u .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
-msgid "Import from .zephyr.subs"
-msgstr "Izvezi u .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
-msgid "Realm"
-msgstr "Ime"
-
 # Šta je bre ovo?!
-#: src/protocols/zephyr/zephyr.c:2889
+#: src/protocols/zephyr/zephyr.c:2757
 msgid "Exposure"
 msgstr "Izlaganje"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:1038
+#: src/proxy.c:958
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Pristup odbijen: posrednik odbija tunel na portu %d."
 
-#: src/proxy.c:1042
+#: src/proxy.c:962
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Greška pri povezivanju posrednika %d"
 
-#: src/proxy.c:1876
+#: src/proxy.c:1790
 msgid "Invalid proxy settings"
 msgstr "Loša podešavanja posrednika"
 
-#: src/proxy.c:1876
+#: src/proxy.c:1790
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11256,19 +11181,28 @@
 "Neispravno je ili ime računara ili broj porta vašeg posrednika među "
 "podešavanjima."
 
+#. * Custom away message.
+#: src/prpl.h:187
+msgid "Custom"
+msgstr "Prilagođeno"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1276
+#: src/request.h:1255
 msgid "Accept"
 msgstr "Prihvati"
 
-#: src/server.c:351
+#: src/server.c:64
+msgid "Please enter your password"
+msgstr "Unesite Vašu lozinku"
+
+#: src/server.c:533
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s je promenio(la) ime u %s.\n"
 
-#: src/server.c:733
+#: src/server.c:978
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
@@ -11277,290 +11211,148 @@
 msgstr[2] "(%d poruka)"
 
 # bug: plural-forms
-#: src/server.c:747
+#: src/server.c:992
 msgid "(1 message)"
 msgstr "(1 poruka)"
 
-#: src/server.c:1008
-#, fuzzy, c-format
-msgid ""
-"%s has invited %s to the chat room %s:\n"
-"%s"
-msgstr "Korisnik „%s“ poziva %s u pričaonicu: „%s“\n"
-
-#: src/server.c:1013
-#, fuzzy, c-format
-msgid "%s has invited %s to the chat room %s\n"
-msgstr "Korisnik „%s“ poziva %s u pričaonicu: „%s“\n"
-
-#: src/server.c:1017
-msgid "Accept chat invitation?"
-msgstr "Prihvati poziv na razgovor?"
-
-#: src/status.c:153
-#, fuzzy
-msgid "Unset"
-msgstr "Koristi"
-
-#: src/status.c:626
+#: src/server.c:1215 src/server.c:1224
+#, c-format
+msgid "%s logged in."
+msgstr "%s se prijavi."
+
+#: src/server.c:1236
+#, c-format
+msgid "%s signed on"
+msgstr "%s se prijavio(la)"
+
+#: src/server.c:1251
 #, c-format
 msgid "%s came back"
 msgstr "%s se vratio(la)"
 
-#: src/status.c:631
+#: src/server.c:1253
 #, c-format
 msgid "%s went away"
 msgstr "%s je otišao(la) na odsustvo."
 
-#: src/status.c:1314
+#: src/server.c:1267
 #, c-format
 msgid "%s became idle"
 msgstr "%s se uspavao(la)"
 
-#: src/status.c:1330
+#: src/server.c:1278
 #, c-format
 msgid "%s became unidle"
 msgstr "%s se probudio(la)"
 
-#: src/util.c:2120
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"Greška pri čitanju %s: \n"
-"%s.\n"
-
-#: src/util.c:2121
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file been renamed to %s~."
-msgstr ""
-"Došlo je do greške pri obradi spiska drugara. Spisak nije učitan a stari "
-"spisak je pomeren u blist.xml~."
-
-#: src/util.c:2558
+#: src/server.c:1288 src/server.c:1295
+#, c-format
+msgid "%s logged out."
+msgstr "%s se odjavi."
+
+#: src/server.c:1308
+#, c-format
+msgid "%s signed off"
+msgstr "%s se odjavio(la)"
+
+#: src/server.c:1370
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+"%s je upravo upozoren od strane %s.\n"
+"Vaš novi nivo obazrivosti je %d%%"
+
+#: src/server.c:1373
+msgid "an anonymous person"
+msgstr "anonimna osoba"
+
+#: src/server.c:1487
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+msgstr ""
+"%s poziva %s u pričaonicu „%s“\n"
+"<b>%s</b>"
+
+#: src/server.c:1493
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s poziva %s u pričaonicu „%s“\n"
+
+#: src/server.c:1502
+msgid "Accept chat invitation?"
+msgstr "Prihvati poziv na razgovor?"
+
+#. 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 ;)
+#: src/status.c:36
+msgid "Sorry, I ran out for a bit!"
+msgstr "Žalim, ali mene nema. Vratiću se jednog dana, ne znam ni ja kad!"
+
+#: src/stock.c:87
+msgid "_Alias"
+msgstr "N_adimak"
+
+#: src/stock.c:89
+msgid "_Invite"
+msgstr "Po_zovi"
+
+#: src/stock.c:90
+msgid "_Modify"
+msgstr "_Izmeni"
+
+#: src/stock.c:91
+msgid "_Open Mail"
+msgstr "_Otvori poštu"
+
+#: src/stock.c:93
+msgid "_Warn"
+msgstr "_Upozori"
+
+#: src/util.c:2396
 msgid "Calculating..."
 msgstr "Računam..."
 
-#: src/util.c:2561
+#: src/util.c:2399
 msgid "Unknown."
 msgstr "Nepoznato."
 
-#: src/util.c:2591
+#: src/util.c:2429
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunda"
 msgstr[1] "sekunde"
 msgstr[2] "sekundi"
 
-#: src/util.c:2605
+#: src/util.c:2443
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
 msgstr[1] "dana"
 msgstr[2] "dana"
 
-#: src/util.c:2613
+#: src/util.c:2451
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "čas"
 msgstr[1] "časa"
 msgstr[2] "časova"
 
-#: src/util.c:2621
+#: src/util.c:2459
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuta"
 msgstr[2] "minuta"
 
-#: src/util.c:3041
+#: src/util.c:2879
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Greška pri otvaranju veze.\n"
 
-#~ msgid "Mail Server"
-#~ msgstr "Server za e-poštu"
-
-# bug: plural-forms
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (novih: %d/ukupno: %d)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Proveri poštu"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Proveravaj e-poštu svakih N sekundi.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Automatska prijava"
-
-#, fuzzy
-#~ msgid "Log Out"
-#~ msgstr "Odjavljen"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Kada se pokrene novi razgovor, ovaj dodatak će ubaciti poslednji razgovor "
-#~ "u tekući."
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Održavaj _lepljivi prozor sa spiskom drugara na vrhu"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Greška u spisku drugara"
-
-#, fuzzy
-#~ msgid "Unable to send messge to %s."
-#~ msgstr "Ne mogu da pošaljem poruku za %s:"
-
-#, fuzzy
-#~ msgid "Auto log in"
-#~ msgstr "Automatska prijava"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Pokaži manje postavki"
-
-#, fuzzy
-#~ msgid "Auto Log In"
-#~ msgstr "Automatska prijava"
-
-#~ msgid "Information"
-#~ msgstr "Podaci"
-
-#, fuzzy
-#~ msgid "/Buddies/_Log Out"
-#~ msgstr "/Drugari/I_zlaz"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Alati/_Odsutan"
-
-#~ msgid "Rename Group"
-#~ msgstr "Preimenuj grupu"
-
-#~ msgid "New group name"
-#~ msgstr "Naziv nove grupe"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Unesite novi naziv za izabranu grupu."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Nalog:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Neaktivan:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Upozoren:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Upozoren (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Alati/Odsutan"
-
-#~ msgid "Done."
-#~ msgstr "Gotovo."
-
-#, fuzzy
-#~ msgid "Logging in: "
-#~ msgstr "Prijava"
-
-#, fuzzy
-#~ msgid "Logging In"
-#~ msgstr "Prijava"
-
-#~ msgid "Cancel All"
-#~ msgstr "Otkaži sve"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Razgovor/_Upozori..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Razgovor/Upozori..."
-
-#~ msgid "Block the user"
-#~ msgstr "Blokiraj korisnika"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Pošalji datoteku korisniku"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Dodavanje korisnika u Vaš spisak drugara"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Uklanjanje korisnika sa Vašeg spisak drugara"
-
-#~ msgid "Send"
-#~ msgstr "Pošalji"
-
-#~ msgid "Send message"
-#~ msgstr "Slanje poruke"
-
-#~ msgid "Invite"
-#~ msgstr "Pozovi"
-
-#~ msgid "Invite a user"
-#~ msgstr "Pozovi korisnika"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Dodavanje razgovora u Vaš spisak drugara"
-
-#~ msgid "Remove the chat from your buddy list"
-#~ msgstr "Uklanjanje razgovora sa Vašeg spiska drugara"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Razgovor/Završi"
-
-#~ msgid "former lead developer"
-#~ msgstr "bivši glavni programer"
-
-#~ msgid "former maintainer"
-#~ msgstr "bivši održavalac"
-
-#~ msgid "Chinese"
-#~ msgstr "kineski"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Ime:"
-
-#~ msgid "Warn User"
-#~ msgstr "Upozori korisnika"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Upozorenje za %s?</span>\n"
-#~ "\n"
-#~ "Ovo će uvećati nivo obazrivosti za „%s“ i on ili ona će imati strožije "
-#~ "ograničenje brzine slanja poruka.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Upozori _anonimno?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Anonimna upozorenja su manjeg uticaja.</b>"
-
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
@@ -11568,167 +11360,45 @@
 #~ "Gaim nije uspeo da pogodi vrstu zapisa slike na osnovu navedenog nastavka "
 #~ "datoteke. Podrazumevano se radi o PNG zapisu."
 
-#~ msgid "Please create an account."
-#~ msgstr "Načinite nalog."
-
-#~ msgid "Login"
-#~ msgstr "Prijava"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Nalog:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>_Lozinka:</b>"
-
-#, fuzzy
-#~ msgid "A_ccounts"
-#~ msgstr "Nalozi"
-
-#, fuzzy
-#~ msgid "P_references"
-#~ msgstr "Postavke"
-
-#, fuzzy
-#~ msgid "_Log in"
-#~ msgstr "Prijava"
-
-#~ 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"
-#~ "  -c, --config=DIR    use DIR for config files\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"
-#~ "  -c, --config=DIR     koristi DIR za datoteke 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"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "Ne mogu da učitam podešavanja"
+#~ msgid "Default SILC Key Pair"
+#~ msgstr "Podrazumevani par ključeva za SILC"
+
+#~ msgid "SILC Public Key"
+#~ msgstr "SILC javni ključ"
+
+#~ msgid "SILC Private Key"
+#~ msgstr "SILC privatni ključ"
+
+#~ msgid "%s (%s/%s)"
+#~ msgstr "%s (%s od %s)"
+
+#~ msgid "%d new"
+#~ msgid_plural "%d new"
+#~ msgstr[0] "%d nova"
+#~ msgstr[1] "%d nove"
+#~ msgstr[2] "%d novih"
+
+#~ msgid "%d total"
+#~ msgid_plural "%d total"
+#~ msgstr[0] "ukupno %d"
+#~ msgstr[1] "ukupno %d"
+#~ msgstr[2] "ukupno %d"
 
 #~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim nije uspeo da učita podešavanja koja imate, jer su snimljena u "
-#~ "starom formatu koji se više ne koristi. Molimo Vas da ponovite "
-#~ "podešavanja koristeći prozor Postavke."
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "Prikaži udaljene nadimke ukoliko alijas nije postavljen"
-
-#~ msgid "Display"
-#~ msgstr "Prikaz"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Prikaži _vremenske oznake poruka"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Zanemari _boje"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Zanemari _pismo"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Zanemari veličinu _slova"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Podrazumevano formatiranje"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "Pošalji podrazumevano formatiranje sa odlazećim porukama"
-
-#~ msgid "Window Closing"
-#~ msgstr "Zatvaranje prozora"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "Esc zatvara _prozor"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Prikaži _nivoe upozorenja"
-
-#~ msgid "Show idle _times"
-#~ msgstr "Prikaži _trajanje neaktivnosti"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "_Sam razgranaj kontakte"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Prikaži _dugmad kao:"
-
-#~ msgid "Pictures"
-#~ msgstr "Slike"
-
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Slike i tekst"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Dozvoli komande \"_sa crtom\""
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Prikaži a_lijase u jezičcima/naslovima"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "_Izdigni prozor na događaje"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "_Izdigni prozor na događaje"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "Postavka _jezičaka:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "Smeštanje novih razgovora"
-
-#~ msgid "Interface"
-#~ msgstr "Sučelje"
-
-#~ msgid "Message Text"
-#~ msgstr "Tekst poruke"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Prečice"
-
-#, fuzzy
-#~ msgid "Logging in: %s"
-#~ msgstr "Prijava"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Sakrij ime operativnog sistema"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "Korisnik %s želi da Vas doda na svoj spisak drugara."
+#~ "You are about to remove the contact containing %s and %d other buddy from "
+#~ "your buddy list.  Do you want to continue?"
+#~ msgid_plural ""
+#~ "You are about to remove the contact containing %s and %d other buddies "
+#~ "from your buddy list.  Do you want to continue?"
+#~ msgstr[0] ""
+#~ "Uklanjate grupu %s i %d drugog člana iz spiska drugara. Da li želite da "
+#~ "nastavite?"
+#~ msgstr[1] ""
+#~ "Uklanjate grupu %s i %d ostala člana iz spiska drugara. Da li želite da "
+#~ "nastavite?"
+#~ msgstr[2] ""
+#~ "Uklanjate grupu %s i %d ostalih članova iz spiska drugara. Da li želite "
+#~ "da nastavite?"
 
 #~ msgid "Miscellaneous error"
 #~ msgstr "Nedefinisana greška"
@@ -11736,12 +11406,6 @@
 #~ msgid "Initiate Chat"
 #~ msgstr "Pokreni razgovor"
 
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Obavesti o kraju razgovora."
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Obavesti o isteku vremena."
-
 #~ msgid "Unable to connect to server"
 #~ msgstr "Ne mogu da se povežem na server"
 
@@ -11753,6 +11417,9 @@
 #~ msgid "Requesting to send password"
 #~ msgstr "Zahteva se slanje lozinke"
 
+#~ msgid "Syncing with server"
+#~ msgstr "Usklađivanje sa serverom"
+
 #~ msgid "Unable to connect to %s server"
 #~ msgstr "Ne mogu da se povežem na server %s"
 
@@ -11765,205 +11432,43 @@
 #~ msgid "Received HTTP error. Please report this."
 #~ msgstr "Primio je HTTP grešku. Prijavite ovo."
 
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "Razgovor nije vođen, i istekao je."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "Veza sa serverom je prekinuta, jer ste se prijavili sa nekog drugog mesta."
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Veza je prekinuta zato što ste se prijavili pod ovim imenom sa nekog "
-#~ "drugog mesta."
-
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "Podrazumevani par ključeva za SILC"
-
-#~ msgid "SILC Public Key"
-#~ msgstr "SILC javni ključ"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "SILC privatni ključ"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "Isključeni ste jer ste se prijavili sa drugog računara ili uređaja."
-
-#~ msgid ""
-#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-#~ "(1,048,576 bytes)."
-#~ msgstr ""
-#~ "GAIM ne može da preko servisa Yahoo! šalje datoteke veće od jednog "
-#~ "megabajta (1048576 bajtova)."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Unesite Vašu lozinku"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "Korisnik „%s“ poziva %s u pričaonicu: „%s“\n"
-#~ "%s"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Vrati zapamćeno stanje veze pri povezivanju"
-
-#~ msgid "Signoff"
-#~ msgstr "Odjavi se"
-
-#~ msgid "Local Addressbook"
-#~ msgstr "Lokalni imenik"
-
-#~ msgid "Away!"
-#~ msgstr "Odsutan!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "Uredi ovu poruku"
-
-#~ msgid "I'm Back!"
-#~ msgstr "Vratio sam se!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Da li ste sigurni da želite da uklonite poruku „%s‟?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Ukloni poruku za odsustvo"
-
-#~ msgid "Set All Away"
-#~ msgstr "Postavi odsustvo za sve"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "Ne možete snimiti poruku za odsustvo bez naslova"
+#~ msgid "Message could not be sent for an unknown reason"
+#~ msgstr "Poruka se ne može poslati iz nepoznatih razloga."
 
 #~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s:\n"
+#~ "%s"
+
+# bug: plural-forms
+#~ msgid ""
+#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "
+#~ "bytes)."
 #~ msgstr ""
-#~ "Navedite i naslov poruke, ili izaberite „Koristi“ za korišćenje bez "
-#~ "snimanja."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "Ne možete napraviti praznu poruku za odsustvo"
-
-#~ msgid "New away message"
-#~ msgstr "Nova poruka za odsustvo"
-
-#~ msgid "Away title: "
-#~ msgstr "Naslov odsustva: "
-
-#~ msgid "_Save"
-#~ msgstr "Sačuvaj"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Sačuvaj i koristi"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Drugari/_Odjava"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Pošalji poruku izabranom drugaru"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Pribavi podatke o izabranom drugaru"
-
-#~ msgid "_Chat"
-#~ msgstr "Razgovor"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Priključi se pričaonici"
-
-#~ msgid "_Away"
-#~ msgstr "Odsutan"
-
-#~ msgid "Set an away message"
-#~ msgstr "Postavi poruku za odsustvo"
-
-#~ msgid "Signon: "
-#~ msgstr "Prijava:"
-
-#~ msgid "Signon"
-#~ msgstr "Prijava"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Pribavi poruku za odsustvo"
-
-#~ msgid "Warn"
-#~ msgstr "Upozori"
-
-#~ msgid "Warn the user"
-#~ msgstr "Upozori korisnika"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "Send Message"
-#~ msgstr "Slanje poruke"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter _šalje poruku"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "Control+Enter š_alje poruku"
-
-#~ msgid "Insertions"
-#~ msgstr "Ubacivanje"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U/S} ubacuje HTML _oznake"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(broj) ubacuje _smešak"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_Izdigni prozor na događaje"
-
-#~ msgid "Dim i_dle buddies"
-#~ msgstr "_Osenči neaktivne drugare"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Koristi _višebojne nadimke u razgovorima"
-
-#~ msgid "_Edit"
-#~ msgstr "_Uredi"
-
-#~ msgid "Away Messages"
-#~ msgstr "Poruke za odsustvo"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Nalozi:"
-
-#~ msgid "_Preferences"
-#~ msgstr "Postavke"
-
-#~ msgid "_Sign on"
-#~ msgstr "Prijavi se"
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim je naišao na grešku pri sporazumevanju sa ICQ serverom."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr ""
-#~ "Korisnik %s (%s%s%s%s%s) želi da Vas doda u svoj spisak drugara i traži "
-#~ "Vašu dozvolu za to."
-
-#~ msgid "Send message through server"
-#~ msgstr "Pošalji poruku kroz server"
-
-#~ msgid "Connecting..."
-#~ msgstr "Uspostavljam vezu..."
-
-#~ msgid "Nick:"
-#~ msgstr "Nadimak:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim korisnik"
+#~ "Gaim ne može da šalje datoteke veće od %d megabajta (%d bajtova) preko "
+#~ "servisa Jahu!."
+
+#~ msgid "%d byte"
+#~ msgid_plural "%d bytes"
+#~ msgstr[0] "%d bajt"
+#~ msgstr[1] "%d bajta"
+#~ msgstr[2] "%d bajtova"
+
+#~ msgid ""
+#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabyte (%s)."
+#~ msgid_plural ""
+#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%s)."
+#~ msgstr[0] ""
+#~ "Gaim ne može da šalje datoteke veće od %d megabajta (%s) preko servisa "
+#~ "Jahu!."
+#~ msgstr[1] ""
+#~ "Gaim ne može da šalje datoteke veće od %d megabajta (%s) preko servisa "
+#~ "Jahu!."
+#~ msgstr[2] ""
+#~ "Gaim ne može da šalje datoteke veće od %d megabajta (%s) preko servisa "
+#~ "Jahu!."
 
 #~ msgid ""
 #~ "(There was an error converting this message.  Check the 'Encoding' option "
@@ -11972,64 +11477,9 @@
 #~ "(Došlo je do greške pri pretvaranju ove poruke. Proverite opciju „Način "
 #~ "zapisa“ u Uredniku naloga)"
 
-#~ msgid "Roomlist Error"
-#~ msgstr "Greška u spisku soba"
-
-#~ msgid "Syncing with server"
-#~ msgstr "Usklađivanje sa serverom"
-
 #~ msgid "MSN error for account %s"
 #~ msgstr "MSN je javio grešku za nalog %s"
 
-#~ msgid "(There was an error receiving this message)"
-#~ msgstr "(Došlo je do greške pri prijemu ove poruke)"
-
-#~ msgid "Not specified"
-#~ msgstr "Nije naznačeno"
-
-#~ msgid "Visible"
-#~ msgstr "Vidljiv"
-
-#~ msgid "Available Message:"
-#~ msgstr "Poruka za dostupnost:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Obavljam posao i nadam se ometanju — šibni mi poruku!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "Postavi poruku za dostupnost..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Neuspešna odjava sa kanala"
-
-#~ msgid "Custom"
-#~ msgstr "Prilagođeno"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s se prijavi."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s se prijavio(la)"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s se odjavi."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s se odjavio(la)"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s je upravo upozoren od strane %s.\n"
-#~ "Vaš novi nivo obazrivosti je %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "anonimna osoba"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Žalim, ali mene nema. Vratiću se jednog dana, ne znam ni ja kad!"
-
 # bug: s+..+...+
 #~ msgid "Moving Gaim Settings.."
 #~ msgstr "Premešta podešavanja Gaima..."
@@ -12040,6 +11490,18 @@
 #~ msgid "Notification"
 #~ msgstr "Obaveštenje"
 
+#~ msgid "Local Addressbook"
+#~ msgstr "Lokalni imenik"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Nalozi:"
+
+#~ msgid "_Preferences"
+#~ msgstr "Postavke"
+
+#~ msgid "(There was an error receiving this message)"
+#~ msgstr "(Došlo je do greške pri prijemu ove poruke)"
+
 #~ msgid "Update Buddy Icon"
 #~ msgstr "Obnovi sličicu drugara"
 
@@ -12086,6 +11548,9 @@
 #~ msgid "idle for"
 #~ msgstr "neaktivnost nakon"
 
+#~ msgid "Invalid Groupname"
+#~ msgstr "Neispravan naziv grupe"
+
 #~ msgid "Buddy icon file:"
 #~ msgstr "Datoteka ikonice drugara:"
 
@@ -12304,6 +11769,9 @@
 #~ msgid "Open new _window by default"
 #~ msgstr "Otvaranje novog _prozora je podrazumevano"
 
+#~ msgid "Disconnected"
+#~ msgstr "Veza je prekinuta"
+
 #~ msgid "Bad Protocol"
 #~ msgstr "Loš protokol"
 
@@ -12453,6 +11921,9 @@
 #~ msgid "Log"
 #~ msgstr "Dnevnik rada"
 
+#~ msgid "Clear"
+#~ msgstr "Očisti"
+
 #~ msgid "Gaim - Information"
 #~ msgstr "Gaim — podaci"
 
@@ -12614,6 +12085,9 @@
 #~ 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"