diff po/sl.po @ 11861:83e2fa10df1c

[gaim-migrate @ 14152] (16:18:11) rlaager: LSchiere2: make[2]: *** No rule to make target `el.po', needed by `el.gmo'. Stop. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 27 Oct 2005 20:22:27 +0000
parents f244cd5647af
children ac18b43b0495
line wrap: on
line diff
--- a/po/sl.po	Thu Oct 27 20:19:24 2005 +0000
+++ b/po/sl.po	Thu Oct 27 20:22:27 2005 +0000
@@ -8,30 +8,31 @@
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-08 00:02-0400\n"
+"POT-Creation-Date: 2005-10-27 16:12-0400\n"
 "PO-Revision-Date: 2005-10-09 19:21+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: LUGOS <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 
-#: plugins/autorecon.c:291
+#: plugins/autorecon.c:301
 msgid "Error Message Suppression"
 msgstr "Preziranje sporočil o napakah"
 
-#: plugins/autorecon.c:295
+#: plugins/autorecon.c:305
 msgid "Hide Disconnect Errors"
 msgstr "Skrij napake prekinjanja povezave"
 
-#: plugins/autorecon.c:299
+#: plugins/autorecon.c:309
 msgid "Hide Login Errors"
 msgstr "Skrij napake pri prijavljanju"
 
-#: plugins/autorecon.c:303
+#: plugins/autorecon.c:313
 msgid "Hide Reconnecting Dialog"
 msgstr "Skrij pogovorno okno ponovnega povezovanja"
 
@@ -55,7 +56,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:327
+#: plugins/autorecon.c:337
 msgid "Auto-Reconnect"
 msgstr "Samodejno se ponovno poveži"
 
@@ -67,8 +68,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:330
-#: plugins/autorecon.c:332
+#: plugins/autorecon.c:340 plugins/autorecon.c:342
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Ko boste brcnjeni, boste samodejno ponovno povezani."
 
@@ -95,13 +95,17 @@
 #. Explanation
 #: plugins/contact_priority.c:141
 msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used to be\n"
+"The buddy with the lowest score is the buddy who will have priority in the "
+"contact.\n"
+"The default values (offline = 4, away = 2, and idle = 1) will use what used "
+"to be\n"
 "the built-in order: active, idle, away, away + idle, offline."
 msgstr ""
 "Prijatelj z najmanj točkami ima prednost na seznamu stikov.\n"
-"Privzete vrednosti (ni na zvezi = 4, odsoten = 2 in nedejaven = 1) se ravnajo po\n"
-"vgrajenem vrstnem redu: dejaven, nedejaven, odsoten, odsoten+nedejaven, ni na zvezi."
+"Privzete vrednosti (ni na zvezi = 4, odsoten = 2 in nedejaven = 1) se "
+"ravnajo po\n"
+"vgrajenem vrstnem redu: dejaven, nedejaven, odsoten, odsoten+nedejaven, ni "
+"na zvezi."
 
 #: plugins/contact_priority.c:144
 msgid "Point values to use for account..."
@@ -121,13 +125,19 @@
 #. *< version
 #. *< summary
 #: plugins/contact_priority.c:198
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Omogoča nastavljanje vrednosti, povezanih z različnimi stanji prijateljev."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Omogoča nastavljanje vrednosti, povezanih z različnimi stanji prijateljev."
 
 #. *< description
 #: plugins/contact_priority.c:200
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "Omogoča nastavljanje vrednosti točk pri računanju prednosti stikov za stanja prijateljev nedejaven/odsoten/ni na zvezi."
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Omogoča nastavljanje vrednosti točk pri računanju prednosti stikov za stanja "
+"prijateljev nedejaven/odsoten/ni na zvezi."
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
@@ -144,100 +154,73 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Odsoten"
 
-#: plugins/docklet/docklet.c:136
+#: plugins/docklet/docklet.c:383
+#, fuzzy
+msgid "Show Buddy List"
+msgstr "Seznam prijateljev"
+
+#: plugins/docklet/docklet.c:390
 msgid "New Message..."
 msgstr "Novo sporočilo ..."
 
-#: plugins/docklet/docklet.c:137
+#: plugins/docklet/docklet.c:394
 msgid "Join A Chat..."
 msgstr "Pridruži se pomenku ..."
 
-#: plugins/docklet/docklet.c:172
-msgid "New..."
-msgstr "Novo ..."
-
-#: plugins/docklet/docklet.c:176
-#: src/gtkprefs.c:1818
-#: src/gtkstatusbox.c:306
-#: src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221
-#: src/protocols/jabber/buddy.c:1092
-#: src/protocols/jabber/jabber.c:1050
-#: src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825
-#: src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3047
-#: src/protocols/oscar/oscar.c:705
-#: src/protocols/oscar/oscar.c:6507
-#: src/protocols/oscar/oscar.c:6576
-#: src/protocols/oscar/oscar.c:7610
-#: src/protocols/oscar/oscar.c:7764
-#: src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52
-#: src/protocols/yahoo/yahoo.c:3251
-#: src/protocols/zephyr/zephyr.c:2259
-#: src/status.c:158
-msgid "Away"
-msgstr "Odsoten"
-
-#  else...
-#: plugins/docklet/docklet.c:184
-msgid "Back"
-msgstr "Nazaj"
-
-#: plugins/docklet/docklet.c:191
+#: plugins/docklet/docklet.c:399
 msgid "Mute Sounds"
 msgstr "Utišaj zvoke"
 
-#: plugins/docklet/docklet.c:198
-#: src/gtkft.c:691
+#: plugins/docklet/docklet.c:406 src/gtkft.c:691
 #: src/protocols/oscar/oscar.c:8357
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: plugins/docklet/docklet.c:199
-#: src/gtkaccount.c:2380
+#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
 msgid "Accounts"
 msgstr "Računi"
 
-#: plugins/docklet/docklet.c:200
-#: src/gtkprefs.c:2212
+#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: plugins/docklet/docklet.c:204
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: plugins/docklet/docklet.c:416
 msgid "Quit"
 msgstr "Končaj"
 
-#: plugins/docklet/docklet.c:529
-msgid "Tray Icon Configuration"
-msgstr "Nastavitve ikone na pladnju"
-
-#: plugins/docklet/docklet.c:533
-msgid "_Hide new messages until tray icon is clicked"
-msgstr "_Skrij nova sporočila, dokler ne kliknem ikone na pladnju"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:556
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:562
+#: plugins/docklet/docklet.c:559
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Prikaže ikono za Gaim v sistemskem pladnju."
 
 #. *  description
-#: plugins/docklet/docklet.c:564
-msgid "Displays a system tray icon (in GNOME, KDE or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list or login window. Also allows messages to be queued until the icon is clicked, similar to ICQ."
-msgstr "Prikaže ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s tem prikazuje trenutno stanje pogovorov ter omogoča lažji dostop do pogosto uporabljanih funkcij. S to ikono lahko tudi skrije oz. prikaže seznam stikov ali prijavni zaslon. Omogoča tudi čakanje sporočil, dokler ne kliknete ikone, podobno kot pri ICQ."
+#: plugins/docklet/docklet.c:561
+msgid ""
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+msgstr ""
+"Prikaže ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s "
+"tem prikazuje trenutno stanje pogovorov ter omogoča lažji dostop do pogosto "
+"uporabljanih funkcij. S to ikono lahko tudi skrije oz. prikaže seznam stikov "
+"ali prijavni zaslon. Omogoča tudi čakanje sporočil, dokler ne kliknete "
+"ikone, podobno kot pri ICQ."
 
 #: plugins/extplacement.c:79
 msgid "By conversation count"
@@ -274,8 +257,12 @@
 #. *< summary
 #. *  description
 #: plugins/extplacement.c:136
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Omeji število pomenkov po oknih z možnostjo ločitve oken za klepet in zasebni pomenek"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Omeji število pomenkov po oknih z možnostjo ločitve oken za klepet in "
+"zasebni pomenek"
 
 #. *< type
 #. *< ui_requirement
@@ -291,8 +278,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248
-#: plugins/filectl.c:250
+#: plugins/filectl.c:248 plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Omogoča nadzor nad Gaimom z vnašanjem ukazov v datoteko."
 
@@ -399,8 +385,7 @@
 msgid "Gaim GTK+ Theme Control"
 msgstr "Nadzor teme Gaim GTK+"
 
-#: plugins/gaimrc.c:462
-#: plugins/gaimrc.c:463
+#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Omogoča dostop do pogosto uporabljenih nastavitev gtkrc."
 
@@ -456,81 +441,72 @@
 "Povlecite navzgor in zatem levo, da se vrnete k prejšnjemu pogovoru.\n"
 "Povlecite navzgor in zatem desno, da se premaknete k naslednjemu pogovoru."
 
-#: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120
-#: src/gtkprefs.c:2066
-#: src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638
-#: src/protocols/msn/msn.c:1547
-#: src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/add_buddy_dialog.c:131
+#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
+#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
 msgid "Name"
 msgstr "Ime"
 
-#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "Neposredno sporočanje"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:459
+#: plugins/gevolution/add_buddy_dialog.c:458
 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:472
-#: plugins/gevolution/assoc-buddy.c:354
+#: plugins/gevolution/add_buddy_dialog.c:471
+#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
 #: src/protocols/oscar/oscar.c:8128
 msgid "Search"
 msgstr "Išči"
 
-#: plugins/gevolution/add_buddy_dialog.c:553
-#: plugins/gevolution/new_person_dialog.c:306
-#: src/gtkblist.c:4402
-#: src/gtkblist.c:4779
+#: plugins/gevolution/add_buddy_dialog.c:552
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
+#: src/gtkblist.c:4459
 msgid "Group:"
 msgstr "Skupina:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:579
-#: plugins/gevolution/assoc-buddy.c:466
+#: plugins/gevolution/add_buddy_dialog.c:578
+#: plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "Nova oseba"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:596
+#: plugins/gevolution/add_buddy_dialog.c:595
 msgid "Select Buddy"
 msgstr "Izberi prijatelja"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:341
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "Izberite osebo iz vašega imenika, ki ji želite dodati tega prijatelja, ali ustvarite novo osebo."
-
-#. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:429
-msgid "Show user details"
-msgstr "Pokaži podrobnosti o uporabniku"
-
-#: plugins/gevolution/assoc-buddy.c:430
-msgid "Hide user details"
+#: plugins/gevolution/assoc-buddy.c:340
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Izberite osebo iz vašega imenika, ki ji želite dodati tega prijatelja, ali "
+"ustvarite novo osebo."
+
+#. Add the expander
+#: plugins/gevolution/assoc-buddy.c:428
+#, fuzzy
+msgid "User _details"
 msgstr "Skrij podrobnosti o uporabniku"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:483
+#: plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "Pridruži prijatelj_a"
 
-#: plugins/gevolution/gevo-util.c:64
-#: plugins/gevolution/gevolution.c:96
-#: src/blist.c:518
-#: src/blist.c:1259
-#: src/blist.c:1480
-#: src/gtkblist.c:4219
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
+#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Prijatelji"
 
-#: plugins/gevolution/gevolution.c:262
-#: plugins/gevolution/gevolution.c:268
+#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
 msgstr "E-sporočila ni bilo moč poslati."
 
@@ -560,9 +536,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Izberite vse račune, katerim naj se samodejno dodajo prijatelji."
 
-#: plugins/gevolution/gevolution.c:447
-#: plugins/idle.c:111
-#: plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
 msgid "Account"
 msgstr "Račun"
 
@@ -580,8 +554,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533
-#: plugins/gevolution/gevolution.c:535
+#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
 msgid "Provides integration with Evolution."
 msgstr "Omogoča integracijo z Evolutionom."
 
@@ -607,10 +580,8 @@
 msgstr "Dodatne informacije:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337
-#: src/gtkaccount.c:413
-#: src/gtkaccount.c:435
-#: src/protocols/oscar/oscar.c:611
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
+#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
 
@@ -626,37 +597,47 @@
 msgid "E-mail:"
 msgstr "E-pošta:"
 
-#: plugins/history.c:138
+#: plugins/history.c:146
 msgid "History Plugin Requires Logging"
 msgstr "Vtičnik za zgodovino zahteva beleženje v dnevnik"
 
-#: plugins/history.c:139
+#: plugins/history.c:147
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
-msgstr ""
-"Beleženje v dnevnik lahko omogočite v Orodja -> Nastavitve -> Beleženje v dnevnik.\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+"Beleženje v dnevnik lahko omogočite v Orodja -> Nastavitve -> Beleženje v "
+"dnevnik.\n"
 "\n"
-"Omogočanje beleženja v dnevnik za neposredna sporočila in/ali klepete aktivira zgodovino za istovrstne pogovore."
-
-#: plugins/history.c:178
+"Omogočanje beleženja v dnevnik za neposredna sporočila in/ali klepete "
+"aktivira zgodovino za istovrstne pogovore."
+
+#: plugins/history.c:186
 msgid "History"
 msgstr "Zgodovina"
 
-#: plugins/history.c:180
+#: plugins/history.c:188
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Prikaže nedavno zabeležene pogovore v novih pogovorih."
 
-#: plugins/history.c:181
-msgid ""
-"When a new conversation is opened this plugin will insert the last conversation into the current conversation.\n"
+#: plugins/history.c:189
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation.\n"
 "\n"
-"The history plugin requires logging be enabled. Logging can be enabled from Tools -> Preferences -> Logging. Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
-msgstr ""
-"Ko se začne nov pomenek, ta vtičnik vstavi zadnji pomenek v trenutni pomenek.\n"
+"The history plugin requires logging be enabled. Logging can be enabled from "
+"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
+"chats will activate history for the same conversation type(s)."
+msgstr ""
+"Ko se začne nov pomenek, ta vtičnik vstavi zadnji pomenek v trenutni "
+"pomenek.\n"
 "\n"
-"Vtičnik zgodovine zahteva omogočeno beleženje v dnevnik. Beleženje v dnevnik lahko omogočite prek izbire Orodja -> Nastavitve -> Beleženje v dnevnik. Omogočanje beleženja v dnevnike za neposredna sporočika in/ali pomenke aktivira zgodovino za taisto vrsto sporočanja."
+"Vtičnik zgodovine zahteva omogočeno beleženje v dnevnik. Beleženje v dnevnik "
+"lahko omogočite prek izbire Orodja -> Nastavitve -> Beleženje v dnevnik. "
+"Omogočanje beleženja v dnevnike za neposredna sporočika in/ali pomenke "
+"aktivira zgodovino za taisto vrsto sporočanja."
 
 #. *< type
 #. *< ui_requirement
@@ -672,8 +653,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104
-#: plugins/iconaway.c:106
+#: plugins/iconaway.c:104 plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pomanjša seznam prijateljev in pogovorna okna, ko ste odsotni."
 
@@ -681,14 +661,11 @@
 msgid "Minutes"
 msgstr "minut"
 
-#: plugins/idle.c:122
-#: plugins/idle.c:149
-#: plugins/idle.c:217
+#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
 msgid "I'dle Mak'er"
 msgstr "NedejavniK"
 
-#: plugins/idle.c:123
-#: plugins/idle.c:178
+#: plugins/idle.c:123 plugins/idle.c:181
 msgid "Set Account Idle Time"
 msgstr "Nastavi čas nedejavnosti"
 
@@ -696,13 +673,11 @@
 msgid "_Set"
 msgstr "_Nastavi"
 
-#: plugins/idle.c:127
-#: plugins/idle.c:154
+#: plugins/idle.c:127 plugins/idle.c:154
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: plugins/idle.c:150
-#: plugins/idle.c:182
+#: plugins/idle.c:150 plugins/idle.c:185
 msgid "Unset Account Idle Time"
 msgstr "Odnastavi čas nedejavnosti"
 
@@ -710,12 +685,11 @@
 msgid "_Unset"
 msgstr "_Odnastavi"
 
-#: plugins/idle.c:187
+#: plugins/idle.c:190
 msgid "Unset Idle Time For All Idled Accounts"
 msgstr "Odnastavi čas odsotnosti za vse račune z odsotnostjo"
 
-#: plugins/idle.c:219
-#: plugins/idle.c:220
+#: plugins/idle.c:217 plugins/idle.c:218
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Omogoča ročno nastavitev časa vaše odsotnosti"
 
@@ -748,8 +722,12 @@
 
 #. *  description
 #: plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "Preskusite vstavek s podporo IPC, kot odjemalec. Poišče strežniški vstavek in kliče registrirane ukaze."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Preskusite vstavek s podporo IPC, kot odjemalec. Poišče strežniški vstavek "
+"in kliče registrirane ukaze."
 
 #  *< api_version
 #  *< type
@@ -781,7 +759,8 @@
 #. *  description
 #: plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Preskusite vstavek s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
+msgstr ""
+"Preskusite vstavek s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
 
 #: plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -793,77 +772,78 @@
 
 #: plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Doda majhno škatlo na seznam prijateljev, ki prikazuje, ali imate novo pošto."
+msgstr ""
+"Doda majhno škatlo na seznam prijateljev, ki prikazuje, ali imate novo pošto."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:652
+#: plugins/notify.c:638
 msgid "Notify For"
 msgstr "Obveščaj o"
 
+#: plugins/notify.c:642
+msgid "_IM windows"
+msgstr "Okna za _neposredne pogovore"
+
+#: plugins/notify.c:649
+msgid "C_hat windows"
+msgstr "_Pogovorna okna"
+
 #: plugins/notify.c:656
-msgid "_IM windows"
-msgstr "Okna za _neposredne pogovore"
-
-#: plugins/notify.c:663
-msgid "C_hat windows"
-msgstr "_Pogovorna okna"
-
-#: plugins/notify.c:670
 msgid "_Focused windows"
 msgstr "Okna, ki imajo _fokus"
 
 #  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:678
+#: plugins/notify.c:664
 msgid "Notification Methods"
 msgstr "Načini obveščanja"
 
-#: plugins/notify.c:685
+#: plugins/notify.c:671
 msgid "Prepend _string into window title:"
 msgstr "Dodaj _obvestilo v naslov okna:"
 
 #. Count method button
-#: plugins/notify.c:704
+#: plugins/notify.c:690
 msgid "Insert c_ount of new messages into window title"
 msgstr "Prikaži _število novih sporočil v naslovu okna"
 
 #. Urgent method button
-#: plugins/notify.c:712
+#: plugins/notify.c:698
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "V upravljalniku oken nastavi namig \"N_UJNO\""
 
 #. Raise window method button
-#: plugins/notify.c:720
+#: plugins/notify.c:706
 msgid "R_aise conversation window"
 msgstr "Povzdigni pogovorna okn_a"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:728
+#: plugins/notify.c:714
 msgid "Notification Removal"
 msgstr "Odstranjevanje obvestil"
 
 #. Remove on focus button
-#: plugins/notify.c:733
+#: plugins/notify.c:719
 msgid "Remove when conversation window _gains focus"
 msgstr "Odstrani, ko pogovorno okno _dobi fokus"
 
 #. Remove on click button
-#: plugins/notify.c:740
+#: plugins/notify.c:726
 msgid "Remove when conversation window _receives click"
 msgstr "Odstrani, ko _kliknem na pogovorno okno"
 
 #. Remove on type button
-#: plugins/notify.c:748
+#: plugins/notify.c:734
 msgid "Remove when _typing in conversation window"
 msgstr "Odstrani, ko _tipkam v pogovornem oknu"
 
 #. Remove on message send button
-#: plugins/notify.c:756
+#: plugins/notify.c:742
 msgid "Remove when a _message gets sent"
 msgstr "Odstrani, ko je _sporočilo poslano"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:765
+#: plugins/notify.c:751
 msgid "Remove on switch to conversation ta_b"
 msgstr "Odstrani ob zamenjavi _zavihka pomenka"
 
@@ -873,7 +853,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:855
+#: plugins/notify.c:841
 msgid "Message Notification"
 msgstr "Obvestila o sporočilih"
 
@@ -881,8 +861,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:858
-#: plugins/notify.c:860
+#: plugins/notify.c:844 plugins/notify.c:846
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ponuja mnoge načine opozarjanja na nova sporočila."
 
@@ -892,15 +871,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:583
+#: plugins/perl/perl.c:587
 msgid "Perl Plugin Loader"
 msgstr "Nalagalnik vstavkov Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:585
-#: plugins/perl/perl.c:586
+#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
 msgid "Provides support for loading perl plugins."
 msgstr "Doda podporo nalaganja vstavkov v programskem jeziku perl."
 
@@ -913,8 +891,13 @@
 msgstr "Omogoča neposreden vnos v protokole."
 
 #: plugins/raw.c:154
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Omogoča pošiljanje golih ukazov za protokole, ki temeljijo na besedilu (Jabber, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte kodno okno."
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Omogoča pošiljanje golih ukazov za protokole, ki temeljijo na besedilu "
+"(Jabber, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte kodno "
+"okno."
 
 #: plugins/relnot.c:63
 #, c-format
@@ -932,11 +915,14 @@
 
 #: plugins/relnot.c:74
 #, c-format
-msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
-msgstr "Različico %s lahko najdete na:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
-
-#: plugins/relnot.c:78
-#: plugins/relnot.c:79
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"Različico %s lahko najdete na:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+
+#: plugins/relnot.c:78 plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Na voljo je nova različica."
 
@@ -959,8 +945,12 @@
 
 #. *  description
 #: plugins/relnot.c:142
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Preverja, ali je na voljo nova različica in uporabika seznanja z dnevnikom sprememb."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Preverja, ali je na voljo nova različica in uporabika seznanja z dnevnikom "
+"sprememb."
 
 #. *< type
 #. *< ui_requirement
@@ -968,7 +958,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:718
+#: plugins/signals-test.c:730
 msgid "Signals Test"
 msgstr "Preskus signalov"
 
@@ -976,8 +966,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:721
-#: plugins/signals-test.c:723
+#: plugins/signals-test.c:733 plugins/signals-test.c:735
 msgid "Test to see that all signals are working properly."
 msgstr "Preveri vse ukaze, da se prepriča o delujoči povezavi."
 
@@ -995,59 +984,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37
-#: plugins/simple.c:39
+#: plugins/simple.c:37 plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "Preveri večino stvari, če delujejo."
 
-#: plugins/spellchk.c:1791
+#: plugins/spellchk.c:1788
 msgid "Duplicate Correction"
 msgstr "Popravek dvojnikov"
 
-#: plugins/spellchk.c:1792
+#: plugins/spellchk.c:1789
 msgid "The specified word already exists in the correction list."
 msgstr "Navedena beseda že obstaja v seznamu popravkov."
 
-#: plugins/spellchk.c:1942
+#: plugins/spellchk.c:1948
 msgid "Text Replacements"
 msgstr "Zamenjave besedila"
 
-#: plugins/spellchk.c:1966
+#: plugins/spellchk.c:1972
 msgid "You type"
 msgstr "Vi napišete"
 
-#: plugins/spellchk.c:1978
+#: plugins/spellchk.c:1984
 msgid "You send"
 msgstr "Jaz pošljem"
 
-#: plugins/spellchk.c:1990
+#: plugins/spellchk.c:1996
 msgid "Whole words only"
 msgstr "Samo cele besede"
 
-#: plugins/spellchk.c:2016
+#: plugins/spellchk.c:2022
 msgid "Add a new text replacement"
 msgstr "Dodaj novo zamenjavo"
 
-#: plugins/spellchk.c:2026
+#: plugins/spellchk.c:2032
 msgid "You _type:"
 msgstr "Vi _napišete:"
 
-#: plugins/spellchk.c:2042
+#: plugins/spellchk.c:2048
 msgid "You _send:"
 msgstr "Jaz _pošljem:"
 
-#: plugins/spellchk.c:2054
+#: plugins/spellchk.c:2060
 msgid "Only replace _whole words"
 msgstr "Zamenjaj le _cele besede"
 
-#: plugins/spellchk.c:2091
+#: plugins/spellchk.c:2097
 msgid "Text replacement"
 msgstr "Zamenjava besedila"
 
-#: plugins/spellchk.c:2093
-#: plugins/spellchk.c:2094
+#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
+msgstr ""
+"Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
 
 #. *< type
 #. *< ui_requirement
@@ -1063,8 +1051,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230
-#: plugins/ssl/ssl-gnutls.c:232
+#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
 msgid "Provides SSL support through GNUTLS."
 msgstr "Omogoča podporo SSL preko GNUTLS."
 
@@ -1082,8 +1069,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322
-#: plugins/ssl/ssl-nss.c:324
+#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Omogoča podporo SSL preko Mozilla NSS."
 
@@ -1101,8 +1087,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97
-#: plugins/ssl/ssl.c:99
+#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Omogoča ovojnico za knjižnice s podporo SSL."
 
@@ -1152,17 +1137,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123
-#: plugins/statenotify.c:126
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+#: plugins/statenotify.c:123 plugins/statenotify.c:126
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
 msgstr "V pogovornem oknu obvešča o spremembah stanja vaših prijateljev."
 
 #: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Nalaganje vstavkov Tcl"
 
-#: plugins/tcl/tcl.c:365
-#: plugins/tcl/tcl.c:366
+#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "Omogoča podporo nalaganja vstavkov Tcl"
 
@@ -1172,8 +1157,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75
-#: plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
 msgid "Buddy Ticker"
 msgstr "Nabodalo prijateljev"
 
@@ -1181,8 +1165,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329
-#: plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodoravna inačica seznama prijateljev."
 
@@ -1198,17 +1181,13 @@
 msgid "minutes."
 msgstr "minut."
 
-#: plugins/timestamp.c:222
-msgid "_Apply"
-msgstr "_Uporabi"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:287
+#: plugins/timestamp.c:279
 msgid "Timestamp"
 msgstr "Čas nastanka"
 
@@ -1216,8 +1195,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:290
-#: plugins/timestamp.c:292
+#: plugins/timestamp.c:282 plugins/timestamp.c:284
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Doda čase nastanka vsakih N minut v slogu iChata."
 
@@ -1282,11 +1260,13 @@
 #. *  description
 #: plugins/win32/transparency/win2ktrans.c:662
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Ta vstavek omogoči poljubno nastavitev prosojnosti pogovornih oken in seznama prijateljev.\n"
+"Ta vstavek omogoči poljubno nastavitev prosojnosti pogovornih oken in "
+"seznama prijateljev.\n"
 "\n"
 "* Pozor: Ta vstavek zahteva Win2000 ali novejše."
 
@@ -1304,9 +1284,7 @@
 msgstr "Za_ženi Gaim ob zagonu Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405
-#: src/gtkblist.c:3514
-#: src/gtkprefs.c:2167
+#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
@@ -1319,8 +1297,7 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "_Ohrani seznam prijateljev nad vrhu:"
 
-#: plugins/win32/winprefs/winprefs.c:412
-#: src/gtkprefs.c:1824
+#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
 msgid "Never"
 msgstr "nikoli"
 
@@ -1334,9 +1311,8 @@
 msgstr "samo, ko je lepljiv"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419
-#: src/gtkprefs.c:938
-#: src/gtkprefs.c:2168
+#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
+#: src/gtkprefs.c:1727
 msgid "Conversations"
 msgstr "Pogovori"
 
@@ -1353,7 +1329,9 @@
 msgstr "Nastavitve, specifične za okolje Windows."
 
 #: plugins/win32/winprefs/winprefs.c:446
-msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
 msgstr "Ponuja posebne nastavitve okenskega Gaima, kot je "
 
 #: src/account.c:773
@@ -1380,165 +1358,106 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:960
-#: src/account.c:1114
-#: src/gtkdialogs.c:506
-#: src/gtkdialogs.c:647
-#: src/gtkdialogs.c:703
-#: src/gtkrequest.c:260
-#: src/protocols/gg/gg.c:434
-#: src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1512
-#: src/protocols/jabber/jabber.c:1157
-#: 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:2900
-#: src/protocols/oscar/oscar.c:4408
-#: src/protocols/oscar/oscar.c:4489
-#: src/protocols/oscar/oscar.c:7857
-#: src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007
-#: src/protocols/oscar/oscar.c:8059
-#: src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137
-#: src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460
-#: src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083
-#: src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:724
-#: src/protocols/yahoo/yahoo.c:2954
-#: src/protocols/yahoo/yahoo.c:2963
-#: src/request.h:1331
+#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
+#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
+#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
+#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
+#: 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:2894
+#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
+#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
+#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
+#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
+#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
+#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
+#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
+#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
 msgid "OK"
 msgstr "V redu"
 
-#: src/account.c:961
-#: src/account.c:1115
-#: src/account.c:1153
-#: src/gtkaccount.c:2089
-#: src/gtkaccount.c:2544
-#: src/gtkblist.c:4817
-#: src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648
-#: src/gtkdialogs.c:704
-#: src/gtkdialogs.c:723
-#: src/gtkdialogs.c:745
-#: src/gtkdialogs.c:765
-#: src/gtkdialogs.c:809
-#: src/gtkdialogs.c:871
-#: src/gtkdialogs.c:913
-#: src/gtkdialogs.c:955
-#: src/gtkimhtmltoolbar.c:419
-#: src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608
-#: src/gtkprivacy.c:633
-#: src/gtkprivacy.c:644
-#: src/gtkrequest.c:261
-#: src/gtksavedstatuses.c:188
-#: src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582
-#: src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1513
-#: src/protocols/jabber/buddy.c:572
-#: src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251
-#: src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281
-#: src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313
-#: src/protocols/oscar/oscar.c:1594
-#: src/protocols/oscar/oscar.c:2901
-#: src/protocols/oscar/oscar.c:4366
-#: src/protocols/oscar/oscar.c:4409
-#: src/protocols/oscar/oscar.c:4446
-#: src/protocols/oscar/oscar.c:4490
-#: src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983
-#: src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060
-#: src/protocols/oscar/oscar.c:8129
-#: src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042
-#: src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595
-#: src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697
-#: src/protocols/silc/silc.c:725
-#: src/protocols/trepia/trepia.c:348
-#: src/protocols/yahoo/yahoo.c:2955
-#: src/protocols/yahoo/yahoo.c:2964
-#: src/request.h:1331
-#: src/request.h:1341
+#: src/account.c:961 src/account.c:1117 src/account.c:1155
+#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
+#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
+#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
+#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
+#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
+#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
+#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
+#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
+#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
+#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
+#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
+#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
+#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
+#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
+#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
+#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
+#: src/request.h:1331 src/request.h:1341
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: src/account.c:983
-#: src/connection.c:96
+#: src/account.c:986 src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manjka vstavek za protokol %s"
 
-#: src/account.c:985
-#: src/connection.c:99
+#: src/account.c:988 src/connection.c:99
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
-#: src/account.c:1049
-#: src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1110
+#: src/account.c:1052 src/protocols/gg/gg.c:470
+#: src/protocols/jabber/jabber.c:1115
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
 
-#: src/account.c:1058
+#: src/account.c:1061
 msgid "Fill out all fields completely."
 msgstr "Izpolnite vsa polja."
 
-#: src/account.c:1083
+#: src/account.c:1085
 msgid "Original password"
 msgstr "Obstoječe geslo"
 
-#: src/account.c:1090
+#: src/account.c:1092
 msgid "New password"
 msgstr "Novo geslo"
 
-#: src/account.c:1097
+#: src/account.c:1099
 msgid "New password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: src/account.c:1103
+#: src/account.c:1105
 #, c-format
 msgid "Change password for %s"
 msgstr "Spremeni geslo za %s"
 
-#: src/account.c:1111
+#: src/account.c:1113
 msgid "Please enter your current password and your new password."
 msgstr "Vnesite svoje obstoječe in novo geslo."
 
-#: src/account.c:1144
+#: src/account.c:1146
 #, c-format
 msgid "Change user information for %s"
 msgstr "Spremeni podatke za uporabika %s"
 
-#: src/account.c:1152
-#: src/gtkdebug.c:684
-#: src/gtkrequest.c:267
-#: src/protocols/jabber/buddy.c:571
-#: src/protocols/trepia/trepia.c:347
+#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
+#: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Shrani"
 
-#: src/account.c:1635
-#: src/gtkft.c:156
-#: src/protocols/jabber/buddy.c:632
-#: src/protocols/jabber/buddy.c:1082
-#: src/protocols/jabber/buddy.c:1099
+#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
 #: src/protocols/novell/novell.c:2837
 msgid "Unknown"
 msgstr "Neznan"
@@ -1553,12 +1472,24 @@
 
 #: src/blist.c:1863
 #, c-format
-msgid "%d buddy from group %s was not removed because its account was not logged in.  This buddy and the group were not removed.\n"
-msgid_plural "%d buddies from group %s were not removed because their accounts were not logged in.  These buddies and the group were not removed.\n"
-msgstr[0] "%d prijateljev iz skupine %s ni bilo odstranjenih, ker njihovi računi niso bili prijavljeni.  Ti prijatelji in skupine niso bili odstranjeni.\n"
-msgstr[1] "%d prijatelj iz skupine %s ni bil odstranjen, ker njegov račun ni bil prijavljen.  Ta prijatelj in skupina nista bila odstranjena.\n"
-msgstr[2] "%d prijatelja iz skupine %s nista bila odstranjena, ker njuna računa nista bila prijavljena.  Ta prijatelja in skupina niso bili odstranjeni.\n"
-msgstr[3] "%d prijatelji iz skupine %s niso bili odstranjeni, ker njihovi računi niso bili prijavljeni.  Ti prijatelji in skupine niso bili odstranjeni.\n"
+msgid ""
+"%d buddy from group %s was not removed because its account was not logged "
+"in.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because their accounts were not "
+"logged in.  These buddies and the group were not removed.\n"
+msgstr[0] ""
+"%d prijateljev iz skupine %s ni bilo odstranjenih, ker njihovi računi niso "
+"bili prijavljeni.  Ti prijatelji in skupine niso bili odstranjeni.\n"
+msgstr[1] ""
+"%d prijatelj iz skupine %s ni bil odstranjen, ker njegov račun ni bil "
+"prijavljen.  Ta prijatelj in skupina nista bila odstranjena.\n"
+msgstr[2] ""
+"%d prijatelja iz skupine %s nista bila odstranjena, ker njuna računa nista "
+"bila prijavljena.  Ta prijatelja in skupina niso bili odstranjeni.\n"
+msgstr[3] ""
+"%d prijatelji iz skupine %s niso bili odstranjeni, ker njihovi računi niso "
+"bili prijavljeni.  Ti prijatelji in skupine niso bili odstranjeni.\n"
 
 #: src/blist.c:1872
 msgid "Group not removed"
@@ -1572,8 +1503,7 @@
 msgid "Unable to send message: The message is too large."
 msgstr "Sporočila ni bilo moč poslati, ker je preveliko."
 
-#: src/conversation.c:208
-#: src/conversation.c:221
+#: src/conversation.c:208 src/conversation.c:221
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Ni bilo moč poslati sporočila k %s."
@@ -1586,48 +1516,47 @@
 msgid "Unable to send message."
 msgstr "Sporočila ni bilo moč poslati."
 
-#: src/conversation.c:1515
+#: src/conversation.c:1497
 #, c-format
 msgid "%s entered the room."
 msgstr "%s se nam pridružuje."
 
-#: src/conversation.c:1517
+#: src/conversation.c:1499
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] se nam pridružuje."
 
