diff po/mk.po @ 9544:8c4d99bea74d

[gaim-migrate @ 10372] make distcheck runs so much faster after this committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 16 Jul 2004 04:36:25 +0000
parents 8bf735cf9d1c
children 4d05b6e9e9cd
line wrap: on
line diff
--- a/po/mk.po	Fri Jul 16 04:06:51 2004 +0000
+++ b/po/mk.po	Fri Jul 16 04:36:25 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:29-0400\n"
+"POT-Creation-Date: 2004-07-16 00:15-0400\n"
 "PO-Revision-Date: 2004-04-19 17:03+0200\n"
 "Last-Translator: Tomislav Markovski <tome@set.com.mk>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
@@ -17,6 +17,18 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 "X-Generator: KBabel 1.2\n"
 
+#: plugins/autorecon.c:174
+msgid "Error Message Suppression"
+msgstr ""
+
+#: plugins/autorecon.c:178
+msgid "Hide Disconnect Errors"
+msgstr ""
+
+#: plugins/autorecon.c:182
+msgid "Hide Login Errors"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -24,7 +36,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:204
 msgid "Auto-Reconnect"
 msgstr "Автоматскo врзување"
 
@@ -32,7 +44,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Автоматско врзување, при пад на врската."
 
@@ -130,7 +142,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Отсутен"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
 msgid "Auto-login"
 msgstr "Автоматска најава"
 
@@ -146,19 +158,21 @@
 msgid "New..."
 msgstr "Нов..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
-#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
+#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Отсутен"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
+#: plugins/docklet/docklet.c:159 src/away.c:550
+#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6697
 msgid "Back"
 msgstr "Назад"
 
@@ -166,16 +180,15 @@
 msgid "Mute Sounds"
 msgstr "Замолчи звуци"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "Пренос на датотеки"
 
-#. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
 msgid "Accounts"
 msgstr "Акаунти"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
 msgid "Preferences"
 msgstr "Параметри"
 
@@ -222,6 +235,49 @@
 "messages to be queued until the icon is clicked, similar to ICQ."
 msgstr ""
 
+#: plugins/extplacement.c:75
+#, fuzzy
+msgid "By conversation count"
+msgstr "Затвори разговор"
+
+#: plugins/extplacement.c:96
+#, fuzzy
+msgid "Conversation Placement"
+msgstr "/Разговор/Отстрани..."
+
+#: plugins/extplacement.c:101
+msgid "Number of conversations per window"
+msgstr ""
+
+#: plugins/extplacement.c:107
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/extplacement.c:126
+msgid "ExtPlacement"
+msgstr ""
+
+#. *< name
+#. *< version
+#: plugins/extplacement.c:128
+msgid "Extra conversation placement options."
+msgstr ""
+
+#. *< summary
+#. *  description
+#: plugins/extplacement.c:130
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -371,60 +427,60 @@
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "Локален адресар"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
-#: src/protocols/jabber/jabber.c:916
+#: plugins/gevolution/add_buddy_dialog.c:143
+#: plugins/gevolution/add_buddy_dialog.c:154
+#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
+#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "Ништо"
 
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Име"
 
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "Инстант пораки"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Одбери контакт од адресарот или додади нов."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6975
 msgid "Search"
 msgstr "Барај"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
-#: src/gtkblist.c:4310
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
+#: src/gtkblist.c:4374
 msgid "Group:"
 msgstr "Група:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "Ново лице"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "Избери пријател"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -433,40 +489,40 @@
 "нов контакт."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "Прикажи кориснички детали"
 
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "Скриј кориснички детали"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "_Асоцирај пријател"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Пријатели"
 
-#: plugins/gevolution/gevolution.c:214
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "Додади во адресар"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Конфигурација за интегрирање на Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Одбери ги сите акаунти на кои сакаш да ги додадеш пријателите."
 
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Акаунт"
 
@@ -477,7 +533,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Интеграција со Evolution"
 
@@ -485,58 +541,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Нуди интеграција со Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Внеси ги информациите за лицето подолу."
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Внеси го корисничкото име и акаунтот на пријателот."
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Тип на акаунт:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "Корисничко име:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Изборни информации:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:425
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
+#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
 msgid "Buddy Icon"
 msgstr "Икона на пријател:"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Име:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Презиме:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "E-пошта:"
 
-#: plugins/history.c:70
+#: plugins/history.c:88
 msgid "History"
 msgstr "Историја"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Ги прикажува последните разговори во новиот прозорец за разговор."
 
-#: plugins/history.c:73
+#: plugins/history.c:91
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -563,31 +619,30 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ја иконизира листата на пријатели и разговорите кога си отсутен."
 
-#: plugins/idle.c:70
-msgid "Idle Time"
+#: plugins/idle.c:55
+#, fuzzy
+msgid "Minutes"
+msgstr "минути."
+
+#: plugins/idle.c:62 plugins/idle.c:95
+msgid "I'dle Mak'er"
+msgstr "I'dle Mak'er"
+
+#: plugins/idle.c:63 plugins/idle.c:78
+#, fuzzy
+msgid "Set Account Idle Time"
 msgstr "Неактивно време"
 
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "Постави"
-
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "неактивен"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "минути."
-
-#: plugins/idle.c:96
+#: plugins/idle.c:66
 msgid "_Set"
 msgstr "_Постави"
 
-#: plugins/idle.c:119
-msgid "I'dle Mak'er"
-msgstr "I'dle Mak'er"
-
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:67 src/dialogs.c:786
+#, fuzzy
+msgid "_Cancel"
+msgstr "Откажи"
+
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Нуди рачно конфигурирање на времето на неактивност."
 
@@ -652,69 +707,69 @@
 msgstr "Додава малечка кутија до листата на пријатели кога има нова пошта."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:572
+#: plugins/notify.c:599
 msgid "Notify For"
 msgstr "Извести за"
 
-#: plugins/notify.c:576
+#: plugins/notify.c:603
 msgid "_IM windows"
 msgstr "_Прозорци за пораки"
 
-#: plugins/notify.c:583
+#: plugins/notify.c:610
 msgid "C_hat windows"
 msgstr "П_розорци за разговор"
 
-#: plugins/notify.c:590
+#: plugins/notify.c:617
 msgid "_Focused windows"
 msgstr "_Фокусирани прозорци"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:598
+#: plugins/notify.c:625
 msgid "Notification Methods"
 msgstr "Методи за исветување"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:632
 msgid "Prepend _string into window title:"
 msgstr "Вметни текст на почеток во насловната лента на прозорецот:"
 
 #. Count method button
-#: plugins/notify.c:624
+#: plugins/notify.c:651
 msgid "Insert c_ount of new messages into window title"
 msgstr ""
 
 #. Urgent method button
-#: plugins/notify.c:633
+#: plugins/notify.c:659
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Подеси менаџер на прозорци \"_URGENT\" hint"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:667
 msgid "Notification Removal"
 msgstr ""
 
 #. Remove on focus button
-#: plugins/notify.c:646
+#: plugins/notify.c:672
 msgid "Remove when conversation window _gains focus"
 msgstr ""
 
 #. Remove on click button
-#: plugins/notify.c:654
+#: plugins/notify.c:679
 msgid "Remove when conversation window _receives click"
 msgstr ""
 
 #. Remove on type button
-#: plugins/notify.c:662
+#: plugins/notify.c:687
 msgid "Remove when _typing in conversation window"
 msgstr ""
 
 #. Remove on message send button
-#: plugins/notify.c:670
+#: plugins/notify.c:695
 msgid "Remove when a _message gets sent"
 msgstr ""
 
 #. Remove on conversation switch button
-#: plugins/notify.c:679
-msgid "Remove on conversation ta_b switch"
+#: plugins/notify.c:704
+msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
 #. *< api_version
@@ -724,7 +779,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:762
+#: plugins/notify.c:792
 msgid "Message Notification"
 msgstr "Известување за порака"
 
@@ -732,7 +787,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:765 plugins/notify.c:767
+#: plugins/notify.c:795 plugins/notify.c:797
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 
@@ -754,15 +809,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
-#: plugins/raw.c:154
+#: plugins/raw.c:146
 msgid "Raw"
 msgstr ""
 
-#: plugins/raw.c:156
+#: plugins/raw.c:148
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 
-#: plugins/raw.c:157
+#: plugins/raw.c:149
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -823,7 +878,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:566
 msgid "Signals Test"
 msgstr ""
 
@@ -831,7 +886,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:569 plugins/signals-test.c:571
 msgid "Test to see that all signals are working properly."
 msgstr ""
 
@@ -943,7 +998,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30
 #, c-format
 msgid "%s has gone away."
 msgstr ""
@@ -984,11 +1039,11 @@
 "idle."
 msgstr ""
 
-#: plugins/tcl/tcl.c:350
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr ""
 
-#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
 msgid "Provides support for loading Tcl plugins"
 msgstr ""
 
@@ -1011,15 +1066,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
-#: plugins/timestamp.c:95
+#: plugins/timestamp.c:185
 msgid "iChat Timestamp"
 msgstr ""
 
-#: plugins/timestamp.c:102
+#: plugins/timestamp.c:192
 msgid "Delay"
 msgstr ""
 
-#: plugins/timestamp.c:115
+#: plugins/timestamp.c:199
+msgid "minutes."
+msgstr "минути."
+
+#: plugins/timestamp.c:205
 msgid "_Apply"
 msgstr ""
 
@@ -1030,7 +1089,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:173
+#: plugins/timestamp.c:268
 msgid "Timestamp"
 msgstr ""
 
@@ -1038,35 +1097,35 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:176 plugins/timestamp.c:178
+#: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:348
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:388
+#: plugins/win32/transparency/win2ktrans.c:419
 msgid "Opacity:"
 msgstr ""
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "IM Conversation Windows"
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:330
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "_IM window transparency"
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:340
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Show slider bar in IM window"
 msgstr ""
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
 msgid "Buddy List Window"
 msgstr ""
 
-#: plugins/win32/transparency/win2ktrans.c:366
+#: plugins/win32/transparency/win2ktrans.c:406
 msgid "_Buddy List window transparency"
 msgstr ""
 
@@ -1077,18 +1136,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:462
 msgid "Transparency"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/win32/transparency/win2ktrans.c:465
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr ""
+
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:425
-#: plugins/win32/transparency/win2ktrans.c:427
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows.\n"
+#: plugins/win32/transparency/win2ktrans.c:467
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
@@ -1107,8 +1170,8 @@
 msgstr ""
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
-#: src/gtkprefs.c:2505
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
+#: src/gtkprefs.c:2412
 msgid "Buddy List"
 msgstr "Листа на пријатели"
 
@@ -1127,8 +1190,8 @@
 msgstr ""
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
-#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
+#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
 msgid "Conversations"
 msgstr ""
 
@@ -1144,324 +1207,356 @@
 msgid "Options specific to Windows Gaim."
 msgstr ""
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
 msgstr ""
 
-#: src/about.c:74
+#: src/about.c:75
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr ""
 
-#: src/about.c:94
-msgid ""
-"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
-"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
-"written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr ""
-
-#: src/about.c:104
+#: src/about.c:95
+msgid ""
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+
+#: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 
-#: src/about.c:109
+#: src/about.c:111
 msgid "Active Developers"
 msgstr "Активен развивачи"
 
-#: src/about.c:110
-msgid "maintainer"
-msgstr ""
-
 #: src/about.c:112
+msgid "maintainer"
+msgstr ""
+
+#: src/about.c:114
 msgid "lead developer"
 msgstr ""
 
-#: src/about.c:115
+#: src/about.c:117
 msgid "developer & webmaster"
 msgstr ""
 
-#: src/about.c:116
+#: src/about.c:118
 msgid "win32 port"
 msgstr ""
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
 msgid "developer"
 msgstr "програмер"
 
-#: src/about.c:122
+#: src/about.c:125
 msgid "support"
 msgstr "поддршка"
 
-#: src/about.c:129
+#: src/about.c:132
 msgid "Crazy Patch Writers"
 msgstr ""
 
-#: src/about.c:144
+#: src/about.c:148
 msgid "Retired Developers"
 msgstr ""
 
-#: src/about.c:145
-msgid "former libfaim maintainer"
-msgstr ""
-
-#: src/about.c:146
-msgid "former lead developer"
-msgstr ""
-
 #: src/about.c:149
-msgid "former maintainer"
+msgid "former libfaim maintainer"
 msgstr ""
 
 #: src/about.c:150
-msgid "former Jabber developer"
-msgstr ""
-
-#: src/about.c:151
-msgid "original author"
+msgid "former lead developer"
+msgstr ""
+
+#: src/about.c:153
+msgid "former maintainer"
 msgstr ""
 
 #: src/about.c:154
+msgid "former Jabber developer"
+msgstr ""
+
+#: src/about.c:155
+msgid "original author"
+msgstr ""
+
+#: src/about.c:158
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/about.c:162
-msgid "Current Translators"
-msgstr ""
-
-#: src/about.c:163 src/about.c:197
-msgid "Catalan"
-msgstr ""
-
-#: src/about.c:164 src/about.c:198
-msgid "Czech"
-msgstr ""
-
-#: src/about.c:165
-msgid "Danish"
-msgstr ""
-
 #: src/about.c:166
-msgid "British English"
-msgstr ""
-
-#: src/about.c:167 src/about.c:199
-msgid "German"
-msgstr ""
-
-#: src/about.c:168 src/about.c:200
-msgid "Spanish"
-msgstr ""
-
-#: src/about.c:169 src/about.c:201
-msgid "Finnish"
-msgstr ""
-
-#: src/about.c:170 src/about.c:202
-msgid "French"
+msgid "Current Translators"
+msgstr ""
+
+#: src/about.c:167 src/about.c:206
+msgid "Bulgarian"
+msgstr ""
+
+#: src/about.c:168 src/about.c:207
+msgid "Catalan"
+msgstr ""
+
+#: src/about.c:169 src/about.c:208
+msgid "Czech"
+msgstr ""
+
+#: src/about.c:170
+msgid "Danish"
 msgstr ""
 
 #: src/about.c:171
-msgid "Hindi"
+msgid "British English"
 msgstr ""
 
 #: src/about.c:172
-msgid "Hungarian"
-msgstr ""
-
-#: src/about.c:173 src/about.c:204
-msgid "Italian"
-msgstr ""
-
-#: src/about.c:174 src/about.c:206
-msgid "Korean"
-msgstr ""
-
-#: src/about.c:175
-msgid "Dutch; Flemish"
-msgstr ""
-
-#: src/about.c:176
-msgid "Macedonian"
+msgid "Canadian English"
+msgstr ""
+
+#: src/about.c:173 src/about.c:209
+msgid "German"
+msgstr ""
+
+#: src/about.c:174 src/about.c:210
+msgid "Spanish"
+msgstr ""
+
+#: src/about.c:175 src/about.c:211
+msgid "Finnish"
+msgstr ""
+
+#: src/about.c:176 src/about.c:212
+msgid "French"
 msgstr ""
 
 #: src/about.c:177
-msgid "Norwegian"
-msgstr ""
-
-#: src/about.c:178 src/about.c:207
-msgid "Polish"
+msgid "Hebrew"
+msgstr ""
+
+#: src/about.c:178
+msgid "Hindi"
 msgstr ""
 
 #: src/about.c:179
-msgid "Portuguese"
-msgstr ""
-
-#: src/about.c:180
-msgid "Portuguese-Brazil"
-msgstr ""
-
-#: src/about.c:181
-msgid "Romanian"
-msgstr ""
-
-#: src/about.c:182 src/about.c:208
-msgid "Russian"
-msgstr ""
-
-#: src/about.c:183
-msgid "Serbian"
-msgstr ""
-
-#: src/about.c:184 src/about.c:210
-msgid "Swedish"
+msgid "Hungarian"
+msgstr ""
+
+#: src/about.c:180 src/about.c:213
+msgid "Italian"
+msgstr ""
+
+#: src/about.c:181 src/about.c:214
+msgid "Japanese"
+msgstr ""
+
+#: src/about.c:182
+msgid "Lithuanian"
+msgstr ""
+
+#: src/about.c:183 src/about.c:215
+msgid "Korean"
+msgstr ""
+
+#: src/about.c:184
+msgid "Dutch; Flemish"
 msgstr ""
 
 #: src/about.c:185
-msgid "Vietnamese"
-msgstr ""
-
-#: src/about.c:185
-msgid "Gnome Vi Team"
+msgid "Macedonian"
 msgstr ""
 
 #: src/about.c:186
-msgid "Simplified Chinese"
-msgstr ""
-
-#: src/about.c:187
-msgid "Traditional Chinese"
-msgstr ""
-
-#: src/about.c:194
-msgid "Past Translators"
+msgid "Norwegian"
+msgstr ""
+
+#: src/about.c:187 src/about.c:216
+msgid "Polish"
+msgstr ""
+
+#: src/about.c:188
+msgid "Portuguese"
+msgstr ""
+
+#: src/about.c:189
+msgid "Portuguese-Brazil"
+msgstr ""
+
+#: src/about.c:190
+msgid "Romanian"
+msgstr ""
+
+#: src/about.c:191 src/about.c:217 src/about.c:218
+msgid "Russian"
+msgstr ""
+
+#: src/about.c:192
+msgid "Serbian"
+msgstr ""
+
+#: src/about.c:193
+msgid "Slovenian"
+msgstr ""
+
+#: src/about.c:194 src/about.c:220
+msgid "Swedish"
 msgstr ""
 
 #: src/about.c:195
-msgid "Amharic"
+msgid "Vietnamese"
+msgstr ""
+
+#: src/about.c:195
+msgid "and the Gnome-Vi Team"
 msgstr ""
 
 #: src/about.c:196
-msgid "Bulgarian"
-msgstr ""
-
-#: src/about.c:203
-msgid "Hebrew"
+msgid "Simplified Chinese"
+msgstr ""
+
+#: src/about.c:197
+msgid "Traditional Chinese"
+msgstr ""
+
+#: src/about.c:204
+msgid "Past Translators"
 msgstr ""
 
 #: src/about.c:205
-msgid "Japanese"
-msgstr ""
-
-#: src/about.c:209
+msgid "Amharic"
+msgstr ""
+
+#: src/about.c:219
 msgid "Slovak"
 msgstr ""
 
-#: src/about.c:211
+#: src/about.c:221
 msgid "Chinese"
 msgstr ""
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr ""
 
-#: src/account.c:288
+#: src/account.c:286
 msgid "Fill out all fields completely."
 msgstr ""
 
-#: src/account.c:313
+#: src/account.c:311
 msgid "Original password"
 msgstr ""
 
-#: src/account.c:320
+#: src/account.c:318
 msgid "New password"
 msgstr ""
 
-#: src/account.c:327
+#: src/account.c:325
 msgid "New password (again)"
 msgstr ""
 
-#: src/account.c:333
+#: src/account.c:331
 #, c-format
 msgid "Change password for %s"
 msgstr ""
 
-#: src/account.c:341
+#: src/account.c:339
 msgid "Please enter your current password and your new password."
 msgstr ""
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
-#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
-#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
+#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3464
+#: src/protocols/oscar/oscar.c:6758 src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
+#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/request.h:1243
 msgid "OK"
 msgstr "Во ред"
 
-#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
-#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
-#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
-#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
-#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
-#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
+#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
+#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
+#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3330
+#: src/protocols/oscar/oscar.c:3371 src/protocols/oscar/oscar.c:3408
+#: src/protocols/oscar/oscar.c:3465 src/protocols/oscar/oscar.c:6759
+#: src/protocols/oscar/oscar.c:6855 src/protocols/oscar/oscar.c:6907
+#: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/account.c:374
+#: src/account.c:372
 #, c-format
 msgid "Change user information for %s"
 msgstr "Промени корисничко инфо за %s"
 
-#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Зачувај"
 
-#: src/away.c:210
+#: src/away.c:211
 msgid "Away!"
 msgstr "Отсутен!"
 
