diff po/sl.po @ 13734:760528340ee3

[gaim-migrate @ 16145] a gaggle of translation updates and such committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 07 May 2006 19:50:27 +0000
parents cfc2f7fcb3dd
children eb58c6169e6c
line wrap: on
line diff
--- a/po/sl.po	Sun May 07 19:45:02 2006 +0000
+++ b/po/sl.po	Sun May 07 19:50:27 2006 +0000
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Gaim package.
 # Jure Čuhalev <gandalf@owca.info>, 2003.
 # Matjaž Horvat <matjaz@owca.info>, 2004.
-# Martin Srebotnjak <miles@filmsi.net>, 2004.
+# Martin Srebotnjak <miles@filmsi.net>, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2006-03-16 15:57+0100\n"
+"PO-Revision-Date: 2006-05-06 10:45+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak, LUGOS <sl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -153,7 +153,7 @@
 
 #. add enabled / disabled
 #: ../plugins/crazychat/cc_gaim_plugin.c:345
-#: ../src/gtkaccount.c:2251
+#: ../src/gtkaccount.c:2262
 #: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "Omogočen"
@@ -168,7 +168,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/dbus-example.c:135
+#: ../plugins/dbus-example.c:152
 msgid "DBus"
 msgstr "DBus"
 
@@ -176,8 +176,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/dbus-example.c:138
-#: ../plugins/dbus-example.c:140
+#: ../plugins/dbus-example.c:155
+#: ../plugins/dbus-example.c:157
 msgid "DBus Plugin Example"
 msgstr "Primer vstavka DBus"
 
@@ -186,7 +186,7 @@
 msgstr "Za več neprebranih sporočil kliknite na desni miškin gumb ...\n"
 
 #: ../plugins/docklet/docklet.c:157
-#: ../src/gtkblist.c:3241
+#: ../src/gtkblist.c:3230
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -201,50 +201,56 @@
 
 #: ../plugins/docklet/docklet.c:435
 #: ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101
+#: ../src/protocols/gg/gg.c:996
+#: ../src/protocols/jabber/buddy.c:1103
 #: ../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:2845
-#: ../src/protocols/yahoo/yahoo.c:2735
+#: ../src/protocols/novell/novell.c:2843
+#: ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/status.c:155
 msgid "Available"
 msgstr "Na voljo"
 
 #. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #: ../plugins/docklet/docklet.c:439
-#: ../src/gtkprefs.c:1759
+#: ../src/gtkprefs.c:1774
 #: ../src/gtkstatusbox.c:674
+#: ../src/protocols/gg/gg.c:999
 #: ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219
-#: ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848
-#: ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6836
-#: ../src/protocols/oscar/oscar.c:7879
+#: ../src/protocols/irc/msgs.c:223
+#: ../src/protocols/jabber/buddy.c:1107
+#: ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719
+#: ../src/protocols/oscar/oscar.c:4401
+#: ../src/protocols/oscar/oscar.c:5444
 #: ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3189
+#: ../src/protocols/yahoo/yahoo.c:3185
+#: ../src/protocols/yahoo/yahoo.c:3258
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Odsoten"
 
 #: ../plugins/docklet/docklet.c:443
 #: ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797
-#: ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/oscar/oscar.c:723
+#: ../src/protocols/yahoo/yahoo.c:2725
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Neviden"
 
 #: ../plugins/docklet/docklet.c:447
-#: ../src/gtkblist.c:2971
+#: ../src/gtkblist.c:2960
 #: ../src/gtkstatusbox.c:676
-#: ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857
-#: ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7851
-#: ../src/protocols/yahoo/yahoo.c:2733
+#: ../src/protocols/gg/gg.c:993
+#: ../src/protocols/jabber/buddy.c:1101
+#: ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785
+#: ../src/protocols/oscar/oscar.c:5416
+#: ../src/protocols/yahoo/yahoo.c:2729
 #: ../src/status.c:154
 msgid "Offline"
 msgstr "Brez povezave"
@@ -264,6 +270,7 @@
 msgstr "Pokaži seznam prijateljev"
 
 #: ../plugins/docklet/docklet.c:489
+#: ../src/gtkconv.c:5611
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
@@ -272,7 +279,7 @@
 msgstr "Novo sporočilo ..."
 
 #: ../plugins/docklet/docklet.c:519
-#: ../src/gtkaccount.c:2467
+#: ../src/gtkaccount.c:2478
 msgid "Accounts"
 msgstr "Računi"
 
@@ -282,7 +289,7 @@
 msgstr "Vstavki"
 
 #: ../plugins/docklet/docklet.c:521
-#: ../src/gtkprefs.c:1900
+#: ../src/gtkprefs.c:1915
 msgid "Preferences"
 msgstr "Nastavitve"
 
@@ -309,8 +316,8 @@
 #: ../plugins/docklet/docklet.c:692
 #: ../plugins/win32/winprefs/winprefs.c:424
 #: ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749
-#: ../src/gtkprefs.c:1763
+#: ../src/gtkprefs.c:1764
+#: ../src/gtkprefs.c:1778
 msgid "Never"
 msgstr "nikoli"
 
@@ -517,53 +524,53 @@
 msgid "Select Font for %s"
 msgstr "Nastavite pisavo za %s"
 
-#: ../plugins/gaimrc.c:362
+#: ../plugins/gaimrc.c:364
 msgid "Select Interface Font"
 msgstr "Nastavite pisavo vmesnika"
 
-#: ../plugins/gaimrc.c:415
+#: ../plugins/gaimrc.c:420
 msgid "General"
 msgstr "Splošno"
 
-#: ../plugins/gaimrc.c:420
+#: ../plugins/gaimrc.c:425
 msgid "GTK+ Interface Font"
 msgstr "Pisava vmesnika GTK+"
 
-#: ../plugins/gaimrc.c:440
+#: ../plugins/gaimrc.c:445
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bližnjic besedila GTK+"
 
-#: ../plugins/gaimrc.c:475
+#: ../plugins/gaimrc.c:480
 msgid "Interface colors"
 msgstr "Barve vmesnika"
 
-#: ../plugins/gaimrc.c:499
+#: ../plugins/gaimrc.c:504
 msgid "Widget Sizes"
 msgstr "Velikosti gradnikov"
 
-#: ../plugins/gaimrc.c:520
+#: ../plugins/gaimrc.c:525
 msgid "Fonts"
 msgstr "Pisave"
 
-#: ../plugins/gaimrc.c:543
+#: ../plugins/gaimrc.c:548
 msgid "Tools"
 msgstr "Orodja"
 
-#: ../plugins/gaimrc.c:548
+#: ../plugins/gaimrc.c:553
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Zapiši nastavitve v %s%sgtkrc-2.0"
 
-#: ../plugins/gaimrc.c:556
+#: ../plugins/gaimrc.c:561
 msgid "Re-read gtkrc files"
 msgstr "Ponovno preberi datoteke gtkrc"
 
-#: ../plugins/gaimrc.c:583
+#: ../plugins/gaimrc.c:588
 msgid "Gaim GTK+ Theme Control"
 msgstr "Nadzor teme Gaim GTK+"
 
-#: ../plugins/gaimrc.c:585
-#: ../plugins/gaimrc.c:586
+#: ../plugins/gaimrc.c:590
+#: ../plugins/gaimrc.c:591
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Omogoča dostop do pogosto uporabljenih nastavitev gtkrc."
 
@@ -620,12 +627,17 @@
 "Povlecite navzgor in zatem desno, da se premaknete k naslednjemu pogovoru."
 
 #. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119
 #: ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604
 #: ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1534
+#: ../src/protocols/msn/msn.c:1527
+#: ../src/protocols/msn/msn.c:1580
+#: ../src/protocols/msn/msn.c:1601
 msgid "Name"
 msgstr "Ime"
 
@@ -633,35 +645,46 @@
 msgid "Instant Messaging"
 msgstr "Neposredno sporočanje"
 
+#: ../plugins/gevolution/add_buddy_dialog.c:442
+#: ../src/gtkblist.c:4526
+#: ../src/protocols/silc/buddy.c:736
+#: ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/buddy.c:1075
+#: ../src/protocols/silc/buddy.c:1174
+#: ../src/protocols/yahoo/yahoo.c:2974
+msgid "Add Buddy"
+msgstr "Dodaj prijatelja"
+
 #. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Izberite osebo iz vašega imenika spodaj ali dodajte novo."
 
 #. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418
-#: ../src/protocols/oscar/oscar.c:8399
-#: ../src/protocols/sametime/sametime.c:5532
+#: ../src/protocols/jabber/buddy.c:1459
+#: ../src/protocols/oscar/oscar.c:6024
+#: ../src/protocols/sametime/sametime.c:5524
 msgid "Search"
 msgstr "Išči"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306
-#: ../src/gtkblist.c:4615
-#: ../src/gtkblist.c:4979
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:307
+#: ../src/gtkblist.c:4610
+#: ../src/gtkblist.c:4974
 msgid "Group:"
 msgstr "Skupina:"
 
 #. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/add_buddy_dialog.c:575
 #: ../plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/new_person_dialog.c:251
 msgid "New Person"
 msgstr "Nova oseba"
 
 #. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Izberi prijatelja"
 
@@ -691,7 +714,7 @@
 #: ../src/blist.c:516
 #: ../src/blist.c:1278
 #: ../src/blist.c:1505
-#: ../src/gtkblist.c:4424
+#: ../src/gtkblist.c:4419
 #: ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Prijatelji"
@@ -728,10 +751,10 @@
 msgstr "Izberite vse račune, katerim naj se samodejno dodajo prijatelji."
 
 #: ../plugins/gevolution/gevolution.c:450
-#: ../plugins/idle.c:147
-#: ../plugins/idle.c:183
-#: ../src/gtknotify.c:397
-#: ../src/gtkpounce.c:1262
+#: ../plugins/idle.c:150
+#: ../plugins/idle.c:186
+#: ../src/gtknotify.c:399
+#: ../src/gtkpounce.c:1244
 msgid "Account"
 msgstr "Račun"
 
@@ -754,45 +777,46 @@
 msgid "Provides integration with Evolution."
 msgstr "Omogoča integracijo z Evolutionom."
 
-#: ../plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Spodaj vnesite podatke o osebi."
 
-#: ../plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Spodaj vnesite prijateljev vzdevek in vrsto računa."
 
-#: ../plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Vrsta računa:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294
+#: ../plugins/gevolution/new_person_dialog.c:295
 #: ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4572
 msgid "Screen name:"
 msgstr "Zaslonsko ime:"
 
 #. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Dodatne informacije:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:337
+#: ../plugins/gevolution/new_person_dialog.c:338
 #: ../src/gtkaccount.c:424
 #: ../src/gtkaccount.c:446
-#: ../src/protocols/oscar/oscar.c:699
+#: ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
 
-#: ../plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Ime:"
 
-#: ../plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Priimek:"
 
-#: ../plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "E-pošta:"
 
@@ -865,58 +889,60 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pomanjša seznam prijateljev in pogovorna okna, ko ste odsotni."
 
-#: ../plugins/idle.c:152
-#: ../plugins/idle.c:210
+#: ../plugins/idle.c:155
+#: ../plugins/idle.c:213
 msgid "Minutes"
 msgstr "minut"
 
-#: ../plugins/idle.c:159
-#: ../plugins/idle.c:192
-#: ../plugins/idle.c:217
-#: ../plugins/idle.c:306
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../plugins/idle.c:162
+#: ../plugins/idle.c:195
+#: ../plugins/idle.c:220
+#: ../plugins/idle.c:312
 msgid "I'dle Mak'er"
 msgstr "NedejavniK"
 
-#: ../plugins/idle.c:160
-#: ../plugins/idle.c:249
+#: ../plugins/idle.c:163
+#: ../plugins/idle.c:252
 msgid "Set Account Idle Time"
 msgstr "Nastavi čas nedejavnosti"
 
-#: ../plugins/idle.c:163
-#: ../plugins/idle.c:221
+#: ../plugins/idle.c:166
+#: ../plugins/idle.c:224
 msgid "_Set"
 msgstr "_Nastavi"
 
-#: ../plugins/idle.c:164
-#: ../plugins/idle.c:197
-#: ../plugins/idle.c:222
+#: ../plugins/idle.c:167
+#: ../plugins/idle.c:200
+#: ../plugins/idle.c:225
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../plugins/idle.c:177
+#: ../plugins/idle.c:180
 msgid "None of your accounts are idle."
 msgstr "Noben od vaših računov ni nedejaven."
 
-#: ../plugins/idle.c:193
-#: ../plugins/idle.c:253
+#: ../plugins/idle.c:196
+#: ../plugins/idle.c:256
 msgid "Unset Account Idle Time"
 msgstr "Odnastavi čas nedejavnosti"
 
-#: ../plugins/idle.c:196
+#: ../plugins/idle.c:199
 msgid "_Unset"
 msgstr "_Odnastavi"
 
-#: ../plugins/idle.c:218
-#: ../plugins/idle.c:257
+#: ../plugins/idle.c:221
+#: ../plugins/idle.c:260
 msgid "Set Idle Time for All Accounts"
 msgstr "Nastavi čas nedejavnosti za vse račune"
 
-#: ../plugins/idle.c:262
+#: ../plugins/idle.c:265
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Odnastavi čas nedejavnosti za vse nedejavne račune"
 
-#: ../plugins/idle.c:308
-#: ../plugins/idle.c:309
+#: ../plugins/idle.c:314
+#: ../plugins/idle.c:315
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Omogoča ročno nastavitev časa vaše odsotnosti"
 
@@ -1022,46 +1048,61 @@
 msgid "Message could not be sent."
 msgstr "Sporočila ni mogoče poslati."
 
-#: ../plugins/log_reader.c:1835
-#: ../plugins/log_reader.c:1928
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1838
+#: ../plugins/log_reader.c:1943
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1844
-#: ../plugins/log_reader.c:1932
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1850
+#: ../plugins/log_reader.c:1947
 msgid "Fire"
 msgstr "Fire"
 
-#: ../plugins/log_reader.c:1853
-#: ../plugins/log_reader.c:1936
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1862
+#: ../plugins/log_reader.c:1951
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1862
-#: ../plugins/log_reader.c:1940
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1874
+#: ../plugins/log_reader.c:1955
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1871
-#: ../plugins/log_reader.c:1944
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1886
+#: ../plugins/log_reader.c:1959
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1910
+#: ../plugins/log_reader.c:1925
 msgid "General Log Reading Configuration"
 msgstr "Splošne nastavitve ogledovanja dnevnika"
 
-#: ../plugins/log_reader.c:1914
+#: ../plugins/log_reader.c:1929
 msgid "Fast size calculations"
 msgstr "Hitri izračuni velikosti"
 
-#: ../plugins/log_reader.c:1918
+#: ../plugins/log_reader.c:1933
 msgid "Use name heuristics"
 msgstr "Uporabi hevristiko imena"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1924
+#: ../plugins/log_reader.c:1939
 msgid "Log Directory"
 msgstr "Imenik dnevnika"
 
@@ -1071,19 +1112,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1967
+#: ../plugins/log_reader.c:1982
 msgid "Log Reader"
 msgstr "Ogledovalnik dnevnika"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1971
+#: ../plugins/log_reader.c:1986
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik dnevnika."
 
 #. * description
-#: ../plugins/log_reader.c:1975
+#: ../plugins/log_reader.c:1990
 msgid "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and Trillian."
 msgstr "Pri ogledovanju dnevnikov bo ta vstavek vključil dnevnike drugih odjemalcev neposrednih sporočil. To trenutno obsega Adium, Fire, Messenger Plus!, MSN Messenger in Trillian."
 
@@ -1176,7 +1217,7 @@
 msgstr "_Pogovorna okna"
 
 #: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
+msgid "\t_Only when someone says your screen name"
 msgstr "\t_Le ko nekdo omeni vaše ime v sobi"
 
 #: ../plugins/notify.c:667
@@ -1275,31 +1316,37 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Doda podporo nalaganja vstavkov v programskem jeziku perl."
 
-#: ../plugins/psychic.c:22
+#: ../plugins/psychic.c:19
 msgid "Psychic Mode"
 msgstr "Telepatski način"
 
-#: ../plugins/psychic.c:23
+#: ../plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
 msgstr "Telepatski način za dohodne pogovore"
 
-#: ../plugins/psychic.c:24
+#: ../plugins/psychic.c:21
 msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr "Povzroči pojavitev pogovornih oken, ko vam začnejo drugi uporabniki sporočati. To deluje za AIM, ICQ, Jabber, Sametime in Yahoo!"
 
-#: ../plugins/psychic.c:60
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../plugins/psychic.c:63
 msgid "You feel a disturbance in the force..."
 msgstr "Občutite motnjo v Moči (saj veste, Vojna zvezd) ..."
 
-#: ../plugins/psychic.c:79
+#: ../plugins/psychic.c:82
 msgid "Only enable for users on the buddy list"
 msgstr "Dovoli le uporabnikom s seznama prijateljev"
 
-#: ../plugins/psychic.c:84
+#: ../plugins/psychic.c:87
 msgid "Disable when away"
 msgstr "Onemogoči ob odsotnosti"
 
-#: ../plugins/psychic.c:88
+#: ../plugins/psychic.c:91
 msgid "Display notification message in conversations"
 msgstr "Prikaži obvestilno sporočilo v pogovorih"
 
@@ -1386,7 +1433,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/simple.c:34
+#: ../plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Enostavni vstavek"
 
@@ -1394,8 +1441,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/simple.c:37
-#: ../plugins/simple.c:39
+#: ../plugins/simple.c:40
+#: ../plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Preveri večino stvari, če delujejo."
 
@@ -1778,7 +1825,7 @@
 
 #. Buddy List
 #: ../plugins/win32/winprefs/winprefs.c:417
-#: ../src/gtkblist.c:3668
+#: ../src/gtkblist.c:3663
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
@@ -1799,7 +1846,7 @@
 #. Conversations
 #: ../plugins/win32/winprefs/winprefs.c:431
 #: ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
+#: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "Pogovori"
 
@@ -1840,61 +1887,65 @@
 msgid "Save password"
 msgstr "Shrani geslo"
 
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
 #: ../src/account.c:968
 #: ../src/account.c:1139
-#: ../src/gtkblist.c:3552
-#: ../src/gtkdialogs.c:588
-#: ../src/gtkdialogs.c:725
-#: ../src/gtkdialogs.c:789
+#: ../src/gtkblist.c:3546
+#: ../src/gtkdialogs.c:602
+#: ../src/gtkdialogs.c:739
+#: ../src/gtkdialogs.c:803
 #: ../src/gtkrequest.c:269
 #: ../src/protocols/gg/gg.c:497
-#: ../src/protocols/gg/gg.c:638
-#: ../src/protocols/gg/gg.c:774
+#: ../src/protocols/gg/gg.c:655
+#: ../src/protocols/gg/gg.c:791
 #: ../src/protocols/jabber/jabber.c:1319
 #: ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250
 #: ../src/protocols/msn/msn.c:265
 #: ../src/protocols/msn/msn.c:280
 #: ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:3064
-#: ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688
-#: ../src/protocols/oscar/oscar.c:8130
-#: ../src/protocols/oscar/oscar.c:8253
-#: ../src/protocols/oscar/oscar.c:8278
-#: ../src/protocols/oscar/oscar.c:8330
+#: ../src/protocols/oscar/oscar.c:1408
+#: ../src/protocols/oscar/oscar.c:2167
+#: ../src/protocols/oscar/oscar.c:2260
+#: ../src/protocols/oscar/oscar.c:5694
+#: ../src/protocols/oscar/oscar.c:5874
+#: ../src/protocols/oscar/oscar.c:5899
+#: ../src/protocols/oscar/oscar.c:5955
 #: ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182
-#: ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461
-#: ../src/protocols/silc/chat.c:724
+#: ../src/protocols/silc/chat.c:424
+#: ../src/protocols/silc/chat.c:462
+#: ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1297
 #: ../src/protocols/silc/ops.c:1910
 #: ../src/protocols/silc/silc.c:753
-#: ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
+#: ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3068
+#: ../src/request.h:1344
 msgid "OK"
 msgstr "V redu"
 
 #: ../src/account.c:969
 #: ../src/account.c:1140
 #: ../src/account.c:1177
-#: ../src/gtkaccount.c:2171
-#: ../src/gtkaccount.c:2638
-#: ../src/gtkblist.c:5020
-#: ../src/gtkdialogs.c:589
-#: ../src/gtkdialogs.c:726
-#: ../src/gtkdialogs.c:790
-#: ../src/gtkdialogs.c:809
-#: ../src/gtkdialogs.c:831
-#: ../src/gtkdialogs.c:851
-#: ../src/gtkdialogs.c:895
-#: ../src/gtkdialogs.c:950
-#: ../src/gtkdialogs.c:987
-#: ../src/gtkdialogs.c:1012
+#: ../src/gtkaccount.c:2182
+#: ../src/gtkaccount.c:2649
+#: ../src/gtkblist.c:5015
+#: ../src/gtkdialogs.c:603
+#: ../src/gtkdialogs.c:740
+#: ../src/gtkdialogs.c:804
+#: ../src/gtkdialogs.c:823
+#: ../src/gtkdialogs.c:845
+#: ../src/gtkdialogs.c:865
+#: ../src/gtkdialogs.c:909
+#: ../src/gtkdialogs.c:964
+#: ../src/gtkdialogs.c:1001
+#: ../src/gtkdialogs.c:1026
 #: ../src/gtkimhtmltoolbar.c:419
 #: ../src/gtkplugin.c:296
-#: ../src/gtkpounce.c:1095
+#: ../src/gtkpounce.c:1077
 #: ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581
 #: ../src/gtkprivacy.c:606
@@ -1902,13 +1953,13 @@
 #: ../src/gtkrequest.c:270
 #: ../src/gtksavedstatuses.c:296
 #: ../src/protocols/gg/gg.c:498
-#: ../src/protocols/gg/gg.c:639
-#: ../src/protocols/gg/gg.c:775
-#: ../src/protocols/gg/gg.c:854
-#: ../src/protocols/jabber/buddy.c:573
-#: ../src/protocols/jabber/buddy.c:1419
-#: ../src/protocols/jabber/buddy.c:1453
-#: ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:792
+#: ../src/protocols/gg/gg.c:871
+#: ../src/protocols/jabber/buddy.c:575
+#: ../src/protocols/jabber/buddy.c:1460
+#: ../src/protocols/jabber/buddy.c:1494
+#: ../src/protocols/jabber/chat.c:778
 #: ../src/protocols/jabber/jabber.c:824
 #: ../src/protocols/jabber/jabber.c:1320
 #: ../src/protocols/jabber/xdata.c:338
@@ -1917,33 +1968,34 @@
 #: ../src/protocols/msn/msn.c:281
 #: ../src/protocols/msn/msn.c:296
 #: ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1705
-#: ../src/protocols/oscar/oscar.c:3065
-#: ../src/protocols/oscar/oscar.c:4565
-#: ../src/protocols/oscar/oscar.c:4608
-#: ../src/protocols/oscar/oscar.c:4645
-#: ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8131
-#: ../src/protocols/oscar/oscar.c:8254
-#: ../src/protocols/oscar/oscar.c:8279
-#: ../src/protocols/oscar/oscar.c:8331
-#: ../src/protocols/oscar/oscar.c:8400
-#: ../src/protocols/sametime/sametime.c:3376
-#: ../src/protocols/sametime/sametime.c:3461
-#: ../src/protocols/sametime/sametime.c:3631
-#: ../src/protocols/sametime/sametime.c:5320
-#: ../src/protocols/sametime/sametime.c:5409
-#: ../src/protocols/sametime/sametime.c:5533
+#: ../src/protocols/oscar/oscar.c:1409
+#: ../src/protocols/oscar/oscar.c:2168
+#: ../src/protocols/oscar/oscar.c:2209
+#: ../src/protocols/oscar/oscar.c:2261
+#: ../src/protocols/oscar/oscar.c:5695
+#: ../src/protocols/oscar/oscar.c:5747
+#: ../src/protocols/oscar/oscar.c:5875
+#: ../src/protocols/oscar/oscar.c:5900
+#: ../src/protocols/oscar/oscar.c:5956
+#: ../src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5525
 #: ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078
 #: ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:596
-#: ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/chat.c:597
+#: ../src/protocols/silc/chat.c:726
 #: ../src/protocols/silc/ops.c:1911
 #: ../src/protocols/silc/silc.c:754
 #: ../src/protocols/silc/silc.c:959
-#: ../src/protocols/yahoo/yahoo.c:3064
-#: ../src/protocols/yahoo/yahoo.c:3073
+#: ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3069
+#: ../src/request.h:1344
+#: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -1955,13 +2007,13 @@
 
 #: ../src/account.c:996
 #: ../src/connection.c:99
+#: ../src/gtkblist.c:3538
 #: ../src/gtkblist.c:3544
-#: ../src/gtkblist.c:3550
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
 #: ../src/account.c:1076
-#: ../src/protocols/gg/gg.c:679
+#: ../src/protocols/gg/gg.c:696
 #: ../src/protocols/jabber/jabber.c:1272
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
@@ -1996,19 +2048,25 @@
 msgid "Change user information for %s"
 msgstr "Spremeni podatke za uporabika %s"
 
+#: ../src/account.c:1172
+#: ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "Nastavi informacije o uporabniku"
+
 #: ../src/account.c:1176
 #: ../src/gtkdebug.c:684
 #: ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:572
+#: ../src/protocols/jabber/buddy.c:574
 msgid "Save"
 msgstr "Shrani"
 
 #: ../src/account.c:1679
-#: ../src/gtkft.c:157
-#: ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112
-#: ../src/protocols/novell/novell.c:2860
+#: ../src/gtkft.c:159
+#: ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:632
+#: ../src/protocols/jabber/buddy.c:1097
+#: ../src/protocols/jabber/buddy.c:1114
+#: ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Neznan"
 
@@ -2101,7 +2159,7 @@
 msgstr "Brez imena"
 
 #: ../src/ft.c:189
-#: ../src/protocols/msn/msn.c:412
+#: ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2172,55 +2230,55 @@
 msgid "%s is offering to send file %s"
 msgstr "%s ponuja pošiljanje datoteke %s"
 
-#: ../src/ft.c:442
+#: ../src/ft.c:443
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ni veljavna datoteka.\n"
 
-#: ../src/ft.c:463
+#: ../src/ft.c:464
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Ponujeno pošiljanje sporočila %s k %s"
 
-#: ../src/ft.c:474
+#: ../src/ft.c:476
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Začetek prenosa %s od %s"
 
-#: ../src/ft.c:628
+#: ../src/ft.c:630
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Prenos datoteke %s je dokončan."
 
-#: ../src/ft.c:631
+#: ../src/ft.c:633
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokončan."
 
-#: ../src/ft.c:1022
+#: ../src/ft.c:1028
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Prekinili ste prenos %s"
 
-#: ../src/ft.c:1027
+#: ../src/ft.c:1033
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
-#: ../src/ft.c:1084
+#: ../src/ft.c:1091
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s je prekinil prenos %s"
 
-#: ../src/ft.c:1089
+#: ../src/ft.c:1096
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s je prekinil prenos datoteke"
 
-#: ../src/ft.c:1146
+#: ../src/ft.c:1153
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Prenos datoteke do %s ni uspel."
 
-#: ../src/ft.c:1148
+#: ../src/ft.c:1155
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Prenos datoteke od %s ni uspel."
@@ -2242,7 +2300,7 @@
 msgstr "Možnosti prijave"
 
 #: ../src/gtkaccount.c:779
-#: ../src/gtkft.c:640
+#: ../src/gtkft.c:642
 msgid "Protocol:"
 msgstr "Protokol:"
 
@@ -2251,8 +2309,8 @@
 msgstr "Geslo:"
 
 #: ../src/gtkaccount.c:863
-#: ../src/gtkblist.c:4598
-#: ../src/gtkblist.c:4964
+#: ../src/gtkblist.c:4593
+#: ../src/gtkblist.c:4959
 msgid "Alias:"
 msgstr "Psevdonim:"
 
@@ -2300,345 +2358,351 @@
 msgstr "SOCKS5"
 
 #: ../src/gtkaccount.c:1263
-#: ../src/gtkprefs.c:1043
+#: ../src/gtkprefs.c:1058
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
-#: ../src/gtkaccount.c:1297
-msgid "you can see the butterflies mating"
-msgstr "lahko opazite metulje, ki se parijo"
-
-#: ../src/gtkaccount.c:1301
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../src/gtkaccount.c:1302
 msgid "If you look real closely"
 msgstr "Če pogledate zelo pozorno,"
 
-#: ../src/gtkaccount.c:1317
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../src/gtkaccount.c:1305
+msgid "you can see the butterflies mating"
+msgstr "lahko opazite metulje, ki se parijo"
+
+#: ../src/gtkaccount.c:1326
 msgid "Proxy Options"
 msgstr "Možnosti strežnika proxy"
 
-#: ../src/gtkaccount.c:1331
-#: ../src/gtkprefs.c:1037
+#: ../src/gtkaccount.c:1340
+#: ../src/gtkprefs.c:1052
 msgid "Proxy _type:"
 msgstr "Vrsta s_trežnika proxy:"
 
-#: ../src/gtkaccount.c:1340
-#: ../src/gtkprefs.c:1058
+#: ../src/gtkaccount.c:1349
+#: ../src/gtkprefs.c:1073
 msgid "_Host:"
 msgstr "_Strežnik:"
 
-#: ../src/gtkaccount.c:1344
-#: ../src/gtkprefs.c:1076
+#: ../src/gtkaccount.c:1353
+#: ../src/gtkprefs.c:1091
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: ../src/gtkaccount.c:1352
+#: ../src/gtkaccount.c:1361
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: ../src/gtkaccount.c:1358
-#: ../src/gtkprefs.c:1113
+#: ../src/gtkaccount.c:1367
+#: ../src/gtkprefs.c:1128
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: ../src/gtkaccount.c:1736
+#: ../src/gtkaccount.c:1747
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: ../src/gtkaccount.c:1738
-#: ../src/gtkblist.c:3553
+#: ../src/gtkaccount.c:1749
+#: ../src/gtkblist.c:3547
 msgid "Modify Account"
 msgstr "Spremeni račun"
 
-#: ../src/gtkaccount.c:1760
+#: ../src/gtkaccount.c:1771
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../src/gtkaccount.c:1771
+#: ../src/gtkaccount.c:1782
 msgid "_Advanced"
 msgstr "N_apredno"
 
 #. Register button
-#: ../src/gtkaccount.c:1786
+#: ../src/gtkaccount.c:1797
 #: ../src/protocols/jabber/jabber.c:823
 msgid "Register"
 msgstr "Registriraj se"
 
-#: ../src/gtkaccount.c:2165
+#: ../src/gtkaccount.c:2176
 #: ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepričani, da želite izbrisati %s?"
 
-#: ../src/gtkaccount.c:2170
-#: ../src/gtkpounce.c:1094
+#: ../src/gtkaccount.c:2181
+#: ../src/gtkpounce.c:1076
 #: ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Zbriši"
 
-#: ../src/gtkaccount.c:2228
-#: ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:5252
+#: ../src/gtkaccount.c:2239
+#: ../src/gtksavedstatuses.c:889
+#: ../src/protocols/oscar/oscar.c:2823
 msgid "Screen Name"
 msgstr "Ime"
 
-#: ../src/gtkaccount.c:2259
+#: ../src/gtkaccount.c:2270
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/gtkaccount.c:2586
+#: ../src/gtkaccount.c:2597
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s"
 
-#: ../src/gtkaccount.c:2635
+#: ../src/gtkaccount.c:2646
 msgid "Add buddy to your list?"
 msgstr "Želite dodati prijatelja na seznam?"
 
-#: ../src/gtkaccount.c:2637
-#: ../src/gtkblist.c:5019
-#: ../src/gtkconv.c:1625
+#: ../src/gtkaccount.c:2648
+#: ../src/gtkblist.c:5014
+#: ../src/gtkconv.c:1623
 #: ../src/gtkrequest.c:274
-#: ../src/protocols/gg/gg.c:853
-#: ../src/protocols/oscar/oscar.c:4877
-#: ../src/protocols/sametime/sametime.c:5408
-#: ../src/protocols/silc/chat.c:595
+#: ../src/protocols/gg/gg.c:870
+#: ../src/protocols/oscar/oscar.c:2453
+#: ../src/protocols/sametime/sametime.c:5400
+#: ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/gtkblist.c:672
+#: ../src/gtkblist.c:664
 msgid "Join a Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../src/gtkblist.c:693
+#: ../src/gtkblist.c:685
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu želite pridružiti.\n"
 