-#: src/conversation.c:1616
+#: src/conversation.c:1598
 #, c-format
 msgid "You are now known as %s"
 msgstr "Zdaj ste znani kot %s"
 
-#: src/conversation.c:1631
+#: src/conversation.c:1613
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je zdaj poznan kot %s"
 
-#: src/conversation.c:1687
+#: src/conversation.c:1669
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s nas je zapustil (%s)."
 
-#: src/conversation.c:1689
+#: src/conversation.c:1671
 #, c-format
 msgid "%s left the room."
 msgstr "%s nas je zapustil."
 
-#: src/conversation.c:1766
+#: src/conversation.c:1748
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d več)"
 
-#: src/conversation.c:1768
+#: src/conversation.c:1750
 #, c-format
 msgid " left the room (%s)."
 msgstr " nas je zapustil (%s)."
 
-#: src/ft.c:188
-#: src/protocols/msn/msn.c:412
+#: src/ft.c:188 src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1751,7 +1680,7 @@
 msgid "File transfer from %s failed."
 msgstr "Prenos datoteke od %s ni uspel."
 
-#: src/gtkaccount.c:363
+#: src/gtkaccount.c:362
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1763,172 +1692,152 @@
 "<b>Velikost slike:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:731
+#: src/gtkaccount.c:730
 msgid "Login Options"
 msgstr "Možnosti prijave"
 
-#: src/gtkaccount.c:748
-#: src/gtkft.c:623
+#: src/gtkaccount.c:747 src/gtkft.c:623
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:753
-#: src/gtkblist.c:4371
+#: src/gtkaccount.c:752 src/gtkblist.c:4051
 msgid "Screen Name:"
 msgstr "Ime:"
 
-#: src/gtkaccount.c:826
+#: src/gtkaccount.c:825
 msgid "Password:"
 msgstr "Geslo:"
 
-#: src/gtkaccount.c:831
-#: src/gtkblist.c:4385
-#: src/gtkblist.c:4764
+#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
 msgid "Alias:"
 msgstr "Psevdonim:"
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:834
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:880
+#: src/gtkaccount.c:879
 msgid "User Options"
 msgstr "Možnosti uporabnika"
 
-#: src/gtkaccount.c:893
+#: src/gtkaccount.c:892
 msgid "New mail notifications"
 msgstr "Obveščanje o prispeli pošti"
 
-#: src/gtkaccount.c:902
+#: src/gtkaccount.c:901
 msgid "Buddy icon:"
 msgstr "Ikona prijatelja:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:991
+#: src/gtkaccount.c:990
 #, c-format
 msgid "%s Options"
 msgstr "%s Možnosti"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1129
-#: src/gtkaccount.c:1176
+#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
 msgid "Use Global Proxy Settings"
 msgstr "uporabljaj splošno nastavitev strežnikov proxy"
 
 #. No Proxy
-#: src/gtkaccount.c:1135
-#: src/gtkaccount.c:1183
+#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
 msgid "No Proxy"
 msgstr "brez strežnika proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1141
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1147
-#: src/gtkaccount.c:1197
+#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
 msgid "SOCKS 4"
 msgstr "SOCKS4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1153
-#: src/gtkaccount.c:1204
+#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
 msgid "SOCKS 5"
 msgstr "SOCKS5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1159
-#: src/gtkaccount.c:1211
-#: src/gtkprefs.c:1142
+#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
-#: src/gtkaccount.c:1250
+#: src/gtkaccount.c:1249
 msgid "you can see the butterflies mating"
 msgstr "lahko opazite metulje, ki se parijo"
 
-#: src/gtkaccount.c:1254
+#: src/gtkaccount.c:1253
 msgid "If you look real closely"
 msgstr "Če pogledate zelo pozorno,"
 
-#: src/gtkaccount.c:1270
+#: src/gtkaccount.c:1269
 msgid "Proxy Options"
 msgstr "Možnosti strežnika proxy"
 
-#: src/gtkaccount.c:1288
-#: src/gtkprefs.c:1136
+#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
 msgid "Proxy _type:"
 msgstr "Vrsta s_trežnika proxy:"
 
-#: src/gtkaccount.c:1297
-#: src/gtkprefs.c:1163
+#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
 msgid "_Host:"
 msgstr "_Strežnik:"
 
-#: src/gtkaccount.c:1301
-#: src/gtkprefs.c:1181
+#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: src/gtkaccount.c:1309
+#: src/gtkaccount.c:1308
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: src/gtkaccount.c:1314
-#: src/gtkprefs.c:1218
+#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: src/gtkaccount.c:1702
+#: src/gtkaccount.c:1700
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: src/gtkaccount.c:1704
+#: src/gtkaccount.c:1702
 msgid "Modify Account"
 msgstr "Spremeni račun"
 
 #. Register button
-#: src/gtkaccount.c:1751
-#: src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gtkaccount.c:2083
-#: src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepričani, da želite izbrisati %s?"
 
-#: src/gtkaccount.c:2088
-#: src/gtkrequest.c:264
-#: src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
 msgid "Delete"
 msgstr "Zbriši"
 
-#: src/gtkaccount.c:2145
-#: src/gtksavedstatuses.c:626
-#: src/protocols/oscar/oscar.c:5053
+#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
+#: src/protocols/oscar/oscar.c:5049
 msgid "Screen Name"
 msgstr "Ime"
 
-#: src/gtkaccount.c:2168
+#: src/gtkaccount.c:2210
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: src/gtkaccount.c:2176
+#: src/gtkaccount.c:2218
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2519
+#: src/gtkaccount.c:2550
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s%s"
 
-#: src/gtkaccount.c:2533
+#: src/gtkaccount.c:2564
 msgid ""
 "\n"
 "\n"
@@ -1938,250 +1847,239 @@
 "\n"
 "Ali ga/jo želite dodati na svoj seznam prijateljev?"
 
-#: src/gtkaccount.c:2541
+#: src/gtkaccount.c:2572
 msgid "Add buddy to your list?"
 msgstr "Želite dodati prijatelja na seznam?"
 
-#: src/gtkaccount.c:2543
-#: src/gtkblist.c:4816
-#: src/gtkconv.c:1501
-#: src/gtkrequest.c:265
-#: src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4678
-#: src/protocols/silc/chat.c:594
+#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
+#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
+#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gtkblist.c:886
+#: src/gtkblist.c:595
 msgid "Join a Chat"
 msgstr "Pridruži se pomenku"
 
-#: src/gtkblist.c:907
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
+#: src/gtkblist.c:616
+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:918
-#: src/gtkpounce.c:415
-#: src/gtkroomlist.c:354
+#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: src/gtkblist.c:1223
+#: src/gtkblist.c:935
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: src/gtkblist.c:1226
+#: src/gtkblist.c:938
 msgid "I_M"
 msgstr "_Sporoči"
 
-#: src/gtkblist.c:1232
+#: src/gtkblist.c:944
 msgid "_Send File"
 msgstr "_Pošlji datoteko"
 
-#: src/gtkblist.c:1238
+#: src/gtkblist.c:950
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _opozorilo prijatelja"
 
-#: src/gtkblist.c:1242
-#: src/gtkblist.c:1246
-#: src/gtkblist.c:1344
-#: src/gtkblist.c:1367
+#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
+#: src/gtkblist.c:1079
 msgid "View _Log"
 msgstr "Poglej _dnevnik"
 
-#: src/gtkblist.c:1257
+#: src/gtkblist.c:969
 msgid "_Alias Buddy..."
 msgstr "Psevdonim prij_atelja ..."
 
-#: src/gtkblist.c:1259
+#: src/gtkblist.c:971
 msgid "_Remove Buddy"
 msgstr "Odst_rani prijatelja"
 
-#: src/gtkblist.c:1261
+#: src/gtkblist.c:973
 msgid "Alias Contact..."
 msgstr "Psevdonim stika ..."
 
-#: src/gtkblist.c:1264
-#: src/gtkdialogs.c:807
-#: src/gtkdialogs.c:808
+#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: src/gtkblist.c:1268
-#: src/gtkblist.c:1352
-#: src/gtkblist.c:1373
+#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
 msgid "_Alias..."
 msgstr "_Psevdonim ..."
 
-#: src/gtkblist.c:1270
-#: src/gtkblist.c:1354
-#: src/gtkblist.c:1375
+#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: src/gtkblist.c:1316
+#: src/gtkblist.c:1028
 msgid "Add a _Buddy"
 msgstr "Dodaj _prijatelja"
 
-#: src/gtkblist.c:1318
+#: src/gtkblist.c:1030
 msgid "Add a C_hat"
 msgstr "Dodaj po_menek"
 
-#: src/gtkblist.c:1320
+#: src/gtkblist.c:1032
 msgid "_Delete Group"
 msgstr "_Zbriši skupino"
 
-#: src/gtkblist.c:1322
+#: src/gtkblist.c:1034
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: src/gtkblist.c:1340
-#: src/gtkroomlist.c:264
-#: src/gtkroomlist.c:409
+#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
 #: src/gtkstock.c:118
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: src/gtkblist.c:1342
+#: src/gtkblist.c:1054
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: src/gtkblist.c:1380
-#: src/gtkblist.c:1403
+#: src/gtkblist.c:1092 src/gtkblist.c:1115
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: src/gtkblist.c:1408
+#: src/gtkblist.c:1120
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: src/gtkblist.c:1635
-#: src/gtkblist.c:1645
-#: src/gtkblist.c:3646
-#: src/gtkblist.c:3649
+#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
+#: src/gtkblist.c:3331
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: src/gtkblist.c:2104
-#: src/gtkconv.c:3712
-#: src/gtkpounce.c:314
-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."
+#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+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:2673
+#: src/gtkblist.c:2329
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: src/gtkblist.c:2674
+#: src/gtkblist.c:2330
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: src/gtkblist.c:2675
+#: src/gtkblist.c:2331
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: src/gtkblist.c:2676
+#: src/gtkblist.c:2332
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: src/gtkblist.c:2677
+#: src/gtkblist.c:2333
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Pog_lej uporabnikov dnevnik ..."
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:2335
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Prijatelji/Prikaži prijatelje, ki niso na z_vezi"
 
-#: src/gtkblist.c:2680
+#: src/gtkblist.c:2336
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Prijatelji/Prikaži pra_zne skupine"
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:2337
+#, fuzzy
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
+
+#: src/gtkblist.c:2338 src/gtkblist.c:5158
+#, fuzzy
+msgid "/Buddies/Sort Buddies"
+msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
+
+#: src/gtkblist.c:2340
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: src/gtkblist.c:2682
+#: src/gtkblist.c:2341
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: src/gtkblist.c:2683
+#: src/gtkblist.c:2342
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: src/gtkblist.c:2685
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Tools
-#: src/gtkblist.c:2688
+#: src/gtkblist.c:2347
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/gtkblist.c:2689
+#: src/gtkblist.c:2348
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: src/gtkblist.c:2690
+#: src/gtkblist.c:2349
 msgid "/Tools/Account Ac_tions"
 msgstr "/Orodja/Dejanja ra_čuna"
 
-#: src/gtkblist.c:2691
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/Orodja/Dejanja _vstavkov"
-
-#: src/gtkblist.c:2693
-msgid "/Tools/_Statuses"
-msgstr "/Orodja/_Stanja"
-
-#: src/gtkblist.c:2694
+#: src/gtkblist.c:2351
 msgid "/Tools/A_ccounts"
 msgstr "/Orodja/_Računi"
 
-#: src/gtkblist.c:2695
+#: src/gtkblist.c:2352
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: src/gtkblist.c:2696
+#: src/gtkblist.c:2353
+#, fuzzy
+msgid "/Tools/P_lugins"
+msgstr "/Orodja/Dejanja vstavkov"
+
+#: src/gtkblist.c:2354
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: src/gtkblist.c:2697
+#: src/gtkblist.c:2355
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: src/gtkblist.c:2698
+#: src/gtkblist.c:2356
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: src/gtkblist.c:2700
+#: src/gtkblist.c:2358
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
-#: src/gtkblist.c:2701
+#: src/gtkblist.c:2359
 msgid "/Tools/View System _Log"
 msgstr "/Orodja/Poglej sistemski _dnevnik"
 
 #. Help
-#: src/gtkblist.c:2704
+#: src/gtkblist.c:2362
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/gtkblist.c:2705
+#: src/gtkblist.c:2363
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: src/gtkblist.c:2706
+#: src/gtkblist.c:2364
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: src/gtkblist.c:2707
+#: src/gtkblist.c:2365
 msgid "/Help/_About"
 msgstr "/pomoč/_O programu"
 
-#: src/gtkblist.c:2739
-#: src/gtkblist.c:2806
+#: src/gtkblist.c:2397 src/gtkblist.c:2464
 #, c-format
 msgid ""
 "\n"
@@ -2190,7 +2088,7 @@
 "\n"
 "<b>Račun:</b> %s"
 
-#: src/gtkblist.c:2815
+#: src/gtkblist.c:2473
 #, c-format
 msgid ""
 "\n"
@@ -2199,7 +2097,7 @@
 "\n"
 "<b>Psevdonim stika:</b> %s"
 
-#: src/gtkblist.c:2823
+#: src/gtkblist.c:2481
 #, c-format
 msgid ""
 "\n"
@@ -2208,7 +2106,7 @@
 "\n"
 "<b>Psevdonim:</b> %s"
 
-#: src/gtkblist.c:2831
+#: src/gtkblist.c:2489
 #, c-format
 msgid ""
 "\n"
@@ -2217,7 +2115,7 @@
 "\n"
 "<b>Vzdevek:</b> %s"
 
-#: src/gtkblist.c:2840
+#: src/gtkblist.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -2226,7 +2124,7 @@
 "\n"
 "<b>Prijavljen(i):</b> %s"
 
-#: src/gtkblist.c:2852
+#: src/gtkblist.c:2510
 #, c-format
 msgid ""
 "\n"
@@ -2235,7 +2133,7 @@
 "\n"
 "<b>Nedejaven:</b> %s"
 
-#: src/gtkblist.c:2888
+#: src/gtkblist.c:2546
 #, c-format
 msgid ""
 "\n"
@@ -2244,7 +2142,7 @@
 "\n"
 "<b>Zadnjič viden:</b> pred %s"
 
-#: src/gtkblist.c:2896
+#: src/gtkblist.c:2554
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2252,7 +2150,7 @@
 "\n"
 "<b>Stanje:</b> Ni na zvezi"
 
-#: src/gtkblist.c:2918
+#: src/gtkblist.c:2577
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2260,7 +2158,7 @@
 "\n"
 "<b>Opis:</b> Strašljivo"
 
-#: src/gtkblist.c:2920
+#: src/gtkblist.c:2579
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2268,7 +2166,7 @@
 "\n"
 "<b>Stanje</b>: Neverjetno!"
 
-#: src/gtkblist.c:2922
+#: src/gtkblist.c:2581
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2276,155 +2174,172 @@
 "\n"
 "<b>Stanje</b>: Kulsko"
 
-#: src/gtkblist.c:3184
+#: src/gtkblist.c:2843
 #, c-format
 msgid "Idle (%dh %02dm) "
 msgstr "Nedejaven (%dh%02dm) "
 
-#: src/gtkblist.c:3186
+#: src/gtkblist.c:2845
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Nedejaven (%dm) "
 
-#: src/gtkblist.c:3189
+#: src/gtkblist.c:2848
 msgid "Idle "
 msgstr "Nedejaven"
 
-#: src/gtkblist.c:3193
+#: src/gtkblist.c:2852
 msgid "Offline "
 msgstr "Ni na zvezi "
 
-#: src/gtkblist.c:3309
+#: src/gtkblist.c:2968
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: src/gtkblist.c:3310
-#: src/gtkblist.c:3344
+#: src/gtkblist.c:2969 src/gtkblist.c:3003
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: src/gtkblist.c:3311
+#: src/gtkblist.c:2970
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: src/gtkblist.c:3312
+#: src/gtkblist.c:2971
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: src/gtkblist.c:3313
+#: src/gtkblist.c:2972
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: src/gtkblist.c:3314
+#: src/gtkblist.c:2973
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: src/gtkblist.c:3347
+#: src/gtkblist.c:3006
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: src/gtkblist.c:3350
+#: src/gtkblist.c:3009
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: src/gtkblist.c:3426
-#: src/protocols/jabber/jabber.c:978
-#: src/protocols/yahoo/yahoo.c:2781
-msgid "None"
-msgstr "brez"
-
-#: src/gtkblist.c:3428
-msgid "Alphabetical"
+#: src/gtkblist.c:3085
+#, fuzzy
+msgid "Manually"
+msgstr "Ročni"
+
+#: src/gtkblist.c:3087
+#, fuzzy
+msgid "Alphabetically"
 msgstr "abecedno"
 
-#: src/gtkblist.c:3429
+#: src/gtkblist.c:3088
 msgid "By status"
 msgstr "po stanju"
 
-#: src/gtkblist.c:3430
+#: src/gtkblist.c:3089
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: src/gtkblist.c:3542
+#: src/gtkblist.c:3201
 msgid "/Tools/Buddy Pounce"
 msgstr "/Orodja/Opozorila prijateljev"
 
-#: src/gtkblist.c:3543
+#: src/gtkblist.c:3202
 msgid "/Tools/Account Actions"
 msgstr "/Orodja/Dejanja ra_čuna"
 
-#: src/gtkblist.c:3544
-msgid "/Tools/Plugin Actions"
-msgstr "/Orodja/Dejanja vstavkov"
-
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3642
+#: src/gtkblist.c:3322
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
 
-#: src/gtkblist.c:3644
+#: src/gtkblist.c:3324
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Prijatelji/Pokaži prazne skupine"
 
-#: src/gtkblist.c:4325
-#: src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994
-#: src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129
-#: src/protocols/yahoo/yahoo.c:2879
+#: src/gtkblist.c:3328
+#, fuzzy
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
+
+#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
+#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
+#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
 msgid "Add Buddy"
 msgstr "Dodaj prijatelja"
 
-#: src/gtkblist.c:4349
-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:4029
+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"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4412
-#: src/gtkblist.c:4744
+#: src/gtkblist.c:4092 src/gtkblist.c:4424
 msgid "Account:"
 msgstr "Račun:"
 
-#: src/gtkblist.c:4677
+#: src/gtkblist.c:4357
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: src/gtkblist.c:4693
-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:4710
+#: src/gtkblist.c:4373
+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:4390
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
-#: src/gtkblist.c:4734
-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:4813
+#: src/gtkblist.c:4414
+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:4493
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: src/gtkblist.c:4814
+#: src/gtkblist.c:4494
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: src/gtkblist.c:5364
-#: src/gtkblist.c:5460
+#: src/gtkblist.c:5025
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
+#: src/gtkblist.c:5094
+#, fuzzy
+msgid "/Tools"
+msgstr "/_Orodja"
+
 #: src/gtkconn.c:190
-#, c-format
-msgid "%s could not connect"
-msgstr "%s se ne more povezati"
+#, fuzzy, c-format
+msgid "%s disconnected"
+msgstr "Povezava prekinjena."
 
 #: src/gtkconn.c:191
-#, c-format
-msgid "%s was unable to connect due to an error. %s The account has been disabled. Correct the error and reenable to account to connect."
-msgstr "%s se ne more povezati zaradi napake. %s Račun je bil onemogočen. Odpravite napako in ponovno omogočite povezavanje za račun."
+#, fuzzy, c-format
+msgid ""
+"%s was disconnected due to an error. %s The account has been disabled. "
+"Correct the error and reenable the account to connect."
+msgstr ""
+"%s se ne more povezati zaradi napake. %s Račun je bil onemogočen. Odpravite "
+"napako in ponovno omogočite povezavanje za račun."
 
 #: src/gtkconv.c:325
 #, c-format
@@ -2453,7 +2368,8 @@
 
 #: src/gtkconv.c:453
 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."
+msgstr ""
+"Skladenjska napaka: vtipkali ste napačno število argumentov za ta ukaz."
 
 #: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
@@ -2471,14 +2387,15 @@
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
-#: src/gtkconv.c:699
-#: src/gtkconv.c:725
+#: src/gtkconv.c:699 src/gtkconv.c:725
 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:719
-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."
+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:772
 msgid "Invite Buddy Into Chat Room"
@@ -2486,22 +2403,22 @@
 
 #. Put our happy label in it.
 #: src/gtkconv.c:802
-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."
+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:823
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: src/gtkconv.c:843
-#: src/gtksavedstatuses.c:778
+#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: src/gtkconv.c:900
-#: src/gtkconv.c:2199
-#: src/gtkdebug.c:217
-#: src/gtkft.c:470
+#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
@@ -2514,262 +2431,266 @@
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: src/gtkconv.c:1030
-#: src/gtkdebug.c:165
-#: src/gtkdebug.c:678
+#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
 msgid "Find"
 msgstr "Najdi"
 
-#: src/gtkconv.c:1056
-#: src/gtkdebug.c:193
+#: src/gtkconv.c:1056 src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: src/gtkconv.c:1463
+#: src/gtkconv.c:1227
+#, fuzzy
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
+
+#: src/gtkconv.c:1235
+#, fuzzy
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
+
+#: src/gtkconv.c:1489
 msgid "IM"
 msgstr "Sporoči"
 
-#: src/gtkconv.c:1469
-#: src/protocols/oscar/oscar.c:626
+#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: src/gtkconv.c:1476
+#: src/gtkconv.c:1502
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: src/gtkconv.c:1479
+#: src/gtkconv.c:1505
 msgid "Ignore"
 msgstr "Prezri"
 
-#: src/gtkconv.c:1485
+#: src/gtkconv.c:1511
 msgid "Info"
 msgstr "Informacije"
 
-#: src/gtkconv.c:1491
+#: src/gtkconv.c:1517
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: src/gtkconv.c:1498
-#: src/gtkrequest.c:266
+#: src/gtkconv.c:1524 src/gtkrequest.c:267
 msgid "Remove"
 msgstr "Odstrani"
 
-#: src/gtkconv.c:2207
+#: src/gtkconv.c:2236
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: src/gtkconv.c:2230
+#: src/gtkconv.c:2259
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: src/gtkconv.c:2280
+#: src/gtkconv.c:2308
 msgid "Animate"
 msgstr "Animiraj"
 
-#: src/gtkconv.c:2285
+#: src/gtkconv.c:2313
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: src/gtkconv.c:2291
+#: src/gtkconv.c:2319
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
 #. Conversation menu
-#: src/gtkconv.c:2339
+#: src/gtkconv.c:2367
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: src/gtkconv.c:2341
+#: src/gtkconv.c:2369
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/Novo neposredno sporočilo ..."
 
-#: src/gtkconv.c:2346
+#: src/gtkconv.c:2374
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: src/gtkconv.c:2348
+#: src/gtkconv.c:2376
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pog_lej dnevnik ..."
 
-#: src/gtkconv.c:2349
+#: src/gtkconv.c:2377
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: src/gtkconv.c:2351
+#: src/gtkconv.c:2379
 msgid "/Conversation/Clear"
 msgstr "/Pogovor/Počisti"
 
-#: src/gtkconv.c:2355
+#: src/gtkconv.c:2383
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#: src/gtkconv.c:2356
+#: src/gtkconv.c:2384
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: src/gtkconv.c:2358
+#: src/gtkconv.c:2386
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: src/gtkconv.c:2360
+#: src/gtkconv.c:2388
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Po_vabi ..."
 
-#: src/gtkconv.c:2365
+#: src/gtkconv.c:2393
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/Psevdon_im ..."
 
-#: src/gtkconv.c:2367
+#: src/gtkconv.c:2395
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/_Zavrni ..."
 
-#: src/gtkconv.c:2369
+#: src/gtkconv.c:2397
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: src/gtkconv.c:2371
+#: src/gtkconv.c:2399
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: src/gtkconv.c:2376
+#: src/gtkconv.c:2404
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi _povezavo ..."
 
-#: src/gtkconv.c:2378
+#: src/gtkconv.c:2406
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: src/gtkconv.c:2383
+#: src/gtkconv.c:2411
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: src/gtkconv.c:2387
+#: src/gtkconv.c:2415
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: src/gtkconv.c:2388
+#: src/gtkconv.c:2416
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: src/gtkconv.c:2389
+#: src/gtkconv.c:2417
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: src/gtkconv.c:2390
+#: src/gtkconv.c:2418
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za _oblikovanje"
 
-#: src/gtkconv.c:2391
+#: src/gtkconv.c:2419
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pr_ikaži časovne žige"
 
-#: src/gtkconv.c:2392
+#: src/gtkconv.c:2420
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: src/gtkconv.c:2432
+#: src/gtkconv.c:2460
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Prikaži dnevnik ..."
 
-#: src/gtkconv.c:2438
+#: src/gtkconv.c:2466
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: src/gtkconv.c:2442
+#: src/gtkconv.c:2470
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: src/gtkconv.c:2448
+#: src/gtkconv.c:2476
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: src/gtkconv.c:2452
+#: src/gtkconv.c:2480
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: src/gtkconv.c:2458
+#: src/gtkconv.c:2486
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: src/gtkconv.c:2462
+#: src/gtkconv.c:2490
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: src/gtkconv.c:2466
+#: src/gtkconv.c:2494
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: src/gtkconv.c:2470
+#: src/gtkconv.c:2498
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: src/gtkconv.c:2476
+#: src/gtkconv.c:2504
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: src/gtkconv.c:2480
+#: src/gtkconv.c:2508
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: src/gtkconv.c:2486
+#: src/gtkconv.c:2514
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: src/gtkconv.c:2489
+#: src/gtkconv.c:2517
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: src/gtkconv.c:2492
+#: src/gtkconv.c:2520
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za oblikovanje"
 
-#: src/gtkconv.c:2495
+#: src/gtkconv.c:2523
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Prikaži časovne žige"
 
-#: src/gtkconv.c:2498
+#: src/gtkconv.c:2526
 msgid "/Options/Show Buddy Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: src/gtkconv.c:2568
+#: src/gtkconv.c:2597
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: src/gtkconv.c:2573
+#: src/gtkconv.c:2602
 msgid "User has typed something and paused"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send As menu
-#: src/gtkconv.c:2715
+#: src/gtkconv.c:2740
 msgid "_Send To"
 msgstr "_Pošlji k"
 
-#: src/gtkconv.c:3344
+#: src/gtkconv.c:3373
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3392
+#: src/gtkconv.c:3421
 msgid "0 people in room"
 msgstr "0 ljudi v sobi"
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3500
 msgid "IM the user"
 msgstr "Pošlji sporočilo uporabniku"
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3513
 msgid "Ignore the user"
 msgstr "Prezri uporabnika"
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3525
 msgid "Get the user's information"
 msgstr "Poizvedi o uporabniku"
 
-#: src/gtkconv.c:4288
-#: src/gtkconv.c:4390
-#: src/gtkconv.c:4445
+#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2778,56 +2699,64 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: src/gtkconv.c:5496
-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:5499
+#: src/gtkconv.c:5582
+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:5585
 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:5502
-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:5505
+msgstr ""
+"me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
+
+#: src/gtkconv.c:5588
+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:5591
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
-#: src/gtkconv.c:5508
+#: src/gtkconv.c:5594
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
-#: src/gtkconv.c:5617
+#: src/gtkconv.c:5709
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: src/gtkconv.c:5649
+#: src/gtkconv.c:5741
 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:6316
+#: src/gtkconv.c:6408
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: src/gtkconv.c:6777
+#: src/gtkconv.c:6872
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: src/gtkconv.c:6779
+#: src/gtkconv.c:6874
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: src/gtkconv.c:6781
-#: src/gtkprefs.c:1341
+#: src/gtkconv.c:6876 src/gtkprefs.c:1205
 msgid "New window"
 msgstr "novo okno"
 
-#: src/gtkconv.c:6783
+#: src/gtkconv.c:6878
 msgid "By group"
 msgstr "po skupinah"
 
-#: src/gtkconv.c:6785
+#: src/gtkconv.c:6880
 msgid "By account"
 msgstr "po vrsti računa"
 
@@ -2855,8 +2784,7 @@
 msgid "Pause"
 msgstr "Premor"
 
-#: src/gtkdebug.c:705
-#: src/gtkdebug.c:706
+#: src/gtkdebug.c:705 src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Prikaži čas"
 
@@ -2868,20 +2796,13 @@
 msgid "Right click for more options."
 msgstr "Za več možnosti kliknite na desni miškin gumb."
 
-#: src/gtkdialogs.c:59
-#: src/gtkdialogs.c:90
+#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
-#: src/gtkdialogs.c:60
-#: src/gtkdialogs.c:63
-#: src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65
-#: src/gtkdialogs.c:66
-#: src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69
-#: src/gtkdialogs.c:70
-#: src/gtkdialogs.c:71
+#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
 msgid "developer"
 msgstr "razvijalec"
 
@@ -2897,8 +2818,7 @@
 msgid "support"
 msgstr "podpora"
 
-#: src/gtkdialogs.c:88
-#: src/gtkdialogs.c:91
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "vzdrževalec"
 
@@ -2918,320 +2838,325 @@
 msgid "hacker and designated driver [lazy bum]"
 msgstr "heker in uradni vodja [lenoba]"
 
-#: src/gtkdialogs.c:99
-#: src/gtkdialogs.c:100
-#: src/gtkdialogs.c:143
+#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
 #: src/gtkdialogs.c:101