-#: src/away.c:275
+#: src/away.c:276
 msgid "I'm Back!"
 msgstr "Се вратив!"
 
-#: src/away.c:375
-msgid "New Away Message"
-msgstr "Нова порака за отсуство"
-
-#: src/away.c:395
+#: src/away.c:330
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Сигурно сакаш да избришеш %s?"
+
+#: src/away.c:332 src/away.c:423
 msgid "Remove Away Message"
 msgstr "Отстрани порака за отсуство"
 
-#: src/away.c:590
+#. Remove button
+#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/gtkrequest.c:248
+msgid "Remove"
+msgstr "Отстрани"
+
+#: src/away.c:403
+msgid "New Away Message"
+msgstr "Нова порака за отсуство"
+
+#: src/away.c:618
 msgid "Set All Away"
 msgstr "Постави „Отсутен“ на сите"
 
-#: src/blist.c:590 src/gtkprefs.c:2508
+#: src/blist.c:681
 msgid "Chats"
 msgstr "Разговори"
 
-#: src/blist.c:1192
+#: src/blist.c:1321
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1472,115 +1567,116 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1201
+#: src/blist.c:1330
 msgid "Group not removed"
 msgstr "Групата не е отстранета"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/blist.c:1578
-msgid "Invalid Groupname"
-msgstr "Невавалидно име на група"
-
-#: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr ""
-
-#: src/blist.c:2222
+#: src/blist.c:2001
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+
+#: src/blist.c:2004
 msgid "Buddy List Error"
 msgstr ""
 
-#: src/connection.c:119 src/connection.c:170
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr ""
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr ""
 
-#: src/connection.c:175
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr ""
 
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr ""
 
-#: src/conversation.c:296
+#: src/conversation.c:261
 msgid "Unable to send message. The message is too large."
 msgstr ""
 
-#: src/conversation.c:304
+#: src/conversation.c:269
 msgid "Unable to send message."
 msgstr ""
 
-#: src/conversation.c:1969
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: src/conversation.c:1972
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: src/conversation.c:2064
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: src/conversation.c:2067
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: src/conversation.c:2110
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2112
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: src/conversation.c:2185
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr ""
 
-#: src/conversation.c:2187
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2467
+#: src/conversation.c:2457
 msgid "Last created window"
 msgstr ""
 
-#: src/conversation.c:2469 src/gtkprefs.c:1413
+#: src/conversation.c:2459
+msgid "Separate IM and Chat windows"
+msgstr ""
+
+#: src/conversation.c:2461 src/gtkprefs.c:1384
 msgid "New window"
 msgstr ""
 
-#: src/conversation.c:2471
+#: src/conversation.c:2463
 msgid "By group"
 msgstr ""
 
-#: src/conversation.c:2473
+#: src/conversation.c:2465
 msgid "By account"
 msgstr ""
 
-#: src/dialogs.c:154
+#: src/dialogs.c:149
 msgid "Warn User"
 msgstr "Предупреди го корисникот"
 
-#: src/dialogs.c:173
+#: src/dialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1593,168 +1689,204 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/dialogs.c:182
+#: src/dialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "Предупреди _анонимно?"
 
-#: src/dialogs.c:189
+#: src/dialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/dialogs.c:301
+#: src/dialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:303 src/dialogs.c:304
+#: src/dialogs.c:297 src/dialogs.c:298
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/dialogs.c:313
+#: src/dialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/dialogs.c:315 src/dialogs.c:316
+#: src/dialogs.c:309 src/dialogs.c:310
 msgid "Remove Chat"
 msgstr "Отстрани разговор"
 
-#: src/dialogs.c:325
+#: src/dialogs.c:319
 #, 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 ""
 
-#: src/dialogs.c:328 src/dialogs.c:329
+#: src/dialogs.c:322 src/dialogs.c:323
 msgid "Remove Group"
 msgstr ""
 
-#: src/dialogs.c:346
+#: src/dialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:343 src/dialogs.c:344
 msgid "Remove Contact"
 msgstr ""
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
 msgid "_Screen name"
 msgstr ""
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
 msgid "_Account"
 msgstr ""
 
-#: src/dialogs.c:466
+#: src/dialogs.c:457
 msgid "New Instant Message"
 msgstr ""
 
-#: src/dialogs.c:468
+#: src/dialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 
-#: src/dialogs.c:522
+#: src/dialogs.c:513
 msgid "Get User Info"
 msgstr ""
 
-#: src/dialogs.c:524
+#: src/dialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr ""
-
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr ""
-
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "Избери фонт"
-
-#: src/dialogs.c:692
+#: src/dialogs.c:566
+msgid "Get User Log"
+msgstr ""
+
+#: src/dialogs.c:568
+#, fuzzy
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr ""
+"Внеси го името на пријателот што сакаш да го поканиш, заедно со пораката за "
+"покана."
+
+#: src/dialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr ""
 
-#: src/dialogs.c:694
+#: src/dialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 
-#: src/dialogs.c:704
+#: src/dialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:766
+#: src/dialogs.c:697
 msgid "New away message"
 msgstr ""
 
-#: src/dialogs.c:787
+#: src/dialogs.c:718
 msgid "Away title: "
 msgstr ""
 
-#: src/dialogs.c:843
-msgid "Save & Use"
-msgstr ""
-
-#: src/dialogs.c:847
-msgid "Use"
-msgstr ""
-
-#: src/dialogs.c:868
+#: src/dialogs.c:774
+#, fuzzy
+msgid "_Save"
+msgstr "Зачувај"
+
+#: src/dialogs.c:778
+msgid "Sa_ve & Use"
+msgstr ""
+
+#: src/dialogs.c:782
+#, fuzzy
+msgid "_Use"
+msgstr "Корисници"
+
+#: src/dialogs.c:804
 msgid "Alias Chat"
 msgstr ""
 
-#: src/dialogs.c:869
+#: src/dialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr ""
 
-#: src/dialogs.c:885
+#: src/dialogs.c:820
 msgid "Alias Contact"
 msgstr ""
 
-#: src/dialogs.c:886
+#: src/dialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr ""
 
-#: src/dialogs.c:903
+#: src/dialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ""
 
-#: src/dialogs.c:905
+#: src/dialogs.c:839
 msgid "Alias Buddy"
 msgstr ""
 
-#: src/ft.c:144
+#: src/ft.c:125
+msgid "That file does not exist."
+msgstr "Датотеката не постои"
+
+#: src/ft.c:134
+msgid "Cannot send a file of 0 bytes."
+msgstr "Не може да се прати датотека од 0 бајти."
+
+#: src/ft.c:194
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s сака да ти испрати %s (%s)"
+
+#: src/ft.c:229
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Прифати го преносот од %s?"
+
+#: src/ft.c:233
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Достапна е датотека за преземање од:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+
+#: src/ft.c:285
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: src/ft.c:157
+#: src/ft.c:298
 #, c-format
 msgid "%s was not found.\n"
 msgstr ""
 
-#: src/ft.c:786
+#: src/ft.c:927
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr ""
 
-#: src/ft.c:788
+#: src/ft.c:929
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr ""
@@ -1777,7 +1909,7 @@
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -h, --help [commmand]    Show help for command\n"
+"       -h, --help [command]     Show help for command\n"
 msgstr ""
 
 #: src/gaim-remote.c:174 src/gaim-remote.c:190
@@ -1818,23 +1950,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:372 src/gaimrc.c:1417
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1227 src/gtkblist.c:3017
 msgid "Alphabetical"
 msgstr ""
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1229 src/gtkblist.c:3018
 msgid "By status"
 msgstr ""
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1231 src/gtkblist.c:3019
 msgid "By log size"
 msgstr ""
 
-#: src/gtkaccount.c:289
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1843,171 +1975,165 @@
 msgstr ""
 
 #. Build the login options frame.
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:614
 msgid "Login Options"
 msgstr "Логин опции"
 
-#: src/gtkaccount.c:401
+#: src/gtkaccount.c:631
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:636 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Име за најава:"
 
-#: src/gtkaccount.c:479
+#: src/gtkaccount.c:709
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Алиас:"
 
-#: src/gtkaccount.c:488
+#: src/gtkaccount.c:718
 msgid "Remember password"
 msgstr "Запамети лозинка"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:542
+#: src/gtkaccount.c:774
 msgid "User Options"
 msgstr "Опции за корисникот"
 
-#: src/gtkaccount.c:555
+#: src/gtkaccount.c:787
 msgid "New mail notifications"
 msgstr "Известување за нова пошта"
 
-#: src/gtkaccount.c:564
-msgid "Buddy icon file:"
-msgstr "Датотека за икони на пријатели:"
-
-#: src/gtkaccount.c:574
-msgid "_Browse"
-msgstr "_Разгледај"
-
-#: src/gtkaccount.c:580
-msgid "_Reset"
-msgstr "_Ресетирај"
+#: src/gtkaccount.c:796
+#, fuzzy
+msgid "Buddy icon:"
+msgstr "Икона на пријател:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:642
+#: src/gtkaccount.c:885
 #, c-format
 msgid "%s Options"
 msgstr "%s Опции"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:778 src/gtkaccount.c:825
+#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
 msgid "Use Global Proxy Settings"
 msgstr ""
 
 #. No Proxy
-#: src/gtkaccount.c:784 src/gtkaccount.c:832
+#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
 msgid "No Proxy"
 msgstr ""
 
 #. HTTP
-#: src/gtkaccount.c:790 src/gtkaccount.c:839
+#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:796 src/gtkaccount.c:846
+#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
 msgid "SOCKS 4"
 msgstr ""
 
 #. SOCKS 5
-#: src/gtkaccount.c:802 src/gtkaccount.c:853
+#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
 msgid "SOCKS 5"
 msgstr ""
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
+#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr ""
 
-#: src/gtkaccount.c:899
+#: src/gtkaccount.c:1142
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:903
+#: src/gtkaccount.c:1146
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:919
+#: src/gtkaccount.c:1162
 msgid "Proxy Options"
 msgstr "Proxy Опции"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr ""
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1238
+#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Хост:"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1256
+#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Порта:"
 
-#: src/gtkaccount.c:958
+#: src/gtkaccount.c:1201
 msgid "_Username:"
 msgstr "_Корисничко име:"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1293
+#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "Ло_зинка:"
 
-#: src/gtkaccount.c:1331
+#: src/gtkaccount.c:1578
 msgid "Add Account"
 msgstr ""
 
-#: src/gtkaccount.c:1333
+#: src/gtkaccount.c:1580
 msgid "Modify Account"
 msgstr ""
 
 #. Add the disclosure
-#: src/gtkaccount.c:1357
+#: src/gtkaccount.c:1604
 msgid "Show more options"
 msgstr "Покажи повеќе опции"
 
-#: src/gtkaccount.c:1358
+#: src/gtkaccount.c:1605
 msgid "Show fewer options"
 msgstr "Покажи помалку опции"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Регистрирај"
 
-#: src/gtkaccount.c:1739
+#: src/gtkaccount.c:1997
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Сигурно сакаш да избришеш %s?"
 
-#: src/gtkaccount.c:1743 src/gtkrequest.c:239
+#: src/gtkaccount.c:2001 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Избриши"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
 msgid "Screen Name"
 msgstr "Име за најава"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
-#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
+#: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1372
 msgid "Online"
 msgstr "Поврзано"
 
-#: src/gtkaccount.c:1898
+#: src/gtkaccount.c:2160
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/gtkaccount.c:2210
+#: src/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/gtkaccount.c:2224
+#: src/gtkaccount.c:2487
 msgid ""
 "\n"
 "\n"
@@ -2017,221 +2143,232 @@
 "\n"
 "Дали сакаш да го додадеш во листата на пријатели?"
 
-#: src/gtkaccount.c:2228
+#: src/gtkaccount.c:2491
 msgid "Information"
 msgstr ""
 
-#: src/gtkaccount.c:2232
+#: src/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr ""
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
+#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
+#: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Додади"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-
-#: src/gtkblist.c:814
+#: src/gtkblist.c:815
 msgid "Join a Chat"
 msgstr ""
 
-#: src/gtkblist.c:835
+#: src/gtkblist.c:836
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr ""
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#: src/gtkblist.c:1133 src/gtkblist.c:3212
 msgid "Get _Info"
 msgstr "Инфо"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#: src/gtkblist.c:1136 src/gtkblist.c:3203
 msgid "I_M"
 msgstr "Порака"
 
-#: src/gtkblist.c:1092
+#: src/gtkblist.c:1141
+#, fuzzy
+msgid "_Send File"
+msgstr "Испрати датотека"
+
+#: src/gtkblist.c:1145
 msgid "Add Buddy _Pounce"
 msgstr ""
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1147
 msgid "View _Log"
 msgstr ""
 
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
 msgid "_Alias..."
 msgstr "_Алиас..."
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Отстрани"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr "Додади пријател"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1205
 msgid "Add a C_hat"
 msgstr ""
 
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr "Избриши група"
 
-#: src/gtkblist.c:1212
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr ""
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr ""
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1233
 msgid "Auto-Join"
 msgstr ""
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1257 src/gtkblist.c:1286
 msgid "_Collapse"
 msgstr ""
 
-#: src/gtkblist.c:1307
+#: src/gtkblist.c:1291
 msgid "_Expand"
 msgstr ""
 
-#: src/gtkblist.c:1964 src/gtkconv.c:3911
+#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
 #. Buddies menu
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2336
 msgid "/_Buddies"
 msgstr "/_Пријатели"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2337
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Пријатели/Нова порака..."
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2338
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Пријатели/Приклучи се во разговор"
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2339
 msgid "/Buddies/Get User _Info..."
 msgstr "/Пријатели/Корисничко инфо..."
 
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2340
+#, fuzzy
+msgid "/Buddies/View User _Log..."
+msgstr "/Пријатели/Корисничко инфо..."
+
+#: src/gtkblist.c:2342
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Пријатели/Покажи исклучени пријатели"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2343
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Пријатели/Покажи празни групи"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2344
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Пријатели/Додади пријател..."
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2345
 msgid "/Buddies/Add C_hat..."
 msgstr "/Пријатели/Додади разговор..."
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2346
 msgid "/Buddies/Add _Group..."
 msgstr "/Пријатели/Додади група"
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2348
 msgid "/Buddies/_Signoff"
 msgstr "/Пријатели/Исклучи се"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2349
 msgid "/Buddies/_Quit"
 msgstr "/Пријатели/Излез"
 
 #. Tools
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2352
 msgid "/_Tools"
 msgstr "/_Алатки"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2353
 msgid "/Tools/_Away"
 msgstr "/Алатки/_Отсутен"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2354
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Алатки/Buddy _Pounce"
 
-#: src/gtkblist.c:2330
-msgid "/Tools/P_rotocol Actions"
-msgstr "/Алатки/Дејствија за протокол"
-
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2355
+#, fuzzy
+msgid "/Tools/Account Ac_tions"
+msgstr "/Алатки/Акаунти"
+
+#: src/gtkblist.c:2356
+#, fuzzy
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Алатки/Дејствија на протокол"
+
+#: src/gtkblist.c:2358
 msgid "/Tools/A_ccounts"
 msgstr "/Алатки/Акаунти"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2359
 msgid "/Tools/_File Transfers"
 msgstr "/Алатки/_Пренос на датотеки"
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2360
 msgid "/Tools/R_oom List"
 msgstr "/Алатки/Листа на со_би"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2361
 msgid "/Tools/Pr_eferences"
 msgstr "/Алатки/Пара_метри"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2362
 msgid "/Tools/Pr_ivacy"
 msgstr "/Алатки/При_ватност"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2364
 msgid "/Tools/View System _Log"
 msgstr "/Алатки/Покажи системски лог"
 
 #. Help
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2367
 msgid "/_Help"
 msgstr "/_Помош"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2368
 msgid "/Help/Online _Help"
 msgstr "/Помош/Онлајн помош"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2369
 msgid "/Help/_Debug Window"
 msgstr "/Помош/Прозорец за дебагирање"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2370
 msgid "/Help/_About"
 msgstr "/Помош/_За"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "Преименувај група"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "Ново има на групата"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "Внеси ново има за означената група."
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2240,16 +2377,19 @@
 "\n"
 "<b>Акаунт:</b> %s"
 
-#: src/gtkblist.c:2453
-msgid "<b>Status:</b> Offline"
+#: src/gtkblist.c:2481
+#, fuzzy
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
 msgstr "<b>Статус:</b> Исклучен"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2257,7 +2397,7 @@
 "\n"
 "<b>Акаунт:</b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2265,7 +2405,7 @@
 "\n"
 "<b>Контакт алиас:</b>"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2273,7 +2413,7 @@
 "\n"
 "<b>Алиас:</b>"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2281,7 +2421,7 @@
 "\n"
 "<b>Надимак: </b>"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2289,7 +2429,7 @@
 "\n"
 "<b>Најавен: </b>"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2297,7 +2437,7 @@
 "\n"
 "<b>Неактивен:</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2305,7 +2445,7 @@
 "\n"
 "<b>Предупреден:</b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2313,7 +2453,7 @@
 "\n"
 "<b>Опис: </b> Spooky"
 
-#: src/gtkblist.c:2493
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2321,7 +2461,7 @@
 "\n"
 "<b>Статус</b>: Awesome"
 
-#: src/gtkblist.c:2494
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2329,77 +2469,101 @@
 "\n"
 "<b>Статус</b>: Rockin'"
 
-#: src/gtkblist.c:2764
+#: src/gtkblist.c:2804
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Неактивен (%dч%02dм) "
 
-#: src/gtkblist.c:2766
+#: src/gtkblist.c:2806
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Неактивен (%dм) "
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2811
 #, c-format
 msgid "Warned (%d%%) "
 msgstr ""
 
-#: src/gtkblist.c:2774
+#: src/gtkblist.c:2814
 msgid "Offline "
 msgstr "Исклучен "
 
-#: src/gtkblist.c:3032
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2932
+#, fuzzy
+msgid "/Buddies/Join a Chat..."
+msgstr "/Пријатели/Приклучи се во разговор"
+
+#: src/gtkblist.c:2935
+#, fuzzy
+msgid "/Tools/Room List"
+msgstr "/Алатки/Листа на со_би"
+
+#: src/gtkblist.c:2938
+#, fuzzy
+msgid "/Tools/Privacy"
+msgstr "/Алатки/При_ватност"
+
+#: src/gtkblist.c:3085
 msgid "/Tools/Away"
 msgstr "/Алатки/Отсутен"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3088
 msgid "/Tools/Buddy Pounce"
 msgstr ""
 
-#: src/gtkblist.c:3038
-msgid "/Tools/Protocol Actions"
+#: src/gtkblist.c:3091
+#, fuzzy
+msgid "/Tools/Account Actions"
+msgstr "/Алатки/Акаунти"
+
+#: src/gtkblist.c:3094
+#, fuzzy
+msgid "/Tools/Plugin Actions"
 msgstr "/Алатки/Дејствија на протокол"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3183
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Пријатели/Покажи исклучени пријатели"
 
-#: src/gtkblist.c:3128
+#: src/gtkblist.c:3185
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Пријатели/Покажи празни групи"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3209
 msgid "Send a message to the selected buddy"
 msgstr "Испрати порака до одбраниот пријател"
 
-#: src/gtkblist.c:3161
+#: src/gtkblist.c:3218
 msgid "Get information on the selected buddy"
 msgstr "Види информации за одбраниот пријател"
 
-#: src/gtkblist.c:3164
+#: src/gtkblist.c:3221
 msgid "_Chat"
 msgstr "_Разговор"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3226
 msgid "Join a chat room"
 msgstr ""
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3229
 msgid "_Away"
 msgstr "_Отсутен"
 
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3234
 msgid "Set an away message"
 msgstr "Намести порака за отсуство"
 
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
+#: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
 msgid "Add Buddy"
 msgstr "Додади пријател"
 
-#: src/gtkblist.c:3932
+#: src/gtkblist.c:3996
 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. "
