im.pidgin.pidgin: 29bfdd3420cde51a9536f3a8f07ce7f179385d20

miles at filmsi.net miles at filmsi.net
Tue Nov 13 17:06:31 EST 2007


-----------------------------------------------------------------
Revision: 29bfdd3420cde51a9536f3a8f07ce7f179385d20
Ancestor: 3717eb349e1d83a25c14833b4f7201f8823025a7
Author: miles at filmsi.net
Date: 2007-11-13T21:54:06
Branch: im.pidgin.pidgin

Modified files:
        po/sl.po

ChangeLog: 

fixes#3735

-------------- next part --------------
============================================================
--- po/sl.po	4ce39a1124d5dbe6932a6c6f28a99ee38968be75
+++ po/sl.po	c5b6f72098b66988fdcb893b0b7fb49c2e223737
@@ -6,22 +6,23 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.2.0\n"
+"Project-Id-Version: Pidgin 2.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-09-22 17:38+0100\n"
+"POT-Creation-Date: 2004-09-08 00:02-0400\n"
+"PO-Revision-Date: 2007-10-27 14:24+0100\n"
 "Last-Translator: Martin Srebotnjak <miles at filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles at filmsi.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\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"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:64
+#: ../finch/finch.c:301
+#: ../finch/finch.c:330
 #: ../finch/finch.c:418
 msgid "Finch"
 msgstr "Finch"
@@ -52,28 +53,31 @@ msgstr ""
 "  -n, --nologin       brez samodejne prijave\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328
+#: ../pidgin/gtkmain.c:718
 #, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-"%s je naletel na napake pri migraciji vaših nastavitev iz %s v %s. Prosimo, "
-"raziščite in dokončajte migracijo ročno (s kopiranjem ustreznih datotek). "
-"Prosimo, da to napako javite na naslov http://developer.pidgin.im."
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr "%s je naletel na napake pri migraciji vaših nastavitev iz %s v %s. Prosimo, raziščite in dokončajte migracijo ročno (s kopiranjem ustreznih datotek). Prosimo, da to napako javite na naslov http://developer.pidgin.im."
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:484
+#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:446
+#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:235
+#: ../finch/gntstatus.c:301
+#: ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/qq/im.c:576
+#: ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
@@ -103,8 +107,10 @@ msgstr "(Najverjetneje ste pozabili na '
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Najverjetneje ste pozabili na 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496
+#: ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1474
+#: ../pidgin/gtkblist.c:4367
 msgid "Modify Account"
 msgstr "Spremeni račun"
 
@@ -112,7 +118,8 @@ msgstr "Nov račun"
 msgid "New Account"
 msgstr "Nov račun"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
+#: ../finch/gntaccount.c:521
+#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokol:"
 
@@ -131,35 +138,54 @@ msgstr "Psevdonim:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../finch/gntaccount.c:575
+#: ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889
+#: ../finch/gntblist.c:344
+#: ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456
+#: ../finch/gntblist.c:803
+#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101
+#: ../finch/gntblist.c:2224
+#: ../finch/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:472
+#: ../finch/gntpounce.c:459
+#: ../finch/gntpounce.c:667
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1013
+#: ../libpurple/account.c:1263
+#: ../libpurple/account.c:1298
+#: ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666
+#: ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
 #: ../libpurple/protocols/jabber/jabber.c:1737
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325
+#: ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/oscar/oscar.c:6149
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -192,38 +218,61 @@ msgstr "Psevdonim:"
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../pidgin/gtkaccount.c:1909
+#: ../pidgin/gtkaccount.c:2496
+#: ../pidgin/gtkblist.c:6321
+#: ../pidgin/gtkcertmgr.c:197
+#: ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911
+#: ../pidgin/gtkdialogs.c:1003
+#: ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1069
+#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkimhtmltoolbar.c:435
+#: ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289
+#: ../pidgin/gtkpounce.c:1108
+#: ../pidgin/gtkprivacy.c:563
+#: ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:618
+#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Prekliči"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
+#: ../finch/gntaccount.c:579
+#: ../finch/gntcertmgr.c:311
+#: ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:472
+#: ../finch/gntpounce.c:465
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055
+#: ../finch/gntstatus.c:488
+#: ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1297
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727
+#: ../pidgin/gtkdebug.c:749
 #: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Shrani"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632
+#: ../pidgin/gtkaccount.c:1901
+#: ../pidgin/gtksavedstatuses.c:333
+#: ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepričani, da želite izbrisati %s?"
@@ -233,17 +282,27 @@ msgstr "Izbriši račun"
 msgstr "Izbriši račun"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319
+#: ../finch/gntpounce.c:666
+#: ../finch/gntpounce.c:729
+#: ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1107
+#: ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669
+#: ../finch/gntblist.c:2121
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2326
+#: ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Računi"
 
@@ -252,52 +311,72 @@ msgstr "Račune lahko omogočite ali one
 msgstr "Račune lahko omogočite ali onemogočite na naslednjem seznamu."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:698
+#: ../finch/gntaccount.c:888
+#: ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456
+#: ../finch/gntblist.c:2372
+#: ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:385
+#: ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../libpurple/protocols/silc10/chat.c:599
+#: ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:6320
+#: ../pidgin/gtkconv.c:1713
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Dodaj"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703
+#: ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "Spremeni"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811
+#: ../pidgin/gtkaccount.c:2442
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884
+#: ../pidgin/gtkaccount.c:2494
 msgid "Add buddy to your list?"
 msgstr "Želite dodati prijatelja na seznam?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944
+#: ../pidgin/gtkaccount.c:2552
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "Uporabnik %s%s%s%s želi dodati %s na svoj seznam prijateljev%s%s."
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:969
+#: ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999
+#: ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "Želite pooblastiti prijatelja?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:976
+#: ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2576
+#: ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "Pooblasti"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:977
+#: ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2577
+#: ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "Zavrni"
 
@@ -321,36 +400,52 @@ msgstr "Napaka pri dodajanju prijatelja"
 msgid "Error adding buddy"
 msgstr "Napaka pri dodajanju prijatelja"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325
+#: ../libpurple/protocols/oscar/oscar.c:2903
+#: ../pidgin/gtkaccount.c:1982
+#: ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Ime"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../finch/gntblist.c:328
+#: ../finch/gntblist.c:410
+#: ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1509
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../libpurple/protocols/zephyr/zephyr.c:1207
+#: ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkdialogs.c:1046
+#: ../pidgin/gtkdialogs.c:1068
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:413
 msgid "Group"
 msgstr "Združi"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:335
+#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:1305
+#: ../finch/gntblist.c:2210
+#: ../finch/gntblist.c:2274
+#: ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3206
+#: ../pidgin/gtknotify.c:511
+#: ../pidgin/gtkpounce.c:1275
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Račun"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -359,7 +454,8 @@ msgstr "Račun"
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3345
+#: ../pidgin/gtkblist.c:5826
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Dodaj prijatelja"
@@ -368,27 +464,35 @@ msgstr "Prosimo, vnesite podatke o prija
 msgid "Please enter buddy information."
 msgstr "Prosimo, vnesite podatke o prijatelju."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370
+#: ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Pomenki"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
+#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1755
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/qq/buddy_info.c:44
+#: ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Ime"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:819
 msgid "Auto-join"
 msgstr "Samodejno spoji"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419
+#: ../finch/gntblist.c:854
+#: ../pidgin/gtkblist.c:6208
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
@@ -396,7 +500,8 @@ msgstr "Kasneje lahko še več podatkov 
 msgid "You can edit more information from the context menu later."
 msgstr "Kasneje lahko še več podatkov uredite prek pojavnega menija."
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "Napaka pri dodajanju skupine"
 
@@ -408,9 +513,11 @@ msgstr "Skupina s tem imenom že obstaja
 msgid "A group with the name already exists."
 msgstr "Skupina s tem imenom že obstaja."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
+#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484
+#: ../pidgin/gtkblist.c:6317
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
@@ -426,7 +533,8 @@ msgstr "Prosimo, posodobite potrebna pol
 msgid "Please Update the necessary fields."
 msgstr "Prosimo, posodobite potrebna polja."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:803
+#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Uredi"
 
@@ -434,15 +542,18 @@ msgstr "Uredi nastavitve"
 msgid "Edit Settings"
 msgstr "Uredi nastavitve"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864
+#: ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Podatki"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864
+#: ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Pridobivanje poteka ..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:904
+#: ../finch/gntconv.c:534
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -453,10 +564,12 @@ msgstr "Dodaj opozorilo prijatelju"
 msgstr "Dodaj opozorilo prijatelju"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915
+#: ../finch/gntconv.c:546
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
@@ -469,7 +582,8 @@ msgstr "Prosimo, vnesite novo ime za %s"
 msgid "Please enter the new name for %s"
 msgstr "Prosimo, vnesite novo ime za %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Preimenuj"
 
@@ -483,13 +597,11 @@ msgid "Removing this contact will also r
 
 #: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
-"Z odstranitvijo tega stika boste odstranili tudi vse prijatelje iz stika"
+msgstr "Z odstranitvijo tega stika boste odstranili tudi vse prijatelje iz stika"
 
 #: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
-"Z odstranitvijo te skupine boste odstranili tudi vse prijatelje iz skupine"
+msgstr "Z odstranitvijo te skupine boste odstranili tudi vse prijatelje iz skupine"
 
 #: ../finch/gntblist.c:1092
 #, c-format
@@ -501,15 +613,22 @@ msgstr "Potrditev odstranitve"
 msgid "Confirm Remove"
 msgstr "Potrditev odstranitve"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../finch/gntblist.c:1100
+#: ../finch/gntblist.c:1252
+#: ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1710
+#: ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Odstrani"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226
+#: ../finch/gntblist.c:2422
+#: ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83
+#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:4610
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
@@ -523,20 +642,23 @@ msgstr "Pokaži/skrij oznako"
 msgstr "Pokaži/skrij oznako"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../finch/gntblist.c:1298
+#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050
+#: ../libpurple/protocols/gg/gg.c:1123
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1517
+#: ../libpurple/protocols/msn/msn.c:1693
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -546,21 +668,25 @@ msgstr "Pokaži/skrij oznako"
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
+#: ../pidgin/gtkblist.c:3230
 msgid "Nickname"
 msgstr "Vzdevek"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../finch/gntblist.c:1320
+#: ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:354
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2927
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
+#: ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664
+#: ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "Nedejaven"
 
@@ -591,54 +717,55 @@ msgstr ""
 "\n"
 "Zadnjič viden: pred %s leti"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704
+#: ../pidgin/gtkdocklet.c:582
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Novo ..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711
+#: ../pidgin/gtkdocklet.c:583
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Datoteka shranjena ..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089
+#: ../finch/gntplugin.c:343
+#: ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716
+#: ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Vtičniki"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Ime"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Račun"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218
+#: ../pidgin/gtkdialogs.c:766
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Vnesite pojavno ime ali psevdonim osebe, ki ji želite poslati neposredno "
-"sporočilo."
+#: ../finch/gntblist.c:2220
+#: ../pidgin/gtkdialogs.c:768
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "Vnesite pojavno ime ali psevdonim osebe, ki ji želite poslati neposredno sporočilo."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
+#: ../finch/gntblist.c:2223
+#: ../finch/gntcertmgr.c:90
+#: ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80
+#: ../libpurple/account.c:1012
+#: ../libpurple/account.c:1262
+#: ../libpurple/protocols/gg/gg.c:506
+#: ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
 #: ../libpurple/protocols/jabber/jabber.c:1736
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324
+#: ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/oscar/oscar.c:6148
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -655,62 +782,97 @@ msgstr ""
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../pidgin/gtkblist.c:4366
+#: ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:771
+#: ../pidgin/gtkdialogs.c:910
+#: ../pidgin/gtkdialogs.c:1002
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "V redu"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../finch/gntblist.c:2282
+#: ../pidgin/gtkblist.c:924
+msgid "Join a Chat"
+msgstr "Pridruži se pomenku"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "Vnesite ime klepeta, ki se mu želite pridružiti."
+
+#: ../finch/gntblist.c:2286
+#: ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Pridruži se"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324
+#: ../finch/gntpounce.c:447
+#: ../pidgin/gtkpounce.c:797
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "Pošllji sporočilo ..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
+#: ../finch/gntblist.c:2334
+msgid "Join Chat..."
+msgstr "Pridruži se klepetu ..."
+
+#: ../finch/gntblist.c:2338
+msgid "Show"
+msgstr "Pokaži"
+
+#: ../finch/gntblist.c:2343
+msgid "Empty groups"
 msgstr "prazne skupine"
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Pokaži neprijavljene prijatelje"
+#: ../finch/gntblist.c:2349
+msgid "Offline buddies"
+msgstr "nepovezane prijatelje"
 
-#: ../finch/gntblist.c:2263
-#, fuzzy
-msgid "Sort by status"
-msgstr "Podstanje"
+#: ../finch/gntblist.c:2355
+msgid "Sort"
+msgstr "Razvrsti"
 
-#: ../finch/gntblist.c:2267
-#, fuzzy
-msgid "Sort alphabetically"
+#: ../finch/gntblist.c:2360
+msgid "By Status"
+msgstr "po stanju"
+
+#: ../finch/gntblist.c:2364
+#: ../pidgin/gtkblist.c:4151
+msgid "Alphabetically"
 msgstr "abecedno"
 
-#: ../finch/gntblist.c:2271
-#, fuzzy
-msgid "Sort by log size"
+#: ../finch/gntblist.c:2368
+msgid "By Log Size"
 msgstr "po obsegu dnevnika"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntcertmgr.c:86
+#: ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Uvoz digitalnega potrdila"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:87
+#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Navedite ime gostitelja"
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:88
+#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Vnesite ime gostitelja, kateremu je namenjeno to digitalno potrdilo."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:97
+#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -719,19 +881,23 @@ msgstr ""
 "Datoteke %s ni bilo mogoče uvoziti.\n"
 "Preverite, da je datoteka berljiva in vrste PEM.\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:99
+#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Napaka pri uvozu digitalnega potrdila"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:100
+#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Uvoz digitalnega potrdila X.509 ni uspel"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:110
+#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Izberite digitalno potrdilo PEM"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:127
+#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -740,15 +906,18 @@ msgstr ""
 "Izvoz v datoteko %s ni uspel.\n"
 "Preverite, da imate na ciljni poti ustrezne pravice za pisanje\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:129
+#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Napaka pri izvozu digitalnega potrdila"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:130
+#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Izvoz digitalnega potrdila X.509 ni uspel"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:159
+#: ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr "Izvoz digitalnega potrdila X.509"
 
@@ -774,65 +943,76 @@ msgstr "Digitalno potrdilo SSL gostitelj
 msgid "SSL Host Certificate"
 msgstr "Digitalno potrdilo SSL gostitelja"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:233
+#: ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Želite resnično izbrisati digitalno potrdilo za %s?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:236
+#: ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
 msgstr "Potrditev brisanja digitalnega potrdila"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:293
+#: ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
 msgstr "Upravitelj digitalnih potrdil"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../finch/gntcertmgr.c:298
+#: ../libpurple/protocols/bonjour/bonjour.c:666
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Ime gostitelja"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315
+#: ../finch/gntnotify.c:388
+#: ../pidgin/gtkconv.c:1689
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Informacije"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
+#: ../finch/gntcertmgr.c:324
+#: ../finch/gntft.c:237
+#: ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:211
+#: ../finch/gntplugin.c:403
+#: ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:407
 #: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../libpurple/protocols/silc10/util.c:377
+#: ../pidgin/gtkaccount.c:2469
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Zapri"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s se je odjavil."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"Finch se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in "
-"ponovno omogočite povezovanje računa."
+"Finch se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138
+#: ../pidgin/gtkblist.c:4368
 msgid "Re-enable Account"
 msgstr "Ponovno omogoči račun"
 
@@ -840,24 +1020,28 @@ msgstr "Ta ukaz ne obstaja."
 msgid "No such command."
 msgstr "Ta ukaz ne obstaja."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:143
+#: ../pidgin/gtkconv.c:531
 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."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:148
+#: ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Vaš ukaz iz neznanega razloga ni uspel."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:153
+#: ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Ta ukaz deluje samo v klepetih in ne v neposrednih sporočilih."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:156
+#: ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Ta ukaz deluje samo v neposrednih sporočilih in ne v klepetih."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:160
+#: ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
@@ -875,7 +1059,8 @@ msgstr "%s [%s]"
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:279
+#: ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -888,65 +1073,66 @@ msgstr "Ta klepet ste zapustili."
 msgid "You have left this chat."
 msgstr "Ta klepet ste zapustili."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:414
+#: ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo "
-"zabeležena."
+msgstr "Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo zabeležena."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo "
-"zabeležena."
+#: ../finch/gntconv.c:420
+#: ../pidgin/gtkconv.c:1424
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo zabeležena."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:469
 msgid "Send To"
 msgstr "Pošlji k"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "Pogovor"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "Počisti pretekle izjave"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:523
+#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Pokaži časovne žige"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "Dodaj opozorilo prijatelju ..."
 
-#: ../finch/gntconv.c:527
+#: ../finch/gntconv.c:554
 msgid "Enable Logging"
 msgstr "Vključi dnevnik"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:560
 msgid "Enable Sounds"
 msgstr "Vključi zvoke"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<SAMODEJNI ODGOVOR>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "Seznam uporabnikov:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1051
+#: ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "Podprte možnosti razhroščevanja:  različica"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1087
+#: ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Tak ukaz ne obstaja (v tem sklopu)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1090
+#: ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -954,64 +1140,70 @@ msgstr ""
 "Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
-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."
+#: ../finch/gntconv.c:1148
+#: ../pidgin/gtkconv.c:7688
+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."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1151
+#: ../pidgin/gtkconv.c:7691
 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."
+msgstr "me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
-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."
+#: ../finch/gntconv.c:1154
+#: ../pidgin/gtkconv.c:7694
+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."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1157
+#: ../pidgin/gtkconv.c:7697
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1160
+#: ../pidgin/gtkconv.c:7703
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Pokaži seznam uporabnikov v klepetu."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Pokaži okno vtičnikov."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Pokaži seznam prijateljev."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Pokaži okno računov."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Pokaži okno razhroščevanja."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "prefs: Pokaži okno nastavitev."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Pokaži okno savedstatuses."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231
+#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Datoteke ni bilo mogoče odprti."
+
+#: ../finch/gntdebug.c:271
+#: ../finch/gntui.c:86
+#: ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Razhroščevalno okno"
 
@@ -1019,38 +1211,47 @@ msgstr "Razhroščevalno okno"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292
+#: ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Počisti"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
 msgstr "Filter: "
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309
+#: ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Premor"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:118
+#: ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Prenosi datotek - %d%% od %d datotek"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:123
+#: ../finch/gntft.c:196
+#: ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234
+#: ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Potek"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Datoteka"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Velikost"
 
@@ -1058,31 +1259,39 @@ msgstr "Hitrost"
 msgid "Speed"
 msgstr "Hitrost"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Preostanek"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../finch/gntft.c:201
+#: ../finch/gntstatus.c:547
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:358
+#: ../libpurple/protocols/gg/gg.c:1039
+#: ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2715
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/yahoo/yahoo.c:3250
+#: ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316
+#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtksavedstatuses.c:999
+#: ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Stanje"
 
@@ -1098,19 +1307,25 @@ msgstr "Ustavi"
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:305
+#: ../pidgin/gtkft.c:169
+#: ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:372
+#: ../pidgin/gtkft.c:166
+#: ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:374
+#: ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:420
+#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
@@ -1120,12 +1335,15 @@ msgstr "Datoteka je bila shranjena kot %
 msgid "The file was saved as %s."
 msgstr "Datoteka je bila shranjena kot %s."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../finch/gntft.c:432
+#: ../finch/gntft.c:433
+#: ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "Končano"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437
+#: ../libpurple/protocols/msn/session.c:388
 msgid "Transferring"
 msgstr "Prenos je v teku"
 
@@ -1133,19 +1351,22 @@ msgstr "E-naslovi"
 msgid "Emails"
 msgstr "E-naslovi"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171
+#: ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Dobili ste pošto!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:518
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:525
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -1154,53 +1375,56 @@ msgstr[3] "%s (%s) ima %d nova sporočil
 msgstr[2] "%s (%s) ima %d novi sporočili."
 msgstr[3] "%s (%s) ima %d nova sporočila."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226
+#: ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Nova e-pošta"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291
+#: ../pidgin/gtknotify.c:948
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292
+#: ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:949
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391
+#: ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "Sporoči"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Pridruži se"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397
+#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Povabi"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(brez)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:76
+#: ../finch/gntplugin.c:85
 msgid "ERROR"
 msgstr "NAPAKA"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:76
 msgid "loading plugin failed"
 msgstr "nalaganje vtičnika ni uspelo"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:85
 msgid "unloading plugin failed"
 msgstr "izklop vtičnika ni uspel"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:130
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1217,19 +1441,39 @@ msgstr ""
 "Spletna stran: %s\n"
 "Ime datoteke: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:188
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Vtičnik je potrebno naložiti, preden ga lahko prilagodite."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:236
 msgid "No configuration options for this plugin."
 msgstr "Za ta vtičnik ni nobenih nastavitev."
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:257
+msgid "Error loading plugin"
+msgstr "Napaka pri nalaganju vtičnika"
+
+#: ../finch/gntplugin.c:258
+msgid "The selected file is not a valid plugin."
+msgstr "Izbrana datoteka ni veljaven vtičnik."
+
+#: ../finch/gntplugin.c:259
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr "Prosim, odprite okno razhroščevanja in poskusite znova, da vidite dejansko sporočilo o napaki."
+
+#: ../finch/gntplugin.c:322
+msgid "Select plugin to install"
+msgstr "Izberite vtičnik za namestitev"
+
+#: ../finch/gntplugin.c:348
 msgid "You can (un)load plugins from the following list."
 msgstr "Vtičnike lahko naložite ali odstranite z naslednjega seznama."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:399
+msgid "Install Plugin..."
+msgstr "Namesti vtičnik ..."
+
+#: ../finch/gntplugin.c:408
 msgid "Configure Plugin"
 msgstr "Prilagodi vtičnik"
 