-#: src/gtkdialogs.c:144
-#: src/gtkdialogs.c:145
+#, fuzzy
+msgid "Bosnian"
+msgstr "romunsko"
+
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
 msgid "Catalan"
 msgstr "katalonsko"
 
-#: src/gtkdialogs.c:102
-#: src/gtkdialogs.c:146
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
 msgid "Czech"
 msgstr "češko"
 
-#: src/gtkdialogs.c:103
+#: src/gtkdialogs.c:104
 msgid "Danish"
 msgstr "dansko"
 
-#: src/gtkdialogs.c:104
-#: src/gtkdialogs.c:147
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
 msgid "German"
 msgstr "nemško"
 
-#: src/gtkdialogs.c:105
+#: src/gtkdialogs.c:106
 msgid "Australian English"
 msgstr "avstralsko-angleško"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:107
 msgid "British English"
 msgstr "britansko-angleško"
 
-#: src/gtkdialogs.c:107
+#: src/gtkdialogs.c:108
 msgid "Canadian English"
 msgstr "kanadsko-angleško"
 
-#: src/gtkdialogs.c:108
-#: src/gtkdialogs.c:148
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
 msgid "Spanish"
 msgstr "špansko"
 
-#: src/gtkdialogs.c:109
-#: src/gtkdialogs.c:149
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
 msgid "Finnish"
 msgstr "finsko"
 
-#: src/gtkdialogs.c:110
-#: src/gtkdialogs.c:150
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
 msgid "French"
 msgstr "francosko"
 
-#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:112
 msgid "Hebrew"
 msgstr "hebrejsko"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:113
 msgid "Hindi"
 msgstr "hindujsko"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:114
 msgid "Hungarian"
 msgstr "madžarsko"
 
-#: src/gtkdialogs.c:114
-#: src/gtkdialogs.c:151
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
 msgid "Italian"
 msgstr "italijansko"
 
-#: src/gtkdialogs.c:115
-#: src/gtkdialogs.c:152
+#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
 msgid "Japanese"
 msgstr "japonsko"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:117
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: src/gtkdialogs.c:117
-msgid "Georgian"
-msgstr "gruzijsko"
-
 #: src/gtkdialogs.c:118
-#: src/gtkdialogs.c:153
+msgid "Georgian"
+msgstr "gruzijsko"
+
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
 msgid "Korean"
 msgstr "korejsko"
 
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:120
 msgid "Dutch, Flemish"
 msgstr "nizozemsko, flamsko"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:121
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#: src/gtkdialogs.c:121
-msgid "Norwegian"
-msgstr "norveško"
-
 #: src/gtkdialogs.c:122
-#: src/gtkdialogs.c:123
-#: src/gtkdialogs.c:154
+msgid "Norwegian"
+msgstr "norveško"
+
+#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
 msgid "Polish"
 msgstr "poljsko"
 
-#: src/gtkdialogs.c:124
+#: src/gtkdialogs.c:125
 msgid "Portuguese"
 msgstr "portugalsko"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:126
 msgid "Portuguese-Brazil"
 msgstr "portugalsko (Brazilija)"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:127
 msgid "Romanian"
 msgstr "romunsko"
 
-#: src/gtkdialogs.c:127
-#: src/gtkdialogs.c:155
-#: src/gtkdialogs.c:156
+#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
 msgid "Russian"
 msgstr "rusko"
 
-#: src/gtkdialogs.c:128
-#: src/gtkdialogs.c:129
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
 msgid "Serbian"
 msgstr "srbsko"
 
-#: src/gtkdialogs.c:130
-msgid "Slovenian"
-msgstr "slovensko"
-
 #: src/gtkdialogs.c:131
-#: src/gtkdialogs.c:158
+msgid "Slovenian"
+msgstr "slovensko"
+
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
 msgid "Swedish"
 msgstr "švedsko"
 
-#: src/gtkdialogs.c:132
-msgid "Telugu"
-msgstr "teluško"
-
-#: src/gtkdialogs.c:133
-msgid "Vietnamese"
-msgstr "vietnamsko"
-
 #: src/gtkdialogs.c:133
+msgid "Telugu"
+msgstr "teluško"
+
+#: src/gtkdialogs.c:134
+msgid "Vietnamese"
+msgstr "vietnamsko"
+
+#: src/gtkdialogs.c:134
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh in ekipa Gnome-Vi"
 
-#: src/gtkdialogs.c:134
-#: src/gtkdialogs.c:159
+#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: src/gtkdialogs.c:135
-#: src/gtkdialogs.c:136
-#: src/gtkdialogs.c:160
+#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: src/gtkdialogs.c:142
+#: src/gtkdialogs.c:143
 msgid "Amharic"
 msgstr "amharsko"
 
-#: src/gtkdialogs.c:157
+#: src/gtkdialogs.c:158
 msgid "Slovak"
 msgstr "slovaško"
 
-#: src/gtkdialogs.c:201
+#: src/gtkdialogs.c:202
 msgid "About Gaim"
 msgstr "O programu Gaim"
 
-#: src/gtkdialogs.c:225
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr "Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr in Gadu-Gadu. Uporablja Gtk+ in je objavljen pod licenco GNU GPL.<BR><BR>"
-
-#: src/gtkdialogs.c:234
+#: src/gtkdialogs.c:226
+msgid ""
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+msgstr ""
+"Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati "
+"uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell "
+"GroupWise, Napster, Zephyr in Gadu-Gadu. Uporablja Gtk+ in je objavljen pod "
+"licenco GNU GPL.<BR><BR>"
+
+#: src/gtkdialogs.c:235
 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:237
+#: src/gtkdialogs.c:238
 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:243
+#: src/gtkdialogs.c:244
 msgid "Active Developers"
 msgstr "Aktivni razvijalci"
 
-#: src/gtkdialogs.c:258
+#: src/gtkdialogs.c:259
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obližev"
 
-#: src/gtkdialogs.c:273
+#: src/gtkdialogs.c:274
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: src/gtkdialogs.c:288
+#: src/gtkdialogs.c:289
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: src/gtkdialogs.c:308
+#: src/gtkdialogs.c:309
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: src/gtkdialogs.c:326
+#: src/gtkdialogs.c:327
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: src/gtkdialogs.c:488
-#: src/gtkdialogs.c:629
-#: src/gtkdialogs.c:684
+#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
 msgid "_Name"
 msgstr "_Ime"
 
-#: src/gtkdialogs.c:493
-#: src/gtkdialogs.c:634
-#: src/gtkdialogs.c:689
+#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
 msgid "_Account"
 msgstr "_Račun"
 
-#: src/gtkdialogs.c:501
+#: src/gtkdialogs.c:502
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: src/gtkdialogs.c:503
-msgid "Please enter the screen name or alias of the person you would like to IM."
+#: src/gtkdialogs.c:504
+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:642
+#: src/gtkdialogs.c:643
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: src/gtkdialogs.c:644
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
+#: src/gtkdialogs.c:645
+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:698
+#: src/gtkdialogs.c:699
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: src/gtkdialogs.c:700
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
+#: src/gtkdialogs.c:701
+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:719
+#: src/gtkdialogs.c:720
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:721
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/gtkdialogs.c:722
-#: src/gtkdialogs.c:744
-#: src/gtkdialogs.c:764
-#: src/gtkrequest.c:268
-#: src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
+#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: src/gtkdialogs.c:740
+#: src/gtkdialogs.c:741
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: src/gtkdialogs.c:742
+#: src/gtkdialogs.c:743
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: src/gtkdialogs.c:761
+#: src/gtkdialogs.c:762
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:763
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/gtkdialogs.c:799
-#, 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?"
-msgstr[0] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugih prijateljev. Ali želite nadaljevati?"
-msgstr[1] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugega prijatelja. Ali želite nadaljevati?"
-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:866
-#, 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:869
-#: src/gtkdialogs.c:870
+#: src/gtkdialogs.c:800
+#, 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?"
+msgstr[0] ""
+"S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugih "
+"prijateljev. Ali želite nadaljevati?"
+msgstr[1] ""
+"S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugega "
+"prijatelja. Ali želite nadaljevati?"
+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:867
+#, 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:870 src/gtkdialogs.c:871
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: src/gtkdialogs.c:908
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+#: src/gtkdialogs.c:909
+#, 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:911
-#: src/gtkdialogs.c:912
+#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: src/gtkdialogs.c:950
-#, 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:953
-#: src/gtkdialogs.c:954
+#: src/gtkdialogs.c:951
+#, 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:954 src/gtkdialogs.c:955
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
@@ -3240,18 +3165,15 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:159
-#: src/gtkft.c:1043
+#: src/gtkft.c:159 src/gtkft.c:1035
 msgid "Finished"
 msgstr "Končano"
 
-#: src/gtkft.c:162
-#: src/gtkft.c:994
+#: src/gtkft.c:162 src/gtkft.c:986
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: src/gtkft.c:165
-#: src/gtkft.c:913
+#: src/gtkft.c:165 src/gtkft.c:905
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
@@ -3339,74 +3261,63 @@
 msgstr "_Ohrani okno odprto"
 
 #: src/gtkft.c:725
-msgid "_Clear finished transfers"
+#, fuzzy
+msgid "C_lear finished transfers"
 msgstr "_Izbriši dokončane prenose"
 
 #. "Download Details" arrow
 #: src/gtkft.c:734
-msgid "Show transfer details"
-msgstr "Pokaži podrobnosti o prenosu"
-
-#: src/gtkft.c:735
-msgid "Hide transfer details"
+#, fuzzy
+msgid "File transfer _details"
 msgstr "Skrij podrobnosti o prenosu"
 
 #. Pause button
-#: src/gtkft.c:772
-#: src/gtkstock.c:122
+#: src/gtkft.c:764 src/gtkstock.c:122
 msgid "_Pause"
 msgstr "_Premor"
 
 #. Resume button
-#: src/gtkft.c:782
+#: src/gtkft.c:774
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: src/gtkft.c:996
+#: src/gtkft.c:988
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: src/gtkgaim-disclosure.c:258
-msgid "Expander Size"
-msgstr "Velikost razširnika"
-
-#: src/gtkgaim-disclosure.c:259
-msgid "Size of the expander arrow"
-msgstr "Velikost razširitvene puščice"
-
-#: src/gtkimhtml.c:814
+#: src/gtkimhtml.c:816
 msgid "Pa_ste As Text"
 msgstr "Prilepi kot be_sedilo"
 
-#: src/gtkimhtml.c:1311
+#: src/gtkimhtml.c:1313
 msgid "Hyperlink color"
 msgstr "Barva povezave"
 
-#: src/gtkimhtml.c:1312
+#: src/gtkimhtml.c:1314
 msgid "Color to draw hyperlinks."
 msgstr "Barva za risanje povezav."
 
-#: src/gtkimhtml.c:1315
+#: src/gtkimhtml.c:1317
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
 
-#: src/gtkimhtml.c:1316
+#: src/gtkimhtml.c:1318
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Barva za risanje povezav, ko je nad njimi miška."
 
-#: src/gtkimhtml.c:1535
+#: src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj naslov e-pošte"
 
-#: src/gtkimhtml.c:1547
+#: src/gtkimhtml.c:1549
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: src/gtkimhtml.c:1557
+#: src/gtkimhtml.c:1559
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: src/gtkimhtml.c:3236
+#: src/gtkimhtml.c:3234
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3416,7 +3327,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: src/gtkimhtml.c:3239
+#: src/gtkimhtml.c:3237
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3426,7 +3337,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: src/gtkimhtml.c:3252
+#: src/gtkimhtml.c:3250
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3437,7 +3348,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3255
+#: src/gtkimhtml.c:3253
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3448,12 +3359,11 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3335
-#: src/gtkimhtml.c:3347
+#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: src/gtkimhtml.c:3375
+#: src/gtkimhtml.c:3373
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
@@ -3478,7 +3388,9 @@
 msgstr "_Opis"
 
 #: src/gtkimhtmltoolbar.c:405
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
 msgstr "Vnesite URL in opis povezave, ki jo želite vstaviti. Opis ni obvezen."
 
 #: src/gtkimhtmltoolbar.c:409
@@ -3498,8 +3410,7 @@
 msgid "Failed to store image: %s\n"
 msgstr "Slike: %s ni mogoče shraniti.\n"
 
-#: src/gtkimhtmltoolbar.c:513
-#: src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
@@ -3512,51 +3423,51 @@
 msgid "Smile!"
 msgstr "Nasmeh!"
 
-#: src/gtkimhtmltoolbar.c:918
+#: src/gtkimhtmltoolbar.c:916
 msgid "Bold"
 msgstr "Krepko"
 
-#: src/gtkimhtmltoolbar.c:929
+#: src/gtkimhtmltoolbar.c:927
 msgid "Italic"
 msgstr "Ležeče"
 
-#: src/gtkimhtmltoolbar.c:940
+#: src/gtkimhtmltoolbar.c:938
 msgid "Underline"
 msgstr "Podčrtano"
 
-#: src/gtkimhtmltoolbar.c:956
+#: src/gtkimhtmltoolbar.c:954
 msgid "Larger font size"
 msgstr "Povečaj pisavo"
 
-#: src/gtkimhtmltoolbar.c:968
+#: src/gtkimhtmltoolbar.c:966
 msgid "Smaller font size"
 msgstr "Manjša pisava"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:983
 msgid "Font Face"
 msgstr "Tip pisave"
 
-#: src/gtkimhtmltoolbar.c:997
+#: src/gtkimhtmltoolbar.c:995
 msgid "Foreground font color"
 msgstr "Barva pisave"
 
-#: src/gtkimhtmltoolbar.c:1009
+#: src/gtkimhtmltoolbar.c:1007
 msgid "Background color"
 msgstr "Barva ozadja"
 
-#: src/gtkimhtmltoolbar.c:1025
+#: src/gtkimhtmltoolbar.c:1023
 msgid "Clear formatting"
 msgstr "Počisti oblikovanje"
 
-#: src/gtkimhtmltoolbar.c:1040
+#: src/gtkimhtmltoolbar.c:1038
 msgid "Insert link"
 msgstr "Vstavi povezavo"
 
-#: src/gtkimhtmltoolbar.c:1050
+#: src/gtkimhtmltoolbar.c:1048
 msgid "Insert image"
 msgstr "Vstavi sliko"
 
-#: src/gtkimhtmltoolbar.c:1061
+#: src/gtkimhtmltoolbar.c:1059
 msgid "Insert smiley"
 msgstr "Vstavi smeškota"
 
@@ -3570,38 +3481,52 @@
 msgid "Conversation with %s on %s"
 msgstr "Pomenki z %s o %s"
 
-#: src/gtklog.c:374
+#: src/gtklog.c:309
+#, fuzzy
+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 <span style="
+"\"italic\">Omogoči sistemski dnevnik</span>."
+
+#: src/gtklog.c:313
+#, fuzzy
+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 <span "
+"style=\"italic\">Shranjuj vsa neposredna sporočila</span>."
+
+#: src/gtklog.c:316
+#, fuzzy
+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 <span style="
+"\"italic\">Shranjuj vse pomenke</span>."
+
+#: src/gtklog.c:320
+#, fuzzy
+msgid "No logs were found"
+msgstr "Ni najdenih dnevnikov."
+
+#: src/gtklog.c:396
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
-#: src/gtklog.c:422
-msgid "System events will only be logged if the <span style=\"italic\">Enable system log preference</span> is set."
-msgstr "Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost <span style=\"italic\">Omogoči sistemski dnevnik</span>."
-
-#: src/gtklog.c:426
-msgid "Instant messages will only be logged if the <span style=\"italic\">Log all instant messages</span> preference is enabled."
-msgstr "Neposredna sporočila se bodo shranila, le če bo okljukana možnost <span style=\"italic\">Shranjuj vsa neposredna sporočila</span>."
-
-#: src/gtklog.c:429
-msgid "Chats will only be logged if the <span style=\"italic\">Log all chats preference</span> is enabled."
-msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost <span style=\"italic\">Shranjuj vse pomenke</span>."
-
-#: src/gtklog.c:434
-msgid "No logs were found."
-msgstr "Ni najdenih dnevnikov."
-
-#: src/gtklog.c:480
+#: src/gtklog.c:472
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: src/gtklog.c:488
-#: src/gtklog.c:540
+#: src/gtklog.c:480 src/gtklog.c:531
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: src/gtklog.c:565
+#: src/gtklog.c:556
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
@@ -3611,18 +3536,17 @@
 msgstr "Gaim %s. Poskusi '%s -h' za več informacij.\n"
 
 #: src/gtkmain.c:328
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -a, --acct          display account editor window\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
+"                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "Gaim %s\n"
@@ -3637,6 +3561,15 @@
 "                     določa račun(e) za prijavo, ločene z vejico)\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
+#. TODO: Should save the previous status as a transient status?
+#. Save the newly selected status to prefs.xml and status.xml
+#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
+#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
+#: src/status.c:1696
+#, fuzzy
+msgid "Default"
+msgstr "Privzeto za Gnome"
+
 #. Descriptive label
 #: src/gtknotify.c:275
 #, c-format
@@ -3679,42 +3612,40 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:502
+#: src/gtknotify.c:504
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: src/gtknotify.c:641
-#: src/protocols/oscar/oscar.c:4862
+#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
-#: src/gtknotify.c:642
-#: src/protocols/toc/toc.c:470
+#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
-#: src/gtknotify.c:685
+#: src/gtknotify.c:687
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Ukaz brskalnika <b>%s</b> ni veljaven."
 
-#: src/gtknotify.c:687
-#: src/gtknotify.c:699
-#: src/gtknotify.c:712
-#: src/gtknotify.c:836
+#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
+#: src/gtknotify.c:838
 msgid "Unable to open URL"
 msgstr "Ni bilo mogoče odprti URL"
 
-#: src/gtknotify.c:697
-#: src/gtknotify.c:710
+#: src/gtknotify.c:699 src/gtknotify.c:712
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Napaka pri zaganjanju <b>%s</b>: %s"
 
-#: src/gtknotify.c:837
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Vašega brskalnika ni bilo mogoče zagnati, ker ste v nastavitvah izbrali poljuben brskalnik, a niste nastavili ukaza."
+#: src/gtknotify.c:839
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"Vašega brskalnika ni bilo mogoče zagnati, ker ste v nastavitvah izbrali "
+"poljuben brskalnik, a niste nastavili ukaza."
 
 #: src/gtkpounce.c:130
 msgid "Select a file"
@@ -3725,8 +3656,7 @@
 msgstr "Vnesite opozorilo prijatelja."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391
-#: src/gtkpounce.c:898
+#: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
@@ -3870,222 +3800,211 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
-#: src/gtkprefs.c:724
-msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
-msgstr "S spodnjega seznama izberite vrsto smeškov, ki jih želite uporabljati. Nove teme lahko namestite, če jih povlečete in spustite na seznam."
-
-#: src/gtkprefs.c:759
+#: src/gtkprefs.c:623
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"S spodnjega seznama izberite vrsto smeškov, ki jih želite uporabljati. Nove "
+"teme lahko namestite, če jih povlečete in spustite na seznam."
+
+#: src/gtkprefs.c:658
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/gtkprefs.c:766
-#: src/gtkprefs.c:2103
-#: src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:810
-#: src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Opis"
 
-#: src/gtkprefs.c:887
-msgid "Buddy List Sorting"
-msgstr "Razvrščanje seznama prijateljev"
-
-#: src/gtkprefs.c:896
-msgid "_Sorting:"
-msgstr "Razvr_ščanje:"
-
-#: src/gtkprefs.c:901
-msgid "Buddy Display"
-msgstr "Prikaz prijateljev"
-
-#: src/gtkprefs.c:902
-msgid "Show more buddy details"
-msgstr "Pokaži podrobnosti o uporabniku"
-
-#: src/gtkprefs.c:940
+#: src/gtkprefs.c:805
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Pošlji neznane ukaze \"_slash\" kot sporočila"
 
-#: src/gtkprefs.c:942
+#: src/gtkprefs.c:807
 msgid "Show _formatting on incoming messages"
 msgstr "Prikaži _oblikovanje v dohodnih sporočilih"
 
-#: src/gtkprefs.c:944
+#: src/gtkprefs.c:809
 msgid "Show buddy _icons"
 msgstr "Prikaži _ikone"
 
-#: src/gtkprefs.c:946
+#: src/gtkprefs.c:811
 msgid "Enable buddy ic_on animation"
 msgstr "_Omogoči animacijo ikon prijateljev"
 
-#: src/gtkprefs.c:948
+#: src/gtkprefs.c:813
 msgid "_Notify buddies that you are typing to them"
 msgstr "O_bvesti prijatelje, da jim pišem"
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:816
 msgid "_Highlight misspelled words"
 msgstr "_Opozori na nepravilno črkovane besede"
 
-#: src/gtkprefs.c:969
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
-msgstr "Tako bo izgledalo besedilo vašega odhodnega sporočila, če uporabljate protokole, ki podpirajo oblikovanje. :)"
+#: src/gtkprefs.c:834
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Tako bo izgledalo besedilo vašega odhodnega sporočila, če uporabljate "
+"protokole, ki podpirajo oblikovanje. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:856
 msgid "Tab Options"
 msgstr "Možnosti zavihkov"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:858
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prikaži pogovore v _oknih z zavihki"
 
-#: src/gtkprefs.c:1007
+#: src/gtkprefs.c:872
 msgid "Show close b_utton on tabs"
 msgstr "Pokaži _gumb 'Zapri' na zavihkih"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:878
 msgid "_Placement:"
 msgstr "_Postavitev"
 
-#: src/gtkprefs.c:1015
+#: src/gtkprefs.c:880
 msgid "Top"
 msgstr "zgoraj"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:881
 msgid "Bottom"
 msgstr "spodaj"
 
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:882
 msgid "Left"
 msgstr "na levi"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:883
 msgid "Right"
 msgstr "na desni"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:885
 msgid "Left Vertical"
 msgstr "levo navpično"
 
-#: src/gtkprefs.c:1021
+#: src/gtkprefs.c:886
 msgid "Right Vertical"
 msgstr "desno navpično"
 
-#: src/gtkprefs.c:1026
+#: src/gtkprefs.c:891
 msgid "N_ew conversations:"
 msgstr "N_ovi pogovori:"
 
-#: src/gtkprefs.c:1077
-#: src/protocols/oscar/oscar.c:777
-#: src/protocols/oscar/oscar.c:5948
+#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
+#: src/protocols/oscar/oscar.c:5959
 msgid "IP Address"
 msgstr "Naslov IP"
 
-#: src/gtkprefs.c:1079
+#: src/gtkprefs.c:944
 msgid "STUN Server:"
 msgstr "Strežnik STUN:"
 
-#: src/gtkprefs.c:1081
+#: src/gtkprefs.c:946
 msgid "_Autodetect IP Address"
 msgstr "_Samozaznaj IP-naslov"
 
-#: src/gtkprefs.c:1090
+#: src/gtkprefs.c:955
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:979
 msgid "Ports"
 msgstr "Vrata"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:982
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ročno določi obseg vrat za poslušanje"
 
-#: src/gtkprefs.c:1120
+#: src/gtkprefs.c:985
 msgid "_Start Port:"
 msgstr "_Začetna vrata:"
 
-#: src/gtkprefs.c:1127
+#: src/gtkprefs.c:992
 msgid "_End Port:"
 msgstr "_Končna vrata:"
 
-#: src/gtkprefs.c:1134
+#: src/gtkprefs.c:999
 msgid "Proxy Server"
 msgstr "Strežnik proxy"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1003
 msgid "No proxy"
 msgstr "Brez strežnika proxy"
 
-#: src/gtkprefs.c:1200
+#: src/gtkprefs.c:1059
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: src/gtkprefs.c:1256
+#: src/gtkprefs.c:1119
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1257
+#: src/gtkprefs.c:1120
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1121
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1122
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1260
-msgid "Gnome Default"
+#: src/gtkprefs.c:1123
+#, fuzzy
+msgid "GNOME Default"
 msgstr "Privzeto za Gnome"
 
-#: src/gtkprefs.c:1261
+#: src/gtkprefs.c:1124
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1262
+#: src/gtkprefs.c:1125
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1126
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1127
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1273
+#: src/gtkprefs.c:1136
 msgid "Manual"
 msgstr "Ročni"
 
-#: src/gtkprefs.c:1326
+#: src/gtkprefs.c:1189
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1193
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: src/gtkprefs.c:1337
+#: src/gtkprefs.c:1201
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1203
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: src/gtkprefs.c:1340
+#: src/gtkprefs.c:1204
 msgid "Existing window"
 msgstr "Obstoječe okno"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1206
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: src/gtkprefs.c:1356
+#: src/gtkprefs.c:1220
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4094,75 +4013,56 @@
 "_Ročno:\n"
 "(%s namesto URL)"
 
-#: src/gtkprefs.c:1395
-msgid "Message Logs"
-msgstr "Dnevnik sporočil"
-
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+msgid "Logging"
+msgstr "Beleženje v dnevnik"
+
+#: src/gtkprefs.c:1259
 msgid "Log _Format:"
 msgstr "Oblika _dnevnika:"
 
-#: src/gtkprefs.c:1401
-msgid "_Log all instant messages"
+#: src/gtkprefs.c:1264
+#, fuzzy
+msgid "Log all _instant messages"
 msgstr "_Shranjuj vsa neposredna sporočila"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1266
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: src/gtkprefs.c:1406
-msgid "System Logs"
-msgstr "Sistemski dnevniki"
-
-#: src/gtkprefs.c:1408
-msgid "_Enable system log"
-msgstr "_Omogoči sistemski dnevnik"
-
-#: src/gtkprefs.c:1411
-msgid "Log when buddies log in/log _out"
-msgstr "Shranjuj čas prijave/_odjave prijateljev"
-
-#: src/gtkprefs.c:1417
-msgid "Log when buddies become _idle/un-idle"
-msgstr "Shranjuj čas, ko postane prijatelj (ne)_dejaven"
-
-#: src/gtkprefs.c:1423
-msgid "Log when buddies go away/come _back"
-msgstr "Shranjuj čas, ko gre prijatelj stran oz. se _vrne"
-
-#: src/gtkprefs.c:1429
-msgid "Log your own _signons/idleness/awayness"
-msgstr "Shranuj _moje spremembe stanj"
-
-#: src/gtkprefs.c:1566
+#: src/gtkprefs.c:1268
+msgid "Log all _status changes to system log"
+msgstr ""
+
+#: src/gtkprefs.c:1400
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: src/gtkprefs.c:1620
+#: src/gtkprefs.c:1454
 msgid "Sound Method"
 msgstr "Način zvoka"
 
-#: src/gtkprefs.c:1621
+#: src/gtkprefs.c:1455
 msgid "_Method:"
 msgstr "_Način:"
 
-#: src/gtkprefs.c:1623
+#: src/gtkprefs.c:1457
 msgid "Console beep"
 msgstr "Pisk"
 
-#: src/gtkprefs.c:1625
+#: src/gtkprefs.c:1459
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/gtkprefs.c:1630
+#: src/gtkprefs.c:1464
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/gtkprefs.c:1631
+#: src/gtkprefs.c:1465
 msgid "No sounds"
 msgstr "Nemo"
 
-#: src/gtkprefs.c:1639
+#: src/gtkprefs.c:1473
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4171,175 +4071,115 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: src/gtkprefs.c:1665
+#: src/gtkprefs.c:1499
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1500
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: src/gtkprefs.c:1668
+#: src/gtkprefs.c:1502
 msgid "_Sounds while away"
 msgstr "_Zvoki, kadar sem odsoten"
 
-#: src/gtkprefs.c:1678
+#: src/gtkprefs.c:1512
 msgid "Sound Events"
 msgstr "Zvočni Dogodki"
 
-#: src/gtkprefs.c:1729
+#: src/gtkprefs.c:1563
 msgid "Play"
 msgstr "Predvajaj"
 
-#: src/gtkprefs.c:1736
+#: src/gtkprefs.c:1570
 msgid "Event"
 msgstr "Dogodek"
 
-#: src/gtkprefs.c:1755
+#: src/gtkprefs.c:1589
 msgid "Test"
 msgstr "Preskus"
 
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1593
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: src/gtkprefs.c:1763
+#: src/gtkprefs.c:1597
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: src/gtkprefs.c:1819
+#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
+#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
+#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
+#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
+#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
+#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
+#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
+#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
+#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
+#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
+msgid "Away"
+msgstr "Odsoten"
+
+#: src/gtkprefs.c:1652
 msgid "_Queue new messages when away"
 msgstr "_Zbiraj sporočila, kadar sem odsoten"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:1655
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: src/gtkprefs.c:1825
+#: src/gtkprefs.c:1658
 msgid "When away"
 msgstr "ob odsotnosti"
 
-#: src/gtkprefs.c:1826
+#: src/gtkprefs.c:1659
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
-#: src/gtkprefs.c:1829
-#: src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5068
-#: src/protocols/yahoo/yahoo.c:2636
-#: src/protocols/yahoo/yahoo_profile.c:665
-msgid "Idle"
-msgstr "Nedejaven"
-
-#: src/gtkprefs.c:1830
-msgid "Idle _Tracking:"
-msgstr "Poročanje o času ne_dejavnosti:"
-
-#: src/gtkprefs.c:1832
-msgid "Gaim usage"
-msgstr "programa Gaim"
-
-#: src/gtkprefs.c:1835
-msgid "X usage"
-msgstr "okenskega sistema X"
-
-#: src/gtkprefs.c:1837
-msgid "Windows usage"
-msgstr "operacijskega sistema Windows"
-
-#: src/gtkprefs.c:1842
+#: src/gtkprefs.c:1662
 msgid "_Report idle time"
 msgstr "Prikaži _čas nedejavnosti"
 
-#: src/gtkprefs.c:1848
+#: src/gtkprefs.c:1665
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: src/gtkprefs.c:1849
-msgid "Set away _when idle"
+#: src/gtkprefs.c:1666
+#, fuzzy
+msgid "Change status when _idle"
 msgstr "Nastavi _odsotnost ob nedejavnosti"
 
-#: src/gtkprefs.c:1853
-msgid "_Minutes before setting away:"
+#: src/gtkprefs.c:1670
+#, fuzzy
+msgid "_Minutes before changing status:"
 msgstr "Število _minut nedejavnosti za nastavitev odsotnosti:"
 
-#: src/gtkprefs.c:1861
-msgid "Away m_essage:"
-msgstr "Spo_ročilo o odsotnosti:"
-
-#: src/gtkprefs.c:1919
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Napisal:</span>\t%s\n"
-"<span weight=\"bold\">Spletni naslov:</span>\t\t%s\n"
-"<span weight=\"bold\">Ime datoteke:</span>\t%s"
-
-#: src/gtkprefs.c:1924
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">File name:</span>  %s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Napisal:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">Ime datoteke:</span>  %s "
-
-#: src/gtkprefs.c:2059
-msgid "Load"
-msgstr "Naloži"
-
-#: src/gtkprefs.c:2073
-msgid "Summary"
-msgstr "Povzetek"
-
-#: src/gtkprefs.c:2121
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: src/gtkprefs.c:2169
+#: src/gtkprefs.c:1678
+#, fuzzy
+msgid "Change _status to:"
+msgstr "Spremeni naslov v:"
+
+#: src/gtkprefs.c:1728
 msgid "Smiley Themes"
 msgstr "Teme za smeške"
 
-#: src/gtkprefs.c:2170
+#: src/gtkprefs.c:1729
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: src/gtkprefs.c:2171
-#: src/protocols/silc/silc.c:1597
+#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
 msgid "Network"
 msgstr "Omrežje"
 
-#: src/gtkprefs.c:2176
+#: src/gtkprefs.c:1735
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: src/gtkprefs.c:2179
-msgid "Logging"
-msgstr "Beleženje v dnevnik"
-
-#: src/gtkprefs.c:2180
+#: src/gtkprefs.c:1739
 msgid "Away / Idle"
 msgstr "Odsotnost / Nedejavnost"
 
-#: src/gtkprefs.c:2183
-msgid "Plugins"
-msgstr "Vstavki"
-
 #: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Dovoli vsem uporabnikom, da stopijo v stik z mano"