@@ -2407,29 +2571,35 @@
 msgstr ""
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:4056 src/gtkblist.c:4340
 msgid "Account:"
 msgstr "Акаунт:"
 
-#: src/gtkblist.c:4243
+#: src/gtkblist.c:4299
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+#: src/gtkblist.c:4306
 msgid "Add Chat"
 msgstr "Додади разговор"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4330
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 
-#: src/gtkblist.c:4345
+#: src/gtkblist.c:4408
 msgid "Add Group"
 msgstr "Додади група"
 
-#: src/gtkblist.c:4346
+#: src/gtkblist.c:4409
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: src/gtkblist.c:4866
+#: src/gtkblist.c:4976 src/gtkblist.c:5073
 msgid "No actions available"
 msgstr ""
 
@@ -2478,25 +2648,61 @@
 msgid "Time"
 msgstr "Време"
 
-#: src/gtkconv.c:172
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Разговор со %s</h1>\n"
-
-#: src/gtkconv.c:190
-msgid "That file already exists"
-msgstr "Датотеката веќе постои"
-
-#: src/gtkconv.c:191 src/gtkft.c:1106
-msgid "Would you like to overwrite it?"
-msgstr "Сакаш да ја пребришеш?"
-
-#: src/gtkconv.c:505
+#: src/gtkconv.c:314
+#, c-format
+msgid "me is using Gaim v%s."
+msgstr ""
+
+#: src/gtkconv.c:323
+msgid "Supported debug options are:  version"
+msgstr ""
+
+#: src/gtkconv.c:336
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+
+#: src/gtkconv.c:370
+msgid "No such command (in this context)."
+msgstr ""
+
+#: src/gtkconv.c:443
+msgid ""
+"No such command. If you didn't mean to type a command, you can turn commands "
+"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
+"commands."
+msgstr ""
+
+#: src/gtkconv.c:451
+msgid ""
+"Syntax Error:  You typed the wrong number of arguments to that command. If "
+"you didn't mean to type a command, you can turn commands off from Tools-"
+">Preferences->Interface->Conversation->Enable \"slash\" commands."
+msgstr ""
+
+#: src/gtkconv.c:458
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+#: src/gtkconv.c:465
+msgid "That command only works in Chats, not IMs."
+msgstr ""
+
+#: src/gtkconv.c:468
+msgid "That command only works in IMs, not Chats."
+msgstr ""
+
+#: src/gtkconv.c:472
+msgid "That command doesn't work on this protocol."
+msgstr ""
+
+#: src/gtkconv.c:693
 msgid "Invite Buddy Into Chat Room"
 msgstr "Покани пријател во соба за разговор"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:533
+#: src/gtkconv.c:721
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2504,292 +2710,337 @@
 "Внеси го името на пријателот што сакаш да го поканиш, заедно со пораката за "
 "покана."
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:742
 msgid "_Buddy:"
 msgstr "_Пријател:"
 
-#: src/gtkconv.c:574
+#: src/gtkconv.c:762
 msgid "_Message:"
 msgstr "_Порака:"
 
-#: src/gtkconv.c:667
+#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr ""
+
+#: src/gtkconv.c:804
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Разговор со %s</h1>\n"
+
+#: src/gtkconv.c:818
+msgid "Save Conversation"
+msgstr "Зачувај разговор"
+
+#: src/gtkconv.c:895 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Пронајди"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:921 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Барај за:"
 
-#: src/gtkconv.c:1071
+#: src/gtkconv.c:1338
 msgid "IM"
 msgstr "Порака"
 
-#: src/gtkconv.c:1079
+#. Block button
+#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:6798
+msgid "Send File"
+msgstr "Испрати датотека"
+
+#: src/gtkconv.c:1356
 msgid "Un-Ignore"
 msgstr "Не игнорирај"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:817
+#: src/gtkconv.c:1358 src/gtkprefs.c:826
 msgid "Ignore"
 msgstr "Игнорирај"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1367 src/gtkconv.c:3687
 msgid "Info"
 msgstr "Инфо"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1376
 msgid "Get Away Msg"
 msgstr "Види причина за отсуство"
 
-#. Remove button
-#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
-#: src/gtkrequest.c:241
-msgid "Remove"
-msgstr "Отстрани"
-
-#: src/gtkconv.c:2201
+#: src/gtkconv.c:2497
+msgid "Unable to save icon file to disk."
+msgstr ""
+
+#: src/gtkconv.c:2514
+msgid "Save Icon"
+msgstr ""
+
+#: src/gtkconv.c:2544
 msgid "Animate"
 msgstr "Анимирај"
 
-#: src/gtkconv.c:2206
+#: src/gtkconv.c:2549
 msgid "Hide Icon"
 msgstr "Скриј икона"
 
-#: src/gtkconv.c:2212
+#: src/gtkconv.c:2555
 msgid "Save Icon As..."
 msgstr "Зачувај икона како..."
 
-#: src/gtkconv.c:2579
+#: src/gtkconv.c:2939
 msgid "User is typing..."
 msgstr "Корисникот пишува..."
 
-#: src/gtkconv.c:2587
+#: src/gtkconv.c:2947
 msgid "User has typed something and paused"
 msgstr "Корисникот напиша нешто и паузира"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:3050
 msgid "_Send As"
 msgstr "_Испрати како"
 
-#: src/gtkconv.c:3110
-msgid "Save Conversation"
-msgstr "Зачувај разговор"
-
 #. Conversation menu
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3450
 msgid "/_Conversation"
 msgstr "/_Разговор"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3452
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Разговор/_Нова порака..."
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3457
 msgid "/Conversation/_Find..."
 msgstr "/Разговор/_Барај..."
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3459
 msgid "/Conversation/View _Log"
 msgstr "/Разговор/Преглед на _Log"
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3460
 msgid "/Conversation/_Save As..."
 msgstr "/Разговор/_Зачувај како..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3462
+#, fuzzy
+msgid "/Conversation/Clear"
+msgstr "/Разговор/_Затвори"
+
+#: src/gtkconv.c:3466
+#, fuzzy
+msgid "/Conversation/Se_nd File..."
+msgstr "/Разговор/_Барај..."
+
+#: src/gtkconv.c:3467
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Разговор/Додај пријател pounce..."
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3469
 msgid "/Conversation/_Get Info"
 msgstr "/Разговор/Ин_фо"
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3471
 msgid "/Conversation/_Warn..."
 msgstr "/Разговор/_Предупреди..."
 
-#: src/gtkconv.c:3148
+#: src/gtkconv.c:3473
 msgid "/Conversation/In_vite..."
 msgstr "/Разговор/П_окани..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3478
 msgid "/Conversation/A_lias..."
 msgstr "/Разговор/А_лиас..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3480
 msgid "/Conversation/_Block..."
 msgstr "/Разговор/_Блокирај..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3482
 msgid "/Conversation/_Add..."
 msgstr "/Разговор/_Додади..."
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3484
 msgid "/Conversation/_Remove..."
 msgstr "/Разговор/_Отстрани..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3489
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Разговор/Внеси Ли_нк..."
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3491
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Разговор/Внеси слика..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3496
 msgid "/Conversation/_Close"
 msgstr "/Разговор/_Затвори"
 
 #. Options
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3500
 msgid "/_Options"
 msgstr "/_Опции"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3501
 msgid "/Options/Enable _Logging"
 msgstr "/Опции/Овозможи логирање"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3502
 msgid "/Options/Enable _Sounds"
 msgstr "/Опции/Овозможи звуци"
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3503
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Опции/Прикажи алатник за форматирање"
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3504
+msgid "/Options/Show T_imestamps"
+msgstr ""
+
+#: src/gtkconv.c:3546
 msgid "/Conversation/View Log"
 msgstr "/Разговор/Види Log"
 
-#: src/gtkconv.c:3225
+#: src/gtkconv.c:3551
+#, fuzzy
+msgid "/Conversation/Send File..."
+msgstr "/Разговор/Покани..."
+
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
-#: src/gtkconv.c:3231
+#: src/gtkconv.c:3561
 msgid "/Conversation/Get Info"
 msgstr "/Разговор/Види инфо"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3565
 msgid "/Conversation/Warn..."
 msgstr "/Разговор/Предупреди..."
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3569
 msgid "/Conversation/Invite..."
 msgstr "/Разговор/Покани..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3575
 msgid "/Conversation/Alias..."
 msgstr "/Разговор/Алиас..."
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3579
 msgid "/Conversation/Block..."
 msgstr "/Разговор/Блокирај..."
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3583
 msgid "/Conversation/Add..."
 msgstr "/Разговор/Додади..."
 
-#: src/gtkconv.c:3257
+#: src/gtkconv.c:3587
 msgid "/Conversation/Remove..."
 msgstr "/Разговор/Отстрани..."
 
-#: src/gtkconv.c:3263
+#: src/gtkconv.c:3593
 msgid "/Conversation/Insert Link..."
 msgstr "/Разговор/Внеси линк..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Image..."
 msgstr "/Разгворо/Внеси слика..."
 
-#: src/gtkconv.c:3273
+#: src/gtkconv.c:3603
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: src/gtkconv.c:3276
+#: src/gtkconv.c:3606
 msgid "/Options/Enable Sounds"
 msgstr ""
 
-#: src/gtkconv.c:3279
+#: src/gtkconv.c:3609
 msgid "/Options/Show Formatting Toolbar"
 msgstr ""
 
+#: src/gtkconv.c:3612
+msgid "/Options/Show Timestamps"
+msgstr ""
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
+#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
 msgid "Send"
 msgstr "Испрати"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3652
 msgid "Warn"
 msgstr "Предупреди"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3655
 msgid "Warn the user"
 msgstr "Предупреди го корисникот"
 
 #. Block button
-#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "Блокирај"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3662
 msgid "Block the user"
 msgstr "Блокирај го корисникот"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3669
+#, fuzzy
+msgid "Send a file to the user"
+msgstr "Испрати порака до одбраниот пријател"
+
+#: src/gtkconv.c:3676
 msgid "Add the user to your buddy list"
 msgstr "Додади го корисникот во листата на пријатели"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3683
 msgid "Remove the user from your buddy list"
 msgstr "Острани го корисникот од листата на пријатели"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3671
+#: src/gtkconv.c:3690 src/gtkconv.c:4039
 msgid "Get the user's information"
 msgstr "Види ги информациите за корисникот"
 
 #. Invite
-#: src/gtkconv.c:3416
+#: src/gtkconv.c:3770
 msgid "Invite"
 msgstr "Покани"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3773
 msgid "Invite a user"
 msgstr "Покани корисник"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3780
 msgid "Add the chat to your buddy list"
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3787
 msgid "Remove the chat from your buddy list"
 msgstr ""
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3897
 msgid "Topic:"
 msgstr "Тема:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3960
 msgid "0 people in room"
 msgstr ""
 
-#: src/gtkconv.c:3648
+#: src/gtkconv.c:4016
 msgid "IM the user"
 msgstr "Порака до корисникот"
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:4028
 msgid "Ignore the user"
 msgstr "Игнорирај го корисникот"
 
-#: src/gtkconv.c:4202
+#: src/gtkconv.c:4627
 msgid "Close conversation"
 msgstr "Затвори разговор"
 
-#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2797,276 +3048,293 @@
 msgstr[1] "%d корисника во собата"
 msgstr[2] "%d корисник во собата"
 
-#: src/gtkconv.c:5484 src/gtkconv.c:5487
+#: src/gtkconv.c:5901 src/gtkconv.c:5904
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Разговор/Затвори"
 
-#: src/gtkdebug.c:135
+#: src/gtkconv.c:6276
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+
+#: src/gtkconv.c:6279
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+
+#: src/gtkconv.c:6283
+msgid "help:  List available commands."
+msgstr ""
+
+#: src/gtkconv.c:6287
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr ""
+
+#: src/gtkdebug.c:197
+msgid "Save Debug Log"
+msgstr ""
+
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Прозорец за дебаг"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr ""
 
-#: src/gtkft.c:135
+#: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
 msgstr ""
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:157 src/gtkft.c:967
 msgid "Finished"
 msgstr "Завршено"
 
-#: src/gtkft.c:209
+#: src/gtkft.c:160 src/gtkft.c:918
+msgid "Canceled"
+msgstr "Откажано"
+
+#: src/gtkft.c:163
+msgid "Waiting for transfer to begin"
+msgstr ""
+
+#: src/gtkft.c:216
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Прием од:</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:219
 msgid "<b>Sending To:</b>"
 msgstr "<b>Испраќање до:</b>"
 
-#: src/gtkft.c:386
+#: src/gtkft.c:393
 msgid "There is no application configured to open this type of file."
 msgstr ""
 
-#: src/gtkft.c:391
+#: src/gtkft.c:398
 msgid "An error occurred while opening the file."
 msgstr ""
 
-#: src/gtkft.c:482
+#: src/gtkft.c:489
 msgid "Progress"
 msgstr "Прогрес"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:496
 msgid "Filename"
 msgstr "Датотека"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:503
 msgid "Size"
 msgstr "Големина"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:510
 msgid "Remaining"
 msgstr "Преостанато"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:540
 msgid "Filename:"
 msgstr "Датотека:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:541
 msgid "Status:"
 msgstr "Статус:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:542
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:543
 msgid "Time Elapsed:"
 msgstr "Изминато време:"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:544
 msgid "Time Remaining:"
 msgstr "Останато време:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:641
 msgid "_Keep the dialog open"
 msgstr "_Чувај го прозорецот отворен"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:651
 msgid "_Clear finished transfers"
 msgstr "_Отстрани ги готовите преноси од листата"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:660
 msgid "Show transfer details"
 msgstr "Покажи детали за пренос"
 
-#: src/gtkft.c:654
+#: src/gtkft.c:661
 msgid "Hide transfer details"
 msgstr "Скриј детали за пренос"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:703 src/stock.c:90
 msgid "_Pause"
 msgstr "_Пауза"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:713
 msgid "_Resume"
 msgstr "П_родолжи"
 
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "Откажано"
-
-#: src/gtkft.c:910
+#: src/gtkft.c:920
 msgid "Failed"
 msgstr "Неуспешно"
 
-#: src/gtkft.c:1082
-msgid "That file does not exist."
-msgstr "Датотеката не постои"
-
-#: src/gtkft.c:1091
-msgid "Cannot send a file of 0 bytes."
-msgstr "Не може да се прати датотека од 0 бајти."
-
-#: src/gtkft.c:1105
-msgid "That file already exists."
-msgstr "Датотеката веќе постои."
-
-#: src/gtkft.c:1131
-msgid "Open..."
-msgstr "Отвори..."
-
-#: src/gtkft.c:1133
-msgid "Save As..."
-msgstr "Зачувај како..."
-
-#: src/gtkft.c:1183
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s сака да ти испрати %s (%s)"
-
-#: src/gtkft.c:1216
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Прифати го преносот од %s?"
-
-#: src/gtkft.c:1220
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Достапна е датотека за преземање од:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-
-#: src/gtkimhtml.c:1139
+#: src/gtkimhtml.c:602
+msgid "Pa_ste As Text"
+msgstr ""
+
+#: src/gtkimhtml.c:1047
+msgid "Hyperlink color"
+msgstr ""
+
+#: src/gtkimhtml.c:1048
+msgid "Color to draw hyperlinks."
+msgstr ""
+
+#: src/gtkimhtml.c:1253
 msgid "_Copy E-Mail Address"
 msgstr "_Копирај е-пошта"
 
-#: src/gtkimhtml.c:1151
+#: src/gtkimhtml.c:1265
 msgid "_Copy Link Location"
 msgstr "_Копирај локација на линк"
 
-#: src/gtkimhtml.c:1161
+#: src/gtkimhtml.c:1275
 msgid "_Open Link in Browser"
 msgstr "_Отвори го линкот во прелистувач"
 
-#: src/gtkimhtml.c:2643
+#: src/gtkimhtml.c:2797
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2805
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Грешка при записот на сликата: %s"
 
-#: src/gtkimhtml.c:2660
+#: src/gtkimhtml.c:2814
 msgid "Save Image"
 msgstr "Зачувај ја сликата"
 
-#: src/gtkimhtml.c:2683
+#: src/gtkimhtml.c:2837
 msgid "_Save Image..."
 msgstr "_Зачувај слика..."
 
-#: src/gtkimhtmltoolbar.c:383
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "Избери фонт"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:392
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:387
+#: src/gtkimhtmltoolbar.c:397
 msgid "_Description"
 msgstr "_Опис"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "Внеси линк"
-
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:400
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:398
+#: src/gtkimhtmltoolbar.c:404
+msgid "Please enter the URL of the link that you want to insert."
+msgstr ""
+
+#: src/gtkimhtmltoolbar.c:409
+msgid "Insert Link"
+msgstr "Внеси линк"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "_Внеси"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:481
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
 msgid "Insert Image"
 msgstr "Внеси слика"
 
+#: src/gtkimhtmltoolbar.c:655
+msgid "This theme has no available smileys."
+msgstr ""
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:670
 msgid "Smile!"
 msgstr "Смајли!"
 
-#: src/gtkimhtmltoolbar.c:825
+#: src/gtkimhtmltoolbar.c:888
 msgid "Bold"
 msgstr "Задебелено"
 
-#: src/gtkimhtmltoolbar.c:836
+#: src/gtkimhtmltoolbar.c:899
 msgid "Italic"
 msgstr "Искосено"
 
-#: src/gtkimhtmltoolbar.c:847
+#: src/gtkimhtmltoolbar.c:910
 msgid "Underline"
 msgstr "Подвлечено"
 
-#: src/gtkimhtmltoolbar.c:863
+#: src/gtkimhtmltoolbar.c:926
 msgid "Larger font size"
 msgstr "Поголем фонт"
 
-#: src/gtkimhtmltoolbar.c:875
+#: src/gtkimhtmltoolbar.c:938
 msgid "Smaller font size"
 msgstr "Помал фонт"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:955
 msgid "Font Face"
 msgstr "Фонт"
 
-#: src/gtkimhtmltoolbar.c:904
+#: src/gtkimhtmltoolbar.c:967
 msgid "Foreground font color"
 msgstr "Боја на фонт"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:979
 msgid "Background color"
 msgstr "Боја на позадина"
 
-#: src/gtkimhtmltoolbar.c:931
+#: src/gtkimhtmltoolbar.c:994
 msgid "Insert link"
 msgstr "Внеси линк"
 
-#: src/gtkimhtmltoolbar.c:941
+#: src/gtkimhtmltoolbar.c:1004
 msgid "Insert image"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:952
+#: src/gtkimhtmltoolbar.c:1015
 msgid "Insert smiley"
 msgstr ""
 
-#: src/gtklog.c:282
+#: src/gtklog.c:302
 msgid "Conversations with"
 msgstr ""
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:392 src/gtklog.c:408
 msgid "System Log"
 msgstr ""
 
@@ -3078,17 +3346,17 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:240
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3096,7 +3364,7 @@
 "%s%s%s%s"
 msgstr ""
 
-#: src/gtknotify.c:255
+#: src/gtknotify.c:261
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3104,758 +3372,678 @@
 "%s"
 msgstr ""
 
-#: src/gtknotify.c:441
+#: src/gtknotify.c:429
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr ""
 
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
-#: src/gtknotify.c:581
+#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr ""
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
+#: src/gtknotify.c:443 src/gtknotify.c:458
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr ""
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: src/gtkpounce.c:143
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr ""
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:387 src/gtkpounce.c:890
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr ""
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:405
 msgid "Pounce Who"
 msgstr ""
 
-#: src/gtkpounce.c:381
-msgid "_Buddy Name:"
-msgstr ""
+#: src/gtkpounce.c:432
+#, fuzzy
+msgid "_Buddy name:"
+msgstr "_Пријател:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:456
 msgid "Pounce When"
 msgstr ""
 
-#: src/gtkpounce.c:412
+#: src/gtkpounce.c:464 src/main.c:296
 msgid "_Sign on"
 msgstr ""
 