-#: ../src/gtkblist.c:704
-#: ../src/gtkpounce.c:527
+#: ../src/gtkblist.c:696
+#: ../src/gtkpounce.c:519
 #: ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: ../src/gtkblist.c:948
+#: ../src/gtkblist.c:940
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: ../src/gtkblist.c:951
+#: ../src/gtkblist.c:943
 #: ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_Sporoči"
 
-#: ../src/gtkblist.c:957
+#: ../src/gtkblist.c:949
 msgid "_Send File"
 msgstr "_Pošlji datoteko"
 
-#: ../src/gtkblist.c:964
+#: ../src/gtkblist.c:956
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _opozorilo prijatelja"
 
-#: ../src/gtkblist.c:968
-#: ../src/gtkblist.c:972
-#: ../src/gtkblist.c:1071
-#: ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:960
+#: ../src/gtkblist.c:964
+#: ../src/gtkblist.c:1063
+#: ../src/gtkblist.c:1086
 msgid "View _Log"
 msgstr "Poglej _dnevnik"
 
-#: ../src/gtkblist.c:983
+#: ../src/gtkblist.c:975
 msgid "Alias..."
 msgstr "Psevdonim ..."
 
-#: ../src/gtkblist.c:986
-#: ../src/gtkconv.c:1622
+#: ../src/gtkblist.c:978
+#: ../src/gtkconv.c:1620
 #: ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ../src/gtkblist.c:992
-#: ../src/gtkblist.c:1079
-#: ../src/gtkblist.c:1100
+#: ../src/gtkblist.c:984
+#: ../src/gtkblist.c:1071
+#: ../src/gtkblist.c:1092
 msgid "_Alias..."
 msgstr "_Psevdonim ..."
 
-#: ../src/gtkblist.c:994
-#: ../src/gtkblist.c:1081
-#: ../src/gtkblist.c:1102
+#: ../src/gtkblist.c:986
+#: ../src/gtkblist.c:1073
+#: ../src/gtkblist.c:1094
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: ../src/gtkblist.c:1042
+#: ../src/gtkblist.c:1034
 msgid "Add a _Buddy"
 msgstr "Dodaj _prijatelja"
 
-#: ../src/gtkblist.c:1044
+#: ../src/gtkblist.c:1036
 msgid "Add a C_hat"
 msgstr "Dodaj po_menek"
 
-#: ../src/gtkblist.c:1047
+#: ../src/gtkblist.c:1039
 msgid "_Delete Group"
 msgstr "_Zbriši skupino"
 
-#: ../src/gtkblist.c:1049
+#: ../src/gtkblist.c:1041
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: ../src/gtkblist.c:1067
+#: ../src/gtkblist.c:1059
 #: ../src/gtkroomlist.c:285
 #: ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../src/gtkblist.c:1069
+#: ../src/gtkblist.c:1061
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: ../src/gtkblist.c:1107
-#: ../src/gtkblist.c:1130
+#: ../src/gtkblist.c:1099
+#: ../src/gtkblist.c:1122
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: ../src/gtkblist.c:1135
+#: ../src/gtkblist.c:1127
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: ../src/gtkblist.c:1381
-#: ../src/gtkblist.c:1393
-#: ../src/gtkblist.c:3813
-#: ../src/gtkblist.c:3823
+#: ../src/gtkblist.c:1373
+#: ../src/gtkblist.c:1385
+#: ../src/gtkblist.c:3808
+#: ../src/gtkblist.c:3818
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: ../src/gtkblist.c:1856
-#: ../src/gtkconv.c:4209
-#: ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1845
+#: ../src/gtkconv.c:4176
+#: ../src/gtkpounce.c:418
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2430
+#: ../src/gtkblist.c:2419
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2420
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2421
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: ../src/gtkblist.c:2433
+#: ../src/gtkblist.c:2422
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: ../src/gtkblist.c:2434
+#: ../src/gtkblist.c:2423
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Pog_lej uporabnikov dnevnik ..."
 
-#: ../src/gtkblist.c:2436
+#: ../src/gtkblist.c:2425
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Prijatelji/Prikaži prijatelje, ki niso na z_vezi"
 
-#: ../src/gtkblist.c:2437
+#: ../src/gtkblist.c:2426
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Prijatelji/Prikaži pra_zne skupine"
 
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2427
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Prijatelji/Pokaži p_odrobnosti prijateljev"
 
-#: ../src/gtkblist.c:2439
+#: ../src/gtkblist.c:2428
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Prijatelji/Pokaži čase _nedejavnosti"
 
-#: ../src/gtkblist.c:2440
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Prijatelji/Razvr_sti prijatelje"
 
-#: ../src/gtkblist.c:2442
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: ../src/gtkblist.c:2443
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: ../src/gtkblist.c:2444
+#: ../src/gtkblist.c:2433
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: ../src/gtkblist.c:2446
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2438
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-#: ../src/gtkblist.c:2450
-#: ../src/gtkblist.c:5598
+#: ../src/gtkblist.c:2439
+#: ../src/gtkblist.c:5591
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Računi/Dodaj\\/Uredi"
 
 #. Tools
-#: ../src/gtkblist.c:2453
+#: ../src/gtkblist.c:2442
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: ../src/gtkblist.c:2454
+#: ../src/gtkblist.c:2443
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2444
 msgid "/Tools/Plu_gins"
 msgstr "/Orodja/Vstav_ki"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2445
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: ../src/gtkblist.c:2457
+#: ../src/gtkblist.c:2446
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: ../src/gtkblist.c:2459
+#: ../src/gtkblist.c:2448
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: ../src/gtkblist.c:2460
+#: ../src/gtkblist.c:2449
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: ../src/gtkblist.c:2461
+#: ../src/gtkblist.c:2450
 msgid "/Tools/System _Log"
 msgstr "/Orodja/Sistemski _dnevnik"
 
-#: ../src/gtkblist.c:2463
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
 #. Help
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2455
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2456
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: ../src/gtkblist.c:2468
+#: ../src/gtkblist.c:2457
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2458
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
-#: ../src/gtkblist.c:2501
-#: ../src/gtkblist.c:2570
+#: ../src/gtkblist.c:2490
+#: ../src/gtkblist.c:2559
 #, c-format
 msgid ""
 "\n"
@@ -2647,7 +2711,7 @@
 "\n"
 "<b>Račun:</b> %s"
 
-#: ../src/gtkblist.c:2582
+#: ../src/gtkblist.c:2571
 #, c-format
 msgid ""
 "\n"
@@ -2656,7 +2720,7 @@
 "\n"
 "<b>Psevdonim:</b> %s"
 
-#: ../src/gtkblist.c:2594
+#: ../src/gtkblist.c:2583
 #, c-format
 msgid ""
 "\n"
@@ -2665,7 +2729,7 @@
 "\n"
 "<b>Vzdevek:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2592
 #, c-format
 msgid ""
 "\n"
@@ -2674,7 +2738,7 @@
 "\n"
 "<b>Prijavljen(i):</b> %s"
 
-#: ../src/gtkblist.c:2614
+#: ../src/gtkblist.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -2683,7 +2747,7 @@
 "\n"
 "<b>Nedejaven:</b> %s"
 
-#: ../src/gtkblist.c:2649
+#: ../src/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -2692,7 +2756,7 @@
 "\n"
 "<b>Zadnjič viden:</b> pred %s"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2647
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2700,7 +2764,7 @@
 "\n"
 "<b>Stanje:</b> Ni na zvezi"
 
-#: ../src/gtkblist.c:2669
+#: ../src/gtkblist.c:2658
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2708,7 +2772,7 @@
 "\n"
 "<b>Opis:</b> Strašljivo"
 
-#: ../src/gtkblist.c:2671
+#: ../src/gtkblist.c:2660
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2716,7 +2780,7 @@
 "\n"
 "<b>Stanje</b>: Neverjetno!"
 
-#: ../src/gtkblist.c:2673
+#: ../src/gtkblist.c:2662
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2724,194 +2788,184 @@
 "\n"
 "<b>Stanje</b>: Kulsko"
 
-#: ../src/gtkblist.c:2962
+#: ../src/gtkblist.c:2951
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nedejaven %dh %02dm"
 
-#: ../src/gtkblist.c:2964
+#: ../src/gtkblist.c:2953
 #, c-format
 msgid "Idle %dm"
 msgstr "Nedejaven %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2967
-#: ../src/gtkprefs.c:1745
+#: ../src/gtkblist.c:2956
+#: ../src/gtkprefs.c:1760
 #: ../src/protocols/bonjour/bonjour.c:333
-#: ../src/protocols/msn/msn.c:552
+#: ../src/protocols/msn/msn.c:550
 #: ../src/protocols/msn/state.c:32
-#: ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273
-#: ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2844
+#: ../src/protocols/yahoo/yahoo.c:2727
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: ../src/gtkblist.c:3099
+#: ../src/gtkblist.c:3088
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: ../src/gtkblist.c:3100
-#: ../src/gtkblist.c:3133
+#: ../src/gtkblist.c:3089
+#: ../src/gtkblist.c:3122
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: ../src/gtkblist.c:3101
+#: ../src/gtkblist.c:3090
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: ../src/gtkblist.c:3102
+#: ../src/gtkblist.c:3091
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: ../src/gtkblist.c:3103
-#: ../src/gtkblist.c:3136
+#: ../src/gtkblist.c:3092
+#: ../src/gtkblist.c:3125
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: ../src/gtkblist.c:3104
+#: ../src/gtkblist.c:3093
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: ../src/gtkblist.c:3139
+#: ../src/gtkblist.c:3128
 msgid "/Tools/Buddy Pounces"
 msgstr "/Orodja/Opozorila prijateljev"
 
-#: ../src/gtkblist.c:3142
+#: ../src/gtkblist.c:3131
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: ../src/gtkblist.c:3145
+#: ../src/gtkblist.c:3134
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: ../src/gtkblist.c:3339
+#: ../src/gtkblist.c:3328
 msgid "Manually"
 msgstr "ročno"
 
-#: ../src/gtkblist.c:3341
+#: ../src/gtkblist.c:3330
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: ../src/gtkblist.c:3342
+#: ../src/gtkblist.c:3331
 msgid "By status"
 msgstr "po stanju"
 
-#: ../src/gtkblist.c:3343
+#: ../src/gtkblist.c:3332
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: ../src/gtkblist.c:3538
+#: ../src/gtkblist.c:3532
 #: ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: ../src/gtkblist.c:3554
-#: ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3548
+#: ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "Poveži se"
 
-#: ../src/gtkblist.c:3554
-#: ../src/gtkblist.c:5697
-msgid "Enable Account"
-msgstr "Omogoči račun"
-
-#: ../src/gtkblist.c:3575
+#: ../src/gtkblist.c:3548
+msgid "Re-enable Account"
+msgstr "Ponovno omogoči račun"
+
+#: ../src/gtkblist.c:3570
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
 
-#: ../src/gtkblist.c:3702
+#: ../src/gtkblist.c:3697
 msgid "/Accounts"
 msgstr "/Računi"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3807
+#: ../src/gtkblist.c:3802
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
 
-#: ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3805
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Prijatelji/Pokaži prazne skupine"
 
-#: ../src/gtkblist.c:3816
+#: ../src/gtkblist.c:3811
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Prijatelji/Pokaži podrobnosti prijatelja"
 
-#: ../src/gtkblist.c:3819
+#: ../src/gtkblist.c:3814
 msgid "/Buddies/Show Idle Times"
 msgstr "/Prijatelji/Pokaži čase nedejavnosti"
 
-#: ../src/gtkblist.c:4531
-#: ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174
-#: ../src/protocols/yahoo/yahoo.c:2978
-msgid "Add Buddy"
-msgstr "Dodaj prijatelja"
-
-#: ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4550
 msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Prosim vnesite ime osebe, ki jo želite dodati vašemu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek. Kjer bo izvedljivo, bo namesto vzdevka prikazan psevdonim.\n"
 
-#: ../src/gtkblist.c:4577
-msgid "Screen Name:"
-msgstr "Ime:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4625
-#: ../src/gtkblist.c:4944
+#: ../src/gtkblist.c:4620
+#: ../src/gtkblist.c:4939
 msgid "Account:"
 msgstr "Račun:"
 
-#: ../src/gtkblist.c:4877
+#: ../src/gtkblist.c:4872
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: ../src/gtkblist.c:4893
+#: ../src/gtkblist.c:4888
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
 
-#: ../src/gtkblist.c:4910
+#: ../src/gtkblist.c:4905
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
-#: ../src/gtkblist.c:4934
+#: ../src/gtkblist.c:4929
 msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "Prosim vnesite psevdonim in ostale informacije za pomenek, ki ga želite dodati na seznam prijateljev.\n"
 
-#: ../src/gtkblist.c:5016
-#: ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5406
+#: ../src/gtkblist.c:5011
+#: ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5398
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: ../src/gtkblist.c:5017
+#: ../src/gtkblist.c:5012
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: ../src/gtkblist.c:5638
+#: ../src/gtkblist.c:5631
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#: ../src/gtkblist.c:5671
-#: ../src/gtkblist.c:5677
+#: ../src/gtkblist.c:5664
+#: ../src/gtkblist.c:5670
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: ../src/gtkblist.c:5685
+#: ../src/gtkblist.c:5678
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-#: ../src/gtkblist.c:5750
+#: ../src/gtkblist.c:5690
+msgid "Enable Account"
+msgstr "Omogoči račun"
+
+#: ../src/gtkblist.c:5743
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: ../src/gtkblist.c:5836
+#: ../src/gtkblist.c:5829
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
@@ -2940,341 +2994,341 @@
 "Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
-#: ../src/gtkconv.c:484
+#: ../src/gtkconv.c:482
 msgid "No such command."
 msgstr "Ta ukaz ne obstaja."
 
-#: ../src/gtkconv.c:491
+#: ../src/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Skladenjska napaka: vtipkali ste napačno število argumentov za ta ukaz."
 
-#: ../src/gtkconv.c:496
+#: ../src/gtkconv.c:494
 msgid "Your command failed for an unknown reason."
 msgstr "Vaš ukaz iz neznanega razloga ni uspel."
 
-#: ../src/gtkconv.c:503
+#: ../src/gtkconv.c:501
 msgid "That command only works in chats, not IMs."
 msgstr "Ta ukaz deluje samo v klepetih in ne v neposrednih sporočilih."
 
-#: ../src/gtkconv.c:506
+#: ../src/gtkconv.c:504
 msgid "That command only works in IMs, not chats."
 msgstr "Ta ukaz deluje samo v neposrednih sporočilih in ne v klepetih."
 
-#: ../src/gtkconv.c:510
+#: ../src/gtkconv.c:508
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
-#: ../src/gtkconv.c:744
-#: ../src/gtkconv.c:770
+#: ../src/gtkconv.c:742
+#: ../src/gtkconv.c:768
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tisti prijatelj ne uporablja enakega protokola kot ta pogovor."
 
-#: ../src/gtkconv.c:764
+#: ../src/gtkconv.c:762
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
-#: ../src/gtkconv.c:817
+#: ../src/gtkconv.c:815
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:847
+#: ../src/gtkconv.c:845
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "Prosim vnesite ime uporabnika, ki ga želite povabiti, dodate pa lahko še povabilo."
 
-#: ../src/gtkconv.c:868
+#: ../src/gtkconv.c:866
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: ../src/gtkconv.c:888
-#: ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444
+#: ../src/gtkconv.c:886
+#: ../src/gtksavedstatuses.c:1107
+#: ../src/gtksavedstatuses.c:1443
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: ../src/gtkconv.c:945
-#: ../src/gtkconv.c:2392
+#: ../src/gtkconv.c:943
+#: ../src/gtkconv.c:2359
 #: ../src/gtkdebug.c:217
-#: ../src/gtkft.c:488
+#: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
-#: ../src/gtkconv.c:951
+#: ../src/gtkconv.c:949
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: ../src/gtkconv.c:975
+#: ../src/gtkconv.c:973
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: ../src/gtkconv.c:1096
+#: ../src/gtkconv.c:1094
 #: ../src/gtkdebug.c:165
 #: ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Najdi"
 
-#: ../src/gtkconv.c:1122
+#: ../src/gtkconv.c:1120
 #: ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: ../src/gtkconv.c:1293
+#: ../src/gtkconv.c:1291
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo zabeležena."
 
-#: ../src/gtkconv.c:1301
+#: ../src/gtkconv.c:1299
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo zabeležena."
 
-#: ../src/gtkconv.c:1562
+#: ../src/gtkconv.c:1560
 msgid "IM"
 msgstr "Sporoči"
 
-#: ../src/gtkconv.c:1573
-#: ../src/protocols/oscar/oscar.c:714
+#: ../src/gtkconv.c:1571
+#: ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: ../src/gtkconv.c:1588
+#: ../src/gtkconv.c:1586
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: ../src/gtkconv.c:1591
+#: ../src/gtkconv.c:1589
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../src/gtkconv.c:1601
+#: ../src/gtkconv.c:1599
 msgid "Info"
 msgstr "Informacije"
 
-#: ../src/gtkconv.c:1611
+#: ../src/gtkconv.c:1609
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../src/gtkconv.c:1634
+#: ../src/gtkconv.c:1632
 msgid "Last said"
 msgstr "Nazadnje rečeno"
 
-#: ../src/gtkconv.c:2400
+#: ../src/gtkconv.c:2367
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: ../src/gtkconv.c:2424
+#: ../src/gtkconv.c:2391
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: ../src/gtkconv.c:2473
+#: ../src/gtkconv.c:2440
 msgid "Animate"
 msgstr "Animiraj"
 
-#: ../src/gtkconv.c:2478
+#: ../src/gtkconv.c:2445
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: ../src/gtkconv.c:2484
+#: ../src/gtkconv.c:2451
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2625
+#: ../src/gtkconv.c:2592
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: ../src/gtkconv.c:2627
+#: ../src/gtkconv.c:2594
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/Novo neposredno sporočilo ..."
 
-#: ../src/gtkconv.c:2632
+#: ../src/gtkconv.c:2599
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: ../src/gtkconv.c:2634
+#: ../src/gtkconv.c:2601
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pog_lej dnevnik ..."
 
-#: ../src/gtkconv.c:2635
+#: ../src/gtkconv.c:2602
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: ../src/gtkconv.c:2637
+#: ../src/gtkconv.c:2604
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Pogovor/Po_čisti pogovor"
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2608
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#: ../src/gtkconv.c:2642
+#: ../src/gtkconv.c:2609
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: ../src/gtkconv.c:2644
+#: ../src/gtkconv.c:2611
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: ../src/gtkconv.c:2646
+#: ../src/gtkconv.c:2613
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Po_vabi ..."
 
-#: ../src/gtkconv.c:2651
+#: ../src/gtkconv.c:2618
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/Psevdon_im ..."
 
-#: ../src/gtkconv.c:2653
+#: ../src/gtkconv.c:2620
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/_Zavrni ..."
 
-#: ../src/gtkconv.c:2655
+#: ../src/gtkconv.c:2622
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2624
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi _povezavo ..."
 
-#: ../src/gtkconv.c:2664
+#: ../src/gtkconv.c:2631
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: ../src/gtkconv.c:2669
+#: ../src/gtkconv.c:2636
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: ../src/gtkconv.c:2673
+#: ../src/gtkconv.c:2640
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: ../src/gtkconv.c:2674
+#: ../src/gtkconv.c:2641
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: ../src/gtkconv.c:2675
+#: ../src/gtkconv.c:2642
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: ../src/gtkconv.c:2676
+#: ../src/gtkconv.c:2643
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: ../src/gtkconv.c:2678
+#: ../src/gtkconv.c:2645
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za _oblikovanje"
 
-#: ../src/gtkconv.c:2679
+#: ../src/gtkconv.c:2646
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pr_ikaži časovne žige"
 
-#: ../src/gtkconv.c:2771
+#: ../src/gtkconv.c:2738
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Prikaži dnevnik ..."
 
-#: ../src/gtkconv.c:2777
+#: ../src/gtkconv.c:2744
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: ../src/gtkconv.c:2781
+#: ../src/gtkconv.c:2748
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: ../src/gtkconv.c:2787
+#: ../src/gtkconv.c:2754
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: ../src/gtkconv.c:2791
+#: ../src/gtkconv.c:2758
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: ../src/gtkconv.c:2797
+#: ../src/gtkconv.c:2764
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: ../src/gtkconv.c:2801
+#: ../src/gtkconv.c:2768
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: ../src/gtkconv.c:2805
+#: ../src/gtkconv.c:2772
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: ../src/gtkconv.c:2809
+#: ../src/gtkconv.c:2776
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: ../src/gtkconv.c:2815
+#: ../src/gtkconv.c:2782
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: ../src/gtkconv.c:2819
+#: ../src/gtkconv.c:2786
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: ../src/gtkconv.c:2825
+#: ../src/gtkconv.c:2792
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: ../src/gtkconv.c:2828
+#: ../src/gtkconv.c:2795
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: ../src/gtkconv.c:2841
+#: ../src/gtkconv.c:2808
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za oblikovanje"
 
-#: ../src/gtkconv.c:2844
+#: ../src/gtkconv.c:2811
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Prikaži časovne žige"
 
-#: ../src/gtkconv.c:2847
+#: ../src/gtkconv.c:2814
 msgid "/Options/Show Buddy Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: ../src/gtkconv.c:2927
+#: ../src/gtkconv.c:2894
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: ../src/gtkconv.c:2930
+#: ../src/gtkconv.c:2897
 msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3113
+#: ../src/gtkconv.c:3080
 msgid "_Send To"
 msgstr "_Pošlji k"
 
-#: ../src/gtkconv.c:3765
+#: ../src/gtkconv.c:3732
 msgid "_Send"
 msgstr "_Pošlji"
 
-#: ../src/gtkconv.c:3820
-#: ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3787
+#: ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3872
+#: ../src/gtkconv.c:3839
 msgid "0 people in room"
 msgstr "0 ljudi v sobi"
 
-#: ../src/gtkconv.c:3951
+#: ../src/gtkconv.c:3918
 msgid "IM the user"
 msgstr "Pošlji sporočilo uporabniku"
 
-#: ../src/gtkconv.c:3964
+#: ../src/gtkconv.c:3931
 msgid "Ignore the user"
 msgstr "Prezri uporabnika"
 
-#: ../src/gtkconv.c:3976
+#: ../src/gtkconv.c:3943
 msgid "Get the user's information"
 msgstr "Poizvedi o uporabniku"
 
-#: ../src/gtkconv.c:4958
-#: ../src/gtkconv.c:5067
+#: ../src/gtkconv.c:4929
+#: ../src/gtkconv.c:5038
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -3283,72 +3337,89 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: ../src/gtkconv.c:6540
+#: ../src/gtkconv.c:5595
+#: ../src/gtkstatusbox.c:366
+msgid "Typing"
+msgstr "Tipka"
+
+#: ../src/gtkconv.c:5601
+msgid "Stopped Typing"
+msgstr "Prenehal tipkati"
+
+#: ../src/gtkconv.c:5606
+msgid "Nick Said"
+msgstr "Vzdevek pravi"
+
+#: ../src/gtkconv.c:5616
+msgid "New Event"
+msgstr "Nov dogodek"
+
+#: ../src/gtkconv.c:6506
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;sporočilo&gt;:  Pošlji sporočilo kot ponavadi, kot če ne bi uporabljal ukaza."
 
-#: ../src/gtkconv.c:6543
+#: ../src/gtkconv.c:6509
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
 
-#: ../src/gtkconv.c:6546
+#: ../src/gtkconv.c:6512
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "razrošči &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o razhroščevanju."
 
-#: ../src/gtkconv.c:6549
+#: ../src/gtkconv.c:6515
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
-#: ../src/gtkconv.c:6552
+#: ../src/gtkconv.c:6518
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
-#: ../src/gtkconv.c:6711
+#: ../src/gtkconv.c:6677
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: ../src/gtkconv.c:6743
+#: ../src/gtkconv.c:6709
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Imate neprebrana sporočila. Ste prepričani, da želite zapreti okno?"
 
-#: ../src/gtkconv.c:7265
+#: ../src/gtkconv.c:7231
 msgid "Close other tabs"
 msgstr "Zapri druge zavihke"
 
-#: ../src/gtkconv.c:7271
+#: ../src/gtkconv.c:7237
 msgid "Close all tabs"
 msgstr "Zapri vse zavihke"
 
-#: ../src/gtkconv.c:7279
+#: ../src/gtkconv.c:7245
 msgid "Detach this tab"
 msgstr "Odpni ta zavihek"
 
-#: ../src/gtkconv.c:7285
+#: ../src/gtkconv.c:7251
 msgid "Close this tab"
 msgstr "Zapri ta zavihek"
 
-#: ../src/gtkconv.c:7547
+#: ../src/gtkconv.c:7511
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: ../src/gtkconv.c:8011
+#: ../src/gtkconv.c:7975
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: ../src/gtkconv.c:8013
+#: ../src/gtkconv.c:7977
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: ../src/gtkconv.c:8015
-#: ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:7979
+#: ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "novo okno"
 
-#: ../src/gtkconv.c:8017
+#: ../src/gtkconv.c:7981
 msgid "By group"
 msgstr "po skupinah"
 
-#: ../src/gtkconv.c:8019
+#: ../src/gtkconv.c:7983
 msgid "By account"
 msgstr "po vrsti računa"
 
@@ -3390,7 +3461,7 @@
 msgstr "Za več možnosti kliknite na desni miškin gumb."
 
 #: ../src/gtkdialogs.c:61
-#: ../src/gtkdialogs.c:103
+#: ../src/gtkdialogs.c:104
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
@@ -3431,344 +3502,353 @@
 msgid "libfaim maintainer"
 msgstr "vzdrževalec libfaim"
 
-#: ../src/gtkdialogs.c:100
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../src/gtkdialogs.c:101
 msgid "hacker and designated driver [lazy bum]"
 msgstr "heker in uradni vodja [lenoba]"
 
-#: ../src/gtkdialogs.c:101
+#: ../src/gtkdialogs.c:102
 msgid "Jabber developer"
 msgstr "razvijalec podpore protokola Jabber"
 
-#: ../src/gtkdialogs.c:102
+#: ../src/gtkdialogs.c:103
 msgid "original author"
 msgstr "prvotni avtor"
 
-#: ../src/gtkdialogs.c:109
 #: ../src/gtkdialogs.c:110
-#: ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:111
+#: ../src/gtkdialogs.c:169
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
-#: ../src/gtkdialogs.c:111
 #: ../src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:113
 msgid "Bengali"
 msgstr "bengalsko"
 
-#: ../src/gtkdialogs.c:113
-msgid "Bosnian"
-msgstr "bosansko"
-
 #: ../src/gtkdialogs.c:114
-#: ../src/gtkdialogs.c:165
-#: ../src/gtkdialogs.c:166
-msgid "Catalan"
-msgstr "katalonsko"
+msgid "Bosnian"
+msgstr "bosansko"
 
 #: ../src/gtkdialogs.c:115
-#: ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171
+msgid "Catalan"
+msgstr "katalonsko"
+
+#: ../src/gtkdialogs.c:116
+msgid "Valencian"
+msgstr "valencijansko"
+
+#: ../src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:172
 msgid "Czech"
 msgstr "češko"
 
-#: ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:118
 msgid "Danish"
 msgstr "dansko"
 
-#: ../src/gtkdialogs.c:117
-#: ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:173
 msgid "German"
 msgstr "nemško"
 
-#: ../src/gtkdialogs.c:118
-#: ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:122
 msgid "Greek"
 msgstr "grško"
 
-#: ../src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:123
 msgid "Australian English"
 msgstr "avstralsko-angleško"
 
-#: ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:124
 msgid "Canadian English"
 msgstr "kanadsko-angleško"
 
-#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:125
 msgid "British English"
 msgstr "britansko-angleško"
 
-#: ../src/gtkdialogs.c:123
-#: ../src/gtkdialogs.c:169
-#: ../src/gtkdialogs.c:170
-#: ../src/gtkdialogs.c:171
-#: ../src/gtkdialogs.c:172
-msgid "Spanish"
-msgstr "špansko"
-
-#: ../src/gtkdialogs.c:124
-#: ../src/gtkdialogs.c:125
-msgid "Persian"
-msgstr "perzijsko"
-
 #: ../src/gtkdialogs.c:126
-#: ../src/gtkdialogs.c:173
 #: ../src/gtkdialogs.c:174
-msgid "Finnish"
-msgstr "finsko"
-
-#: ../src/gtkdialogs.c:127
 #: ../src/gtkdialogs.c:175
 #: ../src/gtkdialogs.c:176
 #: ../src/gtkdialogs.c:177
-#: ../src/gtkdialogs.c:178
-msgid "French"
-msgstr "francosko"
-
+msgid "Spanish"
+msgstr "špansko"
+
+#: ../src/gtkdialogs.c:127
 #: ../src/gtkdialogs.c:128
-msgid "Hebrew"
-msgstr "hebrejsko"
+msgid "Persian"
+msgstr "perzijsko"
 
 #: ../src/gtkdialogs.c:129
-msgid "Hindi"
-msgstr "hindujsko"
+#: ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:179
+msgid "Finnish"
+msgstr "finsko"
 
 #: ../src/gtkdialogs.c:130
-msgid "Hungarian"
-msgstr "madžarsko"
-
-#: ../src/gtkdialogs.c:131
-#: ../src/gtkdialogs.c:179
-msgid "Italian"
-msgstr "italijansko"
-
-#: ../src/gtkdialogs.c:132
 #: ../src/gtkdialogs.c:180
 #: ../src/gtkdialogs.c:181
 #: ../src/gtkdialogs.c:182
-msgid "Japanese"
-msgstr "japonsko"
+#: ../src/gtkdialogs.c:183
+msgid "French"
+msgstr "francosko"
+
+#: ../src/gtkdialogs.c:131
+msgid "Galician"
+msgstr "galicijsko"
+
+#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:184
+msgid "Hebrew"
+msgstr "hebrejsko"
 
 #: ../src/gtkdialogs.c:133
-#: ../src/gtkdialogs.c:183
-msgid "Georgian"
-msgstr "gruzijsko"
+msgid "Hindi"
+msgstr "hindujsko"
 
 #: ../src/gtkdialogs.c:134
-#: ../src/gtkdialogs.c:184
-msgid "Korean"
-msgstr "korejsko"
+msgid "Hungarian"
+msgstr "madžarsko"
 
 #: ../src/gtkdialogs.c:135
-msgid "Kurdish"
-msgstr "kurdsko"
+#: ../src/gtkdialogs.c:185
+msgid "Italian"
+msgstr "italijansko"
 
 #: ../src/gtkdialogs.c:136
-#: ../src/gtkdialogs.c:185
 #: ../src/gtkdialogs.c:186
-msgid "Lithuanian"
-msgstr "litvansko"
+#: ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:188
+msgid "Japanese"
+msgstr "japonsko"
 
 #: ../src/gtkdialogs.c:137
-msgid "Macedonian"
-msgstr "makedonsko"
+#: ../src/gtkdialogs.c:189
+msgid "Georgian"
+msgstr "gruzijsko"
 
 #: ../src/gtkdialogs.c:138
-msgid "Dutch, Flemish"
-msgstr "nizozemsko, flamsko"
+#: ../src/gtkdialogs.c:190
+msgid "Korean"
+msgstr "korejsko"
 
 #: ../src/gtkdialogs.c:139
-msgid "Norwegian"
-msgstr "norveško"
-
 #: ../src/gtkdialogs.c:140
 #: ../src/gtkdialogs.c:141
-#: ../src/gtkdialogs.c:187
-msgid "Polish"
-msgstr "poljsko"
+msgid "Kurdish"
+msgstr "kurdsko"
 
 #: ../src/gtkdialogs.c:142
-msgid "Portuguese"
-msgstr "portugalsko"
+#: ../src/gtkdialogs.c:191
+#: ../src/gtkdialogs.c:192
+msgid "Lithuanian"
+msgstr "litvansko"
 
 #: ../src/gtkdialogs.c:143
-msgid "Portuguese-Brazil"
-msgstr "portugalsko (Brazilija)"
+msgid "Macedonian"
+msgstr "makedonsko"
 
 #: ../src/gtkdialogs.c:144
-msgid "Romanian"
-msgstr "romunsko"
+msgid "Dutch, Flemish"
+msgstr "nizozemsko, flamsko"
 
 #: ../src/gtkdialogs.c:145
-#: ../src/gtkdialogs.c:188
-#: ../src/gtkdialogs.c:189
-msgid "Russian"
-msgstr "rusko"
+msgid "Norwegian"
+msgstr "norveško"
 
 #: ../src/gtkdialogs.c:146
 #: ../src/gtkdialogs.c:147
-msgid "Serbian"
-msgstr "srbsko"
+#: ../src/gtkdialogs.c:193
+msgid "Polish"
+msgstr "poljsko"
 
 #: ../src/gtkdialogs.c:148