@@ -4373,8 +4213,7 @@
 msgid "Set privacy for:"
 msgstr "Nastavi zasebnost za:"
 
-#: src/gtkprivacy.c:589
-#: src/gtkprivacy.c:605
+#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Dovoli uporabniku"
 
@@ -4384,10 +4223,10 @@
 
 #: src/gtkprivacy.c:591
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Prosim vnesite ime uporabnika, ki mu želite omogočiti, da stopi v stik z vami"
-
-#: src/gtkprivacy.c:594
-#: src/gtkprivacy.c:607
+msgstr ""
+"Prosim vnesite ime uporabnika, ki mu želite omogočiti, da stopi v stik z vami"
+
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "Dovoli"
 
@@ -4401,8 +4240,7 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Ste prepričani, da želite dovoliti %s, da stopi v stik z vami?"
 
-#: src/gtkprivacy.c:628
-#: src/gtkprivacy.c:641
+#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Zavrni uporabnika"
 
@@ -4414,9 +4252,7 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "Vnesite ime uporabnika, ki ga želite zavrniti."
 
-#: src/gtkprivacy.c:632
-#: src/gtkprivacy.c:643
-#: src/protocols/gg/gg.c:1140
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
 msgid "Block"
 msgstr "Zavrni"
 
@@ -4433,53 +4269,42 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:258
-#: src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553
-#: src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902
-#: src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117
-#: src/request.h:1322
+#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
+#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
+#: src/protocols/silc/pk.c:117 src/request.h:1322
 msgid "Yes"
 msgstr "Da"
 
-#: src/gtkrequest.c:259
-#: src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553
-#: src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903
-#: src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118
-#: src/request.h:1322
+#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:118 src/request.h:1322
 msgid "No"
 msgstr "Ne"
 
-#: src/gtkrequest.c:262
+#: src/gtkrequest.c:263
 msgid "Apply"
 msgstr "Uporabi"
 
-#: src/gtkrequest.c:263
-#: src/protocols/msn/msn.c:357
+#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
 #: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Zapri"
 
-#: src/gtkrequest.c:1795
+#: src/gtkrequest.c:1796
 msgid "That file already exists"
 msgstr "Datoteka že obstaja"
 
-#: src/gtkrequest.c:1796
+#: src/gtkrequest.c:1797
 msgid "Would you like to overwrite it?"
 msgstr "Ali jo želite prepisati?"
 
-#: src/gtkrequest.c:1838
-#: src/gtkrequest.c:1879
+#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
 msgid "Save File..."
 msgstr "Shrani datoteko ..."
 
-#: src/gtkrequest.c:1839
-#: src/gtkrequest.c:1880
+#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
@@ -4492,85 +4317,73 @@
 msgid "_Get List"
 msgstr "_Dobi seznam"
 
-#: src/gtksavedstatuses.c:314
-#: src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:804
-#: src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr "Naziv"
 
-#: src/gtksavedstatuses.c:329
+#: src/gtksavedstatuses.c:377
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/gtksavedstatuses.c:340
-#: src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088
-#: src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1102
-#: src/protocols/gg/gg.c:1112
-#: src/protocols/gg/gg.c:1117
-#: src/protocols/irc/irc.c:177
-#: src/protocols/jabber/jabber.c:1027
-#: src/protocols/jabber/jabber.c:1035
-#: src/protocols/jabber/jabber.c:1043
-#: src/protocols/jabber/jabber.c:1051
-#: src/protocols/jabber/jabber.c:1059
-#: src/protocols/jabber/jabber.c:1067
-#: src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758
-#: src/protocols/oscar/oscar.c:7765
-#: src/protocols/yahoo/yahoo.c:3218
-#: src/protocols/yahoo/yahoo.c:3252
+#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
+#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
+#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
+#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
+#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
+#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
+#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
+#: src/protocols/sametime/sametime.c:2759
+#: src/protocols/sametime/sametime.c:2765
+#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
+#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
 #: src/protocols/zephyr/zephyr.c:2260
 msgid "Message"
 msgstr "Sporočilo"
 
-#: src/gtksavedstatuses.c:403
+#: src/gtksavedstatuses.c:451
 msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
-#: src/gtksavedstatuses.c:524
+#. Use button
+#. TODO: It might be better if the button said "Use" or "Activate"
+#: src/gtksavedstatuses.c:477
+#, fuzzy
+msgid "_Use"
+msgstr "_Odnastavi"
+
+#: src/gtksavedstatuses.c:584
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Naziv je že v uporabi. Prosimo, izberite drug naziv."
 
-#: src/gtksavedstatuses.c:615
+#: src/gtksavedstatuses.c:675
 msgid "Custom status"
 msgstr "Stanja po meri"
 
-#: src/gtksavedstatuses.c:718
-#: src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069
-#: src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/buddy.c:632
-#: src/protocols/jabber/buddy.c:643
-#: src/protocols/jabber/jabber.c:1000
-#: src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844
-#: src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:760
-#: src/protocols/oscar/oscar.c:765
-#: src/protocols/oscar/oscar.c:767
-#: src/protocols/yahoo/yahoo.c:2788
+#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
+#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
+#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
+#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
+#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gtksavedstatuses.c:737
+#: src/gtksavedstatuses.c:797
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: src/gtksavedstatuses.c:748
-msgid "Out of the office"
-msgstr "Stran iz pisarne"
-
-#: src/gtksavedstatuses.c:759
+#: src/gtksavedstatuses.c:817
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#. Custom status message disclosure
-#: src/gtksavedstatuses.c:794
-#: src/gtksavedstatuses.c:795
-msgid "Use a different status for some accounts"
+#. Custom status message expander
+#: src/gtksavedstatuses.c:852
+#, fuzzy
+msgid "Use a _different status for some accounts"
 msgstr "Za nekatere račune uporabi različno stanje"
 
 #: src/gtksound.c:61
@@ -4613,91 +4426,86 @@
 msgid "Someone says your name in chat"
 msgstr "Nekdo omeni vaše ime v sobi"
 
-#: src/gtksound.c:413
+#: src/gtksound.c:414
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Zvoka ni bilo moč predvajati, ker izbrana datoteka (%s) ne obstaja."
 
-#: 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: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:183
+#: src/gtksound.c:430
+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:442
+#, 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:197
 msgid "Typing"
 msgstr "Tipka"
 
 #. connect to the server
-#: src/gtkstatusbox.c:186
-#: src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:834
-#: src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525
-#: src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1822
-#: src/protocols/trepia/trepia.c:1069
-#: src/protocols/yahoo/yahoo.c:2456
-#: src/protocols/zephyr/zephyr.c:1546
+#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
+#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
+#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
+#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
+#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
 msgid "Connecting"
 msgstr "Povezovanje"
 
 #. hacks
-#.
-#. * Without this selecting Available or Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:305
-#: src/protocols/gg/gg.c:1096
-#: src/protocols/irc/irc.c:172
-#: src/protocols/jabber/jabber.c:1034
-#: src/protocols/msn/msn.c:573
-#: 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:2822
-#: src/protocols/novell/novell.c:2956
-#: src/protocols/novell/novell.c:3045
-#: src/protocols/oscar/oscar.c:806
-#: src/protocols/oscar/oscar.c:7757
-#: src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3212
-#: src/status.c:155
+#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
+#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
+#: src/protocols/msn/msn.c:573 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:2822
+#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
+#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
+#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
 msgid "Available"
 msgstr "Na voljo"
 
-#: src/gtkstatusbox.c:307
-#: src/protocols/gg/gg.c:1101
-#: src/protocols/oscar/oscar.c:709
-#: src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2634
-#: src/protocols/yahoo/yahoo.c:3256
+#.
+#. * Without this selecting Invisible as own status doesn't
+#. * work. It's not used and not needed to show status of buddies.
+#.
+#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
+#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
+#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
 msgid "Invisible"
 msgstr "Neviden"
 
-#: src/gtkstatusbox.c:308
-#: src/protocols/gg/gg.c:1082
-#: src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1086
-#: src/protocols/jabber/jabber.c:1027
-#: src/protocols/msn/msn.c:569
-#: src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834
-#: src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752
-#: src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2638
-#: src/protocols/yahoo/yahoo.c:3209
+#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
+#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
+#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
+#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
+#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
+#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
+#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
+#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
 #: src/status.c:154
 msgid "Offline"
 msgstr "Brez povezave"
 
+#: src/gtkstatusbox.c:299
+msgid "Custom..."
+msgstr ""
+
+#: src/gtkstatusbox.c:300
+#, fuzzy
+msgid "Saved..."
+msgstr "Shrani datoteko ..."
+
 #: src/gtkstock.c:117
 msgid "_Alias"
 msgstr "_Psevdonim"
@@ -4718,121 +4526,142 @@
 msgid "_Warn"
 msgstr "_Opozori"
 
-#: src/gtkutils.c:1388
-#: src/gtkutils.c:1413
+#: src/gtkutils.c:1393 src/gtkutils.c:1418
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pri odpiranju %s je prišlo do neznane napake: %s"
 
-#: src/gtkutils.c:1390
-#: src/gtkutils.c:1415
+#: src/gtkutils.c:1395 src/gtkutils.c:1420
 msgid "Failed to load image"
 msgstr "Slike ni mogoče odpreti"
 
-#: src/gtkutils.c:1490
+#: src/gtkutils.c:1495
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogoče poslati imenika %s."
 
-#: src/gtkutils.c:1492
-msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
-msgstr "Gaim ne more prenesti imenika. Datoteke boste morali poslati posamično."
-
-#: src/gtkutils.c:1520
-#: src/gtkutils.c:1529
-#: src/gtkutils.c:1534
+#: src/gtkutils.c:1497
+msgid ""
+"Gaim cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+"Gaim ne more prenesti imenika. Datoteke boste morali poslati posamično."
+
+#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
 msgid "You have dragged an image"
 msgstr "Povlekli ste sliko"
 
-#: src/gtkutils.c:1521
-msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
-msgstr "To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali uporabite kot ikono za tega uporabnika."
-
-#: src/gtkutils.c:1525
-#: src/gtkutils.c:1540
-msgid "Set as buddy icon"
-msgstr "Nastavi kot ikono prijatelja"
-
 #: src/gtkutils.c:1526
-#: src/gtkutils.c:1541
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali "
+"uporabite kot ikono za tega uporabnika."
+
+#: src/gtkutils.c:1530 src/gtkutils.c:1545
+msgid "Set as buddy icon"
+msgstr "Nastavi kot ikono prijatelja"
+
+#: src/gtkutils.c:1531 src/gtkutils.c:1546
 msgid "Send image file"
 msgstr "Pošlji slikovno datoteko"
 
-#: src/gtkutils.c:1527
-#: src/gtkutils.c:1541
+#: src/gtkutils.c:1532 src/gtkutils.c:1546
 msgid "Insert in message"
 msgstr "Vstavi v sporočilo"
 
-#: src/gtkutils.c:1530
+#: src/gtkutils.c:1535
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo želite nastaviti za ikono prijatelja?"
 
-#: src/gtkutils.c:1535
-msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
-msgstr "To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali jo uporabite kot ikono za tega uporabnika."
-
-#: src/gtkutils.c:1537
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "To sliko lahko vstavite v to sporočilo ali pa jo uporabite kot ikono prijatelja za tega prijatelja"
+#: src/gtkutils.c:1540
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali jo "
+"uporabite kot ikono za tega uporabnika."
+
+#: src/gtkutils.c:1542
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"To sliko lahko vstavite v to sporočilo ali pa jo uporabite kot ikono "
+"prijatelja za tega prijatelja"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1591
+#: src/gtkutils.c:1596
 msgid "Cannot send launcher"
 msgstr "Ni mogoče poslati zaganjalnika"
 
-#: src/gtkutils.c:1591
-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/gtkutils.c:1596
+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:129
 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:578
+#: src/log.c:577
 msgid "Logging of this conversation failed."
 msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
 
-#: src/log.c:840
+#: src/log.c:839
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:905
-#, 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:907
-#, 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:958
-#: src/log.c:1075
+#: src/log.c:904
+#, 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:906
+#, 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:957 src/log.c:1074
 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:968
-#: src/log.c:1087
+#: src/log.c:967 src/log.c:1086
 #, 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:1020
+#: src/log.c:1019
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
 #: src/plugin.c:331
 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr "Zahtevani dodatek %s ni bil najden. Prosim namestite dodatek in poskusite ponovno."
-
-#: src/plugin.c:336
-#: src/plugin.c:364
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"Zahtevani dodatek %s ni bil najden. Prosim namestite dodatek in poskusite "
+"ponovno."
+
+#: src/plugin.c:336 src/plugin.c:364
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ni mogel naložiti vašega dodatka."
 
@@ -4841,12 +4670,79 @@
 msgid "The required plugin %s was unable to load."
 msgstr "Zahtevanega dodatka %s se ni dalo naložiti."
 
-#: src/prefs.c:1094
-msgid "Slightly less boring default"
-msgstr "Nekoliko manj dolgočasno privzeto"
-
-#: src/protocols/gg/gg.c:136
-#: src/protocols/gg/gg.c:155
+#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
+#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
+#: src/protocols/yahoo/yahoo_profile.c:660
+msgid "Idle"
+msgstr "Nedejaven"
+
+#: src/protocols/bonjour/bonjour.c:303
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s"
+msgstr ""
+"\n"
+"<b>Stanje</b>: Neverjetno!"
+
+#: src/protocols/bonjour/bonjour.c:305
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Message:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
+#, fuzzy
+msgid "Bonjour Protocol Plugin"
+msgstr "Dodatek za protokol Yahoo"
+
+#. Creating the user splits
+#: src/protocols/bonjour/bonjour.c:417
+#, fuzzy
+msgid "Host name"
+msgstr "Priimek"
+
+#. Creating the options for the protocol
+#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
+#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
+#: src/protocols/silc/silc.c:1597
+msgid "Port"
+msgstr "Vrata"
+
+#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
+msgid "First name"
+msgstr "Ime"
+
+#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
+msgid "Last name"
+msgstr "Priimek"
+
+#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
+#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
+#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
+#: src/protocols/yahoo/yahoo_profile.c:995
+msgid "Email"
+msgstr "Elektronska pošta"
+
+#: src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr ""
+
+#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
 msgid "Save Buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
@@ -4854,8 +4750,7 @@
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Seznam prijateljev je prazen, v datoteko ni bilo nič zapisanega."
 
-#: src/protocols/gg/gg.c:143
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
 #: src/protocols/gg/gg.c:176
 msgid "Couldn't open file"
 msgstr "Ni mogoče odpreti datoteke"
@@ -4900,35 +4795,17 @@
 msgid "Registration completed successfully!"
 msgstr "Registracija je uspela!"
 
-#: src/protocols/gg/gg.c:401
-msgid "Last name"
-msgstr "Priimek"
-
-#: src/protocols/gg/gg.c:405
-msgid "First name"
-msgstr "Ime"
-
-#: src/protocols/gg/gg.c:409
-#: src/protocols/gg/gg.c:1679
-#: src/protocols/jabber/buddy.c:251
-#: src/protocols/jabber/buddy.c:697
-#: src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1402
-#: src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114
-#: src/protocols/yahoo/yahoo_profile.c:1008
+#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
+#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
+#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#. City
-#: src/protocols/gg/gg.c:413
-#: src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:5995
-#: src/protocols/oscar/oscar.c:6003
-#: src/protocols/trepia/trepia.c:332
-#: src/protocols/trepia/trepia.c:411
+#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
+#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
 msgid "City"
 msgstr "Kraj"
 
@@ -4940,9 +4817,8 @@
 msgid "Only online"
 msgstr "Le prisoten"
 
-#: src/protocols/gg/gg.c:430
-#: src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1524
+#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
+#: src/protocols/gg/gg.c:1510
 msgid "Find buddies"
 msgstr "Poišči prijatelje"
 
@@ -4982,26 +4858,21 @@
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: src/protocols/gg/gg.c:555
-#: src/protocols/gg/gg.c:1490
-#: src/protocols/jabber/jabber.c:632
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
+#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
 msgid "Password"
 msgstr "Geslo"
 
-#: src/protocols/gg/gg.c:559
-#: src/protocols/gg/gg.c:1494
+#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
 msgid "Password (retype)"
 msgstr "Geslo (ponovno vtipkajte)"
 
-#: src/protocols/gg/gg.c:563
-#: src/protocols/gg/gg.c:1498
+#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
 msgid "Enter current token"
 msgstr "Vnesite trenutni žeton"
 
 #. original size: 60x24
-#: src/protocols/gg/gg.c:568
-#: src/protocols/gg/gg.c:1503
+#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
 msgid "Current token"
 msgstr "Trenutni žeton"
 
@@ -5009,8 +4880,7 @@
 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:578
-#: src/protocols/gg/gg.c:579
+#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
 msgid "Change Gadu-Gadu Password"
 msgstr "Spremeni geslo Gadu-Gadu"
 
@@ -5019,8 +4889,7 @@
 msgid "Select a chat for buddy: %s"
 msgstr "Izberite klepet za prijatelja: %s"
 
-#: src/protocols/gg/gg.c:651
-#: src/protocols/gg/gg.c:652
+#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
@@ -5049,12 +4918,9 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/protocols/gg/gg.c:1087
-#: src/protocols/jabber/buddy.c:1088
-#: src/protocols/napster/napster.c:578
-#: src/protocols/oscar/oscar.c:711
-#: src/protocols/yahoo/yahoo.c:2640
-#: src/protocols/zephyr/zephyr.c:2252
+#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
+#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
+#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
 msgid "Online"
 msgstr "Prisoten"
 
@@ -5062,90 +4928,83 @@
 #. TRUE, TRUE, FALSE, "message", _("Message"),
 #. gaim_value_new(GAIM_TYPE_STRING), NULL);
 #. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1111
-#: src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962
-#: src/protocols/novell/novell.c:3050
-#: src/protocols/silc/buddy.c:1421
-#: src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2618
-#: src/protocols/yahoo/yahoo.c:3226
+#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
+#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
+#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
 msgid "Busy"
 msgstr "Zaposlen"
 
-#: src/protocols/gg/gg.c:1116
-#: src/protocols/msn/msn.c:554
+#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
-#: src/protocols/gg/gg.c:1134
+#: src/protocols/gg/gg.c:1129
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
 
-#: src/protocols/gg/gg.c:1138
+#: src/protocols/gg/gg.c:1133
 msgid "Unblock"
 msgstr "Prekliči zavrnitev"
 
-#: src/protocols/gg/gg.c:1154
+#: src/protocols/gg/gg.c:1149
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#: src/protocols/gg/gg.c:1187
+#: src/protocols/gg/gg.c:1183
 msgid "Connection failed."
 msgstr "Povezava ni uspela."
 
-#: src/protocols/gg/gg.c:1371
+#: src/protocols/gg/gg.c:1357
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
-#: src/protocols/gg/gg.c:1372
+#: src/protocols/gg/gg.c:1358
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-#: src/protocols/gg/gg.c:1449
+#: src/protocols/gg/gg.c:1435
 msgid "Not connected to the server."
 msgstr "S strežnikom niste povezani."
 
-#: src/protocols/gg/gg.c:1470
+#: src/protocols/gg/gg.c:1456
 msgid "Token Error: Unable to fetch the token.\n"
 msgstr "Napaka žetona: Ni mogoče prenesti žetona.\n"
 
-#: src/protocols/gg/gg.c:1486
+#: src/protocols/gg/gg.c:1472
 msgid "e-Mail"
 msgstr "E-pošta"
 
-#: src/protocols/gg/gg.c:1509
-#: src/protocols/gg/gg.c:1510
+#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrirajte nov račun za Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1511
+#: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
 msgstr "Prosimo, izpolnite naslednja polja"
 
-#: src/protocols/gg/gg.c:1529
+#: src/protocols/gg/gg.c:1515
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: src/protocols/gg/gg.c:1534
+#: src/protocols/gg/gg.c:1520
 msgid "Upload buddylist to Server"
 msgstr "Izvozi seznam prijateljev na strežnik"
 
-#: src/protocols/gg/gg.c:1537
+#: src/protocols/gg/gg.c:1523
 msgid "Download buddylist from Server"
 msgstr "Uvozi seznam prijateljev s strežnika"
 
-#: src/protocols/gg/gg.c:1540
+#: src/protocols/gg/gg.c:1526
 msgid "Delete buddylist from Server"
 msgstr "Izbriši seznam prijateljev na strežniku"
 
-#: src/protocols/gg/gg.c:1543
+#: src/protocols/gg/gg.c:1529
 msgid "Save buddylist to file"
 msgstr "Shrani seznam prijateljev v datoteko"
 
-#: src/protocols/gg/gg.c:1546
+#: src/protocols/gg/gg.c:1532
 msgid "Load buddylist from file"
 msgstr "Uvozi seznam prijateljev iz datoteke"
 
@@ -5160,42 +5019,38 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1631
+#: src/protocols/gg/gg.c:1617
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Dodatek za protokol Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1632
+#: src/protocols/gg/gg.c:1618
 msgid "Polish popular IM"
 msgstr "Olepšaj priljubljen program za neposredno sporočanje"
 
-#: src/protocols/gg/gg.c:1679
+#: src/protocols/gg/gg.c:1665
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
-#: src/protocols/irc/cmds.c:43
-#: src/protocols/silc/silc.c:1321
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznan ukaz: %s"
 
-#: src/protocols/irc/cmds.c:463
-#: src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1029
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1021
 #, c-format
 msgid "current topic is: %s"
 msgstr "trenutna tema je: %s"
 
-#: src/protocols/irc/cmds.c:467
-#: src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1033
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1025
 msgid "No topic is set"
 msgstr "Ni teme"
 
-#: src/protocols/irc/dcc_send.c:272
-#: src/protocols/yahoo/yahoo_filexfer.c:177
-#: src/protocols/yahoo/yahoo_filexfer.c:186
-#: src/protocols/yahoo/yahoo_filexfer.c:195
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
+#: src/protocols/yahoo/yahoo_filexfer.c:182
+#: src/protocols/yahoo/yahoo_filexfer.c:191
 msgid "File Transfer Failed"
 msgstr "Prenos datoteke ni uspel"
 
@@ -5220,9 +5075,8 @@
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-#: src/protocols/irc/irc.c:103
-#: src/protocols/irc/irc.c:526
-#: src/protocols/irc/irc.c:548
+#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
+#: src/protocols/irc/irc.c:544
 msgid "Server has disconnected"
 msgstr "Strežnik ni več povezan"
 
@@ -5230,13 +5084,11 @@
 msgid "View MOTD"
 msgstr "Ogled MOTD"
 
-#: src/protocols/irc/irc.c:200
-#: src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: src/protocols/irc/irc.c:206
-#: src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Geslo:"
 
@@ -5244,60 +5096,43 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
-#: src/protocols/irc/irc.c:266
-#: src/protocols/jabber/jabber.c:433
+#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
 #: src/protocols/jabber/jabber.c:770
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
-#: src/protocols/irc/irc.c:277
+#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
+#: src/protocols/simple/simple.c:1219
 msgid "Couldn't create socket"
 msgstr "Vtičnika ni bilo mogoče ustvariti"
 
-#: src/protocols/irc/irc.c:348
-#: src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1742
-#: src/protocols/oscar/oscar.c:1818
+#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
+#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
 msgid "Couldn't connect to host"
 msgstr "Nisem se mogel povezati do gostitelja"
 
-#: src/protocols/irc/irc.c:373
-#: src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
 msgid "Connection Failed"
 msgstr "Povezava ni uspela"
 
-#: src/protocols/irc/irc.c:376
-#: src/protocols/jabber/jabber.c:336
+#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
 msgid "SSL Handshake Failed"
 msgstr "Rokovanje SSL ni uspelo"
 
-#: src/protocols/irc/irc.c:523
-#: src/protocols/irc/irc.c:545
-#: src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
 msgid "Read error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/irc/irc.c:694
-#: src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1401
+#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
+#: src/protocols/yahoo/yahoochat.c:1376
 msgid "Users"
 msgstr "Uporabniki"
 
-#: src/protocols/irc/irc.c:697
-#: src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166
-#: src/protocols/yahoo/yahoochat.c:1410
+#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
 msgid "Topic"
 msgstr "Tema"
 
-#: src/protocols/irc/irc.c:734
-msgid "IRC"
-msgstr "IRC"
-
-#: src/protocols/irc/irc.c:738
-msgid "Quit message"
-msgstr "Izhod iz sporočila"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5306,52 +5141,42 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:824
+#: src/protocols/irc/irc.c:799
 msgid "IRC Protocol Plugin"
 msgstr "Vstavek za protokol IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:825
+#: src/protocols/irc/irc.c:800
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Vstavek za protokol IRC, ki je manj beden"
 
-#: src/protocols/irc/irc.c:844
-#: src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1699
-#: src/protocols/napster/napster.c:707
-#: src/protocols/silc/ops.c:1028
+#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
+#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
 #: src/protocols/silc/ops.c:1130
 msgid "Server"
 msgstr "Strežnik"
 
-#: src/protocols/irc/irc.c:847
-#: src/protocols/msn/msn.c:1976
-#: src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1605
-#: src/protocols/trepia/trepia.c:1304
-msgid "Port"
-msgstr "Vrata"
-
-#: src/protocols/irc/irc.c:850
+#: src/protocols/irc/irc.c:825
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
-#: src/protocols/irc/irc.c:853
-#: src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628
-#: src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124
-#: src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
+#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: src/protocols/irc/irc.c:856
+#: src/protocols/irc/irc.c:831
 msgid "Real name"
 msgstr "Resnično ime"
 
-#: src/protocols/irc/irc.c:859
+#.
+#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#.
+#: src/protocols/irc/irc.c:839
 msgid "Use SSL"
 msgstr "Uporabi SSL"
 
@@ -5373,15 +5198,13 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "Prepovedati %s ni možno: seznam prepovedanih je poln"
 
-#: src/protocols/irc/msgs.c:213
-#: src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
 #: src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213
-#: src/protocols/oscar/oscar.c:5941
+#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
 #: src/protocols/silc/ops.c:1198
 msgid "Nick"
 msgstr "Vzdevek"
@@ -5394,24 +5217,19 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:221
-#: src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228
-#: src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
+#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
+#: src/protocols/yahoo/yahoo_profile.c:660
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228
-#: src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118
-#: src/protocols/yahoo/yahoo_profile.c:1013
+#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Pravo ime"
 
-#: src/protocols/irc/msgs.c:239
-#: src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "Trenutno na"
 
@@ -5510,8 +5328,12 @@
 msgstr "način (%s %s) nastavil %s"
 
 #: src/protocols/irc/msgs.c:805
-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."
+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:844
 msgid "Cannot change nick"
@@ -5540,8 +5362,7 @@
 msgid "Cannot join %s:"
 msgstr "Ne morem se pridružiti %s:"
 
-#: src/protocols/irc/msgs.c:985
-#: src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "Ne morem se pridružiti kanalu"
 
@@ -5559,89 +5380,155 @@
 msgstr "dejanje &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
 #: src/protocols/irc/parse.c:115
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "odsoten [sporočilo]:  Nastavite sporočilo za odsotnost ali ne uporabite sporočila za vrnitev iz odsotnosti."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"odsoten [sporočilo]:  Nastavite sporočilo za odsotnost ali ne uporabite "
+"sporočila za vrnitev iz odsotnosti."
 
 #: src/protocols/irc/parse.c:116
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;vzdevek1&gt; [vzdevek2] ...:  Odstrani status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;vzdevek1&gt; [vzdevek2] ...:  Odstrani status operaterja kanala "
+"nekomu. Za to dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:117
-msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
-msgstr "devoice &lt;nick1&gt; [nick2] ...:  Odstrani glasovni status kanala nekomu, kar mu bo preprečilo oglašanje, ko je kanal moderiran (+m). Za to dejanje morate biti operater kanala."
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;nick1&gt; [nick2] ...:  Odstrani glasovni status kanala nekomu, "
+"kar mu bo preprečilo oglašanje, ko je kanal moderiran (+m). Za to dejanje "
+"morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:118
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt;vzdevek&gt; [soba]: Povabite nekoga, da se vam pridruži v navedenem ali trenutnem kanalu."
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;vzdevek&gt; [soba]: Povabite nekoga, da se vam pridruži v "
+"navedenem ali trenutnem kanalu."
 
 #: src/protocols/irc/parse.c:119
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali več kanalov, za ketere lahko po želji navedete tudi ključe."
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali "
+"več kanalov, za ketere lahko po želji navedete tudi ključe."
 
 #: src/protocols/irc/parse.c:120
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali več kanalov, za ketere lahko po želji navedete tudi ključe."
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali "
+"več kanalov, za ketere lahko po želji navedete tudi ključe."
 
 #: src/protocols/irc/parse.c:121
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr "kick &lt;vzdevek&gt; [sporočilo]:  Odstranite nekoga iz kanala. Za to dejanje morate biti operater kanala."
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;vzdevek&gt; [sporočilo]:  Odstranite nekoga iz kanala. Za to "
+"dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:122
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list:  Prikaži seznam pogovornih sob v omrežju. <i>Opozorilo: nekateri strežniki vas lahko med tem odklopijo.</i>"
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  Prikaži seznam pogovornih sob v omrežju. <i>Opozorilo: nekateri "
+"strežniki vas lahko med tem odklopijo.</i>"
 
 #: src/protocols/irc/parse.c:123
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
 #: src/protocols/irc/parse.c:124