@@ -1238,20 +1482,27 @@ msgstr "Prilagodi vtičnik"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:464
+#: ../finch/gntplugin.c:471
+#: ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90
+#: ../pidgin/gtkdocklet.c:717
+#: ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:183
+#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328
+#: ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328
+#: ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Uredi opozorilo prijatelja"
 
@@ -1260,7 +1511,8 @@ msgstr "Opozori tistega, ki"
 msgstr "Opozori tistega, ki"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:336
+#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Račun:"
 
@@ -1269,7 +1521,8 @@ msgstr "Ime prijatelja:"
 msgstr "Ime prijatelja:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:374
+#: ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Opozori, ko se prijatelj ..."
 
@@ -1314,7 +1567,8 @@ msgstr "pošlje sporočilo"
 msgstr "pošlje sporočilo"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:414
+#: ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Dejanje"
 
@@ -1342,7 +1596,8 @@ msgstr "Opozori le tedaj, ko moje stanje
 msgid "Pounce only when my status is not available"
 msgstr "Opozori le tedaj, ko moje stanje ni na voljo"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:450
+#: ../pidgin/gtkpounce.c:1288
 msgid "Recurring"
 msgstr "Ponavljajoč"
 
@@ -1358,67 +1613,80 @@ msgstr "Preden lahko ustvarite opozorilo
 msgid "You must create an account first before you can create a pounce."
 msgstr "Preden lahko ustvarite opozorilo, morate prej ustvariti račun."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:662
+#: ../pidgin/gtkpounce.c:1103
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Ste prepričani, da želite izbrisati obvestilo o %s za %s?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696
+#: ../finch/gntui.c:84
+#: ../pidgin/gtkpounce.c:1332
 msgid "Buddy Pounces"
 msgstr "Opozorila prijatelja"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810
+#: ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je začel pisati"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812
+#: ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s je zastal, medtem ko vam je pisal (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814
+#: ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816
+#: ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818
+#: ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820
+#: ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822
+#: ../pidgin/gtkpounce.c:1471
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824
+#: ../pidgin/gtkpounce.c:1473
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826
+#: ../pidgin/gtkpounce.c:1475
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828
+#: ../pidgin/gtkpounce.c:1477
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:829
+#: ../pidgin/gtkpounce.c:1478
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
@@ -1426,12 +1694,16 @@ msgstr "Glede na uporabo tipkovnice"
 msgid "Based on keyboard use"
 msgstr "Glede na uporabo tipkovnice"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94
+#: ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "Od nazadnje poslanega sporočila"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96
+#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1931
+#: ../pidgin/gtkprefs.c:1945
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "nikoli"
@@ -1481,79 +1753,100 @@ msgstr "Spremeni stanje v"
 msgstr "Spremeni stanje v"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259
+#: ../pidgin/gtkprefs.c:993
+#: ../pidgin/gtkprefs.c:2035
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Pogovori"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260
+#: ../pidgin/gtkprefs.c:1469
+#: ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "Beleženje v dnevnik"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Å e ni podprto."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:661
+#: ../pidgin/gtkrequest.c:1555
 #: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Shrani datoteko ..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:661
+#: ../pidgin/gtkrequest.c:1556
 #: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:64
 msgid "Buddy logs in"
 msgstr "Prijatelj se prijavi"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr "Prijatelj se odjavi"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr "Sporočilo prejeto"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "Prejeto sporočilo začne pogovor"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr "Sporočilo poslano"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr "Oseba se pridruži pogovorni sobi"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103
+#: ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "Oseba zapusti pogovorno sobo"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "Vi govorite v sobi"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105
+#: ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr "Drugi govorijo v sobi"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107
+#: ../pidgin/gtksound.c:75
 msgid "Someone says your screen name in chat"
 msgstr "Nekdo omeni vaše pojavno ime v sobi"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361
+#: ../pidgin/gtksound.c:308
 msgid "GStreamer Failure"
 msgstr "Napaka GStreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362
+#: ../pidgin/gtksound.c:309
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer se ni uspel inicializirati."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716
+#: ../finch/gntsound.c:802
+#: ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678
+#: ../pidgin/gtkprefs.c:1874
 msgid "(default)"
 msgstr "(privzeto)"
 
@@ -1569,7 +1862,8 @@ msgstr "Profili"
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954
+#: ../pidgin/gtkprefs.c:1719
 msgid "Automatic"
 msgstr "Samodejno"
 
@@ -1577,7 +1871,8 @@ msgstr "Pisk konzole"
 msgid "Console Beep"
 msgstr "Pisk konzole"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958
+#: ../pidgin/gtkprefs.c:1723
 msgid "Command"
 msgstr "Ukaz"
 
@@ -1585,7 +1880,8 @@ msgstr "Nemo"
 msgid "No Sound"
 msgstr "Nemo"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961
+#: ../pidgin/gtkprefs.c:1714
 msgid "Sound Method"
 msgstr "Način zvoka"
 
@@ -1603,7 +1899,8 @@ msgstr ""
 "(%s namesto datoteke)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981
+#: ../pidgin/gtkprefs.c:1758
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
@@ -1611,18 +1908,23 @@ msgstr "Zvok, ko pogovorno okno dobi poz
 msgid "Sounds when conversation has focus"
 msgstr "Zvok, ko pogovorno okno dobi pozornost"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990
+#: ../pidgin/gtkprefs.c:897
+#: ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "vedno"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991
+#: ../pidgin/gtkprefs.c:1763
 msgid "Only when available"
 msgstr "Samo ko je na voljo"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992
+#: ../pidgin/gtkprefs.c:1764
 msgid "Only when not available"
 msgstr "Samo ko ni na voljo"
 
@@ -1631,11 +1933,13 @@ msgstr "Glasnost (0-100):"
 msgstr "Glasnost (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018
+#: ../pidgin/gtkprefs.c:1800
 msgid "Sound Events"
 msgstr "Zvočni Dogodki"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020
+#: ../pidgin/gtkprefs.c:1859
 msgid "Event"
 msgstr "Dogodek"
 
@@ -1643,15 +1947,18 @@ msgstr "Datoteka"
 msgid "File"
 msgstr "Datoteka"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039
+#: ../pidgin/gtkprefs.c:1878
 msgid "Test"
 msgstr "Preskus"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042
+#: ../pidgin/gtkprefs.c:1882
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045
+#: ../pidgin/gtkprefs.c:1886
 msgid "Choose..."
 msgstr "Izberi ..."
 
@@ -1664,19 +1971,22 @@ msgstr "Izbriši stanje"
 msgid "Delete Status"
 msgstr "Izbriši stanje"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
+#: ../finch/gntstatus.c:176
+#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1486
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Naziv"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
+#: ../finch/gntstatus.c:183
+#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Vrsta"
 
@@ -1688,47 +1998,61 @@ msgstr "Vrsta"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:564
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:270
+#: ../libpurple/protocols/bonjour/bonjour.c:277
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/gg/gg.c:1077
+#: ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597
+#: ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613
+#: ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627
+#: ../libpurple/protocols/irc/irc.c:234
 #: ../libpurple/protocols/jabber/jabber.c:1532
 #: ../libpurple/protocols/jabber/jabber.c:1555
 #: ../libpurple/protocols/jabber/jabber.c:1578
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msn/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:649
+#: ../libpurple/protocols/msn/msn.c:656
+#: ../libpurple/protocols/msn/msn.c:662
+#: ../libpurple/protocols/msn/msn.c:668
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/novell/novell.c:2946
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/oscar/oscar.c:5609
+#: ../libpurple/protocols/oscar/oscar.c:5827
+#: ../libpurple/protocols/oscar/oscar.c:5841
+#: ../libpurple/protocols/oscar/oscar.c:5857
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:5871
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526
+#: ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Sporočilo"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
+#: ../finch/gntstatus.c:194
+#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Uporabi"
 
@@ -1752,7 +2076,8 @@ msgstr "Podstanje"
 msgid "Substatus"
 msgstr "Podstanje"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
+#: ../finch/gntstatus.c:464
+#: ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -1777,7 +2102,8 @@ msgstr "Digitalna potrdila"
 msgid "Certificates"
 msgstr "Digitalna potrdila"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89
+#: ../pidgin/gtkprefs.c:2037
 msgid "Sounds"
 msgstr "Zvoki"
 
@@ -1785,7 +2111,8 @@ msgstr "Stanja"
 msgid "Statuses"
 msgstr "Stanja"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Pri nalaganju vtičnika je prišlo do napake."
@@ -1811,12 +2138,8 @@ msgstr "Vtičnik za odložišče"
 msgstr "Vtičnik za odložišče"
 
 #: ../finch/plugins/gntclipboard.c:161
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
-msgstr ""
-"Ko se spremeni vsebina odložišča gnt, je vsebina na voljo X-u, če je to le "
-"mogoče."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
+msgstr "Ko se spremeni vsebina odložišča gnt, je vsebina na voljo X-u, če je to le mogoče."
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1875,46 +2198,46 @@ msgstr "GntGf"
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Vtičnik Toaster"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116
+#: ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Pogovor z %s o %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138
+#: ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Vtičnik za zgodovino zahteva beleženje v dnevnik"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139
+#: ../pidgin/plugins/history.c:154
 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)."
+"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"
+"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."
+"Omogočanje beleženja v dnevnik za neposredna sporočila in/ali klepete aktivira zgodovino za istovrstne pogovore."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181
+#: ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Prikaže nedavno zabeležene pogovore v novih pogovorih."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"Ko je odprt nov pogovor, ta vtičnik vstavi zadnji pogovor v trenuten pogovor."
+#: ../finch/plugins/gnthistory.c:182
+#: ../pidgin/plugins/history.c:198
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "Ko je odprt nov pogovor, ta vtičnik vstavi zadnji pogovor v trenuten pogovor."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -1929,7 +2252,8 @@ msgstr "GntLastlog"
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Vtičnik Lastlog."
 
@@ -1937,7 +2261,8 @@ msgstr "Računi"
 msgid "accounts"
 msgstr "Računi"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:958
+#: ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "Za prijavo je potrebno geslo."
 
@@ -1954,18 +2279,21 @@ msgstr "Shrani geslo"
 msgid "Save password"
 msgstr "Shrani geslo"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1039
+#: ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manjka vtičnik za protokol %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1041
+#: ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4363
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/account.c:1199
+#: ../libpurple/protocols/gg/gg.c:707
 #: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
@@ -2000,22 +2328,28 @@ msgstr "Spremeni podatke za uporabika %s
 msgid "Change user information for %s"
 msgstr "Spremeni podatke za uporabika %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293
+#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Nastavi informacije o uporabniku"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1764
+#: ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/qq/qq.c:232
+#: ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Neznan"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521
+#: ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531
+#: ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3250
+#: ../pidgin/gtkblist.c:5716
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2025,17 +2359,17 @@ msgstr "Seznam prijateljev"
 msgid "buddy list"
 msgstr "Seznam prijateljev"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(SE NE UJEMA)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s je predstavil(a) naslednje digitalno potrdilo za enkratno uporabo:"
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2045,39 +2379,40 @@ msgstr ""
 "Prstni odtis (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Preverjanje verodostojnosti digitalnega potrdila za enkratno uporabo"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
 msgstr "Izdajatelji digitalnih potrdil"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
 msgstr "Medpomnilnik vrstnikov SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
+#: ../libpurple/certificate.c:1184
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Želite sprejeti digitalno potrdilo za %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
 msgstr "Preverjanje verodostojnosti digitalnega potrdila SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
+#: ../libpurple/certificate.c:1199
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1200
+#: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
@@ -2085,7 +2420,7 @@ msgstr "Zavrni"
 msgid "Reject"
 msgstr "Zavrni"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
 msgstr "_Pokaži digitalno potrdilo ..."
 
@@ -2093,27 +2428,19 @@ msgstr "_Pokaži digitalno potrdilo ..."
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1301
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  "
-"To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
+msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
+msgstr "Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1326
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni "
-"mogoče preveriti."
+msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgstr "Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni mogoče preveriti."
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Ponujena veriga digitalnih potrdil za %s ni veljavna."
@@ -2123,47 +2450,36 @@ msgstr "Ponujena veriga digitalnih potrd
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#: ../libpurple/certificate.c:1352
+#: ../libpurple/certificate.c:1421
 msgid "SSL Certificate Error"
 msgstr "Napaka digitalnega potrdila SSL"
 
-#: ../libpurple/certificate.c:1340
+#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
 msgstr "Neveljavna veriga digitalnih potrdil"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega "
-"potrdila ni mogoče preveriti."
+#: ../libpurple/certificate.c:1373
+msgid "You have no database of root certificates, so this certificate cannot be validated."
+msgstr "Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega potrdila ni mogoče preveriti."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-"Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je "
-"Pidginu neznano."
+#: ../libpurple/certificate.c:1396
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je Pidginu neznano."
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1413
 #, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"Predstavljena veriga digitalnih potrdil %s nima veljavnega digitalnega "
-"podpisa izdajatelja digitalnih potrdil, katerega podpis naj bi imela."
+msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgstr "Predstavljena veriga digitalnih potrdil %s nima veljavnega digitalnega podpisa izdajatelja digitalnih potrdil, katerega podpis naj bi imela."
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1422
 msgid "Invalid certificate authority signature"
 msgstr "Neveljaven podpis izdajatelja digitalnega potrdila"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1886
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2181,7 +2497,7 @@ msgstr ""
 "Rok veljavnosti: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
+#: ../libpurple/certificate.c:1895
 msgid "Certificate Information"
 msgstr "Podatki o digitalnem potrdilu"
 
@@ -2203,10 +2519,11 @@ msgstr "+++ %s se je odjavil(a)"
 msgid "+++ %s signed off"
 msgstr "+++ %s se je odjavil(a)"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:497
+#: ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:363
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -2214,7 +2531,8 @@ msgstr "Sporočila ni mogoče poslati, k
 msgid "Unable to send message: The message is too large."
 msgstr "Sporočila ni mogoče poslati, ker je preveliko."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:173
+#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Sporočila k %s ni mogoče poslati."
@@ -2223,7 +2541,8 @@ msgstr "Sporočilo je preveliko."
 msgid "The message is too large."
 msgstr "Sporočilo je preveliko."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/conversation.c:183
+#: ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Sporočila ni mogoče poslati."
@@ -2281,11 +2600,12 @@ msgstr "Imena strežnika ni mogoče prid
 msgid "Failed to get serv name: %s"
 msgstr "Imena strežnika ni mogoče pridobiti: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Strežnik D-BUS za Purple ni zagnan zaradi zgoraj navedenih razlogov"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
+#: ../libpurple/desktopitem.c:287
+#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Brez imena"
 
@@ -2297,7 +2617,8 @@ msgstr "Zahteve ni mogoče poslati proce
 msgid "Unable to send request to resolver process\n"
 msgstr "Zahteve ni mogoče poslati procesu razločevanja\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549
+#: ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2306,8 +2627,9 @@ msgstr ""
 "Napaka pri razločevanju %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552
+#: ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Napaka pri razločevanju %s: %d"
@@ -2322,16 +2644,15 @@ msgstr ""
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF pri branju iz procesa razločevanja"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Napaka pri ustvarjanju niti: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
@@ -2431,7 +2752,6 @@ msgstr "Prenos datoteke %s je dokončan.
 msgstr "Prenos datoteke %s je dokončan."
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokončan."
 
@@ -2441,7 +2761,6 @@ msgstr "Prekinili ste prenos %s"
 msgstr "Prekinili ste prenos %s"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
@@ -2534,75 +2853,40 @@ msgstr "Upravljač za URL-je \"ymsgr"
 msgstr "Upravljač za URL-je \"ymsgr"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
-"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
-"ji \"aim\""
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"aim\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
-"ji \"gg\""
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"gg\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
-msgstr ""
-"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
-"ji \"icq\""
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"icq\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
-"ji \"irc\""
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"irc\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
-"ji \"msnim\""
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"msnim\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
-"ji \"sip\""
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"sip\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
-msgstr ""
-"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
-"ji \"xmpp\""
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"xmpp\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
-"ji \"ymsgr\""
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"ymsgr\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
-"Resnično, če naj bo ukaz, ki naj ravna s to vrsto URL-ja, zagnan v konzoli."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "Resnično, če naj bo ukaz, ki naj ravna s to vrsto URL-ja, zagnan v konzoli."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2662,27 +2946,21 @@ msgstr "XML"
 
 #: ../libpurple/log.c:1366
 #, 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"
+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"
 
 #: ../libpurple/log.c:1368
 #, 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"
+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"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1426
+#: ../libpurple/log.c:1559
 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>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1438
+#: ../libpurple/log.c:1568
 #, 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>"
@@ -2698,7 +2976,6 @@ msgstr "Uporabljate %s, a ta vtičnik za
 msgstr "Uporabljate %s, a ta vtičnik zahteva %s."
 
 #: ../libpurple/plugin.c:380
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Ta vtičnik ni definiral vrednosti ID."
 
@@ -2718,12 +2995,8 @@ msgstr "Vtičnik ne vsebuje implementaci
 
 #: ../libpurple/plugin.c:547
 #, 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 vtičnik in poskusite "
-"znova."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "Zahtevani dodatek %s ni bil najden. Prosim, namestite vtičnik in poskusite znova."
 
 #: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
@@ -2751,15 +3024,15 @@ msgstr "Samodejno sprejmi"
 msgid "Autoaccept"
 msgstr "Samodejno sprejmi"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25
+#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Samodejno sprejmi zahtevo po prenosu datotek od izbranih uporabnikov."
 
 #: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr ""
-"Samodejno sprejeta zahteva po prenosu datoteke \"%s\" od \"%s\" zaključena."
+msgstr "Samodejno sprejeta zahteva po prenosu datoteke \"%s\" od \"%s\" zaključena."
 
 #: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
@@ -2778,16 +3051,20 @@ msgstr "_Shrani"
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/plugins/autoaccept.c:165
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1456
+#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2297
 #: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6222
+#: ../libpurple/protocols/oscar/oscar.c:6292
+#: ../libpurple/request.h:1388
 #: ../libpurple/request.h:1398
+#: ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "_Prekliči"
 
@@ -2825,12 +3102,12 @@ msgstr ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Obvesti s pojavnim oknom, ko je zaključen samodejno sprejeti prenos "
-"datoteke\n"
+"Obvesti s pojavnim oknom, ko je zaključen samodejno sprejeti prenos datoteke\n"
 "(le če ni pomenka s pošiljateljem)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46
+#: ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Notes"
 msgstr "Opombe"
 
@@ -2850,21 +3127,23 @@ msgstr "Uredi opombe ..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Opombe o prijatelju"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Shrani opombe o določenih prijateljih."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
+#: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
-"Doda možnost za shranjevanje zapiskov o prijateljih na seznamu prijateljev."
+msgstr "Doda možnost za shranjevanje zapiskov o prijateljih na seznamu prijateljev."
 
 #. *< type
 #. *< ui_requirement
@@ -2880,7 +3159,8 @@ msgstr "Preizkus cifer"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267
+#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Preveri cifre, ki so priložene libpurple."
 
@@ -2917,26 +3197,32 @@ msgstr "Nadzor iz datoteke"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251
+#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Omogoča nadzor nad programom z vnašanjem ukazov v datoteko."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "minut"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165
+#: ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225
+#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "NedejavniK"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Nastavi čas nedejavnosti"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Nastavi"
 
@@ -2944,7 +3230,8 @@ msgstr "Noben od vaših računov ni nede
 msgid "None of your accounts are idle."
 msgstr "Noben od vaših računov ni nedejaven."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200
+#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Odnastavi čas nedejavnosti"
 
@@ -2952,7 +3239,8 @@ msgstr "_Odnastavi"
 msgid "_Unset"
 msgstr "_Odnastavi"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226
+#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Nastavi čas nedejavnosti za vse račune"
 
@@ -2960,7 +3248,8 @@ msgstr "Odnastavi čas nedejavnosti za v
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Odnastavi čas nedejavnosti za vse nedejavne račune"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320
+#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Omogoča ročno nastavitev časa vaše odsotnosti"
 
@@ -2993,12 +3282,8 @@ msgstr "Preskusite vtičnik s podporo IP
 
 #. *  description
 #: ../libpurple/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 vtičnik s podporo IPC, kot odjemalec. Poišče strežniški vtičnik "
-"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 vtičnik s podporo IPC, kot odjemalec. Poišče strežniški vtičnik in kliče registrirane ukaze."
 
 #  *< api_version
 #  *< type
@@ -3030,8 +3315,7 @@ msgid "Test plugin IPC support, as a ser
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Preskusite vtičnik s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
+msgstr "Preskusite vtičnik s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
@@ -3064,123 +3348,123 @@ msgstr "Skrije odvečna sporočila o pri
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
-"Ta vtičnik skrije sporočila o pridruževanju in odhajanju v velikih sobah, "
-"razen za tiste uporabnike, ki aktivno sodelujejo v klepetu."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgstr "Ta vtičnik skrije sporočila o pridruževanju in odhajanju v velikih sobah, razen za tiste uporabnike, ki aktivno sodelujejo v klepetu."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Uporabnik ni na zvezi."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Samodejni odgovor poslan:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se je odjavil(a)."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Eno ali več sporočil ni mogoče dostaviti."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Povezava s strežnikom je bila prekinjena."
 
-#: ../libpurple/plugins/log_reader.c:1628
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"Trenutno niste povezani. Sporočil ne boste mogli prejemati, dokler se ne "
-"povežete."
+#: ../libpurple/plugins/log_reader.c:1605
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr "Trenutno niste povezani. Sporočil ne boste mogli prejemati, dokler se ne povežete."
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Sporočila ni mogoče poslati, saj je presežena največja dolžina."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Sporočila ni mogoče poslati."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Splošne nastavitve ogledovanja dnevnika"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Hitri izračuni velikosti"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Uporabi hevristiko imena"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Mapa dnevnika"
 