-msgid "Slovenian"
-msgstr "slovensko"
+msgid "Portuguese"
+msgstr "portugalsko"
 
 #: ../src/gtkdialogs.c:149
-#: ../src/gtkdialogs.c:191
-msgid "Swedish"
-msgstr "švedsko"
+msgid "Portuguese-Brazil"
+msgstr "portugalsko (Brazilija)"
 
 #: ../src/gtkdialogs.c:150
-msgid "Tamil"
-msgstr "tamilsko"
+msgid "Romanian"
+msgstr "romunsko"
 
 #: ../src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:194
+#: ../src/gtkdialogs.c:195
+msgid "Russian"
+msgstr "rusko"
+
+#: ../src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:153
+msgid "Serbian"
+msgstr "srbsko"
+
+#: ../src/gtkdialogs.c:154
+msgid "Slovenian"
+msgstr "slovensko"
+
+#: ../src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:197
+msgid "Swedish"
+msgstr "švedsko"
+
+#: ../src/gtkdialogs.c:156
+msgid "Tamil"
+msgstr "tamilsko"
+
+#: ../src/gtkdialogs.c:157
 msgid "Telugu"
 msgstr "teluško"
 
-#: ../src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:158
 msgid "Turkish"
 msgstr "turško"
 
-#: ../src/gtkdialogs.c:153
-msgid "Valencian"
-msgstr "valencijansko"
-
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:159
 msgid "Vietnamese"
 msgstr "vietnamsko"
 
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:159
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh in ekipa Gnome-Vi"
 
-#: ../src/gtkdialogs.c:155
-#: ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:198
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: ../src/gtkdialogs.c:156
-#: ../src/gtkdialogs.c:157
-#: ../src/gtkdialogs.c:193
+#: ../src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:199
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:168
 msgid "Amharic"
 msgstr "amharsko"
 
-#: ../src/gtkdialogs.c:190
+#: ../src/gtkdialogs.c:196
 msgid "Slovak"
 msgstr "slovaško"
 
-#: ../src/gtkdialogs.c:234
+#: ../src/gtkdialogs.c:240
 msgid "About Gaim"
 msgstr "O programu Gaim"
 
-#: ../src/gtkdialogs.c:258
+#: ../src/gtkdialogs.c:264
 msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
 msgstr "Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr in Gadu-Gadu. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija GPL je v datoteki 'COPYING', ki je distribuirana s programom Gaim.  Gaim je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
 
-#: ../src/gtkdialogs.c:272
+#: ../src/gtkdialogs.c:278
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim na irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:275
+#: ../src/gtkdialogs.c:281
 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:281
+#: ../src/gtkdialogs.c:287
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
 
-#: ../src/gtkdialogs.c:296
+#: ../src/gtkdialogs.c:302
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obližev"
 
-#: ../src/gtkdialogs.c:311
+#: ../src/gtkdialogs.c:317
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: ../src/gtkdialogs.c:326
+#: ../src/gtkdialogs.c:332
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: ../src/gtkdialogs.c:346
+#: ../src/gtkdialogs.c:352
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: ../src/gtkdialogs.c:364
+#: ../src/gtkdialogs.c:370
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: ../src/gtkdialogs.c:570
-#: ../src/gtkdialogs.c:707
-#: ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:584
+#: ../src/gtkdialogs.c:721
+#: ../src/gtkdialogs.c:784
 msgid "_Name"
 msgstr "_Ime"
 
-#: ../src/gtkdialogs.c:575
-#: ../src/gtkdialogs.c:712
-#: ../src/gtkdialogs.c:775
+#: ../src/gtkdialogs.c:589
+#: ../src/gtkdialogs.c:726
+#: ../src/gtkdialogs.c:789
 msgid "_Account"
 msgstr "_Račun"
 
-#: ../src/gtkdialogs.c:583
+#: ../src/gtkdialogs.c:597
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: ../src/gtkdialogs.c:585
+#: ../src/gtkdialogs.c:599
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Vnesite vzdevek osebe, ki ji želite poslati neposredno sporočilo."
 
-#: ../src/gtkdialogs.c:720
+#: ../src/gtkdialogs.c:734
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: ../src/gtkdialogs.c:722
+#: ../src/gtkdialogs.c:736
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri si želite ogledati podatke."
 
-#: ../src/gtkdialogs.c:784
+#: ../src/gtkdialogs.c:798
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: ../src/gtkdialogs.c:786
+#: ../src/gtkdialogs.c:800
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri želite pridobiti dnevnik."
 
-#: ../src/gtkdialogs.c:805
+#: ../src/gtkdialogs.c:819
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: ../src/gtkdialogs.c:806
+#: ../src/gtkdialogs.c:820
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../src/gtkdialogs.c:808
-#: ../src/gtkdialogs.c:830
-#: ../src/gtkdialogs.c:850
+#: ../src/gtkdialogs.c:822
+#: ../src/gtkdialogs.c:844
+#: ../src/gtkdialogs.c:864
 #: ../src/gtkrequest.c:277
-#: ../src/protocols/silc/chat.c:586
+#: ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: ../src/gtkdialogs.c:826
+#: ../src/gtkdialogs.c:840
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: ../src/gtkdialogs.c:828
+#: ../src/gtkdialogs.c:842
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: ../src/gtkdialogs.c:847
+#: ../src/gtkdialogs.c:861
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: ../src/gtkdialogs.c:848
+#: ../src/gtkdialogs.c:862
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../src/gtkdialogs.c:885
+#: ../src/gtkdialogs.c:899
 #, 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 "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
@@ -3777,177 +3857,181 @@
 msgstr[2] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga prijatelja. Ali želite nadaljevati?"
 msgstr[3] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge prijatelje. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:893
+#: ../src/gtkdialogs.c:907
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: ../src/gtkdialogs.c:894
+#: ../src/gtkdialogs.c:908
 msgid "_Remove Contact"
 msgstr "_Odstrani stik"
 
-#: ../src/gtkdialogs.c:945
+#: ../src/gtkdialogs.c:959
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili skupino %s. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:948
+#: ../src/gtkdialogs.c:962
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: ../src/gtkdialogs.c:949
+#: ../src/gtkdialogs.c:963
 msgid "_Remove Group"
 msgstr "_Odstrani skupino"
 
-#: ../src/gtkdialogs.c:982
+#: ../src/gtkdialogs.c:996
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:985
+#: ../src/gtkdialogs.c:999
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: ../src/gtkdialogs.c:986
+#: ../src/gtkdialogs.c:1000
 msgid "_Remove Buddy"
 msgstr "_Odstrani prijatelja"
 
-#: ../src/gtkdialogs.c:1007
+#: ../src/gtkdialogs.c:1021
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:1010
+#: ../src/gtkdialogs.c:1024
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: ../src/gtkdialogs.c:1011
+#: ../src/gtkdialogs.c:1025
 msgid "_Remove Chat"
 msgstr "_Odstrani pomenek"
 
-#: ../src/gtkft.c:139
+#: ../src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: ../src/gtkft.c:160
+#: ../src/gtkft.c:153
+msgid "Not started"
+msgstr "Ni zagnano"
+
+#: ../src/gtkft.c:162
 #: ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Končano"
 
-#: ../src/gtkft.c:163
+#: ../src/gtkft.c:165
 #: ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: ../src/gtkft.c:166
+#: ../src/gtkft.c:168
 #: ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-#: ../src/gtkft.c:219
+#: ../src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Sprejemam kot:</b>"
 
-#: ../src/gtkft.c:221
+#: ../src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Sprejemam od:</b>"
 
-#: ../src/gtkft.c:225
-msgid "<b>Sending To:</b>"
-msgstr "<b>Pošiljam k:</b>"
-
 #: ../src/gtkft.c:227
+msgid "<b>Sending To:</b>"
+msgstr "<b>Pošiljam k:</b>"
+
+#: ../src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>Pošiljam kot:</b>"
 
-#: ../src/gtkft.c:443
+#: ../src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr "Za odpiranje datotek te vrste ni nastavljen noben program."
 
-#: ../src/gtkft.c:448
+#: ../src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "Med odpiranjem datoteke je prišlo do napake."
 
-#: ../src/gtkft.c:485
+#: ../src/gtkft.c:487
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Napaka pri zagonu %s: %s"
 
-#: ../src/gtkft.c:494
+#: ../src/gtkft.c:496
 #, c-format
 msgid "Error running %s"
 msgstr "Napaka pri uporabi %s"
 
-#: ../src/gtkft.c:495
+#: ../src/gtkft.c:497
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proces je vrnil kodo napake %d"
 
-#: ../src/gtkft.c:589
+#: ../src/gtkft.c:591
 msgid "Progress"
 msgstr "Potek"
 
-#: ../src/gtkft.c:596
+#: ../src/gtkft.c:598
 msgid "Filename"
 msgstr "Datoteka"
 
-#: ../src/gtkft.c:603
+#: ../src/gtkft.c:605
 msgid "Size"
 msgstr "Velikost"
 
-#: ../src/gtkft.c:610
+#: ../src/gtkft.c:612
 msgid "Remaining"
 msgstr "Preostanek"
 
-#: ../src/gtkft.c:641
-msgid "Filename:"
-msgstr "Datoteka:"
-
-#: ../src/gtkft.c:642
-msgid "Local File:"
-msgstr "Lokalna datoteka:"
-
 #: ../src/gtkft.c:643
-msgid "Status:"
-msgstr "Stanje:"
+msgid "Filename:"
+msgstr "Datoteka:"
 
 #: ../src/gtkft.c:644
-msgid "Speed:"
-msgstr "Hitrost:"
+msgid "Local File:"
+msgstr "Lokalna datoteka:"
 
 #: ../src/gtkft.c:645
-msgid "Time Elapsed:"
-msgstr "Porabljen čas:"
+msgid "Status:"
+msgstr "Stanje:"
 
 #: ../src/gtkft.c:646
+msgid "Speed:"
+msgstr "Hitrost:"
+
+#: ../src/gtkft.c:647
+msgid "Time Elapsed:"
+msgstr "Porabljen čas:"
+
+#: ../src/gtkft.c:648
 msgid "Time Remaining:"
 msgstr "Preostali čas:"
 
-#: ../src/gtkft.c:708
+#: ../src/gtkft.c:710
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: ../src/gtkft.c:731
+#: ../src/gtkft.c:733
 msgid "Close this window when all transfers _finish"
 msgstr "Zapri to okno po zaključku _vseh prenosov"
 
-#: ../src/gtkft.c:741
+#: ../src/gtkft.c:743
 msgid "C_lear finished transfers"
 msgstr "_Počisti dokončane prenose"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:750
+#: ../src/gtkft.c:752
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
 #. Pause button
-#: ../src/gtkft.c:780
+#: ../src/gtkft.c:782
 #: ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_Premor"
 
 #. Resume button
-#: ../src/gtkft.c:790
+#: ../src/gtkft.c:792
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
@@ -3959,41 +4043,39 @@
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834
-#: ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "Počisti oblikovanje"
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "_Počisti oblikovanje"
+
+#: ../src/gtkimhtml.c:1327
+msgid "Hyperlink color"
+msgstr "Barva povezave"
 
 #: ../src/gtkimhtml.c:1328
-msgid "Hyperlink color"
-msgstr "Barva povezave"
-
-#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "Barva za risanje povezav."
 
-#: ../src/gtkimhtml.c:1332
+#: ../src/gtkimhtml.c:1331
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
 
-#: ../src/gtkimhtml.c:1333
+#: ../src/gtkimhtml.c:1332
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Barva za risanje povezav, ko je nad njimi miška."
 
-#: ../src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj naslov e-pošte"
 
-#: ../src/gtkimhtml.c:1566
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: ../src/gtkimhtml.c:1576
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: ../src/gtkimhtml.c:3273
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -4003,7 +4085,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../src/gtkimhtml.c:3276
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -4013,7 +4095,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../src/gtkimhtml.c:3289
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -4024,7 +4106,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -4035,12 +4117,12 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372
-#: ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3371
+#: ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: ../src/gtkimhtml.c:3412
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
@@ -4131,6 +4213,10 @@
 msgid "Background color"
 msgstr "Barva ozadja"
 
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
+msgstr "Počisti oblikovanje"
+
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Vstavi povezavo"
@@ -4143,61 +4229,61 @@
 msgid "Insert smiley"
 msgstr "Vstavi smeškota"
 
-#: ../src/gtklog.c:188
+#: ../src/gtklog.c:207
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s o %s</span>"
 
-#: ../src/gtklog.c:193
+#: ../src/gtklog.c:212
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s glede %s</span>"
 
-#: ../src/gtklog.c:242
+#: ../src/gtklog.c:261
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:295
+#: ../src/gtklog.c:308
 msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
 msgstr "Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost \"Omogoči sistemski dnevnik\"."
 
-#: ../src/gtklog.c:299
+#: ../src/gtklog.c:312
 msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
 msgstr "Neposredna sporočila se bodo shranila, le če bo okljukana možnost \"Shranjuj vsa neposredna sporočila\"."
 
-#: ../src/gtklog.c:302
+#: ../src/gtklog.c:315
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost \"Shranjuj vse pomenke\"."
 
-#: ../src/gtklog.c:306
+#: ../src/gtklog.c:319
 msgid "No logs were found"
 msgstr "Ni najdenih dnevnikov."
 
-#: ../src/gtklog.c:382
+#: ../src/gtklog.c:398
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
-#: ../src/gtklog.c:458
+#: ../src/gtklog.c:464
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: ../src/gtklog.c:466
-#: ../src/gtklog.c:517
+#: ../src/gtklog.c:472
+#: ../src/gtklog.c:523
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: ../src/gtklog.c:542
+#: ../src/gtklog.c:548
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: ../src/gtkmain.c:308
+#: ../src/gtkmain.c:307
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Poskusi '%s -h' za več informacij.\n"
 
-#: ../src/gtkmain.c:310
+#: ../src/gtkmain.c:309
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4222,7 +4308,7 @@
 "                     določa račun(e) za prijavo, ločene z vejico)\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
-#: ../src/gtkmain.c:493
+#: ../src/gtkmain.c:492
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4258,28 +4344,28 @@
 "Podatki za stik z Seanom in Lukom prek drugih protokolov so na\n"
 "%scontactinfo.php.\n"
 
-#: ../src/gtknotify.c:327
+#: ../src/gtknotify.c:329
 msgid "New Mail"
 msgstr "Nova e-pošta"
 
-#: ../src/gtknotify.c:343
+#: ../src/gtknotify.c:345
 msgid "Open All Messages"
 msgstr "Odpri vsa sporočila"
 
-#: ../src/gtknotify.c:409
+#: ../src/gtknotify.c:411
 #: ../src/protocols/jabber/jabber.c:1115
 msgid "From"
 msgstr "Od"
 
-#: ../src/gtknotify.c:418
+#: ../src/gtknotify.c:420
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ../src/gtknotify.c:427
+#: ../src/gtknotify.c:429
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
 
-#: ../src/gtknotify.c:493
+#: ../src/gtknotify.c:495
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -4288,7 +4374,7 @@
 msgstr[2] "%s ima %d novi sporočili."
 msgstr[3] "%s ima %d nova sporočila."
 
-#: ../src/gtknotify.c:498
+#: ../src/gtknotify.c:500
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4299,41 +4385,39 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:685
-#: ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:688
+#: ../src/protocols/sametime/sametime.c:5451
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: ../src/gtknotify.c:841
-#: ../src/protocols/oscar/oscar.c:5061
+#: ../src/gtknotify.c:844
+#: ../src/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
-#: ../src/gtknotify.c:842
+#: ../src/gtknotify.c:845
 #: ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
-#. TODO: Change the bold tags to quotes when not in string freeze
-#: ../src/gtknotify.c:882
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "Ukaz brskalnika <b>%s</b> ni veljaven."
-
 #: ../src/gtknotify.c:884
-#: ../src/gtknotify.c:897
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Ukaz brskalnika \"%s\" ni veljaven."
+
+#: ../src/gtknotify.c:886
+#: ../src/gtknotify.c:898
 #: ../src/gtknotify.c:911
 #: ../src/gtknotify.c:1034
 msgid "Unable to open URL"
 msgstr "Ni bilo mogoče odprti URL"
 
-#. TODO: Change the bold tags to quotes when not in string freeze
-#: ../src/gtknotify.c:895
+#: ../src/gtknotify.c:896
 #: ../src/gtknotify.c:909
 #, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Napaka pri zaganjanju <b>%s</b>: %s"
+msgid "Error launching \"%s\": %s"
+msgstr "Napaka pri zagonu \"%s\": %s"
 
 #: ../src/gtknotify.c:1035
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
@@ -4381,185 +4465,185 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Podrobnosti o vstavku</b>"
 
-#: ../src/gtkpounce.c:162
+#: ../src/gtkpounce.c:154
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: ../src/gtkpounce.c:259
+#: ../src/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "Uredi opozorilo prijatelja"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../src/gtkpounce.c:512
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
-#: ../src/gtkpounce.c:547
+#: ../src/gtkpounce.c:539
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
+#: ../src/gtkpounce.c:565
 msgid "Pounce When Buddy..."
 msgstr "Opozori, ko se prijatelj ..."
 
-#: ../src/gtkpounce.c:581
+#: ../src/gtkpounce.c:573
 msgid "Si_gns on"
 msgstr "_prijavi"
 
-#: ../src/gtkpounce.c:583
+#: ../src/gtkpounce.c:575
 msgid "Signs o_ff"
 msgstr "_odjavi"
 
-#: ../src/gtkpounce.c:585
+#: ../src/gtkpounce.c:577
 msgid "Goes a_way"
 msgstr "postane od_soten"
 
-#: ../src/gtkpounce.c:587
+#: ../src/gtkpounce.c:579
 msgid "Ret_urns from away"
 msgstr "_vrne"
 
-#: ../src/gtkpounce.c:589
+#: ../src/gtkpounce.c:581
 msgid "Becomes _idle"
 msgstr "postane _nedejaven"
 
-#: ../src/gtkpounce.c:591
+#: ../src/gtkpounce.c:583
 msgid "Is no longer i_dle"
 msgstr "ni ve_č nedejaven."
 
-#: ../src/gtkpounce.c:593
+#: ../src/gtkpounce.c:585
 msgid "Starts _typing"
 msgstr "začne _tipkati"
 
-#: ../src/gtkpounce.c:595
+#: ../src/gtkpounce.c:587
 msgid "Stops t_yping"
 msgstr "_preneha tipkati"
 
-#: ../src/gtkpounce.c:597
+#: ../src/gtkpounce.c:589
 msgid "Sends a _message"
 msgstr "Pošlje spo_ročilo"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
+#: ../src/gtkpounce.c:621
 msgid "Action"
 msgstr "Dejanje"
 
-#: ../src/gtkpounce.c:637
+#: ../src/gtkpounce.c:629
 msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporočilno okno"
 
-#: ../src/gtkpounce.c:639
+#: ../src/gtkpounce.c:631
 msgid "_Pop up a notification"
 msgstr "_Prikaži obvestilo"
 
-#: ../src/gtkpounce.c:641
+#: ../src/gtkpounce.c:633
 msgid "Send a _message"
 msgstr "Pošlji spo_ročilo"
 
-#: ../src/gtkpounce.c:643
+#: ../src/gtkpounce.c:635
 msgid "E_xecute a command"
 msgstr "Izvr_ši ukaz"
 
-#: ../src/gtkpounce.c:645
+#: ../src/gtkpounce.c:637
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: ../src/gtkpounce.c:650
+#: ../src/gtkpounce.c:642
 msgid "Brows_e..."
 msgstr "Pre_rskaj ..."
 
-#: ../src/gtkpounce.c:652
+#: ../src/gtkpounce.c:644
 msgid "Br_owse..."
 msgstr "Preb_rskaj ..."
 
-#: ../src/gtkpounce.c:653
+#: ../src/gtkpounce.c:645
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
+#: ../src/gtkpounce.c:757
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../src/gtkpounce.c:773
+#: ../src/gtkpounce.c:765
 msgid "P_ounce only when my status is not available"
 msgstr "_Opozori le tedaj, ko moje stanje ni na voljo"
 
-#: ../src/gtkpounce.c:778
+#: ../src/gtkpounce.c:770
 msgid "_Recurring"
 msgstr "Ponavl_jajoč"
 
-#: ../src/gtkpounce.c:1092
+#: ../src/gtkpounce.c:1074
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Ste prepričani, da želite izbrisati obvestilo o %s za %s?"
 
-#: ../src/gtkpounce.c:1240
+#: ../src/gtkpounce.c:1222
 msgid "Pounce Target"
 msgstr "Tarča opozorila"
 
-#: ../src/gtkpounce.c:1275
+#: ../src/gtkpounce.c:1257
 msgid "Recurring"
 msgstr "Ponavljajoč"
 
-#: ../src/gtkpounce.c:1322
+#: ../src/gtkpounce.c:1304
 msgid "Buddy Pounces"
 msgstr "Opozorila prijatelja"
 
-#: ../src/gtkpounce.c:1449
+#: ../src/gtkpounce.c:1431
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je začel pisati"
 
-#: ../src/gtkpounce.c:1451
+#: ../src/gtkpounce.c:1433
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1435
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: ../src/gtkpounce.c:1455
+#: ../src/gtkpounce.c:1437
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: ../src/gtkpounce.c:1457
+#: ../src/gtkpounce.c:1439
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: ../src/gtkpounce.c:1459
+#: ../src/gtkpounce.c:1441
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../src/gtkpounce.c:1443
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: ../src/gtkpounce.c:1463
+#: ../src/gtkpounce.c:1445
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: ../src/gtkpounce.c:1465
+#: ../src/gtkpounce.c:1447
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
-#: ../src/gtkpounce.c:1466
+#: ../src/gtkpounce.c:1448
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
@@ -4577,8 +4661,8 @@
 
 #: ../src/gtkprefs.c:680
 #: ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818
-#: ../src/protocols/jabber/chat.c:769
+#: ../src/protocols/jabber/buddy.c:820
+#: ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "Opis"
 
@@ -4587,7 +4671,7 @@
 msgstr "Skrij nove po_govore IM"
 
 #: ../src/gtkprefs.c:824
-#: ../src/gtkprefs.c:1764
+#: ../src/gtkprefs.c:1779
 msgid "When away"
 msgstr "ob odsotnosti"
 
@@ -4669,8 +4753,8 @@
 msgstr "N_ovi pogovori:"
 
 #: ../src/gtkprefs.c:973
-#: ../src/protocols/oscar/oscar.c:869
-#: ../src/protocols/oscar/oscar.c:6172
+#: ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:3631
 msgid "IP Address"
 msgstr "Naslov IP"
 
@@ -4678,107 +4762,111 @@
 msgid "ST_UN server:"
 msgstr "Strežnik ST_UN:"
 
-#: ../src/gtkprefs.c:977
+#: ../src/gtkprefs.c:987
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
+
+#: ../src/gtkprefs.c:991
 msgid "_Autodetect IP address"
 msgstr "_Samozaznaj naslov IP"
 
-#: ../src/gtkprefs.c:986
+#: ../src/gtkprefs.c:1000
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: ../src/gtkprefs.c:1014
+#: ../src/gtkprefs.c:1029
 msgid "Ports"
 msgstr "Vrata"
 
-#: ../src/gtkprefs.c:1017
+#: ../src/gtkprefs.c:1032
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ročno določi obseg vrat za poslušanje"
 
-#: ../src/gtkprefs.c:1020
-msgid "_Start port:"
-msgstr "_Začetna vrata:"
-
-#: ../src/gtkprefs.c:1027
-msgid "_End port:"
-msgstr "_Končna vrata:"
-
 #: ../src/gtkprefs.c:1035
+msgid "_Start port:"
+msgstr "_Začetna vrata:"
+
+#: ../src/gtkprefs.c:1042
+msgid "_End port:"
+msgstr "_Končna vrata:"
+
+#: ../src/gtkprefs.c:1050
 msgid "Proxy Server"
 msgstr "Strežnik proxy"
 
-#: ../src/gtkprefs.c:1039
+#: ../src/gtkprefs.c:1054
 msgid "No proxy"
 msgstr "Brez strežnika proxy"
 
-#: ../src/gtkprefs.c:1095
+#: ../src/gtkprefs.c:1110
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: ../src/gtkprefs.c:1157
+#: ../src/gtkprefs.c:1172
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../src/gtkprefs.c:1158
+#: ../src/gtkprefs.c:1173
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../src/gtkprefs.c:1159
+#: ../src/gtkprefs.c:1174
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/gtkprefs.c:1160
+#: ../src/gtkprefs.c:1175
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/gtkprefs.c:1161
+#: ../src/gtkprefs.c:1176
 msgid "GNOME Default"
 msgstr "Privzeto za GNOME"
 
-#: ../src/gtkprefs.c:1162
+#: ../src/gtkprefs.c:1177
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/gtkprefs.c:1163
+#: ../src/gtkprefs.c:1178
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../src/gtkprefs.c:1164
+#: ../src/gtkprefs.c:1179
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../src/gtkprefs.c:1165
+#: ../src/gtkprefs.c:1180
 msgid "Opera"
 msgstr "Opera"
 
-#: ../src/gtkprefs.c:1174
+#: ../src/gtkprefs.c:1189
 msgid "Manual"
 msgstr "Ročni"
 
-#: ../src/gtkprefs.c:1227
+#: ../src/gtkprefs.c:1242
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: ../src/gtkprefs.c:1231
+#: ../src/gtkprefs.c:1246
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: ../src/gtkprefs.c:1239
+#: ../src/gtkprefs.c:1254
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: ../src/gtkprefs.c:1241
+#: ../src/gtkprefs.c:1256
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: ../src/gtkprefs.c:1242
+#: ../src/gtkprefs.c:1257
 msgid "Existing window"
 msgstr "Obstoječe okno"
 
-#: ../src/gtkprefs.c:1244
+#: ../src/gtkprefs.c:1259
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: ../src/gtkprefs.c:1258
+#: ../src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4787,85 +4875,85 @@
 "_Ročno:\n"
 "(%s namesto URL)"
 
-#: ../src/gtkprefs.c:1294
-#: ../src/gtkprefs.c:1875
+#: ../src/gtkprefs.c:1309
+#: ../src/gtkprefs.c:1890
 msgid "Logging"
 msgstr "Beleženje v dnevnik"
 
-#: ../src/gtkprefs.c:1297
+#: ../src/gtkprefs.c:1312
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: ../src/gtkprefs.c:1302
+#: ../src/gtkprefs.c:1317
 msgid "Log all _instant messages"
 msgstr "Shranjuj vsa _neposredna sporočila"
 
-#: ../src/gtkprefs.c:1304
+#: ../src/gtkprefs.c:1319
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: ../src/gtkprefs.c:1306
+#: ../src/gtkprefs.c:1321
 msgid "Log all _status changes to system log"
 msgstr "Beleži vse spremembe _stanja v sistemski dnevnik"
 
-#: ../src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1469
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: ../src/gtkprefs.c:1462
+#: ../src/gtkprefs.c:1477
 msgid "Quietest"
 msgstr "najtišje"
 
-#: ../src/gtkprefs.c:1464
+#: ../src/gtkprefs.c:1479
 msgid "Quieter"
 msgstr "tišje"
 
-#: ../src/gtkprefs.c:1466
+#: ../src/gtkprefs.c:1481
 msgid "Quiet"
 msgstr "tiho"
 
-#: ../src/gtkprefs.c:1468
+#: ../src/gtkprefs.c:1483
 #: ../src/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Navadno"
 
-#: ../src/gtkprefs.c:1470
+#: ../src/gtkprefs.c:1485
 msgid "Loud"
 msgstr "glasno"
 
-#: ../src/gtkprefs.c:1472
+#: ../src/gtkprefs.c:1487
 msgid "Louder"
 msgstr "glasneje"
 
-#: ../src/gtkprefs.c:1474
+#: ../src/gtkprefs.c:1489
 msgid "Loudest"
 msgstr "najglasneje"
 
-#: ../src/gtkprefs.c:1537
+#: ../src/gtkprefs.c:1552
 msgid "Sound Method"
 msgstr "Način zvoka"
 
-#: ../src/gtkprefs.c:1538
+#: ../src/gtkprefs.c:1553
 msgid "_Method:"
 msgstr "_Način:"
 
-#: ../src/gtkprefs.c:1540
+#: ../src/gtkprefs.c:1555
 msgid "Console beep"
 msgstr "Pisk"
 
-#: ../src/gtkprefs.c:1542
+#: ../src/gtkprefs.c:1557
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/gtkprefs.c:1547
+#: ../src/gtkprefs.c:1562
 msgid "Command"
 msgstr "Ukaz"
 
-#: ../src/gtkprefs.c:1548
+#: ../src/gtkprefs.c:1563
 msgid "No sounds"
 msgstr "Nemo"
 
-#: ../src/gtkprefs.c:1556
+#: ../src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4874,114 +4962,114 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: ../src/gtkprefs.c:1582
+#: ../src/gtkprefs.c:1597
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: ../src/gtkprefs.c:1583
+#: ../src/gtkprefs.c:1598
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: ../src/gtkprefs.c:1585
+#: ../src/gtkprefs.c:1600
 msgid "_Sounds while away"
 msgstr "_Zvoki, kadar sem odsoten"
 
-#: ../src/gtkprefs.c:1592
+#: ../src/gtkprefs.c:1607
 msgid "Volume:"
 msgstr "Glasnost:"
 
-#: ../src/gtkprefs.c:1620
+#: ../src/gtkprefs.c:1635
 msgid "Sound Events"
 msgstr "Zvočni Dogodki"
 
-#: ../src/gtkprefs.c:1671
+#: ../src/gtkprefs.c:1686
 msgid "Play"
 msgstr "Predvajaj"
 
-#: ../src/gtkprefs.c:1678
+#: ../src/gtkprefs.c:1693
 msgid "Event"
 msgstr "Dogodek"
 
-#: ../src/gtkprefs.c:1697
+#: ../src/gtkprefs.c:1712
 msgid "Test"
 msgstr "Preskus"
 
-#: ../src/gtkprefs.c:1701
+#: ../src/gtkprefs.c:1716
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: ../src/gtkprefs.c:1705
+#: ../src/gtkprefs.c:1720
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: ../src/gtkprefs.c:1747
+#: ../src/gtkprefs.c:1762
 msgid "_Report idle time:"
 msgstr "_Poročaj o času odsotnosti:"
 
-#: ../src/gtkprefs.c:1750
+#: ../src/gtkprefs.c:1765
 msgid "From last sent message"
 msgstr "Od nazadnje poslanega sporočila"
 
-#: ../src/gtkprefs.c:1752
+#: ../src/gtkprefs.c:1767
 msgid "Based on keyboard or mouse use"
 msgstr "Temelji na uporabi tipkovnice ali miške"
 
-#: ../src/gtkprefs.c:1761
+#: ../src/gtkprefs.c:1776
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: ../src/gtkprefs.c:1765
+#: ../src/gtkprefs.c:1780
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1771
+#: ../src/gtkprefs.c:1786
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: ../src/gtkprefs.c:1773
+#: ../src/gtkprefs.c:1788
 msgid "Change status when _idle"
 msgstr "Spremeni stanje ob _nedejavnosti"
 
-#: ../src/gtkprefs.c:1777
+#: ../src/gtkprefs.c:1792
 msgid "_Minutes before changing status:"
 msgstr "Število _minut pred spremembo stanja:"
 
-#: ../src/gtkprefs.c:1785
+#: ../src/gtkprefs.c:1800
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1806
+#: ../src/gtkprefs.c:1821
 msgid "Status at startup"
 msgstr "Stanje ob zagonu"
 
-#: ../src/gtkprefs.c:1808
+#: ../src/gtkprefs.c:1823
 msgid "Use status from last _exit at startup"
 msgstr "Ob zagonu uporabi stanje ob zadnjem _izhodu"
 
-#: ../src/gtkprefs.c:1814
+#: ../src/gtkprefs.c:1829
 msgid "Status to a_pply at startup:"
 msgstr "Stanje ob _zagonu:"
 
-#: ../src/gtkprefs.c:1865
+#: ../src/gtkprefs.c:1880
 msgid "Smiley Themes"
 msgstr "Teme za smeške"
 
-#: ../src/gtkprefs.c:1866
+#: ../src/gtkprefs.c:1881
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: ../src/gtkprefs.c:1867
-#: ../src/protocols/silc/silc.c:1851
+#: ../src/gtkprefs.c:1882
+#: ../src/protocols/silc/silc.c:1850
 msgid "Network"
 msgstr "Omrežje"
 