-#: src/gtkpounce.c:414
+#: src/gtkpounce.c:466
 msgid "Sign _off"
 msgstr ""
 
-#: src/gtkpounce.c:416
+#: src/gtkpounce.c:468
 msgid "A_way"
 msgstr ""
 
-#: src/gtkpounce.c:418
+#: src/gtkpounce.c:470
 msgid "Re_turn from away"
 msgstr ""
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:472
 msgid "_Idle"
 msgstr ""
 
-#: src/gtkpounce.c:422
+#: src/gtkpounce.c:474
 msgid "Retur_n from idle"
 msgstr ""
 
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:476
 msgid "Buddy starts _typing"
 msgstr ""
 
-#: src/gtkpounce.c:426
+#: src/gtkpounce.c:478
 msgid "Buddy stops t_yping"
 msgstr ""
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:507
 msgid "Pounce Action"
 msgstr ""
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:515
 msgid "Op_en an IM window"
 msgstr "Отвори прозорец за пораки"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:517
 msgid "_Popup notification"
 msgstr ""
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:519
 msgid "Send a _message"
 msgstr "Испрати порака"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:521
 msgid "E_xecute a command"
 msgstr ""
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:523
 msgid "P_lay a sound"
 msgstr ""
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:527
 msgid "B_rowse..."
 msgstr ""
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:529
 msgid "Bro_wse..."
 msgstr ""
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr ""
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:613
 msgid "Sav_e this pounce after activation"
 msgstr ""
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:897
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:813
-#, c-format
-msgid "%s has started typing to you"
-msgstr ""
-
-#: src/gtkpounce.c:814
-#, c-format
-msgid "%s has signed on"
-msgstr ""
-
-#: src/gtkpounce.c:815
-#, c-format
-msgid "%s has returned from being idle"
-msgstr ""
-
-#: src/gtkpounce.c:816
-#, c-format
-msgid "%s has returned from being away"
-msgstr ""
-
-#: src/gtkpounce.c:817
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr ""
-
-#: src/gtkpounce.c:818
-#, c-format
-msgid "%s has signed off"
-msgstr ""
-
-#: src/gtkpounce.c:819
-#, c-format
-msgid "%s has become idle"
-msgstr ""
-
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:961
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr ""
+
+#: src/gtkpounce.c:963
+#, fuzzy, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s сака да ти испрати %s (%s)"
+
+#: src/gtkpounce.c:965
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr ""
+
+#: src/gtkpounce.c:967
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr ""
+
+#: src/gtkpounce.c:969
+#, fuzzy, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s сака да ти испрати %s (%s)"
+
+#: src/gtkpounce.c:971
+#, fuzzy, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s сака да ти испрати %s (%s)"
+
+#: src/gtkpounce.c:973
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr ""
+
+#: src/gtkpounce.c:975
+#, fuzzy, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s сака да ти испрати %s (%s)"
+
+#: src/gtkpounce.c:976
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: src/gtkprefs.c:399
+#: src/gtkprefs.c:446
 msgid "Interface Options"
 msgstr ""
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:448
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr ""
 
-#: src/gtkprefs.c:595
+#: src/gtkprefs.c:675
 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 ""
 
-#: src/gtkprefs.c:630
+#: src/gtkprefs.c:715
 msgid "Icon"
 msgstr ""
 
-#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr ""
 
-#: src/gtkprefs.c:704
-msgid "Style"
-msgstr ""
-
-#: src/gtkprefs.c:705
-msgid "_Bold"
-msgstr ""
-
-#: src/gtkprefs.c:707
-msgid "_Italic"
-msgstr ""
-
-#: src/gtkprefs.c:709
-msgid "_Underline"
-msgstr ""
-
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:719
-msgid "_Strikethrough"
-msgstr ""
-
-#: src/gtkprefs.c:722
-msgid "Face"
-msgstr ""
-
-#: src/gtkprefs.c:725
-msgid "Use custo_m face"
-msgstr ""
-
-#: src/gtkprefs.c:742
-msgid "Use custom si_ze"
-msgstr ""
-
-#: src/gtkprefs.c:754
-msgid "Color"
-msgstr ""
-
-#: src/gtkprefs.c:758
-msgid "_Text color"
-msgstr ""
-
-#: src/gtkprefs.c:777
-msgid "Bac_kground color"
-msgstr ""
-
-#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
-msgid "Display"
-msgstr ""
-
-#: src/gtkprefs.c:806
-msgid "Show graphical _smileys"
-msgstr ""
-
-#: src/gtkprefs.c:808
-msgid "Show _timestamp on messages"
-msgstr ""
-
-#: src/gtkprefs.c:810
-msgid "Show _URLs as links"
-msgstr ""
-
-#: src/gtkprefs.c:814
-msgid "_Highlight misspelled words"
-msgstr ""
-
 #: src/gtkprefs.c:818
-msgid "Ignore c_olors"
-msgstr ""
-
-#: src/gtkprefs.c:820
-msgid "Ignore font _faces"
-msgstr "Игнорирај типови на фонт"
+msgid "Display"
+msgstr ""
+
+#: src/gtkprefs.c:819
+msgid "Show _timestamp on messages"
+msgstr ""
 
 #: src/gtkprefs.c:822
+msgid "_Highlight misspelled words"
+msgstr ""
+
+#: src/gtkprefs.c:827
+msgid "Ignore c_olors"
+msgstr ""
+
+#: src/gtkprefs.c:829
+msgid "Ignore font _faces"
+msgstr "Игнорирај типови на фонт"
+
+#: src/gtkprefs.c:831
 msgid "Ignore font si_zes"
 msgstr "Игнорирај големинина фонт"
 
-#: src/gtkprefs.c:835
-msgid "Send Message"
-msgstr "Испрати порака"
-
-#: src/gtkprefs.c:836
-msgid "Enter _sends message"
+#: src/gtkprefs.c:834
+msgid "_Ignore formatting on incoming messages"
 msgstr ""
 
 #: src/gtkprefs.c:838
+msgid "Default Formatting"
+msgstr ""
+
+#: src/gtkprefs.c:840
+msgid "_Send default formatting with outgoing messages"
+msgstr ""
+
+#: src/gtkprefs.c:872
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+
+#: src/gtkprefs.c:875
+msgid "_Clear Formatting"
+msgstr ""
+
+#: src/gtkprefs.c:912
+msgid "Send Message"
+msgstr "Испрати порака"
+
+#: src/gtkprefs.c:913
+msgid "Enter _sends message"
+msgstr ""
+
+#: src/gtkprefs.c:915
 msgid "C_ontrol-Enter sends message"
 msgstr ""
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr ""
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:919
 msgid "_Escape closes window"
 msgstr ""
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:922
 msgid "Insertions"
 msgstr ""
 
-#: src/gtkprefs.c:846
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr ""
-
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:923
+msgid "Control-{B/I/U} changes _formatting"
+msgstr ""
+
+#: src/gtkprefs.c:925
 msgid "Control-(number) _inserts smileys"
 msgstr ""
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:941
 msgid "Buddy List Sorting"
 msgstr "Подредување на листата на пријатели"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:950
 msgid "_Sorting:"
 msgstr ""
 
-#: src/gtkprefs.c:878
-msgid "Buddy List Toolbar"
-msgstr ""
-
-#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
+#: src/gtkprefs.c:956 src/gtkprefs.c:1009
 msgid "Show _buttons as:"
 msgstr ""
 
-#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
+#: src/gtkprefs.c:958 src/gtkprefs.c:1011
 msgid "Pictures"
 msgstr ""
 
-#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
+#: src/gtkprefs.c:959 src/gtkprefs.c:1012
 msgid "Text"
 msgstr ""
 
-#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+#: src/gtkprefs.c:960 src/gtkprefs.c:1013
 msgid "Pictures and text"
 msgstr ""
 
-#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
+#: src/gtkprefs.c:963
 msgid "_Raise window on events"
 msgstr ""
 
-#: src/gtkprefs.c:891
-msgid "Group Display"
-msgstr ""
-
-#: src/gtkprefs.c:892
-msgid "Show _numbers in groups"
-msgstr ""
-
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:966
 msgid "Buddy Display"
 msgstr ""
 
-#: src/gtkprefs.c:896 src/gtkprefs.c:1032
+#: src/gtkprefs.c:967 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr ""
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:969
 msgid "Show _warning levels"
 msgstr ""
 
-#: src/gtkprefs.c:900
-msgid "Show idle _times"
-msgstr ""
-
-#: src/gtkprefs.c:902
-msgid "Dim i_dle buddies"
-msgstr ""
-
-#: src/gtkprefs.c:904
-msgid "_Automatically expand contacts"
-msgstr ""
-
-#: src/gtkprefs.c:929
-msgid "_Placement:"
-msgstr ""
-
-#: src/gtkprefs.c:936
-msgid "Send _URLs as links"
-msgstr ""
-
-#: src/gtkprefs.c:939
-msgid "Show _formatting toolbar"
-msgstr ""
-
-#: src/gtkprefs.c:942
-msgid "Show a_liases in tabs/titles"
-msgstr ""
-
-#: src/gtkprefs.c:945
-msgid "Tab Options"
-msgstr ""
-
-#: src/gtkprefs.c:947
-msgid "_Tab Placement:"
-msgstr ""
-
-#: src/gtkprefs.c:949
-msgid "Top"
-msgstr ""
-
-#: src/gtkprefs.c:950
-msgid "Bottom"
-msgstr ""
-
-#: src/gtkprefs.c:951
-msgid "Left"
-msgstr ""
-
-#: src/gtkprefs.c:952
-msgid "Right"
-msgstr ""
-
-#: src/gtkprefs.c:958
-msgid "Show IMs and chats in _tabbed windows"
-msgstr ""
-
-#: src/gtkprefs.c:961
-msgid "Show IMs and chats in _same tabbed window"
-msgstr ""
-
 #: src/gtkprefs.c:971
-msgid "Show _close button on tabs"
-msgstr ""
-
-#: src/gtkprefs.c:982
-msgid "Show status _icons on tabs"
-msgstr ""
-
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
-msgid "Window"
-msgstr ""
-
-#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
-msgid "New window _width:"
-msgstr ""
-
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
-msgid "New window _height:"
-msgstr ""
-
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
-msgid "_Entry field height:"
-msgstr ""
-
-#: src/gtkprefs.c:1027
-msgid "Hide window on _send"
+msgid "Show idle _times"
+msgstr ""
+
+#: src/gtkprefs.c:973
+msgid "Dim i_dle buddies"
+msgstr ""
+
+#: src/gtkprefs.c:975
+msgid "_Automatically expand contacts"
+msgstr ""
+
+#: src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr ""
+
+#: src/gtkprefs.c:1023
+msgid "Show _formatting toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:1025
+msgid "Show _aliases in tabs/titles"
+msgstr ""
+
+#: src/gtkprefs.c:1029
+msgid "Enable buddy ic_on animation"
 msgstr ""
 
 #: src/gtkprefs.c:1031
-msgid "Buddy Icons"
-msgstr ""
-
-#: src/gtkprefs.c:1034
-msgid "Enable buddy icon a_nimation"
+msgid "_Notify buddies that you are typing to them"
+msgstr ""
+
+#: src/gtkprefs.c:1033
+msgid "_Raise IM window on events"
+msgstr ""
+
+#: src/gtkprefs.c:1036
+msgid "Raise chat _window on events"
 msgstr ""
 
 #: src/gtkprefs.c:1038
-msgid "Show _logins in window"
-msgstr ""
-
-#: src/gtkprefs.c:1041
-msgid "Typing Notification"
-msgstr ""
-
+msgid "Use _multi-colored screen names in chats"
+msgstr ""
+
+#. All the tab options!
 #: src/gtkprefs.c:1042
-msgid "Notify buddies that you are _typing to them"
-msgstr ""
-
-#: src/gtkprefs.c:1079
-msgid "Tab Completion"
-msgstr ""
-
-#: src/gtkprefs.c:1080
-msgid "_Tab-complete nicks"
-msgstr ""
-
-#: src/gtkprefs.c:1082
-msgid "_Old-style tab completion"
-msgstr ""
-
-#: src/gtkprefs.c:1086
-msgid "_Show people joining in window"
-msgstr ""
-
-#: src/gtkprefs.c:1088
-msgid "_Show people leaving in window"
-msgstr ""
-
-#: src/gtkprefs.c:1090
-msgid "Co_lorize screen names"
-msgstr ""
-
-#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4220
+msgid "Tab Options"
+msgstr ""
+
+#: src/gtkprefs.c:1044
+msgid "Show IMs and chats in _tabbed windows"
+msgstr ""
+
+#: src/gtkprefs.c:1059
+msgid "Show _close button on tabs"
+msgstr ""
+
+#: src/gtkprefs.c:1062
+msgid "Tab p_lacement:"
+msgstr ""
+
+#: src/gtkprefs.c:1064
+msgid "Top"
+msgstr ""
+
+#: src/gtkprefs.c:1065
+msgid "Bottom"
+msgstr ""
+
+#: src/gtkprefs.c:1066
+msgid "Left"
+msgstr ""
+
+#: src/gtkprefs.c:1067
+msgid "Right"
+msgstr ""
+
+#: src/gtkprefs.c:1073
+#, fuzzy
+msgid "New conversation _placement:"
+msgstr "Затвори разговор"
+
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:4855
 msgid "IP Address"
 msgstr ""
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr ""
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr ""
 
-#: src/gtkprefs.c:1146
-msgid "Ports"
-msgstr ""
-
-#: src/gtkprefs.c:1149
-msgid "_Manually specify range of ports to listen on"
-msgstr ""
-
-#: src/gtkprefs.c:1152
-msgid "_Start Port:"
-msgstr ""
-
 #: src/gtkprefs.c:1159
+msgid "Ports"
+msgstr ""
+
+#: src/gtkprefs.c:1162
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: src/gtkprefs.c:1165
+msgid "_Start Port:"
+msgstr ""
+
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr ""
 
-#: src/gtkprefs.c:1207
-msgid "Proxy Type"
-msgstr ""
-
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1179
+msgid "Proxy Server"
+msgstr ""
+
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr ""
 
-#: src/gtkprefs.c:1217
-msgid "Proxy Server"
-msgstr ""
-
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr ""
 
-#: src/gtkprefs.c:1331
-msgid "Opera"
-msgstr ""
-
-#: src/gtkprefs.c:1332
-msgid "Netscape"
-msgstr ""
-
-#: src/gtkprefs.c:1333
-msgid "Mozilla"
-msgstr ""
-
-#: src/gtkprefs.c:1334
-msgid "Konqueror"
-msgstr ""
-
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr ""
+
+#: src/gtkprefs.c:1302
+msgid "Firebird"
+msgstr ""
+
+#: src/gtkprefs.c:1303
+msgid "Firefox"
+msgstr ""
+
+#: src/gtkprefs.c:1304
 msgid "Galeon"
 msgstr ""
 
-#: src/gtkprefs.c:1336
-msgid "Firebird"
-msgstr ""
-
-#: src/gtkprefs.c:1337
-msgid "Firefox"
-msgstr ""
-
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1305
 msgid "Gnome Default"
 msgstr ""
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr ""
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr ""
+
+#: src/gtkprefs.c:1308
+msgid "Netscape"
+msgstr ""
+
+#: src/gtkprefs.c:1309
+msgid "Opera"
+msgstr ""
+
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr ""
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr ""
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr ""
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr ""
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr ""
 
-#: src/gtkprefs.c:1412
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr ""
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr ""
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr ""
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr ""
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr ""
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1478
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr ""
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr ""
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr ""
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr ""
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr ""
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1596
+msgid "Sound Selection"
+msgstr ""
+
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr ""
 
-#: src/gtkprefs.c:1551
-msgid "Sounds when you _log in"
-msgstr ""
-
-#: src/gtkprefs.c:1553
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr ""
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr ""
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr ""
 
-#: src/gtkprefs.c:1560
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr ""
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr ""
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr ""
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr ""
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: src/gtkprefs.c:1638
-msgid "_Sending messages removes away status"
-msgstr ""
-
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1701
+msgid "Sound Events"
+msgstr ""
+
+#: src/gtkprefs.c:1752
+msgid "Play"
+msgstr ""
+
+#: src/gtkprefs.c:1759
+msgid "Event"
+msgstr ""
+
+#: src/gtkprefs.c:1778
+msgid "Test"
+msgstr ""
+
+#: src/gtkprefs.c:1782
+msgid "Reset"
+msgstr ""
+
+#: src/gtkprefs.c:1786
+msgid "Choose..."
+msgstr ""
+
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr ""
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1813
 msgid "Auto-response"
 msgstr ""
 
-#: src/gtkprefs.c:1646
-msgid "Seconds before _resending:"
-msgstr ""
-
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1814
 msgid "_Send auto-response"
 msgstr ""
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1816
 msgid "_Only send auto-response when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1653
-msgid "Send auto-response in _active conversations"
-msgstr ""
-
-#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
-#: src/protocols/yahoo/yahoo.c:2295
+#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr ""
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1820
 msgid "Idle _time reporting:"
 msgstr ""
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1823
 msgid "Gaim usage"
 msgstr ""
 
-#: src/gtkprefs.c:1669
+#: src/gtkprefs.c:1826
 msgid "X usage"
 msgstr ""
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1828
 msgid "Windows usage"
 msgstr ""
 
-#: src/gtkprefs.c:1679
+#: src/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr ""
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1837
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1684
+#: src/gtkprefs.c:1841
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/gtkprefs.c:1692
+#: src/gtkprefs.c:1849
 msgid "Away m_essage:"
 msgstr ""
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1930
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3865,7 +4053,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1935
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3875,108 +4063,64 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:1999
+#: src/gtkprefs.c:2168
 msgid "Load"
 msgstr ""
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:2182
 msgid "Summary"
 msgstr ""
 
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:2230
 msgid "Details"
 msgstr ""
 
-#: src/gtkprefs.c:2188
-msgid "Sound Selection"
-msgstr ""
-
-#: src/gtkprefs.c:2295
-msgid "Play"
-msgstr ""
-
-#: src/gtkprefs.c:2302
-msgid "Event"
-msgstr ""
-
-#: src/gtkprefs.c:2321
-msgid "Test"
-msgstr ""
-
-#: src/gtkprefs.c:2325
-msgid "Reset"
-msgstr ""
-
-#: src/gtkprefs.c:2329
-msgid "Choose..."
-msgstr ""
-
-#: src/gtkprefs.c:2464
+#: src/gtkprefs.c:2375
 msgid "_Edit"
 msgstr ""
 
-#: src/gtkprefs.c:2500
+#: src/gtkprefs.c:2411
 msgid "Interface"
 msgstr ""
 
-#: src/gtkprefs.c:2501
-msgid "Smiley Themes"
-msgstr ""
-
-#: src/gtkprefs.c:2502
-msgid "Fonts"
-msgstr ""
-
-#: src/gtkprefs.c:2503
+#: src/gtkprefs.c:2414
 msgid "Message Text"
 msgstr ""
 
-#: src/gtkprefs.c:2504
+#: src/gtkprefs.c:2415
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gtkprefs.c:2507
-msgid "IMs"
-msgstr ""
-
-#: src/gtkprefs.c:2509
+#: src/gtkprefs.c:2416
+msgid "Smiley Themes"
+msgstr ""
+
+#: src/gtkprefs.c:2417
+msgid "Sounds"
+msgstr ""
+
+#: src/gtkprefs.c:2418
 msgid "Network"
 msgstr ""
 
-#: src/gtkprefs.c:2510
-msgid "Proxy"
-msgstr ""
-
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2421
 msgid "Browser"
 msgstr ""
 
-#: src/gtkprefs.c:2515
+#: src/gtkprefs.c:2423
 msgid "Logging"
 msgstr ""
 