@@ -3190,33 +3474,27 @@ msgstr "Mapa dnevnika"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Ogledovalnik dnevnika"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
-"Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik "
-"dnevnika."
+msgstr "Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik dnevnika."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"Pri ogledovanju dnevnikov bo ta vtičnik vključil dnevnike drugih odjemalcev "
-"neposrednih sporočil. To trenutno obsega Adium, MSN Messenger in Trillian.\n"
+"Pri ogledovanju dnevnikov bo ta vtičnik vključil dnevnike drugih odjemalcev neposrednih sporočil. To trenutno obsega Adium, MSN Messenger in Trillian.\n"
 "\n"
-"OPOZORILO: Ta vtičnik je še vedno v fazi alfa in se lahko pogosto sesuje. "
-"Uporaba na lastno odgovornost!"
+"OPOZORILO: Ta vtičnik je še vedno v fazi alfa in se lahko pogosto sesuje. Uporaba na lastno odgovornost!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -3248,37 +3526,26 @@ msgstr "Prikazanemu sporočilu na začet
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr ""
-"Sporočilom na začetek doda prazno vrstico, tako da se preostanek sporočila v "
-"oknu pogovora izpiše pod pojavnim imenom."
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "Sporočilom na začetek doda prazno vrstico, tako da se preostanek sporočila v oknu pogovora izpiše pod pojavnim imenom."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Emulacija nepovezovalnega sporočila"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25
+#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Shrani sporočila, poslana neprijavljenemu uporabniku, kot opozorilo."
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"Preostanek sporočila bo shranjen kot opozorilo. Opozorilo lahko uredite/"
-"izbrišete s pogovornim oknom `Opozorilo prijatelja'."
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "Preostanek sporočila bo shranjen kot opozorilo. Opozorilo lahko uredite/izbrišete s pogovornim oknom `Opozorilo prijatelja'."
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"\"%s\" trenutno ni povezan. Želite shraniti preostanek sporočil v opozorilo "
-"in jih samodejno poslati, ko se \"%s\" znova prijavi?"
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" trenutno ni povezan. Želite shraniti preostanek sporočil v opozorilo in jih samodejno poslati, ko se \"%s\" znova prijavi?"
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
@@ -3286,30 +3553,33 @@ msgid "You can edit/delete the pounce fr
 
 #: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
-"Opozorilo lahko uredite/izbrišete v pogovornem oknu `Opozorila prijateljev'"
+msgstr "Opozorilo lahko uredite/izbrišete v pogovornem oknu `Opozorila prijateljev'"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:304
+#: ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Da"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114
+#: ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:305
+#: ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "Ne"
 
@@ -3334,7 +3604,8 @@ msgstr "Nalagalnik vtičnikov Perl"
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603
+#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Doda podporo nalaganja vtičnikov v programskem jeziku perl."
 
@@ -3347,12 +3618,8 @@ msgstr "Telepatski način za dohodne pog
 msgstr "Telepatski način za dohodne pogovore"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"Povzroči pojavitev pogovornih oken, ko vam začnejo drugi uporabniki "
-"sporočati. To deluje za AIM, ICQ, XMPP, Sametime in Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Povzroči pojavitev pogovornih oken, ko vam začnejo drugi uporabniki sporočati. To deluje za AIM, ICQ, XMPP, Sametime in Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -3407,13 +3674,14 @@ msgstr "Enostavni vtičnik"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40
+#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Preveri večino stvari, če delujejo."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Digitalna potrdila X.509"
 
@@ -3423,7 +3691,7 @@ msgstr "Digitalna potrdila X.509"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3431,8 +3699,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Omogoča podporo SSL preko GNUTLS."
 
@@ -3442,7 +3710,7 @@ msgstr "Omogoča podporo SSL preko GNUTL
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3450,8 +3718,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Omogoča podporo SSL preko Mozilla NSS."
 
@@ -3469,7 +3737,8 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97
+#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Omogoča ovojnico za knjižnice s podporo SSL."
 
@@ -3530,59 +3799,55 @@ msgstr "Obvestila o stanjih prijateljev"
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
+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."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Nalaganje vtičnikov Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425
+#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Omogoča podporo nalaganja vtičnikov Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"Namestitve ActiveTCL ni mogoče najti. Če želite uporabljati vtičnike TCL, "
-"namestite ActiveTCL z naslova http://www.activestate.com\n"
+#: ../libpurple/plugins/tcl/tcl.c:509
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "Namestitve ActiveTCL ni mogoče najti. Če želite uporabljati vtičnike TCL, namestite ActiveTCL z naslova http://www.activestate.com\n"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information."
+msgstr "Paketa orodij Apple Bonjour za Windows ni mogoče najti, oglejte si pogosto zastavljena vprašanja na naslovu: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging za več podrobnosti."
+
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:124
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Dohodnim povezavam IM ni mogoče prisluhniti\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"Povezave s krajevnim strežnikom mDNS ni mogoče vzpostaviti. Ali je strežnik "
-"sploh zagnan?"
+#: ../libpurple/protocols/bonjour/bonjour.c:149
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Povezave s krajevnim strežnikom mDNS ni mogoče vzpostaviti. Ali je strežnik sploh zagnan?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:670
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Ime"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:367
+#: ../libpurple/protocols/bonjour/bonjour.c:673
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Priimek"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:371
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3591,13 +3856,13 @@ msgstr "E-pošta"
 msgid "E-Mail"
 msgstr "E-pošta"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "Račun AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
 msgstr "Račun XMPP"
 
@@ -3611,16 +3876,16 @@ msgstr "Račun XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:481
+#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Vtičnik za protokol Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr "Vijolična oseba"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/bonjour/bonjour.c:676
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3634,55 +3899,57 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s je zaprl pomenek."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:439
+#: ../libpurple/protocols/bonjour/jabber.c:664
+#: ../libpurple/protocols/bonjour/jabber.c:682
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:587
 msgid "Cannot open socket"
 msgstr "Vtičnice ni mogoče odpreti"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:595
 msgid "Error setting socket options"
 msgstr "Napaka pri nastavljanju možnosti vtičnice"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:619
 msgid "Could not bind socket to port"
 msgstr "Povezava vtičnice z vrati ni uspela"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:627
 msgid "Could not listen on socket"
 msgstr "Poslušanje vtičnice ni možno"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Neveljavne proxy nastavitve"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
-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."
+#: ../libpurple/protocols/gg/gg.c:77
+#: ../libpurple/proxy.c:1845
+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."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Napaka žetona"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116
+#: ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Ni mogoče prenesti žetona.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269
+#: ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
@@ -3690,7 +3957,8 @@ msgstr "Seznam prijateljev je prazen, v 
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Seznam prijateljev je prazen, v datoteko ni bilo nič zapisanega."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276
+#: ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Ni mogoče odpreti datoteke"
 
@@ -3698,7 +3966,8 @@ msgstr "Seznam prijateljev je bil uspeš
 msgid "Buddylist saved successfully!"
 msgstr "Seznam prijateljev je bil uspešno shranjen!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307
+#: ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Seznama prijateljev ni mogoče naložiti"
 
@@ -3734,26 +4003,31 @@ msgstr "Registracija je uspela!"
 msgid "Registration completed successfully!"
 msgstr "Registracija je uspela!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:482
+#: ../libpurple/protocols/gg/gg.c:775
 #: ../libpurple/protocols/jabber/jabber.c:913
 #: ../libpurple/protocols/jabber/jabber.c:916
 #: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Geslo"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:487
+#: ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Geslo (ponovno vtipkajte)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:492
+#: ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Vnesite trenutni žeton"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Trenutni žeton"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrirajte nov račun za Gadu-Gadu"
 
@@ -3761,11 +4035,12 @@ msgstr "Prosimo, izpolnite naslednja pol
 msgid "Please, fill in the following fields"
 msgstr "Prosimo, izpolnite naslednja polja"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Kraj"
@@ -3774,12 +4049,15 @@ msgstr "Leto rojstva"
 msgid "Year of birth"
 msgstr "Leto rojstva"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:650
+#: ../libpurple/protocols/msn/msn.c:1695
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232
+#: ../libpurple/protocols/qq/qq.c:236
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Spol"
@@ -3789,14 +4067,14 @@ msgstr "Moški ali ženska"
 msgstr "Moški ali ženska"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Moški"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3806,7 +4084,8 @@ msgstr "Le prisoten"
 msgid "Only online"
 msgstr "Le prisoten"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Poišči prijatelje"
 
@@ -3842,7 +4121,8 @@ msgstr "Vnesite svoje obstoječe in novo
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Vnesite svoje obstoječe in novo geslo za UIN:"
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:799
+#: ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Spremeni geslo Gadu-Gadu"
 
@@ -3851,76 +4131,92 @@ msgstr "Izberite klepet za prijatelja: %
 msgid "Select a chat for buddy: %s"
 msgstr "Izberite klepet za prijatelja: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/oscar/oscar.c:5659
+#: ../libpurple/protocols/qq/qq.c:170
+#: ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/yahoo/yahoo.c:3101
+#: ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3640
+#: ../pidgin/gtkdocklet.c:561
+#: ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Brez povezave"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/msn/state.c:29
+#: ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37
+#: ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3103
+#: ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Na voljo"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1014
+#: ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/oscar/oscar.c:4562
+#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/qq/qq.c:180
+#: ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729
+#: ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549
+#: ../pidgin/gtkprefs.c:1941
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "Odsoten"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1043
+#: ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2714
+#: ../libpurple/protocols/oscar/oscar.c:3714
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1046
+#: ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Ime"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1059
+#: ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Leto rojstva"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1111
+#: ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3926
 msgid "Unable to display the search results."
 msgstr "Rezultatov iskanja ni mogoče izpisati."
 
@@ -3940,7 +4236,8 @@ msgstr "Noben uporabnik ne ustreza iskal
 msgid "There are no users matching your search criteria."
 msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1310
+#: ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Ne morem brati vtičnice"
 
@@ -3960,11 +4257,13 @@ msgstr "Seznam prijateljev je bil shranj
 msgid "Your buddy list was stored on the server."
 msgstr "Seznam prijateljev je bil shranjen na strežniku."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1509
+#: ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Povezava ni uspela."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1621
+#: ../libpurple/protocols/msn/msn.c:622
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
@@ -4100,9 +4399,11 @@ msgstr "MOTD za %s"
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:127
+#: ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:612
+#: ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2361
 msgid "Server has disconnected"
 msgstr "Strežnik ni več povezan"
 
@@ -4110,13 +4411,15 @@ msgstr "Ogled MOTD"
 msgid "View MOTD"
 msgstr "Ogled MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261
+#: ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/jabber/chat.c:59
+#: ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Geslo:"
 
@@ -4128,15 +4431,16 @@ msgstr "IRC vzdevki ne smejo vsebovati p
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/msn/session.c:386
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/simple/simple.c:1732
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:1621
+#: ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Povezovanje"
 
@@ -4149,20 +4453,21 @@ msgstr "Podpora SSL ni na voljo"
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/simple/simple.c:465
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "Couldn't create socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "Povezava do gostitelja ni uspela"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/irc/irc.c:609
+#: ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Read error"
 msgstr "Napaka pri branju"
 
@@ -4201,23 +4506,25 @@ msgstr "Vtičnik za protokol IRC, ki je 
 msgstr "Vtičnik za protokol IRC, ki je manj beden"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/irc/irc.c:940
+#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:6726
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:1919
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Strežnik"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943
+#: ../libpurple/protocols/msn/msn.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:6729
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4230,7 +4537,8 @@ msgstr "Kodiranje znakov"
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/irc.c:949
+#: ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:904
 #: ../libpurple/protocols/jabber/jabber.c:907
 #: ../libpurple/protocols/silc/buddy.c:1539
@@ -4248,7 +4556,8 @@ msgstr "Uporabniško ime"
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952
+#: ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -4289,7 +4598,7 @@ msgstr " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3715
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4388,81 +4697,75 @@ msgstr "Samo na povabilo"
 msgid "Invitation only"
 msgstr "Samo na povabilo"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Brcnil vas je %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Brcnil vas je %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "način (%s %s) nastavil %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Neveljaven vzdevek"
 
-#: ../libpurple/protocols/irc/msgs.c:910
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Vaš izbrani vzdevek je strežnik zavrnil. Najverjetneje vsebuje neveljavne "
-"znake."
+#: ../libpurple/protocols/irc/msgs.c:913
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "Vaš izbrani vzdevek je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
 
-#: ../libpurple/protocols/irc/msgs.c:915
-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."
+#: ../libpurple/protocols/irc/msgs.c:918
+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."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "Vzdevka ne morem spremeniti"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Vzdevka ni bilo mogoče spremeniti"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Zapustili ste kanal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Napaka: Neveljaven PONG odgovor strežnika"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor - Zakasnitev: %lu sekund"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Ne morete se pridružiti k %s: Potrebna je registracija."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne morem se pridružiti kanalu"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nadimek ali kanal je trenutno nedostopen."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Močni udarci od %s"
@@ -4472,74 +4775,40 @@ msgstr "dejanje &lt;dejanje za izvedbo&g
 msgstr "dejanje &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
 #: ../libpurple/protocols/irc/parse.c:123
-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."
 
 #: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:  pošlji ukaz chanservu"
 
 #: ../libpurple/protocols/irc/parse.c:125
-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."
 
 #: ../libpurple/protocols/irc/parse.c:126
-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."
 
 #: ../libpurple/protocols/irc/parse.c:127
-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."
 
 #: ../libpurple/protocols/irc/parse.c:128
-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."
 
 #: ../libpurple/protocols/irc/parse.c:129
-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."
 
 #: ../libpurple/protocols/irc/parse.c:130
-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."
 
 #: ../libpurple/protocols/irc/parse.c:131
-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>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4550,27 +4819,19 @@ msgstr "memoserv:  Pošlji ukaz memoserv
 msgstr "memoserv:  Pošlji ukaz memoservu"
 
 #: ../libpurple/protocols/irc/parse.c:134
-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."
 
 #: ../libpurple/protocols/irc/parse.c:135
-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)."
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite vaš vzdevek."
 
@@ -4579,65 +4840,40 @@ msgstr "nickserv:  pošlji ukaz nickserv
 msgstr "nickserv:  pošlji ukaz nickservu"
 
 #: ../libpurple/protocols/irc/parse.c:139
-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."
 
 #: ../libpurple/protocols/irc/parse.c:140
-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."
 
 #: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:  pošlji ukaz operservu"
 
 #: ../libpurple/protocols/irc/parse.c:142
-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."
 
 #: ../libpurple/protocols/irc/parse.c:143
-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)."
 
 #: ../libpurple/protocols/irc/parse.c:144
-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)."
 
 #: ../libpurple/protocols/irc/parse.c:145
 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."
 
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Pošlji surov ukaz strežniku."
 
 #: ../libpurple/protocols/irc/parse.c:147
-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."
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
@@ -4649,28 +4885,19 @@ msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 
 
 #: ../libpurple/protocols/irc/parse.c:150
 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."
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [vzdevek]: pošlji zahtevo CTCP VERSION uporabniku"
 
 #: ../libpurple/protocols/irc/parse.c:152
-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."
 
 #: ../libpurple/protocols/irc/parse.c:153
-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."
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -4678,25 +4905,26 @@ msgid "whowas &lt;nick&gt;: Get informat
 
 #: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
-"whois &lt;vzdevek&gt;:  Dobi več informacij o uporabniku, ki se je odjavil."
+msgstr "whois &lt;vzdevek&gt;:  Dobi več informacij o uporabniku, ki se je odjavil."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "ÄŒas odgovora od %s: %lu sekund"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "CTCP PING ogdovor"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:632
+#: ../libpurple/protocols/irc/parse.c:636
+#: ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694
+#: ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Povezava prekinjena."
@@ -4713,29 +4941,23 @@ msgstr "Improvizirani ukaz ni uspel"
 msgid "Ad-Hoc Command Failed"
 msgstr "Improvizirani ukaz ni uspel"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
 msgid "execute"
 msgstr "izvedi"
 
 #: ../libpurple/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."
 
 #: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
+msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
 
 #: ../libpurple/protocols/jabber/auth.c:319
 #: ../libpurple/protocols/jabber/auth.c:508
 #, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
-msgstr ""
-"%s zahteva overovitev z navadnim besedilom preko nešifrirane povezave. Se "
-"strinjate s tem in želite nadaljevati z overovitvijo?"
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "%s zahteva overovitev z navadnim besedilom preko nešifrirane povezave. Se strinjate s tem in želite nadaljevati z overovitvijo?"
 
 #: ../libpurple/protocols/jabber/auth.c:321
 #: ../libpurple/protocols/jabber/auth.c:322
@@ -4764,12 +4986,8 @@ msgstr "Neveljaven odgovor strežnika."
 msgstr "Neveljaven odgovor strežnika."
 
 #: ../libpurple/protocols/jabber/auth.c:600
-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?"
+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?"
 
 #: ../libpurple/protocols/jabber/auth.c:797
 #: ../libpurple/protocols/jabber/auth.c:820
@@ -4860,15 +5078,16 @@ msgstr "Funkcija"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/oscar/oscar.c:3764
 msgid "Birthday"
 msgstr "Rojstni dan"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../libpurple/protocols/jabber/usermood.c:193
+#: ../pidgin/gtkblist.c:3314
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Opis"
@@ -4879,9 +5098,7 @@ msgstr "Uredi vCard za XMPP"
 msgstr "Uredi vCard za XMPP"
 
 #: ../libpurple/protocols/jabber/buddy.c:724
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
+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."
 
 #: ../libpurple/protocols/jabber/buddy.c:795
@@ -5151,7 +5368,7 @@ msgstr "Preveri hop"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
@@ -5178,8 +5395,8 @@ msgstr "Drugo ime"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5198,112 +5415,107 @@ msgstr "Logotip"
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
 msgstr "Prijavi se"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
 msgstr "Odjavi se"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2038
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5863
 #: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3726
 msgid "Last Name"
 msgstr "Priimek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "To so rezultati vašega iskanja"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja "
-"dovoljujejo iskanje z nadomestnimi znaki (%)."
+#: ../libpurple/protocols/jabber/buddy.c:2322
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja dovoljujejo iskanje z nadomestnimi znaki (%)."
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "Povpraševanje po imeniku ni uspelo"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "Povpraševanje na strežniku z imenikom ni uspelo."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Ukazi strežniku: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Izpolnite eno ali več polj za iskanje uporabnikov XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "E-Mail Address"
 msgstr "E-naslov"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "Poišči uporabnike XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5315,24 +5527,24 @@ msgstr "Išči"
 msgid "Search"
 msgstr "Išči"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "Neveljaven imenik"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "Vnesite imenik uporabnikov"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "Izberite imenik za iskanje"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "Imenik iskanja"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5347
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Soba:"
@@ -5443,9 +5655,9 @@ msgstr "Napaka pri branju"
 msgstr "Napaka pri branju"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5508,8 +5720,8 @@ msgstr "Že registriran"
 msgstr "Že registriran"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "State"
 msgstr "Zvezna država"
 
@@ -5536,10 +5748,8 @@ msgstr "Odregistriraj se"
 msgstr "Odregistriraj se"
 
 #: ../libpurple/protocols/jabber/jabber.c:994
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr ""
-"Za spremembo registracije svojega računa morate izpolniti spodnja polja."
+msgid "Please fill out the information below to change your account registration."
+msgstr "Za spremembo registracije svojega računa morate izpolniti spodnja polja."
 
 #: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
@@ -5588,7 +5798,7 @@ msgstr "Inicializacija SSL/TLS"
 msgstr "Inicializacija SSL/TLS"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Authenticating"
 msgstr "Overovljanje"
 
@@ -5601,7 +5811,7 @@ msgstr "Ponovna inicializacija toka"
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5657
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
@@ -5642,7 +5852,7 @@ msgstr "Naročilo"
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/jabber/jabber.c:1602
 #: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1212
 #: ../libpurple/protocols/silc10/buddy.c:1557
@@ -5765,7 +5975,7 @@ msgstr "Vnesite svoje novo geslo"
 msgstr "Vnesite svoje novo geslo"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6443
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5773,7 +5983,7 @@ msgstr "Nastavi informacije o uporabniku
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6454
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6019,87 +6229,94 @@ msgstr "Uporabnika %s ni mogoče pingnit
 msgid "Unable to ping user %s"
 msgstr "Uporabnika %s ni mogoče pingniti"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2203
+#: ../libpurple/protocols/jabber/jabber.c:2214
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Ni mogoče stresti, saj o uporabniku %s ni ničesar znanega."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "Ni mogoče stresti, saj je uporabnik %s morda nepovezan."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
+#: ../libpurple/protocols/jabber/jabber.c:2240
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Uporabnika %s ni mogoče stresti, ker tega dejanja ne podpira."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2262
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgid "Buzz"
+msgstr "Tresljaj"
+
+#: ../libpurple/protocols/jabber/jabber.c:2263
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "Uporabnik %s vas je stresel."
+
+#: ../libpurple/protocols/jabber/jabber.c:2264
+#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Stresanje uporabnika %s ..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2296
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2320
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
-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|skrbnik|član|izločenec|nihče&gt;: "
-"Nastavitev uporabnikovega statusa v sobi."
+#: ../libpurple/protocols/jabber/jabber.c:2332
+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|skrbnik|član|izločenec|nihče&gt;: Nastavitev uporabnikovega statusa v sobi."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: "
-"Nastavitev uporabnikove vloge v sobi."
+#: ../libpurple/protocols/jabber/jabber.c:2338
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: Nastavitev uporabnikove vloge v sobi."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2350
 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."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
-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."
+#: ../libpurple/protocols/jabber/jabber.c:2361
+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."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPingni uporabnika/komponento/strežnik."
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stresite prijatelja, da vas bo opazil"
 
@@ -6119,7 +6336,8 @@ msgstr "Vtičnik za protokol XMPP"
 msgstr "Vtičnik za protokol XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domena"
 
@@ -6136,8 +6354,8 @@ msgstr "Dovoli overovitev z navadnim bes
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/myspace/myspace.c:3283
+#: ../libpurple/protocols/simple/simple.c:1925
 msgid "Connect port"
 msgstr "Poveži vrata"
 