-#: ../src/gtkprefs.c:1872
+#: ../src/gtkprefs.c:1887
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: ../src/gtkprefs.c:1876
+#: ../src/gtkprefs.c:1891
 msgid "Away / Idle"
 msgstr "Odsotnost / Nedejavnost"
 
@@ -5074,25 +5162,30 @@
 msgid "Are you sure you want to block %s?"
 msgstr "Ste prepričani, da želite zavrniti %s?"
 
+#. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
 #: ../src/gtkrequest.c:267
 #: ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:559
-#: ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1921
+#: ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1919
 #: ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117
 #: ../src/protocols/silc/wb.c:303
+#: ../src/request.h:1335
 msgid "Yes"
 msgstr "Da"
 
 #: ../src/gtkrequest.c:268
 #: ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:559
-#: ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1922
+#: ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1920
 #: ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118
 #: ../src/protocols/silc/wb.c:304
+#: ../src/request.h:1335
 msgid "No"
 msgstr "Ne"
 
@@ -5102,7 +5195,7 @@
 
 #: ../src/gtkrequest.c:272
 #: ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:336
+#: ../src/protocols/silc/util.c:350
 msgid "Close"
 msgstr "Zapri"
 
@@ -5114,6 +5207,14 @@
 msgid "Would you like to overwrite it?"
 msgstr "Ali jo želite prepisati?"
 
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "Prepiši"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Izberite novo ime"
+
 #: ../src/gtkrequest.c:1512
 #: ../src/gtkrequest.c:1553
 msgid "Save File..."
@@ -5124,6 +5225,11 @@
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
+#: ../src/gtkrequest.c:1601
+#: ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Izberite mapo ..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Dodaj"
@@ -5144,8 +5250,8 @@
 
 #: ../src/gtksavedstatuses.c:433
 #: ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812
-#: ../src/protocols/novell/novell.c:1486
+#: ../src/protocols/jabber/buddy.c:814
+#: ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Naziv"
 
@@ -5153,16 +5259,15 @@
 msgid "Type"
 msgstr "Vrsta"
 
-#. Available status messages are plain text
 #: ../src/gtksavedstatuses.c:459
-#: ../src/gtksavedstatuses.c:920
+#: ../src/gtksavedstatuses.c:919
 #: ../src/protocols/bonjour/bonjour.c:256
 #: ../src/protocols/bonjour/bonjour.c:263
-#: ../src/protocols/gg/gg.c:1461
-#: ../src/protocols/gg/gg.c:1471
-#: ../src/protocols/gg/gg.c:1477
-#: ../src/protocols/gg/gg.c:1486
-#: ../src/protocols/gg/gg.c:1491
+#: ../src/protocols/gg/gg.c:1591
+#: ../src/protocols/gg/gg.c:1601
+#: ../src/protocols/gg/gg.c:1607
+#: ../src/protocols/gg/gg.c:1616
+#: ../src/protocols/gg/gg.c:1621
 #: ../src/protocols/irc/irc.c:227
 #: ../src/protocols/jabber/jabber.c:1182
 #: ../src/protocols/jabber/jabber.c:1192
@@ -5170,23 +5275,23 @@
 #: ../src/protocols/jabber/jabber.c:1212
 #: ../src/protocols/jabber/jabber.c:1222
 #: ../src/protocols/jabber/jabber.c:1234
-#: ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2974
-#: ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986
-#: ../src/protocols/oscar/oscar.c:7801
-#: ../src/protocols/oscar/oscar.c:7816
-#: ../src/protocols/oscar/oscar.c:7821
-#: ../src/protocols/oscar/oscar.c:8030
-#: ../src/protocols/oscar/oscar.c:8042
-#: ../src/protocols/sametime/sametime.c:3274
-#: ../src/protocols/sametime/sametime.c:3280
-#: ../src/protocols/sametime/sametime.c:3286
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/novell/novell.c:2866
+#: ../src/protocols/novell/novell.c:2972
+#: ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/novell/novell.c:2984
+#: ../src/protocols/oscar/oscar.c:5366
+#: ../src/protocols/oscar/oscar.c:5381
+#: ../src/protocols/oscar/oscar.c:5386
+#: ../src/protocols/oscar/oscar.c:5594
+#: ../src/protocols/oscar/oscar.c:5606
+#: ../src/protocols/sametime/sametime.c:3266
+#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/sametime/sametime.c:3278
+#: ../src/protocols/sametime/sametime.c:3357
 #: ../src/protocols/silc/buddy.c:1544
 #: ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3280
-#: ../src/protocols/yahoo/yahoo.c:3286
+#: ../src/protocols/yahoo/yahoo.c:3282
+#: ../src/protocols/yahoo/yahoo.c:3288
 #: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Sporočilo"
@@ -5197,7 +5302,7 @@
 
 #. Use button
 #: ../src/gtksavedstatuses.c:549
-#: ../src/gtksavedstatuses.c:1180
+#: ../src/gtksavedstatuses.c:1179
 msgid "_Use"
 msgstr "_Uporabi"
 
@@ -5209,117 +5314,114 @@
 msgid "Different"
 msgstr "Razno"
 
-#: ../src/gtksavedstatuses.c:909
-#: ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1444
-#: ../src/protocols/gg/gg.c:1448
-#: ../src/protocols/jabber/buddy.c:623
-#: ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641
+#: ../src/gtksavedstatuses.c:908
+#: ../src/gtksavedstatuses.c:1055
+#: ../src/protocols/gg/gg.c:1024
+#: ../src/protocols/gg/gg.c:1574
+#: ../src/protocols/gg/gg.c:1578
+#: ../src/protocols/jabber/buddy.c:625
+#: ../src/protocols/jabber/buddy.c:632
+#: ../src/protocols/jabber/buddy.c:643
 #: ../src/protocols/jabber/jabber.c:1153
-#: ../src/protocols/msn/msn.c:550
-#: ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871
-#: ../src/protocols/oscar/oscar.c:849
-#: ../src/protocols/oscar/oscar.c:855
-#: ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2882
+#: ../src/protocols/msn/msn.c:548
+#: ../src/protocols/novell/novell.c:2865
+#: ../src/protocols/novell/novell.c:2869
+#: ../src/protocols/oscar/oscar.c:775
+#: ../src/protocols/oscar/oscar.c:781
+#: ../src/protocols/oscar/oscar.c:784
+#: ../src/protocols/yahoo/yahoo.c:2878
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/gtksavedstatuses.c:1073
+#: ../src/gtksavedstatuses.c:1072
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: ../src/gtksavedstatuses.c:1092
-#: ../src/gtksavedstatuses.c:1413
+#: ../src/gtksavedstatuses.c:1091
+#: ../src/gtksavedstatuses.c:1412
 msgid "_Status:"
 msgstr "_Stanje:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1124
+#: ../src/gtksavedstatuses.c:1123
 msgid "Use a _different status for some accounts"
 msgstr "Za nekatere račune uporabi _različno stanje"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1188
+#: ../src/gtksavedstatuses.c:1187
 msgid "Sa_ve & Use"
 msgstr "Shra_ni in uporabi"
 
-#: ../src/gtksavedstatuses.c:1394
+#: ../src/gtksavedstatuses.c:1393
 #, c-format
 msgid "Status for %s"
 msgstr "Stanje za %s"
 
-#: ../src/gtksound.c:61
+#: ../src/gtksound.c:59
 msgid "Buddy logs in"
 msgstr "Prijatelj se prijavi"
 
-#: ../src/gtksound.c:62
+#: ../src/gtksound.c:60
 msgid "Buddy logs out"
 msgstr "Prijatelj se odjavi"
 
+#: ../src/gtksound.c:61
+msgid "Message received"
+msgstr "Sporočilo prejeto"
+
+#: ../src/gtksound.c:62
+msgid "Message received begins conversation"
+msgstr "Prejeto sporočilo začne pogovor"
+
 #: ../src/gtksound.c:63
-msgid "Message received"
-msgstr "Sporočilo prejeto"
+msgid "Message sent"
+msgstr "Sporočilo poslano"
 
 #: ../src/gtksound.c:64
-msgid "Message received begins conversation"
-msgstr "Prejeto sporočilo začne pogovor"
+msgid "Person enters chat"
+msgstr "Oseba se pridruži pogovorni sobi"
 
 #: ../src/gtksound.c:65
-msgid "Message sent"
-msgstr "Sporočilo poslano"
+msgid "Person leaves chat"
+msgstr "Oseba zapusti pogovorno sobo"
 
 #: ../src/gtksound.c:66
-msgid "Person enters chat"
-msgstr "Oseba se pridruži pogovorni sobi"
-
-#: ../src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "Oseba zapusti pogovorno sobo"
-
-#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Vi govorite v sobi"
 
-#: ../src/gtksound.c:69
+#: ../src/gtksound.c:67
 msgid "Others talk in chat"
 msgstr "Drugi govorijo v sobi"
 
-#: ../src/gtksound.c:72
-msgid "Someone says your name in chat"
+#: ../src/gtksound.c:70
+msgid "Someone says your screen name in chat"
 msgstr "Nekdo omeni vaše ime v sobi"
 
-#: ../src/gtksound.c:489
+#: ../src/gtksound.c:413
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Zvoka ni mogoče predvajati, ker izbrana datoteka (%s) ne obstaja."
 
-#: ../src/gtksound.c:505
+#: ../src/gtksound.c:429
 msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
 msgstr "Ni bilo mogoče predvajati zvoka, ker ste izbrali ukaz za predvajanje zvoka, niste pa nastavili ukaza."
 
-#: ../src/gtksound.c:517
+#: ../src/gtksound.c:441
 #, c-format
 msgid "Unable to play sound because the configured sound command could not be launched: %s"
 msgstr "Zvoka ni bilo mogoče predvajati, ker izbranega ukaza za zvok ni bilo mogoče pognati: %s"
 
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "Tipka"
-
 #. connect to the server
 #: ../src/gtkstatusbox.c:368
 #: ../src/protocols/irc/irc.c:313
 #: ../src/protocols/jabber/jabber.c:979
-#: ../src/protocols/msn/session.c:349
+#: ../src/protocols/msn/session.c:344
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183
-#: ../src/protocols/oscar/oscar.c:1938
-#: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594
-#: ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/novell/novell.c:2181
+#: ../src/protocols/oscar/oscar.c:1250
+#: ../src/protocols/sametime/sametime.c:3685
+#: ../src/protocols/simple/simple.c:1609
+#: ../src/protocols/yahoo/yahoo.c:2570
 #: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Povezovanje"
@@ -5418,60 +5520,70 @@
 msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
 msgstr "Povlekli ste namizni zaganjalnik. Najverjetneje ste želeli namesto samega zaganjalnika poslati tisto, na kar ta zaganjalnik kaže."
 
-#: ../src/log.c:167
+#: ../src/gtkwhiteboard.c:756
+#: ../src/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Shrani datoteko"
+
+#: ../src/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Izberite barvo"
+
+#: ../src/log.c:177
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Beleženje nima možnosti branja</font></b>"
 
-#: ../src/log.c:549
+#: ../src/log.c:558
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:560
+#: ../src/log.c:569
 msgid "Plain text"
 msgstr "Navadno besedilo"
 
-#: ../src/log.c:571
+#: ../src/log.c:580
 msgid "Old Gaim"
 msgstr "Stari Gaim"
 
-#: ../src/log.c:666
+#: ../src/log.c:675
 msgid "Logging of this conversation failed."
 msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
 
-#: ../src/log.c:1009
+#: ../src/log.c:1025
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1083
+#: ../src/log.c:1099
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1085
+#: ../src/log.c:1101
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1142
-#: ../src/log.c:1273
+#: ../src/log.c:1159
+#: ../src/log.c:1291
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče najti poti do dnevnika!</b></font>"
 
-#: ../src/log.c:1154
-#: ../src/log.c:1287
+#: ../src/log.c:1171
+#: ../src/log.c:1305
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče brati datoteke: %s</b></font>"
 
-#: ../src/log.c:1216
+#: ../src/log.c:1233
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
 #: ../src/plugin.c:281
+#: ../src/protocols/jabber/buddy.c:1384
 #: ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326
-#: ../src/protocols/oscar/oscar.c:5128
+#: ../src/protocols/msn/session.c:321
+#: ../src/protocols/oscar/oscar.c:2701
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -5526,7 +5638,7 @@
 msgstr "Povezave s krajevnim strežnikom mDNS ni mogoče vzpostaviti. Ali je strežnik sploh zagnan?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3251
+#: ../src/protocols/sametime/sametime.c:3243
 #, c-format
 msgid ""
 "\n"
@@ -5575,34 +5687,38 @@
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579
 #: ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2074
+#: ../src/protocols/msn/msn.c:2049
 #: ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643
-#: ../src/protocols/silc/silc.c:1859
+#: ../src/protocols/oscar/oscar.c:6470
+#: ../src/protocols/sametime/sametime.c:5635
+#: ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/toc/toc.c:2344
 msgid "Port"
 msgstr "Vrata"
 
 #: ../src/protocols/bonjour/bonjour.c:582
-#: ../src/protocols/gg/gg.c:605
-#: ../src/protocols/gg/gg.c:1015
+#: ../src/protocols/gg/gg.c:622
+#: ../src/protocols/jabber/jabber.c:770
 msgid "First name"
 msgstr "Ime"
 
 #: ../src/protocols/bonjour/bonjour.c:585
-#: ../src/protocols/gg/gg.c:600
+#: ../src/protocols/gg/gg.c:617
+#: ../src/protocols/jabber/jabber.c:775
 msgid "Last name"
 msgstr "Priimek"
 
 #: ../src/protocols/bonjour/bonjour.c:588
-#: ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779
-#: ../src/protocols/jabber/buddy.c:787
+#: ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:760
 #: ../src/protocols/silc/silc.c:699
 #: ../src/protocols/silc/silc.c:939
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
-msgid "Email"
-msgstr "Elektronska pošta"
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: ../src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr "Bonjour"
 
 #: ../src/protocols/bonjour/jabber.c:357
 #, c-format
@@ -5630,12 +5746,12 @@
 msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 
 #: ../src/protocols/gg/gg.c:76
-#: ../src/proxy.c:2336
+#: ../src/proxy.c:2346
 msgid "Invalid proxy settings"
 msgstr "Neveljavne proxy nastavitve"
 
 #: ../src/protocols/gg/gg.c:77
-#: ../src/proxy.c:2336
+#: ../src/proxy.c:2346
 msgid "Either the host name or port number specified for your given proxy type is invalid."
 msgstr "Bodisi ime strežnika bodisi vrata, ki ste ju navedli za proxy, so neveljavna."
 
@@ -5706,30 +5822,25 @@
 msgid "Registration completed successfully!"
 msgstr "Registracija je uspela!"
 
-#: ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "E-pošta"
-
 #: ../src/protocols/gg/gg.c:473
-#: ../src/protocols/gg/gg.c:747
+#: ../src/protocols/gg/gg.c:764
 #: ../src/protocols/jabber/jabber.c:749
 #: ../src/protocols/jabber/jabber.c:1307
 msgid "Password"
 msgstr "Geslo"
 
 #: ../src/protocols/gg/gg.c:478
-#: ../src/protocols/gg/gg.c:752
+#: ../src/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Geslo (ponovno vtipkajte)"
 
 #: ../src/protocols/gg/gg.c:483
-#: ../src/protocols/gg/gg.c:757
+#: ../src/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "Vnesite trenutni žeton"
 
 #: ../src/protocols/gg/gg.c:489
-#: ../src/protocols/gg/gg.c:763
+#: ../src/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "Trenutni žeton"
 
@@ -5742,24 +5853,18 @@
 msgid "Please, fill in the following fields"
 msgstr "Prosimo, izpolnite naslednja polja"
 
-#: ../src/protocols/gg/gg.c:590
-#: ../src/protocols/gg/gg.c:1657
-msgid "Unable to initiate a new search"
-msgstr "Novega iskanja ni mogoče začeti"
-
-#: ../src/protocols/gg/gg.c:591
-#: ../src/protocols/gg/gg.c:1658
-msgid "You have a pending search. Please wait for it to finish."
-msgstr "Imate iskanje na čakanju. Prosimo, da počakate na njegovo izvršitev."
-
-#: ../src/protocols/gg/gg.c:610
-#: ../src/protocols/gg/gg.c:1018
-#: ../src/protocols/gg/gg.c:2048
+#. General
+#: ../src/protocols/gg/gg.c:627
+#: ../src/protocols/gg/gg.c:1038
+#: ../src/protocols/gg/gg.c:1104
+#: ../src/protocols/gg/gg.c:2175
 #: ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695
-#: ../src/protocols/jabber/buddy.c:1402
+#: ../src/protocols/jabber/buddy.c:697
+#: ../src/protocols/jabber/buddy.c:1261
+#: ../src/protocols/jabber/buddy.c:1443
 #: ../src/protocols/jabber/jabber.c:765
-#: ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/msn/msn.c:1368
+#: ../src/protocols/msn/msn.c:1530
 #: ../src/protocols/silc/buddy.c:1528
 #: ../src/protocols/silc/ops.c:1036
 #: ../src/protocols/silc/ops.c:1179
@@ -5768,210 +5873,222 @@
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: ../src/protocols/gg/gg.c:615
-#: ../src/protocols/gg/gg.c:1021
+#: ../src/protocols/gg/gg.c:632
+#: ../src/protocols/gg/gg.c:1043
+#: ../src/protocols/gg/gg.c:1107
 #: ../src/protocols/jabber/jabber.c:785
-#: ../src/protocols/oscar/oscar.c:6218
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../src/protocols/oscar/oscar.c:3687
+#: ../src/protocols/oscar/oscar.c:3695
 msgid "City"
 msgstr "Kraj"
 
-#: ../src/protocols/gg/gg.c:620
+#: ../src/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Leto rojstva"
 
-#: ../src/protocols/gg/gg.c:623
-#: ../src/protocols/msn/msn.c:1541
-#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:640
+#: ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/oscar/oscar.c:3651
 #: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "Spol"
 
-#: ../src/protocols/gg/gg.c:624
+#: ../src/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Moški ali ženska"
 
-#: ../src/protocols/gg/gg.c:625
-#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:642
+#: ../src/protocols/oscar/oscar.c:3651
 msgid "Male"
 msgstr "Moški"
 
-#: ../src/protocols/gg/gg.c:626
-#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:643
+#: ../src/protocols/oscar/oscar.c:3651
 msgid "Female"
 msgstr "Ženska"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../src/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Le prisoten"
 
-#: ../src/protocols/gg/gg.c:634
-#: ../src/protocols/gg/gg.c:635
+#: ../src/protocols/gg/gg.c:651
+#: ../src/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Poišči prijatelje"
 
-#: ../src/protocols/gg/gg.c:636
+#: ../src/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "Spodaj vnesite svoje iskalne pogoje"
 
-#: ../src/protocols/gg/gg.c:673
+#: ../src/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "Izpolnite polja."
 
-#: ../src/protocols/gg/gg.c:685
+#: ../src/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "Vaše veljavno geslo se razlikuje od navedenega."
 
-#: ../src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occured.\n"
 msgstr "Gesla ni bilo mogoče spremeniti. Prišlo je do napake.\n"
 
-#: ../src/protocols/gg/gg.c:708
+#: ../src/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Spremeni geslo za račun Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "Geslo je bilo uspešno spremenjeno!"
 
-#: ../src/protocols/gg/gg.c:742
+#: ../src/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: ../src/protocols/gg/gg.c:767
+#: ../src/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Vnesite svoje obstoječe in novo geslo za UIN:"
 
-#: ../src/protocols/gg/gg.c:771
-#: ../src/protocols/gg/gg.c:772
+#: ../src/protocols/gg/gg.c:788
+#: ../src/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Spremeni geslo Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:846
+#: ../src/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Izberite klepet za prijatelja: %s"
 
-#: ../src/protocols/gg/gg.c:849
-#: ../src/protocols/gg/gg.c:850
+#: ../src/protocols/gg/gg.c:866
+#: ../src/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
-#: ../src/protocols/gg/gg.c:993
-msgid "No matching users found"
-msgstr "Ni najdenih uporabnikov"
-
-#: ../src/protocols/gg/gg.c:994
-msgid "There are no users matching your search criteria."
-msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
-
-#: ../src/protocols/gg/gg.c:1006
-#: ../src/protocols/gg/gg.c:1073
-#: ../src/protocols/oscar/oscar.c:6329
-msgid "Unable to display the search results."
-msgstr "Rezultatov iskanja ni mogoče izpisati."
-
-#: ../src/protocols/gg/gg.c:1012
-#: ../src/protocols/oscar/oscar.c:6164
+#: ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/gg/gg.c:1098
+#: ../src/protocols/oscar/oscar.c:3623
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:1024
-msgid "Birth year"
+#: ../src/protocols/gg/gg.c:1033
+#: ../src/protocols/gg/gg.c:1101
+#: ../src/protocols/jabber/buddy.c:1257
+#: ../src/protocols/jabber/buddy.c:1433
+#: ../src/protocols/oscar/oscar.c:3634
+#: ../src/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "Ime"
+
+#: ../src/protocols/gg/gg.c:1052
+#: ../src/protocols/gg/gg.c:1110
+msgid "Birth Year"
 msgstr "Leto rojstva"
 
-#: ../src/protocols/gg/gg.c:1064
+#: ../src/protocols/gg/gg.c:1092
+#: ../src/protocols/gg/gg.c:1161
+#: ../src/protocols/oscar/oscar.c:3798
+msgid "Unable to display the search results."
+msgstr "Rezultatov iskanja ni mogoče izpisati."
+
+#: ../src/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Javni imenik Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1065
+#: ../src/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Rezultati iskanja"
 
-#: ../src/protocols/gg/gg.c:1162
-#: ../src/protocols/gg/gg.c:1309
+#: ../src/protocols/gg/gg.c:1197
+msgid "No matching users found"
+msgstr "Ni najdenih uporabnikov"
+
+#: ../src/protocols/gg/gg.c:1198
+msgid "There are no users matching your search criteria."
+msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
+
+#: ../src/protocols/gg/gg.c:1292
+#: ../src/protocols/gg/gg.c:1439
 msgid "Unable to read socket"
 msgstr "Ne morem brati vtičnice"
 
-#: ../src/protocols/gg/gg.c:1245
+#: ../src/protocols/gg/gg.c:1375
 msgid "Buddy list downloaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: ../src/protocols/gg/gg.c:1246
+#: ../src/protocols/gg/gg.c:1376
 msgid "Your buddy list was downloaded from the server."
 msgstr "Vaš seznam prijateljev je bil prenesen s strežnika."
 
-#: ../src/protocols/gg/gg.c:1253
+#: ../src/protocols/gg/gg.c:1383
 msgid "Buddy list uploaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: ../src/protocols/gg/gg.c:1254
+#: ../src/protocols/gg/gg.c:1384
 msgid "Your buddy list was stored on the server."
 msgstr "Seznam prijateljev je bil shranjen na strežniku."
 
-#: ../src/protocols/gg/gg.c:1355
-#: ../src/protocols/gg/gg.c:1579
+#: ../src/protocols/gg/gg.c:1485
+#: ../src/protocols/gg/gg.c:1709
 msgid "Connection failed."
 msgstr "Povezava ni uspela."
 
-#: ../src/protocols/gg/gg.c:1485
-#: ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1615
+#: ../src/protocols/msn/msn.c:564
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
-#: ../src/protocols/gg/gg.c:1508
+#: ../src/protocols/gg/gg.c:1638
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
 
-#: ../src/protocols/gg/gg.c:1517
+#: ../src/protocols/gg/gg.c:1647
 msgid "Unblock"
 msgstr "Prekliči zavrnitev"
 
-#: ../src/protocols/gg/gg.c:1521
+#: ../src/protocols/gg/gg.c:1651
 msgid "Block"
 msgstr "Zavrni"
 
-#: ../src/protocols/gg/gg.c:1538
+#: ../src/protocols/gg/gg.c:1668
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#: ../src/protocols/gg/gg.c:1769
+#: ../src/protocols/gg/gg.c:1896
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
-#: ../src/protocols/gg/gg.c:1770
+#: ../src/protocols/gg/gg.c:1897
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-#: ../src/protocols/gg/gg.c:1853
+#: ../src/protocols/gg/gg.c:1980
 msgid "Not connected to the server."
 msgstr "S strežnikom niste povezani."
 
-#: ../src/protocols/gg/gg.c:1876
+#: ../src/protocols/gg/gg.c:2003
 msgid "Find buddies..."
 msgstr "Poišči prijatelje ..."
 
-#: ../src/protocols/gg/gg.c:1882
+#: ../src/protocols/gg/gg.c:2009
 msgid "Change password..."
 msgstr "Spremeni geslo ..."
 
-#: ../src/protocols/gg/gg.c:1888
+#: ../src/protocols/gg/gg.c:2015
 msgid "Upload buddylist to Server"
 msgstr "Izvozi seznam prijateljev na strežnik"
 
-#: ../src/protocols/gg/gg.c:1892
+#: ../src/protocols/gg/gg.c:2019
 msgid "Download buddylist from Server"
 msgstr "Uvozi seznam prijateljev s strežnika"
 
-#: ../src/protocols/gg/gg.c:1896
+#: ../src/protocols/gg/gg.c:2023
 msgid "Delete buddylist from Server"
 msgstr "Izbriši seznam prijateljev na strežniku"
 
-#: ../src/protocols/gg/gg.c:1900
+#: ../src/protocols/gg/gg.c:2027
 msgid "Save buddylist to file..."
 msgstr "Shrani seznam prijateljev v datoteko ..."
 
-#: ../src/protocols/gg/gg.c:1904
+#: ../src/protocols/gg/gg.c:2031
 msgid "Load buddylist from file..."
 msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
@@ -5986,35 +6103,35 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:2000
+#: ../src/protocols/gg/gg.c:2127
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Dodatek za protokol Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:2001
+#: ../src/protocols/gg/gg.c:2128
 msgid "Polish popular IM"
 msgstr "Olepšaj priljubljen program za neposredno sporočanje"
 
-#: ../src/protocols/gg/gg.c:2049
+#: ../src/protocols/gg/gg.c:2176
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
 #: ../src/protocols/irc/cmds.c:43
-#: ../src/protocols/silc/silc.c:1586
+#: ../src/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznan ukaz: %s"
 
 #: ../src/protocols/irc/cmds.c:482
-#: ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1294
+#: ../src/protocols/jabber/chat.c:590
+#: ../src/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "trenutna tema je: %s"
 
 #: ../src/protocols/irc/cmds.c:486
-#: ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1298
+#: ../src/protocols/jabber/chat.c:594
+#: ../src/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Ni teme"
 
@@ -6080,15 +6197,14 @@
 msgstr "Podpora SSL ni na voljo"
 
 #: ../src/protocols/irc/irc.c:333
-#: ../src/protocols/simple/simple.c:450
-#: ../src/protocols/simple/simple.c:1518
+#: ../src/protocols/simple/simple.c:452
+#: ../src/protocols/simple/simple.c:1521
 msgid "Couldn't create socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
 #: ../src/protocols/irc/irc.c:404
 #: ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1867
-#: ../src/protocols/oscar/oscar.c:1934
+#: ../src/protocols/oscar/oscar.c:1246
 msgid "Couldn't connect to host"
 msgstr "Povezava do gostitelja ni uspela"
 
@@ -6108,14 +6224,14 @@
 msgstr "Napaka pri branju"
 
 #: ../src/protocols/irc/irc.c:765
-#: ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/silc/chat.c:1421
 #: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Uporabniki"
 
 #: ../src/protocols/irc/irc.c:768
-#: ../src/protocols/sametime/sametime.c:3362
-#: ../src/protocols/silc/chat.c:1423
+#: ../src/protocols/sametime/sametime.c:3354
+#: ../src/protocols/silc/chat.c:1424
 #: ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
@@ -6140,13 +6256,16 @@
 
 #. host to connect to
 #: ../src/protocols/irc/irc.c:897
-#: ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/msgs.c:235
 #: ../src/protocols/jabber/jabber.c:1905
+#: ../src/protocols/msn/msn.c:2044
 #: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5638
+#: ../src/protocols/oscar/oscar.c:6467
+#: ../src/protocols/sametime/sametime.c:5630
 #: ../src/protocols/silc/ops.c:1242
 #: ../src/protocols/silc/ops.c:1344
-#: ../src/protocols/simple/simple.c:1754
+#: ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "Strežnik"
 
@@ -6155,7 +6274,7 @@
 msgstr "Kodiranje znakov"
 
 #: ../src/protocols/irc/irc.c:906
-#: ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/msgs.c:229
 #: ../src/protocols/jabber/jabber.c:745
 #: ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189
@@ -6167,6 +6286,8 @@
 msgstr "Uporabniško ime"
 
 #: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Resnično ime"
 
@@ -6178,212 +6299,210 @@
 msgid "Use SSL"
 msgstr "Uporabi SSL"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Neveljaven način"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Na kanalu %s ste prepovedani."
 
-#: ../src/protocols/irc/msgs.c:115
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Prepovedani"
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Prepovedati %s ni možno: seznam prepovedanih je poln"
 
-#: ../src/protocols/irc/msgs.c:211
-#: ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211
-#: ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/oscar/oscar.c:3624
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Vzdevek"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../src/protocols/irc/msgs.c:219
-#: ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226
-#: ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:223
+#: ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:226
-#: ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Realname"
-msgstr "Pravo ime"
-
-#: ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Trenutno na"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Nedejaven že:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Prijavljen od"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Ukrasni pridevek:</b> Supersploh<br>"
 
-#: ../src/protocols/irc/msgs.c:318
+#: ../src/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s je spremenil temo kanala na: %s"
 
-#: ../src/protocols/irc/msgs.c:325
+#: ../src/protocols/irc/msgs.c:331
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s je odstranil temo kanala."
+
+#: ../src/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Tema za kanal %s je: %s"
 
-#: ../src/protocols/irc/msgs.c:343
+#: ../src/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Neznano sporočilo '%s'"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../src/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Neznano sporočilo"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../src/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim je poslal sporočilo, ki ga IRC strežnik ni prepoznal."
 
-#: ../src/protocols/irc/msgs.c:367
+#: ../src/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uporabniki na %s: %s"
 
-#: ../src/protocols/irc/msgs.c:495
+#: ../src/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Časovni odziv"
 
-#: ../src/protocols/irc/msgs.c:496
+#: ../src/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "Krajevni čas strežnika IRC je:"
 
-#: ../src/protocols/irc/msgs.c:507
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Ta kanal ne obstaja"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:518
+#: ../src/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "ta kanal ne obstaja"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../src/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "Uporabnik ni prijavljen"
 
-#: ../src/protocols/irc/msgs.c:526
+#: ../src/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Tak kanal ali vzdevek ne obstaja"
 
-#: ../src/protocols/irc/msgs.c:546
+#: ../src/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Ni bilo mogoče poslati"
 
-#: ../src/protocols/irc/msgs.c:602
+#: ../src/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pridruževanje kanalu %s zahteva povabilo."
 
-#: ../src/protocols/irc/msgs.c:603
+#: ../src/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Samo na povabilo"
 
-#: ../src/protocols/irc/msgs.c:704
+#: ../src/protocols/irc/msgs.c:718
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Brcnil vas je %s: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:709
+#: ../src/protocols/irc/msgs.c:723
 #: ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Brcnil vas je %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:732
+#: ../src/protocols/irc/msgs.c:746
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "način (%s %s) nastavil %s"
 
-#: ../src/protocols/irc/msgs.c:817
-#: ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:831
+#: ../src/protocols/irc/msgs.c:832
 msgid "Invalid nickname"
 msgstr "Neveljaven vzdevek"
 
-#: ../src/protocols/irc/msgs.c:819
+#: ../src/protocols/irc/msgs.c:833
 msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr "Vaš izbrani vzdevek je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: ../src/protocols/irc/msgs.c:823
+#: ../src/protocols/irc/msgs.c:837
 msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "Vaše izbrano ime računa je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: ../src/protocols/irc/msgs.c:863
+#: ../src/protocols/irc/msgs.c:876
 msgid "Cannot change nick"
 msgstr "Vzdevka ne morem spremeniti"
 
-#: ../src/protocols/irc/msgs.c:863
+#: ../src/protocols/irc/msgs.c:876
 msgid "Could not change nick"
 msgstr "Vzdevka ni bilo mogoče spremeniti"
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../src/protocols/irc/msgs.c:897
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Zapustili ste kanal%s%s"
 
-#: ../src/protocols/irc/msgs.c:926
+#: ../src/protocols/irc/msgs.c:939
 msgid "Error: invalid PONG from server"
 msgstr "Napaka: Neveljaven PONG odgovor strežnika"
 
-#: ../src/protocols/irc/msgs.c:928
+#: ../src/protocols/irc/msgs.c:941
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor - Zakasnitev: %lu sekund"
 