-#: src/gtkprefs.c:2516
-msgid "Sounds"
-msgstr ""
-
-#: src/gtkprefs.c:2517
-msgid "Sound Events"
-msgstr ""
-
-#: src/gtkprefs.c:2518
+#: src/gtkprefs.c:2424
 msgid "Away / Idle"
 msgstr ""
 
-#: src/gtkprefs.c:2519
+#: src/gtkprefs.c:2425
 msgid "Away Messages"
 msgstr ""
 
-#: src/gtkprefs.c:2522
-msgid "Protocols"
-msgstr ""
-
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2428
 msgid "Plugins"
 msgstr ""
 
@@ -4000,63 +4144,63 @@
 msgid "Block only the users below"
 msgstr ""
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
 msgid "Privacy"
 msgstr ""
 
-#: src/gtkprivacy.c:389
+#: src/gtkprivacy.c:400
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:412
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
 msgid "Permit User"
 msgstr ""
 
-#: src/gtkprivacy.c:570
+#: src/gtkprivacy.c:582
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:571
+#: src/gtkprivacy.c:583
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
 msgid "Permit"
 msgstr ""
 
-#: src/gtkprivacy.c:579
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:593
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
 msgid "Block User"
 msgstr "Блокирај го корисникот"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:621
 msgid "Type a user to block."
 msgstr ""
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:622
 msgid "Please enter the name of the user you wish to block."
 msgstr ""
 
-#: src/gtkprivacy.c:617
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Block %s?"
 msgstr "Блокирај го/ја %s?"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:631
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
@@ -4064,36 +4208,51 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr ""
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr ""
 
-#: src/gtkrequest.c:237
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr ""
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr ""
 
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr ""
-
-#: src/gtkroomlist.c:335
+#: src/gtkrequest.c:1391
+msgid "That file already exists"
+msgstr "Датотеката веќе постои"
+
+#: src/gtkrequest.c:1392
+msgid "Would you like to overwrite it?"
+msgstr "Сакаш да ја пребришеш?"
+
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#, fuzzy
+msgid "Save File..."
+msgstr "Зачувај како..."
+
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#, fuzzy
+msgid "Open File..."
+msgstr "Отвори..."
+
+#: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr ""
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr ""
 
@@ -4137,41 +4296,33 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
-#: src/gtksound.c:158
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 
-#: src/gtksound.c:174
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 
-#: src/gtksound.c:186
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr ""
 
-#: src/gtkutils.c:133
-msgid "Can't save icon file to disk."
-msgstr ""
-
-#: src/gtkutils.c:168
-msgid "Save Icon"
-msgstr ""
-
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: src/log.c:476
+#: src/log.c:489
 msgid "XML"
 msgstr ""
 
-#: src/log.c:561
+#: src/log.c:574
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4180,7 +4331,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;АВТОМАТСКИ "
 "ОДОГОВОР&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:563
+#: src/log.c:576
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4189,50 +4340,61 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:614 src/log.c:800
+#: src/log.c:627 src/log.c:814
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: src/log.c:624 src/log.c:812
+#: src/log.c:637 src/log.c:826
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: src/log.c:661
+#: src/log.c:674
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:745
+#: src/log.c:759
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: src/log.c:845
+#: src/log.c:859
 msgid "Plain text"
 msgstr "Обичен текст"
 
-#: src/main.c:155
+#: src/main.c:153
 msgid "Please create an account."
 msgstr ""
 
-#: src/main.c:237
+#: src/main.c:235
 msgid "Login"
 msgstr "Најава"
 
-#: src/main.c:255
-msgid "<b>Screen Name:</b>"
-msgstr "<b>Име за најава:</b>"
-
-#: src/main.c:269
-msgid "<b>Password:</b>"
+#: src/main.c:253
+#, fuzzy
+msgid "<b>_Account:</b>"
+msgstr ""
+"\n"
+"<b>Акаунт:</b>"
+
+#: src/main.c:267
+#, fuzzy
+msgid "<b>_Password:</b>"
 msgstr "<b>Лозинка:</b>"
 
-#: src/main.c:298
-msgid "Sign on"
-msgstr "Најави се"
+#. And now for the buttons
+#: src/main.c:284
+#, fuzzy
+msgid "_Accounts"
+msgstr "Акаунти"
+
+#: src/main.c:290
+#, fuzzy
+msgid "_Preferences"
+msgstr "Параметри"
 
 #. full help text
-#: src/main.c:522
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4266,23 +4428,23 @@
 "  -h, --help          display this help and exit\n"
 
 #. short message
-#: src/main.c:537
+#: src/main.c:535
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr ""
 
-#: src/plugin.c:277
+#: src/plugin.c:286
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:282 src/plugin.c:310
+#: src/plugin.c:291 src/plugin.c:319
 msgid "Gaim was unable to load your plugin."
 msgstr ""
 
-#: src/plugin.c:306
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
@@ -4292,12 +4454,12 @@
 msgstr ""
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 src/protocols/msn/state.c:27
-#: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
-#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Available"
 msgstr ""
 
@@ -4309,12 +4471,12 @@
 msgid "Away for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
-#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
-#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
+#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2509
+#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
 msgid "Invisible"
 msgstr ""
 
@@ -4330,14 +4492,14 @@
 msgid "Unable to resolve hostname."
 msgstr ""
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr ""
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:104
+#: src/protocols/jabber/jabber.c:106
 msgid "Invalid response from server."
 msgstr ""
 
@@ -4357,247 +4519,252 @@
 msgid "Unknown Error Code."
 msgstr ""
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3820
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr ""
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
+#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
+#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:635
+msgid "Buddy Information"
+msgstr ""
+
+#: src/protocols/gg/gg.c:293
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:446
 msgid "Could not connect"
 msgstr ""
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:453
 msgid "Unable to read socket"
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:139
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
+#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr ""
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr ""
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr ""
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr ""
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr ""
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Испрати како порака"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:842
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:917
 msgid "Couldn't get search results"
 msgstr ""
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:922
 msgid "Gadu-Gadu Search Engine"
 msgstr ""
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:948
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4847
 msgid "UIN"
 msgstr ""
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr ""
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
+#: src/protocols/oscar/oscar.c:4859 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
+#: src/protocols/silc/ops.c:1184
 msgid "Nick"
 msgstr ""
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
 msgid "Birth Year"
 msgstr ""
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
+#: src/protocols/gg/gg.c:986
 msgid "Sex"
 msgstr ""
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr ""
 
-#. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
-msgid "Buddy Information"
-msgstr ""
-
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:1033
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:1103
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:1111
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:1119
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:1127
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:1136
 msgid "Password changed successfully"
 msgstr ""
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:1143
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:1262
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:1292
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:1293
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1366
 msgid "Couldn't export buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1389
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1440
 msgid "Unable to access directory"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1441
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1475
 msgid "Unable to change Gadu-Gadu password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1476
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1492
 msgid "Directory Search"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
-#: src/protocols/toc/toc.c:1546
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
+#: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1501
 msgid "Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1505
 msgid "Export Buddy List to Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1509
 msgid "Delete Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1542
 msgid "Unable to access user profile."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1543
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4614,7 +4781,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
@@ -4627,17 +4794,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
+#: src/protocols/oscar/oscar.c:6126
 msgid "Authorize"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
+#: src/protocols/oscar/oscar.c:6127
 msgid "Deny"
 msgstr ""
 
@@ -4649,44 +4814,34 @@
 msgid "Connecting..."
 msgstr "Поврзување..."
 
-#: src/protocols/icq/gaim_icq.c:497
+#: src/protocols/icq/gaim_icq.c:498
 msgid "Nick:"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:498
+#: src/protocols/icq/gaim_icq.c:499
 msgid "Gaim User"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:43
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:137
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-msgstr ""
-
-#: src/protocols/irc/cmds.c:146
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-msgstr ""
-
-#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr ""
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
-#: src/protocols/yahoo/yahoo_filexfer.c:217
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:169
+#: src/protocols/yahoo/yahoo_filexfer.c:179
+#: src/protocols/yahoo/yahoo_filexfer.c:188
+#: src/protocols/yahoo/yahoo_filexfer.c:198
 msgid "File Transfer Aborted"
 msgstr ""
 
@@ -4694,63 +4849,68 @@
 msgid "Gaim could not open a listening port."
 msgstr ""
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr ""
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD за %s"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+msgid "Server has disconnected"
+msgstr ""
+
+#: src/protocols/irc/irc.c:147
 msgid "View MOTD"
 msgstr "Види MOTD"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
-#: src/protocols/yahoo/yahoo.c:2456
-msgid "Send File"
-msgstr "Испрати датотека"
-
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Канал:"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: src/protocols/irc/irc.c:193
+#: src/protocols/irc/irc.c:194
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Најавување: %s"
 
-#: src/protocols/irc/irc.c:221
+#: src/protocols/irc/irc.c:222
 msgid "Couldn't create socket"
 msgstr ""
 
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
+msgid "Couldn't connect to host"
+msgstr "Не може да се врзе со серверот"
+
 #: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr ""
 
-#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Корисници"
 
-#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
+#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Наслов"
 
@@ -4763,32 +4923,35 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:628
 msgid "IRC Protocol Plugin"
 msgstr "Додаток за IRC протокол"
 
 #. *  summary
-#: src/protocols/irc/irc.c:614
+#: src/protocols/irc/irc.c:629
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Додатокот за IRC протокол што не е за никаде"
 
-#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
 msgid "Server"
 msgstr "Сервер"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
-#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
-#: src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
+#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Порта"
 
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
 msgid "Encoding"
 msgstr "Кодирање"
 
-#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:581
+#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
+#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
+#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
 msgid "Username"
 msgstr "Корисничко име"
 
@@ -4813,11 +4976,12 @@
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
+#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:202
+#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
 msgid "Currently on"
 msgstr ""
 
@@ -4839,132 +5003,282 @@
 msgid "Buddy Information for %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:278
+#: src/protocols/irc/msgs.c:279
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:283
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:299
+#: src/protocols/irc/msgs.c:301
 #, c-format
 msgid "Unknown message '%s'"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Unknown message"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:300
+#: src/protocols/irc/msgs.c:302
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:403
+#: src/protocols/irc/msgs.c:325
+#, c-format
+msgid "Users on %s: %s"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:407
 msgid "No such channel"
 msgstr ""
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:418
 msgid "no such channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:417
+#: src/protocols/irc/msgs.c:421
 msgid "User is not logged in"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:422
+#: src/protocols/irc/msgs.c:426
 msgid "No such nick or channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:442
+#: src/protocols/irc/msgs.c:446
 msgid "Could not send"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:498
+#: src/protocols/irc/msgs.c:502
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:503
 msgid "Invitation only"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:606
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:600
+#: src/protocols/irc/msgs.c:611
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:621
+#: src/protocols/irc/msgs.c:632
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:700
+#: src/protocols/irc/msgs.c:711
 msgid "Could not change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:712
 msgid "Cannot change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:733
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:762
+#: src/protocols/irc/msgs.c:773
 msgid "Error: invalid PONG from server"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:775
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:839
+#: src/protocols/irc/msgs.c:850
 #, c-format
 msgid "Cannot join %s:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:870
+#: src/protocols/irc/msgs.c:887
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:109
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+#: src/protocols/irc/parse.c:110
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+
+#: src/protocols/irc/parse.c:111
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:112
+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 ""
+
+#: src/protocols/irc/parse.c:113
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+
+#: src/protocols/irc/parse.c:114
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: src/protocols/irc/parse.c:115
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: src/protocols/irc/parse.c:116
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:117
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+
+#: src/protocols/irc/parse.c:118
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+#: src/protocols/irc/parse.c:119
+msgid ""
+"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+
+#: src/protocols/irc/parse.c:120
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+#: src/protocols/irc/parse.c:121
+msgid "names [channel]:  List the users currently in a channel."
+msgstr ""
+
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr ""
+
+#: src/protocols/irc/parse.c:123
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:124
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+#: src/protocols/irc/parse.c:125
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+
+#: src/protocols/irc/parse.c:126
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+
+#: src/protocols/irc/parse.c:127
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+#: src/protocols/irc/parse.c:128
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+
+#: src/protocols/irc/parse.c:129
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+#: src/protocols/irc/parse.c:130
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:131
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr ""
+
+#: src/protocols/irc/parse.c:132
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+#: src/protocols/irc/parse.c:133
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:134
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+
+#: src/protocols/irc/parse.c:135
+msgid "whois &lt;nick&gt;:  Get information on a user."
+msgstr ""
+
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr ""
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:382
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:383
 msgid "PONG"
 msgstr ""
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:383
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
+#: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
+#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr ""
 
@@ -4995,117 +5309,125 @@
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:786
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:798
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
 msgid "URL"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:638
 msgid "Postal Code"
 msgstr ""
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4883
 msgid "Birthday"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
-#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
+#: src/protocols/yahoo/yahoo.c:2634
 msgid "Status"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
 msgid "Resource"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
 msgid "Middle Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
+#: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
+#: src/protocols/silc/ops.c:830
 msgid "Address"
 msgstr ""
 
@@ -5125,27 +5447,31 @@
 msgid "Jabber Profile"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:932
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:935
 msgid "Temporarily Hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:942
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:948
 msgid "(Re-)Request authorization"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:919
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:956
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
 msgid "_Room:"
 msgstr ""
 
@@ -5157,482 +5483,521 @@
 msgid "_Handle:"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room name"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:165
+#: src/protocols/jabber/chat.c:177
 msgid "Invalid Room Name"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:182
 #, c-format
 msgid "%s is not a valid server name"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
 msgid "Invalid Server Name"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:188
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
 msgid "Invalid Room Handle"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:332
+#: src/protocols/jabber/chat.c:349
 msgid "Configuration error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
 msgid "Unable to configure"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:357
+#: src/protocols/jabber/chat.c:374
 msgid "Room Configuration Error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:358
+#: src/protocols/jabber/chat.c:375
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
 msgid "Registration error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:556
+#: src/protocols/jabber/chat.c:573
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
 msgid "Roomlist Error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
 msgid "Error retreiving roomlist"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:652
+#: src/protocols/jabber/chat.c:669
 msgid "Invalid Server"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:689
+#: src/protocols/jabber/chat.c:706
 msgid "Enter a Conference Server"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:690
+#: src/protocols/jabber/chat.c:707
 msgid "Select a conference server to query"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/chat.c:710
 msgid "Find Rooms"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:74
+#: src/protocols/jabber/jabber.c:76
 msgid "Error initializing session"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
-#: src/protocols/trepia/trepia.c:1186
+#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
+#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
 msgid "Read Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:317
+#: src/protocols/jabber/jabber.c:324
 msgid "Connection Failed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:320
+#: src/protocols/jabber/jabber.c:327
 msgid "SSL Handshake Failed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
 msgid "Invalid Jabber ID"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
 msgid "SSL support unavailable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:426
+#: src/protocols/jabber/jabber.c:433
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
 msgid "Registration Successful"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
 msgid "Unknown Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
 msgid "Registration Failed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
 msgid "Already Registered"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
 msgid "Password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:603
 msgid "E-Mail"
 msgstr ""
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
-#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4911 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/jabber.c:653
 msgid "Date"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:661
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
 msgid "Register New Jabber Account"
 msgstr ""
 
+#: src/protocols/jabber/jabber.c:744
+msgid "Logged out"
+msgstr ""
+
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
-#: src/protocols/zephyr/zephyr.c:864
+#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "Поврзување"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:787
 msgid "Initializing Stream"
 msgstr "Стартување"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:793
 msgid "Authenticating"
 msgstr "Авторизирање"
 
-#: src/protocols/jabber/jabber.c:794
+#: src/protocols/jabber/jabber.c:802
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
+#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6497
 msgid "Not Authorized"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:907
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:909
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:946
 msgid "Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6690
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:979
 msgid "Password Changed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
 msgid "Error changing password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:1041
 msgid "Password (again)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
 msgid "Change Jabber Password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1047
 msgid "Please enter your new password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1133
-msgid "Bad Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1135
-msgid "Conflict"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1137
-msgid "Feature Not Implemented"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:1139
-msgid "Forbidden"
+msgid "Bad Request"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1141
-msgid "Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
-msgid "Internal Server Error"
+msgid "Conflict"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1143
+msgid "Feature Not Implemented"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1145
-msgid "Item Not Found"
+msgid "Forbidden"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1147
-msgid "Malformed Jabber ID"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1149
-msgid "Not Acceptable"
+msgid "Gone"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
+msgid "Internal Server Error"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1151
-msgid "Not Allowed"
+msgid "Item Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1153
+msgid "Malformed Jabber ID"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1155
-msgid "Payment Required"
+msgid "Not Acceptable"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1157
-msgid "Recipient Unavailable"
+msgid "Not Allowed"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1161
-msgid "Registration Required"
+msgid "Payment Required"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1163
-msgid "Remote Server Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1165
-msgid "Remote Server Timeout"
+msgid "Recipient Unavailable"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1167
-msgid "Server Overloaded"
+msgid "Registration Required"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1169
-msgid "Service Unavailable"
+msgid "Remote Server Not Found"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1171
-msgid "Subscription Required"
+msgid "Remote Server Timeout"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1173
+msgid "Server Overloaded"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1175
+msgid "Service Unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1177
+msgid "Subscription Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1179
 msgid "Unexpected Request"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1186
 msgid "Authorization Aborted"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1182
-msgid "Incorrect encoding in authorization"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1185
-msgid "Invalid authzid"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:1188
-msgid "Invalid Authorization Mechanism"
+msgid "Incorrect encoding in authorization"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1191
+msgid "Invalid authzid"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1194
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1196
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1198
-msgid "Authentication Failure"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:1202
-msgid "Bad Format"
+msgid "Temporary Authentication Failure"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1204
+msgid "Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1208
+msgid "Bad Format"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1210
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1207
-msgid "Resource Conflict"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1209
-msgid "Connection Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1211
-msgid "Host Gone"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:1213
-msgid "Host Unknown"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1215
-msgid "Improper Addressing"
+msgid "Resource Conflict"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
+msgid "Connection Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1217
+msgid "Host Gone"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1219
-msgid "Invalid ID"
+msgid "Host Unknown"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1221
-msgid "Invalid Namespace"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1223
-msgid "Invalid XML"
+msgid "Improper Addressing"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1225
-msgid "Non-matching Hosts"
+msgid "Invalid ID"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1227
+msgid "Invalid Namespace"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1229
-msgid "Policy Violation"
+msgid "Invalid XML"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1231
-msgid "Remote Connection Failed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1233
-msgid "Resource Constraint"
+msgid "Non-matching Hosts"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1235
-msgid "Restricted XML"
+msgid "Policy Violation"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1237
-msgid "See Other Host"
+msgid "Remote Connection Failed"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1239
-msgid "System Shutdown"
+msgid "Resource Constraint"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1241
-msgid "Undefined Condition"
+msgid "Restricted XML"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1243
-msgid "Unsupported Encoding"
+msgid "See Other Host"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1245
-msgid "Unsupported Stanza Type"
+msgid "System Shutdown"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1247
-msgid "Unsupported Version"
+msgid "Undefined Condition"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1249
-msgid "XML Not Well Formed"
+msgid "Unsupported Encoding"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1251
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1253
+msgid "Unsupported Version"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1255
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1257
 msgid "Stream Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1324
+#, c-format
+msgid "Unable to ban user %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1376
+#, c-format
+msgid "Unable to kick user %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1401
+msgid "config:  Configure a chat room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1404
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1411
+msgid "part [room]:  Leave the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1414
+msgid "register:  Register with a chat room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1419
+msgid "topic [new topic]:  View or change the topic."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1423
+msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1427
+msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1431
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1435
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1439
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1453
 msgid "Hide Operating System"
 msgstr ""
 
@@ -5647,23 +6012,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
 msgid "Jabber Protocol Plugin"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1389
+#: src/protocols/jabber/jabber.c:1565
 msgid "Use TLS if available"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1570
 msgid "Force old SSL"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1575
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1408
+#. Account options
+#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
 msgid "Connect server"
 msgstr ""
 