@@ -6145,9 +6363,10 @@ msgstr "Poveži vrata"
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/myspace/myspace.c:3280
 #: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/silc10/silc.c:1857
+#: ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Poveži se na strežnik"
 
@@ -6180,12 +6399,6 @@ msgstr "Napaka sporočila XMPP"
 msgid "XMPP Message Error"
 msgstr "Napaka sporočila XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, c-format
-msgid "%s has buzzed you!"
-msgstr "Uporabnik %s vas je stresel."
-
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6195,37 +6408,33 @@ msgstr "Napaka pri razčlenjevanu XML"
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:423
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
-#: ../libpurple/protocols/jabber/presence.c:510
-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?"
+#: ../libpurple/protocols/jabber/presence.c:506
+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?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Configure Room"
 msgstr "_Nastavi sobo"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:513
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "Napaka v pomenku %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
@@ -6233,8 +6442,7 @@ msgid "Unable to send file to %s, user d
 #: ../libpurple/protocols/jabber/si.c:775
 #, 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"
+msgstr "Ni mogoče poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
 
 #: ../libpurple/protocols/jabber/si.c:776
 #: ../libpurple/protocols/jabber/si.c:777
@@ -6255,9 +6463,7 @@ msgid "Unable to send file to %s, not su
 #: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
-"Datoteke %s ni mogoče poslati, ker nimate dostopa do stanja uporabnikove "
-"prisotnosti"
+msgstr "Datoteke %s ni mogoče poslati, ker nimate dostopa do stanja uporabnikove prisotnosti"
 
 #: ../libpurple/protocols/jabber/si.c:857
 #, c-format
@@ -6268,21 +6474,21 @@ msgstr "Izberite vir"
 msgid "Select a Resource"
 msgstr "Izberite vir"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr "Uredi razpoloženje uporabnika"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr "Izberite svoje razpoloženje s seznama."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Nastavi"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr "Nastavi razpoloženje ..."
 
@@ -6295,14 +6501,10 @@ msgstr "Prosimo, vnesite svoj nov vzdeve
 msgstr "Prosimo, vnesite svoj nov vzdevek."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-"Ti podatki so vidni vsem stikom s seznama prijateljev, zato izberite nekaj "
-"primernega."
+msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgstr "Ti podatki so vidni vsem stikom s seznama prijateljev, zato izberite nekaj primernega."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Nastavi vzdevek ..."
 
@@ -6314,299 +6516,247 @@ msgstr "Izberi dejanje"
 msgid "Select an action"
 msgstr "Izberi dejanje"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:163
+msgid "Unable to connect to contact server"
+msgstr "Povezava s strežnikom stikov ni uspela."
+
+#: ../libpurple/protocols/msn/contact.c:923
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Adresarja MSN ni mogoče pridobiti."
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Težava ujemanja (sinhronizacije) seznama prijateljev pri %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, 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?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, 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?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr "Ni mogoče razčleniti sporočila"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Skladenjska napaka (verjetno hrošč v odjemalcu)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
 msgid "Invalid e-mail address"
 msgstr "Neveljaven naslov e-pošte"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr "Uporabnik ne obstaja"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manjka povsem veljavno ime domene"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
 msgid "Already logged in"
 msgstr "Že prijavljeni"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr "Neveljavno pojavno ime"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Neveljavno prijateljsko ime"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "List full"
 msgstr "Seznam poln"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
 msgid "Already there"
 msgstr "Že tam"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr "Ni na seznamu"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "Uporabnik ni na zvezi"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
 msgid "Already in the mode"
 msgstr "Že v stanju"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr "Že na sogovornikovem seznamu"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr "Preveč skupin"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "Invalid group"
 msgstr "Neveljavna skupina"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr "Uporabnik ni v skupini"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr "Predolgo ime skupine"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ni mogoče odstraniti skupine nič"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Uporabnika ste želeli dodati v skupino, ki ne obstaja"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
 msgid "Switchboard failed"
 msgstr "Stikalna plošča ni uspela"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Prenos obvestila ni uspel"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr "Obvezna polja niso bila izpolnjena"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Preveč zadetkov za FND"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Storitev trenutno ni na voljo"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr "Napaka v podatkovni bazi strežnika"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
 msgid "Command disabled"
 msgstr "Ukaz onemogočen"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
 msgid "File operation error"
 msgstr "Napaka pri operaciji z datoteko"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
 msgid "Memory allocation error"
 msgstr "Napaka ob rezervaciji pomnilnika"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Strežniku je bila poslana napačna vrednost CHL"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
 msgid "Server busy"
 msgstr "Strežnik je zaposlen"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
 msgid "Server unavailable"
 msgstr "Strežnik je nedostopen"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
 msgid "Peer notification server down"
 msgstr "Strežnik za obveščanje vrstnikov je nedelujoč"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
 msgid "Database connect error"
 msgstr "Napaka pri povezavi v podatkovno bazo"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Strežnik se zaustavlja (skočite iz ladje!)"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
 msgid "Error creating connection"
 msgstr "Napaka pri ustvarjanju povezave"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameter je bodisi neznan ali nedovoljen"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
 msgid "Unable to write"
 msgstr "Ni bilo mogoče pisati"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr "Preobremenitev seje"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr "Uporabnik je preveč aktiven"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr "Preveč sej"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr "Potni list ni preverjen"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr "Neveljavna datoteka s prijatelji"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr "Nepričakovano"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Prijateljsko ime se spreminja preveč pogosto"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
 msgid "Server too busy"
 msgstr "Strežnik preveč zaposlen"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/oscar/oscar.c:1383
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "Overovitev ni uspela"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Ni dovoljeno brez povezave"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
 msgid "Not accepting new users"
 msgstr "Brez sprejemanja novih uporabnikov"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Otroški potni list brez privolitve staršev"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Račun še ni bil potrjen"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr "Napačna vstopnica"
 
@@ -6638,371 +6788,375 @@ msgstr "Vaše novo MSN poimenovanje je p
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN poimenovanje je predolgo."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "Set your friendly name."
 msgstr "Nastavite vaše poimenovanje."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "To je ime, pod katerim vas bodo videli vaši MSN prijatelji."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Set your home phone number."
 msgstr "Nastavite številko vašega domačega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Set your work phone number."
 msgstr "Nastavite številko vašega službenega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339
 msgid "Set your mobile phone number."
 msgstr "Nastavite številko vašega mobilnega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354
 msgid "Allow MSN Mobile pages?"
 msgstr "Dovoli MSN strani za mobilnike?"
 
-#: ../libpurple/protocols/msn/msn.c:351
-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?"
+#: ../libpurple/protocols/msn/msn.c:355
+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?"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Allow"
 msgstr "Dovoli"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362
 msgid "Disallow"
 msgstr "Prepovej"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378
 msgid "This Hotmail account may not be active."
 msgstr "Ta račun Hotmail morda ni aktiven."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404
 msgid "Send a mobile message."
 msgstr "Pošlji sporočilo na mobilnik."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406
 msgid "Page"
 msgstr "Stran/Poziv"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Vas ima med prijatelji"
+#: ../libpurple/protocols/msn/msn.c:611
+#: ../libpurple/protocols/msn/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:657
+#: ../libpurple/protocols/msn/msn.c:663
+#: ../libpurple/protocols/msn/msn.c:669
+msgid "Current media"
+msgstr "Trenutni medij"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:648
+#: ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Pridem precej nazaj"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Zaposlen"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Na telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Na kosilu"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "Set Friendly Name..."
 msgstr "Nastavi poimenovanje ..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:703
 msgid "Set Home Phone Number..."
 msgstr "Nastavi št. domačega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:707
 msgid "Set Work Phone Number..."
 msgstr "Nastavi št. službenega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:711
 msgid "Set Mobile Phone Number..."
 msgstr "Nastavi Å¡t. mobilnega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:717
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Omogoči/onemogoči mobilne naprave ..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:722
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Dovoli/prepovej mobilne strani ..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:733
 msgid "Open Hotmail Inbox"
 msgstr "Odpri prispelo pošto Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:757
 msgid "Send to Mobile"
 msgstr "Pošlji na mobilca"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:767
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Začni _pogovor"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:805
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL."
+msgstr "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL."
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:833
 msgid "Failed to connect to server."
 msgstr "Povezava na strežnik neuspešna."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1964
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1687
+#: ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Splošno"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1694
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Starost"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1696
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Lokacija"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1702
+#: ../libpurple/protocols/msn/msn.c:1894
+#: ../libpurple/protocols/msn/msn.c:1900
+#: ../libpurple/protocols/msn/msn.c:1907
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1849
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1725
 msgid "Social"
 msgstr "Družabno"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1727
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1728
 msgid "Interests"
 msgstr "Zanimanja"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Pets"
 msgstr "Domači ljubljenčki"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1730
 msgid "Hometown"
 msgstr "Domači kraj"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1731
 msgid "Places Lived"
 msgstr "Dosedanji kraji bivanja"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Music"
 msgstr "Glasba"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1916
+#: ../libpurple/protocols/msn/msn.c:1922
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Najljubši citat"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1752
 msgid "Contact Info"
 msgstr "Podatki o stiku"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1753
 msgid "Personal"
 msgstr "Zasebno"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Significant Other"
 msgstr "Boljša polovica"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Home Phone"
 msgstr "Domači telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1758
 msgid "Home Phone 2"
 msgstr "Domači telefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Personal Mobile"
 msgstr "Osebni mobilni tel."
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Personal E-Mail"
 msgstr "Osebni e-naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1763
 msgid "Personal IM"
 msgstr "Osebni IM"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Anniversary"
 msgstr "Obletnica"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1781
 msgid "Work"
 msgstr "Službeno"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Naziv službe"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Company"
 msgstr "Podjetje"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Oddelek"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid "Profession"
 msgstr "Poklic"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1787
 msgid "Work Phone"
 msgstr "Službeni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1788
 msgid "Work Phone 2"
 msgstr "Službeni telefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Address"
 msgstr "Službeni naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Work Mobile"
 msgstr "Službeni mobilni tel."
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work Pager"
 msgstr "Službeni pager"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Fax"
 msgstr "Službeni faks"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Work E-Mail"
 msgstr "Službeni e-naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Work IM"
 msgstr "Službeni IM"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Start Date"
 msgstr "Datum pričetka"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1865
+#: ../libpurple/protocols/msn/msn.c:1871
+#: ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/msn/msn.c:1885
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1930
 msgid "Last Updated"
 msgstr "Nazadnje osveženo"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1941
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Domača stran"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1965
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: ../libpurple/protocols/msn/msn.c:1860
-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."
+#: ../libpurple/protocols/msn/msn.c:1966
+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."
 
-#: ../libpurple/protocols/msn/msn.c:1864
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
-msgstr ""
-"V uporabnikovem profilu ni mogoče najti nobenih informacij. Uporabnik "
-"verjetno ne obstaja."
+#: ../libpurple/protocols/msn/msn.c:1970
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgstr "V uporabnikovem profilu ni mogoče najti nobenih informacij. Uporabnik verjetno ne obstaja."
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:1978
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL profila"
@@ -7017,12 +7171,12 @@ msgstr "URL profila"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "Vtičnik za protokol AIM"
+#: ../libpurple/protocols/msn/msn.c:2265
+#: ../libpurple/protocols/msn/msn.c:2267
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Vtičnik za protokol Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2302
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
@@ -7033,128 +7187,144 @@ msgstr "Uporabi metodo HTTP"
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/protocols/msn/msn.c:2199
+#: ../libpurple/protocols/msn/msn.c:2307
 msgid "HTTP Method Server"
 msgstr "Strežnik metode HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2312
 msgid "Show custom smileys"
 msgstr "Pokaži smeške po meri ..."
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2320
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Ni se mogoče povezati"
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Overjanje Windows Live ID: Povezava ni mogoča"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:272
+msgid "Windows Live ID authentication Failed"
+msgstr "Overovitev Windows Live ID ni uspela"
+
+#: ../libpurple/protocols/msn/notification.c:185
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ni veljavna skupina."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:371
 msgid "Unknown error."
 msgstr "Neznana napaka."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s na %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "Uporabnik %s vam je ravnokar pomežiknil!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Neznana napaka (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Ni mogoče dodati uporabnika"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Uporabnika ni mogoče dodati na %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Ni mogoče blokirati uporabnika %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Uporabniku ni mogoče dovoliti na %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s ni mogoče dodati, saj je vaš seznam prijateljev poln."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ni veljaven račun potnega lista."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
 msgid "Service Temporarily Unavailable."
 msgstr "Storitev je trenutno nedosegljiva."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
 msgid "Unable to rename group"
 msgstr "Skupine ni mogoče preimenovati"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
 msgid "Unable to delete group"
 msgstr "Skupine ni mogoče izbrisati"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1934
 #, 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"
+"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."
 
+#: ../libpurple/protocols/msn/oim.c:142
+msgid "Unable to connect to OIM server"
+msgstr "Povezava s strežnikom OIM ni uspela."
+
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Ni se mogoče povezati"
+
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Napaka pri pisanju"
@@ -7172,60 +7342,56 @@ msgstr ""
 "Napaka povezave s strežnika %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:338
 msgid "Our protocol is not supported by the server."
 msgstr "Strežnik ne podpira tega protokola."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:342
 msgid "Error parsing HTTP."
 msgstr "Napaka pri parsanju HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:351
 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."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:356
 msgid "The MSN servers are going down temporarily."
 msgstr "Strežniki MSN se bodo začasno zaustavili."
 
 #  Data is assumed to be the destination sn
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:361
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ni možno overoviti: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
-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."
+#: ../libpurple/protocols/msn/session.c:366
+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."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Handshaking"
 msgstr "Rokovanje"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Starting authentication"
 msgstr "Pričetek overovitve"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Getting cookie"
 msgstr "Pridobivanje piškotka"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:393
 msgid "Sending cookie"
 msgstr "Pošljanje piškotka"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:394
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
@@ -7241,61 +7407,57 @@ msgstr "Na kosilu"
 msgid "Out To Lunch"
 msgstr "Na kosilu"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
 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:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Sporočila ni mogoče poslati, saj ni dovoljeno v nevidnem stanju:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
 msgid "Message could not be sent because the user is offline:"
 msgstr "Sporočila ni mogoče poslati, saj uporabnik ni na zvezi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Sporočilo ni bilo poslano, ker je prišlo do napake v povezavi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Sporočila ni mogoče poslati, saj je poslano prehitro:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-"Sporočila ni mogoče poslati, ker ni bilo mogoče vzpostaviti seje s "
-"strežnikom. To je najverjetneje težava strežnika, poskusite znova v nekaj "
-"minutah:"
+#: ../libpurple/protocols/msn/switchboard.c:422
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgstr "Sporočila ni mogoče poslati, ker ni bilo mogoče vzpostaviti seje s strežnikom. To je najverjetneje težava strežnika, poskusite znova v nekaj minutah:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+#: ../libpurple/protocols/msn/switchboard.c:429
+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:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do neznane napake:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s vas je dodal(a) na svoj seznam prijateljev."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ni bilo mogoče dodati."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "Navedeno pojavno ime ni veljavno."
 
@@ -7308,216 +7470,200 @@ msgstr "Cifre RC4 ni mogoče najti"
 msgstr "Cifre RC4 ni mogoče najti"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Nadgradite libpurple za podporo RC4 (>= 2.0.1). Vtičnik MySpaceIM se ne bo "
-"naložil."
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "Nadgradite libpurple za podporo RC4 (>= 2.0.1). Vtičnik MySpaceIM se ne bo naložil."
 
 #: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
+msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
 msgstr "Žal MySpace ne podpira gesel, daljših od %d znakov (vaše jih ima %d)."
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1810
 msgid "MySpaceIM Error"
 msgstr "Napaka MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:350
 msgid "Reading challenge"
 msgstr "Branje izziva"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:356
 msgid "Unexpected challenge length from server"
 msgstr "Nepričakovana dolžina izziva strežnika"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Logging in"
 msgstr "Prijavljanje"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1293
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
-"Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih podatkov)"
+msgstr "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih podatkov)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1335
 msgid "New mail messages"
 msgstr "Nova prejeta sporočila"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1336
 msgid "New blog comments"
 msgstr "Novi komentarji na blogu"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1337
 msgid "New profile comments"
 msgstr "Novi komentarji profila"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1338
 msgid "New friend requests!"
 msgstr "Nove zahteve prijateljev!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New picture comments"
 msgstr "Novi komentarji slike"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "MySpace"
 msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
+#: ../libpurple/protocols/myspace/myspace.c:1550
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../libpurple/protocols/myspace/myspace.c:1561
+#: ../libpurple/protocols/myspace/myspace.c:1563
 msgid "No username set"
 msgstr "Uporabniško ime ni določeno"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-"Obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username in izberite uporabniško ime ter se znova poskusite prijaviti."
+#: ../libpurple/protocols/myspace/myspace.c:1562
+msgid "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."
+msgstr "Obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile.username in izberite uporabniško ime ter se znova poskusite prijaviti."
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1789
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Napaka protokola, koda %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:1981
+#: ../libpurple/protocols/myspace/myspace.c:2015
 msgid "Failed to add buddy"
 msgstr "Prijatelja ni bilo mogoče dodati"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:1981
 msgid "'addbuddy' command failed."
 msgstr "Ukaz 'addbuddy' ni uspel."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2015
+#: ../libpurple/protocols/myspace/myspace.c:2252
 msgid "persist command failed"
 msgstr "ukaz persist ni uspel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2120
 #, c-format
 msgid "No such user: %s"
 msgstr "Uporabnik ne obstaja: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2121
 msgid "User lookup"
 msgstr "Ogled uporabnika"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "Failed to remove buddy"
 msgstr "Prijatelja ni bilo mogoče odstraniti"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2233
 msgid "'delbuddy' command failed"
 msgstr "ukaz 'delbuddy' ni uspel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "blocklist command failed"
 msgstr "ukaz blocklist ni uspel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2320
 msgid "Invalid input condition"
 msgstr "Neveljaven vnosni pogoj"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2369
 msgid "Read buffer full"
 msgstr "Bralni predpomnilnik je poln"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2407
 msgid "Unparseable message"
 msgstr "Sporočila ni mogoče razčleniti"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2476
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2647
 msgid "IM Friends"
 msgstr "Prijatelji za klepet"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2747
 #, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr ""
-"%d prijateljev je bilo dodanih ali posodobljenih s strežnika (vključno s "
-"prijatelji, ki so že strežniškem seznamu)"
+msgid "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr "%d prijateljev je bilo dodanih ali posodobljenih s strežnika (vključno s prijatelji, ki so že strežniškem seznamu)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2748
 msgid "Add contacts from server"
 msgstr "Dodaj stike s strežnika"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2800
+#: ../libpurple/protocols/myspace/myspace.c:2865
 msgid "Add friends from MySpace.com"
 msgstr "Dodaj prijatelje z MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2801
 msgid "Importing friends failed"
 msgstr "Uvoz prijateljev ni uspel"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2857
 msgid "Find people..."
 msgstr "Poišči prijatelje ..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2860
 msgid "Change IM name..."
 msgstr "Spremeni pojavno ime ..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3162
 msgid "myim URL handler"
 msgstr "Upravljač za URL-je \"myim\""
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3163
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
-"Za odpiranje tega URL-ja myim ni mogoče najti ustreznega računa MySpaceIM."
+msgstr "Za odpiranje tega URL-ja myim ni mogoče najti ustreznega računa MySpaceIM."
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3164
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Omogoči pravi račun MySpaceIM in poskusi znova."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3287
 msgid "Show display name in status text"
 msgstr "Pokaži zaslonsko ime v besedilu stanja"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3290
 msgid "Show headline in status text"
 msgstr "Pokaži naslov v besedilu stanja"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3295
 msgid "Send emoticons"
 msgstr "Pošlji smejčke"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3300
 msgid "Screen resolution (dots per inch)"
 msgstr "Ločljivost zaslona (točk na palec)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3303
 msgid "Base font size (points)"
 msgstr "Osnovna velikost pisave (točke)"
 
@@ -7527,168 +7673,191 @@ msgstr "Uporabnik"
 msgid "User"
 msgstr "Uporabnik"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2979
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
 msgstr "Naslov"
 
-#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
 msgstr "Skladba"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr "Skupno prijateljev"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
 msgstr "Različica odjemalca"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
 msgstr "Usekaj"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "%s has zapped you!"
 msgstr "Uporabnik %s vas je usekal!"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
 msgstr "Uporabnik %s bo ravnokar usekan ..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
 msgstr "Pribij"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s vas je pribil(a)!"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
 msgstr "Pribijanje uporabnika %s ..."
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
 msgstr "Zažgi"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "Uporabnik %s vas je zažgal!"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Zažiganje uporabnika %s ..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "Cmokni"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "%s has smooched you!"
 msgstr "Uporabnik %s vas je cmoknil!"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr "Cmokanje uporabnika %s ..."
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
 msgstr "Objemi"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s vas je objel(a)!"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
 msgstr "Objemanje uporabnika %s ..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
 msgstr "Klofuta"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s vas je klofnil(a)!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
 msgstr "Klofutanje uporabnika %s ..."
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
 msgstr "Brcni v ta zadnjo"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has goosed you!"
 msgstr "Uporabnik %s vas je brcnil v ta zadnjo!"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Goosing %s..."
 msgstr "Brcanje uporabnika %s v ta zadnjo ..."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
 msgstr "Daj roko"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "Uporabnik %s vam je dal roko!"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Dajanje roke uporabniku %s ..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
 msgstr "Povleci za nos"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "Uporabnik %s vas je povlekel za nos!"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr "Vlečenje za nos uporabnika %s ..."
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
 msgstr "Pokaži osle"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "Uporabnik %s vam je pokazal osle."
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Kazanje oslov uporabniku %s ..."
@@ -7774,9 +7943,7 @@ msgstr "Gostitelja pojavnega imena, ki s
 msgstr "Gostitelja pojavnega imena, ki ste ga vnesli, ni mogoče prepoznati"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr "Vaš račun je bil onemogočen, ker ste vnesli preveč napačnih gesel"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