-#: ../src/protocols/irc/msgs.c:1003
+#: ../src/protocols/irc/msgs.c:1022
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne morem se pridružiti %s:"
 
-#: ../src/protocols/irc/msgs.c:1004
+#: ../src/protocols/irc/msgs.c:1023
 #: ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne morem se pridružiti kanalu"
 
-#: ../src/protocols/irc/msgs.c:1038
+#: ../src/protocols/irc/msgs.c:1057
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nadimek ali kanal je trenutno nedostopen."
 
-#: ../src/protocols/irc/msgs.c:1050
+#: ../src/protocols/irc/msgs.c:1069
 #, c-format
 msgid "Wallops from %s"
 msgstr "Močni udarci od %s"
@@ -6532,7 +6651,6 @@
 
 #: ../src/protocols/irc/parse.c:542
 #: ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1774
 #: ../src/protocols/toc/toc.c:190
 #: ../src/protocols/toc/toc.c:688
 #: ../src/protocols/toc/toc.c:704
@@ -6597,19 +6715,19 @@
 msgstr "Napaka SASL"
 
 #: ../src/protocols/jabber/buddy.c:249
-#: ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/jabber/buddy.c:666
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Polno ime"
 
 #: ../src/protocols/jabber/buddy.c:250
-#: ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/jabber/buddy.c:679
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Družinsko ime"
 
 #: ../src/protocols/jabber/buddy.c:251
-#: ../src/protocols/jabber/buddy.c:681
+#: ../src/protocols/jabber/buddy.c:683
 msgid "Given Name"
 msgstr "Ime"
 
@@ -6619,201 +6737,231 @@
 msgstr "URL"
 
 #: ../src/protocols/jabber/buddy.c:254
-#: ../src/protocols/jabber/buddy.c:733
+#: ../src/protocols/jabber/buddy.c:735
 msgid "Street Address"
 msgstr "Naslov"
 
 #: ../src/protocols/jabber/buddy.c:255
-#: ../src/protocols/jabber/buddy.c:729
+#: ../src/protocols/jabber/buddy.c:731
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
 #: ../src/protocols/jabber/buddy.c:256
-#: ../src/protocols/jabber/buddy.c:737
+#: ../src/protocols/jabber/buddy.c:739
 msgid "Locality"
 msgstr "Okraj"
 
 #: ../src/protocols/jabber/buddy.c:257
-#: ../src/protocols/jabber/buddy.c:741
+#: ../src/protocols/jabber/buddy.c:743
 msgid "Region"
 msgstr "Regija"
 
 #: ../src/protocols/jabber/buddy.c:258
-#: ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
+#: ../src/protocols/jabber/buddy.c:747
 msgid "Postal Code"
 msgstr "Poštna številka"
 
 #: ../src/protocols/jabber/buddy.c:259
-#: ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/jabber/buddy.c:752
 #: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Država"
 
 #: ../src/protocols/jabber/buddy.c:260
-#: ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
+#: ../src/protocols/jabber/buddy.c:763
+#: ../src/protocols/jabber/buddy.c:770
 msgid "Telephone"
 msgstr "Telefon"
 
+#: ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/jabber/buddy.c:781
+#: ../src/protocols/jabber/buddy.c:789
+#: ../src/protocols/jabber/buddy.c:1263
+#: ../src/protocols/silc/ops.c:1075
+#: ../src/protocols/silc/util.c:526
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "E-pošta"
+
 #: ../src/protocols/jabber/buddy.c:262
-#: ../src/protocols/jabber/buddy.c:802
+#: ../src/protocols/jabber/buddy.c:804
 msgid "Organization Name"
 msgstr "Ime organizacije"
 
 #: ../src/protocols/jabber/buddy.c:263
-#: ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/jabber/buddy.c:808
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
 #: ../src/protocols/jabber/buddy.c:265
-#: ../src/protocols/jabber/buddy.c:815
+#: ../src/protocols/jabber/buddy.c:817
 msgid "Role"
 msgstr "Funkcija"
 
 #: ../src/protocols/jabber/buddy.c:266
-#: ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../src/protocols/jabber/buddy.c:700
+#: ../src/protocols/msn/msn.c:1589
+#: ../src/protocols/oscar/oscar.c:3667
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: ../src/protocols/jabber/buddy.c:567
-#: ../src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:570
 msgid "Edit Jabber vCard"
 msgstr "Urejanje Jabber vVizitke"
 
-#: ../src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:571
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "Vsa spodnja polja so izbirna. Vnesite samo informacije, ki jih želite."
 
-#: ../src/protocols/jabber/buddy.c:639
+#: ../src/protocols/jabber/buddy.c:641
 #: ../src/protocols/jabber/jabber.c:1908
 msgid "Resource"
 msgstr "Vir"
 
-#: ../src/protocols/jabber/buddy.c:685
+#: ../src/protocols/jabber/buddy.c:687
 #: ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Drugo ime"
 
-#: ../src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:720
 #: ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6217
-#: ../src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/oscar/oscar.c:3686
+#: ../src/protocols/oscar/oscar.c:3694
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Naslov"
 
-#: ../src/protocols/jabber/buddy.c:725
+#: ../src/protocols/jabber/buddy.c:727
 msgid "P.O. Box"
 msgstr "Poštni nabiralnik"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:841
 msgid "Photo"
 msgstr "Fotografija"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:841
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../src/protocols/jabber/buddy.c:1042
+#: ../src/protocols/jabber/buddy.c:1044
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
-#: ../src/protocols/jabber/buddy.c:1046
+#: ../src/protocols/jabber/buddy.c:1048
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
+#: ../src/protocols/jabber/buddy.c:1056
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
-#: ../src/protocols/jabber/buddy.c:1061
+#: ../src/protocols/jabber/buddy.c:1063
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1070
+#: ../src/protocols/jabber/buddy.c:1072
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: ../src/protocols/jabber/buddy.c:1097
-#: ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688
+#: ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686
 #: ../src/protocols/jabber/jabber.c:1165
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Napaka"
 
-#: ../src/protocols/jabber/buddy.c:1103
+#: ../src/protocols/jabber/buddy.c:1105
 #: ../src/protocols/jabber/jabber.c:1190
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: ../src/protocols/jabber/buddy.c:1107
+#: ../src/protocols/jabber/buddy.c:1109
 #: ../src/status.c:159
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: ../src/protocols/jabber/buddy.c:1109
+#: ../src/protocols/jabber/buddy.c:1111
 #: ../src/protocols/jabber/jabber.c:1220
-#: ../src/protocols/oscar/oscar.c:787
-#: ../src/protocols/oscar/oscar.c:8059
-#: ../src/protocols/sametime/sametime.c:3285
+#: ../src/protocols/oscar/oscar.c:713
+#: ../src/protocols/oscar/oscar.c:5623
+#: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
-#: ../src/protocols/jabber/buddy.c:1289
+#: ../src/protocols/jabber/buddy.c:1255
+msgid "JID"
+msgstr "JID"
+
+#: ../src/protocols/jabber/buddy.c:1259
+#: ../src/protocols/jabber/buddy.c:1438
+#: ../src/protocols/oscar/oscar.c:3635
+msgid "Last Name"
+msgstr "Priimek"
+
+#: ../src/protocols/jabber/buddy.c:1291
 msgid "The following are the results of your search"
 msgstr "To so rezultati vašega iskanja"
 
-#: ../src/protocols/jabber/buddy.c:1388
+#. current comment from Jabber User Directory users.jabber.org
+#: ../src/protocols/jabber/buddy.c:1366
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja dovoljujejo iskanje z nadomestnimi znaki (%)."
+
+#: ../src/protocols/jabber/buddy.c:1386
+msgid "Directory Query Failed"
+msgstr "Povpraševanje po imeniku ni uspelo"
+
+#: ../src/protocols/jabber/buddy.c:1387
+msgid "Could not query the directory server."
+msgstr "Povpraševanje na strežniku z imenikom ni uspelo."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../src/protocols/jabber/buddy.c:1421
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "Ukazi strežniku: %s"
+
+#: ../src/protocols/jabber/buddy.c:1428
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Izpolnite eno ali več polj za iskanje uporabnikov Jabberja."
 
-#: ../src/protocols/jabber/buddy.c:1392
-#: ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175
-#: ../src/protocols/silc/ops.c:1024
-msgid "First Name"
-msgstr "Ime"
-
-#: ../src/protocols/jabber/buddy.c:1397
-#: ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
-msgid "Last Name"
-msgstr "Priimek"
-
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../src/protocols/jabber/buddy.c:1448
+#: ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/oscar/oscar.c:3637
+#: ../src/protocols/oscar/oscar.c:3644
 msgid "E-Mail Address"
-msgstr "E-poštni Naslov"
-
-#: ../src/protocols/jabber/buddy.c:1416
-#: ../src/protocols/jabber/buddy.c:1417
+msgstr "E-naslov"
+
+#: ../src/protocols/jabber/buddy.c:1457
+#: ../src/protocols/jabber/buddy.c:1458
 msgid "Search for Jabber users"
 msgstr "Išči uporabnike Jabberja"
 
-#: ../src/protocols/jabber/buddy.c:1431
+#: ../src/protocols/jabber/buddy.c:1472
 msgid "Invalid Directory"
 msgstr "Neveljaven imenik"
 
-#: ../src/protocols/jabber/buddy.c:1448
+#: ../src/protocols/jabber/buddy.c:1489
 msgid "Enter a User Directory"
 msgstr "Vnesi uporabniški imenik"
 
-#: ../src/protocols/jabber/buddy.c:1449
+#: ../src/protocols/jabber/buddy.c:1490
 msgid "Select a user directory to search"
 msgstr "Izberite imenik za iskanje"
 
-#: ../src/protocols/jabber/buddy.c:1452
+#: ../src/protocols/jabber/buddy.c:1493
 msgid "Search Directory"
 msgstr "Imenik iskanja"
 
 #: ../src/protocols/jabber/chat.c:41
-#: ../src/protocols/oscar/oscar.c:7552
+#: ../src/protocols/oscar/oscar.c:5108
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Soba:"
@@ -6860,46 +7008,46 @@
 msgstr "Napaka pri nastavitvi"
 
 #: ../src/protocols/jabber/chat.c:404
-#: ../src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:547
 msgid "Unable to configure"
 msgstr "Ni mogoče nastaviti"
 
+#: ../src/protocols/jabber/chat.c:419
+msgid "Room Configuration Error"
+msgstr "Napaka pri nastavitvi sobe"
+
 #: ../src/protocols/jabber/chat.c:420
-msgid "Room Configuration Error"
-msgstr "Napaka pri nastavitvi sobe"
-
-#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Te sobe se ne da nastavljati"
 
-#: ../src/protocols/jabber/chat.c:471
-#: ../src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:469
+#: ../src/protocols/jabber/chat.c:538
 msgid "Registration error"
 msgstr "Napaka pri registraciji"
 
-#: ../src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:626
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Spreminjanje vzdevka v pogovornih sobah ne-MUC ni podprto"
 
-#: ../src/protocols/jabber/chat.c:678
-#: ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/jabber/chat.c:676
+#: ../src/protocols/jabber/chat.c:687
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Napaka pri pridobivanju sezama sob"
 
-#: ../src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:735
 msgid "Invalid Server"
 msgstr "Neveljaven strežnik"
 
-#: ../src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:773
 msgid "Enter a Conference Server"
 msgstr "Vnesite konferenčni strežnik"
 
-#: ../src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:774
 msgid "Select a conference server to query"
 msgstr "Izberite konferenčni strežnik za pogovor"
 
-#: ../src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:777
 msgid "Find Rooms"
 msgstr "Najdi sobe"
 
@@ -6954,15 +7102,19 @@
 msgstr "Že registriran"
 
 #: ../src/protocols/jabber/jabber.c:790
-#: ../src/protocols/oscar/oscar.c:6219
-#: ../src/protocols/oscar/oscar.c:6227
+#: ../src/protocols/oscar/oscar.c:3688
+#: ../src/protocols/oscar/oscar.c:3696
 msgid "State"
 msgstr "Zvezna država"
 
+#: ../src/protocols/jabber/jabber.c:795
+msgid "Postal code"
+msgstr "Poštna številka"
+
 #: ../src/protocols/jabber/jabber.c:800
 #: ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:701
-#: ../src/protocols/silc/util.c:514
+#: ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "Telefon"
 
@@ -6984,7 +7136,7 @@
 msgstr "Inicializacija toka"
 
 #: ../src/protocols/jabber/jabber.c:989
-#: ../src/protocols/msn/session.c:355
+#: ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Overovljanje"
 
@@ -6996,8 +7148,8 @@
 #: ../src/protocols/jabber/jabber.c:1434
 #: ../src/protocols/jabber/jabber.c:1475
 #: ../src/protocols/jabber/jabber.c:1509
-#: ../src/protocols/oscar/oscar.c:856
-#: ../src/protocols/oscar/oscar.c:7849
+#: ../src/protocols/oscar/oscar.c:782
+#: ../src/protocols/oscar/oscar.c:5414
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
@@ -7056,14 +7208,14 @@
 msgstr "Vnesite svoje novo geslo"
 
 #: ../src/protocols/jabber/jabber.c:1328
-#: ../src/protocols/oscar/oscar.c:8483
+#: ../src/protocols/oscar/oscar.c:6184
 #: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../src/protocols/jabber/jabber.c:1333
-#: ../src/protocols/oscar/oscar.c:8494
+#: ../src/protocols/oscar/oscar.c:6195
 #: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
@@ -7382,41 +7534,41 @@
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
 #: ../src/protocols/jabber/jabber.c:1929
-#: ../src/protocols/simple/simple.c:1760
+#: ../src/protocols/simple/simple.c:1775
 msgid "Connect port"
 msgstr "Poveži vrata"
 
 #. Account options
 #: ../src/protocols/jabber/jabber.c:1933
-#: ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "Poveži se na strežnik"
 
-#: ../src/protocols/jabber/message.c:108
+#: ../src/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Sporočilo od %s"
 
-#: ../src/protocols/jabber/message.c:172
+#: ../src/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s je spremenil temo na: %s"
 
-#: ../src/protocols/jabber/message.c:174
+#: ../src/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "Tema je: %s"
 
-#: ../src/protocols/jabber/message.c:224
+#: ../src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Dostava sporočila za uporabnika %s ni uspela: %s"
 
-#: ../src/protocols/jabber/message.c:227
+#: ../src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Napaka sporočila Jabber"
 
-#: ../src/protocols/jabber/message.c:295
+#: ../src/protocols/jabber/message.c:319
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koda %s)"
@@ -7436,14 +7588,14 @@
 msgstr "Uporabnik %s želi dodati %s na svoj seznam prijateljev."
 
 #: ../src/protocols/jabber/presence.c:323
-#: ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7482
+#: ../src/protocols/oscar/oscar.c:2381
+#: ../src/protocols/oscar/oscar.c:5039
 msgid "_Authorize"
 msgstr "_Pooblasti"
 
 #: ../src/protocols/jabber/presence.c:324
-#: ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7483
+#: ../src/protocols/oscar/oscar.c:2383
+#: ../src/protocols/oscar/oscar.c:5040
 msgid "_Deny"
 msgstr "_Zavrni"
 
@@ -7597,7 +7749,7 @@
 msgstr "Preveč zadetkov za FND"
 
 #: ../src/protocols/msn/error.c:112
-#: ../src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:148
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
@@ -7692,7 +7844,7 @@
 msgstr "Strežnik preveč zaposlen"
 
 #: ../src/protocols/msn/error.c:198
-#: ../src/protocols/oscar/oscar.c:2929
+#: ../src/protocols/oscar/oscar.c:1331
 #: ../src/protocols/silc/ops.c:1717
 #: ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
@@ -7784,12 +7936,12 @@
 msgid "Page"
 msgstr "Stran/Poziv"
 
-#: ../src/protocols/msn/msn.c:550
-#: ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566
-#: ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2882
-#: ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/msn/msn.c:548
+#: ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564
+#: ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2878
+#: ../src/protocols/yahoo/yahoo.c:2884
 #, c-format
 msgid ""
 "\n"
@@ -7798,86 +7950,86 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:555
 msgid "Has you"
 msgstr "Vas ima med prijatelji"
 
-#: ../src/protocols/msn/msn.c:587
+#: ../src/protocols/msn/msn.c:585
 #: ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2711
-#: ../src/protocols/yahoo/yahoo.c:3290
+#: ../src/protocols/yahoo/yahoo.c:2707
+#: ../src/protocols/yahoo/yahoo.c:3292
 msgid "Be Right Back"
 msgstr "Pridem precej nazaj"
 
-#: ../src/protocols/msn/msn.c:591
+#: ../src/protocols/msn/msn.c:589
 #: ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2851
-#: ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/novell/novell.c:2849
+#: ../src/protocols/novell/novell.c:2983
 #: ../src/protocols/silc/buddy.c:1473
 #: ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2713
-#: ../src/protocols/yahoo/yahoo.c:3293
+#: ../src/protocols/yahoo/yahoo.c:2709
+#: ../src/protocols/yahoo/yahoo.c:3295
 msgid "Busy"
 msgstr "Zaposlen"
 
-#: ../src/protocols/msn/msn.c:595
-#: ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3305
+#: ../src/protocols/msn/msn.c:593
+#: ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3307
 msgid "On the Phone"
 msgstr "Na telefonu"
 
-#: ../src/protocols/msn/msn.c:599
-#: ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/protocols/yahoo/yahoo.c:3311
+#: ../src/protocols/msn/msn.c:597
+#: ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3313
 msgid "Out to Lunch"
 msgstr "Na kosilu"
 
-#: ../src/protocols/msn/msn.c:623
+#: ../src/protocols/msn/msn.c:621
 msgid "Set Friendly Name..."
 msgstr "Nastavi poimenovanje ..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../src/protocols/msn/msn.c:626
 msgid "Set Home Phone Number..."
 msgstr "Nastavi št. domačega telefona ..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../src/protocols/msn/msn.c:630
 msgid "Set Work Phone Number..."
 msgstr "Nastavi št. službenega telefona ..."
 
-#: ../src/protocols/msn/msn.c:636
+#: ../src/protocols/msn/msn.c:634
 msgid "Set Mobile Phone Number..."
 msgstr "Nastavi št. mobilnega telefona ..."
 
-#: ../src/protocols/msn/msn.c:642
+#: ../src/protocols/msn/msn.c:640
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Omogoči/onemogoči mobilne naprave ..."
 
-#: ../src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:645
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Dovoli/prepovej mobilne strani ..."
 
-#: ../src/protocols/msn/msn.c:657
+#: ../src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
 msgstr "Odpri prispelo pošto Hotmail"
 
-#: ../src/protocols/msn/msn.c:681
+#: ../src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "Pošlji na mobilca"
 
-#: ../src/protocols/msn/msn.c:691
-#: ../src/protocols/novell/novell.c:3441
+#: ../src/protocols/msn/msn.c:689
+#: ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "Začni _pogovor"
 
-#: ../src/protocols/msn/msn.c:729
+#: ../src/protocols/msn/msn.c:727
 msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
 msgstr "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL. Več informacij na http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:757
+#: ../src/protocols/msn/msn.c:755
 msgid "Failed to connect to server."
 msgstr "Povezava na strežnik neuspešna."
 
-#: ../src/protocols/msn/msn.c:1366
+#: ../src/protocols/msn/msn.c:1361
 #: ../src/protocols/yahoo/yahoo_profile.c:685
 #: ../src/protocols/zephyr/zephyr.c:736
 #: ../src/protocols/zephyr/zephyr.c:1153
@@ -7886,100 +8038,255 @@
 msgstr "<b>Psevdonim:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/msn/msn.c:1825
+#: ../src/protocols/msn/msn.c:1368
 #: ../src/protocols/yahoo/yahoo_profile.c:1208
-#: ../src/util.c:1055
+#: ../src/util.c:1061
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1465
+#: ../src/protocols/msn/msn.c:1458
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: ../src/protocols/msn/msn.c:1470
-#: ../src/protocols/msn/msn.c:1809
+#: ../src/protocols/msn/msn.c:1463
+#: ../src/protocols/msn/msn.c:1789
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#: ../src/protocols/msn/msn.c:1540
-#: ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/msn/msn.c:1531
+#: ../src/protocols/oscar/oscar.c:3673
 #: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Starost"
 
-#: ../src/protocols/msn/msn.c:1542
+#: ../src/protocols/msn/msn.c:1533
 #: ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: ../src/protocols/msn/msn.c:1543
-#: ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1534
+#: ../src/protocols/novell/novell.c:1478
 #: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Lokacija"
 
-#: ../src/protocols/msn/msn.c:1548
-#: ../src/protocols/msn/msn.c:1738
-#: ../src/protocols/msn/msn.c:1744
-#: ../src/protocols/msn/msn.c:1751
+#: ../src/protocols/msn/msn.c:1539
+#: ../src/protocols/msn/msn.c:1718
+#: ../src/protocols/msn/msn.c:1724
+#: ../src/protocols/msn/msn.c:1731
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: ../src/protocols/msn/msn.c:1554
-#: ../src/protocols/msn/msn.c:1672
-#: ../src/protocols/msn/msn.c:1678
-#: ../src/protocols/msn/msn.c:1685
-#: ../src/protocols/msn/msn.c:1693
-#: ../src/protocols/msn/msn.c:1700
+#: ../src/protocols/msn/msn.c:1545
+#: ../src/protocols/msn/msn.c:1652
+#: ../src/protocols/msn/msn.c:1658
+#: ../src/protocols/msn/msn.c:1665
+#: ../src/protocols/msn/msn.c:1673
+#: ../src/protocols/msn/msn.c:1680
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
+#: ../src/protocols/msn/msn.c:1551
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>Splošno</b><br>%s"
+
 #. Social
-#: ../src/protocols/msn/msn.c:1572
+#: ../src/protocols/msn/msn.c:1560
 #: ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: ../src/protocols/msn/msn.c:1582
-#: ../src/protocols/msn/msn.c:1760
-#: ../src/protocols/msn/msn.c:1766
+#: ../src/protocols/msn/msn.c:1561
+msgid "Interests"
+msgstr "Zanimanja"
+
+#: ../src/protocols/msn/msn.c:1562
+msgid "Pets"
+msgstr "Domači ljubljenčki"
+
+#: ../src/protocols/msn/msn.c:1563
+msgid "Hometown"
+msgstr "Domači kraj"
+
+#: ../src/protocols/msn/msn.c:1564
+msgid "Places Lived"
+msgstr "Dosedanji kraji bivanja"
+
+#: ../src/protocols/msn/msn.c:1565
+msgid "Fashion"
+msgstr "Moda"
+
+#: ../src/protocols/msn/msn.c:1566
+msgid "Humor"
+msgstr "Humor"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Music"
+msgstr "Glasba"
+
+#: ../src/protocols/msn/msn.c:1568
+#: ../src/protocols/msn/msn.c:1740
+#: ../src/protocols/msn/msn.c:1746
 #: ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "Najljubši citat"
 
+#: ../src/protocols/msn/msn.c:1572
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>Družabno</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1581
+msgid "Significant Other"
+msgstr "Boljša polovica"
+
+#: ../src/protocols/msn/msn.c:1582
+msgid "Home Phone"
+msgstr "Domači telefon"
+
+#: ../src/protocols/msn/msn.c:1583
+msgid "Home Phone 2"
+msgstr "Domači telefon 2"
+
+#: ../src/protocols/msn/msn.c:1584
+#: ../src/protocols/oscar/oscar.c:3685
+msgid "Home Address"
+msgstr "Domači naslov"
+
+#: ../src/protocols/msn/msn.c:1585
+msgid "Personal Mobile"
+msgstr "Osebni mobilni tel."
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Home Fax"
+msgstr "Domači faks"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Personal E-Mail"
+msgstr "Osebni e-naslov"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Personal IM"
+msgstr "Osebni IM"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Anniversary"
+msgstr "Obletnica"
+
+#: ../src/protocols/msn/msn.c:1591
+#: ../src/protocols/msn/msn.c:1615
+msgid "Notes"
+msgstr "Opombe"
+
+#: ../src/protocols/msn/msn.c:1595
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Osebno</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1602
+#: ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "Naziv službe"
+
+#: ../src/protocols/msn/msn.c:1603
+#: ../src/protocols/oscar/oscar.c:3702
+msgid "Company"
+msgstr "Podjetje"
+
+#: ../src/protocols/msn/msn.c:1604
+#: ../src/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "Oddelek"
+
+#: ../src/protocols/msn/msn.c:1605
+msgid "Profession"
+msgstr "Poklic"
+
+#: ../src/protocols/msn/msn.c:1606
+msgid "Work Phone"
+msgstr "Službeni telefon"
+
+#: ../src/protocols/msn/msn.c:1607
+msgid "Work Phone 2"
+msgstr "Službeni telefon 2"
+
+#: ../src/protocols/msn/msn.c:1608
+#: ../src/protocols/oscar/oscar.c:3693
+msgid "Work Address"
+msgstr "Službeni naslov"
+
+#: ../src/protocols/msn/msn.c:1609
+msgid "Work Mobile"
+msgstr "Službeni mobilni tel."
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Work Pager"
+msgstr "Službeni pager"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Fax"
+msgstr "Službeni faks"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work E-Mail"
+msgstr "Službeni e-naslov"
+
+#: ../src/protocols/msn/msn.c:1613
+msgid "Work IM"
+msgstr "Službeni IM"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Start Date"
+msgstr "Datum pričetka"
+
+#: ../src/protocols/msn/msn.c:1619
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Poslovno</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1630
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>Podatki o stiku</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1689
+#: ../src/protocols/msn/msn.c:1695
+#: ../src/protocols/msn/msn.c:1702
 #: ../src/protocols/msn/msn.c:1709
-#: ../src/protocols/msn/msn.c:1715
-#: ../src/protocols/msn/msn.c:1722
-#: ../src/protocols/msn/msn.c:1729
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: ../src/protocols/msn/msn.c:1774
+#: ../src/protocols/msn/msn.c:1754
 msgid "Last Updated"
 msgstr "Nazadnje osveženo"
 
-#: ../src/protocols/msn/msn.c:1786
+#: ../src/protocols/msn/msn.c:1766
 #: ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Domača stran"
 
-#: ../src/protocols/msn/msn.c:1811
+#: ../src/protocols/msn/msn.c:1791
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: ../src/protocols/msn/msn.c:1812
+#: ../src/protocols/msn/msn.c:1792
 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 public profile."
 msgstr "MSN ne more najti uporabnikovega profila. To lahko pomeni, da uporabnik ne obstaja, ali pa še ni ustvaril javnega profila."
 
-#: ../src/protocols/msn/msn.c:1816
+#: ../src/protocols/msn/msn.c:1796
 msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
 msgstr "Gaim v uporabnikovem profilu ne more najti informacij. Uporabnik verjetno ne obstaja."
 
-#: ../src/protocols/msn/msn.c:1822
-#: ../src/protocols/msn/msn.c:1825
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1801
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1801
 #: ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "URL profila"
@@ -7994,24 +8301,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2048
-#: ../src/protocols/msn/msn.c:2050
+#: ../src/protocols/msn/msn.c:2023
+#: ../src/protocols/msn/msn.c:2025
 msgid "MSN Protocol Plugin"
 msgstr "Vstavek za protokol MSN"
 
-#: ../src/protocols/msn/msn.c:2069
-msgid "Login server"
-msgstr "Prijavni strežnik"
-
-#: ../src/protocols/msn/msn.c:2078
+#: ../src/protocols/msn/msn.c:2053
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
-#: ../src/protocols/msn/msn.c:2083
+#: ../src/protocols/msn/msn.c:2058
 msgid "Show custom smileys"
 msgstr "Pokaži smeške po meri ..."
 
-#: ../src/protocols/msn/msn.c:2091
+#: ../src/protocols/msn/msn.c:2066
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
@@ -8029,7 +8332,7 @@
 
 #: ../src/protocols/msn/notification.c:184
 #: ../src/protocols/msn/notification.c:532
-#: ../src/protocols/msn/session.c:334
+#: ../src/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Neznana napaka."
 
@@ -8067,15 +8370,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Storitev je trenutno nedosegljiva."
 
-#: ../src/protocols/msn/notification.c:821
+#: ../src/protocols/msn/notification.c:820
 msgid "Unable to rename group"
 msgstr "Skupine ni mogoče preimenovati"
 
-#: ../src/protocols/msn/notification.c:876
+#: ../src/protocols/msn/notification.c:875
 msgid "Unable to delete group"
 msgstr "Skupine ni mogoče izbrisati"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../src/protocols/msn/notification.c:1308
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
@@ -8119,63 +8422,63 @@
 "Napaka povezave s strežnika %s:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:304
+#: ../src/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Strežnik ne podpira tega protokola."
 
-#: ../src/protocols/msn/session.c:308
+#: ../src/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Napaka pri parsanju HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312
+#: ../src/protocols/msn/session.c:307
 #: ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5881
-#: ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/oscar/oscar.c:3416
+#: ../src/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
 
-#: ../src/protocols/msn/session.c:315
+#: ../src/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
 
-#: ../src/protocols/msn/session.c:320
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Strežniki MSN se bodo začasno zaustavili."
 
 #  Data is assumed to be the destination sn
-#: ../src/protocols/msn/session.c:324
+#: ../src/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ni možno overoviti: %s"
 
-#: ../src/protocols/msn/session.c:329
+#: ../src/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "Vaš seznam prijateljev MSN je trenutno nedostopen. Prosimo počakajte in poskusite znova."
 
-#: ../src/protocols/msn/session.c:350
-#: ../src/protocols/msn/session.c:352
+#: ../src/protocols/msn/session.c:345
+#: ../src/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Rokovanje"
 
-#: ../src/protocols/msn/session.c:351
+#: ../src/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Prenos je v teku"
 
-#: ../src/protocols/msn/session.c:353
+#: ../src/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Pričetek overovitve"
 
-#: ../src/protocols/msn/session.c:354
+#: ../src/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Pridobivanje piškotka"
 
-#: ../src/protocols/msn/session.c:356
+#: ../src/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Pošljanje piškotka"
 
-#: ../src/protocols/msn/session.c:357
+#: ../src/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
@@ -8191,35 +8494,35 @@
 msgid "Out To Lunch"
 msgstr "Na kosilu"
 
-#: ../src/protocols/msn/switchboard.c:406
+#: ../src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do časovne prekoračitve:"
 
-#: ../src/protocols/msn/switchboard.c:414
+#: ../src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Sporočila ni mogoče poslati, saj ni dovoljeno v nevidnem stanju:"
 
-#: ../src/protocols/msn/switchboard.c:418
+#: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
 msgstr "Sporočila ni mogoče poslati, saj uporabnik ni na zvezi:"
 
-#: ../src/protocols/msn/switchboard.c:422
+#: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Sporočilo ni bilo poslano, ker je prišlo do napake v povezavi:"
 
-#: ../src/protocols/msn/switchboard.c:426
+#: ../src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Sporočila ni mogoče poslati, saj je poslano prehitro:"
 
-#: ../src/protocols/msn/switchboard.c:430
+#: ../src/protocols/msn/switchboard.c:425
 msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Sporočila ni bilo poslano, ker je prišlo do napake v stikalni plošči:"
 
-#: ../src/protocols/msn/switchboard.c:438
+#: ../src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do neznane napake:"
 
-#: ../src/protocols/msn/switchboard.c:959
+#: ../src/protocols/msn/switchboard.c:953
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vam je ravnokar poslal mežik!"
@@ -8230,12 +8533,12 @@
 msgstr "Uporabnik %s (%s) želi dodati %s na svoj seznam prijateljev."
 
 #: ../src/protocols/msn/userlist.c:111
-#: ../src/protocols/yahoo/yahoo.c:915
+#: ../src/protocols/yahoo/yahoo.c:913
 msgid "Authorize"
 msgstr "Pooblasti"
 
 #: ../src/protocols/msn/userlist.c:112
-#: ../src/protocols/yahoo/yahoo.c:917
+#: ../src/protocols/yahoo/yahoo.c:915
 msgid "Deny"
 msgstr "Zavrni"
 
@@ -8249,12 +8552,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
 
-#: ../src/protocols/msn/userlist.c:679
+#: ../src/protocols/msn/userlist.c:667
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ni bilo mogoče dodati."
 
-#: ../src/protocols/msn/userlist.c:681
+#: ../src/protocols/msn/userlist.c:669
 msgid "The screen name specified is invalid."
 msgstr "Navedeno zaslonsko ime ni veljavno."
 
@@ -8298,10 +8601,10 @@
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:543
 #: ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2239