@@ -5700,546 +6066,535 @@
 msgid "XML Parse error"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:221
+#: src/protocols/jabber/presence.c:224
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
 msgid "Create New Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:279
+#: src/protocols/jabber/presence.c:282
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:284
 msgid "Configure Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:283
+#: src/protocols/jabber/presence.c:286
 msgid "Accept Defaults"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:303
+#: src/protocols/jabber/presence.c:308
 #, c-format
 msgid "Error in chat %s"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:306
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error joining chat %s"
 msgstr ""
 
-#: src/protocols/jabber/si.c:579
+#: src/protocols/jabber/si.c:582
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
-msgid "Unable to request USR\n"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
-msgid "Unable to login using MD5"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
-msgid "Unable to send USR"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
-msgid "Requesting to send password"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:104
-msgid "Protocol version not supported"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
-msgid "Unable to request CVR\n"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
-msgid "Unable to request INF\n"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
-msgid "Got invalid XFR"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:178
-msgid "Unable to transfer"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:192
-msgid "Unable to parse message."
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
-#: src/protocols/msn/notification.c:1826
-msgid "Unable to write to server"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
-msgid "Syncing with server"
-msgstr "Синхронизирање со серверот"
-
-#: src/protocols/msn/dispatch.c:250
-msgid "Error reading from server"
-msgstr ""
-
-#: src/protocols/msn/error.c:33
+#: src/protocols/msn/cmdproc.c:336
+msgid "Miscellaneous error"
+msgstr ""
+
+#: src/protocols/msn/cmdproc.c:338
+msgid "You have signed on from another location."
+msgstr ""
+
+#: src/protocols/msn/cmdproc.c:340
+msgid "The MSN servers are going down temporarily."
+msgstr ""
+
+#: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr ""
 
-#: src/protocols/msn/error.c:36
+#: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr ""
 
-#: src/protocols/msn/error.c:40
+#: src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr ""
 
-#: src/protocols/msn/error.c:43
+#: src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr ""
 
-#: src/protocols/msn/error.c:47
+#: src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr ""
 
-#: src/protocols/msn/error.c:50
+#: src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr ""
 
-#: src/protocols/msn/error.c:53
+#: src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr ""
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr ""
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr ""
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr ""
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
 msgid "User is offline"
 msgstr ""
 
-#: src/protocols/msn/error.c:71
+#: src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr ""
 
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr ""
 
-#: src/protocols/msn/error.c:77
+#: src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr ""
 
-#: src/protocols/msn/error.c:80
+#: src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr ""
 
-#: src/protocols/msn/error.c:83
+#: src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr ""
 
-#: src/protocols/msn/error.c:86
+#: src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr ""
 
-#: src/protocols/msn/error.c:89
+#: src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr ""
 
-#: src/protocols/msn/error.c:93
+#: src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr ""
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:100
+#: src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr ""
 
-#: src/protocols/msn/error.c:107
+#: src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr ""
 
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr ""
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr ""
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr ""
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr ""
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr ""
 
-#: src/protocols/msn/error.c:129
+#: src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr ""
 
-#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr ""
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr ""
 
-#: src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/error.c:153
+#: src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr ""
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr ""
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr ""
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr ""
 
-#: src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr ""
 
-#: src/protocols/msn/error.c:175
+#: src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/error.c:178
+#: src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/error.c:183
+#: src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: src/protocols/msn/error.c:192
+#: src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr ""
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
-#: src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
+#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:199
+#: src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr ""
 
-#: src/protocols/msn/error.c:207
+#: src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr ""
 
-#: src/protocols/msn/error.c:211
+#: src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: src/protocols/msn/error.c:215
+#: src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr ""
 
-#: src/protocols/msn/error.c:218
+#: src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr ""
 
-#: src/protocols/msn/error.c:222
+#: src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr ""
 
-#: src/protocols/msn/error.c:234
+#: src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr ""
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr ""
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:283
 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 ""
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr ""
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr ""
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr ""
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr ""
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
-#: src/protocols/msn/state.c:32
+#: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
+#: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
+#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
-#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
+#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
+#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
 msgid "Hidden"
 msgstr ""
 
-#: src/protocols/msn/msn.c:378
+#: src/protocols/msn/msn.c:479
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:386
+#: src/protocols/msn/msn.c:484
 msgid "Set Home Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:488
 msgid "Set Work Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:492
 msgid "Set Mobile Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:407
+#: src/protocols/msn/msn.c:498
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:503
 msgid "Allow/Disallow Mobile Pages"
 msgstr ""
 
-#: src/protocols/msn/msn.c:440
+#: src/protocols/msn/msn.c:526
 msgid "Send to Mobile"
 msgstr "Испрати на мобилен"
 
-#: src/protocols/msn/msn.c:449
+#: src/protocols/msn/msn.c:536
 msgid "Initiate Chat"
 msgstr ""
 
-#: src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:540
+#, fuzzy
+msgid "Update Buddy Icon"
+msgstr "Икона на пријател:"
+
+#: src/protocols/msn/msn.c:577
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 msgstr ""
 
-#: src/protocols/msn/msn.c:785
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
-msgid "Invalid MSN screen name"
-msgstr ""
-
-#: src/protocols/msn/msn.c:825
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
-msgid "<html><body><b>Error retrieving profile</b></body></html>"
-msgstr "<html><body><b>Грешка во преземањето на профилот</b></body></html>"
+#: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:626
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr ""
+
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#, fuzzy, c-format
+msgid "<b>%s:</b> "
+msgstr ""
+"\n"
+"<b>Алиас:</b>"
+
+#: src/protocols/msn/msn.c:1173
+#, c-format
+msgid "<font sml=\"msn\">%s</font><br>"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
+#, fuzzy, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>Статус:</b> Исклучен"
+
+#: src/protocols/msn/msn.c:1242
+msgid "MSN Profile"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
+#: src/protocols/yahoo/yahoo_profile.c:761
+msgid "Error retrieving profile"
+msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr ""
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4874
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1334 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1349 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1366 src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "A Little About Me"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
-#: src/protocols/msn/msn.c:1505
+#: src/protocols/msn/msn.c:1403 src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1416 src/protocols/msn/msn.c:1423
 msgid "Favorite Things"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
-#: src/protocols/msn/msn.c:1527
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1445
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
-#: src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/msn/msn.c:1454 src/protocols/msn/msn.c:1460
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1468 src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Updated"
 msgstr ""
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
-#, c-format
-msgid "User information for %s unavailable"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
-msgid "The user's profile is empty."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1626
+#: src/protocols/msn/msn.c:1501
+msgid "The user has not created a public profile."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1502
+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 ""
+
+#: src/protocols/msn/msn.c:1506
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1168
+msgid "Profile URL"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1643
 msgid "Display conversation closed notices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1648
 msgid "Display timeout notices"
 msgstr ""
 
@@ -6254,81 +6609,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1762
 msgid "Use HTTP Method"
 msgstr ""
 
-#: src/protocols/msn/nexus.c:56
+#: src/protocols/msn/nexus.c:79
 msgid "Unable to connect to server"
 msgstr ""
 
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr ""
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr ""
-
-#: src/protocols/msn/nexus.c:204
+#: src/protocols/msn/nexus.c:215
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:84
+msgid "Requesting to send password"
+msgstr ""
+
+#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Вчитување листа на пријатели"
 
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1646
+#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
+#: src/protocols/oscar/oscar.c:2315
 msgid "Password sent"
 msgstr "Лозинката е пратена"
 
-#: src/protocols/msn/notification.c:361
-msgid "Unable to send password"
-msgstr ""
-
-#: src/protocols/msn/notification.c:397
-msgid "Protocol not supported"
-msgstr ""
-
-#: src/protocols/msn/notification.c:440
-msgid "You have been disconnected. You have signed on from another location."
-msgstr ""
-
-#: src/protocols/msn/notification.c:445
-msgid "You have been disconnected. The MSN servers are going down temporarily."
-msgstr ""
-
-#: src/protocols/msn/notification.c:584
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr ""
-
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
-#, c-format
-msgid "The user %s (%s) wants to add you to their buddy list."
-msgstr ""
-
-#: src/protocols/msn/notification.c:1362
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr ""
-
-#: src/protocols/msn/notification.c:1607
-msgid "Unable to transfer to notification server"
-msgstr ""
-
-#: src/protocols/msn/notification.c:1776
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6347,34 +6661,68 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/servconn.c:389
-msgid "IO Error."
-msgstr ""
-
-#: src/protocols/msn/servconn.c:527
+#: src/protocols/msn/notification.c:1136
+msgid "Syncing with server"
+msgstr "Синхронизирање со серверот"
+
+#: src/protocols/msn/servconn.c:46
+#, c-format
+msgid "Unable to connect to %s server"
+msgstr ""
+
+#: src/protocols/msn/servconn.c:50
+#, c-format
+msgid "Error writing to %s server"
+msgstr ""
+
+#: src/protocols/msn/servconn.c:54
+#, fuzzy, c-format
+msgid "Error reading from %s server"
+msgstr "Грешка при записот на сликата: %s"
+
+#: src/protocols/msn/servconn.c:58
+#, c-format
+msgid "Unknown error from %s server"
+msgstr ""
+
+#: src/protocols/msn/servconn.c:72
+#, c-format
+msgid "MSN error for account %s"
+msgstr ""
+
+#: src/protocols/msn/servconn.c:346
 msgid "Received HTTP error. Please report this."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:300
-msgid "An MSN message may not have been received."
-msgstr ""
-
-#: src/protocols/napster/napster.c:228
+#: src/protocols/msn/userlist.c:86
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr ""
+
+#: src/protocols/msn/userlist.c:94
+#, fuzzy, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr ""
+"\n"
+"\n"
+"Дали сакаш да го додадеш во листата на пријатели?"
+
+#: src/protocols/napster/napster.c:230
 msgid "Unable to read header from server"
 msgstr ""
 
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
+#: src/protocols/napster/napster.c:244
+#, c-format
+msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 
 #: src/protocols/napster/napster.c:307
@@ -6410,12 +6758,8 @@
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:541
-msgid "Get Info"
-msgstr "Инфо"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6197
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr ""
 
@@ -6430,70 +6774,232 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr ""
 
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:225
-#, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:371
+#: src/protocols/novell/nmuser.c:1868
+msgid "Required parameters not passed in"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1871
+msgid "Unable to write to network"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1874
+msgid "Unable to read from network"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1877
+#, fuzzy
+msgid "Error communicating with server"
+msgstr "Синхронизирање со серверот"
+
+#: src/protocols/novell/nmuser.c:1881
+msgid "Conference not found"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1884
+#, fuzzy
+msgid "Conference does not exist"
+msgstr "Датотеката не постои"
+
+#: src/protocols/novell/nmuser.c:1888
+#, fuzzy
+msgid "A folder with that name already exists"
+msgstr "Датотеката веќе постои"
+
+#: src/protocols/novell/nmuser.c:1891
+#, fuzzy
+msgid "Not supported"
+msgstr "поддршка"
+
+#: src/protocols/novell/nmuser.c:1895
+#, fuzzy
+msgid "Password has expired"
+msgstr "Лозинката е пратена"
+
+#: src/protocols/novell/nmuser.c:1898
+#, fuzzy
+msgid "Invalid password"
+msgstr "Невавалидно име на група"
+
+#: src/protocols/novell/nmuser.c:1901
+#, fuzzy
+msgid "User not found"
+msgstr "Опции за корисникот"
+
+#: src/protocols/novell/nmuser.c:1904
+msgid "Account has been disabled"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1907
+msgid "The server could not access the directory"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1910
+msgid "Your system administrator has disabled this operation"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1913
+msgid "The server is unavailable; try again later"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1916
+msgid "Cannot add a contact to the same folder twice"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1919
+msgid "Cannot add yourself"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1922
+msgid "Master archive is misconfigured"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1926
+msgid "Invalid username or password"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1929
+msgid "Could not recognize the host of the username you entered"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1932
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1935
+msgid "You cannot add the same person twice to a conversation"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1939
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1942
+msgid "You have entered an invalid username"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1945
+msgid "An error occurred while updating the directory"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1948
+msgid "Incompatible protocol version"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1951
+msgid "The user has blocked you"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1954
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1957
+msgid "The user is either offline or you are blocked"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:1960
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr ""
+
+#: src/protocols/novell/novell.c:116
+#, c-format
+msgid "Login failed (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:229
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:375
 #, fuzzy, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
+msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Додади го разговорот во листата на пријатели"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:397
-#, c-format
-msgid "Unable to send message (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:485
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:489
-#, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:401
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:511
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:516
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:563
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:584
-#, c-format
+"creating folder (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:611
+#, fuzzy, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
-#, c-format
-msgid "GroupWise Conference %d"
-msgstr ""
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+"list (%s)."
+msgstr "Додади го разговорот во листата на пријатели"
+
+#: src/protocols/novell/novell.c:683
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
+#, fuzzy, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "Додади го разговорот во листата на пријатели"
+
+#: src/protocols/novell/novell.c:776
+#, fuzzy, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "Додади го разговорот во листата на пријатели"
+
+#: src/protocols/novell/novell.c:829
+#, fuzzy, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "Додади го разговорот во листата на пријатели"
+
+#: src/protocols/novell/novell.c:897
+#, fuzzy, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "Додади го разговорот во листата на пријатели"
+
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:992
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: src/protocols/novell/novell.c:982
+#: src/protocols/novell/novell.c:1426
 #, fuzzy
 msgid "Userid"
 msgstr "Корисници"
@@ -6505,40 +7011,50 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:996
+#: src/protocols/novell/novell.c:1440
 #, fuzzy
 msgid "Full name"
 msgstr "Датотека"
 
-#: src/protocols/novell/novell.c:1016
+#: src/protocols/novell/novell.c:1460
 #, fuzzy
 msgid "User Properties"
 msgstr "Опции за корисникот"
 
-#: src/protocols/novell/novell.c:1084
+#: src/protocols/novell/novell.c:1564
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1113
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1147
+#: src/protocols/novell/novell.c:1619
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1653
 #, fuzzy
 msgid "Authenticating..."
 msgstr "Авторизирање"
 
-#: src/protocols/novell/novell.c:1162
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1302
+#: src/protocols/novell/novell.c:1803
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr ""
+
+#: src/protocols/novell/novell.c:1830
 #, fuzzy
 msgid "Invitation to Conversation"
 msgstr "Зачувај разговор"
 
-#: src/protocols/novell/novell.c:1303
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6546,16 +7062,16 @@
 "Sent: %s"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1305
+#: src/protocols/novell/novell.c:1833
 #, fuzzy
 msgid "Would you like to join the conversation?"
 msgstr "Сакаш да ја пребришеш?"
 
-#: src/protocols/novell/novell.c:1408
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6565,42 +7081,39 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:1560
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1582
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1846
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
 msgid "Offline"
 msgstr ""
 
-#: src/protocols/novell/novell.c:2164
-#, c-format
-msgid ""
-"<b>Status:</b> %s\n"
-"<b>Message:</b> %s"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2168
-#, fuzzy, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>Статус:</b> Исклучен"
-
-#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
+#: src/protocols/novell/novell.c:2744
+#, fuzzy
+msgid "Message"
+msgstr "_Порака:"
+
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 #, fuzzy
 msgid "Appear Offline"
 msgstr "Исклучен "
 
+#: src/protocols/novell/novell.c:3293
+msgid "Initiate _Chat"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6612,255 +7125,296 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr ""
 
-#: src/protocols/novell/novell.c:2428
+#: src/protocols/novell/novell.c:3410
 #, fuzzy
 msgid "Server address"
 msgstr "Домашна адреса"
 
-#: src/protocols/novell/novell.c:2432
+#: src/protocols/novell/novell.c:3414
 #, fuzzy
 msgid "Server port"
 msgstr "Сервер"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:183
-msgid "Invalid SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Rate to host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:185
-msgid "Rate to client"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:187
-msgid "Service unavailable"
+msgid "Invalid SNAC"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:188
-msgid "Service not defined"
+msgid "Rate to host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:189
-msgid "Obsolete SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by host"
+msgid "Rate to client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:191
-msgid "Not supported by client"
+msgid "Service unavailable"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Refused by client"
+msgid "Service not defined"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Reply too big"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Responses lost"
+msgid "Not supported by host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Request denied"
+msgid "Not supported by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Busted SNAC payload"
+msgid "Refused by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Insufficient rights"
+msgid "Reply too big"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:198
-msgid "In local permit/deny"
+msgid "Responses lost"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:199
-msgid "Too evil (sender)"
+msgid "Request denied"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:200
-msgid "Too evil (receiver)"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:201
-msgid "User temporarily unavailable"
-msgstr "Корисник е привремено недостапен"
+msgid "Insufficient rights"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:202
-msgid "No match"
-msgstr "Нема пронајдени резултати"
+msgid "In local permit/deny"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:203
-msgid "List overflow"
+msgid "Too evil (sender)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:204
-msgid "Request ambiguous"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:205
-msgid "Queue full"
-msgstr "Редот е полн"
+msgid "User temporarily unavailable"
+msgstr "Корисник е привремено недостапен"
 
 #: src/protocols/oscar/oscar.c:206
+msgid "No match"
+msgstr "Нема пронајдени резултати"
+
+#: src/protocols/oscar/oscar.c:207
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:208
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:209
+msgid "Queue full"
+msgstr "Редот е полн"
+
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:403
+msgid ""
+"(There was an error converting this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:441
 msgid "Voice"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:431
-msgid "AIM Direct IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:434
-msgid "Chat"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
-msgid "Get File"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:444
+msgid "AIM Direct IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:506
+msgid "Chat"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6803
+msgid "Get File"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:457
 msgid "Games"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:460
 msgid "Add-Ins"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:463
 msgid "Send Buddy List"
 msgstr "Испрати листа на пријатели"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:466
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:469
 msgid "AP User"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:472
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:475
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:478
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:481
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:484
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:474
-msgid "ICQ UTF8"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:477
-msgid "Hiptop"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:480
-msgid "Security Enabled"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:483
-msgid "Video Chat"
-msgstr "Видео разговор"
-
 #: src/protocols/oscar/oscar.c:487
-msgid "iChat AV"
+msgid "ICQ UTF8"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:490
-msgid "Live Video"
+msgid "Hiptop"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:493
+msgid "Security Enabled"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:496
+msgid "Video Chat"
+msgstr "Видео разговор"
+
+#: src/protocols/oscar/oscar.c:500
+msgid "iChat AV"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:503
+msgid "Live Video"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Камера"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5496
+#: src/protocols/oscar/oscar.c:6693
 msgid "Free For Chat"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6691
 msgid "Not Available"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6692
 msgid "Occupied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:534
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:602
 msgid "Capabilities"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:609
 msgid "Buddy Comment"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:716
+#: src/protocols/oscar/oscar.c:744
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:746
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:753
+msgid "Direct Connect failed"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
+#, c-format
+msgid "Direct IM with %s established"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:911
+#, c-format
+msgid "Attempting to connect to %s at %s:%hu for Direct IM."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1328
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1333
+msgid "Unable to open Direct IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1368
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1372
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3329
+msgid "Connect"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:1458
 msgid "Chat is currently unavailable"
 msgstr "Разговор е недостапен"
 
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
-msgid "Couldn't connect to host"
-msgstr "Не може да се врзе со серверот"
-
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:1539
 msgid "Screen name sent"
 msgstr "Корисничкото име испратено"
 
-#: src/protocols/oscar/oscar.c:900
+#: src/protocols/oscar/oscar.c:1553
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6868,151 +7422,143 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:928
+#: src/protocols/oscar/oscar.c:1581
 msgid "Unable to login to AIM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
+#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1690
 msgid "Connection established, cookie sent"
 msgstr "Врската е воспоставена, испраќам колаче"
 
-#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/yahoo/yahoo_filexfer.c:189
+#: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1808
 msgid "Unable to create new connection."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1879
 msgid "Unable to establish listener socket."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1339