@@ -7804,12 +7971,8 @@ msgstr "Uporabnik vas je zavrnil"
 msgstr "Uporabnik vas je zavrnil"
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-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"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
@@ -7825,112 +7988,103 @@ msgstr "Prijava spodletela (%s)."
 msgid "Login failed (%s)."
 msgstr "Prijava spodletela (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"Sporočila ni mogoče poslati. Ni mogoče dobiti podrobnosti za uporabnika (%s)."
+msgstr "Sporočila ni mogoče poslati. Ni mogoče dobiti podrobnosti za uporabnika (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Ni bilo moč dodati %s na vaš seznam prijateljev (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Sporočila (%s) ni mogoče poslati."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ni bilo moč povabiti uporabnika (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Sporočila ni mogoče poslati %s. Ni mogoče ustvariti konference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Sporočila ni bilo moč poslati. Ni mogoče ustvariti konference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, 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 mogoče 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 mogoče premakniti v mapo %s na seznamu nedejavnih na strežniku. Napaka pri usvarjanju mape (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, 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)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Podrobnosti za uporabnika %s (%s) ni moč dobiti."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Uporabnika ni moč dodati na seznam zasebnosti (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s ni moč dodati na seznam zavrnjenih (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s ni moč dodati na seznam dovoljenih (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s ni moč odstraniti s seznama zasebnosti (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ni mogoče spremeniti strežniških nastavitve zasebnosti (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ni mogoče ustvariti konference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "Napaka pri komunikaciji s strežnikom. Zapiranje povezave."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Telefonska Å¡tevilka"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Osebni naziv"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "StojPošta"
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Uporabniška št."
@@ -7941,41 +8095,41 @@ msgstr "Uporabniška št."
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "Polno ime"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konferenca GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "Overovljanje ..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "ÄŒakanje odgovora ..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s je bil povabljen na ta pomenek."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Povabilo na pomenek"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7986,39 +8140,32 @@ msgstr ""
 "\n"
 "Poslano: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Se želite pridružiti pomenku?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, 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!
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
-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."
+#: ../libpurple/protocols/novell/novell.c:2172
+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."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "Napaka. Podpora SSL ni nameščena."
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2509
 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č."
 
@@ -8032,33 +8179,39 @@ msgstr "Ta konferenca je bila zaprta. Sp
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Vtičnik za protokol Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481
+#: ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129
+#: ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338
+#: ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Strežnik je zaprl povezavo."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632
+#: ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141
+#: ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350
+#: ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8067,10 +8220,12 @@ msgstr ""
 "Izgubljena povezava s strežnikom:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/proxy.c:1158
+#: ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362
+#: ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "Na povezavi s strežnikom prejeti neveljavni podatki."
 
@@ -8105,36 +8260,41 @@ msgstr "Vtičnik za protokol ICQ"
 msgstr "Vtičnik za protokol ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Oddaljeni uporabnik je zaprl povezavo."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Oddaljeni uporabnik je zavrnil vašo zahtevo."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Izgubljena povezava z oddaljenim uporabnikom:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Pri povezavi z oddaljenim uporabnikom prejeti neveljavni podatki."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Vzpostavljeno neposredno sporočanje"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgstr "Uporabnik %s vam je želel poslati datoteko %s, vendar dovoljujemo le prenos datotek do velikosti %s prek neposrednih sporočil.  Poskusite raje s funkcijo prenosa datotek.\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8237,29 +8397,18 @@ msgstr "Na omrežju AOL ni dovoljeno"
 msgstr "Na omrežju AOL ni dovoljeno"
 
 #: ../libpurple/protocols/oscar/oscar.c:348
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(Pri sprejemu tega sporočila je prišlo do napake.  Prijatelj, s katerim se "
-"pogovarjate, je najbrž uporabil drugo kodiranje od pričakovanega.  Če veste, "
-"za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev "
-"svojega računa AIM/ICQ.)"
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(Pri sprejemu tega sporočila je prišlo do napake.  Prijatelj, s katerim se pogovarjate, je najbrž uporabil drugo kodiranje od pričakovanega.  Če veste, za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev svojega računa AIM/ICQ.)"
 
 #: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(Pri prejemu tega sporočila je prišlo do napake. Vi in %s imata izbrane "
-"različni kodni strani ali pa ima %s hroščavega odjemalca.)"
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(Pri prejemu tega sporočila je prišlo do napake. Vi in %s imata izbrane različni kodni strani ali pa ima %s hroščavega odjemalca.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../pidgin/gtkutils.c:2391
+#: ../pidgin/gtkutils.c:2421
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
@@ -8281,7 +8430,7 @@ msgstr "Pomenek"
 msgstr "Pomenek"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
@@ -8354,49 +8503,47 @@ msgstr "Kamera"
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5835
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5870
 msgid "Not Available"
 msgstr "Ni na voljo"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5856
 msgid "Occupied"
 msgstr "Zaseden"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737
+#: ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557
+#: ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "Neviden"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "Prisoten"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
+#: ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "Naslov IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
@@ -8435,164 +8582,146 @@ msgstr "Dokončujem povezavo"
 msgid "Finalizing connection"
 msgstr "Dokončujem povezavo"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or 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 pojavno ime "
-"neveljavno. Imena morajo biti veljaven e-poštni naslov ali se morajo začeti "
-"s črko in lahko vsebujejo le črke, številke in presledke ali pa so "
-"sestavljena zgolj iz Å¡tevil."
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or 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 pojavno ime neveljavno. Imena morajo biti veljaven e-poštni naslov ali se morajo začeti s črko in lahko vsebujejo le črke, številke in presledke ali pa so sestavljena zgolj iz števil."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Neveljavno pojavno ime."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1048
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Neveljavno geslo."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid "Your account is currently suspended."
 msgstr "Vaš račun je trenutno zamrznjen."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1364
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
-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."
+#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1380
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1374
 #, 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"
+msgstr "Različica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga pri %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1413
 msgid "Could Not Connect"
 msgstr "Povezava ni uspela"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1439
 msgid "The SecurID key entered is invalid."
 msgstr "Vnešeni ključ SecurID ni veljaven."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1453
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite Å¡tevilo s 6 ciframi iz digitalnega prikazovalnika."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:6221
+#: ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "V _redu"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 #, 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."
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:1540
 msgid "Unable to get a valid AIM login hash."
 msgstr "Veljavnega prijavnega izvlečka za AIM ni mogoče pridobiti."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1628
 msgid "Unable to get a valid login hash."
 msgstr "Veljavnega prijavnega izvlečka ni mogoče pridobiti."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1658
 msgid "Password sent"
 msgstr "Geslo poslano"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1714
 msgid "Unable to initialize connection"
 msgstr "Povezave ni mogoče inicializirati"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2205
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Authorization Request Message:"
 msgstr "Sporočilo o zahtevi po pooblastilu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2246
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:5316
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2294
 msgid "Authorization Denied Message:"
 msgstr "Sporočilo o neodobrenem pooblastilu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"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"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2423
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2430
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2438
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8605,7 +8734,7 @@ msgstr ""
 "Od: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8618,7 +8747,7 @@ msgstr ""
 "Od: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8631,24 +8760,25 @@ msgstr ""
 "Sporočilo se glasi:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Uporabnik ICQ %u vam je poslal vizitko: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ali želite dodati prijatelja s to vizitko na vaš seznam prijateljev?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2486
+#: ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2487
 msgid "_Decline"
 msgstr "_Zavrni"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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."
@@ -8657,7 +8787,7 @@ msgstr[3] "Spregledali ste %hu sporočil
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2620
 #, 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."
@@ -8666,18 +8796,16 @@ msgstr[3] "Spregledali ste %hu sporočil
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2629
 #, 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."
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2638
 #, 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."
@@ -8686,7 +8814,7 @@ msgstr[3] "Spregledali ste %hu sporočil
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2647
 #, 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."
@@ -8695,7 +8823,7 @@ msgstr[3] "Spregledali ste %hu sporočil
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2656
 #, 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."
@@ -8706,110 +8834,101 @@ msgstr[3] "Spregledali ste %hu sporočil
 
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2811
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni moč poslati sporočila: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2880
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2814
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni moč poslati sporočila k %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2880
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2916
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "ÄŒlan od"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2951
 msgid "Available Message"
 msgstr "Sporočilo o dosegljivosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3059
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
-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.]"
+#: ../libpurple/protocols/oscar/oscar.c:3247
+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.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
-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."
+#: ../libpurple/protocols/oscar/oscar.c:3411
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3494
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3744
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Division"
 msgstr "Oddelek"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3932
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -8818,441 +8937,357 @@ msgstr[3] "Naslednja pojavna imena so po
 msgstr[2] "Naslednji pojavni imeni sta povezani z %s"
 msgstr[3] "Naslednja pojavna imena so povezana z %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3937
 msgid "Screen name"
 msgstr "Pojavno ime"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Za dani elektronski naslov %s ni zadetkov."
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Prejeti bi morali e-pošto, da potrdite %s. "
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3986
 msgid "Account Confirmation Requested"
 msgstr "Potrditev računa je bila zahtevana"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4017
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o računu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, 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 "
-"pojavno ime razlikuje od izvirnega."
+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 pojavno ime razlikuje od izvirnega."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"Napaka 0x%04x: Ni bilo mogoče oblikovati pojavnega imena, ker je neveljavno."
+msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati pojavnega imena, ker je neveljavno."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, 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 pojavnega imena, ker je zahtevano "
-"pojavno ime predolgo."
+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 pojavnega imena, ker je zahtevano pojavno ime predolgo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je na čakanju za to "
-"pojavno ime že en zahtevek."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je na čakanju za to pojavno ime že en zahtevek."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker ima podani naslov že "
-"preveč računov."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker ima podani naslov že preveč računov."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je podani naslov "
-"neveljaven."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je podani naslov neveljaven."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4050
 msgid "Account Info"
 msgstr "Podatki o računu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
-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\"."
+#: ../libpurple/protocols/oscar/oscar.c:4233
+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\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM profile."
 msgstr "Ni mogoče nastaviti AIM profila."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
-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."
+#: ../libpurple/protocols/oscar/oscar.c:4505
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4519
 #, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"Največja dolžina profila %d bajtov je bila presežena, zato je bil skrajšan."
-msgstr[1] ""
-"Največja dolžina profila %d bajt je bila presežena, zato je bil skrajšan."
-msgstr[2] ""
-"Največja dolžina profila %d bajta je bila presežena, zato je bil skrajšan."
-msgstr[3] ""
-"Največja dolžina profila %d bajte je bila presežena, zato je bil skrajšan."
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "Največja dolžina profila %d bajtov je bila presežena, zato je bil skrajšan."
+msgstr[1] "Največja dolžina profila %d bajt je bila presežena, zato je bil skrajšan."
+msgstr[2] "Največja dolžina profila %d bajta je bila presežena, zato je bil skrajšan."
+msgstr[3] "Največja dolžina profila %d bajte je bila presežena, zato je bil skrajšan."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4524
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4569
 #, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"Največja dolžina sporočila odsotnosti %d bajtov je bila presežena, zato je "
-"bilo sporočilo skrajšano."
-msgstr[1] ""
-"Največja dolžina sporočila odsotnosti %d bajt je bila presežena, zato je "
-"bilo sporočilo skrajšano."
-msgstr[2] ""
-"Največja dolžina sporočila odsotnosti %d bajta je bila presežena, zato je "
-"bilo sporočilo skrajšano."
-msgstr[3] ""
-"Največja dolžina sporočila odsotnosti %d bajte je bila presežena, zato je "
-"bilo sporočilo skrajšano."
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "Največja dolžina sporočila odsotnosti %d bajtov je bila presežena, zato je bilo sporočilo skrajšano."
+msgstr[1] "Največja dolžina sporočila odsotnosti %d bajt je bila presežena, zato je bilo sporočilo skrajšano."
+msgstr[2] "Največja dolžina sporočila odsotnosti %d bajta je bila presežena, zato je bilo sporočilo skrajšano."
+msgstr[3] "Največja dolžina sporočila odsotnosti %d bajte je bila presežena, zato je bilo sporočilo skrajšano."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4574
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4647
 #, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Ni mogoče dodati prijatelja %s, ker pojavno ime ni veljavno. Imena so lahko "
-"veljavni e-poštni naslovi, se morajo začeti s črko, vsebujejo lahko le črke, "
-"Å¡tevilke in presledke, lahko pa so tudi sestavljena iz samih Å¡tevil."
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Ni mogoče dodati prijatelja %s, ker pojavno ime ni veljavno. Imena so lahko veljavni e-poštni naslovi, se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4649
+#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:5117
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4768
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
-msgstr ""
-"Vašega seznama prijateljev z AIM strežnikov trenutno ni mogoče pridobiti. "
-"Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj "
-"urah."
+#: ../libpurple/protocols/oscar/oscar.c:4769
+msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."
+msgstr "Strežniki AIM trenutno niso bili zmožni poslati seznama vaših prijateljev. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4952
+#: ../libpurple/protocols/oscar/oscar.c:4954
+#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5183
+#: ../libpurple/protocols/oscar/oscar.c:5188
 msgid "Orphans"
 msgstr "Sirote"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5100
 #, 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."
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:5115
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5114
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Iz neznanega razloga prijatelja %s ni mogoče dodati."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5231
 #, 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?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5312
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5313
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5316
 #, 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"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5317
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5353
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5462
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5629
 msgid "Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5629
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5829
 msgid "iTunes Music Store Link"
 msgstr "Povezava na glasbeno trgovino iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5937
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5938
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite "
-"nadaljevati?"
+#: ../libpurple/protocols/oscar/oscar.c:5989
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite nadaljevati?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "Po_veži se"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6030
 msgid "Get AIM Info"
 msgstr "Dobi podatke AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6044
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6057
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6079
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6138
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-"Z oblikovanjem pojavnega imena lahko spreminjate samo velike črke in "
-"presledke."
+msgstr "Z oblikovanjem pojavnega imena lahko spreminjate samo velike črke in presledke."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6219
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6265
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6268
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
-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.\""
+#: ../libpurple/protocols/oscar/oscar.c:6269
+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.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6287
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6288
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6291
 msgid "_Search"
 msgstr "_Najdi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6449
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6460
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6464
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporočil (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6474
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6481
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6485
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Prikaži trenutno registriran e-naslov"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6489
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Spremeni trenutno registriran e-naslov ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6496
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Išči prijatelja po e-naslovu ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6575
 msgid "Use recent buddies group"
 msgstr "Uporabi nedavno skupino prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6578
 msgid "Show how long you have been idle"
 msgstr "Prikaz časa vaše odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6733
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9260,35 +9295,28 @@ msgstr ""
 "Vedno uporabi strežnik prehoda AIM/ICQ za prenos datotek\n"
 "(počasneje, vendar ne razkrije vašega naslova IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Spraševanje %s za povezavo z nami pri %s:%hu za neposredno sporočanje."
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Poskus povezave na %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "Poskus povezave prek strežnika-prehoda."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s vas je ravnokar prosil za neposredno povezavo na %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
-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 nujno potrebno "
-"za sporočanje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med "
-"tveganja zasebnosti."
+#: ../libpurple/protocols/oscar/peer.c:1039
+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 nujno potrebno za sporočanje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med tveganja zasebnosti."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -9442,30 +9470,26 @@ msgstr "Drugo"
 msgid "Other"
 msgstr "Drugo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Spremeni moje podatke"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Posodobi moje podatke"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Vaši podatki so bili posodobljeni"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
-msgstr ""
-"Nastaviti poskušate obraz po meri, kar zaenkrat še ni podprto. Prosimo, "
-"izberite sliko iz %s."
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
+msgstr "Nastaviti poskušate obraz po meri, kar zaenkrat še ni podprto. Prosimo, izberite sliko iz %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Neveljaven obraz QQ"
 
@@ -9736,12 +9760,13 @@ msgstr "Napaka pri zahtevanju prijavnega
 msgid "Error requesting login token"
 msgstr "Napaka pri zahtevanju prijavnega žetona"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "Prijava ni uspela, preverite zapisnik razhroščevanja"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:139
+#: ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -9817,7 +9842,8 @@ msgstr "Nastavi moje podatke"
 msgid "Set My Information"
 msgstr "Nastavi moje podatke"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
@@ -9843,7 +9869,8 @@ msgstr "Blokiraj uporabnika"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "Protokol QQ\tVtičnik"
 
@@ -9994,10 +10021,8 @@ msgstr "Zagon storitev"
 
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-"Upravljalec omrežja Sametime je izdal naslednje obvestilo na strežniku %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
+msgstr "Upravljalec omrežja Sametime je izdal naslednje obvestilo na strežniku %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
@@ -10064,9 +10089,7 @@ msgstr "Ustvari konferenčni pogovor z u
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "Vnesite temo za nov konferenčni pogovor in sporočilo vabila za %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
@@ -10091,14 +10114,8 @@ msgstr "Povabi uporabnika na konferenčn
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"Iz spodnjega seznama izberite konferenco in pošljite povabilo uporabniku %s. "
-"Izberite \"Ustvari novo konferenco\", če bi želeli ustvariti novo konferenco "
-"in k njej povabili uporabnika."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "Iz spodnjega seznama izberite konferenco in pošljite povabilo uporabniku %s. Izberite \"Ustvari novo konferenco\", če bi želeli ustvariti novo konferenco in k njej povabili uporabnika."
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
@@ -10112,7 +10129,8 @@ msgstr "Pošlji obvestilo TEST"
 msgid "Send TEST Announcement"
 msgstr "Pošlji obvestilo TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586
+#: ../pidgin/gtkconv.c:4434
 msgid "Topic:"
 msgstr "Tema:"
 
@@ -10122,12 +10140,8 @@ msgstr "Strežnik Sametime Community ni 
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"Za račun Meanwhile %s ni bil nastavljen noben gostitelj ali naslov IP. Za "
-"nadaljevanje prijave vnesite spodaj potrebne podatke. "
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "Za račun Meanwhile %s ni bil nastavljen noben gostitelj ali naslov IP. Za nadaljevanje prijave vnesite spodaj potrebne podatke. "
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
@@ -10137,7 +10151,8 @@ msgstr "Strežnik Sametime Community ni 
 msgid "No Sametime Community Server Specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:4368
 msgid "Connect"
 msgstr "Poveži se"
 
@@ -10166,12 +10181,8 @@ msgstr "Vnesli ste dvoumen uporabniški 
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"Imenovalec '%s' se morda nanaša na vse naštete uporabnike. Izberite "
-"ustreznega in ga dodajte na seznam prijateljev."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "Imenovalec '%s' se morda nanaša na vse naštete uporabnike. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
@@ -10183,17 +10194,9 @@ msgstr "Ni moč dodati uporabnika: ni ga
 
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"Imenovalec '%s' se ne ujema z nobenim uporabnikom v vaši skupnosti Sametime. "
-"Ta vnos je bil odstranjen iz vašega seznama prijateljev."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom v vaši skupnosti Sametime. Ta vnos je bil odstranjen iz vašega seznama prijateljev."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Ni mogoče dodati uporabnika"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10261,14 +10264,8 @@ msgstr "Skupinski rezultati adresarjev z
 
 #: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"Imenovalec '%s' se morda nanaša na eno od naslednjih skupin adresarjev "
-"zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj "
-"seznam prijateljev."
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "Imenovalec '%s' se morda nanaša na eno od naslednjih skupin adresarjev zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj seznam prijateljev."
 
 #: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
@@ -10280,24 +10277,16 @@ msgstr "Dodajanje skupine ni uspelo: sku
 
 #: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
-msgstr ""
-"Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v vaši "
-"skupnosti Sametime."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v vaši skupnosti Sametime."
 
 #: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Skupina adresarja zapiskov"
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"Vnesite ime skupine opomb adresarja v spodnje polje, s čimer boste lahko v "
-"seznam prijateljev vnesli skupino in njene člane."
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "Vnesite ime skupine opomb adresarja v spodnje polje, s čimer boste lahko v seznam prijateljev vnesli skupino in njene člane."
 
 #: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
@@ -10306,16 +10295,11 @@ msgstr "Rezultati iskanja za '%s'"
 
 #: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"Imenovalec '%s' se lahko nanaša na katerega koli od naštetih uporabnikov. "
-"Izberite ustreznega in ga dodajte na seznam prijateljev ali pa jim pošljite "
-"sporočila s spodnjimi gumbi."
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "Imenovalec '%s' se lahko nanaša na katerega koli od naštetih uporabnikov. Izberite ustreznega in ga dodajte na seznam prijateljev ali pa jim pošljite sporočila s spodnjimi gumbi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtknotify.c:762
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
@@ -10326,8 +10310,7 @@ msgid "The identifier '%s' did not match
 #: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
-"Imenovalec '%s' se ne ujema z nobenim uporabnikom vaše skupnosti Sametime."
+msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom vaše skupnosti Sametime."
 
 #: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
@@ -10338,12 +10321,8 @@ msgstr "Išči uporabnike"
 msgstr "Išči uporabnike"
 
 #: ../libpurple/protocols/sametime/sametime.c:5606
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"Vnesite ime ali delni ID v spodnje polje za iskanje zadetkov v svoji "
-"skupnosti Sametime."
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "Vnesite ime ali delni ID v spodnje polje za iskanje zadetkov v svoji skupnosti Sametime."
 
 #: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
@@ -10455,9 +10434,7 @@ msgstr "Oddaljen uporabnik ni več priso
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, 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?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
@@ -10565,12 +10542,8 @@ msgstr "Prijatelj %s ni zaupljiv"
 
 #: ../libpurple/protocols/silc/buddy.c:726
 #: ../libpurple/protocols/silc10/buddy.c:738
-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.
 #: ../libpurple/protocols/silc/buddy.c:1059
@@ -10586,12 +10559,8 @@ msgstr "Prijatelj %s ni prisoten v omreÅ
 
 #: ../libpurple/protocols/silc/buddy.c:1073
 #: ../libpurple/protocols/silc10/buddy.c:1081
-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."
 
 #: ../libpurple/protocols/silc/buddy.c:1077
 #: ../libpurple/protocols/silc10/buddy.c:1085
@@ -10605,21 +10574,13 @@ msgstr "Izberite ustreznega uporabnika"
 
 #: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:1183
-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."
 
 #: ../libpurple/protocols/silc/buddy.c:1187
 #: ../libpurple/protocols/silc10/buddy.c:1185
-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."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
 #: ../libpurple/protocols/silc10/buddy.c:1474
@@ -10889,7 +10850,6 @@ msgstr "<br><b>Tema kanala:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Načini kanala:</b> "
 
@@ -10928,18 +10888,8 @@ msgstr "Seznam javnih ključev kanala"
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
-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."
+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."
 
 #: ../libpurple/protocols/silc/chat.c:444
 #: ../libpurple/protocols/silc/chat.c:445
@@ -11059,8 +11009,7 @@ msgstr "Nastavi skrivni kanal"
 #: ../libpurple/protocols/silc/chat.c:1045
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, 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"
 
 #: ../libpurple/protocols/silc/chat.c:1047
@@ -11094,13 +11043,20 @@ msgstr "Neznan ukaz"
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85
+#: ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112
+#: ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120
+#: ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277
+#: ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288
+#: ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89
+#: ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -11112,11 +11068,16 @@ msgstr "Varen prenos datotek"
 msgid "Secure File Transfer"
 msgstr "Varen prenos datotek"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86
+#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113
+#: ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121
+#: ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93
+#: ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -11126,11 +11087,13 @@ msgstr "Oddaljeno odjavljeni"
 msgid "Remote disconnected"
 msgstr "Oddaljeno odjavljeni"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106
+#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Ni dovoljeno"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110
+#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Pogodba ni uspela"
 
@@ -11142,27 +11105,33 @@ msgstr "Ustvarjanje povezave ni uspelo"
 msgid "Creating connection failed"
 msgstr "Ustvarjanje povezave ni uspelo"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122
+#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Seja za prenos datotek ne obstaja"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273
+#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nobena seja prenosa datotek ni aktivna"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278
+#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Prenos datotek se je že začel"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283
+#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Ni bilo mogoče izvesti pogodbe za prenos datotek"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289
+#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Ni bilo mogoče začeti prenosa datotek"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426
+#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Ni mogoče poslati datoteke"
 
@@ -11170,7 +11139,8 @@ msgstr "Prišlo je do napake"
 msgid "Error occurred"
 msgstr "Prišlo je do napake"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:533
+#: ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
@@ -11209,7 +11179,8 @@ msgstr "Iz <I>%s</I> vas je brcnil upora
 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)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:718
+#: ../libpurple/protocols/silc/ops.c:723
 #: ../libpurple/protocols/silc/ops.c:728
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
@@ -11218,7 +11189,8 @@ msgstr "Ubil vas je %s (%s)"
 msgid "You have been killed by %s (%s)"
 msgstr "Ubil vas je %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:749
+#: ../libpurple/protocols/silc/ops.c:754
 #: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
@@ -11465,21 +11437,20 @@ msgstr "Zahtevano geslo"
 msgid "Passphrase required"
 msgstr "Zahtevano geslo"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98
+#: ../libpurple/protocols/silc10/pk.c:104
 #, 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č?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Sprejet javni ključ uporabnika %s. Želite sprejeti ta javni ključ?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107
+#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11492,17 +11463,20 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110
+#: ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Preveri javni ključ"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115
+#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Pokaži ..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Nepodprt tip javnega ključa"
 
@@ -11523,11 +11497,8 @@ msgstr "Izmenjava ključa ni uspela"
 
 #: ../libpurple/protocols/silc/silc.c:238
 #: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Nadaljevanje odpete seje ni uspelo. Pritisnite Ponovna povezava za tvorbo "
-"nove povezave."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "Nadaljevanje odpete seje ni uspelo. Pritisnite Ponovna povezava za tvorbo nove povezave."
 
 #: ../libpurple/protocols/silc/silc.c:265
 #: ../libpurple/protocols/silc/silc.c:311
@@ -11547,7 +11518,6 @@ msgstr "Povezovanjes strežnikom SILC"
 msgstr "Povezovanjes strežnikom SILC"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, c-format
 msgid "Could not load SILC key pair"
 msgstr "Para ključev SILC ni mogoče naložiti"
 
@@ -11576,8 +11546,8 @@ msgstr "Vaše trenutno razpoloženje"
 msgstr "Vaše trenutno razpoloženje"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc10/silc.c:652
+#: ../pidgin/gtkprefs.c:1643
 msgid "Normal"
 msgstr "Navadno"
 
@@ -11652,14 +11622,8 @@ msgstr "Atributi stanja uporabnika na zv
 
 #: ../libpurple/protocols/silc/silc.c:818
 #: ../libpurple/protocols/silc10/silc.c:731
-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."
+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."
 
 #: ../libpurple/protocols/silc/silc.c:859
 #: ../libpurple/protocols/silc/silc.c:865
@@ -11807,8 +11771,7 @@ msgid "join &lt;channel&gt; [&lt;passwor
 #: ../libpurple/protocols/silc/silc.c:1666
 #: ../libpurple/protocols/silc10/silc.c:1595
 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"
+msgstr "join &lt;kanal&gt; [&lt;geslo&gt;]:  Pridruži se klepetu na tem omrežju"
 
 #: ../libpurple/protocols/silc/silc.c:1670
 #: ../libpurple/protocols/silc10/silc.c:1599
@@ -11824,15 +11787,12 @@ msgid "msg &lt;nick&gt; &lt;message&gt;:
 #: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 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"
+msgstr "msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku"
 
 #: ../libpurple/protocols/silc/silc.c:1682
 #: ../libpurple/protocols/silc10/silc.c:1611
 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"
+msgstr "query &lt;vzdevek&gt; [&lt;sporočilo&gt;]:  Pošlji zasebno sporočilo uporabniku"
 
 #: ../libpurple/protocols/silc/silc.c:1686
 #: ../libpurple/protocols/silc10/silc.c:1615
@@ -11871,21 +11831,13 @@ msgstr "whowas &lt;vzdevek&gt;:  Ogled i
 
 #: ../libpurple/protocols/silc/silc.c:1716
 #: ../libpurple/protocols/silc10/silc.c:1645
-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 "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"
 
 #: ../libpurple/protocols/silc/silc.c:1720
 #: ../libpurple/protocols/silc10/silc.c:1649
-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 "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"
 
 #: ../libpurple/protocols/silc/silc.c:1724
 #: ../libpurple/protocols/silc10/silc.c:1653
@@ -11895,23 +11847,17 @@ msgid "oper &lt;nick&gt; [-pubkey]:  Get
 #: ../libpurple/protocols/silc/silc.c:1728
 #: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-"oper &lt;vzdevek&gt; [-javniključ]:  Dodeli pravice operaterju strežnika"
+msgstr "oper &lt;vzdevek&gt; [-javniključ]:  Dodeli pravice operaterju strežnika"
 
 #: ../libpurple/protocols/silc/silc.c:1732
 #: ../libpurple/protocols/silc10/silc.c:1661
-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 "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"
 
 #: ../libpurple/protocols/silc/silc.c:1736
 #: ../libpurple/protocols/silc10/silc.c:1665
 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"
+msgstr "kick &lt;kanal&gt; &lt;vzdevek&gt; [komentar]:  Brcni odjemalca s kanala"
 
 #: ../libpurple/protocols/silc/silc.c:1740
 #: ../libpurple/protocols/silc10/silc.c:1669
@@ -11926,8 +11872,7 @@ msgid "getkey &lt;nick|server&gt;:  Retr
 #: ../libpurple/protocols/silc/silc.c:1748
 #: ../libpurple/protocols/silc10/silc.c:1677
 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"
+msgstr "getkey &lt;vzdevek|strežnik&gt;:  Pridobi javni ključ odjemalca ali strežnika"
 
 #: ../libpurple/protocols/silc/silc.c:1752
 #: ../libpurple/protocols/silc10/silc.c:1681
@@ -11946,12 +11891,8 @@ msgstr "users &lt;kanal&gt;:  Navedi upo
 
 #: ../libpurple/protocols/silc/silc.c:1765
 #: ../libpurple/protocols/silc10/silc.c:1694
-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)"
+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)"
 
 #. *< type
 #. *< ui_requirement