-#: ../src/protocols/yahoo/yahoo.c:2266
-#: ../src/protocols/yahoo/yahoo.c:2349
-#: ../src/protocols/yahoo/yahoo.c:2364
+#: ../src/protocols/yahoo/yahoo.c:2237
+#: ../src/protocols/yahoo/yahoo.c:2264
+#: ../src/protocols/yahoo/yahoo.c:2347
+#: ../src/protocols/yahoo/yahoo.c:2362
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8471,7 +8774,7 @@
 msgstr "Sporočila (%s) ni mogoče poslati."
 
 #: ../src/protocols/novell/novell.c:493
-#: ../src/protocols/novell/novell.c:987
+#: ../src/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ni bilo moč povabiti uporabnika (%s)."
@@ -8523,44 +8826,34 @@
 msgstr "%s ni moč odstraniti s seznama zasebnosti (%s)."
 
 #: ../src/protocols/novell/novell.c:942
-#: ../src/protocols/novell/novell.c:1654
+#: ../src/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ni mogoče spremeniti strežniških nastavitve zasebnosti (%s)."
 
-#: ../src/protocols/novell/novell.c:1014
+#: ../src/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ni mogoče ustvariti konference (%s)."
 
-#: ../src/protocols/novell/novell.c:1123
-#: ../src/protocols/novell/novell.c:1693
+#: ../src/protocols/novell/novell.c:1121
+#: ../src/protocols/novell/novell.c:1691
 msgid "Error communicating with server. Closing connection."
 msgstr "Napaka pri komunikaciji s strežnikom. Zapiranje povezave."
 
-#: ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonska številka"
 
 #: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Oddelek"
-
-#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Osebni naziv"
 
-#: ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "StojPošta"
 
-#: ../src/protocols/novell/novell.c:1490
-#: ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "Elektronski naslov"
-
-#: ../src/protocols/novell/novell.c:1506
+#: ../src/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "Uporabniška št."
 
@@ -8571,41 +8864,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520
+#: ../src/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Polno ime"
 
-#: ../src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konferenca GroupWise %d"
 
-#: ../src/protocols/novell/novell.c:1669
+#: ../src/protocols/novell/novell.c:1667
 msgid "Unable to make SSL connection to server."
 msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
 
-#: ../src/protocols/novell/novell.c:1726
+#: ../src/protocols/novell/novell.c:1724
 msgid "Authenticating..."
 msgstr "Overovljanje ..."
 
-#: ../src/protocols/novell/novell.c:1738
+#: ../src/protocols/novell/novell.c:1736
 msgid "Unable to connect to server."
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: ../src/protocols/novell/novell.c:1741
+#: ../src/protocols/novell/novell.c:1739
 msgid "Waiting for response..."
 msgstr "Čakanje odgovora ..."
 
-#: ../src/protocols/novell/novell.c:1876
+#: ../src/protocols/novell/novell.c:1874
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s je bil povabljen na ta pomenek."
 
-#: ../src/protocols/novell/novell.c:1904
+#: ../src/protocols/novell/novell.c:1902
 msgid "Invitation to Conversation"
 msgstr "Povabilo na pomenek"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../src/protocols/novell/novell.c:1903
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8616,15 +8909,15 @@
 "\n"
 "Poslano: %s"
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1905
 msgid "Would you like to join the conversation?"
 msgstr "Se želite pridružiti pomenku?"
 
-#: ../src/protocols/novell/novell.c:2014
+#: ../src/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../src/protocols/novell/novell.c:2068
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ni na zvezi in ni sprejel sporočila, ki ste ga pravkar poslali."
@@ -8633,15 +8926,15 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../src/protocols/novell/novell.c:2166
 msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr "Ni se mogoče povezati na strežnik. Vnesite naslov strežnika, na katerega se želite povezati."
 
-#: ../src/protocols/novell/novell.c:2190
+#: ../src/protocols/novell/novell.c:2188
 msgid "Error. SSL support is not installed."
 msgstr "Napaka. Podpora SSL ni nameščena."
 
-#: ../src/protocols/novell/novell.c:2499
+#: ../src/protocols/novell/novell.c:2497
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferenca je bila zaprta. Spročil se ne da pošiljati več.več."
 
@@ -8655,476 +8948,374 @@
 #. *< version
 #. *  summary
 #. *  description
+#: ../src/protocols/novell/novell.c:3541
 #: ../src/protocols/novell/novell.c:3543
-#: ../src/protocols/novell/novell.c:3545
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Vstavek za protokol Novell GroupWise Messenger"
 
-#: ../src/protocols/novell/novell.c:3564
+#: ../src/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: ../src/protocols/novell/novell.c:3568
+#: ../src/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-#: ../src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "Neveljavna napaka"
 
-#: ../src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:145
 msgid "Invalid SNAC"
 msgstr "Neveljaven SNAC"
 
-#: ../src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:146
 msgid "Rate to host"
 msgstr "Prenos do gostitelja"
 
-#: ../src/protocols/oscar/oscar.c:206
+#: ../src/protocols/oscar/oscar.c:147
 msgid "Rate to client"
 msgstr "Prenos do odjemalca"
 
-#: ../src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:149
 msgid "Service unavailable"
 msgstr "Storitev ni dostopna"
 
-#: ../src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:150
 msgid "Service not defined"
 msgstr "Storitev nedefinirana"
 
-#: ../src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:151
 msgid "Obsolete SNAC"
 msgstr "Zastarel SNAC"
 
-#: ../src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:152
 msgid "Not supported by host"
 msgstr "Gostitelj ne podpira"
 
-#: ../src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:153
 msgid "Not supported by client"
 msgstr "Odjemalec ne podpira"
 
-#: ../src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:154
 msgid "Refused by client"
 msgstr "Odjemalec je zavrnil"
 
-#: ../src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:155
 msgid "Reply too big"
 msgstr "Odgovor prevelik"
 
-#: ../src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:156
 msgid "Responses lost"
 msgstr "Odgovori so se izgubili"
 
-#: ../src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:157
 msgid "Request denied"
 msgstr "Zahteva zavrnjena"
 
-#: ../src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:158
 msgid "Busted SNAC payload"
 msgstr "Odkrit SNAC podatek"
 
-#: ../src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:159
 msgid "Insufficient rights"
 msgstr "Premalo pravic"
 
-#: ../src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:160
 msgid "In local permit/deny"
 msgstr "V lokalnem dovoljenju/prepovedi"
 
-#: ../src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:161
 msgid "Too evil (sender)"
 msgstr "Preveč zloben (pošiljatelj)"
 
-#: ../src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:162
 msgid "Too evil (receiver)"
 msgstr "Preveč zloben (prejemnik)"
 
-#: ../src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:163
 msgid "User temporarily unavailable"
 msgstr "Uporabnik začasno ni dostopen"
 
-#: ../src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:164
 msgid "No match"
 msgstr "Ni zadetka"
 
-#: ../src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:165
 msgid "List overflow"
 msgstr "Prekoračitev seznama"
 
-#: ../src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:166
 msgid "Request ambiguous"
 msgstr "Zahteva nejasna"
 
-#: ../src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:167
 msgid "Queue full"
 msgstr "Čakalna vrsta je polna"
 
-#: ../src/protocols/oscar/oscar.c:227
+#: ../src/protocols/oscar/oscar.c:168
 msgid "Not while on AOL"
 msgstr "Na omrežju AOL ni dovoljeno"
 
-#: ../src/protocols/oscar/oscar.c:421
-#: ../src/protocols/oscar/oscar.c:523
+#: ../src/protocols/oscar/oscar.c:346
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(Pri sprejemu tega sporočila je prišlo do napake.  Prijatelj, s katerim se pogovarjate, je najbrž uporabil drugo kodiranje od pričakovanega.  Če veste, za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev svojega računa AIM/ICQ.)"
+
+#: ../src/protocols/oscar/oscar.c:449
 msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
 msgstr "(Prišlo je do napake pri prejemu tega sporočila. Prijatelj, s katerim se pogovarjate, ima verjetno hroščastega odjemalca.)"
 
-#: ../src/protocols/oscar/oscar.c:702
+#: ../src/protocols/oscar/oscar.c:628
 msgid "Voice"
 msgstr "Glasovno"
 
-#: ../src/protocols/oscar/oscar.c:705
+#: ../src/protocols/oscar/oscar.c:631
 msgid "AIM Direct IM"
 msgstr "Neposredni pogovor AIM"
 
-#: ../src/protocols/oscar/oscar.c:708
+#: ../src/protocols/oscar/oscar.c:634
 #: ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:510
+#: ../src/protocols/silc/util.c:524
 msgid "Chat"
 msgstr "Pomenek"
 
-#: ../src/protocols/oscar/oscar.c:711
-#: ../src/protocols/oscar/oscar.c:8174
+#: ../src/protocols/oscar/oscar.c:637
+#: ../src/protocols/oscar/oscar.c:5793
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
-#: ../src/protocols/oscar/oscar.c:718
+#: ../src/protocols/oscar/oscar.c:644
 msgid "Games"
 msgstr "Igre"
 
-#: ../src/protocols/oscar/oscar.c:721
+#: ../src/protocols/oscar/oscar.c:647
 msgid "Add-Ins"
 msgstr "Dodatki"
 
-#: ../src/protocols/oscar/oscar.c:724
+#: ../src/protocols/oscar/oscar.c:650
 msgid "Send Buddy List"
 msgstr "Pošlji seznam prijateljev"
 
-#: ../src/protocols/oscar/oscar.c:727
+#: ../src/protocols/oscar/oscar.c:653
 msgid "ICQ Direct Connect"
 msgstr "Neposredna povezava ICQ"
 
-#: ../src/protocols/oscar/oscar.c:730
+#: ../src/protocols/oscar/oscar.c:656
 msgid "AP User"
 msgstr "AP uporabnik"
 
-#: ../src/protocols/oscar/oscar.c:733
+#: ../src/protocols/oscar/oscar.c:659
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:736
+#: ../src/protocols/oscar/oscar.c:662
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../src/protocols/oscar/oscar.c:739
+#: ../src/protocols/oscar/oscar.c:665
 msgid "ICQ Server Relay"
 msgstr "ICQ strežniški posrednik"
 
-#: ../src/protocols/oscar/oscar.c:742
+#: ../src/protocols/oscar/oscar.c:668
 msgid "Old ICQ UTF8"
 msgstr "Star ICQ UTF-8"
 
-#: ../src/protocols/oscar/oscar.c:745
+#: ../src/protocols/oscar/oscar.c:671
 msgid "Trillian Encryption"
 msgstr "Trillian kodiranje"
 
-#: ../src/protocols/oscar/oscar.c:748
+#: ../src/protocols/oscar/oscar.c:674
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: ../src/protocols/oscar/oscar.c:751
+#: ../src/protocols/oscar/oscar.c:677
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:754
+#: ../src/protocols/oscar/oscar.c:680
 msgid "Security Enabled"
 msgstr "Varnost vključena"
 
-#: ../src/protocols/oscar/oscar.c:757
+#: ../src/protocols/oscar/oscar.c:683
 msgid "Video Chat"
 msgstr "Video.pomenek"
 
-#: ../src/protocols/oscar/oscar.c:761
+#: ../src/protocols/oscar/oscar.c:687
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:764
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Live Video"
 msgstr "Video v živo"
 
-#: ../src/protocols/oscar/oscar.c:767
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:785
-#: ../src/protocols/oscar/oscar.c:8036
+#: ../src/protocols/oscar/oscar.c:711
+#: ../src/protocols/oscar/oscar.c:5600
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
-#: ../src/protocols/oscar/oscar.c:789
-#: ../src/protocols/oscar/oscar.c:8064
+#: ../src/protocols/oscar/oscar.c:715
+#: ../src/protocols/oscar/oscar.c:5628
 msgid "Not Available"
 msgstr "Ni na voljo"
 
-#: ../src/protocols/oscar/oscar.c:791
-#: ../src/protocols/oscar/oscar.c:8054
+#: ../src/protocols/oscar/oscar.c:717
+#: ../src/protocols/oscar/oscar.c:5618
 msgid "Occupied"
 msgstr "Zaseden"
 
-#: ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
-#: ../src/protocols/oscar/oscar.c:799
+#: ../src/protocols/oscar/oscar.c:725
 msgid "Online"
 msgstr "Prisoten"
 
-#: ../src/protocols/oscar/oscar.c:876
-#: ../src/protocols/oscar/oscar.c:5253
+#: ../src/protocols/oscar/oscar.c:802
+#: ../src/protocols/oscar/oscar.c:2824
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
-#: ../src/protocols/oscar/oscar.c:885
+#: ../src/protocols/oscar/oscar.c:811
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#: ../src/protocols/oscar/oscar.c:1034
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "Neposredni pogovor z %s končan"
-
-#: ../src/protocols/oscar/oscar.c:1036
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "Neposredni pogovor z %s ni bil uspešen"
-
-#: ../src/protocols/oscar/oscar.c:1044
-msgid "Direct Connect failed"
-msgstr "Neposredna povezava spodletela"
-
-#: ../src/protocols/oscar/oscar.c:1124
-#: ../src/protocols/oscar/oscar.c:1253
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "Neposredni pogovor z %s vzpostavljen"
-
-#: ../src/protocols/oscar/oscar.c:1205
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "Poskus povezave z %s pri %s:%hu za Direct IM."
-
-#: ../src/protocols/oscar/oscar.c:1608
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Spraševanje %s za povezavo na nas pri %s:%hu za Direct IM."
-
-#: ../src/protocols/oscar/oscar.c:1613
-#: ../src/protocols/oscar/oscar.c:1660
-msgid "Unable to open Direct IM"
-msgstr "Neposredne povezave ni bilo mogoče vzpostaviti"
-
-#: ../src/protocols/oscar/oscar.c:1696
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Izbrali ste neposredno povezovanje z %s."
-
-#: ../src/protocols/oscar/oscar.c:1700
-msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
-msgstr "Ker to razkrije vaš IP naslov, se to obravnava kot kršenje zasebnosti. Ali želite nadaljevati?"
-
-#: ../src/protocols/oscar/oscar.c:1704
-#: ../src/protocols/oscar/oscar.c:4564
-msgid "_Connect"
-msgstr "_Poveži"
-
-#: ../src/protocols/oscar/oscar.c:1782
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
-
-#: ../src/protocols/oscar/oscar.c:1805
-msgid "Chat is currently unavailable"
-msgstr "Pomenek tenutno ni na voljo"
-
-#: ../src/protocols/oscar/oscar.c:1877
+#: ../src/protocols/oscar/oscar.c:966
+msgid "Could not connect to authentication server"
+msgstr "Povezava z overovitvenim strežnikom ni uspela"
+
+#: ../src/protocols/oscar/oscar.c:968
+msgid "Could not connect to BOS server"
+msgstr "Povezava na strežnik BOS ni uspela"
+
+#: ../src/protocols/oscar/oscar.c:998
 msgid "Screen name sent"
 msgstr "Vzdevek poslan"
 
-#: ../src/protocols/oscar/oscar.c:1893
+#: ../src/protocols/oscar/oscar.c:1003
+msgid "Connection established, cookie sent"
+msgstr "Povezava vzpostavljena, piškotek poslan"
+
+#. TODO: Don't call this with ssi
+#: ../src/protocols/oscar/oscar.c:1034
+msgid "Finalizing connection"
+msgstr "Dokončujem povezavo"
+
+#: ../src/protocols/oscar/oscar.c:1219
 #, c-format
 msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je vzdevek neveljaven. Vzdevki se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljeni iz samih števil."
 
-#: ../src/protocols/oscar/oscar.c:1921
-msgid "Unable to login to AIM"
-msgstr "Povezava na AIM ni uspela"
-
-#: ../src/protocols/oscar/oscar.c:2024
-#: ../src/protocols/oscar/oscar.c:3016
-msgid "Could Not Connect"
-msgstr "Povezava ni uspela"
-
-#: ../src/protocols/oscar/oscar.c:2035
-msgid "Connection established, cookie sent"
-msgstr "Povezava vzpostavljena, piškotek poslan"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. *
-#. * Above, we checked if we had previously attempted a connection
-#. * redirect to prevent a conflict with the joscar library
-#.
-#. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2194
-msgid "Attempting connection redirect..."
-msgstr "Poskus preusmeritve povezave ..."
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2240
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account->Advanced."
-msgstr ""
-"Prenos datoteke %s je prekoračil čas.\n"
-"Poskusite omogočiti strežnike prehoda za prenos datotek v Računi -> %s -> Uredi račun -> Napredno."
-
-#: ../src/protocols/oscar/oscar.c:2338
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
-
-#: ../src/protocols/oscar/oscar.c:2343
-msgid "Unable to create new connection."
-msgstr "Ni bilo mogoče vzpostaviti nove povezave."
-
-#: ../src/protocols/oscar/oscar.c:2581
-#: ../src/protocols/oscar/oscar.c:2590
-#: ../src/protocols/oscar/oscar.c:2604
-#: ../src/protocols/oscar/oscar.c:2614
-msgid "Unable to log into file transfer proxy."
-msgstr "Prijava v proxy prenosa datotek ni bila mogoča."
-
-#: ../src/protocols/oscar/oscar.c:2668
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Vtičnice za poslušanje ni bilo mogoče vzpostaviti ali pa povezava prehoda AOL ni prisotna."
-
-#: ../src/protocols/oscar/oscar.c:2906
+#: ../src/protocols/oscar/oscar.c:1308
 #: ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Neveljaven vzdevek ali geslo."
 
-#: ../src/protocols/oscar/oscar.c:2911
+#: ../src/protocols/oscar/oscar.c:1313
 msgid "Your account is currently suspended."
 msgstr "Vaš račun je trenutno zamrznjen."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2915
+#: ../src/protocols/oscar/oscar.c:1317
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
-#: ../src/protocols/oscar/oscar.c:2920
+#: ../src/protocols/oscar/oscar.c:1322
 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
 msgstr "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
 
-#: ../src/protocols/oscar/oscar.c:2925
+#: ../src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Različica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga pri %s"
 
-#: ../src/protocols/oscar/oscar.c:2953
-msgid "Internal Error"
-msgstr "Interna napaka"
-
-#: ../src/protocols/oscar/oscar.c:3023
+#: ../src/protocols/oscar/oscar.c:1363
+msgid "Could Not Connect"
+msgstr "Povezava ni uspela"
+
+#: ../src/protocols/oscar/oscar.c:1368
 msgid "Received authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#: ../src/protocols/oscar/oscar.c:3047
+#: ../src/protocols/oscar/oscar.c:1391
 msgid "The SecurID key entered is invalid."
 msgstr "Vnešeni ključ SecurID ni veljaven."
 
-#: ../src/protocols/oscar/oscar.c:3061
+#: ../src/protocols/oscar/oscar.c:1405
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
 
-#: ../src/protocols/oscar/oscar.c:3062
+#: ../src/protocols/oscar/oscar.c:1406
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite število s 6 ciframi iz digitalnega prikazovalnika."
 
-#: ../src/protocols/oscar/oscar.c:3102
-#: ../src/protocols/oscar/oscar.c:3132
-#: ../src/protocols/oscar/oscar.c:3223
+#: ../src/protocols/oscar/oscar.c:1446
+#: ../src/protocols/oscar/oscar.c:1480
 #, c-format
 msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
 msgstr "Morda bo povezava v kratkem prekinjena. Morda boste želeli uporabiti TOC dokler to ni popravljeno. Preverite %s za posodobitve."
 
-#: ../src/protocols/oscar/oscar.c:3105
-#: ../src/protocols/oscar/oscar.c:3135
+#: ../src/protocols/oscar/oscar.c:1449
+#: ../src/protocols/oscar/oscar.c:1483
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvlečka za AIM."
 
-#: ../src/protocols/oscar/oscar.c:3226
+#: ../src/protocols/oscar/oscar.c:1569
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
+
+#: ../src/protocols/oscar/oscar.c:1572
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvlečka."
 
-#: ../src/protocols/oscar/oscar.c:3247
+#: ../src/protocols/oscar/oscar.c:1598
 msgid "Password sent"
 msgstr "Geslo poslano"
 
-#: ../src/protocols/oscar/oscar.c:4555
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s je pravkar prosil za neposredno povezavo z %s"
-
-#: ../src/protocols/oscar/oscar.c:4558
-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 considered a privacy risk."
-msgstr "To zahteva neposredno povezavo med dvema računalnikoma in je za vstavljene slike nujno potrebno. Ker bo izdan vaš IP naslov, je to lahko tveganje varnosti."
-
-#: ../src/protocols/oscar/oscar.c:4597
+#: ../src/protocols/oscar/oscar.c:2156
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
 
-#: ../src/protocols/oscar/oscar.c:4605
+#: ../src/protocols/oscar/oscar.c:2165
 msgid "Authorization Request Message:"
 msgstr "Sporočilo o zahtevi po pooblastilu:"
 
-#: ../src/protocols/oscar/oscar.c:4606
+#: ../src/protocols/oscar/oscar.c:2166
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: ../src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:2200
 #, c-format
 msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
 msgstr "Uporabnik %s zahteva pooblastilo preden je dodan na seznam prijateljev. Ali želite poslati zahtevo po pooblastilu?"
 
-#: ../src/protocols/oscar/oscar.c:4641
+#: ../src/protocols/oscar/oscar.c:2205
 msgid "Request Authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:4643
+#: ../src/protocols/oscar/oscar.c:2207
 msgid "_Request Authorization"
 msgstr "_Zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:4681
-#: ../src/protocols/oscar/oscar.c:4687
-#: ../src/protocols/oscar/oscar.c:4791
-#: ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7468
-#: ../src/protocols/oscar/oscar.c:7520
+#: ../src/protocols/oscar/oscar.c:2251
+#: ../src/protocols/oscar/oscar.c:2259
+#: ../src/protocols/oscar/oscar.c:2367
+#: ../src/protocols/oscar/oscar.c:2391
+#: ../src/protocols/oscar/oscar.c:5025
+#: ../src/protocols/oscar/oscar.c:5077
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: ../src/protocols/oscar/oscar.c:4686
+#: ../src/protocols/oscar/oscar.c:2258
 msgid "Authorization Denied Message:"
 msgstr "Sporočilo o neodobrenem pooblastilu:"
 
-#: ../src/protocols/oscar/oscar.c:4793
+#: ../src/protocols/oscar/oscar.c:2369
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9133,12 +9324,12 @@
 "Uporabnik %u želi dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803
-#: ../src/protocols/oscar/oscar.c:7480
+#: ../src/protocols/oscar/oscar.c:2379
+#: ../src/protocols/oscar/oscar.c:5037
 msgid "Authorization Request"
 msgstr "Zahtevek po pooblastilu"
 
-#: ../src/protocols/oscar/oscar.c:4815
+#: ../src/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the following reason:\n"
@@ -9147,17 +9338,17 @@
 "Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev z naslednjim razlogom:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4816
+#: ../src/protocols/oscar/oscar.c:2392
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4823
+#: ../src/protocols/oscar/oscar.c:2399
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Uporabik %u vam je dovolil, da ga dodate na svoj seznam prijateljev."
 
-#: ../src/protocols/oscar/oscar.c:4831
+#: ../src/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9170,7 +9361,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4839
+#: ../src/protocols/oscar/oscar.c:2415
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9183,7 +9374,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4847
+#: ../src/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9191,25 +9382,25 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"Prejeli ste ICQ elektronsko pošto od %s [%s]\n"
+"Prejeli ste e-pošto ICQ od %s [%s]\n"
 "\n"
-"Sporočilo je:\n"
+"Sporočilo se glasi:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4868
+#: ../src/protocols/oscar/oscar.c:2444
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Uporabnik ICQ %u vam je poslal vizitko: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:4874
+#: ../src/protocols/oscar/oscar.c:2450
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ali želite dodati prijatelja s to vizitko na vaš seznam prijateljev?"
 
-#: ../src/protocols/oscar/oscar.c:4878
+#: ../src/protocols/oscar/oscar.c:2454
 msgid "_Decline"
 msgstr "_Zavrni"
 
-#: ../src/protocols/oscar/oscar.c:4962
+#: ../src/protocols/oscar/oscar.c:2538
 #, 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."
@@ -9218,7 +9409,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:4971
+#: ../src/protocols/oscar/oscar.c:2547
 #, 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."
@@ -9227,7 +9418,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:4980
+#: ../src/protocols/oscar/oscar.c:2556
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
@@ -9236,7 +9427,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:4989
+#: ../src/protocols/oscar/oscar.c:2565
 #, 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."
@@ -9245,7 +9436,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:4998
+#: ../src/protocols/oscar/oscar.c:2574
 #, 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."
@@ -9254,7 +9445,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:5007
+#: ../src/protocols/oscar/oscar.c:2583
 #, 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."
@@ -9263,146 +9454,129 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:5066
+#: ../src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Stanje:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:5127
+#: ../src/protocols/oscar/oscar.c:2700
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC je izvrgel napako: %s\n"
 
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:5164
+#: ../src/protocols/oscar/oscar.c:2736
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni moč poslati sporočila: %s"
 
-#: ../src/protocols/oscar/oscar.c:5164
-#: ../src/protocols/oscar/oscar.c:5169
-#: ../src/protocols/oscar/oscar.c:5227
-#: ../src/protocols/oscar/oscar.c:5231
+#: ../src/protocols/oscar/oscar.c:2736
+#: ../src/protocols/oscar/oscar.c:2741
+#: ../src/protocols/oscar/oscar.c:2799
+#: ../src/protocols/oscar/oscar.c:2803
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: ../src/protocols/oscar/oscar.c:5167
-#: ../src/protocols/sametime/sametime.c:2373
+#: ../src/protocols/oscar/oscar.c:2739
+#: ../src/protocols/sametime/sametime.c:2367
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni moč poslati sporočila k %s:"
 
-#: ../src/protocols/oscar/oscar.c:5227
+#: ../src/protocols/oscar/oscar.c:2799
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: ../src/protocols/oscar/oscar.c:5230
+#: ../src/protocols/oscar/oscar.c:2802
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podatki o uporabniku %s niso dostopni:"
 
-#: ../src/protocols/oscar/oscar.c:5257
+#: ../src/protocols/oscar/oscar.c:2828
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: ../src/protocols/oscar/oscar.c:5262
+#: ../src/protocols/oscar/oscar.c:2833
 #: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "Član od"
 
-#: ../src/protocols/oscar/oscar.c:5267
+#: ../src/protocols/oscar/oscar.c:2838
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
-#: ../src/protocols/oscar/oscar.c:5285
+#: ../src/protocols/oscar/oscar.c:2856
 msgid "Available Message"
 msgstr "Sporočilo o dosegljivosti"
 
-#: ../src/protocols/oscar/oscar.c:5402
+#: ../src/protocols/oscar/oscar.c:2945
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5588
+#: ../src/protocols/oscar/oscar.c:3126
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[Ni mogoče prikazati sporočila tega uporabnika, ker vsebuje neveljavne znake.]"
 
-#: ../src/protocols/oscar/oscar.c:5809
+#: ../src/protocols/oscar/oscar.c:3345
 msgid "Rate limiting error."
 msgstr "Napaka z omejevanjem pogostosti sporočil."
 
-#: ../src/protocols/oscar/oscar.c:5810
+#: ../src/protocols/oscar/oscar.c:3346
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "Zadnjega dejanja, ki ste ga želeli izvesti, ni bilo mogoče izvesti, ker ste prekoračili dovoljeno pogostost. Prosim počakajte 10 sekund in poskusite znova."
 
-#: ../src/protocols/oscar/oscar.c:5883
+#: ../src/protocols/oscar/oscar.c:3418
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste bili iz neznanega razloga."
 
-#: ../src/protocols/oscar/oscar.c:5896
+#: ../src/protocols/oscar/oscar.c:3431
 #: ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-#. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5925
-msgid "Finalizing connection"
-msgstr "Dokončujem povezavo"
-
-#: ../src/protocols/oscar/oscar.c:6190
-#: ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:3649
+#: ../src/protocols/silc/util.c:556
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../src/protocols/oscar/oscar.c:6207
+#: ../src/protocols/oscar/oscar.c:3676
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: ../src/protocols/oscar/oscar.c:6211
+#: ../src/protocols/oscar/oscar.c:3680
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "Domači naslov"
-
-#: ../src/protocols/oscar/oscar.c:6220
-#: ../src/protocols/oscar/oscar.c:6228
+#: ../src/protocols/oscar/oscar.c:3689
+#: ../src/protocols/oscar/oscar.c:3697
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "Službeni naslov"
-
-#: ../src/protocols/oscar/oscar.c:6232
+#: ../src/protocols/oscar/oscar.c:3701
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "Podjetje"
-
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../src/protocols/oscar/oscar.c:3703
 msgid "Division"
 msgstr "Oddelek"
 
-#: ../src/protocols/oscar/oscar.c:6235
+#: ../src/protocols/oscar/oscar.c:3704
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: ../src/protocols/oscar/oscar.c:6237
+#: ../src/protocols/oscar/oscar.c:3706
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: ../src/protocols/oscar/oscar.c:6295
+#: ../src/protocols/oscar/oscar.c:3764
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
-#: ../src/protocols/oscar/oscar.c:6335
+#: ../src/protocols/oscar/oscar.c:3804
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -9411,60 +9585,64 @@
 msgstr[2] "Naslednja vzdevka sta povezana z %s"
 msgstr[3] "Naslednji vzdevki so povezani z %s"
 
-#: ../src/protocols/oscar/oscar.c:6366
+#: ../src/protocols/oscar/oscar.c:3809
+msgid "Screen name"
+msgstr "Zaslonsko ime"
+
+#: ../src/protocols/oscar/oscar.c:3835
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr "Za dani elektronski naslov %s ni bilo rezultatov"
-
-#: ../src/protocols/oscar/oscar.c:6387
+msgstr "Za dani elektronski naslov %s ni zadetkov."
+
+#: ../src/protocols/oscar/oscar.c:3856
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Prejeti bi morali elektronsko pošto, da potrdite %s. "
-
-#: ../src/protocols/oscar/oscar.c:6389
+msgstr "Prejeti bi morali e-pošto, da potrdite %s. "
+
+#: ../src/protocols/oscar/oscar.c:3858
 msgid "Account Confirmation Requested"
 msgstr "Potrditev računa je bila zahtevana"
 
-#: ../src/protocols/oscar/oscar.c:6420
+#: ../src/protocols/oscar/oscar.c:3889
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o računu"
 
-#: ../src/protocols/oscar/oscar.c:6423
+#: ../src/protocols/oscar/oscar.c:3892
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker se zahtevano poimenovanje razlikuje od izvirnega."
 
-#: ../src/protocols/oscar/oscar.c:6426
+#: ../src/protocols/oscar/oscar.c:3895
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker je neveljavno."
 
-#: ../src/protocols/oscar/oscar.c:6429
+#: ../src/protocols/oscar/oscar.c:3898
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker je zahtevano poimenovanje predolgo."
 
-#: ../src/protocols/oscar/oscar.c:6432
+#: ../src/protocols/oscar/oscar.c:3901
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
-msgstr "Napaka 0x%04x: Ni bilo mogoče spremeniti elektronskega naslova, ker je že en zahtevek v čakanju za to ime."
-
-#: ../src/protocols/oscar/oscar.c:6435
+msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je na čakanju za to ime že en zahtevek."
+
+#: ../src/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
-msgstr "Napaka 0x%04x: Ni mogoče spremeniti elektronskega naslova ker ima podan naslov že preveč računov."
-
-#: ../src/protocols/oscar/oscar.c:6438
+msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker ima podani naslov že preveč računov."
+
+#: ../src/protocols/oscar/oscar.c:3907
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
-msgstr "Napaka 0x%04x: Ni mogoče spremeniti elektronskega naslova ker je podan naslov neveljaven."
-
-#: ../src/protocols/oscar/oscar.c:6441
+msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je podani naslov neveljaven."
+
+#: ../src/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: ../src/protocols/oscar/oscar.c:6451
+#: ../src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9473,29 +9651,29 @@
 "Vaše ime je trenutno naslednje oblike:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6452
-#: ../src/protocols/oscar/oscar.c:6459
+#: ../src/protocols/oscar/oscar.c:3921
+#: ../src/protocols/oscar/oscar.c:3928
 msgid "Account Info"
 msgstr "Podatki o računu"
 
-#: ../src/protocols/oscar/oscar.c:6457
+#: ../src/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: ../src/protocols/oscar/oscar.c:6535
+#: ../src/protocols/oscar/oscar.c:4101
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "Vaša slika IM ni bila poslana. Za pošiljanje slik IM morate biti \"neposredno povezani\"."
 
-#: ../src/protocols/oscar/oscar.c:6775
+#: ../src/protocols/oscar/oscar.c:4341
 msgid "Unable to set AIM profile."
 msgstr "Ni mogoče nastaviti AIM profila."
 