+#: src/protocols/oscar/oscar.c:2008
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1343
+#: src/protocols/oscar/oscar.c:2012
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1348
+#: src/protocols/oscar/oscar.c:2017
 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 ""
 
-#: src/protocols/oscar/oscar.c:1353
+#: src/protocols/oscar/oscar.c:2022
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1385
+#: src/protocols/oscar/oscar.c:2054
 msgid "Internal Error"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1457
+#: src/protocols/oscar/oscar.c:2126
 msgid "Received authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
-#: src/protocols/oscar/oscar.c:1611
+#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
+#: src/protocols/oscar/oscar.c:2280
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:2283
 msgid "Gaim was unable to get a valid login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
-#, c-format
-msgid "Direct IM with %s established"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:3113 src/protocols/oscar/oscar.c:3135
 msgid "(There was an error receiving this message)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:3321
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2716
+#: src/protocols/oscar/oscar.c:3324
 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 ""
 
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
-msgid "Connect"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:3360
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:3368
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:3369
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:3399
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:3404 src/protocols/oscar/oscar.c:3406
 msgid "Request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
-#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
-#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3456
+#: src/protocols/oscar/oscar.c:3463 src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3919
+#: src/protocols/oscar/oscar.c:3979 src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6164
 msgid "No reason given."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:3462
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:3545
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:3553 src/protocols/oscar/oscar.c:6124
 msgid "Authorization Request"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3565
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7020,17 +7566,17 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:3566
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:3573
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:3581
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7039,7 +7585,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2966
+#: src/protocols/oscar/oscar.c:3589
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7048,7 +7594,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:3597
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7057,34 +7603,34 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:3618
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3001
+#: src/protocols/oscar/oscar.c:3624
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3005
+#: src/protocols/oscar/oscar.c:3628
 msgid "Decline"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3713
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3722
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3731
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7093,269 +7639,278 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3740
 #, 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."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3749
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3758
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3189
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3248
+#: src/protocols/oscar/oscar.c:3815 src/protocols/oscar/oscar.c:4039
+#, fuzzy, c-format
+msgid "Info for %s"
+msgstr "ICQ инфо за %s"
+
+#: src/protocols/oscar/oscar.c:3881
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3882
 msgid "Unknown error"
 msgstr ""
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3917
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3976
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3366
+#: src/protocols/oscar/oscar.c:3999
 msgid "Warning Level"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:4002
 #, fuzzy
 msgid "Online Since"
 msgstr "Поврзано"
 
-#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:4006 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:4090
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3641
+#: src/protocols/oscar/oscar.c:4276
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:4494
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:4495
 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 ""
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:4558
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:4560
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:4591
 msgid "Finalizing connection"
 msgstr "Привршување на поврзувањето"
 
-#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
+#: src/protocols/oscar/oscar.c:4861 src/protocols/oscar/oscar.c:4868
 msgid "Email Address"
 msgstr "E-mail адреса"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4873 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Мобилен телефон"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4874
+msgid "Not specified"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Женско"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Машко"
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4891
 msgid "Personal Web Page"
 msgstr "Лична веб страница"
 
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4895
 msgid "Additional Information"
 msgstr "Дополнителни информации"
 
-#: src/protocols/oscar/oscar.c:4264
+#: src/protocols/oscar/oscar.c:4900
 msgid "Home Address"
 msgstr "Домашна адреса"
 
-#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4904 src/protocols/oscar/oscar.c:4912
 msgid "Zip Code"
 msgstr "Поштенски код"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4908
 msgid "Work Address"
 msgstr "Адреса на работа"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4916
 msgid "Work Information"
 msgstr "Работа информација"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4917
 msgid "Company"
 msgstr "Компанија"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4918
 msgid "Division"
 msgstr "Оддел"
 
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4919
 msgid "Position"
 msgstr "Позиција"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4921
 msgid "Web Page"
 msgstr "Web страница"
 
-#: src/protocols/oscar/oscar.c:4291
+#: src/protocols/oscar/oscar.c:4927
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ инфо за %s"
 
-#: src/protocols/oscar/oscar.c:4341
+#: src/protocols/oscar/oscar.c:4976
 msgid "Pop-Up Message"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4997
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4366
+#: src/protocols/oscar/oscar.c:5001
 msgid "Search Results"
 msgstr "Резулатати од пребарувањето"
 
-#: src/protocols/oscar/oscar.c:4383
+#: src/protocols/oscar/oscar.c:5018
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4404
+#: src/protocols/oscar/oscar.c:5039
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Ќе добиете email за потврда на %s"
 
-#: src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:5041
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4434
+#: src/protocols/oscar/oscar.c:5069
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:5075
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4443
+#: src/protocols/oscar/oscar.c:5078
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4446
+#: src/protocols/oscar/oscar.c:5081
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4449
+#: src/protocols/oscar/oscar.c:5084
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4452
+#: src/protocols/oscar/oscar.c:5087
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:5090
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:5100
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:5101 src/protocols/oscar/oscar.c:5108
 msgid "Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:5106
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4686
+#: src/protocols/oscar/oscar.c:5171
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5345
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4687
+#: src/protocols/oscar/oscar.c:5346
 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 ""
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:5373
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7366,26 +7921,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:5378
 msgid "Profile too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6698
 msgid "Visible"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4753
+#: src/protocols/oscar/oscar.c:5412
 msgid "Unable to set AIM away message."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:5413
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4794
+#: src/protocols/oscar/oscar.c:5453
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7396,11 +7951,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4799
+#: src/protocols/oscar/oscar.c:5458
 msgid "Away message too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4892
+#: src/protocols/oscar/oscar.c:5536
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7408,40 +7963,40 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5537 src/protocols/oscar/oscar.c:5985
+#: src/protocols/oscar/oscar.c:5998
 msgid "Unable To Add"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5698
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5030
+#: src/protocols/oscar/oscar.c:5699
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
-#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:5887 src/protocols/oscar/oscar.c:6042
+#: src/protocols/oscar/oscar.c:6043 src/protocols/oscar/oscar.c:6048
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5984
 #, 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 ""
 
-#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5984 src/protocols/oscar/oscar.c:5997
 msgid "(no name)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5997
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7449,18 +8004,18 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:6079
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5410
+#: src/protocols/oscar/oscar.c:6085
 msgid "Authorization Given"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6118
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7468,17 +8023,17 @@
 msgstr ""
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:6160
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6161
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6164
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7486,156 +8041,145 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6165
 msgid "Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6202 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:6224
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:6314
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6471
 msgid "Away Message"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6284
-msgid "Unable to open Direct IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6297
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6300
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6485
+#: src/protocols/oscar/oscar.c:6756
 msgid "Buddy Comment:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6501
+#: src/protocols/oscar/oscar.c:6774
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6509
+#: src/protocols/oscar/oscar.c:6780
 msgid "Get Status Msg"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6792
 msgid "Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6553
+#: src/protocols/oscar/oscar.c:6814
 msgid "Re-request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6844
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6575
+#: src/protocols/oscar/oscar.c:6845
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6581
+#: src/protocols/oscar/oscar.c:6852
 msgid "New screen name formatting:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:6904
 msgid "Change Address To:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6674
+#: src/protocols/oscar/oscar.c:6949
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6952
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6678
+#: src/protocols/oscar/oscar.c:6953
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:6970
 msgid "Find Buddy by E-mail"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6971
 msgid "Search for a buddy by e-mail address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6972
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6989
 msgid "Available Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6990
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:7072 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:7077
 msgid "Set User Info (URL)..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:7083
 msgid "Set Available Message..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:7088 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:7093
 msgid "Change Password (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:7097
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:7106
 msgid "Format Screen Name..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6842
+#: src/protocols/oscar/oscar.c:7110
 msgid "Confirm Account"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:7114
 msgid "Display Currently Registered Address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:7118
 msgid "Change Currently Registered Address..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:7125
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6871
+#: src/protocols/oscar/oscar.c:7131
 msgid "Search for Buddy by Email..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:7136
 msgid "Search for Buddy by Information"
 msgstr ""
 
@@ -7650,202 +8194,1516 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
 msgid "AIM/ICQ Protocol Plugin"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7021
+#: src/protocols/oscar/oscar.c:7275
 msgid "Auth host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7026
+#: src/protocols/oscar/oscar.c:7280
 msgid "Auth port"
 msgstr ""
 
-#: src/protocols/toc/toc.c:167
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
+msgid "Key Agreement"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:53
+msgid "Cannot perform the key agreement"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:110
+msgid "Error occurred during key agreement"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:114
+msgid "Key Agreement failed"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:119
+msgid "Timeout during key agreement"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:124
+msgid "Key agreement was aborted"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:129
+msgid "Key agreement is already started"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:134
+msgid "Key agreement cannot be started with yourself"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
+msgid "The remote user is not present in the network any more"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:292
+#, fuzzy, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Достапна е датотека за преземање од:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+
+#: src/protocols/silc/buddy.c:305
+msgid "Key Agreement Request"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
+#, fuzzy
+msgid "IM With Password"
+msgstr "Лозинка:"
+
+#: src/protocols/silc/buddy.c:417
+msgid "Cannot set IM key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:459
+#, fuzzy
+msgid "Set IM Password"
+msgstr "Лозинка:"
+
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
+#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+msgid "Get Public Key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
+#: src/protocols/silc/ops.c:1268
+msgid "Cannot fetch the public key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
+msgid "Show Public Key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:222
+msgid "Could not load public key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
+#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
+#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+#, fuzzy
+msgid "User Information"
+msgstr "Работа информација"
+
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
+#: src/protocols/silc/ops.c:1080
+#, fuzzy
+msgid "Cannot get user information"
+msgstr "Промени корисничко инфо за %s"
+
+#: src/protocols/silc/buddy.c:729
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:732
+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 ""
+
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "Отвори..."
+
+#: src/protocols/silc/buddy.c:1032
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1035
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1038
+msgid "Import..."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1125
+#, fuzzy
+msgid "Select correct user"
+msgstr "Избери фонт"
+
+#: src/protocols/silc/buddy.c:1127
+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 ""
+
+#: src/protocols/silc/buddy.c:1129
+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 ""
+
+#: src/protocols/silc/buddy.c:1377
+msgid "Detached"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1389
+msgid "Robot"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/util.c:469
+msgid "Happy"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/util.c:471
+msgid "Sad"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/util.c:473
+msgid "Angry"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/util.c:475
+msgid "Jealous"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/util.c:477
+msgid "Ashamed"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/util.c:479
+#, fuzzy
+msgid "Invincible"
+msgstr "Покани"
+
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/util.c:481
+#, fuzzy
+msgid "In Love"
+msgstr "Игнорирај"
+
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/util.c:483
+msgid "Sleepy"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/util.c:485
+#, fuzzy
+msgid "Bored"
+msgstr "Задебелено"
+
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/util.c:487
+msgid "Excited"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/util.c:489
+msgid "Anxious"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+#, fuzzy
+msgid "User Modes"
+msgstr "Корисници"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+msgid "Mood"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+#, fuzzy
+msgid "Status Text"
+msgstr "Статус:"
+
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#, fuzzy
+msgid "Preferred Contact"
+msgstr "Параметри"
+
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+#, fuzzy
+msgid "Preferred Language"
+msgstr "Параметри"
+
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+msgid "Device"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
+#, fuzzy
+msgid "Timezone"
+msgstr "Време"
+
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+#, fuzzy
+msgid "Geolocation"
+msgstr "Известување"
+
+#: src/protocols/silc/buddy.c:1529
+msgid "Reset IM Key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1534
+msgid "IM with Key Exchange"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1538
+#, fuzzy
+msgid "IM with Password"
+msgstr "Лозинка:"
+
+#: src/protocols/silc/buddy.c:1549
+msgid "Get Public Key..."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#, fuzzy
+msgid "Kill User"
+msgstr "Блокирај го корисникот"
+
+#: src/protocols/silc/chat.c:37
+#, fuzzy
+msgid "_Passphrase:"
+msgstr "_Лозинка:"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr ""
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
+#, fuzzy
+msgid "Channel Information"
+msgstr "Работа информација"
+
+#: src/protocols/silc/chat.c:68
+#, fuzzy
+msgid "Cannot get channel information"
+msgstr "Промени корисничко инфо за %s"
+
+#: src/protocols/silc/chat.c:105
+#, fuzzy, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Име за најава:</b>"
+
+#: src/protocols/silc/chat.c:108
+#, fuzzy, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr ""
+"\n"
+"<b>Акаунт:</b> %s"
+
+#: src/protocols/silc/chat.c:115
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:124
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:127
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:132
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:137
+msgid "<br><b>Channel Modes:</b> "
+msgstr ""
+
+#: src/protocols/silc/chat.c:150
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:151
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:221
+msgid "Add Channel Public Key"
+msgstr ""
+
+#. Add new public key
+#: src/protocols/silc/chat.c:276
+msgid "Open Public Key..."
+msgstr ""
+
+#: src/protocols/silc/chat.c:385
+msgid "Channel Passphrase"
+msgstr ""
+
+#: src/protocols/silc/chat.c:392
+msgid "Channel Public Keys List"
+msgstr ""
+
+#: src/protocols/silc/chat.c:397
+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 ""
+
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
+#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
+#: src/protocols/silc/chat.c:874
+#, fuzzy
+msgid "Channel Authentication"
+msgstr "Авторизирање"
+
+#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
+#, fuzzy
+msgid "Add / Remove"
+msgstr "Отстрани"
+
+#: src/protocols/silc/chat.c:563
+#, fuzzy
+msgid "Group Name"
+msgstr "Ново има на групата"
+
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#, fuzzy
+msgid "Passphrase"
+msgstr "Лозинката е пратена"
+
+#: src/protocols/silc/chat.c:578
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr ""
+
+#: src/protocols/silc/chat.c:580
+msgid "Add Channel Private Group"
+msgstr ""
+
+#: src/protocols/silc/chat.c:707
+#, fuzzy
+msgid "User Limit"
+msgstr "Корисници"
+
+#: src/protocols/silc/chat.c:708
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+
+#: src/protocols/silc/chat.c:850
+msgid "Get Info"
+msgstr "Инфо"
+
+#: src/protocols/silc/chat.c:857
+#, fuzzy
+msgid "Invite List"
+msgstr "Покани"
+
+#: src/protocols/silc/chat.c:861
+#, fuzzy
+msgid "Ban List"
+msgstr "Листа на пријатели"
+
+#: src/protocols/silc/chat.c:868
+#, fuzzy
+msgid "Add Private Group"
+msgstr "Додади група"
+
+#: src/protocols/silc/chat.c:879
+msgid "Reset Permanent"
+msgstr ""
+
+#: src/protocols/silc/chat.c:883
+msgid "Set Permanent"
+msgstr ""
+
+#: src/protocols/silc/chat.c:890
+msgid "Set User Limit"
+msgstr ""
+
+#: src/protocols/silc/chat.c:895
+msgid "Reset Topic Restriction"
+msgstr ""
+
+#: src/protocols/silc/chat.c:899
+msgid "Set Topic Restriction"
+msgstr ""
+
+#: src/protocols/silc/chat.c:905
+msgid "Reset Private Channel"
+msgstr ""
+
+#: src/protocols/silc/chat.c:909
+msgid "Set Private Channel"
+msgstr ""
+
+#: src/protocols/silc/chat.c:915
+msgid "Reset Secret Channel"
+msgstr ""
+
+#: src/protocols/silc/chat.c:919
+msgid "Set Secret Channel"
+msgstr ""
+
+#: src/protocols/silc/chat.c:989
+#, fuzzy, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Баниран си од %s."
+
+#: src/protocols/silc/chat.c:993
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr ""
+
+#: src/protocols/silc/chat.c:1046
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+
+#: src/protocols/silc/chat.c:1048
+#, fuzzy
+msgid "Join Private Group"
+msgstr "Преименувај група"
+
+#: src/protocols/silc/chat.c:1049
+msgid "Cannot join private group"
+msgstr ""
+
+#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+msgid "Cannot call command"
+msgstr ""
+
+#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#, fuzzy
+msgid "Unknown command"
+msgstr "Непознато"
+
+#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:206
+#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+#, fuzzy
+msgid "Secure File Transfer"
+msgstr "Пренос на датотеки"
+
+#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:105
+msgid "Error during file transfer"
+msgstr ""
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr ""
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr ""
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr ""
+
+#: src/protocols/silc/ft.c:207
+msgid "No file transfer session active"
+msgstr ""
+
+#: src/protocols/silc/ft.c:212
+#, fuzzy
+msgid "File transfer already started"
+msgstr "Пренос на датотеки"
+
+#: src/protocols/silc/ft.c:217
+msgid "Could not perform key agreement for file transfer"
+msgstr ""
+
+#: src/protocols/silc/ft.c:223
+msgid "Could not start the file transfer"
+msgstr ""
+
+#: src/protocols/silc/ft.c:343
+#, fuzzy
+msgid "Cannot send file"
+msgstr "Не може да се прати датотека од 0 бајти."
+
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
+#: src/protocols/silc/ops.c:351
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr ""
+
+#: src/protocols/silc/ops.c:413
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr ""
+
+#: src/protocols/silc/ops.c:417
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr ""
+
+#: src/protocols/silc/ops.c:448
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr ""
+
+#: src/protocols/silc/ops.c:452
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr ""
+
+#: src/protocols/silc/ops.c:479
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr ""
+
+#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
+#: src/protocols/silc/ops.c:519
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr ""
+
+#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
+#: src/protocols/silc/ops.c:550
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr ""
+
+#: src/protocols/silc/ops.c:596
+#, fuzzy
+msgid "Server signoff"
+msgstr "Одјави се"
+
+#: src/protocols/silc/ops.c:783
+#, fuzzy
+msgid "Personal Information"
+msgstr "Дополнителни информации"
+
+#: src/protocols/silc/ops.c:806
+msgid "Birth Day"
+msgstr ""
+
+#: src/protocols/silc/ops.c:810
+msgid "Job Title"
+msgstr ""
+
+#: src/protocols/silc/ops.c:814
+msgid "Job Role"
+msgstr ""
+
+#: src/protocols/silc/ops.c:818
+msgid "Organization"
+msgstr ""
+
+#: src/protocols/silc/ops.c:822
+#, fuzzy
+msgid "Unit"
+msgstr "Покани"
+
+#: src/protocols/silc/ops.c:841
+#, fuzzy
+msgid "EMail"
+msgstr "Машко"
+
+#: src/protocols/silc/ops.c:846
+#, fuzzy
+msgid "Note"
+msgstr "Ништо"
+
+#: src/protocols/silc/ops.c:894
+#, fuzzy
+msgid "Join Chat"
+msgstr "Приклучи се на разговор..."
+
+#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+msgid "Public Key Fingerprint"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+msgid "Public Key Babbleprint"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1064
+#, fuzzy
+msgid "More..."
+msgstr "Нов..."
+
+#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+msgid "Detach From Server"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1135
+msgid "Cannot detach"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1146
+msgid "Cannot set topic"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1184
+msgid "Failed to change nickname"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1221
+msgid "Roomlist"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1221
+msgid "Cannot get room list"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1269
+msgid "No public key was received"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+#, fuzzy
+msgid "Server Information"
+msgstr "Работа информација"
+
+#: src/protocols/silc/ops.c:1283
+#, fuzzy
+msgid "Cannot get server information"
+msgstr "Промени корисничко инфо за %s"
+
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+#, fuzzy
+msgid "Server Statistics"
+msgstr "Домашна адреса"
+
+#: src/protocols/silc/ops.c:1315
+msgid "Cannot get server statistics"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1324
+msgid "No server statisitics available"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1346
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1369
+msgid "Network Statistics"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+msgid "Ping"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1377
+msgid "Ping failed"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1382
+msgid "Ping reply received from server"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1390
+msgid "Could not kill user"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1471
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1476
+msgid "Key Exchange failed"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1485
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+#: src/protocols/silc/ops.c:1520
+msgid "Disconnected by server"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1582
+#, fuzzy
+msgid "Authenticating connection"
+msgstr "Авторизирање"
+
+#: src/protocols/silc/ops.c:1629
+msgid "Verifying server public key"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1670
+msgid "Passphrase required"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1699
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1702
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1705
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1708
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1711
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1714
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1717
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1719
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1721
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1732
+msgid "Failure: Authentication failed"
+msgstr ""
+
+#: src/protocols/silc/pk.c:103
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr ""
+
+#: src/protocols/silc/pk.c:118
+#, fuzzy
+msgid "View..."
+msgstr "Нов..."
+
+#: src/protocols/silc/pk.c:140
+msgid "Unsupported public key type"
+msgstr ""
+
+#: src/protocols/silc/silc.c:133
+#, fuzzy
+msgid "Connection failed"
+msgstr "Поврзување"
+
+#: src/protocols/silc/silc.c:159
+#, fuzzy
+msgid "Cannot initialize SILC Client connection"
+msgstr "Привршување на поврзувањето"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr ""
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr ""
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+msgid "Connecting to SILC Server"
+msgstr ""
+
+#: src/protocols/silc/silc.c:606
+msgid "Your Current Mood"
+msgstr ""
+
+#: src/protocols/silc/silc.c:608
+msgid "Normal"
+msgstr ""
+
+#: src/protocols/silc/silc.c:633
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+
+#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+msgid "SMS"
+msgstr ""
+
+#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+msgid "MMS"
+msgstr ""
+
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+msgid "Video Conferencing"
+msgstr ""
+
+#: src/protocols/silc/silc.c:650
+msgid "Your Current Status"
+msgstr ""
+
+#: src/protocols/silc/silc.c:657
+#, fuzzy
+msgid "Online Services"
+msgstr "Поврзано"
+
+#: src/protocols/silc/silc.c:660
+msgid "Let others see what services you are using"
+msgstr ""
+
+#: src/protocols/silc/silc.c:666
+msgid "Let others see what computer you are using"
+msgstr ""
+
+#: src/protocols/silc/silc.c:673
+msgid "Your VCard File"
+msgstr ""
+
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
+msgid "User Online Status Attributes"
+msgstr ""
+
+#: src/protocols/silc/silc.c:688
+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 ""
+
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:1135
+msgid "Message of the Day"
+msgstr ""
+
+#: src/protocols/silc/silc.c:728
+msgid "No Message of the Day available"
+msgstr ""
+
+#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
+msgid "There is no Message of the Day associated with this connection"
+msgstr ""
+
+#: src/protocols/silc/silc.c:772
+#, fuzzy
+msgid "Online Status"
+msgstr "Поврзано"
+
+#: src/protocols/silc/silc.c:781
+msgid "View Message of the Day"
+msgstr ""
+
+#: src/protocols/silc/silc.c:853
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:962
+msgid "Failed to leave channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1006
+msgid "Topic too long"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1087
+msgid "You must specify a nick"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1189
+#, c-format
+msgid "channel %s not found"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1194
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1196
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1209
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1239
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1302
+msgid "part [channel]:  Leave the chat"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1306
+msgid "leave [channel]:  Leave the chat"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1310
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1315
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1319
+msgid "list:  List channels on this network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1323
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1331
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1335
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1339
+msgid "detach:  Detach this session"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1343
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1347
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1352
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1356
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1360
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1364
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1368
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1372
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1376
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1380
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1384
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1388
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1392
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1396
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1400
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1404
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1409
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1413
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1425
+#, fuzzy
+msgid "Instant Messages"
+msgstr "Инстант пораки"
+
+#: src/protocols/silc/silc.c:1430
+msgid "Digitally sign all IM messages"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1435
+msgid "Verify all IM message signatures"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1438
+#, fuzzy
+msgid "Channel Messages"
+msgstr "Испрати порака"
+
+#: src/protocols/silc/silc.c:1443
+msgid "Digitally sign all channel messages"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1448
+msgid "Verify all channel message signatures"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1451
+msgid "Default SILC Key Pair"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1456
+msgid "SILC Public Key"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1461
+msgid "SILC Private Key"
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1547
+#, fuzzy
+msgid "SILC Protocol Plugin"
+msgstr "Додаток за IRC протокол"
+
+#. *  description
+#: src/protocols/silc/silc.c:1549
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1579
+#, fuzzy
+msgid "Public key authentication"
+msgstr "Авторизирање"
+
+#: src/protocols/silc/silc.c:1585
+msgid "Public Key File"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1589
+msgid "Private Key File"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1594
+msgid "Reject watching by other users"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1597
+#, fuzzy
+msgid "Block invites"
+msgstr "Блокирај го корисникот"
+
+#: src/protocols/silc/silc.c:1600
+msgid "Block IMs without Key Exchange"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1603
+msgid "Reject online status attribute requests"
+msgstr ""
+
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
+msgid "Creating SILC key pair..."
+msgstr ""
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#: src/protocols/silc/util.c:310
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:312
+#, fuzzy, c-format
+msgid "User Name: \t%s\n"
+msgstr "_Корисничко име:"
+
+#: src/protocols/silc/util.c:314
+#, c-format
+msgid "EMail: \t\t%s\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:316
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:318
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:320
+#, c-format
+msgid "Country: \t%s\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:322
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:324
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:325
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
+#, fuzzy
+msgid "Public Key Information"
+msgstr "Работа информација"
+
+#: src/protocols/silc/util.c:512
+msgid "Paging"
+msgstr ""
+
+#: src/protocols/silc/util.c:536
+msgid "Computer"
+msgstr ""
+
+#: src/protocols/silc/util.c:540
+msgid "PDA"
+msgstr ""
+
+#: src/protocols/silc/util.c:542
+msgid "Terminal"
+msgstr ""
+
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr ""
 