@@ -11974,7 +11915,8 @@ msgstr "Protokol SILC (Varen internetni 
 msgstr "Protokol SILC (Varen internetni konferenčni sistem v živo)"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc10/silc.c:1853
+#: ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "Omrežje"
 
@@ -12149,19 +12091,20 @@ msgstr "Terminal"
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s je poslal sporočilo na tablo. Želite odpreti tablo?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc10/wb.c:288
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
 msgstr "%s je poslal sporočilo na tablo v kanalu %s. Želite odpreti tablo?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Tabla"
 
@@ -12170,52 +12113,42 @@ msgstr "Statistika strežnika ni na volj
 msgstr "Statistika strežnika ni na voljo."
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Napaka: Neustrezna različica, nadgradite svojega odjemalca"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Napaka: Oddaljeni ne podpira vašega ključa ali mu ne zaupa"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Napaka: Oddaljeni ne podpira predlagane skupine KE"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Napaka: Oddaljeni ne podpira predlagane cifre"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega PKCS"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Napaka: Oddaljeni ne podpira predlagane razpršene možnosti"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega HMAC"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Napaka: Napačen podpis"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Napaka: Napačen piškot"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
@@ -12237,35 +12170,35 @@ msgstr "Ni mogoče naložiti para ključ
 msgstr "Ni mogoče naložiti para ključev SILC: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:417
 msgid "Could not write"
 msgstr "Ni mogoče pisati"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:439
+#: ../libpurple/protocols/simple/simple.c:1545
 msgid "Could not connect"
 msgstr "Povezava ni uspela"
 
-#: ../libpurple/protocols/simple/simple.c:1059
+#: ../libpurple/protocols/simple/simple.c:1062
 msgid "Unknown server response."
 msgstr "Neznan odgovor strežnika."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1621
+#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1685
 msgid "Could not create listen socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1602
 msgid "Couldn't resolve host"
 msgstr "Gostitelja ni mogoče razbrati"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1693
 msgid "Could not resolve hostname"
 msgstr "Imena strežnika ni mogoče razločiti"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1710
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Pojavna imena SIP ne smejo vsebovati presledka ali simbola @"
 
@@ -12277,36 +12210,36 @@ msgstr "Pojavna imena SIP ne smejo vsebo
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Vtičnik za protokol SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1894
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Vtičnik za protokol SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1922
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1928
 msgid "Use UDP"
 msgstr "Uporabi UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1930
 msgid "Use proxy"
 msgstr "Uporabi prehod (proxy)"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1932
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1934
 msgid "Auth User"
 msgstr "Avtoriziraj uporabnika"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1936
 msgid "Auth Domain"
 msgstr "Avtoriziraj domeno"
 
@@ -12351,10 +12284,8 @@ msgstr "Opozarjanje %s ni dovoljeno."
 msgstr "Opozarjanje %s ni dovoljeno."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 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."
 
 #: ../libpurple/protocols/toc/toc.c:506
 #, c-format
@@ -12377,47 +12308,38 @@ msgstr "Zgrešili ste sporočilo od %s, 
 msgstr "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "Neuspeh."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "Preveč zadetkov."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "Potrebujem več selekcije."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Imeniška storitev je trenutno nedosegljiva."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "Poizvedba po e-poštnem naslovu je omejena."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "Ključna beseda zanemarjena."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "Brez ključnih besed."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "Uporabnik nima imeniških informacij."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "Država ni podprta."
 
@@ -12427,28 +12349,20 @@ msgstr "Neznan vzrok neuspeha: %s."
 msgstr "Neznan vzrok neuspeha: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Neveljavno pojavno ime ali geslo."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Storitev je trenutno nedostopna."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
-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."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -12480,8 +12394,9 @@ msgstr "Sprememba gesla uspešna"
 msgid "Password Change Successful"
 msgstr "Sprememba gesla uspešna"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366
+#: ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkblist.c:6281
 msgid "_Group:"
 msgstr "_Skupina:"
 
@@ -12500,11 +12415,12 @@ msgid "File transfer failed; other side 
 
 #: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
+msgstr "Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878
+#: ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042
+#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Ni se bilo mogoče povezati za prenos."
 
@@ -12540,116 +12456,99 @@ msgstr "%s zahteva, da jim pošljete dat
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306
+#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Vtičnik za protokol TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr "%s vam je poslal povabilo s spletno kamero, kar Å¡e ni podprto."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše sporočilo za Yahoo! ni bilo poslano."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Sistemsko sporočilo Yahoo! za %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Zavrnjeno sporočilo pooblaščanja:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, 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."
+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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, 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."
+msgstr "%s je (že prej) zavrnil vašo zahtevo, da ga smete dodati na svoj seznam."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"Strežnik Yahoo je zahteval uporabo neprepoznane metode overovitve. Verjetno "
-"se ne boste mogli uspešno prijaviti v Yahoo. Preverite %s za posodobitve."
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Strežnik Yahoo je zahteval uporabo neprepoznane metode overovitve. Verjetno se ne boste mogli uspešno prijaviti v Yahoo. Preverite %s za posodobitve."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Napaka pri overovitvi Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, 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."
+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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Vaš račun je zaklenjen. Prijavite se na spletno stran Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, 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."
+msgstr "Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Prejet neveljaven odgovor HTTP strežnika."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Težava s povezavo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12658,7 +12557,7 @@ msgstr ""
 "Izgubljena povezava s strežnikom %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12667,112 +12566,103 @@ msgstr ""
 "Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Nisem doma"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Nisem za mizo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Nisem v pisarni"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Å el na pavzo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Prisotnost"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Začni konferenčni pogovor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Nastavitve prisotnosti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Začni Doodlati"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Kateri ID naj bo aktiviran?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Join whom in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Aktiviraj ID ..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Pridruži se uporabniku v pomenku ..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Odpri prejeto pošto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr "Tresljaj"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Stresanje uporabnika %s ..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Seznam sob na omrežju Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
 
@@ -12786,56 +12676,56 @@ msgstr "doodle: Od uporabnika zahtevajte
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
 #: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "Vtičnik za protokol Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Pager server"
 msgstr "Strežnik pozivnika"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Japan Pager server"
 msgstr "Japonski strežnik pozivnika"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "File transfer server"
 msgstr "Strežnik prenosa datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan file transfer server"
 msgstr "Japonski strežnik prenosa datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Chat room locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat server"
 msgstr "Strežnik klepeta Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "Yahoo Chat port"
 msgstr "Vrata klepeta Yahoo"
 
@@ -12866,19 +12756,12 @@ msgstr "Profil Yahoo!"
 msgstr "Profil Yahoo!"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-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."
+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."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-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 s spletnim brskalnikom obiskati "
-"naslednjo povezavo:"
+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 s spletnim brskalnikom obiskati naslednjo povezavo:"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
@@ -12921,28 +12804,16 @@ msgstr "Podatki o uporabniku %s niso dos
 msgstr "Podatki o uporabniku %s niso dostopni"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
 msgstr "Oprostite, profil je v jeziku ali obliki, ki trenutno ni podprta."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-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."
+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."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-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."
+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."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
@@ -12977,12 +12848,8 @@ msgstr "Ni na voljo"
 msgstr "Ni na voljo"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Neznana napaka. Morda se boste morali odjaviti in počakati pet minut, preden "
-"se boste lahko ponovno pridružili klepetalnici"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "Neznana napaka. Morda se boste morali odjaviti in počakati pet minut, preden se boste lahko ponovno pridružili klepetalnici"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
@@ -13033,12 +12900,8 @@ msgstr ""
 "%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
-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)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -13088,62 +12951,39 @@ msgid "instance &lt;instance&gt;: Set th
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2700
 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"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2705
 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"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2710
 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"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2716
 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"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-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;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2727
-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;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
-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;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
-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;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
 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;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
@@ -13200,8 +13040,10 @@ msgstr "Izpostavljanje"
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461
+#: ../libpurple/proxy.c:902
+#: ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13211,29 +13053,30 @@ msgstr ""
 "%s"
 
 #  Data is assumed to be the destination sn
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Ni moč razčleniti odziva proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702
+#: ../libpurple/proxy.c:750
+#: ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Napaka pri povezavi proxy HTTP %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr ""
-"Dostop zavrnjen: strežnik proxy HTTP ne dovoljuje preusmerjanja vrat %d."
+msgstr "Dostop zavrnjen: strežnik proxy HTTP ne dovoljuje preusmerjanja vrat %d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Napaka pri razločanju %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Imena strežnika ni možno razločiti"
 
@@ -13281,7 +13124,7 @@ msgstr "%s želi vaše pozornosti!"
 msgid "%s has requested your attention!"
 msgstr "%s želi vaše pozornosti!"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13290,12 +13133,12 @@ msgstr ""
 "Uporabnik %s vabi %s na pomenek v sobo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Uporabnik %s vabi %s na pomenek v sobo %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
@@ -13319,7 +13162,9 @@ msgstr "Nenastavljeno"
 msgid "Unset"
 msgstr "Nenastavljeno"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Ne moti"
 
@@ -13336,64 +13181,75 @@ msgstr "%s je spremenil stanje iz %s v %
 msgid "%s changed status from %s to %s"
 msgstr "%s je spremenil stanje iz %s v %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:612
 #, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) je spremenil stanje iz %s v %s"
+
+#: ../libpurple/status.c:623
+#, c-format
 msgid "%s is now %s"
 msgstr "%s je zdaj %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:625
 #, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) je zdaj %s"
+
+#: ../libpurple/status.c:631
+#, c-format
 msgid "%s is no longer %s"
 msgstr "%s ni nič več %s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:633
 #, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) ni nič več %s"
+
+#: ../libpurple/status.c:1244
+#, c-format
 msgid "%s became idle"
 msgstr "%s je postal nedejaven"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s je postal dejaven"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s je postal nedejaven"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s je postal dejaven"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2706
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2707
 #, 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~."
+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~."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3207
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3210
 msgid "Unknown."
 msgstr "Neznano."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3236
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13402,7 +13258,7 @@ msgstr[3] "%d sekunde"
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunde"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13411,7 +13267,7 @@ msgstr[3] "%d dni"
 msgstr[2] "%d dneva"
 msgstr[3] "%d dni"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13420,7 +13276,7 @@ msgstr[3] "%s, %d ur"
 msgstr[2] "%s, %d uri"
 msgstr[3] "%s, %d ur"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13429,7 +13285,7 @@ msgstr[3] "%d ure"
 msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -13438,7 +13294,7 @@ msgstr[3] "%s, %d minut"
 msgstr[2] "%s, %d minuti"
 msgstr[3] "%s, %d minut"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -13447,36 +13303,33 @@ msgstr[3] "%d minut"
 msgstr[2] "%d minuti"
 msgstr[3] "%d minut"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3536
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Ni mogoče odpreti %s: Prevečkrat preusmerjeno"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3573
+#: ../libpurple/util.c:3869
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Ni se mogoče povezati z %s."
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3696
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"Za hrambo vsebine %s ni mogoče pridobiti zadostnega prostora. Spletni "
-"strežnik morda poskuša storiti nekaj sovražnega."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "Za hrambo vsebine %s ni mogoče pridobiti zadostnega prostora. Spletni strežnik morda poskuša storiti nekaj sovražnega."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3731
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Napaka pri branju iz %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3762
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Napaka pri pisanju v %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3787
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Napaka pri povezovanju z %s: %s"
@@ -13493,11 +13346,11 @@ msgstr "Pošlji neposredna sporočila pr
 msgid "Send instant messages over multiple protocols"
 msgstr "Pošlji neposredna sporočila prek več protokolov"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Postavitev"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Postavitev pladnja."
 
@@ -13566,7 +13419,8 @@ msgstr "SOCKS5"
 msgid "SOCKS 5"
 msgstr "SOCKS5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
@@ -13588,15 +13442,18 @@ msgstr "Možnosti strežnika proxy"
 msgid "Proxy Options"
 msgstr "Možnosti strežnika proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1044
+#: ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "Vrsta s_trežnika proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1053
+#: ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "_Strežnik:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1057
+#: ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "_Vrata:"
 
@@ -13604,7 +13461,8 @@ msgstr "_Uporabniško ime:"
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1072
+#: ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
@@ -13616,294 +13474,323 @@ msgstr "Račun z navedenimi parametri ž
 msgid "An account already exists with the specified criteria."
 msgstr "Račun z navedenimi parametri že obstaja."
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1474
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1493
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1500
 msgid "Create this new account on the server"
 msgstr "Ta nov račun ustvarite na strežniku"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1516
 msgid "_Advanced"
 msgstr "N_apredno"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1974
+#: ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2002
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2202
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Dobrodošli v %s!</span>\n"
 "\n"
-"Nimate nastavljenih računov za neposredno sporočanje. Da bi omogočili "
-"povezovanje z %s, pritisnite na spodnji gumb <b>Dodaj</b> in nastavite svoj "
-"prvi račun. Če želite, da se %s poveže z več računi, pritisnite znova "
-"<b>Dodaj</b>, da jih vse nastavite.\n"
+"Nimate nastavljenih računov za neposredno sporočanje. Da bi omogočili povezovanje z %s, pritisnite na spodnji gumb <b>Dodaj</b> in nastavite svoj prvi račun. Če želite, da se %s poveže z več računi, pritisnite znova <b>Dodaj</b>, da jih vse nastavite.\n"
 "\n"
-"Vedno se k temu oknu lahko vrnete in dodate, uredite ali odstranite račune z "
-"<b>Računi->Dodaj/Uredi</b> v oknu seznama prijateljev"
+"Vedno se k temu oknu lahko vrnete in dodate, uredite ali odstranite račune z <b>Računi->Dodaj/Uredi</b> v oknu seznama prijateljev"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Pridruži se pomenku"
+#: ../pidgin/gtkblist.c:524
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Imate %d stikov z imenom %s. Jih želite spojiti v enega?"
+msgstr[1] "Imate %d stik z imenom %s. Ga želite spojiti v enega?"
+msgstr[2] "Imate %d stika z imenom %s. Ju želite spojiti v enega?"
+msgstr[3] "Imate %d stike z imenom %s. Jih želite spojiti v enega?"
 