-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vzdevek|kanal&gt;:  Nastavi ali razveljavi način uporabnika ali kanala."
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;vzdevek|kanal&gt;:  Nastavi ali "
+"razveljavi način uporabnika ali kanala."
 
 #: src/protocols/irc/parse.c:125
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku (za razliko od kanala)."
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku "
+"(za razliko od kanala)."
 
 #: src/protocols/irc/parse.c:126
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
-#: src/protocols/irc/parse.c:127
-#: src/protocols/jabber/jabber.c:1546
+#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite vaš vzdevek."
 
 #: src/protocols/irc/parse.c:128
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "op &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala "
+"nekomu. Za to dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:129
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete uporabiti."
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete "
+"uporabiti."
 
 #: src/protocols/irc/parse.c:130
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [soba] [sporočilo]:  Zapusti trenutni ali določen kanal z možnostjo sporočila."
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [soba] [sporočilo]:  Zapusti trenutni ali določen kanal z možnostjo "
+"sporočila."
 
 #: src/protocols/irc/parse.c:131
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [vzdevek]:  Vpraša koliko zaostanka ima uporabnik (ali strežnik, če uporabnik ni naveden)."
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [vzdevek]:  Vpraša koliko zaostanka ima uporabnik (ali strežnik, če "
+"uporabnik ni naveden)."
 
 #: src/protocols/irc/parse.c:132
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku (za razliko od kanala)."
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo "
+"uporabniku (za razliko od kanala)."
 
 #: src/protocols/irc/parse.c:133
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [sporočilo]:  Prekinitev povezave s strežnikom z možnostjo sporočila."
+msgstr ""
+"quit [sporočilo]:  Prekinitev povezave s strežnikom z možnostjo sporočila."
 
 #: src/protocols/irc/parse.c:134
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Pošlji surov ukaz strežniku."
 
 #: src/protocols/irc/parse.c:135
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;vzdevek&gt; [sporočilo]:  Odstrani nekoga iz sobe. Za to dejanje morate biti operater kanala."
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;vzdevek&gt; [sporočilo]:  Odstrani nekoga iz sobe. Za to dejanje "
+"morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:136
 msgid "time: Displays the current local time at the IRC server."
@@ -5653,15 +5540,24 @@
 
 #: src/protocols/irc/parse.c:138
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Nastavi ali odvzemi način uporabnika."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Nastavi ali odvzemi način uporabnika."
 
 #: src/protocols/irc/parse.c:139
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala "
+"nekomu. Za to dejanje morate biti operater kanala."
 
 #: src/protocols/irc/parse.c:140
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete uporabiti."
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete "
+"uporabiti."
 
 #: src/protocols/irc/parse.c:141
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -5680,51 +5576,51 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING ogdovor"
 
-#: src/protocols/irc/parse.c:526
-#: src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1651
-#: src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688
-#: src/protocols/toc/toc.c:704
+#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
+#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
 #: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Povezava prekinjena."
 
 #: src/protocols/jabber/auth.c:51
-msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
-msgstr "Za prijavo potrebuje strežnik TLS/SSL. Izberite \"Uporabi TLS, če je na voljo\" v lastnostih računa."
+msgid ""
+"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+"account properties"
+msgstr ""
+"Za prijavo potrebuje strežnik TLS/SSL. Izberite \"Uporabi TLS, če je na voljo"
+"\" v lastnostih računa."
 
 #: src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
+msgstr ""
+"Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
 
 #: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
-
-#: src/protocols/jabber/auth.c:133
-#: src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375
-#: src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485
-#: src/protocols/jabber/jabber.c:110
+msgstr ""
+"Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
+
+#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
+#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
+#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
 msgid "Invalid response from server."
 msgstr "Neveljaven odgovor strežnika."
 
-#: src/protocols/jabber/auth.c:163
-#: src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244
-#: src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-#: src/protocols/jabber/auth.c:165
-#: src/protocols/jabber/auth.c:246
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifrirane povezave. Se strinjate s tem in želite nadaljevati z overovitvijo?"
-
-#: src/protocols/jabber/auth.c:173
-#: src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+"Strežnik zahteva overovitev z navadnim besedilom preko nešifrirane povezave. "
+"Se strinjate s tem in želite nadaljevati z overovitvijo?"
+
+#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "Strežnik ne uporablja nobene podprte metode overovitve"
 
@@ -5732,194 +5628,205 @@
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv strežnika"
 
-#: src/protocols/jabber/buddy.c:248
-#: src/protocols/jabber/buddy.c:666
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/buddy.c:679
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Družinsko ime"
 
-#: src/protocols/jabber/buddy.c:250
-#: src/protocols/jabber/buddy.c:683
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
 msgid "Given Name"
 msgstr "Ime"
 
-#: src/protocols/jabber/buddy.c:252
-#: src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:253
-#: src/protocols/jabber/buddy.c:725
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
 msgid "Street Address"
 msgstr "Naslov"
 
-#: src/protocols/jabber/buddy.c:254
-#: src/protocols/jabber/buddy.c:721
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
-#: src/protocols/jabber/buddy.c:255
-#: src/protocols/jabber/buddy.c:729
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
 msgid "Locality"
 msgstr "Okraj"
 
-#: src/protocols/jabber/buddy.c:256
-#: src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
 msgid "Region"
 msgstr "Regija"
 
-#: src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
 #: src/protocols/jabber/jabber.c:678
 msgid "Postal Code"
 msgstr "Poštna številka"
 
-#. Country
-#: src/protocols/jabber/buddy.c:258
-#: src/protocols/jabber/buddy.c:742
-#: src/protocols/trepia/trepia.c:340
-#: src/protocols/trepia/trepia.c:417
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
 msgid "Country"
 msgstr "Država"
 
-#: src/protocols/jabber/buddy.c:259
-#: src/protocols/jabber/buddy.c:753
-#: src/protocols/jabber/buddy.c:760
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:761
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:260
-#: src/protocols/jabber/buddy.c:771
-#: src/protocols/jabber/buddy.c:779
-#: src/protocols/silc/silc.c:669
-#: src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:1003
-msgid "Email"
-msgstr "Elektronska pošta"
-
-#: src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:794
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
 msgid "Organization Name"
 msgstr "Ime organizacije"
 
-#: src/protocols/jabber/buddy.c:262
-#: src/protocols/jabber/buddy.c:798
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
-#: src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:807
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
 msgid "Role"
 msgstr "Funkcija"
 
-#: src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:700
-#: src/protocols/oscar/oscar.c:5976
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
+#: src/protocols/oscar/oscar.c:5987
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: src/protocols/jabber/buddy.c:566
-#: src/protocols/jabber/buddy.c:567
+#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Urejanje Jabber vVizitke"
 
-#: src/protocols/jabber/buddy.c:568
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
+#: src/protocols/jabber/buddy.c:569
+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:615
+#: src/protocols/jabber/buddy.c:616
 msgid "Jabber ID"
 msgstr "Jabber ID oznaka"
 
-#: src/protocols/jabber/buddy.c:641
-#: src/protocols/jabber/jabber.c:1702
+#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
 msgstr "Vir"
 
-#: src/protocols/jabber/buddy.c:687
-#: src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Drugo ime"
 
-#: src/protocols/jabber/buddy.c:705
-#: src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:5994
-#: src/protocols/oscar/oscar.c:6002
+#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
+#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
 #: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Naslov"
 
-#: src/protocols/jabber/buddy.c:717
+#: src/protocols/jabber/buddy.c:718
 msgid "P.O. Box"
 msgstr "Poštni nabiralnik"
 
-#: src/protocols/jabber/buddy.c:831
+#: src/protocols/jabber/buddy.c:832
 msgid "Photo"
 msgstr "Fotografija"
 
-#: src/protocols/jabber/buddy.c:831
+#: src/protocols/jabber/buddy.c:832
 msgid "Logo"
 msgstr "Logotip"
 
-#: src/protocols/jabber/buddy.c:1034
+#: src/protocols/jabber/buddy.c:1035
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
-#: src/protocols/jabber/buddy.c:1037
+#: src/protocols/jabber/buddy.c:1038
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1044
+#: src/protocols/jabber/buddy.c:1045
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
-#: src/protocols/jabber/buddy.c:1050
+#: src/protocols/jabber/buddy.c:1051
 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:1058
+#: src/protocols/jabber/buddy.c:1059
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: src/protocols/jabber/buddy.c:1084
-#: src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688
-#: src/protocols/jabber/jabber.c:1013
+#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
 #: src/protocols/silc/ops.c:1235
 msgid "Error"
 msgstr "Napaka"
 
-#: src/protocols/jabber/buddy.c:1090
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: src/protocols/jabber/buddy.c:1094
-#: src/protocols/jabber/jabber.c:1058
+#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
 #: src/status.c:159
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: src/protocols/jabber/buddy.c:1096
-#: src/protocols/jabber/jabber.c:1066
-#: src/protocols/oscar/oscar.c:699
-#: src/protocols/oscar/oscar.c:7791
+#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
+#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
+#: src/protocols/sametime/sametime.c:2770
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
-#: src/protocols/jabber/chat.c:41
-#: src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:996
+#: src/protocols/jabber/buddy.c:1235
+msgid "The following are the results of your search"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1327
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
+#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+msgid "First Name"
+msgstr "Ime"
+
+#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
+#: src/protocols/oscar/oscar.c:5963
+msgid "Last Name"
+msgstr "Priimek"
+
+#: src/protocols/jabber/buddy.c:1346
+msgid "E-Mail Address"
+msgstr "E-poštni Naslov"
+
+#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
+#, fuzzy
+msgid "Search for Jabber users"
+msgstr "Išči prijatelje po naslovu e-pošte"
+
+#: src/protocols/jabber/buddy.c:1370
+#, fuzzy
+msgid "Invalid Directory"
+msgstr "Neveljavna napaka"
+
+#: src/protocols/jabber/buddy.c:1387
+#, fuzzy
+msgid "Enter a User Directory"
+msgstr "Imenika ni mogoče poslati."
+
+#: src/protocols/jabber/buddy.c:1388
+#, fuzzy
+msgid "Select a user directory to search"
+msgstr "Izberite konferenčni strežnik za pogovor"
+
+#: src/protocols/jabber/buddy.c:1391
+#, fuzzy
+msgid "Search Directory"
+msgstr "Rezultati iskanja"
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
+#: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "_Soba:"
 
@@ -5945,8 +5852,7 @@
 msgid "%s is not a valid server name"
 msgstr "%s ni veljavno ime strežnika"
 
-#: src/protocols/jabber/chat.c:230
-#: src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Neveljavno ime strežnika"
 
@@ -5955,8 +5861,7 @@
 msgid "%s is not a valid room handle"
 msgstr "%s ni veljavna ročica sobe"
 
-#: src/protocols/jabber/chat.c:236
-#: src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Neveljavna ročica sobe"
 
@@ -5964,8 +5869,7 @@
 msgid "Configuration error"
 msgstr "Napaka pri nastavitvi"
 
-#: src/protocols/jabber/chat.c:404
-#: src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Ni mogoče nastaviti"
 
@@ -5977,8 +5881,7 @@
 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:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Napaka pri registraciji"
 
@@ -5986,8 +5889,7 @@
 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:678 src/protocols/jabber/chat.c:689
 #: src/protocols/silc/ops.c:1235
 msgid "Error retrieving room list"
 msgstr "Napaka pri pridobivanju sezama sob"
@@ -6013,28 +5915,18 @@
 msgstr "Napaka pri inicializaciji seje"
 
 #: src/protocols/jabber/jabber.c:215
-#: src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699
-#: src/protocols/trepia/trepia.c:991
-#: src/protocols/trepia/trepia.c:1036
-#: src/protocols/trepia/trepia.c:1135
-#: src/protocols/trepia/trepia.c:1181
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
-#: src/protocols/jabber/jabber.c:253
-#: src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
 msgid "Read Error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/jabber/jabber.c:359
-#: src/protocols/jabber/jabber.c:780
-#: src/protocols/trepia/trepia.c:1075
+#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
 msgid "Unable to create socket"
 msgstr "Ni mogoče ustvariti vtičnika"
 
-#: src/protocols/jabber/jabber.c:403
-#: src/protocols/jabber/jabber.c:740
+#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
 msgid "Invalid Jabber ID"
 msgstr "Neveljaven Jabber ID"
 
@@ -6043,23 +5935,19 @@
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
 
-#: src/protocols/jabber/jabber.c:475
-#: src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
 msgid "Registration Successful"
 msgstr "Registracija uspela!"
 
-#: src/protocols/jabber/jabber.c:482
-#: src/protocols/jabber/jabber.c:1290
+#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
-#: src/protocols/jabber/jabber.c:484
-#: src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
 msgid "Registration Failed"
 msgstr "Napaka pri registraciji"
 
-#: src/protocols/jabber/jabber.c:596
-#: src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
 msgid "Already Registered"
 msgstr "Že registriran"
 
@@ -6067,34 +5955,13 @@
 msgid "E-Mail"
 msgstr "E-pošta"
 
-#. First Name
-#: src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5951
-#: src/protocols/silc/ops.c:810
-#: src/protocols/trepia/trepia.c:268
-msgid "First Name"
-msgstr "Ime"
-
-#. Last Name
-#: src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5952
-#: src/protocols/trepia/trepia.c:275
-msgid "Last Name"
-msgstr "Priimek"
-
-#. State
-#: src/protocols/jabber/jabber.c:673
-#: src/protocols/oscar/oscar.c:5996
-#: src/protocols/oscar/oscar.c:6004
-#: src/protocols/trepia/trepia.c:336
-#: src/protocols/trepia/trepia.c:414
+#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
+#: src/protocols/oscar/oscar.c:6015
 msgid "State"
 msgstr "Zvezna država"
 
-#: src/protocols/jabber/jabber.c:683
-#: src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:671
-#: src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telefon"
 
@@ -6106,363 +5973,367 @@
 msgid "Please fill out the information below to register your new account."
 msgstr "Za registracijo novega računa morate izpolniti spodnja polja."
 
-#: src/protocols/jabber/jabber.c:704
-#: src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
 msgid "Register New Jabber Account"
 msgstr "Registrirajte nov račun za Jabber"
 
-#: src/protocols/jabber/jabber.c:838
+#: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: src/protocols/jabber/jabber.c:844
-#: src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "Overovljanje"
 
-#: src/protocols/jabber/jabber.c:853
+#: src/protocols/jabber/jabber.c:857
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: src/protocols/jabber/jabber.c:924
-#: src/protocols/jabber/jabber.c:1268
-#: src/protocols/jabber/jabber.c:1309
-#: src/protocols/jabber/jabber.c:1342
-#: src/protocols/oscar/oscar.c:765
-#: src/protocols/oscar/oscar.c:7589
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#: src/protocols/jabber/jabber.c:967
+#: src/protocols/jabber/jabber.c:971
 msgid "Both"
 msgstr "Oboje"
 
-#: src/protocols/jabber/jabber.c:969
+#: src/protocols/jabber/jabber.c:973
 msgid "From (To pending)"
 msgstr "Od (Za čakajoče)"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:975
 msgid "From"
 msgstr "Od"
 
-#: src/protocols/jabber/jabber.c:974
+#: src/protocols/jabber/jabber.c:978
 msgid "To"
 msgstr "Za"
 
-#: src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:980
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
+msgid "None"
+msgstr "brez"
+
+#: src/protocols/jabber/jabber.c:984
 msgid "Subscription"
 msgstr "Naročilo"
 
-#: src/protocols/jabber/jabber.c:1034
-#: src/protocols/jabber/jabber.c:1042
-#: src/protocols/jabber/jabber.c:1050
-#: src/protocols/jabber/jabber.c:1058
-#: src/protocols/jabber/jabber.c:1066
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
+#: src/protocols/jabber/jabber.c:1071
 msgid "Priority"
 msgstr "Prednost stika"
 
-#: src/protocols/jabber/jabber.c:1088
+#: src/protocols/jabber/jabber.c:1093
 msgid "Password Changed"
 msgstr "Geslo spremenjeno"
 
-#: src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/jabber.c:1094
 msgid "Your password has been changed."
 msgstr "Vaše geslo je bilo spremenjeno."
 
-#: src/protocols/jabber/jabber.c:1093
-#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1155
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: src/protocols/jabber/jabber.c:1155
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
 msgid "Change Jabber Password"
 msgstr "Spremeni geslo za Jabber"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: src/protocols/jabber/jabber.c:1166
-#: src/protocols/toc/toc.c:1684
+#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Nastavi informacije o uporabniku"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1171
-#: src/protocols/toc/toc.c:1694
+#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
-#: src/protocols/jabber/jabber.c:1248
+#. }
+#: src/protocols/jabber/jabber.c:1181
+#, fuzzy
+msgid "Search for users"
+msgstr "_Išči:"
+
+#: src/protocols/jabber/jabber.c:1257
 msgid "Bad Request"
 msgstr "Napačna zahteva"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1259
 msgid "Conflict"
 msgstr "Spor"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1261
 msgid "Feature Not Implemented"
 msgstr "Možnost ni uvedena"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1263
 msgid "Forbidden"
 msgstr "Prepovedano"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1265
 msgid "Gone"
 msgstr "Ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1258
-#: src/protocols/jabber/jabber.c:1332
+#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
 msgid "Internal Server Error"
 msgstr "Notranja napaka strežnika"
 
-#: src/protocols/jabber/jabber.c:1260
+#: src/protocols/jabber/jabber.c:1269
 msgid "Item Not Found"
 msgstr "Predmeta ni mogoče najti"
 
-#: src/protocols/jabber/jabber.c:1262
+#: src/protocols/jabber/jabber.c:1271
 msgid "Malformed Jabber ID"
 msgstr "Nepravilen Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1264
+#: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
 msgstr "Ni mogoče sprejeti"
 
-#: src/protocols/jabber/jabber.c:1266
+#: src/protocols/jabber/jabber.c:1275
 msgid "Not Allowed"
 msgstr "Ni dovoljeno"
 
-#: src/protocols/jabber/jabber.c:1270
+#: src/protocols/jabber/jabber.c:1279
 msgid "Payment Required"
 msgstr "Zahtevano plačilo"
 
-#: src/protocols/jabber/jabber.c:1272
+#: src/protocols/jabber/jabber.c:1281
 msgid "Recipient Unavailable"
 msgstr "Dobitnik ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1285
 msgid "Registration Required"
 msgstr "Zahtevana registracija"
 
-#: src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1287
 msgid "Remote Server Not Found"
 msgstr "Oddaljenega strežnika ni mogoče najti"
 
-#: src/protocols/jabber/jabber.c:1280
+#: src/protocols/jabber/jabber.c:1289
 msgid "Remote Server Timeout"
 msgstr "Časovna omejitev oddaljenega strežnika je potekla"
 
-#: src/protocols/jabber/jabber.c:1282
+#: src/protocols/jabber/jabber.c:1291
 msgid "Server Overloaded"
 msgstr "Strežnik je preobremenjen"
 
-#: src/protocols/jabber/jabber.c:1284
+#: src/protocols/jabber/jabber.c:1293
 msgid "Service Unavailable"
 msgstr "Storitev ni dostopna"
 
-#: src/protocols/jabber/jabber.c:1286
+#: src/protocols/jabber/jabber.c:1295
 msgid "Subscription Required"
 msgstr "Zahtevano naročilo"
 
-#: src/protocols/jabber/jabber.c:1288
-msgid "Unexpected Request"
-msgstr "Nepričakovana zahteva"
-
-#: src/protocols/jabber/jabber.c:1295
-msgid "Authorization Aborted"
-msgstr "Pooblastitev prekinjena"
-
 #: src/protocols/jabber/jabber.c:1297
+msgid "Unexpected Request"
+msgstr "Nepričakovana zahteva"
+
+#: src/protocols/jabber/jabber.c:1304
+msgid "Authorization Aborted"
+msgstr "Pooblastitev prekinjena"
+
+#: src/protocols/jabber/jabber.c:1306
 msgid "Incorrect encoding in authorization"
 msgstr "Napačno kodiranje pri pooblastitvi"
 
-#: src/protocols/jabber/jabber.c:1300
+#: src/protocols/jabber/jabber.c:1309
 msgid "Invalid authzid"
 msgstr "Neveljaven ID pooblastila"
 
-#: src/protocols/jabber/jabber.c:1303
+#: src/protocols/jabber/jabber.c:1312
 msgid "Invalid Authorization Mechanism"
 msgstr "Neveljaven mehanizem pooblastil"
 
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1315
 msgid "Authorization mechanism too weak"
 msgstr "Prešibek mehanizem pooblastil"
 
-#: src/protocols/jabber/jabber.c:1311
+#: src/protocols/jabber/jabber.c:1320
 msgid "Temporary Authentication Failure"
 msgstr "Napaka začasne overovitve"
 
-#: src/protocols/jabber/jabber.c:1313
+#: src/protocols/jabber/jabber.c:1322
 msgid "Authentication Failure"
 msgstr "Napaka pri overovitvi"
 
-#: src/protocols/jabber/jabber.c:1317
+#: src/protocols/jabber/jabber.c:1326
 msgid "Bad Format"
 msgstr "Napačna oblika"
 
-#: src/protocols/jabber/jabber.c:1319
+#: src/protocols/jabber/jabber.c:1328
 msgid "Bad Namespace Prefix"
 msgstr "Napačna predpona imenskega prostora"
 
-#: src/protocols/jabber/jabber.c:1322
+#: src/protocols/jabber/jabber.c:1331
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: src/protocols/jabber/jabber.c:1324
-#: src/protocols/silc/ops.c:1514
+#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
 msgid "Connection Timeout"
 msgstr "Časovna omejitev povezave potekla"
 
-#: src/protocols/jabber/jabber.c:1326
+#: src/protocols/jabber/jabber.c:1335
 msgid "Host Gone"
 msgstr "Gostitelj ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1328
+#: src/protocols/jabber/jabber.c:1337
 msgid "Host Unknown"
 msgstr "Neznan gostitelj"
 
-#: src/protocols/jabber/jabber.c:1330
+#: src/protocols/jabber/jabber.c:1339
 msgid "Improper Addressing"
 msgstr "Neustrezno naslavljanje"
 
-#: src/protocols/jabber/jabber.c:1334
+#: src/protocols/jabber/jabber.c:1343
 msgid "Invalid ID"
 msgstr "Neveljaven ID"
 
-#: src/protocols/jabber/jabber.c:1336
+#: src/protocols/jabber/jabber.c:1345
 msgid "Invalid Namespace"
 msgstr "Neveljaven imenski prostor"
 
-#: src/protocols/jabber/jabber.c:1338
+#: src/protocols/jabber/jabber.c:1347
 msgid "Invalid XML"
 msgstr "Neveljaven XML"
 
-#: src/protocols/jabber/jabber.c:1340
+#: src/protocols/jabber/jabber.c:1349
 msgid "Non-matching Hosts"
 msgstr "Neujemajoči gostitelji"
 
-#: src/protocols/jabber/jabber.c:1344
+#: src/protocols/jabber/jabber.c:1353
 msgid "Policy Violation"
 msgstr "Zloraba politike"
 
-#: src/protocols/jabber/jabber.c:1346
+#: src/protocols/jabber/jabber.c:1355
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-#: src/protocols/jabber/jabber.c:1348
+#: src/protocols/jabber/jabber.c:1357
 msgid "Resource Constraint"
 msgstr "Zadrega vira"
 
-#: src/protocols/jabber/jabber.c:1350
+#: src/protocols/jabber/jabber.c:1359
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
-#: src/protocols/jabber/jabber.c:1352
+#: src/protocols/jabber/jabber.c:1361
 msgid "See Other Host"
 msgstr "Glej druge gostitelje"
 
-#: src/protocols/jabber/jabber.c:1354
+#: src/protocols/jabber/jabber.c:1363
 msgid "System Shutdown"
 msgstr "Izklop sistema"
 
-#: src/protocols/jabber/jabber.c:1356
+#: src/protocols/jabber/jabber.c:1365
 msgid "Undefined Condition"
 msgstr "Nedoločen pogoj"
 
-#: src/protocols/jabber/jabber.c:1358
+#: src/protocols/jabber/jabber.c:1367
 msgid "Unsupported Encoding"
 msgstr "Nepodprto kodiranje"
 
-#: src/protocols/jabber/jabber.c:1360
+#: src/protocols/jabber/jabber.c:1369
 msgid "Unsupported Stanza Type"
 msgstr "Nepodprt tip vrstice"
 
-#: src/protocols/jabber/jabber.c:1362
+#: src/protocols/jabber/jabber.c:1371
 msgid "Unsupported Version"
 msgstr "Nepodprta različica"
 
-#: src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1373
 msgid "XML Not Well Formed"
 msgstr "Slabo oblikovan XML"
 
-#: src/protocols/jabber/jabber.c:1366
+#: src/protocols/jabber/jabber.c:1375
 msgid "Stream Error"
 msgstr "Napaka toka"
 
-#: src/protocols/jabber/jabber.c:1433
+#: src/protocols/jabber/jabber.c:1442
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ni mogoče prepovedati uporabnika %s"
 
-#: src/protocols/jabber/jabber.c:1455
+#: src/protocols/jabber/jabber.c:1464
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Neznana včlanitev: \"%s\""
 
-#: src/protocols/jabber/jabber.c:1460
+#: src/protocols/jabber/jabber.c:1469
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ni bilo moč včlaniti uporabnika %s kot \"%s\""
 
-#: src/protocols/jabber/jabber.c:1512
+#: src/protocols/jabber/jabber.c:1521
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ni mogoče brcniti uporabnika %s"
 
-#: src/protocols/jabber/jabber.c:1538
+#: src/protocols/jabber/jabber.c:1547
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: src/protocols/jabber/jabber.c:1542
-msgid "configure:  Configure a chat room."
-msgstr "configure:  Nastavi pogovorno sobo."
-
 #: src/protocols/jabber/jabber.c:1551
+msgid "configure:  Configure a chat room."
+msgstr "configure:  Nastavi pogovorno sobo."
+
+#: src/protocols/jabber/jabber.c:1560
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: src/protocols/jabber/jabber.c:1556
+#: src/protocols/jabber/jabber.c:1565
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
-#: src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/jabber.c:1571
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
 
-#: src/protocols/jabber/jabber.c:1568
+#: src/protocols/jabber/jabber.c:1577
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
-#: src/protocols/jabber/jabber.c:1574
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr "affiliate &lt;uporabnik&gt; &lt;lastnik|upravitelj|član|izločenec|nihče&gt;: Nastavitev uporabnikovega statusa v sobi."
-
-#: src/protocols/jabber/jabber.c:1580
+#: src/protocols/jabber/jabber.c:1583
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+"affiliate &lt;uporabnik&gt; &lt;lastnik|upravitelj|član|izločenec|nihče&gt;: "
+"Nastavitev uporabnikovega statusa v sobi."
+
+#: src/protocols/jabber/jabber.c:1589
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
 
-#: src/protocols/jabber/jabber.c:1586
+#: src/protocols/jabber/jabber.c:1595
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [strežnik]:  Pridruži se pomenku na tem strežniku."
 
-#: src/protocols/jabber/jabber.c:1592
+#: src/protocols/jabber/jabber.c:1601
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
-#: src/protocols/jabber/jabber.c:1597
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;uporabnik&gt; &lt;sporočilo&gt;:  Pošljite zasebno sporočilo drugemu uporabniku."
+#: src/protocols/jabber/jabber.c:1606
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;uporabnik&gt; &lt;sporočilo&gt;:  Pošljite zasebno sporočilo drugemu "
+"uporabniku."
 
 #. *< type
 #. *< ui_requirement
@@ -6474,34 +6345,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1677
-#: src/protocols/jabber/jabber.c:1679
+#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatek za protokol Jabber"
 
-#: src/protocols/jabber/jabber.c:1705
+#: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
 msgstr "Uporabite TLS, če je na voljo"
 
-#: src/protocols/jabber/jabber.c:1710
+#: src/protocols/jabber/jabber.c:1719
 msgid "Require TLS"
 msgstr "Zahtevaj TLS"
 
-#: src/protocols/jabber/jabber.c:1713
+#: src/protocols/jabber/jabber.c:1722
 msgid "Force old (port 5223) SSL"
 msgstr "Vsili star SSL (vrata 5223)"
 
-#: src/protocols/jabber/jabber.c:1718
+#: src/protocols/jabber/jabber.c:1727
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
-#: src/protocols/jabber/jabber.c:1723
+#: src/protocols/jabber/jabber.c:1732
 msgid "Connect port"
 msgstr "Poveži vrata"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1727
-#: src/protocols/silc/silc.c:1601
+#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
 msgid "Connect server"
 msgstr "Poveži se na strežnik"
 
@@ -6538,55 +6407,53 @@
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
 
-#: src/protocols/jabber/presence.c:292
+#: src/protocols/jabber/presence.c:284
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
-#: src/protocols/jabber/presence.c:297
-#: src/protocols/msn/userlist.c:93
+#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Uporabnik %s želi dodati %s na svoj seznam prijateljev."
 
-#: src/protocols/jabber/presence.c:305
-#: src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:889
+#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
+#: src/protocols/yahoo/yahoo.c:895
 msgid "Authorize"
 msgstr "Pooblasti"
 
-#: src/protocols/jabber/presence.c:306
-#: src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4608
-#: src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:891
+#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
+#: src/protocols/yahoo/yahoo.c:897
 msgid "Deny"
 msgstr "Zavrni"
 
-#: src/protocols/jabber/presence.c:353
-#: src/protocols/jabber/presence.c:354
+#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
-#: src/protocols/jabber/presence.c:355
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Ustvarili boste novo sobo. Jo želite najprej nastaviti ali boste sprejeli privzete nastavitve?"
-
-#: src/protocols/jabber/presence.c:357
+#: src/protocols/jabber/presence.c:347
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Ustvarili boste novo sobo. Jo želite najprej nastaviti ali boste sprejeli "
+"privzete nastavitve?"
+
+#: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
 msgstr "Nastavi sobo"
 
-#: src/protocols/jabber/presence.c:359
+#: src/protocols/jabber/presence.c:351
 msgid "Accept Defaults"
 msgstr "Sprejmi privzeto"
 
-#: src/protocols/jabber/presence.c:396
+#: src/protocols/jabber/presence.c:388
 #, c-format
 msgid "Error in chat %s"
 msgstr "Napaka v pomenku %s"
 
-#: src/protocols/jabber/presence.c:399
+#: src/protocols/jabber/presence.c:391
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
@@ -6594,10 +6461,10 @@
 #: src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Ni mogoče poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
-
-#: src/protocols/jabber/si.c:592
-#: src/protocols/jabber/si.c:593
+msgstr ""
+"Ni mogoče poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
+
+#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "Pošiljanje datoteke ni uspelo"
 
@@ -6608,13 +6475,21 @@
 
 #: src/protocols/msn/dialog.c:97
 #, c-format
-msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
-msgstr "%s z lokalnega seznama je v skupini \"%s\", ne pa tudi na seznamu strežnika. Želite dodati tega prijatelja v skupino?"
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s z lokalnega seznama je v skupini \"%s\", ne pa tudi na seznamu strežnika. "
+"Želite dodati tega prijatelja v skupino?"
 
 #: src/protocols/msn/dialog.c:105
 #, c-format
-msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
-msgstr "%s je na lokalnem seznamu, ne pa tudi na seznamu strežnika. Želite dodati tega prijatelja?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s je na lokalnem seznamu, ne pa tudi na seznamu strežnika. Želite dodati "
+"tega prijatelja?"
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6660,8 +6535,7 @@
 msgid "Not on list"
 msgstr "Ni na seznamu"
 
-#: src/protocols/msn/error.c:70
-#: src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "Uporabnik ni na zvezi"
 
@@ -6713,8 +6587,7 @@
 msgid "Too many hits to a FND"
 msgstr "Preveč zadetkov za FND"
 
-#: src/protocols/msn/error.c:112
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
@@ -6746,8 +6619,7 @@
 msgid "Server busy"
 msgstr "Strežnik je zaposlen"
 
-#: src/protocols/msn/error.c:138
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
 #: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Strežnik je nedostopen"
@@ -6808,10 +6680,8 @@
 msgid "Server too busy"
 msgstr "Strežnik preveč zaposlen"
 
-#: src/protocols/msn/error.c:198
-#: src/protocols/oscar/oscar.c:2762
-#: src/protocols/silc/ops.c:1503
-#: src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
+#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Overovitev ni uspela"
 
@@ -6878,8 +6748,12 @@
 msgstr "Dovoli MSN strani za mobilnike?"
 
 #: src/protocols/msn/msn.c:307
-msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
-msgstr "Ali želite dovoliti oz. prepovedati prijateljem na vašem seznamu, da vam pošiljajo MSN strani za mobilnike na vaš mobilni telefon?"
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+"Ali želite dovoliti oz. prepovedati prijateljem na vašem seznamu, da vam "
+"pošiljajo MSN strani za mobilnike na vaš mobilni telefon?"
 
 #: src/protocols/msn/msn.c:311
 msgid "Allow"
@@ -6901,11 +6775,9 @@
 msgid "Page"
 msgstr "Stran/Poziv"
 
-#: src/protocols/msn/msn.c:544
-#: src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554
-#: src/protocols/yahoo/yahoo.c:2788
-#: src/protocols/yahoo/yahoo.c:2794
+#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:2793
 #, c-format
 msgid ""
 "\n"
@@ -6918,29 +6790,22 @@
 msgid "Has you"
 msgstr "Vas ima med prijatelji"
 
-#: src/protocols/msn/msn.c:581
-#: src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2616
-#: src/protocols/yahoo/yahoo.c:3223
+#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
 msgid "Be Right Back"
 msgstr "Pridem precej nazaj"
 
-#: src/protocols/msn/msn.c:589
-#: src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2626
-#: src/protocols/yahoo/yahoo.c:3238
+#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
 msgid "On The Phone"
 msgstr "Na telefonu"
 
-#: src/protocols/msn/msn.c:593
-#: src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2630
-#: src/protocols/yahoo/yahoo.c:3244
+#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
 msgid "Out To Lunch"
 msgstr "Na kosilu"
 
-#: src/protocols/msn/msn.c:597
-#: src/protocols/zephyr/zephyr.c:2255
+#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
 #: src/status.c:157
 msgid "Hidden"
 msgstr "Skrito"
@@ -6977,133 +6842,118 @@
 msgid "Send to Mobile"
 msgstr "Pošlji na mobilca"
 
-#: src/protocols/msn/msn.c:680
-#: src/protocols/novell/novell.c:3448
+#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
 msgid "Initiate _Chat"
 msgstr "Začni _pogovor"
 
 #: src/protocols/msn/msn.c:717
-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."
+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:745
 msgid "Failed to connect to server."
 msgstr "Povezava na strežnik neuspešna."
 
-#: src/protocols/msn/msn.c:1395
-#: src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:721
-#: src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Psevdonim:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1402
-#: src/protocols/msn/msn.c:1748
-#: src/protocols/yahoo/yahoo_profile.c:1175
-#: src/util.c:801
+#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
+#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1479
+#: src/protocols/msn/msn.c:1471
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: src/protocols/msn/msn.c:1484
-#: src/protocols/msn/msn.c:1735
-#: src/protocols/yahoo/yahoo_profile.c:765
+#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
+#: src/protocols/yahoo/yahoo_profile.c:760
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#. Age
-#: src/protocols/msn/msn.c:1554
-#: src/protocols/oscar/oscar.c:5981
-#: src/protocols/trepia/trepia.c:286
-#: src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1023
+#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Starost"
 
-#. Gender
-#: src/protocols/msn/msn.c:1561
-#: src/protocols/oscar/oscar.c:5968
-#: src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1033
+#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Spol"
 
-#: src/protocols/msn/msn.c:1570
-#: src/protocols/yahoo/yahoo_profile.c:1028
+#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: src/protocols/msn/msn.c:1577
-#: src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1018
+#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Lokacija"
 
-#: src/protocols/msn/msn.c:1585
-#: src/protocols/yahoo/yahoo_profile.c:1038
+#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: src/protocols/msn/msn.c:1602
-#: src/protocols/msn/msn.c:1608
-#: src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1623
-#: src/protocols/msn/msn.c:1630
+#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
+#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
+#: src/protocols/msn/msn.c:1622
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
-#: src/protocols/msn/msn.c:1639
-#: src/protocols/msn/msn.c:1645
-#: src/protocols/msn/msn.c:1652
-#: src/protocols/msn/msn.c:1659
+#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
+#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: src/protocols/msn/msn.c:1668
-#: src/protocols/msn/msn.c:1674
-#: src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1673
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: src/protocols/msn/msn.c:1690
-#: src/protocols/msn/msn.c:1696
-#: src/protocols/yahoo/yahoo_profile.c:1080
+#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Najljubši citat"
 
-#: src/protocols/msn/msn.c:1704
+#: src/protocols/msn/msn.c:1696
 msgid "Last Updated"
 msgstr "Nazadnje osveženo"
 
-#. Homepage
-#: src/protocols/msn/msn.c:1715
-#: src/protocols/silc/ops.c:846
-#: src/protocols/trepia/trepia.c:290
-#: src/protocols/trepia/trepia.c:420
+#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
 msgid "Homepage"
 msgstr "Domača stran"
 
-#: src/protocols/msn/msn.c:1737
+#: src/protocols/msn/msn.c:1729
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: src/protocols/msn/msn.c:1738
-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:1742
-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:1748
-#: src/protocols/yahoo/yahoo_profile.c:1175
+#: src/protocols/msn/msn.c:1730
+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:1734
+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:1740 src/protocols/yahoo/yahoo_profile.c:1167
 msgid "Profile URL"
 msgstr "URL profila"
 
@@ -7117,27 +6967,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1950
-#: src/protocols/msn/msn.c:1952
+#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
 msgid "MSN Protocol Plugin"
 msgstr "Vtičnik za protokol MSN"
 
-#: src/protocols/msn/msn.c:1971
-#: src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1963
 msgid "Login server"
 msgstr "Prijavni strežnik"
 
+#: src/protocols/msn/msn.c:1972
+msgid "Use HTTP Method"
+msgstr "Uporabi metodo HTTP"
+
 #: src/protocols/msn/msn.c:1980
-msgid "Use HTTP Method"
-msgstr "Uporabi metodo HTTP"
-
-#: src/protocols/msn/msn.c:1988
 msgid "nudge: nudge a contact to get their attention"
 msgstr "nudge: Pomežiknite prijatelju, da vas bo opazil"
 
-#: src/protocols/msn/nexus.c:103
-#: src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1351
+#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/yahoo/yahoochat.c:1326
 msgid "Unable to connect"
 msgstr "Ni se mogoče povezati"
 
@@ -7146,8 +6993,7 @@
 msgid "%s is not a valid group."
 msgstr "%s ni veljavna skupina."
 
-#: src/protocols/msn/notification.c:184
-#: src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
 #: src/protocols/msn/session.c:347
 msgid "Unknown error."
 msgstr "Neznana napaka."
@@ -7182,38 +7028,48 @@
 msgid "%s is not a valid passport account."
 msgstr "%s ni veljaven račun potnega lista."
 
-#: src/protocols/msn/notification.c:811
+#: src/protocols/msn/notification.c:815
 msgid "Unable to rename group"
 msgstr "Skupine ni mogoče preimenovati"
 
-#: src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:870
 msgid "Unable to delete group"
 msgstr "Skupine ni mogoče izbrisati"
 
-#: src/protocols/msn/notification.c:1299
-#, 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"
+#: src/protocols/msn/notification.c:1303
+#, 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"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
+"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem "
+"boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 msgstr[1] ""
-"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minuti. Ob tem boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
+"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minuti. Ob tem "
+"boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 msgstr[2] ""
-"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
+"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem "
+"boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 msgstr[3] ""
-"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
+"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem "
+"boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 
@@ -7225,9 +7081,8 @@
 msgid "Reading error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/msn/servconn.c:133
-#: src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4929
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
+#: src/protocols/oscar/oscar.c:4925
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -7250,16 +7105,15 @@
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325
-#: src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5632
-#: src/protocols/yahoo/yahoo.c:189
+#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
+#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
 
 #: src/protocols/msn/session.c:328
 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."
+msgstr ""
+"Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
 
 #: src/protocols/msn/session.c:333
 msgid "The MSN servers are going down temporarily."
@@ -7272,11 +7126,13 @@
 msgstr "Ni možno overoviti: %s"
 
 #: src/protocols/msn/session.c:342
-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:363
-#: src/protocols/msn/session.c:365
+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:363 src/protocols/msn/session.c:365
 msgid "Handshaking"
 msgstr "Rokovanje"
 
@@ -7297,7 +7153,6 @@
 msgstr "Pošljanje piškotka"
 
 #: src/protocols/msn/session.c:370
-#: src/protocols/trepia/trepia.c:637
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
@@ -7307,7 +7162,8 @@
 
 #: src/protocols/msn/switchboard.c:403
 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:"
+msgstr ""
+"Sporočila morda ni bilo poslano, ker je prišlo do časovne prekoračitve:"
 
 #: src/protocols/msn/switchboard.c:411
 msgid "Message could not be sent, not allowed while invisible:"
@@ -7322,7 +7178,8 @@
 msgstr "Sporočilo ni bilo poslano, ker je prišlo do napake v povezavi:"
 
 #: src/protocols/msn/switchboard.c:423
-msgid "Message could not be sent because an error with the switchboard occurred:"
+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:431
@@ -7339,22 +7196,22 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Uporabnik %s (%s) želi dodati %s na svoj seznam prijateljev."
 
-#: src/protocols/msn/userlist.c:276
+#: src/protocols/msn/userlist.c:275
 #, c-format
 msgid "%s has added you to his or her contact list."
 msgstr "%s vas je dodal na svoj seznam prijateljev."
 
-#: src/protocols/msn/userlist.c:340
+#: src/protocols/msn/userlist.c:339
 #, c-format
 msgid "%s has removed you from his or her contact list."
 msgstr "%s vas je odstranil(a) s svojega seznama stikov."
 
-#: src/protocols/msn/userlist.c:655
+#: src/protocols/msn/userlist.c:659
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ni bilo mogoče dodati."
 
-#: src/protocols/msn/userlist.c:657
+#: src/protocols/msn/userlist.c:661
 msgid "The screen name specified is invalid."
 msgstr "Navedeno zaslonsko ime ni veljavno."
 
@@ -7365,7 +7222,8 @@
 #: src/protocols/napster/napster.c:274
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr "Ni mogoče prebrati sporočila s strežnika: %s.  Ukaz je %hd, dolžina pa %hd."
+msgstr ""
+"Ni mogoče prebrati sporočila s strežnika: %s.  Ukaz je %hd, dolžina pa %hd."
 
 #: src/protocols/napster/napster.c:290
 msgid "Unknown server error."
@@ -7401,20 +7259,15 @@
 msgstr "%s je zahteval PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501
-#: src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2214
-#: src/protocols/yahoo/yahoo.c:2241
-#: src/protocols/yahoo/yahoo.c:2304
-#: src/protocols/yahoo/yahoo_filexfer.c:71
-#: src/protocols/yahoo/yahoo_filexfer.c:115
-#: src/protocols/yahoo/ycht.c:483
+#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
+#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
+#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
+#: src/protocols/yahoo/yahoo_filexfer.c:69
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
 msgid "Unable to connect."
 msgstr "Ni se bilo mogoče povezati."
 
-#: src/protocols/napster/napster.c:590
-#: src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Skupina:"
 
@@ -7428,8 +7281,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687
-#: src/protocols/napster/napster.c:689
+#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
 msgid "NAPSTER Protocol Plugin"
 msgstr "Dodatek za protokol NAPSTER"
 
@@ -7514,7 +7366,9 @@
 msgstr "Ni mogoče prepoznati gostitelja uporabniškega imena, ki ste ga vnesli"
 
 #: src/protocols/novell/nmuser.c:1932
-msgid "Your account has been disabled because too many invalid passwords were entered"
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
 msgstr "Vaš račun je bil onemogočen, ker ste vnesli preveč napačnih gesel"
 
 #: src/protocols/novell/nmuser.c:1935
@@ -7542,8 +7396,12 @@
 msgstr "Uporabnik vas je zavrnil"
 
 #: src/protocols/novell/nmuser.c:1954
-msgid "This evaluation version does not allow more than ten users to log in at one time"
-msgstr "Ta preskusna različica ne dovoljuje prijave več kot desetim uporabnikom hkrati"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Ta preskusna različica ne dovoljuje prijave več kot desetim uporabnikom "
+"hkrati"
 
 #: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
@@ -7562,7 +7420,9 @@
 #: src/protocols/novell/novell.c:232
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Sporočila ni bilo moč poslati. Ni mogoče dobiti podrobnosti za uporabnika (%s)."
+msgstr ""
+"Sporočila ni bilo moč poslati. Ni mogoče dobiti podrobnosti za uporabnika (%"
+"s)."
 
 #: src/protocols/novell/novell.c:381
 #, c-format
@@ -7575,8 +7435,7 @@
 msgid "Unable to send message (%s)."
 msgstr "Sporočila (%s) ni bilo moč poslati."
 
-#: src/protocols/novell/novell.c:478
-#: src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ni bilo moč povabiti uporabnika (%s)."
@@ -7593,21 +7452,28 @@
 
 #: src/protocols/novell/novell.c:569
 #, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
-msgstr "Uporabnika %s ni bilo moč premakniti v mapo %s na seznamu nedejavnih na strežniku. Napaka pri usvarjanju mape (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Uporabnika %s ni bilo moč premakniti v mapo %s na seznamu nedejavnih na "
+"strežniku. Napaka pri usvarjanju mape (%s)."
 
 #: src/protocols/novell/novell.c:617
 #, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
-msgstr "Ni bilo moč dodati %s na vaš seznam prijateljev. Napaka pri ustvarjanju mape na strežniku (%s)."
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Ni bilo moč dodati %s na vaš seznam prijateljev. Napaka pri ustvarjanju mape "
+"na strežniku (%s)."
 
 #: src/protocols/novell/novell.c:690
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Ni moč dobiti podrobnosti za uporabnika %s (%s)."
 
-#: src/protocols/novell/novell.c:736
-#: src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Ni bilo moč dodati uporabnika na seznam zasebnosti (%s)."
@@ -7627,8 +7493,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Ni bilo moč odstraniti %s s seznama zasebnosti (%s)."
 
-#: src/protocols/novell/novell.c:927
-#: src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ni mogoče spremeniti strežniških nastavitve zasebnosti (%s)."
@@ -7638,8 +7503,7 @@
 msgid "Unable to create conference (%s)."
 msgstr "Ni mogoče ustvariti konference (%s)."
 
-#: src/protocols/novell/novell.c:1110
-#: src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
 msgid "Error communicating with server. Closing connection."
 msgstr "Napaka pri komunikaciji s strežnikom. Zapiranje povezave."
 
@@ -7659,9 +7523,8 @@
 msgid "Mailstop"
 msgstr "StojPošta"
 
-#: src/protocols/novell/novell.c:1464
-#: src/protocols/oscar/oscar.c:5954
-#: src/protocols/oscar/oscar.c:5961
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
+#: src/protocols/oscar/oscar.c:5972
 msgid "Email Address"
 msgstr "Elektronski naslov"
 
@@ -7736,7 +7599,8 @@
 
 #: src/protocols/novell/novell.c:2051
 #, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+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."
 
 #. TODO: Would be nice to prompt if not set!
@@ -7744,8 +7608,12 @@
 #.
 #. ...but for now just error out with a nice message.
 #: src/protocols/novell/novell.c:2149
-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."
+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:2171
 msgid "Error. SSL support is not installed."
@@ -7755,9 +7623,8 @@
 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č."
 
-#: src/protocols/novell/novell.c:2965
-#: src/protocols/novell/novell.c:3053
-#: src/protocols/yahoo/yahoo.c:2840
+#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
+#: src/protocols/yahoo/yahoo.c:2839
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
@@ -7771,322 +7638,325 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3546
-#: src/protocols/novell/novell.c:3548
+#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Vstavek za protokol Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3567
+#: src/protocols/novell/novell.c:3561
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: src/protocols/novell/novell.c:3571
+#: src/protocols/novell/novell.c:3565
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:202
 msgid "Invalid error"
 msgstr "Neveljavna napaka"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:203
 msgid "Invalid SNAC"
 msgstr "Neveljaven SNAC"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:204
 msgid "Rate to host"
 msgstr "Prenos do gostitelja"
 
-#: src/protocols/oscar/oscar.c:203
-msgid "Rate to client"
-msgstr "Prenos do odjemalca"
-
 #: src/protocols/oscar/oscar.c:205
+msgid "Rate to client"
+msgstr "Prenos do odjemalca"
+
+#: src/protocols/oscar/oscar.c:207
 msgid "Service unavailable"
 msgstr "Storitev ni dostopna"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:208
 msgid "Service not defined"
 msgstr "Storitev nedefinirana"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:209
 msgid "Obsolete SNAC"
 msgstr "Zastarel SNAC"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:210
 msgid "Not supported by host"
 msgstr "Gostitelj ne podpira"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:211
 msgid "Not supported by client"
 msgstr "Odjemalec ne podpira"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:212
 msgid "Refused by client"
 msgstr "Odjemalec je zavrnil"
 
-#: src/protocols/oscar/oscar.c:211
-msgid "Reply too big"
-msgstr "Odgovor prevelik"
-
-#: src/protocols/oscar/oscar.c:212
-msgid "Responses lost"
-msgstr "Odgovori so se izgubili"
-
 #: src/protocols/oscar/oscar.c:213
+msgid "Reply too big"
+msgstr "Odgovor prevelik"
+
+#: src/protocols/oscar/oscar.c:214
+msgid "Responses lost"
+msgstr "Odgovori so se izgubili"
+
+#: src/protocols/oscar/oscar.c:215
 msgid "Request denied"
 msgstr "Zahteva zavrnjena"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:216
 msgid "Busted SNAC payload"
 msgstr "Odkrit SNAC podatek"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:217
 msgid "Insufficient rights"
 msgstr "Premalo pravic"
 
-#: src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:218
 msgid "In local permit/deny"
 msgstr "V lokalnem dovoljenju/prepovedi"
 
-#: src/protocols/oscar/oscar.c:217
+#: src/protocols/oscar/oscar.c:219
 msgid "Too evil (sender)"
 msgstr "Preveč zloben (pošiljatelj)"
 
-#: src/protocols/oscar/oscar.c:218
+#: src/protocols/oscar/oscar.c:220
 msgid "Too evil (receiver)"
 msgstr "Preveč zloben (prejemnik)"
 
-#: src/protocols/oscar/oscar.c:219
+#: src/protocols/oscar/oscar.c:221
 msgid "User temporarily unavailable"
 msgstr "Uporabnik začasno ni dostopen"
 
-#: src/protocols/oscar/oscar.c:220
+#: src/protocols/oscar/oscar.c:222
 msgid "No match"
 msgstr "Ni zadetka"
 
-#: src/protocols/oscar/oscar.c:221
+#: src/protocols/oscar/oscar.c:223
 msgid "List overflow"
 msgstr "Prekoračitev seznama"
 
-#: src/protocols/oscar/oscar.c:222
+#: src/protocols/oscar/oscar.c:224
 msgid "Request ambiguous"
 msgstr "Zahteva nejasna"
 
-#: src/protocols/oscar/oscar.c:223
+#: src/protocols/oscar/oscar.c:225
 msgid "Queue full"
 msgstr "Čakalna vrsta je polna"
 
-#: src/protocols/oscar/oscar.c:224
+#: src/protocols/oscar/oscar.c:226
 msgid "Not while on AOL"
 msgstr "Na omrežju AOL ni dovoljeno"
 
-#: src/protocols/oscar/oscar.c:415
-#: src/protocols/oscar/oscar.c:500
-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:614
+#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+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:616
 msgid "Voice"
 msgstr "Glasovno"
 
-#: src/protocols/oscar/oscar.c:617
+#: src/protocols/oscar/oscar.c:619
 msgid "AIM Direct IM"
 msgstr "Neposredni pogovor AIM"
 
-#: src/protocols/oscar/oscar.c:620
-#: src/protocols/silc/silc.c:667
+#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Pomenek"
 
-#: src/protocols/oscar/oscar.c:623
-#: src/protocols/oscar/oscar.c:7898
+#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
-#: src/protocols/oscar/oscar.c:630
+#: src/protocols/oscar/oscar.c:632
 msgid "Games"
 msgstr "Igre"
 
-#: src/protocols/oscar/oscar.c:633
+#: src/protocols/oscar/oscar.c:635
 msgid "Add-Ins"
 msgstr "Dodatki"
 
-#: src/protocols/oscar/oscar.c:636
+#: src/protocols/oscar/oscar.c:638
 msgid "Send Buddy List"
 msgstr "Pošlji seznam prijateljev"
 
-#: src/protocols/oscar/oscar.c:639
+#: src/protocols/oscar/oscar.c:641
 msgid "ICQ Direct Connect"
 msgstr "Neposredna povezava ICQ"
 
-#: src/protocols/oscar/oscar.c:642
+#: src/protocols/oscar/oscar.c:644
 msgid "AP User"
 msgstr "AP uporabnik"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:647
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:650
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:651
+#: src/protocols/oscar/oscar.c:653
 msgid "ICQ Server Relay"
 msgstr "ICQ strežniški posrednik"
 
-#: src/protocols/oscar/oscar.c:654
+#: src/protocols/oscar/oscar.c:656
 msgid "Old ICQ UTF8"
 msgstr "Star ICQ UTF-8"
 
-#: src/protocols/oscar/oscar.c:657
+#: src/protocols/oscar/oscar.c:659
 msgid "Trillian Encryption"
 msgstr "Trillian kodiranje"
 
-#: src/protocols/oscar/oscar.c:660
+#: src/protocols/oscar/oscar.c:662
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: src/protocols/oscar/oscar.c:663
+#: src/protocols/oscar/oscar.c:665
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:666
+#: src/protocols/oscar/oscar.c:668
 msgid "Security Enabled"
 msgstr "Varnost vključena"
 
-#: src/protocols/oscar/oscar.c:669
+#: src/protocols/oscar/oscar.c:671
 msgid "Video Chat"
 msgstr "Video.pomenek"
 
-#: src/protocols/oscar/oscar.c:673
+#: src/protocols/oscar/oscar.c:675
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:676
+#: src/protocols/oscar/oscar.c:678
 msgid "Live Video"
 msgstr "Video v živo"
 
-#: src/protocols/oscar/oscar.c:679
+#: src/protocols/oscar/oscar.c:681
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:697
-#: src/protocols/oscar/oscar.c:7781
+#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
-#: src/protocols/oscar/oscar.c:701
-#: src/protocols/oscar/oscar.c:7796
+#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
 msgid "Not Available"
 msgstr "Ni na voljo"
 
-#: src/protocols/oscar/oscar.c:703
-#: src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
 msgid "Occupied"
 msgstr "Zaseden"
 
-#: src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:709
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
-#: src/protocols/oscar/oscar.c:784
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
-#: src/protocols/oscar/oscar.c:790
+#: src/protocols/oscar/oscar.c:792
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
-#: src/protocols/oscar/oscar.c:799
+#: src/protocols/oscar/oscar.c:801
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#: src/protocols/oscar/oscar.c:956
+#: src/protocols/oscar/oscar.c:958
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Neposredni pogovor z %s končan"
 
-#: src/protocols/oscar/oscar.c:958
+#: src/protocols/oscar/oscar.c:960
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Neposredni pogovor z %s ni bil uspešen"
 
-#: src/protocols/oscar/oscar.c:966
+#: src/protocols/oscar/oscar.c:968
 msgid "Direct Connect failed"
 msgstr "Neposredna povezava spodletela"
 
-#: src/protocols/oscar/oscar.c:1043
-#: src/protocols/oscar/oscar.c:1174
+#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Neposredni pogovor z %s vzpostavljen"
 
-#: src/protocols/oscar/oscar.c:1124
+#: src/protocols/oscar/oscar.c:1126
 #, 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:1545
+#: src/protocols/oscar/oscar.c:1547
 #, 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:1550
+#: src/protocols/oscar/oscar.c:1552
 msgid "Unable to open Direct IM"
 msgstr "Neposredne povezave ni bilo mogoče vzpostaviti"
 
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1587
 #, 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:1589
-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:1593
-#: src/protocols/oscar/oscar.c:4365
+#: src/protocols/oscar/oscar.c:1591
+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:1595 src/protocols/oscar/oscar.c:4361
 msgid "Connect"
 msgstr "Poveži se"
 
-#: src/protocols/oscar/oscar.c:1659
+#: src/protocols/oscar/oscar.c:1661
 #, 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:1682
+#: src/protocols/oscar/oscar.c:1684
 msgid "Chat is currently unavailable"
 msgstr "Pomenek tenutno ni na voljo"
 
-#: src/protocols/oscar/oscar.c:1752
+#: src/protocols/oscar/oscar.c:1754
 msgid "Screen name sent"
 msgstr "Vzdevek poslan"
 
-#: src/protocols/oscar/oscar.c:1776
-#, 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:1805
+#: src/protocols/oscar/oscar.c:1770
+#, 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:1799
 msgid "Unable to login to AIM"
 msgstr "Nisem se mogel povezati na AIM"
 
-#: src/protocols/oscar/oscar.c:1909
-#: src/protocols/oscar/oscar.c:2852
+#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
 msgid "Could Not Connect"
 msgstr "Nisem se mogel povezati"
 
-#: src/protocols/oscar/oscar.c:1917
+#: src/protocols/oscar/oscar.c:1911
 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
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2069
+#: src/protocols/oscar/oscar.c:2063
 msgid "Attempting connection redirect..."
 msgstr "Poskus preusmeritve povezave ..."
 
@@ -8094,178 +7964,194 @@
 #. * 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/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2114
+#: src/protocols/oscar/oscar.c:2108
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
+"ICQ."
 msgstr ""
 "Prenos datoteke %s je prekoračil čas.\n"
-"Poskusite omogočiti strežnike proxy za prenos datotek vOrodja -> Nastavitve -> AIM/ICQ."
-
-#: src/protocols/oscar/oscar.c:2212
-#: src/protocols/yahoo/yahoo_filexfer.c:178
-#: src/protocols/yahoo/yahoo_filexfer.c:187
-#: src/protocols/yahoo/yahoo_filexfer.c:196
+"Poskusite omogočiti strežnike proxy za prenos datotek vOrodja -> Nastavitve -"
+"> AIM/ICQ."
+
+#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+#: src/protocols/yahoo/yahoo_filexfer.c:183
+#: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
 
-#: src/protocols/oscar/oscar.c:2217
+#: src/protocols/oscar/oscar.c:2211
 msgid "Unable to create new connection."
 msgstr "Ni bilo mogoče vzpostaviti nove povezave."
 
-#: src/protocols/oscar/oscar.c:2451
-#: src/protocols/oscar/oscar.c:2460
-#: src/protocols/oscar/oscar.c:2474
-#: src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
 msgid "Unable to log into file transfer proxy."
 msgstr "Prijava v proxy prenosa datotek ni bila mogoča."
 
-#: src/protocols/oscar/oscar.c:2538
+#: src/protocols/oscar/oscar.c:2532
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Vtičnika za poslušanje ni bilo mogoče vzpostaviti ali pa povezava proxy AOL ni prisotna."
-
-#: src/protocols/oscar/oscar.c:2739
-#: src/protocols/toc/toc.c:543
+msgstr ""
+"Vtičnika za poslušanje ni bilo mogoče vzpostaviti ali pa povezava proxy AOL "
+"ni prisotna."
+
+#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Neveljaven vzdevek ali geslo."
 
-#: src/protocols/oscar/oscar.c:2744
+#: src/protocols/oscar/oscar.c:2738
 msgid "Your account is currently suspended."
 msgstr "Vaš račun je trenutno zamrznjen."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2748
+#: src/protocols/oscar/oscar.c:2742
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
-#: src/protocols/oscar/oscar.c:2753
-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:2758
+#: src/protocols/oscar/oscar.c:2747
+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:2752
 #, 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:2789
+msgstr ""
+"Različica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga "
+"pri %s"
+
+#: src/protocols/oscar/oscar.c:2783
 msgid "Internal Error"
 msgstr "Interna napaka"
 
-#: src/protocols/oscar/oscar.c:2859
+#: src/protocols/oscar/oscar.c:2853
 msgid "Received authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#: src/protocols/oscar/oscar.c:2883
+#: src/protocols/oscar/oscar.c:2877
 msgid "The SecurID key entered is invalid."
 msgstr "Vnešeni ključ SecurID ni veljaven."
 
-#: src/protocols/oscar/oscar.c:2897
+#: src/protocols/oscar/oscar.c:2891
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
 
-#: src/protocols/oscar/oscar.c:2898
+#: src/protocols/oscar/oscar.c:2892
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite število s 6 ciframi iz digitalnega prikazovalnika."
 
-#: src/protocols/oscar/oscar.c:2938
-#: src/protocols/oscar/oscar.c:2968
-#: src/protocols/oscar/oscar.c:3057
-#, 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:2941
-#: src/protocols/oscar/oscar.c:2971
+#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
+#: src/protocols/oscar/oscar.c:3051
+#, 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:2935 src/protocols/oscar/oscar.c:2965
 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:3060
+#: src/protocols/oscar/oscar.c:3054
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ni mogel dobiti veljavnega prijavnega izvlečka."
 
-#: src/protocols/oscar/oscar.c:3091
+#: src/protocols/oscar/oscar.c:3085
 msgid "Password sent"
 msgstr "Geslo poslano"
 
-#: src/protocols/oscar/oscar.c:4356
+#: src/protocols/oscar/oscar.c:4352
 #, 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:4359
-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:4398
+#: src/protocols/oscar/oscar.c:4355
+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:4394
 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:4406
+#: src/protocols/oscar/oscar.c:4402
 msgid "Authorization Request Message:"
 msgstr "Sporočilo o zahtevi po pooblastilu:"
 
-#: src/protocols/oscar/oscar.c:4407
+#: src/protocols/oscar/oscar.c:4403
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: src/protocols/oscar/oscar.c:4437
-#, 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:4442
-#: src/protocols/oscar/oscar.c:4444
+#: src/protocols/oscar/oscar.c:4433
+#, 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:4438 src/protocols/oscar/oscar.c:4440
 msgid "Request Authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: src/protocols/oscar/oscar.c:4482
-#: src/protocols/oscar/oscar.c:4488
-#: src/protocols/oscar/oscar.c:4592
-#: src/protocols/oscar/oscar.c:4616
-#: src/protocols/oscar/oscar.c:7234
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
+#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: src/protocols/oscar/oscar.c:4487
+#: src/protocols/oscar/oscar.c:4483
 msgid "Authorization Denied Message:"
 msgstr "Sporočilo o neodobrenem pooblastilu:"
 
-#: src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:4590
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %u želi dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
+"Uporabnik %u želi dodati %s na svoj seznam prijateljev iz naslednjega "
+"razloga:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4604
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
 msgid "Authorization Request"
 msgstr "Zahtevek po pooblastilu"
 
-#: src/protocols/oscar/oscar.c:4616
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:4612
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev z naslednjim razlogom:\n"
+"Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev "
+"z naslednjim razlogom:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4617
+#: src/protocols/oscar/oscar.c:4613
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4624
+#: src/protocols/oscar/oscar.c:4620
 #, 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:4632
+#: src/protocols/oscar/oscar.c:4628
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8278,7 +8164,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4640
+#: src/protocols/oscar/oscar.c:4636
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8291,7 +8177,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4648
+#: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8304,20 +8190,20 @@
 "Sporočilo je:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4669
+#: src/protocols/oscar/oscar.c:4665
 #, 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:4675
+#: src/protocols/oscar/oscar.c:4671
 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:4679
+#: src/protocols/oscar/oscar.c:4675
 msgid "Decline"
 msgstr "Zavrni"
 
-#: src/protocols/oscar/oscar.c:4763
+#: src/protocols/oscar/oscar.c:4759
 #, 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."
@@ -8326,7 +8212,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:4772
+#: src/protocols/oscar/oscar.c:4768
 #, 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."
@@ -8335,16 +8221,18 @@
 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:4781
-#, 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."
+#: src/protocols/oscar/oscar.c:4777
+#, 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."
 msgstr[0] "Spregledali ste %hu sporočil od %s, ker so bila neveljavna."
 msgstr[1] "Spregledali ste %hu sporočilo od %s, ker je bilo neveljavno."
 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:4790
+#: src/protocols/oscar/oscar.c:4786
 #, 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."
@@ -8353,7 +8241,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:4799
+#: src/protocols/oscar/oscar.c:4795
 #, 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."
@@ -8362,7 +8250,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:4808
+#: src/protocols/oscar/oscar.c:4804
 #, 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."
@@ -8371,212 +8259,232 @@
 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:4867
+#: src/protocols/oscar/oscar.c:4863
 #, 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:4928
+#: src/protocols/oscar/oscar.c:4924
 #, 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:4965
+#: src/protocols/oscar/oscar.c:4961
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni bilo moč poslati sporočila: %s"
 
-#: src/protocols/oscar/oscar.c:4965
-#: src/protocols/oscar/oscar.c:4970
-#: src/protocols/oscar/oscar.c:5028
-#: src/protocols/oscar/oscar.c:5032
+#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
+#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: src/protocols/oscar/oscar.c:4968
+#: src/protocols/oscar/oscar.c:4964
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni bilo moč poslati sporočila k %s:"
 
-#: src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:5024
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: src/protocols/oscar/oscar.c:5031
+#: src/protocols/oscar/oscar.c:5027
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podatki o uporabniku %s niso dostopni:"
 
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5054
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: src/protocols/oscar/oscar.c:5063
-#: src/protocols/yahoo/yahoo_profile.c:1126
+#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Član od"
 
-#: src/protocols/oscar/oscar.c:5145
+#: src/protocols/oscar/oscar.c:5142
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5331
-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:5557
+#: src/protocols/oscar/oscar.c:5328
+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:5554
 msgid "Rate limiting error."
 msgstr "Napaka z omejevanjem pogostosti sporočil."
 
-#: src/protocols/oscar/oscar.c:5558
-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:5634
+#: src/protocols/oscar/oscar.c:5555
+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:5631
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste bili iz neznanega razloga."
 
-#: src/protocols/oscar/oscar.c:5647
-#: src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5644 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:5672
+#: src/protocols/oscar/oscar.c:5669
 msgid "Finalizing connection"
 msgstr "Dokončujem povezavo"
 
-#: src/protocols/oscar/oscar.c:5940
+#: src/protocols/oscar/oscar.c:5951
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/oscar/oscar.c:5966
-#: src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: src/protocols/oscar/oscar.c:5968
-#: src/protocols/trepia/trepia.c:282
-#: src/protocols/trepia/trepia.c:408
+#: src/protocols/oscar/oscar.c:5979
 msgid "Female"
 msgstr "Ženska"
 
-#: src/protocols/oscar/oscar.c:5968
-#: src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:408
+#: src/protocols/oscar/oscar.c:5979
 msgid "Male"
 msgstr "Moški"
 
-#: src/protocols/oscar/oscar.c:5984
+#: src/protocols/oscar/oscar.c:5995
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: src/protocols/oscar/oscar.c:5988
+#: src/protocols/oscar/oscar.c:5999
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: src/protocols/oscar/oscar.c:5993
+#: src/protocols/oscar/oscar.c:6004
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: src/protocols/oscar/oscar.c:5997
-#: src/protocols/oscar/oscar.c:6005
+#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: src/protocols/oscar/oscar.c:6001
+#: src/protocols/oscar/oscar.c:6012
 msgid "Work Address"
 msgstr "Službeni naslov"
 
-#: src/protocols/oscar/oscar.c:6009
+#: src/protocols/oscar/oscar.c:6020
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: src/protocols/oscar/oscar.c:6010
+#: src/protocols/oscar/oscar.c:6021
 msgid "Company"
 msgstr "Podjetje"
 
-#: src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6022
 msgid "Division"
 msgstr "Oddelek"
 
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6023
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: src/protocols/oscar/oscar.c:6014
+#: src/protocols/oscar/oscar.c:6025
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: src/protocols/oscar/oscar.c:6071
+#: src/protocols/oscar/oscar.c:6082
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
 #. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/oscar/oscar.c:6111
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "Naslednji vzdevki so povezani z %s"
 
-#: src/protocols/oscar/oscar.c:6129
+#: src/protocols/oscar/oscar.c:6140
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Za dani elektronski naslov %s ni bilo rezultatov"
 
-#: src/protocols/oscar/oscar.c:6150
+#: src/protocols/oscar/oscar.c:6161
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Prejeti bi morali elektronsko pošto, da potrdite %s. "
 
-#: src/protocols/oscar/oscar.c:6152
+#: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
 msgstr "Potrditev računa je bila zahtevana"
 
-#: src/protocols/oscar/oscar.c:6183
+#: src/protocols/oscar/oscar.c:6194
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o računu"
 
-#: src/protocols/oscar/oscar.c:6186
-#, 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:6189
+#: src/protocols/oscar/oscar.c:6197
+#, 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:6200
 #, 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:6192
-#, 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:6195
-#, c-format
-msgid "Error 0x%04x: Unable to change email 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:6198
-#, c-format
-msgid "Error 0x%04x: Unable to change email 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:6201
-#, c-format
-msgid "Error 0x%04x: Unable to change email 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:6204
+msgstr ""
+"Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker je neveljavno."
+
+#: src/protocols/oscar/oscar.c:6203
+#, 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:6206
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email 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:6209
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email 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:6212
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email 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:6215
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6225
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8585,72 +8493,113 @@
 "Vaše ime je trenutno naslednje oblike:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6215
-#: src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
 msgid "Account Info"
 msgstr "Podatki o računu"
 
-#: src/protocols/oscar/oscar.c:6220
+#: src/protocols/oscar/oscar.c:6231
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: src/protocols/oscar/oscar.c:6287
-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:6471
+#: src/protocols/oscar/oscar.c:6298
+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:6480
 msgid "Unable to set AIM profile."
 msgstr "Ni mogoče nastaviti AIM profila."
 
-#: src/protocols/oscar/oscar.c:6472
-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:6486
-#, 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."
-msgstr[0] "Največja dolžina profila %d bajtov je bila presežena.  Gaim ga je skrajšal namesto vas."
-msgstr[1] "Največja dolžina profila %d bajte je bila presežena.  Gaim ga je skrajšal namesto vas."
-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:6491
+#: src/protocols/oscar/oscar.c:6481
+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:6495
+#, 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."
+msgstr[0] ""
+"Največja dolžina profila %d bajtov je bila presežena.  Gaim ga je skrajšal "
+"namesto vas."
+msgstr[1] ""
+"Največja dolžina profila %d bajte je bila presežena.  Gaim ga je skrajšal "
+"namesto vas."
+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:6500
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: src/protocols/oscar/oscar.c:6514
-#: src/protocols/oscar/oscar.c:6587
-#, 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."
-msgstr[0] "Največja dolžina sporočila odsotnosti %d bajtov je bila presežena.  Gaim ga je skrajšal namesto vas."
-msgstr[1] "Največja dolžina sporočila odsotnosti %d bajt je bila presežena.  Gaim ga je skrajšal namesto vas."
-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:6519
-#: src/protocols/oscar/oscar.c:6592
+#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#, 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."
+msgstr[0] ""
+"Največja dolžina sporočila odsotnosti %d bajtov je bila presežena.  Gaim ga "
+"je skrajšal namesto vas."
+msgstr[1] ""
+"Največja dolžina sporočila odsotnosti %d bajt je bila presežena.  Gaim ga je "
+"skrajšal namesto vas."
+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:6528 src/protocols/oscar/oscar.c:6601
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: src/protocols/oscar/oscar.c:6551
+#: src/protocols/oscar/oscar.c:6560
 msgid "Unable to set AIM away message."
 msgstr "Sporočila za odsotnost za protokol AIM ni bilo mogoče nastaviti."
 
-#: src/protocols/oscar/oscar.c:6552
-msgid "You have probably requested to set your away message before the login procedure completed.  You remain in a \"present\" state; try setting it again when you are fully connected."
-msgstr "Verjetno ste hoteli nastaviti sporočilo o odsotnosti preden se je končalo prijavljanje. Vaše stanje ostaja nespremenjeno. Poskusite ponovno, ko ste zagotovo prijavljeni."
-
-#: src/protocols/oscar/oscar.c:6692
-#, 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:6694
-#: src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:6561
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+"Verjetno ste hoteli nastaviti sporočilo o odsotnosti preden se je končalo "
+"prijavljanje. Vaše stanje ostaja nespremenjeno. Poskusite ponovno, ko ste "
+"zagotovo prijavljeni."
+
+#: src/protocols/oscar/oscar.c:6691
+#, 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:6693 src/protocols/oscar/oscar.c:7092
+#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
@@ -8659,37 +8608,52 @@
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
 #: src/protocols/oscar/oscar.c:6799
-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:6983
-#: src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989
-#: src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151
-#: src/protocols/oscar/oscar.c:7156
+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:6983 src/protocols/oscar/oscar.c:6984
+#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
+#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
 msgid "Orphans"
 msgstr "Sirote"
 
 #: src/protocols/oscar/oscar.c:7090
 #, 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:7090
-#: src/protocols/oscar/oscar.c:7104
+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:7090 src/protocols/oscar/oscar.c:7104
 msgid "(no name)"
 msgstr "(brez imena)"
 
 #: src/protocols/oscar/oscar.c:7104
 #, 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."
+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:7187
 #, 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?"
+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:7193
 msgid "Authorization Given"
@@ -8701,14 +8665,16 @@
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %s želi dodati %s na svoj seznam prijateljev iz naslednjega razloga:\n"
+"Uporabnik %s želi dodati %s na svoj seznam prijateljev iz naslednjega "
+"razloga:\n"
 "%s"
 
 #. Granted
 #: src/protocols/oscar/oscar.c:7282
 #, 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."
+msgstr ""
+"Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
 #: src/protocols/oscar/oscar.c:7283
 msgid "Authorization Granted"
@@ -8718,18 +8684,19 @@
 #: src/protocols/oscar/oscar.c:7286
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
+"Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam "
+"prijateljev, ker:\n"
 "%s"
 
 #: src/protocols/oscar/oscar.c:7287
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: src/protocols/oscar/oscar.c:7324
-#: src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
@@ -8739,7 +8706,8 @@
 
 #: src/protocols/oscar/oscar.c:7430
 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."
+msgstr ""
+"Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
 #: src/protocols/oscar/oscar.c:7565
 msgid "Away Message"
@@ -8792,7 +8760,8 @@
 
 #: src/protocols/oscar/oscar.c:7998
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "Z oblikovanjem vzdevka lahko spreminjate samo velike črke in presledke."
+msgstr ""
+"Z oblikovanjem vzdevka lahko spreminjate samo velike črke in presledke."
 
 #: src/protocols/oscar/oscar.c:8005
 msgid "New screen name formatting:"
@@ -8811,8 +8780,12 @@
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
 #: src/protocols/oscar/oscar.c:8106
-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.\""
+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:8123
 msgid "Find Buddy by E-mail"
@@ -8826,8 +8799,7 @@
 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:8212
-#: src/protocols/silc/silc.c:825
+#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
@@ -8835,8 +8807,7 @@
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: src/protocols/oscar/oscar.c:8223
-#: src/protocols/silc/silc.c:821
+#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
@@ -8904,8 +8875,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476
-#: src/protocols/oscar/oscar.c:8478
+#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Vstavek za protokol AIM/ICQ"
 
@@ -8917,28 +8887,130 @@
 msgid "Auth port"
 msgstr "Vrata za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8503
-#: src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/protocols/silc/buddy.c:51
-#: src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544
-#: src/protocols/silc/buddy.c:711
+#: src/protocols/sametime/sametime.c:1134
+#, fuzzy
+msgid "Sending Handshake"
+msgstr "Pošljanje piškotka"
+
+#: src/protocols/sametime/sametime.c:1139
+#, fuzzy
+msgid "Waiting for Handshake Acknowledgement"
+msgstr "Čakanje na začetek prenosa"
+
+#: src/protocols/sametime/sametime.c:1144
+msgid "Handshake Acknowledged, Sending Login"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:1149
+msgid "Waiting for Login Acknowledgement"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:1154
+#, fuzzy
+msgid "Login Redirected"
+msgstr "Prijavni strežnik"
+
+#: src/protocols/sametime/sametime.c:1159
+#, fuzzy
+msgid "Forcing Login"
+msgstr "Prijavljanje"
+
+#: src/protocols/sametime/sametime.c:1163
+msgid "Login Acknowledged"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:1168
+#, fuzzy
+msgid "Connected to Sametime Community Server"
+msgstr "Povezovanjes strežnikom SILC"
+
+#. * @todo Admin alerts should probably be in a conversation window
+#. rather than a gaim_notify_message. Or in some sort of updating
+#. dialog, or something.
+#: src/protocols/sametime/sametime.c:1263
+msgid "Admin Alert"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:2758
+#, fuzzy
+msgid "Active"
+msgstr "Hiperaktiven"
+
+#: src/protocols/simple/simple.c:202
+#, c-format
+msgid ""
+"Could not add the buddy %s because every simple user has to start with "
+"'sip:'."
+msgstr ""
+
+#: src/protocols/simple/simple.c:1209
+#, fuzzy
+msgid "Could not create listen socket"
+msgstr "Vtičnika ni bilo mogoče ustvariti"
+
+#: src/protocols/simple/simple.c:1263
+#, fuzzy
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "IRC vzdevki ne smejo vsebovati presledka"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: src/protocols/simple/simple.c:1408
+#, fuzzy
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "Vstavek za protokol SILC"
+
+#. *  summary
+#: src/protocols/simple/simple.c:1409
+#, fuzzy
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "Vstavek za protokol SILC"
+
+#. *  description
+#: src/protocols/simple/simple.c:1410
+msgid "Thomas Butter <butter@uni-mannheim.de>"
+msgstr ""
+
+#: src/protocols/simple/simple.c:1431
+msgid "Publish Status (note: everyone may watch you)"
+msgstr ""
+
+#: src/protocols/simple/simple.c:1434
+#, fuzzy
+msgid "Use UDP"
+msgstr "Uporabniška št."
+
+#: src/protocols/simple/simple.c:1436
+#, fuzzy
+msgid "Use Proxy"
+msgstr "brez strežnika proxy"
+
+#: src/protocols/simple/simple.c:1438
+#, fuzzy
+msgid "Proxy"
+msgstr "brez strežnika proxy"
+
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
+#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Uporabnik %s ni prisoten v omrežju"
 
-#: src/protocols/silc/buddy.c:52
-#: src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119
-#: src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128
-#: src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138
-#: src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
+#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
+#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
 msgid "Key Agreement"
 msgstr "Pogodba"
 
@@ -8970,15 +9042,16 @@
 msgid "Key agreement cannot be started with yourself"
 msgstr "Pogodba se ne more začeti z vami"
 
-#: src/protocols/silc/buddy.c:257
-#: src/protocols/silc/buddy.c:387
+#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
 #: src/protocols/silc/buddy.c:512
 msgid "The remote user is not present in the network any more"
 msgstr "Oddaljen uporabnik ni več prisoten v omrežju"
 
 #: src/protocols/silc/buddy.c:293
 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
 msgstr "Zahteva po pogodbi sprejeta od %s. Želite izvesti pogodbo?"
 
 #: src/protocols/silc/buddy.c:297
@@ -8996,8 +9069,7 @@
 msgid "Key Agreement Request"
 msgstr "Zahteva pogodbe"
 
-#: src/protocols/silc/buddy.c:386
-#: src/protocols/silc/buddy.c:421
+#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
 #: src/protocols/silc/buddy.c:463
 msgid "IM With Password"
 msgstr "IM z geslom"
@@ -9010,41 +9082,32 @@
 msgid "Set IM Password"
 msgstr "Nastavi geslo IM"
 
-#: src/protocols/silc/buddy.c:511
-#: src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278
-#: src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
+#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
 msgid "Get Public Key"
 msgstr "Dobi javni ključ"
 
-#: src/protocols/silc/buddy.c:547
-#: src/protocols/silc/ops.c:1279
+#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
 #: src/protocols/silc/ops.c:1290
 msgid "Cannot fetch the public key"
 msgstr "Javnega ključa ni mogoče dobiti"
 
-#: src/protocols/silc/buddy.c:634
-#: src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
 msgid "Show Public Key"
 msgstr "Prikaži javni ključ"
 
-#: src/protocols/silc/buddy.c:635
-#: src/protocols/silc/buddy.c:994
+#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
 #: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "Ni mogoče naložiti javnega ključa"
 
-#: src/protocols/silc/buddy.c:712
-#: src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945
-#: src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
+#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
 msgid "User Information"
 msgstr "Informacije o uporabniku"
 
-#: src/protocols/silc/buddy.c:713
-#: src/protocols/silc/ops.c:946
+#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
 #: src/protocols/silc/ops.c:1100
 msgid "Cannot get user information"
 msgstr "Ni mogoče dobiti informacij o uporabniku"
@@ -9055,8 +9118,12 @@
 msgstr "Prijatelj %s ni zaupljiv"
 
 #: src/protocols/silc/buddy.c:737
-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
-msgstr "Opozoril prijatelja ne morete sprejeti, dokler ne uvozite njegovega javnega ključa.  Uporabite lahko ukaz Dobi javni ključ."
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"Opozoril prijatelja ne morete sprejeti, dokler ne uvozite njegovega javnega "
+"ključa.  Uporabite lahko ukaz Dobi javni ključ."
 
 #. Open file selector to select the public key.
 #: src/protocols/silc/buddy.c:1028
@@ -9069,8 +9136,12 @@
 msgstr "Prijatelj %s ni prisoten v omrežju"
 
 #: src/protocols/silc/buddy.c:1040
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr "Če želite dodati prijatelja, morate uvoziti njegov javni ključ. Kliknite Uvozi za uvoz javnega ključa."
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Če želite dodati prijatelja, morate uvoziti njegov javni ključ. Kliknite "
+"Uvozi za uvoz javnega ključa."
 
 #: src/protocols/silc/buddy.c:1043
 msgid "Import..."
@@ -9081,29 +9152,34 @@
 msgstr "Izberite ustreznega uporabnika"
 
 #: src/protocols/silc/buddy.c:1132
-msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
-msgstr "Najden je bil več kot en uporabnik z enakim javnim ključem. Izberite ustreznega in ga dodajte na seznam prijateljev."
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"Najden je bil več kot en uporabnik z enakim javnim ključem. Izberite "
+"ustreznega in ga dodajte na seznam prijateljev."
 
 #: src/protocols/silc/buddy.c:1134
-msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
-msgstr "Najden je bil več kot en uporabnik z enakim vzdevkom. Izberite ustreznega in ga dodajte na seznam prijateljev."
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"Najden je bil več kot en uporabnik z enakim vzdevkom. Izberite ustreznega in "
+"ga dodajte na seznam prijateljev."
 
 #: src/protocols/silc/buddy.c:1415
 msgid "Detached"
 msgstr "Odpeto"
 
-#: src/protocols/silc/buddy.c:1419
-#: src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
 msgid "Indisposed"
 msgstr "Neurejeno"
 
-#: src/protocols/silc/buddy.c:1423
-#: src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
 msgid "Wake Me Up"
 msgstr "Zbudi me"
 
-#: src/protocols/silc/buddy.c:1425
-#: src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
 msgid "Hyper Active"
 msgstr "Hiperaktiven"
 
@@ -9111,111 +9187,91 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434
-#: src/protocols/silc/silc.c:642
+#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Vesel"
 
-#: src/protocols/silc/buddy.c:1436
-#: src/protocols/silc/silc.c:644
+#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Žalosten"
 
-#: src/protocols/silc/buddy.c:1438
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Jezen"
 
-#: src/protocols/silc/buddy.c:1440
-#: src/protocols/silc/silc.c:648
+#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Ljubosumen"
 
-#: src/protocols/silc/buddy.c:1442
-#: src/protocols/silc/silc.c:650
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Osramočen"
 
-#: src/protocols/silc/buddy.c:1444
-#: src/protocols/silc/silc.c:652
+#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
 #: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Nepremagljiv"
 
-#: src/protocols/silc/buddy.c:1446
-#: src/protocols/silc/silc.c:654
+#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
 #: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: src/protocols/silc/buddy.c:1448
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Zaspan"
 
-#: src/protocols/silc/buddy.c:1450
-#: src/protocols/silc/silc.c:658
+#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
 #: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Zdolgočasen"
 
-#: src/protocols/silc/buddy.c:1452
-#: src/protocols/silc/silc.c:660
+#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Razburjen"
 
-#: src/protocols/silc/buddy.c:1454
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Vznemirjen"
 
-#: src/protocols/silc/buddy.c:1486
-#: src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "Načini uporabnika"
 
-#: src/protocols/silc/buddy.c:1495
-#: src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Razpoloženje"
 
-#: src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Besedilo stanja"
 
-#: src/protocols/silc/buddy.c:1504
-#: src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Priljubljen stik"
 
-#: src/protocols/silc/buddy.c:1509
-#: src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Priljubljen jezik"
 
-#: src/protocols/silc/buddy.c:1514
-#: src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "Naprava"
 
-#: src/protocols/silc/buddy.c:1519
-#: src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:710
-#: src/protocols/silc/silc.c:712
+#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
 msgid "Timezone"
 msgstr "Časovni pas"
 
-#: src/protocols/silc/buddy.c:1524
-#: src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Lokacija"
 
@@ -9235,8 +9291,7 @@
 msgid "Get Public Key..."
 msgstr "Dobi javni ključ ..."
 
-#: src/protocols/silc/buddy.c:1595
-#: src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
 msgid "Kill User"
 msgstr "Ubij uporabnika"
 
@@ -9249,8 +9304,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "kanal %s ne obstaja v omrežju"
 
-#: src/protocols/silc/chat.c:80
-#: src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "Informacije o kanalu"
 
@@ -9320,19 +9374,25 @@
 msgstr "Seznam javnih ključev kanala"
 
 #: src/protocols/silc/chat.c:410
-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:419
-#: src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457
-#: src/protocols/silc/chat.c:458
+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:419 src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
 #: src/protocols/silc/chat.c:891
 msgid "Channel Authentication"
 msgstr "Overovitev kanala"
 
-#: src/protocols/silc/chat.c:421
-#: src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "Dodaj / odstrani"
 
@@ -9340,8 +9400,7 @@
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: src/protocols/silc/chat.c:580
-#: src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
 msgid "Passphrase"
 msgstr "Geslo"
 
@@ -9426,7 +9485,8 @@
 
 #: src/protocols/silc/chat.c:1071
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+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:1073
@@ -9437,33 +9497,24 @@
 msgid "Cannot join private group"
 msgstr "Ni se mogoče pridružiti zasebni skupini"
 
-#: src/protocols/silc/chat.c:1267
-#: src/protocols/silc/silc.c:925
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
 msgid "Cannot call command"
 msgstr "Ni mogoče klicati ukaza"
 
-#: src/protocols/silc/chat.c:1268
-#: src/protocols/silc/silc.c:926
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: src/protocols/silc/ft.c:89
-#: src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96
-#: src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104
-#: src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210
-#: src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221
-#: src/protocols/silc/ft.c:340
+#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Varen prenos datotek"
 
-#: src/protocols/silc/ft.c:90
-#: src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97
-#: src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
 #: src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Napaka pri prenosu datotek"
@@ -9500,8 +9551,7 @@
 msgid "Cannot send file"
 msgstr "Ni mogoče poslati datoteke"
 
-#: src/protocols/silc/ops.c:341
-#: src/protocols/silc/ops.c:350
+#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
 #: src/protocols/silc/ops.c:359
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -9532,15 +9582,13 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Iz <I>%s</I> vas je brcnil uporabnik <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529
-#: src/protocols/silc/ops.c:534
+#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
 #: src/protocols/silc/ops.c:539
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Ubil vas je %s (%s)"
 
-#: src/protocols/silc/ops.c:560
-#: src/protocols/silc/ops.c:565
+#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
 #: src/protocols/silc/ops.c:570
 #, c-format
 msgid "Killed by %s (%s)"
@@ -9586,13 +9634,11 @@
 msgid "Join Chat"
 msgstr "Pridruži se klepetu"
 
-#: src/protocols/silc/ops.c:1070
-#: src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
 msgid "Public Key Fingerprint"
 msgstr "Prstni odtis javnega ključa"
 
-#: src/protocols/silc/ops.c:1071
-#: src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
 msgid "Public Key Babbleprint"
 msgstr "Odtis javnega ključa"
 
@@ -9600,8 +9646,7 @@
 msgid "More..."
 msgstr "Več ..."
 
-#: src/protocols/silc/ops.c:1155
-#: src/protocols/silc/silc.c:813
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
 msgid "Detach From Server"
 msgstr "Odpni se od strežnika"
 
@@ -9629,8 +9674,7 @@
 msgid "No public key was received"
 msgstr "Javni ključ ni bil sprejet"
 
-#: src/protocols/silc/ops.c:1304
-#: src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
 msgid "Server Information"
 msgstr "Informacije o strežniku"
 
@@ -9638,8 +9682,7 @@
 msgid "Cannot get server information"
 msgstr "Ni moč dobiti informacij o strežniku"
 
-#: src/protocols/silc/ops.c:1334
-#: src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "Statistika strežnika"
 
@@ -9690,8 +9733,7 @@
 msgid "Network Statistics"
 msgstr "Statistika omrežja"
 
-#: src/protocols/silc/ops.c:1397
-#: src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
@@ -9716,16 +9758,18 @@
 msgstr "Izmenjava ključa ni uspela"
 
 #: src/protocols/silc/ops.c:1508
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Nadaljevalna odpeta seja ni uspela. Pritisnite ponovna povezava za ustvarjanje nove povezave."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Nadaljevalna odpeta seja ni uspela. Pritisnite ponovna povezava za "
+"ustvarjanje nove povezave."
 
 #: src/protocols/silc/ops.c:1543
 msgid "Disconnected by server"
 msgstr "Strežnik je prekinil povezavo"
 
-#: src/protocols/silc/ops.c:1605
-#: src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:202
+#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
+#: src/protocols/silc/silc.c:194
 msgid "Resuming session"
 msgstr "Nadaljevalna seja"
 
@@ -9783,8 +9827,12 @@
 
 #: src/protocols/silc/pk.c:103
 #, c-format
-msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
-msgstr "Sprejet javni ključ uporabnika %s. Vaša lokalna kopija ne ustreza temu ključu. Želite kljub temu sprejeti ta javni ključ?"
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"Sprejet javni ključ uporabnika %s. Vaša lokalna kopija ne ustreza temu "
+"ključu. Želite kljub temu sprejeti ta javni ključ?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
@@ -9804,8 +9852,7 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115
-#: src/protocols/silc/pk.c:140
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Preveri javni ključ"
 
@@ -9817,36 +9864,36 @@
 msgid "Unsupported public key type"
 msgstr "Nepodprt tip javnega ključa"
 
-#: src/protocols/silc/silc.c:162
+#: src/protocols/silc/silc.c:154
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/protocols/silc/silc.c:194
+#: src/protocols/silc/silc.c:186
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ni moč začeti povezave odjemalca SILC"
 
-#: src/protocols/silc/silc.c:205
+#: src/protocols/silc/silc.c:197
 msgid "Performing key exchange"
 msgstr "Izvajanje izmenjave ključev"
 
-#: src/protocols/silc/silc.c:278
+#: src/protocols/silc/silc.c:270
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
 #. Progress
-#: src/protocols/silc/silc.c:317
+#: src/protocols/silc/silc.c:309
 msgid "Connecting to SILC Server"
 msgstr "Povezovanjes strežnikom SILC"
 
-#: src/protocols/silc/silc.c:638
+#: src/protocols/silc/silc.c:630
 msgid "Your Current Mood"
 msgstr "Vaše trenutno razpoloženje"
 
-#: src/protocols/silc/silc.c:640
+#: src/protocols/silc/silc.c:632
 msgid "Normal"
 msgstr "Navadno"
 
-#: src/protocols/silc/silc.c:665
+#: src/protocols/silc/silc.c:657
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9854,245 +9901,267 @@
 "\n"
 "Vaša priljubljena metoda stikov"
 
-#: src/protocols/silc/silc.c:673
-#: src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:675
-#: src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:677
-#: src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Video-konferenca"
 
-#: src/protocols/silc/silc.c:682
+#: src/protocols/silc/silc.c:674
 msgid "Your Current Status"
 msgstr "Vaše trenutno stanje"
 
-#: src/protocols/silc/silc.c:689
+#: src/protocols/silc/silc.c:681
 msgid "Online Services"
 msgstr "Storitve na zvezi"
 
-#: src/protocols/silc/silc.c:692
+#: src/protocols/silc/silc.c:684
 msgid "Let others see what services you are using"
 msgstr "Naj ostali vidijo, katere storitve uporabljate"
 
-#: src/protocols/silc/silc.c:698
+#: src/protocols/silc/silc.c:690
 msgid "Let others see what computer you are using"
 msgstr "Naj ostali vidijo, kakšen računalnik uporabljate"
 
-#: src/protocols/silc/silc.c:705
+#: src/protocols/silc/silc.c:697
 msgid "Your VCard File"
 msgstr "Vaša datoteka VCard"
 
-#: src/protocols/silc/silc.c:718
-#: src/protocols/silc/silc.c:719
+#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
 msgid "User Online Status Attributes"
 msgstr "Atributi stanja uporabnika na zvezi"
 
-#: src/protocols/silc/silc.c:720
-msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
-msgstr "Ostalim uporabnikom lahko dovolite ogled informacij o vašem stanju na zvezi in osebnih informacij. Izpolnite informacije, ki jih želite pokazati ostalim uporabnikom."
-
-#: src/protocols/silc/silc.c:760
-#: src/protocols/silc/silc.c:766
-#: src/protocols/silc/silc.c:1170
+#: src/protocols/silc/silc.c:712
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"Ostalim uporabnikom lahko dovolite ogled informacij o vašem stanju na zvezi "
+"in osebnih informacij. Izpolnite informacije, ki jih želite pokazati ostalim "
+"uporabnikom."
+
+#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
+#: src/protocols/silc/silc.c:1162
 msgid "Message of the Day"
 msgstr "Sporočilo dneva"
 
-#: src/protocols/silc/silc.c:760
+#: src/protocols/silc/silc.c:752
 msgid "No Message of the Day available"
 msgstr "Sporočilo dneva ni na voljo"
 
-#: src/protocols/silc/silc.c:761
-#: src/protocols/silc/silc.c:1165
+#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
 msgid "There is no Message of the Day associated with this connection"
 msgstr "S to povezavo ni povezano nobeno sporočilo dneva"
 
-#: src/protocols/silc/silc.c:808
+#: src/protocols/silc/silc.c:800
 msgid "Online Status"
 msgstr "Stanje na zvezi"
 
-#: src/protocols/silc/silc.c:817
+#: src/protocols/silc/silc.c:809
 msgid "View Message of the Day"
 msgstr "Ogled sporočila dneva"
 
-#: src/protocols/silc/silc.c:890
+#: src/protocols/silc/silc.c:882
 #, c-format
 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:1041
+#: src/protocols/silc/silc.c:1033
 msgid "Topic too long"
 msgstr "Temal je predolga."
 
-#: src/protocols/silc/silc.c:1122
+#: src/protocols/silc/silc.c:1114
 msgid "You must specify a nick"
 msgstr "Določiti morate vzdevek"
 
-#: src/protocols/silc/silc.c:1224
+#: src/protocols/silc/silc.c:1216
 #, c-format
 msgid "channel %s not found"
 msgstr "kanala %s ni mogoče najti"
 
-#: src/protocols/silc/silc.c:1229
+#: src/protocols/silc/silc.c:1221
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "načini kanala za %s: %s"
 
-#: src/protocols/silc/silc.c:1231
+#: src/protocols/silc/silc.c:1223
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "načini kanala za %s niso nastavljeni"
 
-#: src/protocols/silc/silc.c:1244
+#: src/protocols/silc/silc.c:1236
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ni mogoče nastaviti načinov za %s"
 
-#: src/protocols/silc/silc.c:1274
+#: src/protocols/silc/silc.c:1266
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Neznan ukaz: %s, (morda hrošč v Gaimu)"
 
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1329
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  Zapusti klepet"
 
-#: src/protocols/silc/silc.c:1341
+#: src/protocols/silc/silc.c:1333
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]:  Zapusti klepet"
 