-#: ../src/protocols/oscar/oscar.c:6776
+#: ../src/protocols/oscar/oscar.c:4342
 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 fully connected."
 msgstr "Verjetno ste zahtevali, da spremenite svoj profil preden je bila prijava dokončana. Za zdaj je vaš profil nespremenjen; poskusite ponovno, ko boste zagotovo prijavljeni."
 
-#: ../src/protocols/oscar/oscar.c:6790
+#: ../src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9504,11 +9682,11 @@
 msgstr[2] "Največja dolžina profila %d bajta je bila presežena.  Gaim ga je skrajšal namesto vas."
 msgstr[3] "Največja dolžina profila %d bajte je bila presežena.  Gaim ga je skrajšal namesto vas."
 
-#: ../src/protocols/oscar/oscar.c:6795
+#: ../src/protocols/oscar/oscar.c:4361
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: ../src/protocols/oscar/oscar.c:6843
+#: ../src/protocols/oscar/oscar.c:4408
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9517,63 +9695,63 @@
 msgstr[2] "Največja dolžina sporočila odsotnosti %d bajta je bila presežena.  Gaim ga je skrajšal namesto vas."
 msgstr[3] "Največja dolžina sporočila odsotnosti %d bajte je bila presežena.  Gaim ga je skrajšal namesto vas."
 
-#: ../src/protocols/oscar/oscar.c:6848
+#: ../src/protocols/oscar/oscar.c:4413
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: ../src/protocols/oscar/oscar.c:6917
+#: ../src/protocols/oscar/oscar.c:4482
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Ni mogoče dodati prijatelja %s, ker vzdevek ni veljaven. Vzdevki se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljeni iz samih števil."
 
-#: ../src/protocols/oscar/oscar.c:6919
-#: ../src/protocols/oscar/oscar.c:7326
-#: ../src/protocols/oscar/oscar.c:7340
+#: ../src/protocols/oscar/oscar.c:4484
+#: ../src/protocols/oscar/oscar.c:4883
+#: ../src/protocols/oscar/oscar.c:4897
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
-#: ../src/protocols/oscar/oscar.c:7026
+#: ../src/protocols/oscar/oscar.c:4588
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
-#: ../src/protocols/oscar/oscar.c:7027
+#: ../src/protocols/oscar/oscar.c:4589
 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 a few hours."
 msgstr "Gaim začasno ni uspel pridobiti vašega seznama prijateljev z AIM strežnikov. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: ../src/protocols/oscar/oscar.c:7224
-#: ../src/protocols/oscar/oscar.c:7225
-#: ../src/protocols/oscar/oscar.c:7230
-#: ../src/protocols/oscar/oscar.c:7384
-#: ../src/protocols/oscar/oscar.c:7385
-#: ../src/protocols/oscar/oscar.c:7390
+#: ../src/protocols/oscar/oscar.c:4781
+#: ../src/protocols/oscar/oscar.c:4782
+#: ../src/protocols/oscar/oscar.c:4787
+#: ../src/protocols/oscar/oscar.c:4941
+#: ../src/protocols/oscar/oscar.c:4942
+#: ../src/protocols/oscar/oscar.c:4947
 msgid "Orphans"
 msgstr "Sirote"
 
-#: ../src/protocols/oscar/oscar.c:7324
+#: ../src/protocols/oscar/oscar.c:4881
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč prijateljev. Prosim odstranite enega in poskusite ponovno."
 
-#: ../src/protocols/oscar/oscar.c:7324
-#: ../src/protocols/oscar/oscar.c:7338
+#: ../src/protocols/oscar/oscar.c:4881
+#: ../src/protocols/oscar/oscar.c:4895
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: ../src/protocols/oscar/oscar.c:7338
+#: ../src/protocols/oscar/oscar.c:4895
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
 msgstr "Prijatelja %s iz neznanega razloga ni bilo mogoče dodati na seznam. Najpogostejši razlog za to je preveliko število prijateljev na vašem seznamu."
 
-#: ../src/protocols/oscar/oscar.c:7421
+#: ../src/protocols/oscar/oscar.c:4978
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga želite dodati?"
 
-#: ../src/protocols/oscar/oscar.c:7427
+#: ../src/protocols/oscar/oscar.c:4984
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
-#: ../src/protocols/oscar/oscar.c:7471
+#: ../src/protocols/oscar/oscar.c:5028
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9583,17 +9761,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7516
+#: ../src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
-#: ../src/protocols/oscar/oscar.c:7517
+#: ../src/protocols/oscar/oscar.c:5074
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7520
+#: ../src/protocols/oscar/oscar.c:5077
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -9602,150 +9780,171 @@
 "Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7521
+#: ../src/protocols/oscar/oscar.c:5078
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: ../src/protocols/oscar/oscar.c:7558
+#: ../src/protocols/oscar/oscar.c:5114
 #: ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: ../src/protocols/oscar/oscar.c:7594
+#: ../src/protocols/oscar/oscar.c:5154
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: ../src/protocols/oscar/oscar.c:7664
+#: ../src/protocols/oscar/oscar.c:5224
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
-#: ../src/protocols/oscar/oscar.c:7821
+#: ../src/protocols/oscar/oscar.c:5386
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8127
+#: ../src/protocols/oscar/oscar.c:5691
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: ../src/protocols/oscar/oscar.c:8128
+#: ../src/protocols/oscar/oscar.c:5692
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: ../src/protocols/oscar/oscar.c:8147
+#: ../src/protocols/oscar/oscar.c:5738
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Izbrali ste neposredno povezovanje z %s."
+
+#: ../src/protocols/oscar/oscar.c:5742
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite nadaljevati?"
+
+#: ../src/protocols/oscar/oscar.c:5746
+msgid "_Connect"
+msgstr "_Poveži"
+
+#: ../src/protocols/oscar/oscar.c:5764
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: ../src/protocols/oscar/oscar.c:8154
+#: ../src/protocols/oscar/oscar.c:5772
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: ../src/protocols/oscar/oscar.c:8167
+#: ../src/protocols/oscar/oscar.c:5785
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: ../src/protocols/oscar/oscar.c:8186
+#: ../src/protocols/oscar/oscar.c:5807
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:8243
+#: ../src/protocols/oscar/oscar.c:5864
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:8246
+#: ../src/protocols/oscar/oscar.c:5867
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: ../src/protocols/oscar/oscar.c:8251
+#: ../src/protocols/oscar/oscar.c:5872
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8268
+#: ../src/protocols/oscar/oscar.c:5889
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:5890
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Z oblikovanjem vzdevka lahko spreminjate samo velike črke in presledke."
 
-#: ../src/protocols/oscar/oscar.c:8276
+#: ../src/protocols/oscar/oscar.c:5897
 msgid "New screen name formatting:"
 msgstr "Nov vzdevek za oblikovanje:"
 
-#: ../src/protocols/oscar/oscar.c:8328
+#: ../src/protocols/oscar/oscar.c:5953
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: ../src/protocols/oscar/oscar.c:8373
+#: ../src/protocols/oscar/oscar.c:5998
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
-#: ../src/protocols/oscar/oscar.c:8376
+#: ../src/protocols/oscar/oscar.c:6001
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
-#: ../src/protocols/oscar/oscar.c:8377
+#: ../src/protocols/oscar/oscar.c:6002
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-#: ../src/protocols/oscar/oscar.c:8394
+#: ../src/protocols/oscar/oscar.c:6019
 msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: ../src/protocols/oscar/oscar.c:8395