-#: ../pidgin/gtkblist.c:788
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+#: ../pidgin/gtkblist.c:525
+msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
+msgstr "Spajanje teh stikov bo povzročilo, da si bodo delili en sam vnos na seznamu prijateljev in eno samo pogovorno okno. Znova jih lahko ločite z izbiro 'Razširi' v kontekstnem meniju stika."
+
+#: ../pidgin/gtkblist.c:527
+msgid "_Merge"
+msgstr "_Spoji"
+
+#: ../pidgin/gtkblist.c:945
+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"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkblist.c:956
+#: ../pidgin/gtkblist.c:6242
+#: ../pidgin/gtkpounce.c:546
 #: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Zavrni"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "Prekliči _zavrnitev"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr "Premakni v"
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1331
+#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Sporoči"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Pošlji datoteko"
+#: ../pidgin/gtkblist.c:1337
+msgid "_Send File..."
+msgstr "_Pošlji datoteko ..."
 
-#: ../pidgin/gtkblist.c:1155
-#, fuzzy
-msgid "Add Buddy _Pounce"
-msgstr "Dodaj opozorilo prijatelju"
+#: ../pidgin/gtkblist.c:1344
+msgid "Add Buddy _Pounce..."
+msgstr "Dodaj &opozorilo prijatelju ..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1349
+#: ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468
+#: ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "Pokaži _dnevnik"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1359
+msgid "Hide when offline"
+msgstr "Skrij, če nepovezan"
+
+#: ../pidgin/gtkblist.c:1359
+msgid "Show when offline"
+msgstr "Pokaži, če nepovezan"
+
+#: ../pidgin/gtkblist.c:1373
+#: ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476
+#: ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "Psevdo_nim ..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1376
+#: ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478
+#: ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: ../pidgin/gtkblist.c:1238
-#, fuzzy
-msgid "Add a _Buddy"
-msgstr "Dodaj prijatelja"
+#: ../pidgin/gtkblist.c:1434
+msgid "Add _Buddy..."
+msgstr "Dodaj _prijatelja ..."
 
-#: ../pidgin/gtkblist.c:1241
-#, fuzzy
-msgid "Add a C_hat"
-msgstr "Dodaj pomenek"
+#: ../pidgin/gtkblist.c:1437
+msgid "Add C_hat..."
+msgstr "Dodaj &klepet ..."
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "I_zbriši skupino"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1462
+#: ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460
+#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1466
+msgid "Persistent"
+msgstr "Vztrajno"
+
+#: ../pidgin/gtkblist.c:1504
+#: ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1783
+#: ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4929
+#: ../pidgin/gtkblist.c:4942
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
-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."
+#: ../pidgin/gtkblist.c:2255
+#: ../pidgin/gtkconv.c:4919
+#: ../pidgin/gtkpounce.c:437
+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
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Po_kaži uporabnikov dnevnik ..."
 
-#: ../pidgin/gtkblist.c:2875
-msgid "/Buddies/Show"
-msgstr "/Prijatelji/Pokaži"
+#: ../pidgin/gtkblist.c:3073
+msgid "/Buddies/Sh_ow"
+msgstr "/Prijatelji/Poka_ži"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Prijatelji/Pokaži/Prijatelji, ki niso na _zvezi"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3075
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Prijatelji/Pokaži/Prazne _skupine"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3076
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Prijatelji/Pokaži/P_odrobnosti prijateljev"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Prijatelji/Pokaži/_Časi nedejavnosti"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Prijatelji/Pokaži/_Ikone protokolov"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Prijatelji/Razvr_sti prijatelje"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-#, fuzzy
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Računi"
+#: ../pidgin/gtkblist.c:3089
+#: ../pidgin/gtkblist.c:6943
+msgid "/Accounts/Manage"
+msgstr "/Računi/Upravljaj"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: ../pidgin/gtkblist.c:2896
+#: ../pidgin/gtkblist.c:3094
 msgid "/Tools/_Certificates"
 msgstr "/Orodja/_Digitalna potrdila"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/Orodja/Vtični_ki"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/Orodja/Sistemski _dnevnik"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -13912,78 +13799,82 @@ msgstr ""
 "\n"
 "<b>Račun:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "Psevdonim prijatelja"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "Prijavljeni"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "Zadnjič viden"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
 msgstr "Strašljivo"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr "Noro dobro"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3318
 msgid "Rockin'"
 msgstr "Kulsko"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3657
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Nedejaven %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nedejaven %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "Nedejaven %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3814
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3815
+#: ../pidgin/gtkblist.c:3848
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3816
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3817
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3818
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3819
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3854
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3857
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3989
+#: ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -13992,159 +13883,153 @@ msgstr[3] "%d neprebrana sporočila od %
 msgstr[2] "%d neprebrani sporočili od %s\n"
 msgstr[3] "%d neprebrana sporočila od %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4149
 msgid "Manually"
 msgstr "ročno"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "abecedno"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4152
 msgid "By status"
 msgstr "po stanju"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4153
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4358
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4393
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4545
 msgid "<b>Username:</b>"
 msgstr "<b>Uporabniško ime:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4552
 msgid "<b>Password:</b>"
 msgstr "<b>Geslo:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4563
 msgid "_Login"
 msgstr "_Prijavi"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4646
 msgid "/Accounts"
 msgstr "/Računi"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4660
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Dobrodošli v %s!</span>\n"
 "\n"
-"Nimate aktiviranih računov. Vključite svoje račune za neposredno sporočanje "
-"(IM) prek okna <b>Računi</b> z ukazom <b>Računi->Dodaj/Uredi</b>. Ko račune "
-"omogočite, se boste lahko prijavili, nastavili svoje stanje in klepetali s "
-"svojimi prijatelji."
+"Nimate aktiviranih računov. Vključite svoje račune za neposredno sporočanje (IM) prek okna <b>Računi</b> z ukazom <b>Računi->Dodaj/Uredi</b>. Ko račune omogočite, se boste lahko prijavili, nastavili svoje stanje in klepetali s svojimi prijatelji."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
+#: ../pidgin/gtkblist.c:4923
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Prijatelji/Pokaži/Prijatelji, ki niso na zvezi"
 
-#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:4926
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Prijatelji/Pokaži/Prazne skupine"
 
-#: ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:4932
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Prijatelji/Pokaži/Podrobnosti prijateljev"
 
-#: ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkblist.c:4935
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Prijatelji/Pokaži/Časi nedejavnosti"
 
-#: ../pidgin/gtkblist.c:4612
+#: ../pidgin/gtkblist.c:4938
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Prijatelji/Pokaži/Ikone protokolov"
 
-#: ../pidgin/gtkblist.c:5507
-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 pojavno ime osebe, ki jo želite dodati vašemu seznamu "
-"prijateljev. Vnesete lahko tudi psevdonim ali vzdevek prijatelja. Kjer bo "
-"izvedljivo, bo namesto pojavnega imena prikazan vzdevek.\n"
+#: ../pidgin/gtkblist.c:5850
+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 pojavno ime osebe, ki jo želite dodati vašemu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek prijatelja. Kjer bo izvedljivo, bo namesto pojavnega imena prikazan vzdevek.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5873
+msgid "A_ccount:"
+msgstr "Ra_čun:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5885
 msgid "_Screen name:"
 msgstr "_Pojavno ime:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5907
+#: ../pidgin/gtkblist.c:6263
 msgid "A_lias:"
 msgstr "Psev_donim:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6175
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: ../pidgin/gtkblist.c:5842
-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."
+#: ../pidgin/gtkblist.c:6191
+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."
 
-#: ../pidgin/gtkblist.c:5883
-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"
+#: ../pidgin/gtkblist.c:6232
+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"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6291
+msgid "Autojoin when account becomes online."
+msgstr "Samodejno se pridruži, ko račun postane povezan."
+
+#: ../pidgin/gtkblist.c:6292
+msgid "Hide chat when the window is closed."
+msgstr "Skrij klepet, ko je okno zaprto."
+
+#: ../pidgin/gtkblist.c:6318
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6963
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Računi/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6987
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7000
+#: ../pidgin/gtkconv.c:3143
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7008
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7020
 msgid "Enable Account"
 msgstr "Omogoči račun"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7026
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Računi/Omogoči račun"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7075
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7145
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
@@ -14153,228 +14038,220 @@ msgstr "Strežniki SSL"
 msgid "SSL Servers"
 msgstr "Strežniki SSL"
 
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
+"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"%s se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in "
-"ponovno omogočite povezovanje računa."
+"%s se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
 
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Neznan ukaz."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796
+#: ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tisti prijatelj ne uporablja enakega protokola kot ta pogovor."
 
-#: ../pidgin/gtkconv.c:774
-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."
+#: ../pidgin/gtkconv.c:816
+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."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
-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."
+#: ../pidgin/gtkconv.c:899
+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."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:931
+#: ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Datoteke ni bilo mogoče odprti."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179
+#: ../pidgin/gtkdebug.c:167
+#: ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Najdi"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205
+#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1679
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Nazadnje rečeno"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Animiraj"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Nastavi ikono po meri ..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Odstrani ikono po meri"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr "Pokaži vse"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/N_ovo neposredno sporočilo ..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pokaži _dnevnik ..."
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Pogovor/Po_čisti pogovor"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Pova_bi ..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Pogovor/_Več"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/_Vzdevek ..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/Zavr_ni ..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Pogovor/Pre_kliči zavrnitev ..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi pove_zavo ..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Pokaži orodno vrstico za _oblikovanje"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pokaži _časovne žige"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/More"
 msgstr "/Pogovor/Več"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options"
 msgstr "/Možnosti"
 
@@ -14383,98 +14260,101 @@ msgstr "/Možnosti"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3254
 msgid "/Conversation"
 msgstr "/Pogovor"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Pokaži dnevnik"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3278
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3288
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3292
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3296
 msgid "/Conversation/Unblock..."
 msgstr "/Pogovor/Prekliči zavrnitev ..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3300
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3310
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3314
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3320
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3336
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Pokaži orodno vrstico za oblikovanje"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Pokaži časovne žige"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3416
+#: ../pidgin/gtkconv.c:3458
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3461
 msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-#, fuzzy
-msgid "_Send To"
-msgstr "Pošlji k"
+#: ../pidgin/gtkconv.c:3645
+#: ../pidgin/gtkconv.c:8181
+msgid "S_end To"
+msgstr "Po_Å¡lji k"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4357
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4470
 msgid "0 people in room"
 msgstr "0 oseb v sobi"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5844
+#: ../pidgin/gtkconv.c:5965
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -14483,75 +14363,78 @@ msgstr[3] "%d osebe v sobi"
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6572
+#: ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Tipka"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6576
 msgid "Stopped Typing"
 msgstr "Prenehal tipkati"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6579
 msgid "Nick Said"
 msgstr "Vzdevek pravi"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6582
+#: ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6588
 msgid "New Event"
 msgstr "Nov dogodek"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7700
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Počisti vse izpisane replike pomenka."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7863
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7895
 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?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8514
 msgid "Close other tabs"
 msgstr "Zapri druge zavihke"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8520
 msgid "Close all tabs"
 msgstr "Zapri vse zavihke"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8528
 msgid "Detach this tab"
 msgstr "Odpni ta zavihek"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8534
 msgid "Close this tab"
 msgstr "Zapri ta zavihek"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9039
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9641
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9643
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9645
+#: ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "novo okno"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9647
 msgid "By group"
 msgstr "po skupinah"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9649
 msgid "By account"
 msgstr "po vrsti računa"
 
@@ -14591,7 +14474,8 @@ msgstr "Raven"
 msgid "Level "
 msgstr "Raven"
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:825
+#: ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Izberite raven filtra razhroščevanja."
 
@@ -14615,18 +14499,27 @@ msgstr "Usodna napaka"
 msgid "Fatal Error"
 msgstr "Usodna napaka"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:91
 #: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "razvijalec"
@@ -14639,7 +14532,8 @@ msgstr "podpora/QA"
 msgid "support/QA"
 msgstr "podpora/QA"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "razvijalec in oskrbnik spletne strani"
 
@@ -14651,7 +14545,8 @@ msgstr "različica win32"
 msgid "win32 port"
 msgstr "različica win32"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "vzdrževalec"
 
@@ -14676,7 +14571,8 @@ msgstr "afrikansko"
 msgid "Afrikaans"
 msgstr "afrikansko"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "arabsko"
 
@@ -14684,13 +14580,16 @@ msgstr "belorusko (latinica)"
 msgid "Belarusian Latin"
 msgstr "belorusko (latinica)"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "bengalsko"
 
@@ -14698,34 +14597,41 @@ msgstr "bosansko"
 msgid "Bosnian"
 msgstr "bosansko"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:228
 #: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "katalonsko"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "valencijansko-katalonsko"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "češko"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "dansko"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150
 #: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "nemško"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
 #: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Džonka"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "grško"
 
@@ -14745,8 +14651,10 @@ msgstr "esperanto"
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 #: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Å¡pansko"
@@ -14755,32 +14663,39 @@ msgstr "estonsko"
 msgid "Estonian"
 msgstr "estonsko"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "baskijsko"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:165
 #: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "perzijsko"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:236
 #: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "finsko"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 #: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "francosko"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "galicijsko"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "gujaratsko"
 
@@ -14788,7 +14703,8 @@ msgstr "prevajalska skupina za Gujarati"
 msgid "Gujarati Language Team"
 msgstr "prevajalska skupina za Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "hebrejsko"
 
@@ -14796,7 +14712,8 @@ msgstr "hindujsko"
 msgid "Hindi"
 msgstr "hindujsko"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "madžarsko"
 
@@ -14804,16 +14721,20 @@ msgstr "indonezijsko"
 msgid "Indonesian"
 msgstr "indonezijsko"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "italijansko"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "japonsko"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "gruzijsko"
 
@@ -14829,32 +14750,37 @@ msgstr "prevajalska skupina za Kannado"
 msgid "Kannada Translation team"
 msgstr "prevajalska skupina za Kannado"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:250
 #: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "korejsko"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 #: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "kurdsko"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "Lev"
+msgstr "laoško"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:252
 #: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:255
 #: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
 msgstr "norveško (Bokmål)"
@@ -14871,8 +14797,10 @@ msgstr "norveško (Nyorsk)"
 msgid "Norwegian Nynorsk"
 msgstr "norveško (Nyorsk)"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "poljsko"
 
@@ -14892,18 +14820,22 @@ msgstr "romunsko"
 msgid "Romanian"
 msgstr "romunsko"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:258
 #: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "rusko"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 #: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "slovaško"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "slovensko"
 
@@ -14911,12 +14843,15 @@ msgstr "albansko"
 msgid "Albanian"
 msgstr "albansko"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "srbsko"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:266
 #: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "Å¡vedsko"
@@ -14933,7 +14868,8 @@ msgstr "tajsko"
 msgid "Thai"
 msgstr "tajsko"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "turško"
 
@@ -14945,16 +14881,19 @@ msgstr "T.M.Thanh in ekipa Gnome-Vi"
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh in ekipa Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 #: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "hongkonško kitajsko"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 #: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
@@ -14970,29 +14909,10 @@ msgstr "O programu %s"
 
 #: ../pidgin/gtkdialogs.c:400
 #, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-"%s je modularen grafičen odjemalec za neposredna sporočila, ki lahko hkrati "
-"uporablja protokole AIM, MSN, Yahoo!, XMPPr, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu in "
-"QQ. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in "
-"razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence "
-"GPL je vključena v datoteko 'COPYING', ki se razširja s programom %s.  %s je "
-"zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln "
-"seznam avtorjev prispevkov.  Za program ni na voljo nikakršna garancija."
-"<BR><BR>"
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s je modularen grafičen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, XMPPr, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu in QQ. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence GPL je vključena v datoteko 'COPYING', ki se razširja s programom %s.  %s je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam avtorjev prispevkov.  Za program ni na voljo nikakršna garancija.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:418
-#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
@@ -15028,169 +14948,153 @@ msgstr "Informacije za razhroščevanje"
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:973
+msgid "_Name"
+msgstr "_Ime"
+
+#: ../pidgin/gtkdialogs.c:758
+#: ../pidgin/gtkdialogs.c:897
+#: ../pidgin/gtkdialogs.c:978
+msgid "_Account"
+msgstr "_Račun"
+
+#: ../pidgin/gtkdialogs.c:905
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: ../pidgin/gtkdialogs.c:908
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Vnesite pojavno ime ali psevdonim osebe, o kateri si želite ogledati podatke."
+#: ../pidgin/gtkdialogs.c:907
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "Vnesite pojavno ime ali psevdonim osebe, o kateri si želite ogledati podatke."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:997
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Vnesite pojavno ime ali psevdonim osebe, o kateri želite pridobiti dnevnik."
+#: ../pidgin/gtkdialogs.c:999
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "Vnesite pojavno ime ali psevdonim osebe, o kateri želite pridobiti dnevnik."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1042
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1044
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1105
 #, 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?"
+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?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1113
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1116
 msgid "_Remove Contact"
 msgstr "_Odstrani stik"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1147
 #, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
 msgstr "Skupino %s boste spojili v skupino %s. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1154
 msgid "Merge Groups"
 msgstr "Spoji skupine"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1157
 msgid "_Merge Groups"
 msgstr "_Spoji skupine"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1207
 #, 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?"
+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?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1210
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1213
 msgid "_Remove Group"
 msgstr "_Odstrani skupino"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1246
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+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?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1249
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1252
 msgid "_Remove Buddy"
 msgstr "_Odstrani prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1273
 #, 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?"
+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?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1276
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1279
 msgid "_Remove Chat"
 msgstr "_Odstrani pomenek"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Za več neprebranih sporočil kliknite na desni miškin gumb ...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Spremeni stanje"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Pokaži seznam prijateljev"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Novo sporočilo ..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Utišaj zvoke"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "Utripaj ob novem sporočilu"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Končaj"
 
@@ -15271,7 +15175,8 @@ msgstr "Po_drobnosti o prenosu"
 msgstr "Po_drobnosti o prenosu"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:833
+#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Premor"
 
@@ -15280,43 +15185,44 @@ msgstr "_Nadaljuj"
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:817
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:834
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "_Reset formatting"
 msgstr "_Počisti oblikovanje"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1361
 msgid "Hyperlink color"
 msgstr "Barva povezave"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1362
 msgid "Color to draw hyperlinks."
 msgstr "Barva za risanje povezav."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1365
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1366
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Barva za risanje povezav, ko je nad njimi miška."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1583
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj naslov e-pošte"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1595
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1605
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3355
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15326,7 +15232,7 @@ msgstr ""
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3358
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15336,7 +15242,7 @@ msgstr ""
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3387
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15347,7 +15253,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3390
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15358,12 +15264,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3468
+#: ../pidgin/gtkimhtml.c:3480
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3508
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
@@ -15388,20 +15294,20 @@ msgstr "_Opis"
 msgstr "_Opis"
 
 #: ../pidgin/gtkimhtmltoolbar.c:421
-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."
 
 #: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Vnesite URL povezave, ki jo želite vstaviti."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:430
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Vstavi povezavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434
+#: ../pidgin/gtkimhtmltoolbar.c:1263
 msgid "_Insert"
 msgstr "_Vstavi"
 
@@ -15410,7 +15316,8 @@ msgstr "Slike: %s ni mogoče shraniti.\n
 msgid "Failed to store image: %s\n"
 msgstr "Slike: %s ni mogoče shraniti.\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:540
+#: ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
@@ -15423,7 +15330,8 @@ msgstr "Nasmeh!"
 msgid "Smile!"
 msgstr "Nasmeh!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:846
+#: ../pidgin/gtkimhtmltoolbar.c:1220
 msgid "_Font"
 msgstr "_Pisava"
 
@@ -15435,15 +15343,18 @@ msgstr "Razdruži"
 msgid "Ungroup Items"
 msgstr "Razdruži"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1088
+#: ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Krepko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+#: ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Ležeče"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+#: ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Podčrtano"
 
@@ -15483,92 +15394,79 @@ msgstr "Vstavi smejčka"
 msgid "Insert Smiley"
 msgstr "Vstavi smejčka"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<b>_Bold</b>"
 msgstr "<b>_Krepko</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<i>_Italic</i>"
 msgstr "<i>_Ležeče</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<u>_Underline</u>"
 msgstr "<u>Pod_črtano</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Prečrtano</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size=\"larger\">_Večje</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "_Normal"
 msgstr "_Navadna"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Manjše</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Font face"
 msgstr "V_rsta pisave"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Foreground _color"
 msgstr "Barva o_spredja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
 msgstr "Barva o_zadja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
-msgid "_Smiley"
-msgstr "_Nasmeh!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1271
 msgid "_Image"
 msgstr "Sl_ika"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1277
 msgid "_Link"
 msgstr "P_ovezava"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1283
 msgid "_Horizontal rule"
 msgstr "_Vodoravna črta"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smile!"
+msgstr "_Nasmeh!"
+
 #: ../pidgin/gtklog.c:293
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr ""
-"Ste prepričani, da želite povsem izbrisati dnevnik klepeta z %s, ki se je "
-"pričel ob %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgstr "Ste prepričani, da želite povsem izbrisati dnevnik klepeta z %s, ki se je pričel ob %s?"
 
 #: ../pidgin/gtklog.c:304
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-"Ste prepričani, da želite povsem izbrisati dnevnik klepeta v %s, ki se je "
-"pričel ob %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgstr "Ste prepričani, da želite povsem izbrisati dnevnik klepeta v %s, ki se je pričel ob %s?"
 
 #: ../pidgin/gtklog.c:309
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr ""
-"Ste prepričani, da želite povsem izbrisati sistemski dnevnik, ki se je "
-"pričel ob %s?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgstr "Ste prepričani, da želite povsem izbrisati sistemski dnevnik, ki se je pričel ob %s?"
 
 #: ../pidgin/gtklog.c:453
 #, c-format