-#: src/protocols/silc/silc.c:1345
+#: src/protocols/silc/silc.c:1337
 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:1342
+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:1346
+msgid "list:  List channels on this network"
+msgstr "list:  Seznam kanalov na tem omrežju"
+
 #: src/protocols/silc/silc.c:1350
-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:1354
-msgid "list:  List channels on this network"
-msgstr "list:  Seznam kanalov na tem omrežju"
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;vzdevek&gt;:  Oglej si informacije vzdevka"
+
+#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+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:1358
-msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;vzdevek&gt;:  Oglej si informacije vzdevka"
+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:1362
-#: src/protocols/zephyr/zephyr.c:2597
-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"
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd:  Ogled sporočila dneva na strežniku"
 
 #: src/protocols/silc/silc.c:1366
-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"
+msgid "detach:  Detach this session"
+msgstr "odpni:  Odpni to sejo"
 
 #: src/protocols/silc/silc.c:1370
-msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  Ogled sporočila dneva na strežniku"
-
-#: src/protocols/silc/silc.c:1374
-msgid "detach:  Detach this session"
-msgstr "odpni:  Odpni to sejo"
-
-#: src/protocols/silc/silc.c:1378
 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:1382
+#: src/protocols/silc/silc.c:1374
 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:1388
+#: src/protocols/silc/silc.c:1380
 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:1384
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;novvzdevek&gt;:  Spremenite vaš vzdevek"
+
+#: src/protocols/silc/silc.c:1388
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;vzdevek&gt;:  Ogled informacij o vzdevku"
+
 #: src/protocols/silc/silc.c:1392
-msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;novvzdevek&gt;:  Spremenite vaš vzdevek"
+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:1396
-msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;vzdevek&gt;:  Ogled informacij o vzdevku"
+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:1400
-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"
+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:1404
-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"
+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:1408
-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"
+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:1412
-msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;vzdevek&gt; [-javniključ]:  Dodeli pravice operaterju strežnika"
+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:1416
-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"
+msgid "info [server]:  View server administrative details"
+msgstr "info [strežnik]:  Ogled nadzorniških podrobnosti strežnika"
 
 #: src/protocols/silc/silc.c:1420
-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"
+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:1424
-msgid "info [server]:  View server administrative details"
-msgstr "info [strežnik]:  Ogled nadzorniških podrobnosti strežnika"
+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:1428
-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:1432
-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:1436
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Ogled statistike omrežja in strežnika"
 
-#: src/protocols/silc/silc.c:1440
+#: src/protocols/silc/silc.c:1432
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Pošlji PING povezanemu strežniku"
 
-#: src/protocols/silc/silc.c:1445
+#: src/protocols/silc/silc.c:1437
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Navedi uporabnike v kanalu"
 
-#: src/protocols/silc/silc.c:1449
-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)"
-
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1441
+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)"
+
+#: src/protocols/silc/silc.c:1453
 msgid "Instant Messages"
 msgstr "Neposredna sporočila"
 