+#: src/protocols/toc/toc.c:480
+#, c-format
+msgid "Unable to write file %s."
+msgstr ""
+
+#: src/protocols/toc/toc.c:483
+#, c-format
+msgid "Unable to read file %s."
+msgstr ""
+
+#: src/protocols/toc/toc.c:486
+#, c-format
+msgid "Message too long, last %s bytes truncated."
+msgstr ""
+
+#: src/protocols/toc/toc.c:489
+#, c-format
+msgid "%s not currently logged in."
+msgstr ""
+
+#: src/protocols/toc/toc.c:492
+#, c-format
+msgid "Warning of %s not allowed."
+msgstr ""
+
+#: src/protocols/toc/toc.c:495
+msgid "A message has been dropped, you are exceeding the server speed limit."
+msgstr ""
+
+#: src/protocols/toc/toc.c:498
+#, c-format
+msgid "Chat in %s is not available."
+msgstr ""
+
+#: src/protocols/toc/toc.c:501
+#, c-format
+msgid "You are sending messages too fast to %s."
+msgstr ""
+
+#: src/protocols/toc/toc.c:504
+#, c-format
+msgid "You missed an IM from %s because it was too big."
+msgstr ""
+
+#: src/protocols/toc/toc.c:507
+#, c-format
+msgid "You missed an IM from %s because it was sent too fast."
+msgstr ""
+
 #: src/protocols/toc/toc.c:510
-#, c-format
-msgid "Unable to write file %s."
+msgid "Failure."
 msgstr ""
 
 #: src/protocols/toc/toc.c:513
-#, c-format
-msgid "Unable to read file %s."
+msgid "Too many matches."
 msgstr ""
 
 #: src/protocols/toc/toc.c:516
-#, c-format
-msgid "Message too long, last %s bytes truncated."
+msgid "Need more qualifiers."
 msgstr ""
 
 #: src/protocols/toc/toc.c:519
-#, c-format
-msgid "%s not currently logged in."
+msgid "Dir service temporarily unavailable."
 msgstr ""
 
 #: src/protocols/toc/toc.c:522
-#, c-format
-msgid "Warning of %s not allowed."
+msgid "Email lookup restricted."
 msgstr ""
 
 #: src/protocols/toc/toc.c:525
-msgid "A message has been dropped, you are exceeding the server speed limit."
+msgid "Keyword ignored."
 msgstr ""
 
 #: src/protocols/toc/toc.c:528
-#, c-format
-msgid "Chat in %s is not available."
+msgid "No keywords."
 msgstr ""
 
 #: src/protocols/toc/toc.c:531
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr ""
-
-#: src/protocols/toc/toc.c:534
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr ""
-
-#: src/protocols/toc/toc.c:537
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-
-#: src/protocols/toc/toc.c:540
-msgid "Failure."
-msgstr ""
-
-#: src/protocols/toc/toc.c:543
-msgid "Too many matches."
-msgstr ""
-
-#: src/protocols/toc/toc.c:546
-msgid "Need more qualifiers."
-msgstr ""
-
-#: src/protocols/toc/toc.c:549
-msgid "Dir service temporarily unavailable."
+msgid "User has no directory information."
+msgstr ""
+
+#: src/protocols/toc/toc.c:535
+msgid "Country not supported."
+msgstr ""
+
+#: src/protocols/toc/toc.c:538
+#, c-format
+msgid "Failure unknown: %s."
+msgstr ""
+
+#: src/protocols/toc/toc.c:544
+msgid "The service is temporarily unavailable."
+msgstr ""
+
+#: src/protocols/toc/toc.c:547
+msgid "Your warning level is currently too high to log in."
+msgstr ""
+
+#: src/protocols/toc/toc.c:550
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
 
 #: src/protocols/toc/toc.c:552
-msgid "Email lookup restricted."
-msgstr ""
-
-#: src/protocols/toc/toc.c:555
-msgid "Keyword ignored."
-msgstr ""
-
-#: src/protocols/toc/toc.c:558
-msgid "No keywords."
-msgstr ""
-
-#: src/protocols/toc/toc.c:561
-msgid "User has no directory information."
-msgstr ""
-
-#: src/protocols/toc/toc.c:565
-msgid "Country not supported."
-msgstr ""
-
-#: src/protocols/toc/toc.c:568
-#, c-format
-msgid "Failure unknown: %s."
-msgstr ""
-
-#: src/protocols/toc/toc.c:574
-msgid "The service is temporarily unavailable."
-msgstr ""
-
-#: src/protocols/toc/toc.c:577
-msgid "Your warning level is currently too high to log in."
-msgstr ""
-
-#: src/protocols/toc/toc.c:580
-msgid ""
-"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 ""
-
-#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Непозната грешка при најавување: %s."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr ""
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
 msgstr ""
 
-#: src/protocols/toc/toc.c:907
+#: src/protocols/toc/toc.c:894
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:908
+#: src/protocols/toc/toc.c:895
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1545
 msgid "Set Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1667
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
+#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1945
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2042
+#: src/protocols/toc/toc.c:2045
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2079
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
@@ -7861,15 +9719,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2187
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr ""
 
@@ -7926,7 +9784,7 @@
 msgid "Profile"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
 msgstr ""
 
@@ -7953,46 +9811,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:308
+#: src/protocols/yahoo/yahoo.c:338
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:939
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:942
 msgid "Add buddy rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1599
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8000,163 +9858,129 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1675
+#: src/protocols/yahoo/yahoo.c:1777
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1678
+#: src/protocols/yahoo/yahoo.c:1780
 msgid "Ignore buddy?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Invalid username."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1825
+msgid "Normal authencation failed!"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1826
+msgid ""
+"The normal authencation method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authencation, will which result in "
+"reduced functionality and features."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1717
-msgid "Your account is locked, please log in to the yahoo website."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1720
-#, c-format
-msgid "Unknown error number %d."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1837
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1840
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1894
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1896
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
 msgid "Unable to read"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
+#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Connection problem"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2971
 msgid "Not At Home"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Not At Desk"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2973
 msgid "Not In Office"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
-#: src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "On Vacation"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
 msgid "Not on server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2634
 #, c-format
 msgid ""
 "\n"
 "<b>%s:</b> %s"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Join in Chat"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoo.c:2698
 msgid "Initiate Conference"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Active which ID?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2759
 msgid "Join who in chat?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2769
 msgid "Activate ID..."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2773
 msgid "Join user in chat..."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2916
-msgid ""
-"<b>Sorry, profiles marked as containing adult content are not supported at "
-"this time.</b><br><br>\n"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2939
-msgid ""
-"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
-msgid "Yahoo! ID"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
-#: src/protocols/yahoo/yahoo.c:3038
-msgid "Hobbies"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
-msgid "Latest News"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3064
-msgid "Home Page"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3076
-msgid "Cool Link 1"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3080
-msgid "Cool Link 2"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3082
-msgid "Cool Link 3"
-msgstr ""
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -8168,139 +9992,301 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3313
+msgid "Yahoo Japan"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3317
+#: src/protocols/yahoo/yahoo.c:3319
+msgid "Japan Pager host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3322
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3320
+#: src/protocols/yahoo/yahoo.c:3325
 msgid "File transfer host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3328
+#, fuzzy
+msgid "Japan File transfer host"
+msgstr "Пренос на датотеки"
+
+#: src/protocols/yahoo/yahoo.c:3331
 msgid "File transfer port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3326
+#: src/protocols/yahoo/yahoo.c:3334
 msgid "Chat Room List Url"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_filexfer.c:200
+#: src/protocols/yahoo/yahoo.c:3337
+msgid "YCHT Host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3340
+#, fuzzy
+msgid "YCHT Port"
+msgstr "Порта"
+
+#: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoo_profile.c:675
+#, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:749
+msgid "Yahoo! Japan Profile"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:750
+msgid "Yahoo! Profile"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:794
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:796
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:969
+msgid "Yahoo! ID"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Hobbies"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
+msgid "Latest News"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1086
+msgid "Home Page"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 1"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1106
+msgid "Cool Link 2"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 3"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+#, c-format
+msgid "User information for %s unavailable"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1152
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
+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 ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1163
+msgid "The user's profile is empty."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Failed to join chat"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:355
 msgid "Maybe the room is full?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:426
+#: src/protocols/yahoo/yahoochat.c:429
 #, c-format
 msgid "You are now chatting in %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:583
 msgid "Failed to join buddy in chat"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:581
+#: src/protocols/yahoo/yahoochat.c:584
 msgid "Maybe they're not in a chat?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Unable to connect"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1338
 msgid "Fetching the room list failed."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1346
+#: src/protocols/yahoo/yahoochat.c:1383
 msgid "Voices"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1349
+#: src/protocols/yahoo/yahoochat.c:1386
 msgid "Webcams"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
 msgid "Unable to fetch room list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1414
+#: src/protocols/yahoo/yahoochat.c:1451
 msgid "User Rooms"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:557
+#: src/protocols/zephyr/zephyr.c:589
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:624
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:559
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:561
+#: src/protocols/zephyr/zephyr.c:628
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
+#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
 msgid "Anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:1011
 msgid "Already logged in with Zephyr"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:1011
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1164
-msgid "ZLocate"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1206
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "_Class:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1212
+#: src/protocols/zephyr/zephyr.c:1392
 msgid "_Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/protocols/zephyr/zephyr.c:1398
 msgid "_Recipient:"
 msgstr ""
 
+#: src/protocols/zephyr/zephyr.c:1409
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1678
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1683
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1688
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1693
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1699
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1704
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1710
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1716
+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 ""
+
+#: src/protocols/zephyr/zephyr.c:1722
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1727
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1802
+msgid "Resubscribe"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1805
+msgid "Retrieve subscriptions from server"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -8312,133 +10298,140 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
+#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1906
 msgid "Export to .anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Exposure"
 msgstr ""
 
+#. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:955
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr ""
-
-#: src/proxy.c:957
+#: src/proxy.c:845
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr ""
+
+#: src/proxy.c:849
 #, c-format
 msgid "Proxy connection error %d"
 msgstr ""
 
-#: src/proxy.c:1696
+#: src/proxy.c:1495
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: src/proxy.c:1696
+#: src/proxy.c:1495
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
 #. * Custom away message.
-#: src/prpl.h:195
+#: src/prpl.h:165
 msgid "Custom"
 msgstr ""
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1250
+#: src/request.h:1253
 msgid "Accept"
 msgstr ""
 
-#: src/server.c:58
+#: src/server.c:63
 msgid "Please enter your password"
 msgstr ""
 
-#: src/server.c:962
+#: src/server.c:528
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr ""
+
+#: src/server.c:938
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/server.c:976
+#: src/server.c:952
 msgid "(1 message)"
 msgstr ""
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1180 src/server.c:1189
 #, c-format
 msgid "%s logged in."
 msgstr ""
 
-#: src/server.c:1184
+#: src/server.c:1201
 #, c-format
 msgid "%s signed on"
 msgstr ""
 
-#: src/server.c:1200
+#: src/server.c:1216
 #, c-format
 msgid "%s came back"
 msgstr ""
 
-#: src/server.c:1202
+#: src/server.c:1218
 #, c-format
 msgid "%s went away"
 msgstr ""
 
-#: src/server.c:1217
+#: src/server.c:1232
 #, c-format
 msgid "%s became idle"
 msgstr ""
 
-#: src/server.c:1231
+#: src/server.c:1243
 #, c-format
 msgid "%s became unidle"
 msgstr ""
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1253 src/server.c:1260
 #, c-format
 msgid "%s logged out."
 msgstr ""
 
-#: src/server.c:1267
+#: src/server.c:1273
 #, c-format
 msgid "%s signed off"
 msgstr ""
 
-#: src/server.c:1317
+#: src/server.c:1335
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1320
+#: src/server.c:1338
 msgid "an anonymous person"
 msgstr ""
 
-#: src/server.c:1430
+#: src/server.c:1448
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
 
-#: src/server.c:1434
+#: src/server.c:1452
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr ""
 
-#: src/server.c:1440
+#: src/server.c:1458
 msgid "Accept chat invitation?"
 msgstr "Прифати ја поканата за разговор?"
 
@@ -8465,47 +10458,81 @@
 msgid "_Warn"
 msgstr "_Предупреди"
 
-#: src/util.c:2040
+#: src/util.c:2363
 msgid "Calculating..."
 msgstr "_Пресметувам..."
 
-#: src/util.c:2043
+#: src/util.c:2366
 msgid "Unknown."
 msgstr "_Непознато."
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+#: src/util.c:2392
+#, fuzzy
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "Испрати"
+msgstr[1] "Испрати"
+
+#: src/util.c:2406
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ден"
 msgstr[1] "ден"
 msgstr[2] "ден"
 
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+#: src/util.c:2414
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "час"
 msgstr[2] "час"
 
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+#: src/util.c:2422
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минута"
 msgstr[2] "минута"
 
-#: src/util.c:2430
+#: src/util.c:2832
 msgid "g003: Error opening connection.\n"
 msgstr ""
 
-#: src/win32/win32dep.c:272
+#: src/win32/win32dep.c:273
 msgid "Moving Gaim Settings.."
 msgstr ""
 
-#: src/win32/win32dep.c:275
+#: src/win32/win32dep.c:276
 msgid "Moving Gaim user settings to: "
 msgstr ""
 
-#: src/win32/win32dep.c:277
+#: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "Известување"
+
+#~ msgid "Set"
+#~ msgstr "Постави"
+
+#~ msgid "idle for"
+#~ msgstr "неактивен"
+
+#~ msgid "Buddy icon file:"
+#~ msgstr "Датотека за икони на пријатели:"
+
+#~ msgid "_Browse"
+#~ msgstr "_Разгледај"
+
+#~ msgid "_Reset"
+#~ msgstr "_Ресетирај"
+
+#~ msgid "/Tools/P_rotocol Actions"
+#~ msgstr "/Алатки/Дејствија за протокол"
+
+#~ msgid "That file already exists."
+#~ msgstr "Датотеката веќе постои."
+
+#~ msgid "Sign on"
+#~ msgstr "Најави се"
+
+#~ msgid "<html><body><b>Error retrieving profile</b></body></html>"
+#~ msgstr "<html><body><b>Грешка во преземањето на профилот</b></body></html>"