@@ -15585,27 +15483,16 @@ msgstr "%B %Y"
 msgstr "%B %Y"
 
 #: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost \"Omogoči "
-"sistemski dnevnik\"."
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost \"Omogoči sistemski dnevnik\"."
 
 #: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Neposredna sporočila se bodo shranila, le če bo okljukana možnost \"Shranjuj "
-"vsa neposredna sporočila\"."
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "Neposredna sporočila se bodo shranila, le če bo okljukana možnost \"Shranjuj vsa neposredna sporočila\"."
 
 #: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost \"Shranjuj vse "
-"pomenke\"."
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost \"Shranjuj vse pomenke\"."
 
 #: ../pidgin/gtklog.c:561
 msgid "No logs were found"
@@ -15620,17 +15507,18 @@ msgstr "Skupna velikost dnevnika:"
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:718
+#: ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
@@ -15640,7 +15528,7 @@ msgstr "%s %s. Poskusite `%s -h' za več
 msgstr "%s %s. Poskusite `%s -h' za več informacij.\n"
 
 #: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15652,6 +15540,7 @@ msgid ""
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15667,10 +15556,10 @@ msgstr ""
 "  --display=DISPLAY   zaslon X, ki naj bo uporabljen\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:516
+#, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15707,7 +15596,8 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:706
+#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -15719,7 +15609,7 @@ msgstr "<span weight=\"bold\" size=\"lar
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:545
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -15728,36 +15618,36 @@ msgstr[3] "%s ima %d nova sporočila."
 msgstr[2] "%s ima %d novi sporočili."
 msgstr[3] "%s ima %d nova sporočila."
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+#: ../pidgin/gtknotify.c:569
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>Imate %d novih e-sporočil.</b>"
 msgstr[1] "<b>Imate %d novo e-sporočilo.</b>"
 msgstr[2] "<b>Imate %d novi e-sporočili.</b>"
 msgstr[3] "<b>Imate %d nova e-sporočila.</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:997
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Ukaz brskalnika \"%s\" ni veljaven."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:999
+#: ../pidgin/gtknotify.c:1011
+#: ../pidgin/gtknotify.c:1024
+#: ../pidgin/gtknotify.c:1152
 msgid "Unable to open URL"
 msgstr "Ni bilo mogoče odprti URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1009
+#: ../pidgin/gtknotify.c:1022
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Napaka pri zagonu \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
-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."
+#: ../pidgin/gtknotify.c:1153
+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."
 
 #: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
@@ -15806,95 +15696,95 @@ msgstr "Izberi datoteko"
 msgstr "Izberi datoteko"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_prijavi"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "_odjavi"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "postane od_soten"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_vrne"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "postane _nedejaven"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "ni ve_č nedejaven."
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "začne _tipkati"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Premor med _tipkanjem"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "_preneha tipkati"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Pošlje spo_ročilo"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporočilno okno"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "_Prikaži obvestilo"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Pošlji spo_ročilo"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "Izvr_Å¡i ukaz"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "Pre_rskaj ..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "Preb_rskaj ..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:805
 msgid "P_ounce only when my status is not Available"
 msgstr "_Opozori le tedaj, ko nisem na voljo"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:810
 msgid "_Recurring"
 msgstr "Ponavl_jajoč"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1253
 msgid "Pounce Target"
 msgstr "Tarča opozorila"
 
@@ -15912,12 +15802,8 @@ msgstr "Namesti temo"
 msgstr "Namesti temo"
 
 #: ../pidgin/gtkprefs.c:697
-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."
+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."
 
 #: ../pidgin/gtkprefs.c:732
 msgid "Icon"
@@ -15943,7 +15829,8 @@ msgstr "Skrij nove po_govore IM:"
 msgid "_Hide new IM conversations:"
 msgstr "Skrij nove po_govore IM:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "ob odsotnosti"
 
@@ -15996,175 +15883,175 @@ msgstr "Prikaži _oblikovanje v dohodnih
 msgid "Show _formatting on incoming messages"
 msgstr "Prikaži _oblikovanje v dohodnih sporočilih"
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Zapri sporočila takoj, ko je zaprt zavihek."
+
+#: ../pidgin/gtkprefs.c:1000
 msgid "Show _detailed information"
 msgstr "Pokaži _podrobne podatke"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "_Omogoči animacijo ikon prijateljev"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "O_bvesti prijatelje, da jim pišem"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "_Obarvaj nepravilno črkovane besede"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "Uporabi animirano drsenje"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1019
 msgid "F_lash window when IMs are received"
 msgstr "Utripaj z _oknom, ko prispe novo sporočilo"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1021
 msgid "Minimi_ze new conversation windows"
 msgstr "Poman_jšaj pogovorna okna"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1025
 msgid "Font"
 msgstr "Pisava"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use document font from _theme"
 msgstr "Uporabi pisavo dokumenta iz _teme"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
 msgstr "Uporabi pisavo iz _teme"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "_Pisava pogovora:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "Privzeto oblikovanje"
 
-#: ../pidgin/gtkprefs.c:1062
-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."
+#: ../pidgin/gtkprefs.c:1064
+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."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "Strežnik ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "_Samozaznaj naslov IP"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "Vrata"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ročno določi obseg vrat za poslušanje"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "_Začetna vrata:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "_Končna vrata:"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "Strežnik proxy"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "Brez strežnika proxy"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "GNOME Default"
 msgstr "Privzeto za GNOME"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "Ročni"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "Obstoječe okno"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16173,69 +16060,63 @@ msgstr ""
 "_Ročno:\n"
 "(%s namesto URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "Shranjuj vsa _neposredna sporočila"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "Beleži vse spremembe _stanja v sistemski dnevnik"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1637
 msgid "Quietest"
 msgstr "najtišje"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1639
 msgid "Quieter"
 msgstr "tišje"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1641
 msgid "Quiet"
 msgstr "tiho"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1645
 msgid "Loud"
 msgstr "glasno"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1647
 msgid "Louder"
 msgstr "glasneje"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1649
 msgid "Loudest"
 msgstr "najglasneje"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1715
 msgid "_Method:"
 msgstr "_Način:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "Pisk"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "Nemo"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16244,81 +16125,81 @@ msgstr ""
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "Omogoči zvoke:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "Glasnost:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "Predvajaj"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "_Poročaj o času odsotnosti:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "Temelji na uporabi tipkovnice ali miške"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "Spremeni stanje ob _nedejavnosti"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1959
 msgid "_Minutes before becoming idle:"
 msgstr "Å tevilo _minut pred nedejavnostjo:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "Stanje ob zagonu"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "Ob zagonu uporabi stanje ob zadnjem _izhodu"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "Stanje ob _zagonu:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "Teme za smeške"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "Stanje / Nedejaven"
 
@@ -16355,7 +16236,8 @@ msgstr "Nastavi zasebnost za:"
 msgid "Set privacy for:"
 msgstr "Nastavi zasebnost za:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:557
+#: ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "Dovoli uporabniku"
 
@@ -16365,10 +16247,10 @@ msgid "Please enter the name of the user
 
 #: ../pidgin/gtkprivacy.c:559
 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"
+msgstr "Prosim vnesite ime uporabnika, ki mu želite omogočiti, da stopi v stik z vami"
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Dovoli"
 
@@ -16382,7 +16264,8 @@ msgstr "Ste prepričani, da želite dovo
 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?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:599
+#: ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Zavrni uporabnika"
 
@@ -16424,7 +16307,8 @@ msgstr "Izberite novo ime"
 msgid "Choose New Name"
 msgstr "Izberite novo ime"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1650
+#: ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Izberite mapo ..."
 
@@ -16448,7 +16332,8 @@ msgstr "Ste prepričani, da želite izbr
 msgstr "Ste prepričani, da želite izbrisati izbrana shranjena stanja?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620
+#: ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Uporabi"
 
@@ -16464,7 +16349,8 @@ msgstr "_Naziv:"
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1178
+#: ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "_Stanje:"
 
@@ -16487,94 +16373,82 @@ msgstr "Čakanje na omrežno povezavo"
 msgid "Waiting for network connection"
 msgstr "Čakanje na omrežno povezavo"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkutils.c:633
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1400
+#: ../pidgin/gtkutils.c:1423
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pri odpiranju %s je prišlo do neznane napake: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1403
+#: ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
 msgstr "Slike ni mogoče odpreti"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogoče poslati mape %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1500
 #, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
 msgstr "Mape %s ni mogoče prenesti. Datoteke boste morali poslati posamično."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1534
+#: ../pidgin/gtkutils.c:1546
+#: ../pidgin/gtkutils.c:1553
 msgid "You have dragged an image"
 msgstr "Povlekli ste sliko"
 
-#: ../pidgin/gtkutils.c:1532
-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."
+#: ../pidgin/gtkutils.c:1535
+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."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1561
 msgid "Set as buddy icon"
 msgstr "Nastavi kot ikono prijatelja"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "Pošlji slikovno datoteko"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "Vstavi v sporočilo"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1547
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo želite nastaviti za ikono prijatelja?"
 
-#: ../pidgin/gtkutils.c:1551
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-"To sliko lahko pošljete kot datoteko ali uporabite kot ikono za tega "
-"uporabnika."
+#: ../pidgin/gtkutils.c:1554
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
+msgstr "To sliko lahko pošljete kot datoteko ali uporabite kot ikono za tega uporabnika."
 
-#: ../pidgin/gtkutils.c:1552
-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"
+#: ../pidgin/gtkutils.c:1555
+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
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid "Cannot send launcher"
 msgstr "Ni mogoče poslati zaganjalnika"
 
-#: ../pidgin/gtkutils.c:1610
-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."
+#: ../pidgin/gtkutils.c:1614
+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."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2349
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16585,33 +16459,31 @@ msgstr ""
 "<b>Velikost:</b> %s\n"
 "<b>Velikost slike:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2645
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-"Datoteka '%s' je prevelika za %s.  Prosimo, poskusite z manjšo sliko.\n"
+msgstr "Datoteka '%s' je prevelika za %s.  Prosimo, poskusite z manjšo sliko.\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2647
 msgid "Icon Error"
 msgstr "Napaka ikone"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "Ikone ni mogoče nastaviti"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Datoteke '%s' ni mogoče odpreti: %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2797
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Sliko '%s' ni mogoče naložiti: razlog ni znan, najbrž je datoteka okvarjena"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "Sliko '%s' ni mogoče naložiti: razlog ni znan, najbrž je datoteka okvarjena"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Shrani datoteko"
 
@@ -16663,7 +16535,8 @@ msgstr "Pokaži statistiko"
 msgid "Display Statistics"
 msgstr "Pokaži statistiko"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:462
+#: ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Verjetnost odgovora:"
 
@@ -16676,8 +16549,10 @@ msgstr "Največji časovni zamik odziva:
 msgid "Maximum response timeout:"
 msgstr "Največji časovni zamik odziva:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817
+#: ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831
+#: ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minut"
 
@@ -16709,12 +16584,8 @@ msgstr "Vtičnik za napovedovanje dosegl
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"Vtičnik dosegljivosti stika (cap) se uporablja za prikaz statističnih "
-"podatkov o prijateljih v seznamu stikov."
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "Vtičnik dosegljivosti stika (cap) se uporablja za prikaz statističnih podatkov o prijateljih v seznamu stikov."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -16742,12 +16613,8 @@ msgstr "Vrednosti točk, ko ..."
 msgstr "Vrednosti točk, ko ..."
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-"Prijatelj z <i>največjim rezultatom</i> je tisti, ki bo imel prioriteto pri "
-"stiku.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "Prijatelj z <i>največjim rezultatom</i> je tisti, ki bo imel prioriteto pri stiku.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -16771,25 +16638,20 @@ msgstr "Prednost stika"
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:190
-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
 #: ../pidgin/plugins/contact_priority.c:192
-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."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Barve pogovora"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25
+#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Prilagodi barve v oknu pogovora"
 
@@ -16813,7 +16675,8 @@ msgstr "Prejeta sporočila"
 msgid "Received Messages"
 msgstr "Prejeta sporočila"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210
+#: ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Nastavite barvo za %s"
@@ -16840,12 +16703,8 @@ msgstr "Postavitev pomenkov"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 #: ../pidgin/plugins/extplacement.c:105
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-"Opomba: Nastavitev za \"Nove pomenke\" mora biti nastavljena na \"Po Å¡tevilu "
-"pomenkov\"."
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "Opomba: Nastavitev za \"Nove pomenke\" mora biti nastavljena na \"Po Å¡tevilu pomenkov\"."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -16874,12 +16733,8 @@ msgstr "Dodatne možnosti postavitve pom
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-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"
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -16961,12 +16816,8 @@ msgstr "Izberi prijatelja"
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Izberite osebo iz vašega adresarja, ki ji želite dodati tega prijatelja, ali "
-"ustvarite novo osebo."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "Izberite osebo iz vašega adresarja, ki ji želite dodati tega prijatelja, ali ustvarite novo osebo."
 
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
@@ -17085,7 +16936,7 @@ msgstr ""
 "\n"
 "<b>Opombe o prijatelju</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Zgodovina"
 
@@ -17103,7 +16954,8 @@ msgstr "Pomanjšaj, ko sem odsoten"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85
+#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pomanjša seznam prijateljev in pogovorna okna, ko ste odsotni."
 
@@ -17117,14 +16969,14 @@ msgid "Adds a small box to the buddy lis
 
 #: ../pidgin/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."
 
 #: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Označevalna črta"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Nariši črto, ki prikazuje nova sporočila pogovora."
 
@@ -17132,21 +16984,19 @@ msgstr "Nariši označevalno črto v "
 msgid "Draw Markerline in "
 msgstr "Nariši označevalno črto v "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:250
+#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "oknih _neposrednih pogovorov"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:254
+#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_pogovornih oknih"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Zahtevana je seja glasbenega sporočanja. Prosimo, kliknite ikono MM za "
-"sprejem."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "Zahtevana je seja glasbenega sporočanja. Prosimo, kliknite ikono MM za sprejem."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
@@ -17195,12 +17045,8 @@ msgstr "Vtičnik za glasbeno sporočanje
 
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju "
-"pri glasbenem ustvarjanju kompozicije v resničnem času."
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju pri glasbenem ustvarjanju kompozicije v resničnem času."
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:678
@@ -17289,7 +17135,8 @@ msgstr "Obvestila o sporočilih"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:910
+#: ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ponuja mnoge načine opozarjanja na nova sporočila."
 
@@ -17346,47 +17193,36 @@ msgstr "Vodoravno ločilo GtkTreeView"
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodoravno ločilo GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Vnos pogovora"
 
-#: ../pidgin/plugins/pidginrc.c:74
-#, fuzzy
-msgid "Conversation History"
-msgstr "Vnos pogovora"
-
-#: ../pidgin/plugins/pidginrc.c:75
-#, fuzzy
-msgid "Log Viewer"
-msgstr "Ogledovalnik dnevnika"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Pogovorno okno zahteve"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Pogovorno okno obvestila"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Nastavite barvo"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "Nastavite pisavo vmesnika"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Nastavite pisavo za %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "Pisava vmesnika GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bližnjic besedila GTK+"
 
@@ -17410,36 +17246,37 @@ msgstr "Tema bližnjic besedila GTK+"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Barve vmesnika"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Velikosti gradnikov"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Pisave"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Datotečna orodja Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Zapiši nastavitve v %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Ponovno preberi datoteke gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Nadzor teme Gaim GTK+ v Pidginu"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:540
+#: ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Omogoča dostop do pogosto uporabljenih nastavitev gtkrc."
 
@@ -17452,29 +17289,21 @@ msgstr "Omogoča neposreden vnos v proto
 msgstr "Omogoča neposreden vnos v protokole."
 
 #: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, 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 "
-"(XMPP, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte "
-"razhroščevalno okno."
+msgid "Lets you send raw input to text-based protocols (XMPP, 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 (XMPP, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte razhroščevalno okno."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr ""
-"Uporabljate %s različice %s.  Najnovejša dosegljiva različica je %s. "
-"Prenesete jo lahko z naslova <a href=\"%s\">%s</a><hr>"
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgstr "Uporabljate %s različice %s.  Najnovejša dosegljiva različica je %s. Prenesete jo lahko z naslova <a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Dnevnik sprememb:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Na voljo je nova različica."
 
@@ -17497,12 +17326,8 @@ msgstr "Preverjaj, ali je na voljo nova 
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-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."
 
 #: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
@@ -17547,8 +17372,7 @@ msgid "_Exact case match (uncheck for au
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"_Natanko ujemanje velikih in malih črk (ne označi za samodejno ravnanje)"
+msgstr "_Natanko ujemanje velikih in malih črk (ne označi za samodejno ravnanje)"
 
 #: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
@@ -17566,10 +17390,10 @@ msgstr "Zamenjava besedila"
 msgid "Text replacement"
 msgstr "Zamenjava besedila"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2372
+#: ../pidgin/plugins/spellchk.c:2373
 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
@@ -17577,7 +17401,8 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74
+#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Nabodalo prijateljev"
 
@@ -17585,7 +17410,8 @@ msgstr "Nabodalo prijateljev"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodoravna inačica seznama prijateljev."
 
@@ -17620,7 +17446,6 @@ msgstr "Možnosti zapisa časovnega žig
 msgstr "Možnosti zapisa časovnega žiga"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Vsili 24-urni časovni zapis"
 
@@ -17665,12 +17490,8 @@ msgstr "Prilagodi oblike časovnega žig
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in "
-"dnevniških sporočil."
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in dnevniških sporočil."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
@@ -17733,13 +17554,11 @@ msgid ""
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 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 vtičnik omogoči poljubno nastavitev prosojnosti pogovornih oken in "
-"seznama prijateljev.\n"
+"Ta vtičnik omogoči poljubno nastavitev prosojnosti pogovornih oken in seznama prijateljev.\n"
 "\n"
 "* Pozor: Ta vtičnik zahteva Win2000 ali novejše."
 
@@ -17784,11 +17603,8 @@ msgstr "Nastavitve, specifične za %s v 
 msgstr "Nastavitve, specifične za %s v okolju Windows."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"Ponuja nastavitve, specifične za %s v okolju Windows, kot je sidranje "
-"seznama prijateljev."
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "Ponuja nastavitve, specifične za %s v okolju Windows, kot je sidranje seznama prijateljev."
 
 #: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
@@ -17800,7 +17616,8 @@ msgstr "<font color='#777777'>Odjavljeni
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746
+#: ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "Konzola XMPP"
@@ -17835,109 +17652,5 @@ msgid "This plugin is useful for debbugi
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-"Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
+msgstr "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
-#~ msgid "Show"
-#~ msgstr "Pokaži"
-
-#~ msgid "Offline buddies"
-#~ msgstr "nepovezane prijatelje"
-
-#~ msgid "Sort"
-#~ msgstr "Razvrsti"
-
-#~ msgid "By Status"
-#~ msgstr "po stanju"
-
-#~ msgid "By Log Size"
-#~ msgstr "po obsegu dnevnika"
-
-#~ msgid "Current media"
-#~ msgstr "Trenutni medij"
-
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Vtičnik za protokol Windows Live Messenger"
-
-#~ msgid "Windows Live ID authentication:Unable to connect"
-#~ msgstr "Overjanje Windows Live ID: Povezava ni mogoča"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Overovitev Windows Live ID ni uspela"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "Uporabnik %s vam je ravnokar pomežiknil!"
-
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Neznana napaka (%d)"
-
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s (%s) je spremenil stanje iz %s v %s"
-
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s (%s) je zdaj %s"
-
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s (%s) ni nič več %s"
-
-#~ msgid "You have %d contact named %s. Would you like to merge them?"
-#~ msgid_plural ""
-#~ "You currently have %d contacts named %s. Would you like to merge them?"
-#~ msgstr[0] "Imate %d stikov z imenom %s. Jih želite spojiti v enega?"
-#~ msgstr[1] "Imate %d stik z imenom %s. Ga želite spojiti v enega?"
-#~ msgstr[2] "Imate %d stika z imenom %s. Ju želite spojiti v enega?"
-#~ msgstr[3] "Imate %d stike z imenom %s. Jih želite spojiti v enega?"
-
-#~ msgid ""
-#~ "Merging these contacts will cause them to share a single entry on the "
-#~ "buddy list and use a single conversation window. You can separate them "
-#~ "again by choosing 'Expand' from the contact's context menu"
-#~ msgstr ""
-#~ "Spajanje teh stikov bo povzročilo, da si bodo delili en sam vnos na "
-#~ "seznamu prijateljev in eno samo pogovorno okno. Znova jih lahko ločite z "
-#~ "izbiro 'Razširi' v kontekstnem meniju stika."
-
-#~ msgid "_Merge"
-#~ msgstr "_Spoji"
-
-#~ msgid "Move to"
-#~ msgstr "Premakni v"
-
-#~ msgid "_Send File..."
-#~ msgstr "_Pošlji datoteko ..."
-
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Dodaj &opozorilo prijatelju ..."
-
-#~ msgid "Hide when offline"
-#~ msgstr "Skrij, če nepovezan"
-
-#~ msgid "Show when offline"
-#~ msgstr "Pokaži, če nepovezan"
-
-#~ msgid "Add _Buddy..."
-#~ msgstr "Dodaj _prijatelja ..."
-
-#~ msgid "Add C_hat..."
-#~ msgstr "Dodaj &klepet ..."
-
-#~ msgid "Persistent"
-#~ msgstr "Vztrajno"
-
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Računi/Upravljaj"
-
-#~ msgid "A_ccount:"
-#~ msgstr "Ra_čun:"
-
-#~ msgid "Autojoin when account becomes online."
-#~ msgstr "Samodejno se pridruži, ko račun postane povezan."
-
-#~ msgid "Hide chat when the window is closed."
-#~ msgstr "Skrij klepet, ko je okno zaprto."
-
-#~ msgid "S_end To"
-#~ msgstr "Po_Å¡lji k"
-
-#~ msgid "Close IMs immediately when the tab is closed"
-#~ msgstr "Zapri sporočila takoj, ko je zaprt zavihek."


More information about the Commits mailing list