+#: src/protocols/silc/silc.c:1458
+msgid "Digitally sign all IM messages"
+msgstr "Digitalno podpiši vsa vsa neposredna sporočila"
+
+#: src/protocols/silc/silc.c:1463
+msgid "Verify all IM message signatures"
+msgstr "Preveri podpise vseh neposrednih sporočil"
+
 #: src/protocols/silc/silc.c:1466
-msgid "Digitally sign all IM messages"
-msgstr "Digitalno podpiši vsa vsa neposredna sporočila"
+msgid "Channel Messages"
+msgstr "Sporočila kanala"
 
 #: src/protocols/silc/silc.c:1471
-msgid "Verify all IM message signatures"
-msgstr "Preveri podpise vseh neposrednih sporočil"
-
-#: src/protocols/silc/silc.c:1474
-msgid "Channel Messages"
-msgstr "Sporočila kanala"
-
-#: src/protocols/silc/silc.c:1479
 msgid "Digitally sign all channel messages"
 msgstr "Digitalno podpiši vsa sporočila kanala"
 
-#: src/protocols/silc/silc.c:1484
+#: src/protocols/silc/silc.c:1476
 msgid "Verify all channel message signatures"
 msgstr "Preveri podpise vseh sporočil kanala"
 
@@ -10105,45 +10174,44 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1572
+#: src/protocols/silc/silc.c:1564
 msgid "SILC Protocol Plugin"
 msgstr "Vstavek za protokol SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1574
+#: src/protocols/silc/silc.c:1566
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol SILC (Varen internetni konferenčni sistem v živo)"
 
-#: src/protocols/silc/silc.c:1608
+#: src/protocols/silc/silc.c:1600
 msgid "Public Key file"
 msgstr "Datoteka z javnim ključem"
 
-#: src/protocols/silc/silc.c:1612
+#: src/protocols/silc/silc.c:1604
 msgid "Private Key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: src/protocols/silc/silc.c:1615
+#: src/protocols/silc/silc.c:1607
 msgid "Public key authentication"
 msgstr "Overovitev javnega ključa"
 
-#: src/protocols/silc/silc.c:1619
+#: src/protocols/silc/silc.c:1611
 msgid "Reject watching by other users"
 msgstr "Zavrni ogledovanje drugih uporabnikov"
 
-#: src/protocols/silc/silc.c:1622
+#: src/protocols/silc/silc.c:1614
 msgid "Block invites"
 msgstr "Zavrni povabljene"
 
-#: src/protocols/silc/silc.c:1625
+#: src/protocols/silc/silc.c:1617
 msgid "Block IMs without Key Exchange"
 msgstr "Zavrni neposredno sporočanje brez izmenjave ključev"
 
-#: src/protocols/silc/silc.c:1628
+#: src/protocols/silc/silc.c:1620
 msgid "Reject online status attribute requests"
 msgstr "Zavrni zahtevke atributov stanja uporabnikov na zvezi"
 
-#: src/protocols/silc/util.c:205
-#: src/protocols/silc/util.c:230
+#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para ključev SILC ..."
 
@@ -10210,8 +10278,7 @@
 "Odtis javnega ključa:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332
-#: src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
 msgid "Public Key Information"
 msgstr "Informacije o javnem ključu"
 
@@ -10273,7 +10340,8 @@
 
 #: src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
+msgstr ""
+"Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
 
 #: src/protocols/toc/toc.c:500
 #, c-format
@@ -10345,8 +10413,12 @@
 msgstr "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
 
 #: src/protocols/toc/toc.c:552
-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 "Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
+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 ""
+"Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in "
+"poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
 
 #: src/protocols/toc/toc.c:554
 #, c-format
@@ -10383,8 +10455,14 @@
 msgstr "TOC je poslal ukaz PAUSE."
 
 #: src/protocols/toc/toc.c:994
-msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
-msgstr "Ko se to pripeti, TOC prezre vsa poslana sporočila in vas lahko celo brcne s kanala če pošljete sporočilo. Gaim bo poskrbel, da se to ne zgodi. Stanje je le začasno, prosim potrpite."
+msgid ""
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
+msgstr ""
+"Ko se to pripeti, TOC prezre vsa poslana sporočila in vas lahko celo brcne s "
+"kanala če pošljete sporočilo. Gaim bo poskrbel, da se to ne zgodi. Stanje je "
+"le začasno, prosim potrpite."
 
 #: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
@@ -10401,12 +10479,11 @@
 
 #: src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
-msgstr "Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
-
-#: src/protocols/toc/toc.c:1892
-#: src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056
-#: src/protocols/toc/toc.c:2144
+msgstr ""
+"Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
+
+#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Ni se bilo mogoče povezati za prenos."
 
@@ -10442,8 +10519,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316
-#: src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
 msgid "TOC Protocol Plugin"
 msgstr "Dodatek za protokol TOC"
 
@@ -10455,284 +10531,217 @@
 msgid "TOC port"
 msgstr "TOC vrata"
 
-#. Basic Profile group.
-#: src/protocols/trepia/trepia.c:264
-msgid "Basic Profile"
-msgstr "Osnovni profil"
-
-#. E-Mail Address
-#: src/protocols/trepia/trepia.c:295
-msgid "E-Mail Address"
-msgstr "E-poštni Naslov"
-
-#: src/protocols/trepia/trepia.c:301
-msgid "Profile Information"
-msgstr "Podatki profila"
-
-#. Instant Messagers
-#: src/protocols/trepia/trepia.c:307
-msgid "Instant Messagers"
-msgstr "Programi za neposredna sporočila"
-
-#. AIM
-#: src/protocols/trepia/trepia.c:311
-msgid "AIM"
-msgstr "AIM"
-
-#. ICQ
-#: src/protocols/trepia/trepia.c:315
-msgid "ICQ UIN"
-msgstr "ICQ UIN"
-
-#. MSN
-#: src/protocols/trepia/trepia.c:319
-msgid "MSN"
-msgstr "MSN"
-
-#. Yahoo
-#: src/protocols/trepia/trepia.c:323
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#. I'm From
-#: src/protocols/trepia/trepia.c:328
-msgid "I'm From"
-msgstr "Sem iz"
-
-#. Call the dialog.
-#: src/protocols/trepia/trepia.c:345
-msgid "Set your Trepia profile data."
-msgstr "Nastavite svoje podatke za profil Trepia."
-
-#: src/protocols/trepia/trepia.c:425
-msgid "Profile"
-msgstr "Profil"
-
-#: src/protocols/trepia/trepia.c:439
-msgid "Set Profile"
-msgstr "Nastavi profil"
-
-#: src/protocols/trepia/trepia.c:476
-msgid "Visit Homepage"
-msgstr "Obišči domačo stran"
-
-#: src/protocols/trepia/trepia.c:822
-#: src/protocols/trepia/trepia.c:825
-msgid "Local Users"
-msgstr "Lokalni uporabniki"
-
-#: src/protocols/trepia/trepia.c:1032
-msgid "Logging in"
-msgstr "Prijavljanje"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1278
-#: src/protocols/trepia/trepia.c:1280
-msgid "Trepia Protocol Plugin"
-msgstr "Dodatek za protokol Trepia"
-
-#: src/protocols/yahoo/yahoo.c:702
+#: src/protocols/yahoo/yahoo.c:706
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše sporočilo za Yahoo! ni bilo poslano."
 
-#: src/protocols/yahoo/yahoo.c:746
-#: src/protocols/yahoo/yahoo.c:3499
+#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
 msgid "Buzz!!"
 msgstr "Brrr!!"
 
-#: src/protocols/yahoo/yahoo.c:791
+#: src/protocols/yahoo/yahoo.c:797
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Sistemsko sporočilo Yahoo! za %s:"
 
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
-#. *
-#: src/protocols/yahoo/yahoo.c:881
+#.
+#: src/protocols/yahoo/yahoo.c:887
 #, 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:887
+#: src/protocols/yahoo/yahoo.c:893
 msgid "Message (optional) :"
 msgstr "Sporočilo (dodatno):"
 
-#: src/protocols/yahoo/yahoo.c:929
+#: src/protocols/yahoo/yahoo.c:935
 #, 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:932
-#, 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:935
+msgstr ""
+"%s je (že prej) zavrnil vašo zahtevo, da ga smete dodati na svoj seznam."
+
+#: src/protocols/yahoo/yahoo.c:938
+#, 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:941
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
+#: src/protocols/yahoo/yahoo.c:1684
+#, 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:1687
-#, 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:1690
 msgid "Failed Yahoo! Authentication"
 msgstr "Napaka pri overovitvi Yahoo!"
 
+#: src/protocols/yahoo/yahoo.c:1760
+#, 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:1763
-#, 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:1766
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-#: src/protocols/yahoo/yahoo.c:1800
+#: src/protocols/yahoo/yahoo.c:1797
 msgid "Invalid username."
 msgstr "Neveljavno uporabniško ime."
 
-#: src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/yahoo/yahoo.c:1808
 msgid "Normal authentication failed!"
 msgstr "Navadna overovitev ni uspela!"
 
-#: src/protocols/yahoo/yahoo.c:1812
-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:1809
+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:1817
+msgid "Incorrect password."
+msgstr "Neveljavno geslo."
 
 #: src/protocols/yahoo/yahoo.c:1820
-msgid "Incorrect password."
-msgstr "Neveljavno geslo."
-
-#: src/protocols/yahoo/yahoo.c:1823
 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:1826
+#: src/protocols/yahoo/yahoo.c:1823
 #, 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."
+msgstr ""
+"Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
+"odpravi."
+
+#: src/protocols/yahoo/yahoo.c:1877
+#, 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:1880
-#, 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:1883
 msgid "Could not add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
-#: src/protocols/yahoo/yahoo.c:2126
-#: src/protocols/yahoo/yahoo.c:2272
-#: src/protocols/yahoo/ycht.c:415
+#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "Ni mogoče brati"
 
-#: src/protocols/yahoo/yahoo.c:2294
-#: src/protocols/yahoo/yahoo.c:2422
-#: src/protocols/yahoo/yahoo.c:2507
-#: src/protocols/yahoo/yahoo.c:2517
-#: src/protocols/yahoo/yahoochat.c:1418
-#: src/protocols/yahoo/yahoochat.c:1485
-#: src/protocols/yahoo/ycht.c:519
+#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
+#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Težava s povezavo"
 
-#: src/protocols/yahoo/yahoo.c:2620
-#: src/protocols/yahoo/yahoo.c:3229
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
 msgid "Not At Home"
 msgstr "Nisem doma"
 
-#: src/protocols/yahoo/yahoo.c:2622
-#: src/protocols/yahoo/yahoo.c:3232
+#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
 msgid "Not At Desk"
 msgstr "Nisem za mizo"
 
-#: src/protocols/yahoo/yahoo.c:2624
-#: src/protocols/yahoo/yahoo.c:3235
+#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
 msgid "Not In Office"
 msgstr "Nisem v pisarni"
 
-#: src/protocols/yahoo/yahoo.c:2628
-#: src/protocols/yahoo/yahoo.c:3241
+#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: src/protocols/yahoo/yahoo.c:2632
-#: src/protocols/yahoo/yahoo.c:3247
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
 msgid "Stepped Out"
 msgstr "Šel na pavzo"
 
-#: src/protocols/yahoo/yahoo.c:2724
-#: src/protocols/yahoo/yahoo.c:2751
+#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-#: src/protocols/yahoo/yahoo.c:2774
-#: src/protocols/yahoo/yahoo.c:2834
+#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: src/protocols/yahoo/yahoo.c:2777
-#: src/protocols/yahoo/yahoo.c:2856
+#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: src/protocols/yahoo/yahoo.c:2795
+#: src/protocols/yahoo/yahoo.c:2794
 msgid "Stealth"
 msgstr "Skrivno"
 
-#: src/protocols/yahoo/yahoo.c:2850
+#: src/protocols/yahoo/yahoo.c:2849
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: src/protocols/yahoo/yahoo.c:2889
+#: src/protocols/yahoo/yahoo.c:2896
 msgid "Join in Chat"
 msgstr "Pridruži se pomenku"
 
-#: src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:2901
 msgid "Initiate Conference"
 msgstr "Začni konferenčni pogovor"
 
-#: src/protocols/yahoo/yahoo.c:2919
+#: src/protocols/yahoo/yahoo.c:2926
 msgid "Stealth Settings"
 msgstr "Nastavitve prikritosti"
 
-#: src/protocols/yahoo/yahoo.c:2952
+#: src/protocols/yahoo/yahoo.c:2932
+msgid "Start Doodling"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2963
 msgid "Active which ID?"
 msgstr "Kateri ID naj aktiviram?"
 
-#: src/protocols/yahoo/yahoo.c:2961
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Join who in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
 
-#: src/protocols/yahoo/yahoo.c:2971
+#: src/protocols/yahoo/yahoo.c:2982
 msgid "Activate ID..."
 msgstr "Aktiviraj ID ..."
 
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2986
 msgid "Join user in chat..."
 msgstr "Pridruži se uporabniku v pomenku ..."
 
-#: src/protocols/yahoo/yahoo.c:3542
+#: src/protocols/yahoo/yahoo.c:3541
 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:3546
+#: src/protocols/yahoo/yahoo.c:3545
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: Pozvonite pri prijatelju, da vas bo opazil"
 
-#: src/protocols/yahoo/yahoo.c:3551
+#: src/protocols/yahoo/yahoo.c:3550
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
 
@@ -10746,215 +10755,232 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3641
-#: src/protocols/yahoo/yahoo.c:3643
+#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatek za protokol Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3662
+#: src/protocols/yahoo/yahoo.c:3658
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: src/protocols/yahoo/yahoo.c:3665
+#: src/protocols/yahoo/yahoo.c:3661
 msgid "Pager host"
 msgstr "Strežnik za pozivnik"
 
-#: src/protocols/yahoo/yahoo.c:3668
+#: src/protocols/yahoo/yahoo.c:3664
 msgid "Japan Pager host"
 msgstr "Japonski gostitelj pozivnika"
 
-#: src/protocols/yahoo/yahoo.c:3671
+#: src/protocols/yahoo/yahoo.c:3667
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: src/protocols/yahoo/yahoo.c:3674
+#: src/protocols/yahoo/yahoo.c:3670
 msgid "File transfer host"
 msgstr "Gostitelj prenosa datotek"
 
-#: src/protocols/yahoo/yahoo.c:3677
+#: src/protocols/yahoo/yahoo.c:3673
 msgid "Japan File transfer host"
 msgstr "Japonski gostitelj prenosa datotek"
 
-#: src/protocols/yahoo/yahoo.c:3680
+#: src/protocols/yahoo/yahoo.c:3676
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: src/protocols/yahoo/yahoo.c:3683
+#: src/protocols/yahoo/yahoo.c:3679
 msgid "Chat Room Locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: src/protocols/yahoo/yahoo.c:3686
+#: src/protocols/yahoo/yahoo.c:3682
 msgid "Chat Room List Url"
 msgstr "URL seznama sob pomenkov"
 
-#: src/protocols/yahoo/yahoo.c:3689
+#: src/protocols/yahoo/yahoo.c:3685
 msgid "YCHT Host"
 msgstr "Gostitelj YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3692
+#: src/protocols/yahoo/yahoo.c:3688
 msgid "YCHT Port"
 msgstr "Vrata YCHT"
 
-#: src/protocols/yahoo/yahoo_profile.c:677
+#: src/protocols/yahoo/yahoo_profile.c:672
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Naslov IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:753
+#: src/protocols/yahoo/yahoo_profile.c:748
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo!-Japonska"
 
-#: src/protocols/yahoo/yahoo_profile.c:754
+#: src/protocols/yahoo/yahoo_profile.c:749
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:798
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "Oprostite, profili označeni z vsebino za odrasle trenutno niso podprti."
-
-#: src/protocols/yahoo/yahoo_profile.c:800
-msgid "If you wish to view this profile, you will need to visit this link in your web browser"
-msgstr "Če si želite ogledati ta profil, morate obiskati to povezavo z vašim spletnim brskalnikom"
-
-#: src/protocols/yahoo/yahoo_profile.c:977
+#: src/protocols/yahoo/yahoo_profile.c:793
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Oprostite, profili označeni z vsebino za odrasle trenutno niso podprti."
+
+#: src/protocols/yahoo/yahoo_profile.c:795
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr ""
+"Če si želite ogledati ta profil, morate obiskati to povezavo z vašim "
+"spletnim brskalnikom"
+
+#: src/protocols/yahoo/yahoo_profile.c:971
 msgid "Yahoo! ID"
 msgstr "Yahoo ID"
 
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
 #: src/protocols/yahoo/yahoo_profile.c:1051
-#: src/protocols/yahoo/yahoo_profile.c:1055
-#: src/protocols/yahoo/yahoo_profile.c:1059
 msgid "Hobbies"
 msgstr "Hobiji"
 
-#: src/protocols/yahoo/yahoo_profile.c:1069
-#: src/protocols/yahoo/yahoo_profile.c:1073
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Latest News"
 msgstr "Zadnje novice"
 
-#: src/protocols/yahoo/yahoo_profile.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Home Page"
 msgstr "Domača stran"
 
-#: src/protocols/yahoo/yahoo_profile.c:1109
+#: src/protocols/yahoo/yahoo_profile.c:1101
 msgid "Cool Link 1"
 msgstr "Zanimiva povezava št. 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1114
+#: src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Cool Link 2"
 msgstr "Zanimiva povezava št. 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 3"
 msgstr "Zanimiva povezava št. 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1131
+#: src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Update"
 msgstr "Nazadnje osveženo"
 
-#: src/protocols/yahoo/yahoo_profile.c:1137
+#: src/protocols/yahoo/yahoo_profile.c:1129
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Podatki o uporabniku %s niso dostopni"
 
-#: src/protocols/yahoo/yahoo_profile.c:1143
-msgid "Sorry, this profile seems to be in a language that is not supported at this time."
+#: src/protocols/yahoo/yahoo_profile.c:1135
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
 msgstr "Oprostite, profil je v jeziku, ki trenutno ni podprt."
 
-#: src/protocols/yahoo/yahoo_profile.c:1159
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "Ni mogoče pridobiti uporabnikovega profila. Ponavadi gre za začasno težavo na strežniku. Poskusite pozneje."
+#: src/protocols/yahoo/yahoo_profile.c:1151
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Ni mogoče pridobiti uporabnikovega profila. Ponavadi gre za začasno težavo "
+"na strežniku. Poskusite pozneje."
+
+#: src/protocols/yahoo/yahoo_profile.c:1154
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"Ni mogoče pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik "
+"ne obstaja. Kljub temu Yahoo! občasno ne uspe najti uporabnikovega profila. "
+"Če veste, da uporabnik obstaja, poskusite pozneje."
 
 #: src/protocols/yahoo/yahoo_profile.c:1162
-msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
-msgstr "Ni mogoče pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik ne obstaja. Kljub temu Yahoo! občasno ne uspe najti uporabnikovega profila. Če veste, da uporabnik obstaja, poskusite pozneje."
-
-#: src/protocols/yahoo/yahoo_profile.c:1170
 msgid "The user's profile is empty."
 msgstr "Uporabnikov profil je prazen."
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:202
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:205
+#: src/protocols/yahoo/yahoochat.c:204
 msgid "Invitation Rejected"
 msgstr "Povabilo zavrnjeno"
 
-#: src/protocols/yahoo/yahoochat.c:359
+#: src/protocols/yahoo/yahoochat.c:358
 msgid "Failed to join chat"
 msgstr "Pomenku se ni mogoče pridružiti"
 
-#: src/protocols/yahoo/yahoochat.c:359
+#: src/protocols/yahoo/yahoochat.c:358
 msgid "Maybe the room is full?"
 msgstr "Je morda soba polna?"
 
-#: src/protocols/yahoo/yahoochat.c:437
+#: src/protocols/yahoo/yahoochat.c:435
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Pogovarjate se v %s."
 
-#: src/protocols/yahoo/yahoochat.c:614
+#: src/protocols/yahoo/yahoochat.c:608
 msgid "Failed to join buddy in chat"
 msgstr "Prijatelju se ni bilo mogoče pridružiti na pomenku"
 
-#: src/protocols/yahoo/yahoochat.c:615
+#: src/protocols/yahoo/yahoochat.c:609
 msgid "Maybe they're not in a chat?"
 msgstr "Morda niso v pomenku?"
 
-#: src/protocols/yahoo/yahoochat.c:1351
+#: src/protocols/yahoo/yahoochat.c:1326
 msgid "Fetching the room list failed."
 msgstr "Prejemanje seznama sob je spodletelo."
 
-#: src/protocols/yahoo/yahoochat.c:1404
+#: src/protocols/yahoo/yahoochat.c:1379
 msgid "Voices"
 msgstr "Glasovi"
 
-#: src/protocols/yahoo/yahoochat.c:1407
+#: src/protocols/yahoo/yahoochat.c:1382
 msgid "Webcams"
 msgstr "Spletne kamere"
 
-#: src/protocols/yahoo/yahoochat.c:1418
-#: src/protocols/yahoo/yahoochat.c:1485
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
 msgid "Unable to fetch room list."
 msgstr "Ni mogoče prenesti seznama sob."
 
-#: src/protocols/yahoo/yahoochat.c:1478
+#: src/protocols/yahoo/yahoochat.c:1453
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
-#: src/protocols/yahoo/ycht.c:402
+#: src/protocols/yahoo/ycht.c:400
 msgid "Connection problem with the YCHT server."
 msgstr "Težava s povezavo s strežnikom YCHT."
 
 #: src/protocols/zephyr/zephyr.c:331
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr "(Prišlo je do napake pri pretvorbi tega sporočila. \t Preverite izbiro kodnega nabora v Upravitelju računov)"
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Prišlo je do napake pri pretvorbi tega sporočila. \t Preverite izbiro "
+"kodnega nabora v Upravitelju računov)"
 
 #: src/protocols/zephyr/zephyr.c:686
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ni mogoče poslati klepetu %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719
-#: src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Uporabnik:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723
-#: src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Skrit ali neprijavljen"
 
-#: src/protocols/zephyr/zephyr.c:728
-#: src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Pri %s od %s"
 
-#: src/protocols/zephyr/zephyr.c:1471
-#: src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "Kdorkoli"
 
@@ -10985,39 +11011,62 @@
 
 #: src/protocols/zephyr/zephyr.c:2612
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
+msgstr ""
+"instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem "
+"razredu"
 
 #: src/protocols/zephyr/zephyr.c:2617
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
+msgstr ""
+"inst &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
 
 #: src/protocols/zephyr/zephyr.c:2622
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
+msgstr ""
+"topic &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem "
+"razredu"
 
 #: src/protocols/zephyr/zephyr.c:2628
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pridruži se novemu klepetu"
+msgstr ""
+"sub &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pridruži se novemu "
+"klepetu"
 
 #: src/protocols/zephyr/zephyr.c:2633
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;sporočilo,<i>instanca</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;sporočilo,<i>instanca</"
+"i>,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2639
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
-msgstr "zci &lt;razred&gt; &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,*&gt;"
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;razred&gt; &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;"
+"<i>razred</i>,<i>instanca</i>,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2645
-msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zcir &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,<i>prejemnik</i>&gt;"
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pošlji sporočilo "
+"uporabniku &lt;<i>razred</i>,<i>instanca</i>,<i>prejemnik</i>&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2651
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zir &lt;instanca&gt; &lt;prejemnikt&gt;: Pošlji sporočilo uporabniku &lt;SPOROČILO,<i>instanca</i>,<i>prejemnik</i>&gt;"
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;instanca&gt; &lt;prejemnikt&gt;: Pošlji sporočilo uporabniku &lt;"
+"SPOROČILO,<i>instanca</i>,<i>prejemnik</i>&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2656
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;razred&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,OSEBNO,*&gt;"
+msgstr ""
+"zc &lt;razred&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,OSEBNO,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2762
 msgid "Resubscribe"
@@ -11037,8 +11086,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847
-#: src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
 msgid "Zephyr Protocol Plugin"
 msgstr "Dodatek za protokol Zephyr"
 
@@ -11083,8 +11131,11 @@
 msgstr "Neveljavne proxy nastavitve"
 
 #: src/proxy.c:1874
-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."
+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."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
@@ -11093,12 +11144,12 @@
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: src/server.c:350
+#: src/server.c:243
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s je zdaj poznan kot %s.\n"
 
-#: src/server.c:732
+#: src/server.c:625
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
@@ -11107,11 +11158,11 @@
 msgstr[2] "(%d sporočili)"
 msgstr[3] "(%d sporočila)"
 
-#: src/server.c:746
+#: src/server.c:639
 msgid "(1 message)"
 msgstr "(%d sporočil)"
 
-#: src/server.c:1007
+#: src/server.c:859
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11120,12 +11171,12 @@
 "Uporabnik %s vabi %s na pomenek v sobo %s:\n"
 "%s"
 
-#: src/server.c:1012
+#: src/server.c:864
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Uporabnik %s vabi %s na pomenek v sobo %s\n"
 
-#: src/server.c:1016
+#: src/server.c:868
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
@@ -11137,45 +11188,54 @@
 msgid "Unavailable"
 msgstr "Nedostopen"
 
-#: src/status.c:625
+#: src/status.c:621
 #, c-format
 msgid "%s came back"
 msgstr "%s se je vrnil"
 
-#: src/status.c:630
+#: src/status.c:626
 #, c-format
 msgid "%s went away"
 msgstr "%s je postal odsoten"
 
-#: src/status.c:1311
+#: src/status.c:1308
 #, c-format
 msgid "%s became idle"
 msgstr "%s je postal nedejaven"
 
-#: src/status.c:1327
+#: src/status.c:1323
 #, c-format
 msgid "%s became unidle"
 msgstr "%s je postal dejaven"
 
-#: src/util.c:2124
+#: src/status.c:1697
+#, fuzzy
+msgid "Default auto-away"
+msgstr "Samodejna odsotnost"
+
+#: src/util.c:2121
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: src/util.c:2125
-#, 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:2562
+#: src/util.c:2122
+#, 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:2567
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: src/util.c:2565
+#: src/util.c:2570
 msgid "Unknown."
 msgstr "Neznano."
 
-#: src/util.c:2595
+#: src/util.c:2600
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
@@ -11183,7 +11243,7 @@
 msgstr[2] "sekundi"
 msgstr[3] "sekunde"
 
-#: src/util.c:2609
+#: src/util.c:2614
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dni"
@@ -11191,7 +11251,7 @@
 msgstr[2] "dneva"
 msgstr[3] "dnevi"
 
-#: src/util.c:2617
+#: src/util.c:2622
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ur"
@@ -11199,7 +11259,7 @@
 msgstr[2] "uri"
 msgstr[3] "ure"
 
-#: src/util.c:2625
+#: src/util.c:2630
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -11207,7 +11267,183 @@
 msgstr[2] "minuti"
 msgstr[3] "minute"
 
-#: src/util.c:3048
+#: src/util.c:3053
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Napaka pri vzpostavljanju povezave.\n"
 
+#~ msgid "New..."
+#~ msgstr "Novo ..."
+
+#  else...
+#~ msgid "Back"
+#~ msgstr "Nazaj"
+
+#~ msgid "Tray Icon Configuration"
+#~ msgstr "Nastavitve ikone na pladnju"
+
+#~ msgid "_Hide new messages until tray icon is clicked"
+#~ msgstr "_Skrij nova sporočila, dokler ne kliknem ikone na pladnju"
+
+#~ msgid "Show user details"
+#~ msgstr "Pokaži podrobnosti o uporabniku"
+
+#~ msgid "_Apply"
+#~ msgstr "_Uporabi"
+
+#~ msgid "/Tools/Pl_ugin Actions"
+#~ msgstr "/Orodja/Dejanja _vstavkov"
+
+#~ msgid "/Tools/_Statuses"
+#~ msgstr "/Orodja/_Stanja"
+
+#~ msgid "%s could not connect"
+#~ msgstr "%s se ne more povezati"
+
+#~ msgid "Show transfer details"
+#~ msgstr "Pokaži podrobnosti o prenosu"
+
+#~ msgid "Expander Size"
+#~ msgstr "Velikost razširnika"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Velikost razširitvene puščice"
+
+#~ msgid "Buddy List Sorting"
+#~ msgstr "Razvrščanje seznama prijateljev"
+
+#~ msgid "_Sorting:"
+#~ msgstr "Razvr_ščanje:"
+
+#~ msgid "Buddy Display"
+#~ msgstr "Prikaz prijateljev"
+
+#~ msgid "Show more buddy details"
+#~ msgstr "Pokaži podrobnosti o uporabniku"
+
+#~ msgid "Message Logs"
+#~ msgstr "Dnevnik sporočil"
+
+#~ msgid "System Logs"
+#~ msgstr "Sistemski dnevniki"
+
+#~ msgid "_Enable system log"
+#~ msgstr "_Omogoči sistemski dnevnik"
+
+#~ msgid "Log when buddies log in/log _out"
+#~ msgstr "Shranjuj čas prijave/_odjave prijateljev"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "Shranjuj čas, ko postane prijatelj (ne)_dejaven"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "Shranjuj čas, ko gre prijatelj stran oz. se _vrne"
+
+#~ msgid "Log your own _signons/idleness/awayness"
+#~ msgstr "Shranuj _moje spremembe stanj"
+
+#~ msgid "Idle _Tracking:"
+#~ msgstr "Poročanje o času ne_dejavnosti:"
+
+#~ msgid "Gaim usage"
+#~ msgstr "programa Gaim"
+
+#~ msgid "X usage"
+#~ msgstr "okenskega sistema X"
+
+#~ msgid "Windows usage"
+#~ msgstr "operacijskega sistema Windows"
+
+#~ msgid "Away m_essage:"
+#~ msgstr "Spo_ročilo o odsotnosti:"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
+#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">File name:</span>\t%s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Napisal:</span>\t%s\n"
+#~ "<span weight=\"bold\">Spletni naslov:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">Ime datoteke:</span>\t%s"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">File name:</span>  %s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Napisal:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">Ime datoteke:</span>  %s "
+
+#~ msgid "Load"
+#~ msgstr "Naloži"
+
+#~ msgid "Summary"
+#~ msgstr "Povzetek"
+
+#~ msgid "Details"
+#~ msgstr "Podrobnosti"
+
+#~ msgid "Plugins"
+#~ msgstr "Vstavki"
+
+#~ msgid "Out of the office"
+#~ msgstr "Stran iz pisarne"
+
+#~ msgid "Slightly less boring default"
+#~ msgstr "Nekoliko manj dolgočasno privzeto"
+
+#~ msgid "IRC"
+#~ msgstr "IRC"
+
+#~ msgid "Quit message"
+#~ msgstr "Izhod iz sporočila"
+
+#~ msgid "Basic Profile"
+#~ msgstr "Osnovni profil"
+
+#~ msgid "Profile Information"
+#~ msgstr "Podatki profila"
+
+#~ msgid "Instant Messagers"
+#~ msgstr "Programi za neposredna sporočila"
+
+#~ msgid "AIM"
+#~ msgstr "AIM"
+
+#~ msgid "ICQ UIN"
+#~ msgstr "ICQ UIN"
+
+#~ msgid "MSN"
+#~ msgstr "MSN"
+
+#~ msgid "Yahoo"
+#~ msgstr "Yahoo"
+
+#~ msgid "I'm From"
+#~ msgstr "Sem iz"
+
+#~ msgid "Set your Trepia profile data."
+#~ msgstr "Nastavite svoje podatke za profil Trepia."
+
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Set Profile"
+#~ msgstr "Nastavi profil"
+
+#~ msgid "Visit Homepage"
+#~ msgstr "Obišči domačo stran"
+
+#~ msgid "Local Users"
+#~ msgstr "Lokalni uporabniki"
+
+#~ msgid "Trepia Protocol Plugin"
+#~ msgstr "Dodatek za protokol Trepia"