+#: ../src/protocols/oscar/oscar.c:6020
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: ../src/protocols/oscar/oscar.c:8396
+#: ../src/protocols/oscar/oscar.c:6021
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
-#: ../src/protocols/oscar/oscar.c:8489
+#: ../src/protocols/oscar/oscar.c:6190
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: ../src/protocols/oscar/oscar.c:8500
+#: ../src/protocols/oscar/oscar.c:6201
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: ../src/protocols/oscar/oscar.c:8504
+#: ../src/protocols/oscar/oscar.c:6205
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporočil (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8514
+#: ../src/protocols/oscar/oscar.c:6215
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8521
+#: ../src/protocols/oscar/oscar.c:6222
 msgid "Format Screen Name..."
 msgstr "Oblikuj vzdevek ..."
 
-#: ../src/protocols/oscar/oscar.c:8525
+#: ../src/protocols/oscar/oscar.c:6226
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: ../src/protocols/oscar/oscar.c:8529
-msgid "Display Currently Registered Address"
-msgstr "Prikaži trenutno registriran naslov"
-
-#: ../src/protocols/oscar/oscar.c:8533
-msgid "Change Currently Registered Address..."
-msgstr "Spremeni trenutno registriran naslov ..."
-
-#: ../src/protocols/oscar/oscar.c:8540
+#: ../src/protocols/oscar/oscar.c:6230
+msgid "Display Currently Registered E-Mail Address"
+msgstr "Prikaži trenutno registriran e-naslov"
+
+#: ../src/protocols/oscar/oscar.c:6234
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "Spremeni trenutno registriran e-naslov ..."
+
+#: ../src/protocols/oscar/oscar.c:6241
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:8546
-msgid "Search for Buddy by E-Mail..."
-msgstr "Išči prijatelja po e-pošti ..."
-
-#: ../src/protocols/oscar/oscar.c:8551
+#: ../src/protocols/oscar/oscar.c:6247
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "Išči prijatelja po e-naslovu ..."
+
+#: ../src/protocols/oscar/oscar.c:6252
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
+#: ../src/protocols/oscar/oscar.c:6318
+msgid "Use recent buddies group"
+msgstr "Uporabi nedavno skupino prijateljev"
+
+#: ../src/protocols/oscar/oscar.c:6321
+msgid "Show how long you have been idle"
+msgstr "Prikaz časa vaše odsotnosti"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9756,158 +9955,150 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8729
-#: ../src/protocols/oscar/oscar.c:8731
+#: ../src/protocols/oscar/oscar.c:6446
+#: ../src/protocols/oscar/oscar.c:6448
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Vstavek za protokol AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8750
-msgid "Auth host"
-msgstr "Strežnik za avtentikacijo"
-
-#: ../src/protocols/oscar/oscar.c:8753
-msgid "Auth port"
-msgstr "Vrata za avtentikacijo"
-
-#: ../src/protocols/oscar/oscar.c:8756
+#: ../src/protocols/oscar/oscar.c:6473
 #: ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: ../src/protocols/oscar/oscar.c:8760
+#: ../src/protocols/oscar/oscar.c:6477
 msgid ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
+"Always use AIM/ICQ proxy server\n"
+"(slower, but does not reveal your IP address)"
 msgstr ""
-"Uporabi strežnik prehoda AIM/ICQ\n"
-"(počasneje, vendar ponavadi deluje)"
+"Vedno uporabi strežnik prehoda AIM/ICQ\n"
+"(počasneje, vendar ne razkrije vašega naslova IP)"
 
 #: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Povezava zaprta (pisanje)"
 
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../src/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ime skupine:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1268
+#: ../src/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID skupine zapiskov:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1270
+#: ../src/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "Podatki za skupino %s"
 
-#: ../src/protocols/sametime/sametime.c:1272
+#: ../src/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr "Informacije o adresarju zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:1304
+#: ../src/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr "Povabi skupino na konferenčni pogovor ..."
 
-#: ../src/protocols/sametime/sametime.c:1314
+#: ../src/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr "Pridobi podatke o adresarju zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:1467
+#: ../src/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr "Pošljanje rokovanja"
 
-#: ../src/protocols/sametime/sametime.c:1472
+#: ../src/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Čakanje na potrditev rokovanja"
 
-#: ../src/protocols/sametime/sametime.c:1477
+#: ../src/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Rokovanje potrjeno, pošiljanje prijave"
 
-#: ../src/protocols/sametime/sametime.c:1482
+#: ../src/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr "Čakanje na potrditev prijave"
 
+#: ../src/protocols/sametime/sametime.c:1481
+msgid "Login Redirected"
+msgstr "Prijava preusmerjena"
+
 #: ../src/protocols/sametime/sametime.c:1487
-msgid "Login Redirected"
-msgstr "Prijava preusmerjena"
-
-#: ../src/protocols/sametime/sametime.c:1493
 msgid "Forcing Login"
 msgstr "Prisilno prijavljanje"
 
-#: ../src/protocols/sametime/sametime.c:1497
+#: ../src/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr "Prijava potrjena"
 
-#: ../src/protocols/sametime/sametime.c:1502
+#: ../src/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr "Zagon storitev"
 
-#: ../src/protocols/sametime/sametime.c:1507
+#: ../src/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../src/protocols/sametime/sametime.c:1605
+#: ../src/protocols/sametime/sametime.c:1599
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Upravljalec omrežja Sametime je izdal naslednje obvestilo na strežniku %s"
 
-#: ../src/protocols/sametime/sametime.c:1610
+#: ../src/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr "Upravljalsko obvestilo Sametime"
 
-#: ../src/protocols/sametime/sametime.c:1662
+#: ../src/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr "Povezava ponovno nastavljena"
 
-#: ../src/protocols/sametime/sametime.c:1669
+#: ../src/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Napaka pri branju iz vtičnice: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1698
-#: ../src/protocols/sametime/sametime.c:3696
+#: ../src/protocols/sametime/sametime.c:1692
+#: ../src/protocols/sametime/sametime.c:3688
 msgid "Unable to connect to host"
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: ../src/protocols/sametime/sametime.c:1736
+#: ../src/protocols/sametime/sametime.c:1730
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznanilo od %s"
 
-#: ../src/protocols/sametime/sametime.c:1910
+#: ../src/protocols/sametime/sametime.c:1904
 msgid "Conference Closed"
 msgstr "Konferenčni pogovor zaprt"
 
 #  Data is assumed to be the destination sn
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../src/protocols/sametime/sametime.c:2361
 msgid "Unable to send message: "
 msgstr "Ni moč poslati sporočila: "
 
-#: ../src/protocols/sametime/sametime.c:2926
+#: ../src/protocols/sametime/sametime.c:2918
 msgid "Place Closed"
 msgstr "Zaprto mesto"
 
-#: ../src/protocols/sametime/sametime.c:3217
+#: ../src/protocols/sametime/sametime.c:3209
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../src/protocols/sametime/sametime.c:3210
 msgid "Speakers"
 msgstr "Zvočniki"
 
-#: ../src/protocols/sametime/sametime.c:3219
+#: ../src/protocols/sametime/sametime.c:3211
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../src/protocols/sametime/sametime.c:3223
+#: ../src/protocols/sametime/sametime.c:3215
 msgid "File Transfer"
 msgstr "Prenos datotek"
 
-#: ../src/protocols/sametime/sametime.c:3257
+#: ../src/protocols/sametime/sametime.c:3249
 #, c-format
 msgid ""
 "\n"
@@ -9916,7 +10107,7 @@
 "\n"
 "<b>Podpira:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3262
+#: ../src/protocols/sametime/sametime.c:3254
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9924,143 +10115,143 @@
 "\n"
 "<b>Zunanji uporabnik</b>"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3360
 msgid "Create conference with user"
 msgstr "Ustvari konferenčni pogovor z uporabnikom"
 
-#: ../src/protocols/sametime/sametime.c:3369
+#: ../src/protocols/sametime/sametime.c:3361
 #, c-format
 msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "Vnesite temo za nov konferenčni pogovor in sporočilo vabila za %s"
 
-#: ../src/protocols/sametime/sametime.c:3373
+#: ../src/protocols/sametime/sametime.c:3365
 msgid "New Conference"
 msgstr "Nov konferenčni pogovor"
 
-#: ../src/protocols/sametime/sametime.c:3375
+#: ../src/protocols/sametime/sametime.c:3367
 msgid "Create"
 msgstr "Ustvari"
 
-#: ../src/protocols/sametime/sametime.c:3439
+#: ../src/protocols/sametime/sametime.c:3431
 msgid "Available Conferences"
 msgstr "Konferenčni pogovori na voljo"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../src/protocols/sametime/sametime.c:3437
 msgid "Create New Conference..."
 msgstr "Ustvari nov konferenčni pogovor ..."
 
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../src/protocols/sametime/sametime.c:3444
 msgid "Invite user to a conference"
 msgstr "Povabi uporabnika na konferenčni pogovor"
 
-#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3445
 #, c-format
 msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
 msgstr "Iz spodnjega seznama izberite konferenco in pošljite povabilo uporabniku %s. Izberite \"Ustvari novo konferenco\", če bi želeli ustvariti novo konferenco in k njej povabili uporabnika."
 
-#: ../src/protocols/sametime/sametime.c:3458
+#: ../src/protocols/sametime/sametime.c:3450
 msgid "Invite to Conference"
 msgstr "Povabi na konferenčni pogovor"
 
-#: ../src/protocols/sametime/sametime.c:3460
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite"
 msgstr "Povabi"
 
-#: ../src/protocols/sametime/sametime.c:3548
+#: ../src/protocols/sametime/sametime.c:3540
 msgid "Invite to Conference..."
 msgstr "Povabi na konferenčni pogovor ..."
 
-#: ../src/protocols/sametime/sametime.c:3553
+#: ../src/protocols/sametime/sametime.c:3545
 msgid "Send TEST Announcement"
 msgstr "Pošlji obvestilo TEST"
 
-#: ../src/protocols/sametime/sametime.c:3600
+#: ../src/protocols/sametime/sametime.c:3592
 msgid "No Sametime Community Server specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../src/protocols/sametime/sametime.c:3622
+#: ../src/protocols/sametime/sametime.c:3614
 #, c-format
 msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
 msgstr "Za račun Meanwhile %s ni bil nastavljen noben gostitelj ali naslov IP. Za nadaljevanje prijave vnesite spodaj potrebne podatke. "
 
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../src/protocols/sametime/sametime.c:3619
 msgid "Meanwhile Connection Setup"
 msgstr "Namestitev povezave Meanwhile"
 
-#: ../src/protocols/sametime/sametime.c:3628
+#: ../src/protocols/sametime/sametime.c:3620
 msgid "No Sametime Community Server Specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../src/protocols/sametime/sametime.c:4077
 msgid "<b>External User</b><br>"
 msgstr "<b>Zunanji uporabnik</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4088
+#: ../src/protocols/sametime/sametime.c:4080
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Uporabniški ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4094
+#: ../src/protocols/sametime/sametime.c:4086
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Polno ime:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../src/protocols/sametime/sametime.c:4092
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Zadnjič razpoznan odjemalec:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4108
+#: ../src/protocols/sametime/sametime.c:4100
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Neznano (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4115
+#: ../src/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Podpira:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4121
+#: ../src/protocols/sametime/sametime.c:4113
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Stanje</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../src/protocols/sametime/sametime.c:4256
+#: ../src/protocols/sametime/sametime.c:5419
 msgid "User Name"
 msgstr "Uporabniško ime"
 
-#: ../src/protocols/sametime/sametime.c:4267
-#: ../src/protocols/sametime/sametime.c:5430
+#: ../src/protocols/sametime/sametime.c:4259
+#: ../src/protocols/sametime/sametime.c:5422
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../src/protocols/sametime/sametime.c:4283
 msgid "An ambiguous user ID was entered"
 msgstr "Vnesli ste dvoumen uporabniški ID"
 
-#: ../src/protocols/sametime/sametime.c:4292
+#: ../src/protocols/sametime/sametime.c:4284
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
 msgstr "Imenovalec '%s' se morda nanaša na vse naštete uporabnike. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: ../src/protocols/sametime/sametime.c:4297
+#: ../src/protocols/sametime/sametime.c:4289
 msgid "Select User"
 msgstr "Izberite uporabnika"
 
-#: ../src/protocols/sametime/sametime.c:4367
+#: ../src/protocols/sametime/sametime.c:4359
 msgid "Unable to add user: user not found"
 msgstr "Ni moč dodati uporabnika: ni ga mogoče najti"
 
-#: ../src/protocols/sametime/sametime.c:4369
+#: ../src/protocols/sametime/sametime.c:4361
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom v vaši skupnosti Sametime. Ta vnos je bil odstranjen iz vašega seznama prijateljev."
 
-#: ../src/protocols/sametime/sametime.c:4374
+#: ../src/protocols/sametime/sametime.c:4366
 msgid "Unable to add user"
 msgstr "Ni mogoče dodati uporabnika"
 
-#: ../src/protocols/sametime/sametime.c:4946
+#: ../src/protocols/sametime/sametime.c:4938
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10069,145 +10260,145 @@
 "Napaka pri branju datoteke %s: \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5077
+#: ../src/protocols/sametime/sametime.c:5069
 msgid "Remotely Stored Buddy List"
 msgstr "Oddaljeno shranjeni seznam prijateljev"
 
-#: ../src/protocols/sametime/sametime.c:5082
+#: ../src/protocols/sametime/sametime.c:5074
 msgid "Buddy List Storage Mode"
 msgstr "Način hrambe seznama prijateljev"
 
-#: ../src/protocols/sametime/sametime.c:5085
+#: ../src/protocols/sametime/sametime.c:5077
 msgid "Local Buddy List Only"
 msgstr "Le krajevni seznam prijateljev"
 
-#: ../src/protocols/sametime/sametime.c:5087
+#: ../src/protocols/sametime/sametime.c:5079
 msgid "Merge List from Server"
 msgstr "Spoji seznam prijateljev s strežnikovim"
 
-#: ../src/protocols/sametime/sametime.c:5089
+#: ../src/protocols/sametime/sametime.c:5081
 msgid "Merge and Save List to Server"
 msgstr "Spoji seznam prijateljev s strežnikovim in ga shrani"
 
-#: ../src/protocols/sametime/sametime.c:5091
+#: ../src/protocols/sametime/sametime.c:5083
 msgid "Synchronize List with Server"
 msgstr "Sinhroniziraj seznam s strežnikom"
 
-#: ../src/protocols/sametime/sametime.c:5140
+#: ../src/protocols/sametime/sametime.c:5132
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Uvozi seznam Sametime za račun %s"
 
-#: ../src/protocols/sametime/sametime.c:5179
+#: ../src/protocols/sametime/sametime.c:5171
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Izvozi seznam Sametime za račun %s"
 
-#: ../src/protocols/sametime/sametime.c:5232
+#: ../src/protocols/sametime/sametime.c:5224
 msgid "Unable to add group: group exists"
 msgstr "Skupine ni bilo mogoče dodati: že obstaja"
 
-#: ../src/protocols/sametime/sametime.c:5233
+#: ../src/protocols/sametime/sametime.c:5225
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Skupina z imenom '%s' že obstaja v vašem seznamu prijateljev."
 
-#: ../src/protocols/sametime/sametime.c:5236
-#: ../src/protocols/sametime/sametime.c:5365
+#: ../src/protocols/sametime/sametime.c:5228
+#: ../src/protocols/sametime/sametime.c:5357
 msgid "Unable to add group"
 msgstr "Skupine ni mogoče dodati"
 
-#: ../src/protocols/sametime/sametime.c:5295
+#: ../src/protocols/sametime/sametime.c:5287
 msgid "Possible Matches"
 msgstr "Možni zadetki"
 
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5303
 msgid "Notes Address Book group results"
 msgstr "Skupinski rezultati adresarjev zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
 msgstr "Imenovalec '%s' se morda nanaša na eno od naslednjih skupin adresarjev zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj seznam prijateljev."
 
-#: ../src/protocols/sametime/sametime.c:5317
+#: ../src/protocols/sametime/sametime.c:5309
 msgid "Select Notes Address Book"
 msgstr "Izberite adresar zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:5359
+#: ../src/protocols/sametime/sametime.c:5351
 msgid "Unable to add group: group not found"
 msgstr "Dodajanje skupine ni uspelo: skupina ne obstaja"
 
-#: ../src/protocols/sametime/sametime.c:5361
+#: ../src/protocols/sametime/sametime.c:5353
 #, c-format
 msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v vaši skupnosti Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../src/protocols/sametime/sametime.c:5394
 msgid "Notes Address Book Group"
 msgstr "Skupina adresarja zapiskov"
 
-#: ../src/protocols/sametime/sametime.c:5403
+#: ../src/protocols/sametime/sametime.c:5395
 msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
 msgstr "Vnesite ime skupine opomb adresarja v spodnje polje, s čimer boste lahko v seznam prijateljev vnesli skupino in njene člane."
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../src/protocols/sametime/sametime.c:5443
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultati iskanja za '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5452
+#: ../src/protocols/sametime/sametime.c:5444
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
 msgstr "Imenovalec '%s' se lahko nanaša na katerega koli od naštetih uporabnikov. Izberite ustreznega in ga dodajte na seznam prijateljev ali pa jim pošljite sporočila s spodnjimi gumbi."
 
-#: ../src/protocols/sametime/sametime.c:5484
+#: ../src/protocols/sametime/sametime.c:5476
 msgid "No matches"
 msgstr "Ni zadetkov"
 
-#: ../src/protocols/sametime/sametime.c:5485
+#: ../src/protocols/sametime/sametime.c:5477
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom vaše skupnosti Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5489
+#: ../src/protocols/sametime/sametime.c:5481
 msgid "No Matches"
 msgstr "Ni zadetkov"
 
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../src/protocols/sametime/sametime.c:5518
 msgid "Search for a user"
 msgstr "Išči uporabnike"
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../src/protocols/sametime/sametime.c:5519
 msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
 msgstr "Vnesite ime ali delni ID v spodnje polje za iskanje zadetkov v svoji skupnosti Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5530
+#: ../src/protocols/sametime/sametime.c:5522
 msgid "User Search"
 msgstr "Iskanje uporabnikov"
 
+#: ../src/protocols/sametime/sametime.c:5534
+msgid "Import Sametime List..."
+msgstr "Uvozi seznam Sametime ..."
+
+#: ../src/protocols/sametime/sametime.c:5538
+msgid "Export Sametime List..."
+msgstr "Izvozi seznam Sametime ..."
+
 #: ../src/protocols/sametime/sametime.c:5542
-msgid "Import Sametime List..."
-msgstr "Uvozi seznam Sametime ..."
+msgid "Add Notes Address Book Group..."
+msgstr "Dodaj skupino adresarja zapiskov ..."
 
 #: ../src/protocols/sametime/sametime.c:5546
-msgid "Export Sametime List..."
-msgstr "Izvozi seznam Sametime ..."
-
-#: ../src/protocols/sametime/sametime.c:5550
-msgid "Add Notes Address Book Group..."
-msgstr "Dodaj skupino adresarja zapiskov ..."
-
-#: ../src/protocols/sametime/sametime.c:5554
 msgid "User Search..."
 msgstr "Iskanje uporabnikov ..."
 
-#: ../src/protocols/sametime/sametime.c:5651
+#: ../src/protocols/sametime/sametime.c:5643
 msgid "Force login (ignore server redirects)"
 msgstr "Prisilna prijava (prezri strežniške preusmeritve)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5661
+#: ../src/protocols/sametime/sametime.c:5653
 msgid "Hide client identity"
 msgstr "Skrij identiteto odjemalca"
 
@@ -10319,7 +10510,7 @@
 
 #: ../src/protocols/silc/buddy.c:635
 #: ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
+#: ../src/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Ni mogoče naložiti javnega ključa"
 
@@ -10402,67 +10593,66 @@
 
 #: ../src/protocols/silc/buddy.c:1486
 #: ../src/protocols/silc/silc.c:672
-#: ../src/protocols/silc/util.c:473
+#: ../src/protocols/silc/util.c:487
 msgid "Happy"
 msgstr "Vesel"
 
 #: ../src/protocols/silc/buddy.c:1488
 #: ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:475
+#: ../src/protocols/silc/util.c:489
 msgid "Sad"
 msgstr "Žalosten"
 
 #: ../src/protocols/silc/buddy.c:1490
 #: ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:477
+#: ../src/protocols/silc/util.c:491
 msgid "Angry"
 msgstr "Jezen"
 
 #: ../src/protocols/silc/buddy.c:1492
 #: ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:479
+#: ../src/protocols/silc/util.c:493
 msgid "Jealous"
 msgstr "Ljubosumen"
 
 #: ../src/protocols/silc/buddy.c:1494
 #: ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:481
+#: ../src/protocols/silc/util.c:495
 msgid "Ashamed"
 msgstr "Osramočen"
 
 #: ../src/protocols/silc/buddy.c:1496
 #: ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:483
+#: ../src/protocols/silc/util.c:497
 msgid "Invincible"
 msgstr "Nepremagljiv"
 
 #: ../src/protocols/silc/buddy.c:1498
-#: ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/util.c:499
 msgid "In Love"
 msgstr "Zaljubljen"
 
 #: ../src/protocols/silc/buddy.c:1500
 #: ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:487
+#: ../src/protocols/silc/util.c:501
 msgid "Sleepy"
 msgstr "Zaspan"
 
 #: ../src/protocols/silc/buddy.c:1502
 #: ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:489
+#: ../src/protocols/silc/util.c:503
 msgid "Bored"
 msgstr "Zdolgočasen"
 
 #: ../src/protocols/silc/buddy.c:1504
 #: ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:491
+#: ../src/protocols/silc/util.c:505
 msgid "Excited"
 msgstr "Razburjen"
 
 #: ../src/protocols/silc/buddy.c:1506
 #: ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:493
+#: ../src/protocols/silc/util.c:507
 msgid "Anxious"
 msgstr "Vznemirjen"
 
@@ -10525,7 +10715,7 @@
 msgstr "Ubij uporabnika"
 
 #: ../src/protocols/silc/buddy.c:1670
-#: ../src/protocols/silc/chat.c:971
+#: ../src/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Riši po tabli"
 
@@ -10539,7 +10729,7 @@
 msgstr "kanal %s ne obstaja v omrežju"
 
 #: ../src/protocols/silc/chat.c:81
-#: ../src/protocols/silc/chat.c:173
+#: ../src/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Informacije o kanalu"
 
@@ -10567,177 +10757,178 @@
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifra kanala:</b> %s"
 
-#: ../src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../src/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC kanala:</b> %s"
 
-#: ../src/protocols/silc/chat.c:146
+#: ../src/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema kanala:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:151
+#: ../src/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Načini kanala:</b> "
 
-#: ../src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Prstni odtis ključa ustanovitelja:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:165
+#: ../src/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Odtis ključa ustanovitelja:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Dodaj javni ključ kanala"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:290
+#: ../src/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Odpri javni ključ ..."
 
-#: ../src/protocols/silc/chat.c:399
+#: ../src/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Geslo kanala"
 
-#: ../src/protocols/silc/chat.c:406
+#: ../src/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Seznam javnih ključev kanala"
 
-#: ../src/protocols/silc/chat.c:411
+#: ../src/protocols/silc/chat.c:412
 msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
 msgstr "Overovitev kanala služi obrambi kanala pred neavtoriziranim dostopom. Overovitev lahko temelji na geslih in digitalnih podpisih. Če je geslo nastavljeno, je potrebno za pridružitev. Če so nastavljeni javni ključi kanala, se mu lahko pridružijo le uporabniki, katerih ključi so na seznamu."
 
-#: ../src/protocols/silc/chat.c:420
 #: ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458
+#: ../src/protocols/silc/chat.c:422
 #: ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
+#: ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Overovitev kanala"
 
-#: ../src/protocols/silc/chat.c:422
-#: ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:423
+#: ../src/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Dodaj / odstrani"
 
-#: ../src/protocols/silc/chat.c:577
+#: ../src/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: ../src/protocols/silc/chat.c:581
+#: ../src/protocols/silc/chat.c:582
 #: ../src/protocols/silc/ops.c:1908
 #: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Geslo"
 
-#: ../src/protocols/silc/chat.c:592
+#: ../src/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Vnesite ime zasebne skupine kanala %s in njeno geslo."
 
-#: ../src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Dodaj zasebno skupino kanala"
 
-#: ../src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Meja uporabnikov"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../src/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Nastavite mejo uporabnikov kanala. Izberite 0 za ponastavitev meje."
 
-#: ../src/protocols/silc/chat.c:877
+#: ../src/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Informacije"
 
-#: ../src/protocols/silc/chat.c:885
+#: ../src/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Seznam povabljenih"
 
-#: ../src/protocols/silc/chat.c:890
+#: ../src/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Seznam prepovedanih"
 
-#: ../src/protocols/silc/chat.c:898
+#: ../src/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Dodaj zasebno skupino"
 
-#: ../src/protocols/silc/chat.c:911
+#: ../src/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Začasno ponastavi"
 
-#: ../src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Začasno nastavi"
 
-#: ../src/protocols/silc/chat.c:924
+#: ../src/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Nastavi mejo uporabnikov"
 
-#: ../src/protocols/silc/chat.c:930
+#: ../src/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Ponastavi omejitev teme"
 
-#: ../src/protocols/silc/chat.c:935
+#: ../src/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Nastavi omejitev teme"
 
-#: ../src/protocols/silc/chat.c:942
+#: ../src/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Ponastavi zasebni kanal"
 
-#: ../src/protocols/silc/chat.c:947
+#: ../src/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Nastavi zasebni kanal"
 
-#: ../src/protocols/silc/chat.c:954
+#: ../src/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Ponastavi skrivni kanal"
 
-#: ../src/protocols/silc/chat.c:959
+#: ../src/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Nastavi skrivni kanal"
 
-#: ../src/protocols/silc/chat.c:1033
+#: ../src/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Ste ustanovitelj kanala <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1037
+#: ../src/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Ustanovitelj kanala na <I>%s</I> je <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1096
+#: ../src/protocols/silc/chat.c:1097
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "Preden se pridružite zasebni skupini, se morate pridružiti kanalu %s"
 
-#: ../src/protocols/silc/chat.c:1098
+#: ../src/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Pridruži se zasebni skupini"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../src/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Ni se mogoče pridružiti zasebni skupini"
 
-#: ../src/protocols/silc/chat.c:1293
+#: ../src/protocols/silc/chat.c:1294
 #: ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "Ukaz klica"
 
-#: ../src/protocols/silc/chat.c:1293
+#: ../src/protocols/silc/chat.c:1294
 #: ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Ni mogoče klicati ukaza"
 
-#: ../src/protocols/silc/chat.c:1294
+#: ../src/protocols/silc/chat.c:1295
 #: ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Neznan ukaz"
@@ -10853,10 +11044,6 @@
 msgid "Birth Day"
 msgstr "Rojstni dan"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "Naziv službe"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Funkcija v službi"
@@ -10870,10 +11057,6 @@
 msgid "Unit"
 msgstr "Enota"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "E-pošta"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Opomba"
@@ -10882,6 +11065,12 @@
 msgid "Join Chat"
 msgstr "Pridruži se klepetu"
 
+#: ../src/protocols/silc/ops.c:1183
+#: ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "Resnično ime"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Besedilo stanja"
@@ -11159,6 +11348,10 @@
 msgid "Your Current Mood"
 msgstr "Vaše trenutno razpoloženje"
 
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "Zaljubljen"
+
 #: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
@@ -11168,18 +11361,17 @@
 "Vaša priljubljena metoda stikov"
 
 #: ../src/protocols/silc/silc.c:703
-#: ../src/protocols/silc/util.c:518
+#: ../src/protocols/silc/util.c:532
 msgid "SMS"
 msgstr "SMS"
 
 #: ../src/protocols/silc/silc.c:705
-#: ../src/protocols/silc/util.c:520
+#: ../src/protocols/silc/util.c:534
 msgid "MMS"
 msgstr "MMS"
 
 #: ../src/protocols/silc/silc.c:707
-#: ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+msgid "Video conferencing"
 msgstr "Video-konferenca"
 
 #: ../src/protocols/silc/silc.c:712
@@ -11213,7 +11405,7 @@
 
 #: ../src/protocols/silc/silc.c:789
 #: ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1435
+#: ../src/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr "Sporočilo dneva"
 
@@ -11222,7 +11414,7 @@
 msgstr "Sporočilo dneva ni na voljo"
 
 #: ../src/protocols/silc/silc.c:790
-#: ../src/protocols/silc/silc.c:1430
+#: ../src/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr "S to povezavo ni povezano nobeno sporočilo dneva"
 
@@ -11253,13 +11445,9 @@
 msgid "Private key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: ../src/protocols/silc/silc.c:937
-msgid "Real Name"
-msgstr "Resnično ime"
-
 #: ../src/protocols/silc/silc.c:951
-msgid "Re-type Passphrase"
-msgstr "Ponovno vnesite geslo"
+msgid "Passphrase (retype)"
+msgstr "Geslo (ponovno vtipkajte)"
 
 #: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
@@ -11282,149 +11470,149 @@
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Uporabnik <I>%s</I> ni prisoten v omrežju"
 
-#: ../src/protocols/silc/silc.c:1306
+#: ../src/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr "Temal je predolga."
 
-#: ../src/protocols/silc/silc.c:1387
+#: ../src/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr "Določiti morate vzdevek"
 
-#: ../src/protocols/silc/silc.c:1489
+#: ../src/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr "kanala %s ni mogoče najti"
 
-#: ../src/protocols/silc/silc.c:1494
+#: ../src/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "načini kanala za %s: %s"
 
-#: ../src/protocols/silc/silc.c:1496
+#: ../src/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "načini kanala za %s niso nastavljeni"
 
-#: ../src/protocols/silc/silc.c:1509
+#: ../src/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ni mogoče nastaviti načinov za %s"
 
-#: ../src/protocols/silc/silc.c:1539
+#: ../src/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Neznan ukaz: %s, (morda hrošč v Gaimu)"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  Zapusti klepet"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]:  Zapusti klepet"
 
-#: ../src/protocols/silc/silc.c:1610
+#: ../src/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nova tema&gt;]:  Ogled ali sprememba teme"
 
-#: ../src/protocols/silc/silc.c:1615
+#: ../src/protocols/silc/silc.c:1614
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanal&gt; [&lt;geslo&gt;]:  Pridruži se klepetu na tem omrežju"
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../src/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list:  Seznam kanalov na tem omrežju"
 
-#: ../src/protocols/silc/silc.c:1623
+#: ../src/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;vzdevek&gt;:  Oglej si informacije vzdevka"
 
-#: ../src/protocols/silc/silc.c:1627
+#: ../src/protocols/silc/silc.c:1626
 #: ../src/protocols/zephyr/zephyr.c:2622
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku"
 
-#: ../src/protocols/silc/silc.c:1631
+#: ../src/protocols/silc/silc.c:1630
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;vzdevek&gt; [&lt;sporočilo&gt;]:  Pošlji zasebno sporočilo uporabniku"
 
-#: ../src/protocols/silc/silc.c:1635
+#: ../src/protocols/silc/silc.c:1634
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Ogled sporočila dneva na strežniku"
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr "odpni:  Odpni to sejo"
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [sporočilo]:  Prekini povezavo s strežnikom z možnostjo sporočila"
 
-#: ../src/protocols/silc/silc.c:1647
+#: ../src/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu"
 
-#: ../src/protocols/silc/silc.c:1653
+#: ../src/protocols/silc/silc.c:1652
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;vzdevek&gt; [-javniključ|&lt;razlog&gt;]:  Ubij vzdevek"
 
-#: ../src/protocols/silc/silc.c:1657
+#: ../src/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novvzdevek&gt;:  Spremenite vaš vzdevek"
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;vzdevek&gt;:  Ogled informacij o vzdevku"
 
-#: ../src/protocols/silc/silc.c:1665
+#: ../src/protocols/silc/silc.c:1664
 msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
 msgstr "cmode &lt;kanall&gt; [+|-&lt;načini&gt;] [argumenti]:  Spremeni ali prikaži načine kanala"
 
-#: ../src/protocols/silc/silc.c:1669
+#: ../src/protocols/silc/silc.c:1668
 msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
 msgstr "cumode &lt;kanal&gt; +|-&lt;načini&gt; &lt;vzdevek&gt;:  Spremeni načine vzdevka na kanalu"
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1672
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;načiniuporabnika&gt;:  Nastavite vaše načine v omrežju"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1676
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;vzdevek&gt; [-javniključ]:  Dodeli pravice operaterju strežnika"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1680
 msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
 msgstr "invite &lt;kanal&gt; [-|+]&lt;vzdevek&gt;:  povabi vzdevek ali dodaj/odstrani iz seznama povabljenih na kanal"
 
-#: ../src/protocols/silc/silc.c:1685
+#: ../src/protocols/silc/silc.c:1684
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kanal&gt; &lt;vzdevek&gt; [komentar]:  Brcni odjemalca s kanala"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr "info [strežnik]:  Ogled skrbniških podrobnosti strežnika"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1692
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;vzdevek&gt;]:  Prepovaj odjemalca na kanalu"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;vzdevek|strežnik&gt;:  Pridobi javni ključ odjemalca ali strežnika"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Ogled statistike omrežja in strežnika"
 
-#: ../src/protocols/silc/silc.c:1705
+#: ../src/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Pošlji PING povezanemu strežniku"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1709
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Navedi uporabnike v kanalu"
 
-#: ../src/protocols/silc/silc.c:1714
+#: ../src/protocols/silc/silc.c:1713
 msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
 msgstr "names [-št|-op|-polop|-glas|-navadni] &lt;kanal(i)&gt;:  Seznam določenih uporabnikov na kanalu(ih)"
 
@@ -11437,112 +11625,112 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1823
+#: ../src/protocols/silc/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "Vstavek za protokol SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1825
+#: ../src/protocols/silc/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol SILC (Varen internetni konferenčni sistem v živo)"
 
-#: ../src/protocols/silc/silc.c:1862
+#: ../src/protocols/silc/silc.c:1861
 msgid "Public Key file"
 msgstr "Datoteka z javnim ključem"
 
-#: ../src/protocols/silc/silc.c:1866
+#: ../src/protocols/silc/silc.c:1865
 msgid "Private Key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: ../src/protocols/silc/silc.c:1876
+#: ../src/protocols/silc/silc.c:1875
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../src/protocols/silc/silc.c:1886
+#: ../src/protocols/silc/silc.c:1885
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1889
+#: ../src/protocols/silc/silc.c:1888
 msgid "Public key authentication"
 msgstr "Overovitev javnega ključa"
 
-#: ../src/protocols/silc/silc.c:1892
+#: ../src/protocols/silc/silc.c:1891
 msgid "Reject watching by other users"
 msgstr "Zavrni ogledovanje drugih uporabnikov"
 
-#: ../src/protocols/silc/silc.c:1895
+#: ../src/protocols/silc/silc.c:1894
 msgid "Block invites"
 msgstr "Zavrni povabljene"
 
-#: ../src/protocols/silc/silc.c:1898
+#: ../src/protocols/silc/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Zavrni neposredno sporočanje brez izmenjave ključev"
 
-#: ../src/protocols/silc/silc.c:1901
+#: ../src/protocols/silc/silc.c:1900
 msgid "Reject online status attribute requests"
 msgstr "Zavrni zahtevke atributov stanja uporabnikov na zvezi"
 
-#: ../src/protocols/silc/silc.c:1904
+#: ../src/protocols/silc/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Blokiraj sporočila na tablo"
 
-#: ../src/protocols/silc/silc.c:1907
+#: ../src/protocols/silc/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Samodejno odpri tablo"
 
-#: ../src/protocols/silc/silc.c:1910
+#: ../src/protocols/silc/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Digitalno podpiši in preveri vsa sporočila"
 
-#: ../src/protocols/silc/util.c:206
-#: ../src/protocols/silc/util.c:231
+#: ../src/protocols/silc/util.c:207
+#: ../src/protocols/silc/util.c:233
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para ključev SILC ..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:314
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Pravo ime: \t%s\n"
 
-#: ../src/protocols/silc/util.c:316
+#: ../src/protocols/silc/util.c:330
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Uporabniško ime: \t%s\n"
 
-#: ../src/protocols/silc/util.c:318
-#, c-format
-msgid "EMail: \t\t%s\n"
+#: ../src/protocols/silc/util.c:332
+#, c-format
+msgid "E-Mail: \t\t%s\n"
 msgstr "E-pošta: \t\t%s\n"
 
-#: ../src/protocols/silc/util.c:320
+#: ../src/protocols/silc/util.c:334
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Ime gostitelja: \t%s\n"
 
-#: ../src/protocols/silc/util.c:322
+#: ../src/protocols/silc/util.c:336
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizacija: \t%s\n"
 
-#: ../src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:338
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Država: \t%s\n"
 
-#: ../src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:339
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritem: \t%s\n"
 
-#: ../src/protocols/silc/util.c:326
-#, c-format
-msgid "Key length: \t%d bits\n"
+#: ../src/protocols/silc/util.c:340
+#, c-format
+msgid "Key Length: \t%d bits\n"
 msgstr "Dolžina ključa: \t%d bitov\n"
 
-#: ../src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:342
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11553,7 +11741,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:329
+#: ../src/protocols/silc/util.c:343
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11562,24 +11750,28 @@
 "Odtis javnega ključa:\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:333
-#: ../src/protocols/silc/util.c:334
+#: ../src/protocols/silc/util.c:347
+#: ../src/protocols/silc/util.c:348
 msgid "Public Key Information"
 msgstr "Informacije o javnem ključu"
 
-#: ../src/protocols/silc/util.c:516
+#: ../src/protocols/silc/util.c:530
 msgid "Paging"
 msgstr "Ostranjevanje"
 
-#: ../src/protocols/silc/util.c:540
+#: ../src/protocols/silc/util.c:536
+msgid "Video Conferencing"
+msgstr "Video-konferenca"
+
+#: ../src/protocols/silc/util.c:554
 msgid "Computer"
 msgstr "Računalnik"
 
-#: ../src/protocols/silc/util.c:544
+#: ../src/protocols/silc/util.c:558
 msgid "PDA"
 msgstr "PDA"
 
-#: ../src/protocols/silc/util.c:546
+#: ../src/protocols/silc/util.c:560
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -11598,31 +11790,31 @@
 msgstr "Tabla"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:409
+#: ../src/protocols/simple/simple.c:411
 msgid "Could not write"
 msgstr "Ni mogoče pisati"
 
-#: ../src/protocols/simple/simple.c:424
-#: ../src/protocols/simple/simple.c:1422
+#: ../src/protocols/simple/simple.c:426
+#: ../src/protocols/simple/simple.c:1425
 msgid "Could not connect"
 msgstr "Povezava ni uspela"
 
-#: ../src/protocols/simple/simple.c:994
+#: ../src/protocols/simple/simple.c:997
 msgid "Wrong Password"
 msgstr "Napačno geslo"
 
-#: ../src/protocols/simple/simple.c:1453
-#: ../src/protocols/simple/simple.c:1492
-#: ../src/protocols/simple/simple.c:1504
-#: ../src/protocols/simple/simple.c:1551
+#: ../src/protocols/simple/simple.c:1456
+#: ../src/protocols/simple/simple.c:1495
+#: ../src/protocols/simple/simple.c:1507
+#: ../src/protocols/simple/simple.c:1565
 msgid "Could not create listen socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: ../src/protocols/simple/simple.c:1474
+#: ../src/protocols/simple/simple.c:1477
 msgid "Couldn't resolve host"
 msgstr "Gostitelja ni mogoče razbrati"
 
-#: ../src/protocols/simple/simple.c:1572
+#: ../src/protocols/simple/simple.c:1587
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Uporabniška imena SIP ne smejo vsebovati presledka ali simbola @"
 
@@ -11634,36 +11826,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1734
+#: ../src/protocols/simple/simple.c:1749
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1735
+#: ../src/protocols/simple/simple.c:1750
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
-#: ../src/protocols/simple/simple.c:1757
+#: ../src/protocols/simple/simple.c:1772
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
 
-#: ../src/protocols/simple/simple.c:1763
+#: ../src/protocols/simple/simple.c:1778
 msgid "Use UDP"
 msgstr "Uporabi UDP"
 
-#: ../src/protocols/simple/simple.c:1765
+#: ../src/protocols/simple/simple.c:1780
 msgid "Use proxy"
 msgstr "Uporabi prehod (proxy)"
 
-#: ../src/protocols/simple/simple.c:1767
+#: ../src/protocols/simple/simple.c:1782
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/simple/simple.c:1784
 msgid "Auth User"
 msgstr "Avtoriziraj uporabnika"
 
-#: ../src/protocols/simple/simple.c:1771
+#: ../src/protocols/simple/simple.c:1786
 msgid "Auth Domain"
 msgstr "Avtoriziraj domeno"
 
@@ -11826,10 +12018,6 @@
 msgid "Get Dir Info"
 msgstr "Prikaži imeniške podatke"
 
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Nastavi informacije o uporabniku"
-
 #: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Nastavi imeniške podatke"
@@ -11891,24 +12079,16 @@
 msgid "TOC Protocol Plugin"
 msgstr "Dodatek za protokol TOC"
 
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr "TOC gostitelj"
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr "TOC vrata"
-
-#: ../src/protocols/yahoo/yahoo.c:712
+#: ../src/protocols/yahoo/yahoo.c:710
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše sporočilo za Yahoo! ni bilo poslano."
 
-#: ../src/protocols/yahoo/yahoo.c:766
-#: ../src/protocols/yahoo/yahoo.c:3563
+#: ../src/protocols/yahoo/yahoo.c:764
+#: ../src/protocols/yahoo/yahoo.c:3564
 msgid "Buzz!!"
 msgstr "Brrr!!"
 
-#: ../src/protocols/yahoo/yahoo.c:811
+#: ../src/protocols/yahoo/yahoo.c:809
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Sistemsko sporočilo Yahoo! za %s:"
@@ -11916,200 +12096,200 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:907
+#: ../src/protocols/yahoo/yahoo.c:905
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Uporabnik %s želi dodati %s na svoj seznam prijateljev%s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:913
+#: ../src/protocols/yahoo/yahoo.c:911
 msgid "Message (optional) :"
 msgstr "Sporočilo (dodatno):"
 
-#: ../src/protocols/yahoo/yahoo.c:955
+#: ../src/protocols/yahoo/yahoo.c:953
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s je (že prej) zavrnil vašo zahtevo, da ga smete dodati na svoj seznam."
 
-#: ../src/protocols/yahoo/yahoo.c:958
+#: ../src/protocols/yahoo/yahoo.c:956
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
 msgstr "%s je (že prej) zavrnil vašo zahtevo, da bi ga dodali na svoj seznam prijateljev zaradi naslednjega razloga: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:961
+#: ../src/protocols/yahoo/yahoo.c:959
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
-#: ../src/protocols/yahoo/yahoo.c:1704
+#: ../src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
 msgstr "Strežnik Yahoo je zahteval uporabo neprepoznane metode overovitve. Ta različica Gaima se verjetno ne bo uspešno prijavila na Yahoo. Preverite %s za posodobitve."
 
-#: ../src/protocols/yahoo/yahoo.c:1707
+#: ../src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Napaka pri overovitvi Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1773
+#: ../src/protocols/yahoo/yahoo.c:1771
 #, c-format
 msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
 msgstr "Poskusili ste prezreti uporabnika %s, ki je na vašem seznamu prijateljev. Če kliknete \"Da\" boste odstranili prijatelja in ga prezrli."
 
-#: ../src/protocols/yahoo/yahoo.c:1776
+#: ../src/protocols/yahoo/yahoo.c:1774
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-#: ../src/protocols/yahoo/yahoo.c:1810
+#: ../src/protocols/yahoo/yahoo.c:1808
 msgid "Invalid username."
 msgstr "Neveljavno uporabniško ime."
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1819
 msgid "Normal authentication failed!"
 msgstr "Navadna overovitev ni uspela!"
 
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
 msgstr "Navadna metoda overovitve je spodletela. To lahko pomeni, da je napačno vaše geslo ali pa se je spremenila shema overovitve Yahoo! Gaim se bo zdaj poskušal prijaviti z uporabo overovitve Web Messengerja, kar se bo odrazilo v manj možnostih."
 
-#: ../src/protocols/yahoo/yahoo.c:1830
+#: ../src/protocols/yahoo/yahoo.c:1828
 msgid "Incorrect password."
 msgstr "Neveljavno geslo."
 
-#: ../src/protocols/yahoo/yahoo.c:1833
+#: ../src/protocols/yahoo/yahoo.c:1831
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Vaš račun je zaklenjen. Prijavite se na spletno stran Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1836
+#: ../src/protocols/yahoo/yahoo.c:1834
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to odpravi."
 
-#: ../src/protocols/yahoo/yahoo.c:1890
+#: ../src/protocols/yahoo/yahoo.c:1888
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1893
+#: ../src/protocols/yahoo/yahoo.c:1891
 msgid "Could not add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
-#: ../src/protocols/yahoo/yahoo.c:2012
+#: ../src/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2151
-#: ../src/protocols/yahoo/yahoo.c:2298
-#: ../src/protocols/yahoo/yahoo.c:2313
+#: ../src/protocols/yahoo/yahoo.c:2149
+#: ../src/protocols/yahoo/yahoo.c:2296
+#: ../src/protocols/yahoo/yahoo.c:2311
 #: ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Ni mogoče brati"
 
-#: ../src/protocols/yahoo/yahoo.c:2337
-#: ../src/protocols/yahoo/yahoo.c:2494
-#: ../src/protocols/yahoo/yahoo.c:2596
-#: ../src/protocols/yahoo/yahoo.c:2606
+#: ../src/protocols/yahoo/yahoo.c:2335
+#: ../src/protocols/yahoo/yahoo.c:2492
+#: ../src/protocols/yahoo/yahoo.c:2594
+#: ../src/protocols/yahoo/yahoo.c:2604
 #: ../src/protocols/yahoo/yahoochat.c:1447
 #: ../src/protocols/yahoo/yahoochat.c:1517
 #: ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Težava s povezavo"
 
-#: ../src/protocols/yahoo/yahoo.c:2715
-#: ../src/protocols/yahoo/yahoo.c:3296
+#: ../src/protocols/yahoo/yahoo.c:2711
+#: ../src/protocols/yahoo/yahoo.c:3298
 msgid "Not at Home"
 msgstr "Nisem doma"
 
-#: ../src/protocols/yahoo/yahoo.c:2717
-#: ../src/protocols/yahoo/yahoo.c:3299
+#: ../src/protocols/yahoo/yahoo.c:2713
+#: ../src/protocols/yahoo/yahoo.c:3301
 msgid "Not at Desk"
 msgstr "Nisem za mizo"
 
-#: ../src/protocols/yahoo/yahoo.c:2719
-#: ../src/protocols/yahoo/yahoo.c:3302
+#: ../src/protocols/yahoo/yahoo.c:2715
+#: ../src/protocols/yahoo/yahoo.c:3304
 msgid "Not in Office"
 msgstr "Nisem v pisarni"
 
-#: ../src/protocols/yahoo/yahoo.c:2723
-#: ../src/protocols/yahoo/yahoo.c:3308
+#: ../src/protocols/yahoo/yahoo.c:2719
+#: ../src/protocols/yahoo/yahoo.c:3310
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: ../src/protocols/yahoo/yahoo.c:2727
-#: ../src/protocols/yahoo/yahoo.c:3314
+#: ../src/protocols/yahoo/yahoo.c:2723
+#: ../src/protocols/yahoo/yahoo.c:3316
 msgid "Stepped Out"
 msgstr "Šel na pavzo"
 
-#: ../src/protocols/yahoo/yahoo.c:2820
-#: ../src/protocols/yahoo/yahoo.c:2850
+#: ../src/protocols/yahoo/yahoo.c:2816
+#: ../src/protocols/yahoo/yahoo.c:2846
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-#: ../src/protocols/yahoo/yahoo.c:2867
-#: ../src/protocols/yahoo/yahoo.c:2926
+#: ../src/protocols/yahoo/yahoo.c:2863
+#: ../src/protocols/yahoo/yahoo.c:2922
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: ../src/protocols/yahoo/yahoo.c:2870
-#: ../src/protocols/yahoo/yahoo.c:2947
+#: ../src/protocols/yahoo/yahoo.c:2866
+#: ../src/protocols/yahoo/yahoo.c:2943
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: ../src/protocols/yahoo/yahoo.c:2889
+#: ../src/protocols/yahoo/yahoo.c:2885
 msgid "Presence"
 msgstr "Prisotnost"
 
-#: ../src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:2928
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../src/protocols/yahoo/yahoo.c:2941
+#: ../src/protocols/yahoo/yahoo.c:2937
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../src/protocols/yahoo/yahoo.c:2989
+#: ../src/protocols/yahoo/yahoo.c:2985
 msgid "Join in Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../src/protocols/yahoo/yahoo.c:2995
+#: ../src/protocols/yahoo/yahoo.c:2991
 msgid "Initiate Conference"
 msgstr "Začni konferenčni pogovor"
 
-#: ../src/protocols/yahoo/yahoo.c:3023
+#: ../src/protocols/yahoo/yahoo.c:3019
 msgid "Presence Settings"
 msgstr "Nastavitve prisotnosti"
 
-#: ../src/protocols/yahoo/yahoo.c:3029
+#: ../src/protocols/yahoo/yahoo.c:3025
 msgid "Start Doodling"
 msgstr "Začni Doodlati"
 
-#: ../src/protocols/yahoo/yahoo.c:3061
+#: ../src/protocols/yahoo/yahoo.c:3057
 msgid "Active which ID?"
 msgstr "Kateri ID naj aktiviram?"
 
-#: ../src/protocols/yahoo/yahoo.c:3070
+#: ../src/protocols/yahoo/yahoo.c:3066
 msgid "Join who in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
 
+#: ../src/protocols/yahoo/yahoo.c:3076
+msgid "Activate ID..."
+msgstr "Aktiviraj ID ..."
+
 #: ../src/protocols/yahoo/yahoo.c:3080
-msgid "Activate ID..."
-msgstr "Aktiviraj ID ..."
-
-#: ../src/protocols/yahoo/yahoo.c:3084
 msgid "Join User in Chat..."
 msgstr "Pridruži se uporabniku v pomenku ..."
 
-#: ../src/protocols/yahoo/yahoo.c:3622
+#: ../src/protocols/yahoo/yahoo.c:3623
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;soba&gt;:  Pridružite se klepetalnici v omrežju Yahoo."
 
-#: ../src/protocols/yahoo/yahoo.c:3627
+#: ../src/protocols/yahoo/yahoo.c:3628
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Seznam sob na omrežju Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3631
+#: ../src/protocols/yahoo/yahoo.c:3632
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Pozvonite (buzznite) pri prijatelju, da vas bo opazil"
 
-#: ../src/protocols/yahoo/yahoo.c:3635
+#: ../src/protocols/yahoo/yahoo.c:3636
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
 
@@ -12123,58 +12303,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3728
-#: ../src/protocols/yahoo/yahoo.c:3730
+#: ../src/protocols/yahoo/yahoo.c:3729
+#: ../src/protocols/yahoo/yahoo.c:3731
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatek za protokol Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3747
+#: ../src/protocols/yahoo/yahoo.c:3748
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: ../src/protocols/yahoo/yahoo.c:3750
-msgid "Pager host"
-msgstr "Strežnik za pozivnik"
-
-#: ../src/protocols/yahoo/yahoo.c:3753
-msgid "Japan Pager host"
-msgstr "Japonski gostitelj pozivnika"
-
-#: ../src/protocols/yahoo/yahoo.c:3756
+#: ../src/protocols/yahoo/yahoo.c:3751
+msgid "Pager server"
+msgstr "Strežnik pozivnika"
+
+#: ../src/protocols/yahoo/yahoo.c:3754
+msgid "Japan Pager server"
+msgstr "Japonski strežnik pozivnika"
+
+#: ../src/protocols/yahoo/yahoo.c:3757
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: ../src/protocols/yahoo/yahoo.c:3759
-msgid "File transfer host"
-msgstr "Gostitelj prenosa datotek"
-
-#: ../src/protocols/yahoo/yahoo.c:3762
-msgid "Japan file transfer host"
-msgstr "Japonski gostitelj prenosa datotek"
-
-#: ../src/protocols/yahoo/yahoo.c:3765
+#: ../src/protocols/yahoo/yahoo.c:3760
+msgid "File transfer server"
+msgstr "Strežnik prenosa datotek"
+
+#: ../src/protocols/yahoo/yahoo.c:3763
+msgid "Japan file transfer server"
+msgstr "Japonski strežnik prenosa datotek"
+
+#: ../src/protocols/yahoo/yahoo.c:3766
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: ../src/protocols/yahoo/yahoo.c:3768
+#: ../src/protocols/yahoo/yahoo.c:3769
 msgid "Chat room locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: ../src/protocols/yahoo/yahoo.c:3771
+#: ../src/protocols/yahoo/yahoo.c:3772
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-#: ../src/protocols/yahoo/yahoo.c:3775
+#: ../src/protocols/yahoo/yahoo.c:3776
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
-#: ../src/protocols/yahoo/yahoo.c:3778
-msgid "YCHT host"
-msgstr "Gostitelj YCHT"
-
-#: ../src/protocols/yahoo/yahoo.c:3781
-msgid "YCHT port"
-msgstr "Vrata YCHT"
+#: ../src/protocols/yahoo/yahoo.c:3779
+msgid "Yahoo Chat server"
+msgstr "Strežnik klepeta Yahoo"
+
+#: ../src/protocols/yahoo/yahoo.c:3782
+msgid "Yahoo Chat port"
+msgstr "Vrata klepeta Yahoo"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -12183,6 +12363,12 @@
 msgid "Sent Doodle request."
 msgstr "Pošlji zahtevo Doodle."
 
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+msgid "Unable to establish file descriptor."
+msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
+
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
 msgid "Write Error"
@@ -12451,6 +12637,14 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Dodatek za protokol Zephyr"
 
+#: ../src/protocols/zephyr/zephyr.c:2896
+msgid "Use tzc"
+msgstr "Uporabi tzc"
+
+#: ../src/protocols/zephyr/zephyr.c:2899
+msgid "tzc command"
+msgstr "ukaz tzc"
+
 #: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "Izvozi v .kdorkoli"
@@ -12475,28 +12669,38 @@
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
-#: ../src/proxy.c:1207
-#: ../src/proxy.c:1263
-#: ../src/proxy.c:1311
-#: ../src/proxy.c:1338
+#: ../src/proxy.c:1217
+#: ../src/proxy.c:1273
+#: ../src/proxy.c:1321
+#: ../src/proxy.c:1348
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Napaka pri povezavi strežnika proxy %d"
 
 #. Forbidden
-#: ../src/proxy.c:1327
+#: ../src/proxy.c:1337
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Dostop zavrnjen: strežnik proxy ne dovoljuje tuneliranja vrat %d."
 
-#: ../src/savedstatuses.c:514
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../src/request.h:1354
+msgid "_Accept"
+msgstr "_Sprejmi"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../src/savedstatuses.c:44
+msgid "I'm not here right now"
+msgstr "Trenutno nisem tukaj"
+
+#: ../src/savedstatuses.c:519
 msgid "saved statuses"
 msgstr "shranjena stanja"
 
-#: ../src/savedstatuses.c:767
-msgid "I'm not here right now"
-msgstr "Trenutno nisem tukaj"
-
 #: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
@@ -12532,42 +12736,37 @@
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s se je prijavil(a)"
-
-#: ../src/status.c:629
-#, c-format
-msgid "%s signed off"
-msgstr "%s se je odjavil(a)"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s came back"
-msgstr "%s se je vrnil"
-
-#: ../src/status.c:639
-#, c-format
-msgid "%s went away"
-msgstr "%s je postal odsoten"
-
-#: ../src/status.c:1330
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s je spremenil stanje iz %s v %s"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s je zdaj %s"
+
+#: ../src/status.c:637
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s ni nič več %s"
+
+#: ../src/status.c:1311
 #, c-format
 msgid "%s became idle"
 msgstr "%s je postal nedejaven"
 
-#: ../src/status.c:1347
+#: ../src/status.c:1328
 #, c-format
 msgid "%s became unidle"
 msgstr "%s je postal dejaven"
 
-#: ../src/status.c:1413
+#: ../src/status.c:1394
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s je postal nedejaven"
 
-#: ../src/status.c:1415
+#: ../src/status.c:1396
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s je postal dejaven"
@@ -12577,25 +12776,25 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2455
+#: ../src/util.c:2453
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: ../src/util.c:2456
+#: ../src/util.c:2454
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Pri branju vašega %s je prišlo do napake, zato ni bil naložen. Stara datoteka se je preimenovala v %s~."
 
-#: ../src/util.c:2895
+#: ../src/util.c:2903
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: ../src/util.c:2898
+#: ../src/util.c:2906
 msgid "Unknown."
 msgstr "Neznano."
 
-#: ../src/util.c:2924
+#: ../src/util.c:2932
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -12604,7 +12803,7 @@
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunde"
 
-#: ../src/util.c:2936
+#: ../src/util.c:2944
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -12613,7 +12812,7 @@
 msgstr[2] "%d dneva"
 msgstr[3] "%d dni"
 
-#: ../src/util.c:2944
+#: ../src/util.c:2952
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -12622,7 +12821,7 @@
 msgstr[2] "%s, %d uri"
 msgstr[3] "%s, %d ur"
 
-#: ../src/util.c:2950
+#: ../src/util.c:2958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -12631,7 +12830,7 @@
 msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
-#: ../src/util.c:2958
+#: ../src/util.c:2966
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -12640,7 +12839,7 @@
 msgstr[2] "%s, %d minuti"
 msgstr[3] "%s, %d minut"
 
-#: ../src/util.c:2964
+#: ../src/util.c:2972
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"