diff po/mk.po @ 11412:4be6232ffcd3

[gaim-migrate @ 13649] sync the oldstatus translations to head because I have not been updating head, and while head _is_ significantly different, there now exist translations in oldstatus that don't in head, and even where they exist in both, the oldstatus one is often more updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 01 Sep 2005 19:24:17 +0000
parents 67a929d50cfe
children 81e26b7f262e
line wrap: on
line diff
--- a/po/mk.po	Thu Sep 01 18:47:49 2005 +0000
+++ b/po/mk.po	Thu Sep 01 19:24:17 2005 +0000
@@ -7,31 +7,30 @@
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-15 12:01-0400\n"
+"POT-Creation-Date: 2005-07-10 16:02-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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 "X-Generator: KBabel 1.2\n"
 
-#: plugins/autorecon.c:291
+#: plugins/autorecon.c:240
 msgid "Error Message Suppression"
 msgstr ""
 
-#: plugins/autorecon.c:295
+#: plugins/autorecon.c:244
 msgid "Hide Disconnect Errors"
 msgstr ""
 
-#: plugins/autorecon.c:299
+#: plugins/autorecon.c:248
 msgid "Hide Login Errors"
 msgstr ""
 
-#: plugins/autorecon.c:303
-msgid "Hide Reconnecting Dialog"
+#: plugins/autorecon.c:252
+msgid "Restore Away State On Reconnect"
 msgstr ""
 
 #. *< type
@@ -40,7 +39,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:327
+#: plugins/autorecon.c:276
 msgid "Auto-Reconnect"
 msgstr "Автоматскo врзување"
 
@@ -48,10 +47,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:330 plugins/autorecon.c:332
+#: plugins/autorecon.c:279 plugins/autorecon.c:281
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Автоматско врзување, при пад на врската."
 
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
+msgid "Mail Server"
+msgstr "Сервер за пошта"
+
+#: plugins/chkmail.c:136
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr "%s (%d нови/%d вкупно)"
+
+#: plugins/chkmail.c:199
+msgid "Check Mail"
+msgstr "Провери пошта"
+
+#: plugins/chkmail.c:203
+msgid "Check email every X seconds.\n"
+msgstr "Провери пошта на секои X секунди.\n"
+
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr ""
@@ -77,13 +93,13 @@
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
 msgstr ""
 
 #: plugins/contact_priority.c:144
-msgid "Point values to use for account..."
+msgid "Point values to use for Account..."
 msgstr ""
 
 #. *< type
@@ -113,6 +129,98 @@
 "in contact priority computations."
 msgstr ""
 
+#: plugins/docklet/docklet.c:137 src/gtkaccount.c:751 src/gtkaccount.c:2179
+msgid "Auto-login"
+msgstr "Автоматска најава"
+
+#: plugins/docklet/docklet.c:140
+msgid "New Message..."
+msgstr "Нова порака..."
+
+#: plugins/docklet/docklet.c:141
+msgid "Join A Chat..."
+msgstr "Приклучи се на разговор..."
+
+#: plugins/docklet/docklet.c:173
+msgid "New..."
+msgstr "Нов..."
+
+#: plugins/docklet/docklet.c:177 src/gtkprefs.c:1813 src/protocols/gg/gg.c:52
+#: src/protocols/irc/msgs.c:227 src/protocols/jabber/jabber.c:998
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
+#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
+#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
+#: src/protocols/oscar/oscar.c:684 src/protocols/oscar/oscar.c:5788
+#: src/protocols/oscar/oscar.c:6785 src/protocols/oscar/oscar.c:6985
+#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:81
+msgid "Away"
+msgstr "Отсутен"
+
+#. else...
+#: plugins/docklet/docklet.c:183 src/away.c:595
+#: src/protocols/oscar/oscar.c:5706 src/protocols/oscar/oscar.c:6993
+msgid "Back"
+msgstr "Назад"
+
+#: plugins/docklet/docklet.c:191
+msgid "Mute Sounds"
+msgstr "Замолчи звуци"
+
+#: plugins/docklet/docklet.c:196 src/gtkft.c:659
+msgid "File Transfers"
+msgstr "Пренос на датотеки"
+
+#: plugins/docklet/docklet.c:197 src/gtkaccount.c:2391
+msgid "Accounts"
+msgstr "Акаунти"
+
+#: plugins/docklet/docklet.c:198 src/gtkprefs.c:2514
+msgid "Preferences"
+msgstr "Параметри"
+
+#: plugins/docklet/docklet.c:207
+msgid "Signoff"
+msgstr "Одјави се"
+
+#: plugins/docklet/docklet.c:211
+msgid "Quit"
+msgstr "Напушти"
+
+#: plugins/docklet/docklet.c:527
+msgid "Tray Icon Configuration"
+msgstr "Конфигурација за иконата во фиока"
+
+#: plugins/docklet/docklet.c:531
+msgid "_Hide new messages until tray icon is clicked"
+msgstr "Скриј нови пораки се додека икона не е кликната."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:557
+msgid "System Tray Icon"
+msgstr "Системска икона во фиока"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:560
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "Прикажи икона за Gaim во фиока."
+
+#. *  description
+#: plugins/docklet/docklet.c:562
+msgid ""
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+msgstr ""
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -128,87 +236,12 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Отсутен"
 
-#: plugins/docklet/docklet.c:136
-msgid "New Message..."
-msgstr "Нова порака..."
-
-#: plugins/docklet/docklet.c:137
-msgid "Join A Chat..."
-msgstr "Приклучи се на разговор..."
-
-#: plugins/docklet/docklet.c:172
-msgid "New..."
-msgstr "Нов..."
-
-#: plugins/docklet/docklet.c:176 src/gtkprefs.c:1757 src/gtkstatusbox.c:247
-#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:180
-#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1089
-#: src/protocols/jabber/jabber.c:1000 src/protocols/msn/msn.c:538
-#: src/protocols/novell/novell.c:2813 src/protocols/novell/novell.c:2951
-#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:698
-#: src/protocols/oscar/oscar.c:5868 src/protocols/oscar/oscar.c:6906
-#: src/protocols/oscar/oscar.c:7063 src/protocols/silc/buddy.c:1412
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3214
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:159
-msgid "Away"
-msgstr "Отсутен"
-
-#: plugins/docklet/docklet.c:184
-msgid "Back"
-msgstr "Назад"
-
-#: plugins/docklet/docklet.c:191
-msgid "Mute Sounds"
-msgstr "Замолчи звуци"
-
-#: plugins/docklet/docklet.c:198 src/gtkft.c:694
-msgid "File Transfers"
-msgstr "Пренос на датотеки"
-
-#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2327
-msgid "Accounts"
-msgstr "Акаунти"
-
-#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2144
-msgid "Preferences"
-msgstr "Параметри"
-
-#: plugins/docklet/docklet.c:204
-msgid "Quit"
-msgstr "Напушти"
-
-#: plugins/docklet/docklet.c:529
-msgid "Tray Icon Configuration"
-msgstr "Конфигурација за иконата во фиока"
-
-#: plugins/docklet/docklet.c:533
-msgid "_Hide new messages until tray icon is clicked"
-msgstr "Скриј нови пораки се додека икона не е кликната."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:559
-msgid "System Tray Icon"
-msgstr "Системска икона во фиока"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:562
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Прикажи икона за Gaim во фиока."
-
-#. *  description
-#: plugins/docklet/docklet.c:564
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
+#: plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr ""
+
+#: plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
 msgstr ""
 
 #: plugins/extplacement.c:77
@@ -259,7 +292,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: plugins/filectl.c:224
 msgid "Gaim File Control"
 msgstr "Контрола на датотеки за Gaim"
 
@@ -267,10 +300,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: plugins/filectl.c:227 plugins/filectl.c:229
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Овозможува контрола на Gaim со внесување на команди во датотека."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaiminc.c:90
+msgid "Gaim Demonstration Plugin"
+msgstr "Додаток за демонстрација на Gaim"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaiminc.c:93
+msgid "An example plugin that does stuff - see the description."
+msgstr "Додаток за пример што брка некои работи - види опис."
+
+#. *  description
+#: plugins/gaiminc.c:95
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Ова е многу добар додаток кој прави многу работи:\n"
+"- Кажува кој ја напишал програмава кога се најавуваш\n"
+"- Пораките што ги добиваш ги испишува инверзно\n"
+"- Испраќа порака до пријателите веднаш по нивната најава"
+
 #: plugins/gaim-remote/remote.c:91
 msgid "Not connected to AIM"
 msgstr "Не е врзано на AIM"
@@ -287,14 +350,14 @@
 msgid "Invalid AIM URI"
 msgstr "Невавалидно AIM URI"
 
-#: plugins/gaim-remote/remote.c:750
+#: plugins/gaim-remote/remote.c:673
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
 "%s"
 msgstr ""
 
-#: plugins/gaim-remote/remote.c:774
+#: plugins/gaim-remote/remote.c:697
 msgid "Unable to open socket"
 msgstr ""
 
@@ -304,145 +367,39 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:824
+#: plugins/gaim-remote/remote.c:747
 msgid "Remote Control"
 msgstr "Далечинска контрола"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:827
+#: plugins/gaim-remote/remote.c:750
 msgid "Provides remote control for gaim applications."
 msgstr "Нуди далечинска контрола на gaim апликации."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:829
+#: plugins/gaim-remote/remote.c:752
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Додаток за демонстрација на Gaim"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Додаток за пример што брка некои работи - види опис."
-
-#. *  description
-#: plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Ова е многу добар додаток кој прави многу работи:\n"
-"- Кажува кој ја напишал програмава кога се најавуваш\n"
-"- Пораките што ги добиваш ги испишува инверзно\n"
-"- Испраќа порака до пријателите веднаш по нивната најава"
-
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:42
-msgid "Hyperlink Color"
-msgstr ""
-
-#: plugins/gaimrc.c:53
-msgid "GtkTreeView Expander Size"
-msgstr ""
-
-#: plugins/gaimrc.c:72
-#, fuzzy
-msgid "Conversation Entry"
-msgstr "/Разговор/Отстрани..."
-
-#: plugins/gaimrc.c:73
-#, fuzzy
-msgid "Conversation History"
-msgstr "<h1>Разговор со %s</h1>\n"
-
-#: plugins/gaimrc.c:74
-msgid "Log Viewer"
-msgstr ""
-
-#: plugins/gaimrc.c:75
-msgid "Request Dialog"
-msgstr ""
-
-#: plugins/gaimrc.c:76
-#, fuzzy
-msgid "Notify Dialog"
-msgstr "Извести за"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
-msgid "Select Color for %s"
-msgstr "Избери фонт"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
-msgid "Select Color"
-msgstr "Избери фонт"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
-msgid "Select Font for %s"
-msgstr "Избери фонт"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
-msgid "Select Interface Font"
-msgstr "Избери фонт"
-
-#: plugins/gaimrc.c:343
-msgid "GTK+ Interface Font"
-msgstr ""
-
-#: plugins/gaimrc.c:362
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: plugins/gaimrc.c:460
-#, fuzzy
-msgid "Gaim GTK+ Theme Control"
-msgstr "Контрола на датотеки за Gaim"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
-
 #. Configuration frame
-#: plugins/gestures/gestures.c:241
+#: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
 msgstr "Конфигурација за гестови на глувчето"
 
-#: plugins/gestures/gestures.c:248
+#: plugins/gestures/gestures.c:228
 msgid "Middle mouse button"
 msgstr "Средно копче на глувчето"
 
-#: plugins/gestures/gestures.c:253
+#: plugins/gestures/gestures.c:233
 msgid "Right mouse button"
 msgstr "Десно копче на глувчето"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:265
+#: plugins/gestures/gestures.c:245
 msgid "_Visual gesture display"
 msgstr "_Визуелен приказ на гестовите"
 
@@ -452,19 +409,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:294
+#: plugins/gestures/gestures.c:274
 msgid "Mouse Gestures"
 msgstr "Гестови на глувчето"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:297
+#: plugins/gestures/gestures.c:277
 msgid "Provides support for mouse gestures"
 msgstr "Нуди поддршка за гестови на глувчето"
 
 #. *  description
-#: plugins/gestures/gestures.c:299
+#: plugins/gestures/gestures.c:279
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -475,9 +432,9 @@
 msgstr ""
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2003
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:613
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2168
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:609
+#: src/protocols/msn/msn.c:1474 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Име"
 
@@ -486,30 +443,30 @@
 msgstr "Инстант пораки"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:459
+#: plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Одбери контакт од адресарот или додади нов."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:472
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7427
+#: plugins/gevolution/add_buddy_dialog.c:468
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7269
 msgid "Search"
 msgstr "Барај"
 
-#: plugins/gevolution/add_buddy_dialog.c:553
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4400
-#: src/gtkblist.c:4777
+#: plugins/gevolution/add_buddy_dialog.c:549
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4186
+#: src/gtkblist.c:4534
 msgid "Group:"
 msgstr "Група:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:579
+#: plugins/gevolution/add_buddy_dialog.c:575
 #: plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "Ново лице"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:596
+#: plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Избери пријател"
 
@@ -536,45 +493,33 @@
 msgid "_Associate Buddy"
 msgstr "_Асоцирај пријател"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1242 src/blist.c:1458 src/gtkblist.c:4217
-#: src/protocols/jabber/roster.c:66
+#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
+#: src/gtkblist.c:3122 src/gtkprefs.c:962 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1827 src/protocols/jabber/jabber.c:949
+msgid "None"
+msgstr "Ништо"
+
+#: plugins/gevolution/gevolution.c:93 plugins/gevolution/gevo-util.c:64
+#: src/blist.c:776 src/blist.c:983 src/blist.c:1933 src/gtkblist.c:4001
+#: src/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "Пријатели"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
-msgid "Unable to send e-mail"
-msgstr "Додади го разговорот во листата на пријатели"
-
-#: plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+#: plugins/gevolution/gevolution.c:225
 msgid "Add to Address Book"
 msgstr "Додади во адресар"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
-msgid "Send E-Mail"
-msgstr "Испрати датотека"
-
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:348
 msgid "Evolution Integration Configuration"
 msgstr "Конфигурација за интегрирање на Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:351
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Одбери ги сите акаунти на кои сакаш да ги додадеш пријателите."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:52 src/gtkconn.c:431
+#: plugins/gevolution/gevolution.c:381 plugins/idle.c:52 src/gtkconn.c:627
 msgid "Account"
 msgstr "Акаунт"
 
@@ -584,7 +529,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:464
 msgid "Evolution Integration"
 msgstr "Интеграција со Evolution"
 
@@ -592,87 +537,90 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
-msgid "Provides integration with Evolution."
+#: plugins/gevolution/gevolution.c:467 plugins/gevolution/gevolution.c:469
+msgid "Provides integration with Ximian Evolution."
 msgstr "Нуди интеграција со Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: plugins/gevolution/new_person_dialog.c:264
 msgid "Please enter the person's information below."
 msgstr "Внеси ги информациите за лицето подолу."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Внеси го корисничкото име и акаунтот на пријателот."
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: plugins/gevolution/new_person_dialog.c:288
 msgid "Account type:"
 msgstr "Тип на акаунт:"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Screenname:"
 msgstr "Корисничко име:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
 msgstr "Изборни информации:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:395
-#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:604
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
+#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:590
 msgid "Buddy Icon"
 msgstr "Икона на пријател:"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr "Име:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr "Презиме:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr "E-пошта:"
 
-#: plugins/history.c:137
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:138
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:177
-msgid "History"
-msgstr "Историја"
-
-#: plugins/history.c:179
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Ги прикажува последните разговори во новиот прозорец за разговор."
-
-#: plugins/history.c:180
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:106
+#: plugins/gtk-signals-test.c:102
+msgid "GTK Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+
+#: plugins/history.c:92
+msgid "History"
+msgstr "Историја"
+
+#: plugins/history.c:94
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Ги прикажува последните разговори во новиот прозорец за разговор."
+
+#: plugins/history.c:95
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Кога е отворен нов прозорец за разговор,овој додаток ќе го внеси последниот "
+"разговор во тековниот."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/iconaway.c:104
 msgid "Iconify on Away"
 msgstr "Иконизирај при отсуство"
 
@@ -680,7 +628,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:109 plugins/iconaway.c:111
+#: plugins/iconaway.c:107 plugins/iconaway.c:109
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ја иконизира листата на пријатели и разговорите кога си отсутен."
 
@@ -689,7 +637,7 @@
 msgid "Minutes"
 msgstr "минути."
 
-#: plugins/idle.c:63 plugins/idle.c:97
+#: plugins/idle.c:63 plugins/idle.c:98
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
@@ -702,12 +650,12 @@
 msgid "_Set"
 msgstr "_Постави"
 
-#: plugins/idle.c:68
+#: plugins/idle.c:68 src/away.c:922
 #, fuzzy
 msgid "_Cancel"
 msgstr "Откажи"
 
-#: plugins/idle.c:99 plugins/idle.c:100
+#: plugins/idle.c:100 plugins/idle.c:101
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Нуди рачно конфигурирање на времето на неактивност."
 
@@ -770,74 +718,68 @@
 msgstr "Додава малечка кутија до листата на пријатели кога има нова пошта."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:642
+#: plugins/notify.c:614
 msgid "Notify For"
 msgstr "Извести за"
 
-#: plugins/notify.c:646
+#: plugins/notify.c:618
 msgid "_IM windows"
 msgstr "_Прозорци за пораки"
 
-#: plugins/notify.c:653
+#: plugins/notify.c:625
 msgid "C_hat windows"
 msgstr "П_розорци за разговор"
 
-#: plugins/notify.c:660
+#: plugins/notify.c:632
 msgid "_Focused windows"
 msgstr "_Фокусирани прозорци"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:668
+#: plugins/notify.c:640
 msgid "Notification Methods"
 msgstr "Методи за исветување"
 
-#: plugins/notify.c:675
+#: plugins/notify.c:647
 msgid "Prepend _string into window title:"
 msgstr "Вметни текст на почеток во насловната лента на прозорецот:"
 
 #. Count method button
-#: plugins/notify.c:694
+#: plugins/notify.c:666
 msgid "Insert c_ount of new messages into window title"
 msgstr ""
 
 #. Urgent method button
-#: plugins/notify.c:702
+#: plugins/notify.c:674
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Подеси менаџер на прозорци \"_URGENT\" hint"
 
-#. Raise window method button
-#: plugins/notify.c:710
-#, fuzzy
-msgid "R_aise conversation window"
-msgstr "Затвори разговор"
-
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:718
+#: plugins/notify.c:682
 msgid "Notification Removal"
 msgstr ""
 
 #. Remove on focus button
-#: plugins/notify.c:723
+#: plugins/notify.c:687
 msgid "Remove when conversation window _gains focus"
 msgstr ""
 
 #. Remove on click button
-#: plugins/notify.c:730
+#: plugins/notify.c:694
 msgid "Remove when conversation window _receives click"
 msgstr ""
 
 #. Remove on type button
-#: plugins/notify.c:738
+#: plugins/notify.c:702
 msgid "Remove when _typing in conversation window"
 msgstr ""
 
 #. Remove on message send button
-#: plugins/notify.c:746
+#: plugins/notify.c:710
 msgid "Remove when a _message gets sent"
 msgstr ""
 
 #. Remove on conversation switch button
-#: plugins/notify.c:755
+#: plugins/notify.c:719
 msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
@@ -847,7 +789,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:845
+#: plugins/notify.c:809
 msgid "Message Notification"
 msgstr "Известување за порака"
 
@@ -855,7 +797,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:848 plugins/notify.c:850
+#: plugins/notify.c:812 plugins/notify.c:814
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 
@@ -865,14 +807,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:567
+#: plugins/perl/perl.c:535
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:569 plugins/perl/perl.c:570
+#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
@@ -943,7 +885,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:626
+#: plugins/signals-test.c:601
 msgid "Signals Test"
 msgstr ""
 
@@ -951,7 +893,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:629 plugins/signals-test.c:631
+#: plugins/signals-test.c:604 plugins/signals-test.c:606
 msgid "Test to see that all signals are working properly."
 msgstr ""
 
@@ -973,43 +915,35 @@
 msgid "Tests to see that most things are working."
 msgstr ""
 
-#: plugins/spellchk.c:1680
-msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1681
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1826
+#: plugins/spellchk.c:416
 msgid "Text Replacements"
 msgstr ""
 
-#: plugins/spellchk.c:1850
+#: plugins/spellchk.c:440
 msgid "You type"
 msgstr ""
 
-#: plugins/spellchk.c:1862
+#: plugins/spellchk.c:452
 msgid "You send"
 msgstr ""
 
-#: plugins/spellchk.c:1888
+#: plugins/spellchk.c:478
 msgid "Add a new text replacement"
 msgstr ""
 
-#: plugins/spellchk.c:1895
+#: plugins/spellchk.c:485
 msgid "You _type:"
 msgstr ""
 
-#: plugins/spellchk.c:1909
+#: plugins/spellchk.c:499
 msgid "You _send:"
 msgstr ""
 
-#: plugins/spellchk.c:1951
+#: plugins/spellchk.c:541
 msgid "Text replacement"
 msgstr ""
 
-#: plugins/spellchk.c:1953 plugins/spellchk.c:1954
+#: plugins/spellchk.c:543 plugins/spellchk.c:544
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
@@ -1019,42 +953,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
-msgid "GNUTLS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
-msgid "Provides SSL support through GNUTLS."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-nss.c:319
-msgid "NSS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
-msgid "Provides SSL support through Mozilla NSS."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
 #: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr ""
@@ -1067,37 +965,73 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: plugins/statenotify.c:42
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:226
+msgid "GNUTLS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:318
+msgid "NSS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
+msgid "Provides SSL support through Mozilla NSS."
+msgstr ""
+
+#: plugins/statenotify.c:41
 #, c-format
 msgid "%s has gone away."
 msgstr ""
 
-#: plugins/statenotify.c:49
+#: plugins/statenotify.c:48
 #, c-format
 msgid "%s is no longer away."
 msgstr ""
 
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:55
 #, c-format
 msgid "%s has become idle."
 msgstr ""
 
-#: plugins/statenotify.c:63
+#: plugins/statenotify.c:62
 #, c-format
 msgid "%s is no longer idle."
 msgstr ""
 
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:73
 #, fuzzy
 msgid "Notify When"
 msgstr "Извести за"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:76
 #, fuzzy
 msgid "Buddy Goes _Away"
 msgstr "Пријателот е отсутен:"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:79
 #, fuzzy
 msgid "Buddy Goes _Idle"
 msgstr "Пријателот е неактивен:"
@@ -1108,7 +1042,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:119
 msgid "Buddy State Notification"
 msgstr ""
 
@@ -1116,7 +1050,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: plugins/statenotify.c:122 plugins/statenotify.c:125
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1148,19 +1082,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr ""
 
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:193
 msgid "Delay"
 msgstr ""
 
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:200
 msgid "minutes."
 msgstr "минути."
 
-#: plugins/timestamp.c:222
+#: plugins/timestamp.c:206
 msgid "_Apply"
 msgstr ""
 
@@ -1170,7 +1104,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:287
+#: plugins/timestamp.c:271
 msgid "Timestamp"
 msgstr ""
 
@@ -1178,7 +1112,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:290 plugins/timestamp.c:292
+#: plugins/timestamp.c:274 plugins/timestamp.c:276
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 
@@ -1202,7 +1136,7 @@
 msgstr ""
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:430
+#: plugins/win32/transparency/win2ktrans.c:430 src/gtkprefs.c:956
 msgid "Buddy List Window"
 msgstr ""
 
@@ -1236,209 +1170,227 @@
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
 
-#: plugins/win32/winprefs/winprefs.c:401
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr ""
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:409
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr ""
 
-#: plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr ""
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:421 src/gtkblist.c:3514
-#: src/gtkprefs.c:2099
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3167
+#: src/gtkprefs.c:2421
 msgid "Buddy List"
 msgstr "Листа на пријатели"
 
-#: plugins/win32/winprefs/winprefs.c:422
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr ""
 
+#. Docked Blist On Top
+#: plugins/win32/winprefs/winprefs.c:367
+msgid "Docked _Buddy List is always on top"
+msgstr ""
+
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:426
-msgid "_Keep Buddy List window on top:"
-msgstr ""
-
-#: plugins/win32/winprefs/winprefs.c:428 src/gtkprefs.c:1763
-#, fuzzy
-msgid "Never"
-msgstr "Сервер"
-
-#: plugins/win32/winprefs/winprefs.c:429
-#, fuzzy
-msgid "Always"
-msgstr "Отсутен"
-
-#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:431
-msgid "Only when docked"
+#: plugins/win32/winprefs/winprefs.c:377
+msgid "_Keep Buddy List window on top"
 msgstr ""
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:435 src/gtkprefs.c:883
-#: src/gtkprefs.c:2100
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
+#: src/gtkprefs.c:2422 src/protocols/msn/msn.c:1811
 msgid "Conversations"
 msgstr ""
 
-#: plugins/win32/winprefs/winprefs.c:436
-msgid "_Flash window when messages are received"
-msgstr ""
-
-#: plugins/win32/winprefs/winprefs.c:459
+#: plugins/win32/winprefs/winprefs.c:383
+msgid "_Flash Window when messages are received"
+msgstr ""
+
+#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr ""
 
-#: plugins/win32/winprefs/winprefs.c:461
+#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr ""
 
-#: plugins/win32/winprefs/winprefs.c:462
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-#, fuzzy
-msgid "accounts"
-msgstr "Акаунти"
-
-#: src/account.c:913
-#, fuzzy
-msgid "Password is required to sign on."
-msgstr "Лозинката е пратена"
-
-#: src/account.c:939
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr ""
-
-#: src/account.c:946
-#, fuzzy
-msgid "Enter Password"
-msgstr "Лозинка:"
-
-#: src/account.c:951
-#, fuzzy
-msgid "Save password"
-msgstr "Лозинка:"
+#: src/account.c:298 src/protocols/jabber/jabber.c:1039
+msgid "New passwords do not match."
+msgstr ""
+
+#: src/account.c:307
+msgid "Fill out all fields completely."
+msgstr ""
+
+#: src/account.c:332
+msgid "Original password"
+msgstr ""
+
+#: src/account.c:339
+msgid "New password"
+msgstr ""
+
+#: src/account.c:346
+msgid "New password (again)"
+msgstr ""
+
+#: src/account.c:352
+#, c-format
+msgid "Change password for %s"
+msgstr ""
+
+#: src/account.c:360
+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:959 src/account.c:1111 src/gtkdialogs.c:504
-#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
-#: src/protocols/jabber/jabber.c:1103 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
-#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:3774
-#: src/protocols/oscar/oscar.c:3855 src/protocols/oscar/oscar.c:7156
-#: src/protocols/oscar/oscar.c:7281 src/protocols/oscar/oscar.c:7306
-#: src/protocols/oscar/oscar.c:7358 src/protocols/silc/buddy.c:460
-#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1700
-#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2931 src/request.h:1266
+#: src/account.c:363 src/connection.c:198 src/gtkblist.c:2492
+#: src/gtkdialogs.c:505 src/gtkdialogs.c:647 src/gtkdialogs.c:701
+#: src/gtkrequest.c:243 src/protocols/jabber/jabber.c:1086
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:3686 src/protocols/oscar/oscar.c:3780
+#: src/protocols/oscar/oscar.c:7056 src/protocols/oscar/oscar.c:7148
+#: src/protocols/oscar/oscar.c:7200 src/protocols/oscar/oscar.c:7286
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1699 src/protocols/silc/silc.c:711
+#: src/protocols/yahoo/yahoo.c:2938 src/protocols/yahoo/yahoo.c:2947
+#: src/request.h:1245
 msgid "OK"
 msgstr "Во ред"
 
-#: src/account.c:960 src/account.c:1112 src/account.c:1150
-#: src/gtkaccount.c:2012 src/gtkaccount.c:2491 src/gtkblist.c:4815
-#: src/gtkdialogs.c:505 src/gtkdialogs.c:648 src/gtkdialogs.c:704
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
-#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:413 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:569 src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:1104
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
-#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
-#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1594 src/protocols/oscar/oscar.c:2477
-#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3775
-#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:3856
-#: src/protocols/oscar/oscar.c:7157 src/protocols/oscar/oscar.c:7282
-#: src/protocols/oscar/oscar.c:7307 src/protocols/oscar/oscar.c:7359
-#: src/protocols/oscar/oscar.c:7428 src/protocols/silc/buddy.c:461
-#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1701 src/protocols/silc/silc.c:726
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2923
-#: src/protocols/yahoo/yahoo.c:2932 src/request.h:1266 src/request.h:1276
+#: src/account.c:364 src/account.c:402 src/away.c:367 src/connection.c:199
+#: src/gtkaccount.c:2029 src/gtkaccount.c:2568 src/gtkaccount.c:2599
+#: src/gtkblist.c:2493 src/gtkblist.c:4572 src/gtkconn.c:169
+#: src/gtkdialogs.c:506 src/gtkdialogs.c:648 src/gtkdialogs.c:702
+#: src/gtkdialogs.c:800 src/gtkdialogs.c:822 src/gtkdialogs.c:842
+#: src/gtkdialogs.c:879 src/gtkdialogs.c:939 src/gtkdialogs.c:982
+#: src/gtkdialogs.c:1023 src/gtkimhtmltoolbar.c:437 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:610 src/gtkprivacy.c:635 src/gtkprivacy.c:646
+#: src/gtkrequest.c:244 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:754
+#: src/protocols/jabber/jabber.c:678 src/protocols/jabber/jabber.c:1087
+#: src/protocols/jabber/presence.c:213 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1534
+#: src/protocols/oscar/oscar.c:2414 src/protocols/oscar/oscar.c:3644
+#: src/protocols/oscar/oscar.c:3687 src/protocols/oscar/oscar.c:3724
+#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7149 src/protocols/oscar/oscar.c:7201
+#: src/protocols/oscar/oscar.c:7270 src/protocols/oscar/oscar.c:7287
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
+#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1700
+#: src/protocols/silc/silc.c:712 src/protocols/trepia/trepia.c:348
+#: src/protocols/yahoo/yahoo.c:2939 src/protocols/yahoo/yahoo.c:2948
+#: src/request.h:1245 src/request.h:1255
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/account.c:982 src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr ""
-
-#: src/account.c:984 src/connection.c:99
-msgid "Connection Error"
-msgstr ""
-
-#: src/account.c:1046 src/protocols/jabber/jabber.c:1056
-msgid "New passwords do not match."
-msgstr ""
-
-#: src/account.c:1055
-msgid "Fill out all fields completely."
-msgstr ""
-
-#: src/account.c:1080
-msgid "Original password"
-msgstr ""
-
-#: src/account.c:1087
-msgid "New password"
-msgstr ""
-
-#: src/account.c:1094
-msgid "New password (again)"
-msgstr ""
-
-#: src/account.c:1100
-#, c-format
-msgid "Change password for %s"
-msgstr ""
-
-#: src/account.c:1108
-msgid "Please enter your current password and your new password."
-msgstr ""
-
-#: src/account.c:1141
+#: src/account.c:393
 #, c-format
 msgid "Change user information for %s"
 msgstr "Промени корисничко инфо за %s"
 
-#: src/account.c:1149 src/gtkdebug.c:669 src/gtkrequest.c:267
-#: src/protocols/jabber/buddy.c:568 src/protocols/trepia/trepia.c:347
+#: src/account.c:401 src/gtkrequest.c:250 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Зачувај"
 
-#: src/account.c:1605 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
-#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/buddy.c:1096
-#: src/protocols/novell/novell.c:2825
+#: src/account.c:760 src/gtkft.c:159 src/protocols/jabber/buddy.c:573
+#: src/protocols/novell/novell.c:2812
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/blist.c:545
-#, fuzzy
-msgid "buddy list"
-msgstr "Листа на пријатели"
-
-#: src/blist.c:1145
+#: src/away.c:233
+msgid "Away!"
+msgstr "Отсутен!"
+
+#: src/away.c:303
+#, fuzzy
+msgid "Edit This Message"
+msgstr "Испрати како порака"
+
+#: src/away.c:308
+msgid "I'm Back!"
+msgstr "Се вратив!"
+
+#: src/away.c:362
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "Сигурно сакаш да избришеш %s?"
+
+#: src/away.c:364 src/away.c:442
+msgid "Remove Away Message"
+msgstr "Отстрани порака за отсуство"
+
+#. Remove button
+#: src/away.c:366 src/gtkconv.c:1520 src/gtkconv.c:3902 src/gtkconv.c:3973
+#: src/gtkrequest.c:249
+msgid "Remove"
+msgstr "Отстрани"
+
+#: src/away.c:436
+msgid "New Away Message"
+msgstr "Нова порака за отсуство"
+
+#: src/away.c:663
+msgid "Set All Away"
+msgstr "Постави „Отсутен“ на сите"
+
+#: src/away.c:770
+msgid "You cannot save an away message with a blank title"
+msgstr ""
+
+#: src/away.c:772
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr ""
+
+#: src/away.c:782
+msgid "You cannot create an empty away message"
+msgstr ""
+
+#: src/away.c:847
+msgid "New away message"
+msgstr ""
+
+#: src/away.c:862
+msgid "Away title: "
+msgstr ""
+
+#: src/away.c:910
+#, fuzzy
+msgid "_Save"
+msgstr "Зачувај"
+
+#: src/away.c:914
+msgid "Sa_ve & Use"
+msgstr ""
+
+#: src/away.c:918
+#, fuzzy
+msgid "_Use"
+msgstr "Корисници"
+
+#: src/blist.c:682
 msgid "Chats"
 msgstr "Разговори"
 
-#: src/blist.c:1835
+#: src/blist.c:1354
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1449,142 +1401,167 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1844
+#: src/blist.c:1363
 msgid "Group not removed"
 msgstr "Групата не е отстранета"
 
-#: src/connection.c:98
+#: src/blist.c:2066
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+
+#: src/blist.c:2069
+msgid "Buddy List Error"
+msgstr ""
+
+#: src/connection.c:118 src/connection.c:169
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr ""
+
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr ""
 
-#: src/conversation.c:237
-msgid "Unable to send message: The message is too large."
-msgstr ""
-
-#: src/conversation.c:240 src/conversation.c:253
-#, fuzzy, c-format
-msgid "Unable to send message to %s."
-msgstr "Додади го разговорот во листата на пријатели"
-
-#: src/conversation.c:241
+#: src/connection.c:174
+msgid "Connection Error"
+msgstr ""
+
+#: src/connection.c:195
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr ""
+
+#: src/conversation.c:233
+msgid "Unable to send message. The message is too large."
+msgstr ""
+
+#: src/conversation.c:237 src/conversation.c:251
+#: src/protocols/oscar/oscar.c:4247
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr ""
+
+#: src/conversation.c:239
 msgid "The message is too large."
 msgstr ""
 
-#: src/conversation.c:250
+#: src/conversation.c:248
 msgid "Unable to send message."
 msgstr ""
 
-#: src/conversation.c:1962
+#: src/conversation.c:2070
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: src/conversation.c:1965
+#: src/conversation.c:2073
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: src/conversation.c:2062
+#: src/conversation.c:2171
 #, c-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: src/conversation.c:2065
+#: src/conversation.c:2174
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: src/conversation.c:2107
+#: src/conversation.c:2216
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2109
+#: src/conversation.c:2218
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: src/conversation.c:2186
+#: src/conversation.c:2291
 #, c-format
 msgid "(+%d more)"
 msgstr ""
 
-#: src/conversation.c:2188
+#: src/conversation.c:2293
 #, c-format
 msgid " left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2596
+#: src/conversation.c:2698
 msgid "Last created window"
 msgstr ""
 
-#: src/conversation.c:2598
+#: src/conversation.c:2700
 msgid "Separate IM and Chat windows"
 msgstr ""
 
-#: src/conversation.c:2600 src/gtkprefs.c:1279
+#: src/conversation.c:2702 src/gtkprefs.c:1387
 msgid "New window"
 msgstr ""
 
-#: src/conversation.c:2602
+#: src/conversation.c:2704
 msgid "By group"
 msgstr ""
 
-#: src/conversation.c:2604
+#: src/conversation.c:2706
 msgid "By account"
 msgstr ""
 
-#: src/ft.c:150 src/protocols/msn/msn.c:369
+#: src/ft.c:148 src/protocols/msn/msn.c:369
 #, fuzzy, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr "Грешка при записот на сликата: %s"
 
-#: src/ft.c:154
+#: src/ft.c:152
 #, fuzzy, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr "Грешка при записот на сликата: %s"
 
-#: src/ft.c:158
+#: src/ft.c:156
 #, fuzzy, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr "Грешка при записот на сликата: %s"
 
-#: src/ft.c:191
+#: src/ft.c:189
 msgid "Cannot send a file of 0 bytes."
 msgstr "Не може да се прати датотека од 0 бајти."
 
-#: src/ft.c:201
+#: src/ft.c:199
 #, fuzzy
 msgid "Cannot send a directory."
 msgstr "Не може да се прати датотека од 0 бајти."
 
-#: src/ft.c:210
+#: src/ft.c:208
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: src/ft.c:268
+#: src/ft.c:265
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s сака да ти испрати %s (%s)"
 
-#: src/ft.c:275
+#: src/ft.c:273
 #, fuzzy, c-format
 msgid "%s wants to send you a file"
 msgstr "%s сака да ти испрати %s (%s)"
 
-#: src/ft.c:316
+#: src/ft.c:311
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Прифати го преносот од %s?"
 
-#: src/ft.c:320
+#: src/ft.c:315
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1595,104 +1572,92 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/ft.c:344
+#: src/ft.c:338
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: src/ft.c:384
+#: src/ft.c:374
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: src/ft.c:405
+#: src/ft.c:395
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: src/ft.c:416
-#, fuzzy, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Прифати го преносот од %s?"
-
-#: src/ft.c:570
+#: src/ft.c:890
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: src/ft.c:573
+#: src/ft.c:893
 #, fuzzy
 msgid "File transfer complete"
 msgstr "Пренос на датотеки"
 
-#: src/ft.c:957
+#: src/ft.c:942
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#: src/ft.c:962
+#: src/ft.c:948
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Пренос на датотеки"
 
-#: src/ft.c:1019
+#: src/ft.c:1001
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr ""
 
-#: src/ft.c:1024
+#: src/ft.c:1007
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr ""
 
-#: src/ft.c:1081
-#, fuzzy, c-format
-msgid "File transfer to %s failed."
-msgstr "Пренос на датотеки"
-
-#: src/ft.c:1083
-#, fuzzy, c-format
-msgid "File transfer from %s failed."
-msgstr "Пренос на датотеки"
-
-#: src/gaim-remote.c:104
+#: src/ft.c:1056
+#, c-format
+msgid "File transfer to %s aborted.\n"
+msgstr ""
+
+#: src/ft.c:1058
+#, c-format
+msgid "File transfer from %s aborted.\n"
+msgstr ""
+
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr ""
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: src/gaim-remote.c:108
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
-"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -m, --message=MESG       Message to send or show in conversation "
-"window\n"
-"       -t, --to=SCREENNAME      Select a target for command\n"
-"       -p, --protocol=PROTO     Specify protocol to use\n"
-"       -f, --from=SCREENNAME    Specify screen name to use\n"
-"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
 
-#: src/gaim-remote.c:195
-#, c-format
-msgid ""
-"Gaim not running (on session %d)\n"
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
 
-#: src/gaim-remote.c:282
-msgid ""
-"Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-"greater than 9999 chars\n"
-msgstr ""
-
-#: src/gaim-remote.c:293
+#: src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1715,38 +1680,25 @@
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 
-#: src/gaim-remote.c:313
-msgid ""
-"\n"
-"Log out all accounts\n"
-msgstr ""
-
-#: src/gaim-remote.c:317
+#: src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
 msgstr ""
 
-#: src/gaim-remote.c:321
+#: src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 msgstr ""
 
-#: src/gaim-remote.c:325
+#: src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
 msgstr ""
 
-#: src/gaim-remote.c:329
-#, fuzzy
-msgid ""
-"\n"
-"Send instant message\n"
-msgstr "Испрати порака"
-
-#: src/gtkaccount.c:345
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1755,154 +1707,166 @@
 msgstr ""
 
 #. Build the login options frame.
-#: src/gtkaccount.c:665
+#: src/gtkaccount.c:638
 msgid "Login Options"
 msgstr "Логин опции"
 
-#: src/gtkaccount.c:682 src/gtkft.c:626
+#: src/gtkaccount.c:655 src/gtkft.c:585
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/gtkaccount.c:687 src/gtkblist.c:4369
+#: src/gtkaccount.c:660 src/gtkblist.c:4158
 msgid "Screen Name:"
 msgstr "Име за најава:"
 
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:733
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: src/gtkaccount.c:765 src/gtkblist.c:4383 src/gtkblist.c:4762
+#: src/gtkaccount.c:738 src/gtkblist.c:4172 src/gtkblist.c:4519
 msgid "Alias:"
 msgstr "Алиас:"
 
-#: src/gtkaccount.c:769
+#: src/gtkaccount.c:742
 msgid "Remember password"
 msgstr "Запамети лозинка"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:814
+#: src/gtkaccount.c:798
 msgid "User Options"
 msgstr "Опции за корисникот"
 
-#: src/gtkaccount.c:827
+#: src/gtkaccount.c:811
 msgid "New mail notifications"
 msgstr "Известување за нова пошта"
 
-#: src/gtkaccount.c:836
+#: src/gtkaccount.c:820
 #, fuzzy
 msgid "Buddy icon:"
 msgstr "Икона на пријател:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:925
+#: src/gtkaccount.c:909
 #, c-format
 msgid "%s Options"
 msgstr "%s Опции"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1063 src/gtkaccount.c:1110
+#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr ""
 
 #. No Proxy
-#: src/gtkaccount.c:1069 src/gtkaccount.c:1117
+#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr ""
 
 #. HTTP
-#: src/gtkaccount.c:1075 src/gtkaccount.c:1124
+#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1081 src/gtkaccount.c:1131
+#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr ""
 
 #. SOCKS 5
-#: src/gtkaccount.c:1087 src/gtkaccount.c:1138
+#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr ""
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1080
+#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1190
 msgid "Use Environmental Settings"
 msgstr ""
 
-#: src/gtkaccount.c:1184
+#: src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:1188
+#: src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:1204
+#: src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "Proxy Опции"
 
-#: src/gtkaccount.c:1222 src/gtkprefs.c:1074
+#: src/gtkaccount.c:1207 src/gtkprefs.c:1184
 msgid "Proxy _type:"
 msgstr ""
 
-#: src/gtkaccount.c:1231 src/gtkprefs.c:1101
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1211
 msgid "_Host:"
 msgstr "_Хост:"
 
-#: src/gtkaccount.c:1235 src/gtkprefs.c:1119
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1229
 msgid "_Port:"
 msgstr "_Порта:"
 
-#: src/gtkaccount.c:1243
+#: src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "_Корисничко име:"
 
-#: src/gtkaccount.c:1248 src/gtkprefs.c:1156
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1266
 msgid "Pa_ssword:"
 msgstr "Ло_зинка:"
 
-#: src/gtkaccount.c:1625
+#: src/gtkaccount.c:1604
 msgid "Add Account"
 msgstr ""
 
-#: src/gtkaccount.c:1627
+#: src/gtkaccount.c:1606
 msgid "Modify Account"
 msgstr ""
 
+#. Add the disclosure
+#: src/gtkaccount.c:1630
+msgid "Show more options"
+msgstr "Покажи повеќе опции"
+
+#: src/gtkaccount.c:1631
+msgid "Show fewer options"
+msgstr "Покажи помалку опции"
+
 #. Register button
-#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:681
+#: src/gtkaccount.c:1658 src/protocols/jabber/jabber.c:677
 msgid "Register"
 msgstr "Регистрирај"
 
-#: src/gtkaccount.c:2006 src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:2023
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Сигурно сакаш да избришеш %s?"
 
-#: src/gtkaccount.c:2011 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2028 src/gtkrequest.c:247
 msgid "Delete"
 msgstr "Избриши"
 
-#: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4420
+#: src/gtkaccount.c:2142 src/protocols/oscar/oscar.c:4331
 msgid "Screen Name"
 msgstr "Име за најава"
 
-#: src/gtkaccount.c:2115
-#, fuzzy
-msgid "Enabled"
-msgstr "Неуспешно"
-
-#: src/gtkaccount.c:2123
+#: src/gtkaccount.c:2166 src/protocols/jabber/jabber.c:996
+#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:5786
+#: src/protocols/oscar/oscar.c:6984 src/protocols/silc/silc.c:45
+#: src/protocols/yahoo/yahoo.c:2701 src/protocols/zephyr/zephyr.c:2122
+#: src/protocols/zephyr/zephyr.c:2141
+msgid "Online"
+msgstr "Поврзано"
+
+#: src/gtkaccount.c:2187
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/gtkaccount.c:2466
+#. XXX: Tidy this up when not in string freeze
+#: src/gtkaccount.c:2521 src/protocols/jabber/presence.c:202
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/gtkaccount.c:2480
+#: src/gtkaccount.c:2535 src/protocols/jabber/presence.c:208
 msgid ""
 "\n"
 "\n"
@@ -1912,242 +1876,253 @@
 "\n"
 "Дали сакаш да го додадеш во листата на пријатели?"
 
-#: src/gtkaccount.c:2488
+#: src/gtkaccount.c:2561
+msgid "Information"
+msgstr ""
+
+#: src/gtkaccount.c:2565 src/gtkaccount.c:2596
+#: src/protocols/jabber/presence.c:210
 msgid "Add buddy to your list?"
 msgstr ""
 
-#: src/gtkaccount.c:2490 src/gtkblist.c:4814 src/gtkconv.c:1580
-#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:4045
-#: src/protocols/silc/chat.c:594
+#. Add button
+#: src/gtkaccount.c:2567 src/gtkaccount.c:2598 src/gtkblist.c:4571
+#: src/gtkconv.c:1522 src/gtkconv.c:3895 src/gtkconv.c:3966
+#: src/gtkrequest.c:248 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/presence.c:212 src/protocols/oscar/oscar.c:3958
+#: src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Додади"
 
-#: src/gtkblist.c:888
+#: src/gtkblist.c:846
 msgid "Join a Chat"
 msgstr ""
 
-#: src/gtkblist.c:909
+#: src/gtkblist.c:867
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-#: src/gtkblist.c:920 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:878 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr ""
 
-#: src/gtkblist.c:1225
+#: src/gtkblist.c:1173 src/gtkblist.c:3323
 msgid "Get _Info"
 msgstr "Инфо"
 
-#: src/gtkblist.c:1228
+#: src/gtkblist.c:1176 src/gtkblist.c:3313
 msgid "I_M"
 msgstr "Порака"
 
-#: src/gtkblist.c:1234
+#: src/gtkblist.c:1182
 #, fuzzy
 msgid "_Send File"
 msgstr "Испрати датотека"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1188
 msgid "Add Buddy _Pounce"
 msgstr ""
 
-#: src/gtkblist.c:1244 src/gtkblist.c:1248 src/gtkblist.c:1346
-#: src/gtkblist.c:1369
+#: src/gtkblist.c:1190 src/gtkblist.c:1287
 msgid "View _Log"
 msgstr ""
 
-#: src/gtkblist.c:1259
+#: src/gtkblist.c:1200
 #, fuzzy
 msgid "_Alias Buddy..."
 msgstr "_Алиас..."
 
-#: src/gtkblist.c:1261
+#: src/gtkblist.c:1202
 #, fuzzy
 msgid "_Remove Buddy"
 msgstr "_Отстрани"
 
-#: src/gtkblist.c:1263
+#: src/gtkblist.c:1204
 #, fuzzy
 msgid "Alias Contact..."
 msgstr "_Алиас..."
 
-#: src/gtkblist.c:1266 src/gtkdialogs.c:807 src/gtkdialogs.c:808
+#: src/gtkblist.c:1207 src/gtkdialogs.c:876 src/gtkdialogs.c:878
 msgid "Remove Contact"
 msgstr ""
 
-#: src/gtkblist.c:1270 src/gtkblist.c:1354 src/gtkblist.c:1375
+#: src/gtkblist.c:1211 src/gtkblist.c:1295 src/gtkblist.c:1309
 msgid "_Alias..."
 msgstr "_Алиас..."
 
-#: src/gtkblist.c:1272 src/gtkblist.c:1356 src/gtkblist.c:1377
-#: src/gtkconn.c:171
+#: src/gtkblist.c:1213 src/gtkblist.c:1297 src/gtkblist.c:1314
+#: src/gtkconn.c:367
 msgid "_Remove"
 msgstr "_Отстрани"
 
-#: src/gtkblist.c:1318
+#: src/gtkblist.c:1259
 msgid "Add a _Buddy"
 msgstr "Додади пријател"
 
-#: src/gtkblist.c:1320
+#: src/gtkblist.c:1261
 msgid "Add a C_hat"
 msgstr ""
 
-#: src/gtkblist.c:1322
+#: src/gtkblist.c:1263
 msgid "_Delete Group"
 msgstr "Избриши група"
 
-#: src/gtkblist.c:1324
+#: src/gtkblist.c:1265
 msgid "_Rename"
 msgstr ""
 
 #. join button
-#: src/gtkblist.c:1342 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:102
+#: src/gtkblist.c:1283 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
 msgid "_Join"
 msgstr ""
 
-#: src/gtkblist.c:1344
+#: src/gtkblist.c:1285
 msgid "Auto-Join"
 msgstr ""
 
-#: src/gtkblist.c:1382 src/gtkblist.c:1405
+#: src/gtkblist.c:1311 src/gtkblist.c:1336
 msgid "_Collapse"
 msgstr ""
 
-#: src/gtkblist.c:1410
+#: src/gtkblist.c:1341
 msgid "_Expand"
 msgstr ""
 
-#: src/gtkblist.c:1637 src/gtkblist.c:1647 src/gtkblist.c:3646
-#: src/gtkblist.c:3649
-#, fuzzy
-msgid "/Tools/Mute Sounds"
-msgstr "Замолчи звуци"
-
-#: src/gtkblist.c:2106 src/gtkconv.c:4255 src/gtkpounce.c:314
+#: src/gtkblist.c:2016 src/gtkconv.c:4538 src/gtkpounce.c:316
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
 #. Buddies menu
-#: src/gtkblist.c:2675
+#: src/gtkblist.c:2437
 msgid "/_Buddies"
 msgstr "/_Пријатели"
 
-#: src/gtkblist.c:2676
+#: src/gtkblist.c:2438
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Пријатели/Нова порака..."
 
-#: src/gtkblist.c:2677
+#: src/gtkblist.c:2439
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Пријатели/Приклучи се во разговор"
 
-#: src/gtkblist.c:2678
+#: src/gtkblist.c:2440
 msgid "/Buddies/Get User _Info..."
 msgstr "/Пријатели/Корисничко инфо..."
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:2441
 #, fuzzy
 msgid "/Buddies/View User _Log..."
 msgstr "/Пријатели/Корисничко инфо..."
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:2443
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Пријатели/Покажи исклучени пријатели"
 
-#: src/gtkblist.c:2682
+#: src/gtkblist.c:2444
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Пријатели/Покажи празни групи"
 
-#: src/gtkblist.c:2683
+#: src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Пријатели/Додади пријател..."
 
-#: src/gtkblist.c:2684
+#: src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/Пријатели/Додади разговор..."
 
-#: src/gtkblist.c:2685
+#: src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/Пријатели/Додади група"
 
-#: src/gtkblist.c:2687
+#: src/gtkblist.c:2449
+msgid "/Buddies/_Signoff"
+msgstr "/Пријатели/Исклучи се"
+
+#: src/gtkblist.c:2450
 msgid "/Buddies/_Quit"
 msgstr "/Пријатели/Излез"
 
 #. Tools
-#: src/gtkblist.c:2690
+#: src/gtkblist.c:2453
 msgid "/_Tools"
 msgstr "/_Алатки"
 
-#: src/gtkblist.c:2691
+#: src/gtkblist.c:2454
+msgid "/Tools/_Away"
+msgstr "/Алатки/_Отсутен"
+
+#: src/gtkblist.c:2455
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Алатки/Buddy _Pounce"
 
-#: src/gtkblist.c:2692
+#: src/gtkblist.c:2456
 #, fuzzy
 msgid "/Tools/Account Ac_tions"
 msgstr "/Алатки/Акаунти"
 
-#: src/gtkblist.c:2693
+#: src/gtkblist.c:2457
 #, fuzzy
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Алатки/Дејствија на протокол"
 
-#: src/gtkblist.c:2695
-#, fuzzy
-msgid "/Tools/_Statuses"
-msgstr "Статус:"
-
-#: src/gtkblist.c:2696
+#: src/gtkblist.c:2459
 msgid "/Tools/A_ccounts"
 msgstr "/Алатки/Акаунти"
 
-#: src/gtkblist.c:2697
+#: src/gtkblist.c:2460
+msgid "/Tools/_File Transfers"
+msgstr "/Алатки/_Пренос на датотеки"
+
+#: src/gtkblist.c:2461
+msgid "/Tools/R_oom List"
+msgstr "/Алатки/Листа на со_би"
+
+#: src/gtkblist.c:2462
 msgid "/Tools/Pr_eferences"
 msgstr "/Алатки/Пара_метри"
 
-#: src/gtkblist.c:2698
+#: src/gtkblist.c:2463
 msgid "/Tools/Pr_ivacy"
 msgstr "/Алатки/При_ватност"
 
-#: src/gtkblist.c:2699
-msgid "/Tools/_File Transfers"
-msgstr "/Алатки/_Пренос на датотеки"
-
-#: src/gtkblist.c:2700
-msgid "/Tools/R_oom List"
-msgstr "/Алатки/Листа на со_би"
-
-#: src/gtkblist.c:2702
-#, fuzzy
-msgid "/Tools/Mute _Sounds"
-msgstr "Замолчи звуци"
-
-#: src/gtkblist.c:2703
+#: src/gtkblist.c:2465
 msgid "/Tools/View System _Log"
 msgstr "/Алатки/Покажи системски лог"
 
 #. Help
-#: src/gtkblist.c:2706
+#: src/gtkblist.c:2468
 msgid "/_Help"
 msgstr "/_Помош"
 
-#: src/gtkblist.c:2707
+#: src/gtkblist.c:2469
 msgid "/Help/Online _Help"
 msgstr "/Помош/Онлајн помош"
 
-#: src/gtkblist.c:2708
+#: src/gtkblist.c:2470
 msgid "/Help/_Debug Window"
 msgstr "/Помош/Прозорец за дебагирање"
 
-#: src/gtkblist.c:2709
+#: src/gtkblist.c:2471
 msgid "/Help/_About"
 msgstr "/Помош/_За"
 
-#: src/gtkblist.c:2741 src/gtkblist.c:2808
+#: src/gtkblist.c:2489
+msgid "Rename Group"
+msgstr "Преименувај група"
+
+#: src/gtkblist.c:2489
+msgid "New group name"
+msgstr "Ново има на групата"
+
+#: src/gtkblist.c:2490
+msgid "Please enter a new name for the selected group."
+msgstr "Внеси ново има за означената група."
+
+#: src/gtkblist.c:2519
 #, c-format
 msgid ""
 "\n"
@@ -2156,68 +2131,75 @@
 "\n"
 "<b>Акаунт:</b> %s"
 
-#: src/gtkblist.c:2817
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Контакт алиас:</b>"
-
-#: src/gtkblist.c:2825
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Алиас:</b>"
-
-#: src/gtkblist.c:2833
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Надимак: </b>"
-
-#: src/gtkblist.c:2842
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Најавен: </b>"
-
-#: src/gtkblist.c:2854
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Неактивен:</b>"
-
-#: src/gtkblist.c:2889
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Алиас:</b>"
-
-#: src/gtkblist.c:2897
+#: src/gtkblist.c:2585
 #, fuzzy
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
 msgstr "<b>Статус:</b> Исклучен"
 
-#: src/gtkblist.c:2919
+#: src/gtkblist.c:2600
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:2616
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>Акаунт:</b>"
+
+#: src/gtkblist.c:2617
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>Контакт алиас:</b>"
+
+#: src/gtkblist.c:2618
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>Алиас:</b>"
+
+#: src/gtkblist.c:2619
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>Надимак: </b>"
+
+#: src/gtkblist.c:2620
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>Најавен: </b>"
+
+#: src/gtkblist.c:2621
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+"\n"
+"<b>Неактивен:</b>"
+
+#: src/gtkblist.c:2622
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>Предупреден:</b>"
+
+#: src/gtkblist.c:2624
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2225,110 +2207,83 @@
 "\n"
 "<b>Опис: </b> Spooky"
 
-#: src/gtkblist.c:2921
-#, fuzzy
+#: src/gtkblist.c:2625
 msgid ""
 "\n"
-"<b>Status:</b> Awesome"
+"<b>Status</b>: Awesome"
 msgstr ""
 "\n"
 "<b>Статус</b>: Awesome"
 
-#: src/gtkblist.c:2923
-#, fuzzy
+#: src/gtkblist.c:2626
 msgid ""
 "\n"
-"<b>Status:</b> Rockin'"
+"<b>Status</b>: Rockin'"
 msgstr ""
 "\n"
 "<b>Статус</b>: Rockin'"
 
-#: src/gtkblist.c:3185
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
+#: src/gtkblist.c:2908
+#, c-format
+msgid "Idle (%dh%02dm) "
 msgstr "Неактивен (%dч%02dм) "
 
-#: src/gtkblist.c:3187
+#: src/gtkblist.c:2910
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Неактивен (%dм) "
 
-#: src/gtkblist.c:3190
-#, fuzzy
-msgid "Idle "
-msgstr "Неактивен (%dм) "
-
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:2915
+#, c-format
+msgid "Warned (%d%%) "
+msgstr ""
+
+#: src/gtkblist.c:2918
 msgid "Offline "
 msgstr "Исклучен "
 
-#: src/gtkblist.c:3310
-#, fuzzy
-msgid "/Buddies/New Instant Message..."
-msgstr "/Пријатели/Нова порака..."
-
-#: src/gtkblist.c:3311 src/gtkblist.c:3345
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:3036
 #, fuzzy
 msgid "/Buddies/Join a Chat..."
 msgstr "/Пријатели/Приклучи се во разговор"
 
-#: src/gtkblist.c:3312
-#, fuzzy
-msgid "/Buddies/Get User Info..."
-msgstr "/Пријатели/Корисничко инфо..."
-
-#: src/gtkblist.c:3313
-#, fuzzy
-msgid "/Buddies/Add Buddy..."
-msgstr "/Пријатели/Додади пријател..."
-
-#: src/gtkblist.c:3314
-#, fuzzy
-msgid "/Buddies/Add Chat..."
-msgstr "/Пријатели/Додади разговор..."
-
-#: src/gtkblist.c:3315
-#, fuzzy
-msgid "/Buddies/Add Group..."
-msgstr "/Пријатели/Додади група"
-
-#: src/gtkblist.c:3348
+#: src/gtkblist.c:3039
 #, fuzzy
 msgid "/Tools/Room List"
 msgstr "/Алатки/Листа на со_би"
 
-#: src/gtkblist.c:3351
+#: src/gtkblist.c:3042
 #, fuzzy
 msgid "/Tools/Privacy"
 msgstr "/Алатки/При_ватност"
 
-#: src/gtkblist.c:3427 src/gtkprefs.c:1771 src/protocols/jabber/jabber.c:941
-#: src/protocols/yahoo/yahoo.c:2749
-msgid "None"
-msgstr "Ништо"
-
-#: src/gtkblist.c:3429
+#: src/gtkblist.c:3124
 msgid "Alphabetical"
 msgstr ""
 
-#: src/gtkblist.c:3430
+#: src/gtkblist.c:3125
 msgid "By status"
 msgstr ""
 
-#: src/gtkblist.c:3431
+#: src/gtkblist.c:3126
 msgid "By log size"
 msgstr ""
 
-#: src/gtkblist.c:3542
+#: src/gtkblist.c:3192
+msgid "/Tools/Away"
+msgstr "/Алатки/Отсутен"
+
+#: src/gtkblist.c:3195
 msgid "/Tools/Buddy Pounce"
 msgstr ""
 
-#: src/gtkblist.c:3543
+#: src/gtkblist.c:3198
 #, fuzzy
 msgid "/Tools/Account Actions"
 msgstr "/Алатки/Акаунти"
 
-#: src/gtkblist.c:3544
+#: src/gtkblist.c:3201
 #, fuzzy
 msgid "/Tools/Plugin Actions"
 msgstr "/Алатки/Дејствија на протокол"
@@ -2336,21 +2291,45 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3642
+#: src/gtkblist.c:3292
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Пријатели/Покажи исклучени пријатели"
 
-#: src/gtkblist.c:3644
+#: src/gtkblist.c:3294
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Пријатели/Покажи празни групи"
 
-#: src/gtkblist.c:4323 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3319
+msgid "Send a message to the selected buddy"
+msgstr "Испрати порака до одбраниот пријател"
+
+#: src/gtkblist.c:3329
+msgid "Get information on the selected buddy"
+msgstr "Види информации за одбраниот пријател"
+
+#: src/gtkblist.c:3333
+msgid "_Chat"
+msgstr "_Разговор"
+
+#: src/gtkblist.c:3338
+msgid "Join a chat room"
+msgstr ""
+
+#: src/gtkblist.c:3343
+msgid "_Away"
+msgstr "_Отсутен"
+
+#: src/gtkblist.c:3348
+msgid "Set an away message"
+msgstr "Намести порака за отсуство"
+
+#: src/gtkblist.c:4112 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2847
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2868
 msgid "Add Buddy"
 msgstr "Додади пријател"
 
-#: src/gtkblist.c:4347
+#: src/gtkblist.c:4136
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2358,48 +2337,63 @@
 msgstr ""
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4410 src/gtkblist.c:4742
+#: src/gtkblist.c:4196 src/gtkblist.c:4499
 msgid "Account:"
 msgstr "Акаунт:"
 
-#: src/gtkblist.c:4675
+#: src/gtkblist.c:4432
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: src/gtkblist.c:4691
+#: src/gtkblist.c:4448
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: src/gtkblist.c:4708
+#: src/gtkblist.c:4465
 msgid "Add Chat"
 msgstr "Додади разговор"
 
-#: src/gtkblist.c:4732
+#: src/gtkblist.c:4489
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 
-#: src/gtkblist.c:4811
+#: src/gtkblist.c:4568
 msgid "Add Group"
 msgstr "Додади група"
 
-#: src/gtkblist.c:4812
+#: src/gtkblist.c:4569
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: src/gtkblist.c:5362 src/gtkblist.c:5458
+#: src/gtkblist.c:5138 src/gtkblist.c:5235
 msgid "No actions available"
 msgstr ""
 
-#: src/gtkconn.c:171
-#, fuzzy
-msgid "Reconnect"
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
+msgid "Done."
+msgstr "Завршено."
+
+#: src/gtkconn.c:158
+msgid "Signon: "
+msgstr "Најавување: "
+
+#: src/gtkconn.c:204
+msgid "Signon"
+msgstr "Најава"
+
+#: src/gtkconn.c:216
+msgid "Cancel All"
+msgstr "Откажи ги сите"
+
+#: src/gtkconn.c:367 src/gtkconn.c:600
+msgid "_Reconnect"
 msgstr "_Врзи се пак"
 
-#: src/gtkconn.c:368
+#: src/gtkconn.c:564
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2412,94 +2406,76 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:370
+#: src/gtkconn.c:566
 msgid "Reason Unknown."
 msgstr "Причина: непознато."
 
-#: src/gtkconn.c:378
-#, fuzzy
-msgid "Disconnected"
-msgstr "_Врзи се пак"
-
-#: src/gtkconn.c:404
-msgid "_Reconnect"
-msgstr "_Врзи се пак"
-
-#: src/gtkconn.c:409
+#: src/gtkconn.c:605
 msgid "Reconnect _All"
 msgstr "Врзи се пак на сите"
 
-#: src/gtkconn.c:439
+#: src/gtkconn.c:635
 msgid "Time"
 msgstr "Време"
 
-#: src/gtkconv.c:148
-msgid "Confirm close"
-msgstr ""
-
-#: src/gtkconv.c:180
-#, fuzzy
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Сигурно сакаш да избришеш %s?"
-
-#: src/gtkconv.c:410
+#: src/gtkconv.c:342
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr ""
 
-#: src/gtkconv.c:419
+#: src/gtkconv.c:351
 msgid "Supported debug options are:  version"
 msgstr ""
 
-#: src/gtkconv.c:456
+#: src/gtkconv.c:375
 msgid "No such command (in this context)."
 msgstr ""
 
-#: src/gtkconv.c:459
+#: src/gtkconv.c:378
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: src/gtkconv.c:531
+#: src/gtkconv.c:450
 msgid "No such command."
 msgstr ""
 
-#: src/gtkconv.c:538
+#: src/gtkconv.c:457
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 
-#: src/gtkconv.c:543
+#: src/gtkconv.c:462
 msgid "Your command failed for an unknown reason."
 msgstr ""
 
-#: src/gtkconv.c:550
-msgid "That command only works in chats, not IMs."
-msgstr ""
-
-#: src/gtkconv.c:553
-msgid "That command only works in IMs, not chats."
-msgstr ""
-
-#: src/gtkconv.c:557
+#: src/gtkconv.c:469
+msgid "That command only works in Chats, not IMs."
+msgstr ""
+
+#: src/gtkconv.c:472
+msgid "That command only works in IMs, not Chats."
+msgstr ""
+
+#: src/gtkconv.c:476
 msgid "That command doesn't work on this protocol."
 msgstr ""
 
-#: src/gtkconv.c:783 src/gtkconv.c:809
-msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-
-#: src/gtkconv.c:803
+#: src/gtkconv.c:719 src/gtkconv.c:745
+msgid "That buddy is not on the same protocol as this chat"
+msgstr ""
+
+#: src/gtkconv.c:739
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: src/gtkconv.c:858
+#: src/gtkconv.c:793
 msgid "Invite Buddy Into Chat Room"
 msgstr "Покани пријател во соба за разговор"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:888
+#: src/gtkconv.c:823
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2507,709 +2483,795 @@
 "Внеси го името на пријателот што сакаш да го поканиш, заедно со пораката за "
 "покана."
 
-#: src/gtkconv.c:909
+#: src/gtkconv.c:844
 msgid "_Buddy:"
 msgstr "_Пријател:"
 
-#: src/gtkconv.c:929 src/gtksavedstatuses.c:774
+#: src/gtkconv.c:864
 msgid "_Message:"
 msgstr "_Порака:"
 
-#: src/gtkconv.c:986 src/gtkconv.c:2636 src/gtkdebug.c:215 src/gtkft.c:473
+#: src/gtkconv.c:920 src/gtkconv.c:2645 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr ""
 
-#: src/gtkconv.c:992
+#: src/gtkconv.c:925
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Разговор со %s</h1>\n"
 
-#: src/gtkconv.c:1016
+#: src/gtkconv.c:939
 msgid "Save Conversation"
 msgstr "Зачувај разговор"
 
-#: src/gtkconv.c:1117 src/gtkdebug.c:163 src/gtkdebug.c:663
+#: src/gtkconv.c:1024 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Пронајди"
 
-#: src/gtkconv.c:1143 src/gtkdebug.c:191
+#: src/gtkconv.c:1050 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Барај за:"
 
-#: src/gtkconv.c:1541
+#: src/gtkconv.c:1466
 msgid "IM"
 msgstr "Порака"
 
-#: src/gtkconv.c:1547 src/protocols/oscar/oscar.c:619
+#. Send File button
+#: src/gtkconv.c:1475 src/gtkconv.c:3888 src/protocols/oscar/oscar.c:605
 msgid "Send File"
 msgstr "Испрати датотека"
 
-#: src/gtkconv.c:1554
+#: src/gtkconv.c:1484
 msgid "Un-Ignore"
 msgstr "Не игнорирај"
 
-#: src/gtkconv.c:1557
+#: src/gtkconv.c:1486 src/gtkprefs.c:831
 msgid "Ignore"
 msgstr "Игнорирај"
 
-#: src/gtkconv.c:1562
+#. Info button
+#: src/gtkconv.c:1495 src/gtkconv.c:3909
 msgid "Info"
 msgstr "Инфо"
 
-#: src/gtkconv.c:1568
-#, fuzzy
-msgid "Get Away Message"
-msgstr "Нова порака за отсуство"
-
-#: src/gtkconv.c:1577 src/gtkrequest.c:266
-msgid "Remove"
-msgstr "Отстрани"
-
-#: src/gtkconv.c:2644
+#: src/gtkconv.c:1504
+msgid "Get Away Msg"
+msgstr "Види причина за отсуство"
+
+#: src/gtkconv.c:2653
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: src/gtkconv.c:2667
+#: src/gtkconv.c:2675
 msgid "Save Icon"
 msgstr ""
 
-#: src/gtkconv.c:2695
+#: src/gtkconv.c:2705
 msgid "Animate"
 msgstr "Анимирај"
 
-#: src/gtkconv.c:2700
+#: src/gtkconv.c:2710
 msgid "Hide Icon"
 msgstr "Скриј икона"
 
-#: src/gtkconv.c:2706
+#: src/gtkconv.c:2716
 msgid "Save Icon As..."
 msgstr "Зачувај икона како..."
 
-#: src/gtkconv.c:3067
+#: src/gtkconv.c:3093
 msgid "User is typing..."
 msgstr "Корисникот пишува..."
 
-#: src/gtkconv.c:3072
+#: src/gtkconv.c:3101
 msgid "User has typed something and paused"
 msgstr "Корисникот напиша нешто и паузира"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3204
 msgid "_Send As"
 msgstr "_Испрати како"
 
 #. Conversation menu
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3658
 msgid "/_Conversation"
 msgstr "/_Разговор"
 
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3660
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Разговор/_Нова порака..."
 
-#: src/gtkconv.c:3635
+#: src/gtkconv.c:3665
 msgid "/Conversation/_Find..."
 msgstr "/Разговор/_Барај..."
 
-#: src/gtkconv.c:3637
+#: src/gtkconv.c:3667
 msgid "/Conversation/View _Log"
 msgstr "/Разговор/Преглед на _Log"
 
-#: src/gtkconv.c:3638
+#: src/gtkconv.c:3668
 msgid "/Conversation/_Save As..."
 msgstr "/Разговор/_Зачувај како..."
 
-#: src/gtkconv.c:3640
+#: src/gtkconv.c:3670
 #, fuzzy
 msgid "/Conversation/Clear"
 msgstr "/Разговор/_Затвори"
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3674
 #, fuzzy
 msgid "/Conversation/Se_nd File..."
 msgstr "/Разговор/_Барај..."
 
-#: src/gtkconv.c:3645
+#: src/gtkconv.c:3675
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Разговор/Додај пријател pounce..."
 
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3677
 msgid "/Conversation/_Get Info"
 msgstr "/Разговор/Ин_фо"
 
-#: src/gtkconv.c:3649
+#: src/gtkconv.c:3679
+msgid "/Conversation/_Warn..."
+msgstr "/Разговор/_Предупреди..."
+
+#: src/gtkconv.c:3681
 msgid "/Conversation/In_vite..."
 msgstr "/Разговор/П_окани..."
 
-#: src/gtkconv.c:3654
-msgid "/Conversation/Al_ias..."
+#: src/gtkconv.c:3686
+msgid "/Conversation/A_lias..."
 msgstr "/Разговор/А_лиас..."
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3688
 msgid "/Conversation/_Block..."
 msgstr "/Разговор/_Блокирај..."
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3690
 msgid "/Conversation/_Add..."
 msgstr "/Разговор/_Додади..."
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3692
 msgid "/Conversation/_Remove..."
 msgstr "/Разговор/_Отстрани..."
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3697
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Разговор/Внеси Ли_нк..."
 
-#: src/gtkconv.c:3667
+#: src/gtkconv.c:3699
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Разговор/Внеси слика..."
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3704
 msgid "/Conversation/_Close"
 msgstr "/Разговор/_Затвори"
 
 #. Options
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3708
 msgid "/_Options"
 msgstr "/_Опции"
 
-#: src/gtkconv.c:3677
+#: src/gtkconv.c:3709
 msgid "/Options/Enable _Logging"
 msgstr "/Опции/Овозможи логирање"
 
-#: src/gtkconv.c:3678
+#: src/gtkconv.c:3710
 msgid "/Options/Enable _Sounds"
 msgstr "/Опции/Овозможи звуци"
 
-#: src/gtkconv.c:3679
-#, fuzzy
-msgid "/Options/Show Formatting _Toolbars"
+#: src/gtkconv.c:3711
+msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Опции/Прикажи алатник за форматирање"
 
-#: src/gtkconv.c:3680
-msgid "/Options/Show Ti_mestamps"
-msgstr ""
-
-#: src/gtkconv.c:3681
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "Икона на пријател:"
-
-#: src/gtkconv.c:3725
+#: src/gtkconv.c:3712
+msgid "/Options/Show T_imestamps"
+msgstr ""
+
+#: src/gtkconv.c:3754
 msgid "/Conversation/View Log"
 msgstr "/Разговор/Види Log"
 
-#: src/gtkconv.c:3731
+#: src/gtkconv.c:3759
 #, fuzzy
 msgid "/Conversation/Send File..."
 msgstr "/Разговор/Покани..."
 
-#: src/gtkconv.c:3735
+#: src/gtkconv.c:3763
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
-#: src/gtkconv.c:3741
-msgid "/Conversation/Get Info"
-msgstr "/Разговор/Види инфо"
-
-#: src/gtkconv.c:3745
-msgid "/Conversation/Invite..."
-msgstr "/Разговор/Покани..."
-
-#: src/gtkconv.c:3751
-msgid "/Conversation/Alias..."
-msgstr "/Разговор/Алиас..."
-
-#: src/gtkconv.c:3755
-msgid "/Conversation/Block..."
-msgstr "/Разговор/Блокирај..."
-
-#: src/gtkconv.c:3759
-msgid "/Conversation/Add..."
-msgstr "/Разговор/Додади..."
-
-#: src/gtkconv.c:3763
-msgid "/Conversation/Remove..."
-msgstr "/Разговор/Отстрани..."
-
 #: src/gtkconv.c:3769
+msgid "/Conversation/Get Info"
+msgstr "/Разговор/Види инфо"
+
+#: src/gtkconv.c:3773
+msgid "/Conversation/Warn..."
+msgstr "/Разговор/Предупреди..."
+
+#: src/gtkconv.c:3777
+msgid "/Conversation/Invite..."
+msgstr "/Разговор/Покани..."
+
+#: src/gtkconv.c:3783
+msgid "/Conversation/Alias..."
+msgstr "/Разговор/Алиас..."
+
+#: src/gtkconv.c:3787
+msgid "/Conversation/Block..."
+msgstr "/Разговор/Блокирај..."
+
+#: src/gtkconv.c:3791
+msgid "/Conversation/Add..."
+msgstr "/Разговор/Додади..."
+
+#: src/gtkconv.c:3795
+msgid "/Conversation/Remove..."
+msgstr "/Разговор/Отстрани..."
+
+#: src/gtkconv.c:3801
 msgid "/Conversation/Insert Link..."
 msgstr "/Разговор/Внеси линк..."
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3805
 msgid "/Conversation/Insert Image..."
 msgstr "/Разгворо/Внеси слика..."
 
-#: src/gtkconv.c:3779
+#: src/gtkconv.c:3811
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3814
 msgid "/Options/Enable Sounds"
 msgstr ""
 
-#: src/gtkconv.c:3785
-#, fuzzy
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Опции/Прикажи алатник за форматирање"
-
-#: src/gtkconv.c:3788
+#: src/gtkconv.c:3817
+msgid "/Options/Show Formatting Toolbar"
+msgstr ""
+
+#: src/gtkconv.c:3820
 msgid "/Options/Show Timestamps"
 msgstr ""
 
-#: src/gtkconv.c:3791
-#, fuzzy
-msgid "/Options/Show Buddy Icon"
-msgstr "Икона на пријател:"
-
-#: src/gtkconv.c:3911
+#. The buttons, from left to right
+#. Warn button
+#: src/gtkconv.c:3874
+msgid "Warn"
+msgstr "Предупреди"
+
+#: src/gtkconv.c:3875
+msgid "Warn the user"
+msgstr "Предупреди го корисникот"
+
+#. Block button
+#: src/gtkconv.c:3881 src/gtkprivacy.c:634 src/gtkprivacy.c:645
+msgid "Block"
+msgstr "Блокирај"
+
+#: src/gtkconv.c:3882
+msgid "Block the user"
+msgstr "Блокирај го корисникот"
+
+#: src/gtkconv.c:3889
+#, fuzzy
+msgid "Send a file to the user"
+msgstr "Испрати порака до одбраниот пријател"
+
+#: src/gtkconv.c:3896
+msgid "Add the user to your buddy list"
+msgstr "Додади го корисникот во листата на пријатели"
+
+#: src/gtkconv.c:3903
+msgid "Remove the user from your buddy list"
+msgstr "Острани го корисникот од листата на пријатели"
+
+#: src/gtkconv.c:3910 src/gtkconv.c:4245
+msgid "Get the user's information"
+msgstr "Види ги информациите за корисникот"
+
+#. Send button
+#: src/gtkconv.c:3916 src/gtkconv.c:3980
+msgid "Send"
+msgstr "Испрати"
+
+#: src/gtkconv.c:3917 src/gtkconv.c:3981
+#, fuzzy
+msgid "Send message"
+msgstr "Испрати порака"
+
+#. The buttons, from left to right
+#. Invite
+#: src/gtkconv.c:3959
+msgid "Invite"
+msgstr "Покани"
+
+#: src/gtkconv.c:3960
+msgid "Invite a user"
+msgstr "Покани корисник"
+
+#: src/gtkconv.c:3967
+msgid "Add the chat to your buddy list"
+msgstr "Додади го разговорот во листата на пријатели"
+
+#: src/gtkconv.c:3974
+msgid "Remove the chat from your buddy list"
+msgstr ""
+
+#: src/gtkconv.c:4098
 msgid "Topic:"
 msgstr "Тема:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3959
+#: src/gtkconv.c:4161
 msgid "0 people in room"
 msgstr ""
 
-#: src/gtkconv.c:4021
+#: src/gtkconv.c:4222
 msgid "IM the user"
 msgstr "Порака до корисникот"
 
-#: src/gtkconv.c:4034
+#: src/gtkconv.c:4234
 msgid "Ignore the user"
 msgstr "Игнорирај го корисникот"
 
-#: src/gtkconv.c:4046
-msgid "Get the user's information"
-msgstr "Види ги информациите за корисникот"
-
-#: src/gtkconv.c:4569
+#: src/gtkconv.c:4833
 msgid "Close conversation"
 msgstr "Затвори разговор"
 
-#: src/gtkconv.c:5192 src/gtkconv.c:5220 src/gtkconv.c:5316 src/gtkconv.c:5373
-#, fuzzy, c-format
+#: src/gtkconv.c:5370 src/gtkconv.c:5399 src/gtkconv.c:5495 src/gtkconv.c:5553
+#, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d корисник во собата"
 msgstr[1] "%d корисника во собата"
 msgstr[2] "%d корисник во собата"
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6130 src/gtkconv.c:6133
+msgid "<main>/Conversation/Close"
+msgstr "<main>/Разговор/Затвори"
+
+#: src/gtkconv.c:6505
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: src/gtkconv.c:6282
+#: src/gtkconv.c:6508
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: src/gtkconv.c:6285
+#: src/gtkconv.c:6511
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: src/gtkconv.c:6288
-msgid "clear: Clears the conversation scrollback."
-msgstr ""
-
-#: src/gtkconv.c:6291
+#: src/gtkconv.c:6515
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: src/gtkdebug.c:230
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr ""
 
-#: src/gtkdebug.c:571
-#, fuzzy
-msgid "Invert"
-msgstr "_Внеси"
-
-#: src/gtkdebug.c:574
-msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:621
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Прозорец за дебаг"
 
-#: src/gtkdebug.c:674
-msgid "Clear"
-msgstr ""
-
-#: src/gtkdebug.c:683
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/gtkdebug.c:690 src/gtkdebug.c:691
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr ""
 
-#: src/gtkdebug.c:709
-#, fuzzy
-msgid "Filter"
-msgstr "Неуспешно"
-
-#: src/gtkdebug.c:722
-#, fuzzy
-msgid "Right click for more options."
-msgstr "Покажи повеќе опции"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:89
+#: src/gtkdialogs.c:63
 msgid "lead developer"
 msgstr ""
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:64 src/gtkdialogs.c:67 src/gtkdialogs.c:68
 #: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75
 msgid "developer"
 msgstr "програмер"
 
-#: src/gtkdialogs.c:61
+#: src/gtkdialogs.c:65
 msgid "developer & webmaster"
 msgstr ""
 
-#: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:66
 msgid "win32 port"
 msgstr ""
 
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:72
 msgid "support"
 msgstr "поддршка"
 
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:90
+#: src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr ""
 
-#: src/gtkdialogs.c:88
-msgid "libfaim maintainer"
-msgstr ""
-
-#: src/gtkdialogs.c:91
-#, fuzzy
-msgid "Jabber developer"
-msgstr "програмер"
-
 #: src/gtkdialogs.c:92
-msgid "original author"
+msgid "former libfaim maintainer"
 msgstr ""
 
 #: src/gtkdialogs.c:93
+msgid "former lead developer"
+msgstr ""
+
+#: src/gtkdialogs.c:94
+msgid "former maintainer"
+msgstr ""
+
+#: src/gtkdialogs.c:95
+msgid "former Jabber developer"
+msgstr ""
+
+#: src/gtkdialogs.c:96
+msgid "original author"
+msgstr ""
+
+#: src/gtkdialogs.c:97
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/gtkdialogs.c:98 src/gtkdialogs.c:99 src/gtkdialogs.c:141
-msgid "Bulgarian"
-msgstr ""
-
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:142 src/gtkdialogs.c:143
-msgid "Catalan"
-msgstr ""
-
-#: src/gtkdialogs.c:101 src/gtkdialogs.c:144
-msgid "Czech"
-msgstr ""
-
 #: src/gtkdialogs.c:102
-msgid "Danish"
-msgstr ""
-
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
-msgid "German"
-msgstr ""
-
-#: src/gtkdialogs.c:104
-msgid "Australian English"
-msgstr ""
-
-#: src/gtkdialogs.c:105
-msgid "British English"
+msgid "Azerbaijani"
+msgstr ""
+
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:149
+msgid "Bulgarian"
+msgstr ""
+
+#: src/gtkdialogs.c:103
+msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+msgstr ""
+
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:150 src/gtkdialogs.c:151
+msgid "Catalan"
+msgstr ""
+
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:152
+msgid "Czech"
 msgstr ""
 
 #: src/gtkdialogs.c:106
+msgid "Danish"
+msgstr ""
+
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:153
+msgid "German"
+msgstr ""
+
+#: src/gtkdialogs.c:108
+msgid "Australian English"
+msgstr ""
+
+#: src/gtkdialogs.c:109
 msgid "Canadian English"
 msgstr ""
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:146
-msgid "Spanish"
-msgstr ""
-
-#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
-msgid "Finnish"
-msgstr ""
-
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
-msgid "French"
-msgstr ""
-
 #: src/gtkdialogs.c:110
-msgid "Hebrew"
-msgstr ""
-
-#: src/gtkdialogs.c:111
-msgid "Hindi"
+msgid "British English"
+msgstr ""
+
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:154
+msgid "Spanish"
 msgstr ""
 
 #: src/gtkdialogs.c:112
-msgid "Hungarian"
-msgstr ""
-
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:149
-msgid "Italian"
-msgstr ""
-
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
-msgid "Japanese"
+msgid "Estonian"
+msgstr ""
+
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:155
+msgid "Finnish"
+msgstr ""
+
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:156
+msgid "French"
 msgstr ""
 
 #: src/gtkdialogs.c:115
-msgid "Lithuanian"
-msgstr ""
-
-#: src/gtkdialogs.c:116
+msgid "Hebrew"
+msgstr ""
+
+#: src/gtkdialogs.c:116 src/gtkdialogs.c:157
+msgid "Hindi"
+msgstr ""
+
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:158
+msgid "Hungarian"
+msgstr ""
+
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:159
+msgid "Italian"
+msgstr ""
+
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:160
+msgid "Japanese"
+msgstr ""
+
+#: src/gtkdialogs.c:120
 #, fuzzy
 msgid "Georgian"
 msgstr "Најава"
 
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:161
 msgid "Korean"
 msgstr ""
 
-#: src/gtkdialogs.c:118
-msgid "Dutch, Flemish"
-msgstr ""
-
-#: src/gtkdialogs.c:119
-msgid "Macedonian"
-msgstr ""
-
-#: src/gtkdialogs.c:120
-msgid "Norwegian"
-msgstr ""
-
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:122 src/gtkdialogs.c:152
-msgid "Polish"
+#: src/gtkdialogs.c:122
+msgid "Lithuanian"
 msgstr ""
 
 #: src/gtkdialogs.c:123
-msgid "Portuguese"
+msgid "Macedonian"
 msgstr ""
 
 #: src/gtkdialogs.c:124
-msgid "Portuguese-Brazil"
+msgid "Burmese"
 msgstr ""
 
 #: src/gtkdialogs.c:125
-msgid "Romanian"
-msgstr ""
-
-#: src/gtkdialogs.c:126 src/gtkdialogs.c:153 src/gtkdialogs.c:154
-msgid "Russian"
-msgstr ""
-
-#: src/gtkdialogs.c:127 src/gtkdialogs.c:128
-msgid "Serbian"
-msgstr ""
-
-#: src/gtkdialogs.c:129
-msgid "Slovenian"
-msgstr ""
-
-#: src/gtkdialogs.c:130 src/gtkdialogs.c:156
-msgid "Swedish"
-msgstr ""
-
-#: src/gtkdialogs.c:131
-msgid "Vietnamese"
+msgid "Dutch; Flemish"
+msgstr ""
+
+#: src/gtkdialogs.c:126
+msgid "Norwegian (Nynorsk)"
+msgstr ""
+
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:162
+msgid "Norwegian"
+msgstr ""
+
+#: src/gtkdialogs.c:128
+msgid "Punjabi"
+msgstr ""
+
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:163
+msgid "Polish"
+msgstr ""
+
+#: src/gtkdialogs.c:130
+msgid "Portuguese"
 msgstr ""
 
 #: src/gtkdialogs.c:131
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr ""
-
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
-msgid "Simplified Chinese"
-msgstr ""
-
-#: src/gtkdialogs.c:133 src/gtkdialogs.c:134 src/gtkdialogs.c:158
-msgid "Traditional Chinese"
+msgid "Portuguese-Brazil"
+msgstr ""
+
+#: src/gtkdialogs.c:132
+msgid "Romanian"
+msgstr ""
+
+#: src/gtkdialogs.c:133 src/gtkdialogs.c:164 src/gtkdialogs.c:165
+msgid "Russian"
+msgstr ""
+
+#: src/gtkdialogs.c:134
+msgid "Slovenian"
+msgstr ""
+
+#: src/gtkdialogs.c:135
+msgid "Albanian"
+msgstr ""
+
+#: src/gtkdialogs.c:136
+msgid "Serbian"
+msgstr ""
+
+#: src/gtkdialogs.c:137 src/gtkdialogs.c:167 src/gtkdialogs.c:168
+msgid "Swedish"
+msgstr ""
+
+#: src/gtkdialogs.c:138
+msgid "Turkish"
+msgstr ""
+
+#: src/gtkdialogs.c:139
+msgid "Ukrainian"
 msgstr ""
 
 #: src/gtkdialogs.c:140
+msgid "Vietnamese"
+msgstr ""
+
+#: src/gtkdialogs.c:140
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr ""
+
+#: src/gtkdialogs.c:141
+msgid "Simplified Chinese"
+msgstr ""
+
+#: src/gtkdialogs.c:142
+msgid "Traditional Chinese"
+msgstr ""
+
+#: src/gtkdialogs.c:148
 msgid "Amharic"
 msgstr ""
 
-#: src/gtkdialogs.c:155
+#: src/gtkdialogs.c:166
 msgid "Slovak"
 msgstr ""
 
-#: src/gtkdialogs.c:199
+#: src/gtkdialogs.c:169
+msgid "Chinese"
+msgstr ""
+
+#: src/gtkdialogs.c:211
 msgid "About Gaim"
 msgstr ""
 
-#: src/gtkdialogs.c:223
+#: src/gtkdialogs.c:226
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr ""
+
+#: src/gtkdialogs.c:248
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-
-#: src/gtkdialogs.c:232
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+
+#: src/gtkdialogs.c:258
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 
-#: src/gtkdialogs.c:235
+#: src/gtkdialogs.c:261
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 
-#: src/gtkdialogs.c:241
+#: src/gtkdialogs.c:267
 msgid "Active Developers"
 msgstr "Активен развивачи"
 
-#: src/gtkdialogs.c:256
+#: src/gtkdialogs.c:282
 msgid "Crazy Patch Writers"
 msgstr ""
 
-#: src/gtkdialogs.c:271
+#: src/gtkdialogs.c:297
 msgid "Retired Developers"
 msgstr ""
 
-#: src/gtkdialogs.c:286
+#: src/gtkdialogs.c:312
 msgid "Current Translators"
 msgstr ""
 
-#: src/gtkdialogs.c:306
+#: src/gtkdialogs.c:332
 msgid "Past Translators"
 msgstr ""
 
-#: src/gtkdialogs.c:324
-#, fuzzy
-msgid "Debugging Information"
-msgstr "Работа информација"
-
-#: src/gtkdialogs.c:486 src/gtkdialogs.c:629 src/gtkdialogs.c:684
-#, fuzzy
-msgid "_Name"
-msgstr "Име"
-
-#: src/gtkdialogs.c:491 src/gtkdialogs.c:634 src/gtkdialogs.c:689
+#: src/gtkdialogs.c:487 src/gtkdialogs.c:629 src/gtkdialogs.c:682
+msgid "_Screen name"
+msgstr ""
+
+#: src/gtkdialogs.c:493 src/gtkdialogs.c:635 src/gtkdialogs.c:688
 msgid "_Account"
 msgstr ""
 
-#: src/gtkdialogs.c:499
+#: src/gtkdialogs.c:500
 msgid "New Instant Message"
 msgstr ""
 
-#: src/gtkdialogs.c:501
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Внеси го името на пријателот што сакаш да го поканиш, заедно со пораката за "
-"покана."
+#: src/gtkdialogs.c:502
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr ""
 
 #: src/gtkdialogs.c:642
 msgid "Get User Info"
 msgstr ""
 
 #: src/gtkdialogs.c:644
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Внеси го името на пријателот што сакаш да го поканиш, заедно со пораката за "
-"покана."
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr ""
+
+#: src/gtkdialogs.c:696
+msgid "Get User Log"
+msgstr ""
 
 #: src/gtkdialogs.c:698
 #, fuzzy
-msgid "View User Log"
-msgstr "/Пријатели/Корисничко инфо..."
-
-#: src/gtkdialogs.c:700
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Внеси го името на пријателот што сакаш да го поканиш, заедно со пораката за "
 "покана."
 
-#: src/gtkdialogs.c:719
+#: src/gtkdialogs.c:738
+msgid "Warn User"
+msgstr "Предупреди го корисникот"
+
+#: src/gtkdialogs.c:759
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Предупреди %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+
+#: src/gtkdialogs.c:768
+msgid "Warn _anonymously?"
+msgstr "Предупреди _анонимно?"
+
+#: src/gtkdialogs.c:775
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr ""
+
+#: src/gtkdialogs.c:796
 msgid "Alias Contact"
 msgstr ""
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:797
 msgid "Enter an alias for this contact."
 msgstr ""
 
-#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
-#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:799 src/gtkdialogs.c:821 src/gtkdialogs.c:841
+#: src/gtkrequest.c:251 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr ""
 
-#: src/gtkdialogs.c:740
+#: src/gtkdialogs.c:817
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ""
 
-#: src/gtkdialogs.c:742
+#: src/gtkdialogs.c:819
 msgid "Alias Buddy"
 msgstr ""
 
-#: src/gtkdialogs.c:761
+#: src/gtkdialogs.c:838
 msgid "Alias Chat"
 msgstr ""
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:839
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: src/gtkdialogs.c:799
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
+#: src/gtkdialogs.c:873
+#, c-format
+msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/gtkdialogs.c:866
+msgstr ""
+
+#: src/gtkdialogs.c:934
 #, 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/gtkdialogs.c:869 src/gtkdialogs.c:870
+#: src/gtkdialogs.c:937 src/gtkdialogs.c:938
 msgid "Remove Group"
 msgstr ""
 
-#: src/gtkdialogs.c:908
+#: src/gtkdialogs.c:976
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
+#: src/gtkdialogs.c:979 src/gtkdialogs.c:981
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/gtkdialogs.c:950
+#: src/gtkdialogs.c:1018
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
 
-#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
+#: src/gtkdialogs.c:1021 src/gtkdialogs.c:1022
 msgid "Remove Chat"
 msgstr "Отстрани разговор"
 
@@ -3218,15 +3280,15 @@
 msgid "%.2f KB/s"
 msgstr ""
 
-#: src/gtkft.c:162 src/gtkft.c:1046
+#: src/gtkft.c:162 src/gtkft.c:1012
 msgid "Finished"
 msgstr "Завршено"
 
-#: src/gtkft.c:165 src/gtkft.c:997
+#: src/gtkft.c:165 src/gtkft.c:963
 msgid "Canceled"
 msgstr "Откажано"
 
-#: src/gtkft.c:168 src/gtkft.c:916
+#: src/gtkft.c:168 src/gtkft.c:882
 msgid "Waiting for transfer to begin"
 msgstr ""
 
@@ -3248,155 +3310,124 @@
 msgid "<b>Sending As:</b>"
 msgstr "<b>Испраќање до:</b>"
 
-#: src/gtkft.c:445
+#: src/gtkft.c:436
 msgid "There is no application configured to open this type of file."
 msgstr ""
 
-#: src/gtkft.c:450
+#: src/gtkft.c:441
 msgid "An error occurred while opening the file."
 msgstr ""
 
-#: src/gtkft.c:470
-#, fuzzy, c-format
-msgid "Error launching %s: %s"
-msgstr "Грешка при записот на сликата: %s"
-
-#: src/gtkft.c:479
-#, fuzzy, c-format
-msgid "Error running %s"
-msgstr "Грешка при записот на сликата: %s"
-
-#: src/gtkft.c:480
-#, c-format
-msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:575
+#: src/gtkft.c:533
 msgid "Progress"
 msgstr "Прогрес"
 
-#: src/gtkft.c:582
+#: src/gtkft.c:540
 msgid "Filename"
 msgstr "Датотека"
 
-#: src/gtkft.c:589
+#: src/gtkft.c:547
 msgid "Size"
 msgstr "Големина"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:554
 msgid "Remaining"
 msgstr "Преостанато"
 
-#: src/gtkft.c:627
+#: src/gtkft.c:586
 msgid "Filename:"
 msgstr "Датотека:"
 
-#: src/gtkft.c:628
+#: src/gtkft.c:587
 msgid "Local File:"
 msgstr ""
 
-#: src/gtkft.c:629
+#: src/gtkft.c:588
 msgid "Status:"
 msgstr "Статус:"
 
-#: src/gtkft.c:630
+#: src/gtkft.c:589
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: src/gtkft.c:631
+#: src/gtkft.c:590
 msgid "Time Elapsed:"
 msgstr "Изминато време:"
 
-#: src/gtkft.c:632
+#: src/gtkft.c:591
 msgid "Time Remaining:"
 msgstr "Останато време:"
 
-#: src/gtkft.c:718
+#: src/gtkft.c:683
 msgid "_Keep the dialog open"
 msgstr "_Чувај го прозорецот отворен"
 
-#: src/gtkft.c:728
+#: src/gtkft.c:693
 msgid "_Clear finished transfers"
 msgstr "_Отстрани ги готовите преноси од листата"
 
 #. "Download Details" arrow
-#: src/gtkft.c:737
+#: src/gtkft.c:702
 msgid "Show transfer details"
 msgstr "Покажи детали за пренос"
 
-#: src/gtkft.c:738
+#: src/gtkft.c:703
 msgid "Hide transfer details"
 msgstr "Скриј детали за пренос"
 
 #. Pause button
-#: src/gtkft.c:775 src/gtkstock.c:106
+#: src/gtkft.c:745 src/stock.c:92
 msgid "_Pause"
 msgstr "_Пауза"
 
 #. Resume button
-#: src/gtkft.c:785
+#: src/gtkft.c:755
 msgid "_Resume"
 msgstr "П_родолжи"
 
-#: src/gtkft.c:999
+#: src/gtkft.c:965
 msgid "Failed"
 msgstr "Неуспешно"
 
-#: src/gtkgaim-disclosure.c:258
-msgid "Expander Size"
-msgstr ""
-
-#: src/gtkgaim-disclosure.c:259
-msgid "Size of the expander arrow"
-msgstr ""
-
-#: src/gtkimhtml.c:816
+#: src/gtkimhtml.c:693
 msgid "Pa_ste As Text"
 msgstr ""
 
-#: src/gtkimhtml.c:1263
+#: src/gtkimhtml.c:1087
 msgid "Hyperlink color"
 msgstr ""
 
-#: src/gtkimhtml.c:1264
+#: src/gtkimhtml.c:1088
 msgid "Color to draw hyperlinks."
 msgstr ""
 
-#: src/gtkimhtml.c:1267
-msgid "Hyperlink prelight color"
-msgstr ""
-
-#: src/gtkimhtml.c:1268
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr ""
-
-#: src/gtkimhtml.c:1486
+#: src/gtkimhtml.c:1296
 msgid "_Copy E-Mail Address"
 msgstr "_Копирај е-пошта"
 
-#: src/gtkimhtml.c:1498
+#: src/gtkimhtml.c:1308
+msgid "_Copy Link Location"
+msgstr "_Копирај локација на линк"
+
+#: src/gtkimhtml.c:1318
 msgid "_Open Link in Browser"
 msgstr "_Отвори го линкот во прелистувач"
 
-#: src/gtkimhtml.c:1508
-msgid "_Copy Link Location"
-msgstr "_Копирај локација на линк"
-
-#: src/gtkimhtml.c:3182
+#: src/gtkimhtml.c:2915
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:3185
+#: src/gtkimhtml.c:2918
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:3198
+#: src/gtkimhtml.c:2931
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3404,7 +3435,7 @@
 "%s"
 msgstr ""
 
-#: src/gtkimhtml.c:3201
+#: src/gtkimhtml.c:2934
 #, fuzzy, c-format
 msgid ""
 "Error saving image\n"
@@ -3412,205 +3443,143 @@
 "%s"
 msgstr "Грешка при записот на сликата: %s"
 
-#: src/gtkimhtml.c:3281 src/gtkimhtml.c:3293
+#: src/gtkimhtml.c:3014 src/gtkimhtml.c:3026
 msgid "Save Image"
 msgstr "Зачувај ја сликата"
 
-#: src/gtkimhtml.c:3321
+#: src/gtkimhtml.c:3054
 msgid "_Save Image..."
 msgstr "_Зачувај слика..."
 
-#: src/gtkimhtmltoolbar.c:141
+#: src/gtkimhtmltoolbar.c:176
 msgid "Select Font"
 msgstr "Избери фонт"
 
-#: src/gtkimhtmltoolbar.c:220
+#: src/gtkimhtmltoolbar.c:254
 msgid "Select Text Color"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:299
+#: src/gtkimhtmltoolbar.c:328
 msgid "Select Background Color"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:388
+#: src/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:396
+#: src/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Опис"
 
-#: src/gtkimhtmltoolbar.c:399
+#: src/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:403
+#: src/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:408
+#: src/gtkimhtmltoolbar.c:432
 msgid "Insert Link"
 msgstr "Внеси линк"
 
-#: src/gtkimhtmltoolbar.c:412
+#: src/gtkimhtmltoolbar.c:436
 msgid "_Insert"
 msgstr "_Внеси"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:505
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
 msgid "Insert Image"
 msgstr "Внеси слика"
 
-#: src/gtkimhtmltoolbar.c:715
+#: src/gtkimhtmltoolbar.c:679
 msgid "This theme has no available smileys."
 msgstr ""
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:729
+#: src/gtkimhtmltoolbar.c:694
 msgid "Smile!"
 msgstr "Смајли!"
 
-#: src/gtkimhtmltoolbar.c:917
+#: src/gtkimhtmltoolbar.c:912
 msgid "Bold"
 msgstr "Задебелено"
 
-#: src/gtkimhtmltoolbar.c:928
+#: src/gtkimhtmltoolbar.c:923
 msgid "Italic"
 msgstr "Искосено"
 
-#: src/gtkimhtmltoolbar.c:939
+#: src/gtkimhtmltoolbar.c:934
 msgid "Underline"
 msgstr "Подвлечено"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:950
 msgid "Larger font size"
 msgstr "Поголем фонт"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:962
 msgid "Smaller font size"
 msgstr "Помал фонт"
 
-#: src/gtkimhtmltoolbar.c:984
+#: src/gtkimhtmltoolbar.c:979
 msgid "Font Face"
 msgstr "Фонт"
 
-#: src/gtkimhtmltoolbar.c:996
+#: src/gtkimhtmltoolbar.c:991
 msgid "Foreground font color"
 msgstr "Боја на фонт"
 
-#: src/gtkimhtmltoolbar.c:1008
+#: src/gtkimhtmltoolbar.c:1003
 msgid "Background color"
 msgstr "Боја на позадина"
 
-#: src/gtkimhtmltoolbar.c:1024
-#, fuzzy
-msgid "Clear formatting"
-msgstr "Работа информација"
-
-#: src/gtkimhtmltoolbar.c:1039
+#: src/gtkimhtmltoolbar.c:1018
 msgid "Insert link"
 msgstr "Внеси линк"
 
-#: src/gtkimhtmltoolbar.c:1049
+#: src/gtkimhtmltoolbar.c:1028
 msgid "Insert image"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:1060
+#: src/gtkimhtmltoolbar.c:1039
 msgid "Insert smiley"
 msgstr ""
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "<h1>Разговор со %s</h1>\n"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "<h1>Разговор со %s</h1>\n"
-
-#: src/gtklog.c:397
-msgid ""
-"System events will only be logged if the <span style=\"italic\">Enable "
-"system log preference</span> is set."
-msgstr ""
-
-#: src/gtklog.c:401
-msgid ""
-"Instant messages will only be logged if the <span style=\"italic\">Log all "
-"instant messages</span> preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:404
-msgid ""
-"Chats will only be logged if the <span style=\"italic\">Log all chats "
-"preference</span> is enabled."
-msgstr ""
-
-#: src/gtklog.c:409
-msgid "No logs were found."
-msgstr ""
-
-#: src/gtklog.c:455
-#, fuzzy, c-format
-msgid "Conversations in %s"
-msgstr "<h1>Разговор со %s</h1>\n"
-
-#: src/gtklog.c:463 src/gtklog.c:513
+#: src/gtklog.c:316
 #, fuzzy, c-format
 msgid "Conversations with %s"
 msgstr "<h1>Разговор со %s</h1>\n"
 
-#: src/gtklog.c:538
+#. Window **********
+#: src/gtklog.c:412 src/gtklog.c:429
 msgid "System Log"
 msgstr ""
 
-#: src/gtkmain.c:323
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr ""
-
-#: src/gtkmain.c:325
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-
 #. Descriptive label
-#: src/gtknotify.c:267
+#: src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtknotify.c:281
+#: src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:290
+#: src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:295
+#: src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3618,7 +3587,7 @@
 "%s%s%s%s"
 msgstr ""
 
-#: src/gtknotify.c:311
+#: src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3626,26 +3595,22 @@
 "%s"
 msgstr ""
 
-#: src/gtknotify.c:456
-msgid "Search Results"
-msgstr "Резулатати од пребарувањето"
-
-#: src/gtknotify.c:617
+#: src/gtknotify.c:430
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr ""
 
-#: src/gtknotify.c:619 src/gtknotify.c:631 src/gtknotify.c:644
-#: src/gtknotify.c:768
+#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr ""
 
-#: src/gtknotify.c:629 src/gtknotify.c:642
+#: src/gtknotify.c:442 src/gtknotify.c:455
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr ""
 
-#: src/gtknotify.c:769
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3659,7 +3624,7 @@
 msgstr ""
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:391 src/gtkpounce.c:895
 msgid "New Buddy Pounce"
 msgstr ""
 
@@ -3757,434 +3722,557 @@
 msgstr ""
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
+#: src/gtkpounce.c:902
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr ""
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:965
 #, fuzzy, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s сака да ти испрати %s (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr ""
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr ""
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:971
 #, fuzzy, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s сака да ти испрати %s (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:973
 #, fuzzy, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s сака да ти испрати %s (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr ""
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:977
 #, fuzzy, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s сака да ти испрати %s (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:978
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: src/gtkprefs.c:685
+#: src/gtkprefs.c:447
+msgid "Interface Options"
+msgstr ""
+
+#: src/gtkprefs.c:449
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr ""
+
+#: src/gtkprefs.c:681
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
 
-#: src/gtkprefs.c:725
+#: src/gtkprefs.c:721
 msgid "Icon"
 msgstr ""
 
-#: src/gtkprefs.c:732 src/gtkprefs.c:2040 src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:728 src/gtkprefs.c:2205 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:757 src/protocols/jabber/chat.c:743
 msgid "Description"
 msgstr ""
 
+#: src/gtkprefs.c:824
+msgid "Display"
+msgstr ""
+
+#: src/gtkprefs.c:825
+msgid "Show _timestamp on messages"
+msgstr ""
+
+#: src/gtkprefs.c:828
+msgid "_Highlight misspelled words"
+msgstr ""
+
 #: src/gtkprefs.c:832
-msgid "Buddy List Sorting"
-msgstr "Подредување на листата на пријатели"
+msgid "Ignore c_olors"
+msgstr ""
+
+#: src/gtkprefs.c:834
+msgid "Ignore font _faces"
+msgstr "Игнорирај типови на фонт"
+
+#: src/gtkprefs.c:836
+msgid "Ignore font si_zes"
+msgstr "Игнорирај големинина фонт"
+
+#: src/gtkprefs.c:839
+msgid "Default Formatting"
+msgstr ""
 
 #: src/gtkprefs.c:841
-msgid "_Sorting:"
-msgstr ""
-
-#: src/gtkprefs.c:846
-msgid "Buddy Display"
-msgstr ""
-
-#: src/gtkprefs.c:847
-#, fuzzy
-msgid "Show more buddy details"
-msgstr "Прикажи кориснички детали"
-
-#: src/gtkprefs.c:885
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr ""
-
-#: src/gtkprefs.c:887
-msgid "Show _formatting on incoming messages"
-msgstr ""
-
-#: src/gtkprefs.c:889
-msgid "Show buddy _icons"
-msgstr ""
-
-#: src/gtkprefs.c:891
-msgid "Enable buddy ic_on animation"
-msgstr ""
-
-#: src/gtkprefs.c:893
-msgid "_Notify buddies that you are typing to them"
-msgstr ""
-
-#: src/gtkprefs.c:896
-msgid "_Highlight misspelled words"
-msgstr ""
-
-#: src/gtkprefs.c:914
+msgid "_Send default formatting with outgoing messages"
+msgstr ""
+
+#: src/gtkprefs.c:873
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr ""
 
+#: src/gtkprefs.c:876
+msgid "_Clear Formatting"
+msgstr ""
+
+#: src/gtkprefs.c:913
+msgid "Send Message"
+msgstr "Испрати порака"
+
+#: src/gtkprefs.c:914
+msgid "Enter _sends message"
+msgstr ""
+
+#: src/gtkprefs.c:916
+msgid "C_ontrol-Enter sends message"
+msgstr ""
+
+#: src/gtkprefs.c:919
+msgid "Window Closing"
+msgstr ""
+
+#: src/gtkprefs.c:920
+msgid "_Escape closes window"
+msgstr ""
+
+#: src/gtkprefs.c:923
+msgid "Insertions"
+msgstr ""
+
+#: src/gtkprefs.c:924
+msgid "Control-{B/I/U} changes _formatting"
+msgstr ""
+
+#: src/gtkprefs.c:926
+msgid "Control-(number) _inserts smileys"
+msgstr ""
+
+#: src/gtkprefs.c:942
+msgid "Buddy List Sorting"
+msgstr "Подредување на листата на пријатели"
+
+#: src/gtkprefs.c:951
+msgid "_Sorting:"
+msgstr ""
+
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr ""
+
+#: src/gtkprefs.c:959 src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr ""
+
+#: src/gtkprefs.c:960 src/gtkprefs.c:1012
+msgid "Text"
+msgstr ""
+
+#: src/gtkprefs.c:961 src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr ""
+
+#: src/gtkprefs.c:964
+msgid "_Raise window on events"
+msgstr ""
+
+#: src/gtkprefs.c:967
+msgid "Buddy Display"
+msgstr ""
+
+#: src/gtkprefs.c:968 src/gtkprefs.c:1030
+msgid "Show buddy _icons"
+msgstr ""
+
+#: src/gtkprefs.c:970
+msgid "Show _warning levels"
+msgstr ""
+
+#: src/gtkprefs.c:972
+msgid "Show idle _times"
+msgstr ""
+
+#: src/gtkprefs.c:974
+msgid "Dim i_dle buddies"
+msgstr ""
+
+#: src/gtkprefs.c:976
+msgid "_Automatically expand contacts"
+msgstr ""
+
+#: src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr ""
+
+#: src/gtkprefs.c:1023
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr ""
+
+#: src/gtkprefs.c:1026
+msgid "Show _formatting toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:1028
+msgid "Show _aliases in tabs/titles"
+msgstr ""
+
+#: src/gtkprefs.c:1032
+msgid "Enable buddy ic_on animation"
+msgstr ""
+
+#: src/gtkprefs.c:1034
+msgid "_Notify buddies that you are typing to them"
+msgstr ""
+
+#: src/gtkprefs.c:1036
+msgid "_Raise IM window on events"
+msgstr ""
+
+#: src/gtkprefs.c:1039
+msgid "Raise chat _window on events"
+msgstr ""
+
+#: src/gtkprefs.c:1041
+msgid "Use _multi-colored screen names in chats"
+msgstr ""
+
 #. All the tab options!
-#: src/gtkprefs.c:935
+#: src/gtkprefs.c:1045
 msgid "Tab Options"
 msgstr ""
 
-#: src/gtkprefs.c:937
+#: src/gtkprefs.c:1047
 msgid "Show IMs and chats in _tabbed windows"
 msgstr ""
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:1062
 msgid "Show close b_utton on tabs"
 msgstr ""
 
-#: src/gtkprefs.c:957
-msgid "_Placement:"
-msgstr ""
-
-#: src/gtkprefs.c:959
-msgid "Top"
-msgstr ""
-
-#: src/gtkprefs.c:960
-msgid "Bottom"
-msgstr ""
-
-#: src/gtkprefs.c:961
-msgid "Left"
-msgstr ""
-
-#: src/gtkprefs.c:962
-msgid "Right"
-msgstr ""
-
-#: src/gtkprefs.c:966
-#, fuzzy
-msgid "N_ew conversations:"
-msgstr "Затвори разговор"
-
-#: src/gtkprefs.c:1017 src/protocols/oscar/oscar.c:772
-#: src/protocols/oscar/oscar.c:5310
-msgid "IP Address"
-msgstr ""
-
-#: src/gtkprefs.c:1019
-msgid "_Autodetect IP Address"
-msgstr ""
-
-#: src/gtkprefs.c:1028
-msgid "Public _IP:"
-msgstr ""
-
-#: src/gtkprefs.c:1052
-msgid "Ports"
-msgstr ""
-
-#: src/gtkprefs.c:1055
-msgid "_Manually specify range of ports to listen on"
-msgstr ""
-
-#: src/gtkprefs.c:1058
-msgid "_Start Port:"
-msgstr ""
-
 #: src/gtkprefs.c:1065
-msgid "_End Port:"
-msgstr ""
-
-#: src/gtkprefs.c:1072
-msgid "Proxy Server"
+msgid "Tab p_lacement:"
+msgstr ""
+
+#: src/gtkprefs.c:1067
+msgid "Top"
+msgstr ""
+
+#: src/gtkprefs.c:1068
+msgid "Bottom"
+msgstr ""
+
+#: src/gtkprefs.c:1069
+msgid "Left"
+msgstr ""
+
+#: src/gtkprefs.c:1070
+msgid "Right"
 msgstr ""
 
 #: src/gtkprefs.c:1076
-msgid "No proxy"
+#, fuzzy
+msgid "New conversation _placement:"
+msgstr "Затвори разговор"
+
+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:5198
+msgid "IP Address"
+msgstr ""
+
+#: src/gtkprefs.c:1129
+msgid "_Autodetect IP Address"
 msgstr ""
 
 #: src/gtkprefs.c:1138
+msgid "Public _IP:"
+msgstr ""
+
+#: src/gtkprefs.c:1162
+msgid "Ports"
+msgstr ""
+
+#: src/gtkprefs.c:1165
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: src/gtkprefs.c:1168
+msgid "_Start Port:"
+msgstr ""
+
+#: src/gtkprefs.c:1175
+msgid "_End Port:"
+msgstr ""
+
+#: src/gtkprefs.c:1182
+msgid "Proxy Server"
+msgstr ""
+
+#: src/gtkprefs.c:1186
+msgid "No proxy"
+msgstr ""
+
+#: src/gtkprefs.c:1248
 msgid "_User:"
 msgstr ""
 
-#: src/gtkprefs.c:1194
+#: src/gtkprefs.c:1304
 msgid "Epiphany"
 msgstr ""
 
-#: src/gtkprefs.c:1195
+#: src/gtkprefs.c:1305
 msgid "Firebird"
 msgstr ""
 
-#: src/gtkprefs.c:1196
+#: src/gtkprefs.c:1306
 msgid "Firefox"
 msgstr ""
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1307
 msgid "Galeon"
 msgstr ""
 
-#: src/gtkprefs.c:1198
+#: src/gtkprefs.c:1308
 msgid "Gnome Default"
 msgstr ""
 
-#: src/gtkprefs.c:1199
+#: src/gtkprefs.c:1309
 msgid "Konqueror"
 msgstr ""
 
-#: src/gtkprefs.c:1200
+#: src/gtkprefs.c:1310
 msgid "Mozilla"
 msgstr ""
 
-#: src/gtkprefs.c:1201
+#: src/gtkprefs.c:1311
 msgid "Netscape"
 msgstr ""
 
-#: src/gtkprefs.c:1202
+#: src/gtkprefs.c:1312
 msgid "Opera"
 msgstr ""
 
-#: src/gtkprefs.c:1211
+#: src/gtkprefs.c:1321
 msgid "Manual"
 msgstr ""
 
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1372
 msgid "Browser Selection"
 msgstr ""
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1376
 msgid "_Browser:"
 msgstr ""
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1383
 msgid "_Open link in:"
 msgstr ""
 
-#: src/gtkprefs.c:1277
+#: src/gtkprefs.c:1385
 msgid "Browser default"
 msgstr ""
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1386
 msgid "Existing window"
 msgstr ""
 
-#: src/gtkprefs.c:1280
+#: src/gtkprefs.c:1388
 msgid "New tab"
 msgstr ""
 
-#: src/gtkprefs.c:1294
+#: src/gtkprefs.c:1402
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1439
 msgid "Message Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1442
 msgid "Log _Format:"
 msgstr ""
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1445
 msgid "_Log all instant messages"
 msgstr ""
 
-#: src/gtkprefs.c:1341
+#: src/gtkprefs.c:1447
 msgid "Log all c_hats"
 msgstr ""
 
-#: src/gtkprefs.c:1344
+#: src/gtkprefs.c:1450
 msgid "System Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1346
+#: src/gtkprefs.c:1452
 msgid "_Enable system log"
 msgstr ""
 
-#: src/gtkprefs.c:1349
-msgid "Log when buddies log in/log _out"
-msgstr ""
-
-#: src/gtkprefs.c:1355
+#: src/gtkprefs.c:1455
+msgid "Log when buddies _sign on/sign off"
+msgstr ""
+
+#: src/gtkprefs.c:1461
 msgid "Log when buddies become _idle/un-idle"
 msgstr ""
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1467
 msgid "Log when buddies go away/come _back"
 msgstr ""
 
-#: src/gtkprefs.c:1367
-msgid "Log your own _signons/idleness/awayness"
-msgstr ""
-
-#: src/gtkprefs.c:1504
+#: src/gtkprefs.c:1473
+msgid "Log your _own signons/idleness/awayness"
+msgstr ""
+
+#: src/gtkprefs.c:1600
 msgid "Sound Selection"
 msgstr ""
 
-#: src/gtkprefs.c:1558
+#: src/gtkprefs.c:1651
+msgid "Sound Options"
+msgstr ""
+
+#: src/gtkprefs.c:1652
+msgid "Sounds when conversation has _focus"
+msgstr ""
+
+#: src/gtkprefs.c:1654
+msgid "_Sounds while away"
+msgstr ""
+
+#: src/gtkprefs.c:1658
 msgid "Sound Method"
 msgstr ""
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1659
 msgid "_Method:"
 msgstr ""
 
-#: src/gtkprefs.c:1561
+#: src/gtkprefs.c:1661
 msgid "Console beep"
 msgstr ""
 
-#: src/gtkprefs.c:1563
+#: src/gtkprefs.c:1663
 msgid "Automatic"
 msgstr ""
 
-#: src/gtkprefs.c:1568
+#: src/gtkprefs.c:1670
 msgid "Command"
 msgstr ""
 
-#: src/gtkprefs.c:1569
-#, fuzzy
-msgid "No sounds"
-msgstr "Замолчи звуци"
-
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1678
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: src/gtkprefs.c:1604
-msgid "Sound Options"
-msgstr ""
-
-#: src/gtkprefs.c:1605
-msgid "Sounds when conversation has _focus"
-msgstr ""
-
-#: src/gtkprefs.c:1607
-msgid "_Sounds while away"
-msgstr ""
-
-#: src/gtkprefs.c:1617
+#: src/gtkprefs.c:1705
 msgid "Sound Events"
 msgstr ""
 
-#: src/gtkprefs.c:1668
+#: src/gtkprefs.c:1756
 msgid "Play"
 msgstr ""
 
-#: src/gtkprefs.c:1675
+#: src/gtkprefs.c:1763
 msgid "Event"
 msgstr ""
 
-#: src/gtkprefs.c:1694
+#: src/gtkprefs.c:1782
 msgid "Test"
 msgstr ""
 
-#: src/gtkprefs.c:1698
-msgid "Reset"
-msgstr ""
-
-#: src/gtkprefs.c:1702
-msgid "Choose..."
-msgstr ""
-
-#: src/gtkprefs.c:1758
-msgid "_Queue new messages when away"
-msgstr ""
-
-#: src/gtkprefs.c:1761
-msgid "_Auto-reply:"
-msgstr ""
-
-#: src/gtkprefs.c:1764
-msgid "When away"
-msgstr ""
-
-#: src/gtkprefs.c:1765
-msgid "When both away and idle"
-msgstr ""
-
-#: src/gtkprefs.c:1768 src/protocols/msn/msn.c:503
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2819
-#: src/protocols/oscar/oscar.c:4435 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo_profile.c:665
-msgid "Idle"
-msgstr ""
-
-#: src/gtkprefs.c:1769
-msgid "Idle _time reporting:"
-msgstr ""
-
-#: src/gtkprefs.c:1772
-msgid "Gaim usage"
-msgstr ""
-
-#: src/gtkprefs.c:1775
-msgid "X usage"
-msgstr ""
-
-#: src/gtkprefs.c:1777
-msgid "Windows usage"
-msgstr ""
-
-#: src/gtkprefs.c:1785
-msgid "Auto-away"
-msgstr ""
-
 #: src/gtkprefs.c:1786
-msgid "Set away _when idle"
+msgid "Reset"
 msgstr ""
 
 #: src/gtkprefs.c:1790
+msgid "Choose..."
+msgstr ""
+
+#: src/gtkprefs.c:1814
+msgid "_Queue new messages when away"
+msgstr ""
+
+#: src/gtkprefs.c:1817
+msgid "_Auto-reply:"
+msgstr ""
+
+#: src/gtkprefs.c:1819
+#, fuzzy
+msgid "Never"
+msgstr "Сервер"
+
+#: src/gtkprefs.c:1820
+msgid "When away"
+msgstr ""
+
+#: src/gtkprefs.c:1821
+msgid "When away and idle"
+msgstr ""
+
+#: src/gtkprefs.c:1824 src/protocols/msn/msn.c:1327
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
+#: src/protocols/oscar/oscar.c:4346 src/protocols/yahoo/yahoo.c:2697
+#: src/protocols/yahoo/yahoo_profile.c:664
+msgid "Idle"
+msgstr ""
+
+#: src/gtkprefs.c:1825
+msgid "Idle _time reporting:"
+msgstr ""
+
+#: src/gtkprefs.c:1828
+msgid "Gaim usage"
+msgstr ""
+
+#: src/gtkprefs.c:1831
+msgid "X usage"
+msgstr ""
+
+#: src/gtkprefs.c:1833
+msgid "Windows usage"
+msgstr ""
+
+#: src/gtkprefs.c:1841
+msgid "Auto-away"
+msgstr ""
+
+#: src/gtkprefs.c:1842
+msgid "Set away _when idle"
+msgstr ""
+
+#: src/gtkprefs.c:1846
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/gtkprefs.c:1798
+#: src/gtkprefs.c:1854
 msgid "Away m_essage:"
 msgstr ""
 
-#: src/gtkprefs.c:1856
+#: src/gtkprefs.c:1923
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4194,7 +4282,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1861
+#: src/gtkprefs.c:1928
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4204,43 +4292,63 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:1996
+#: src/gtkprefs.c:2161
 msgid "Load"
 msgstr ""
 
-#: src/gtkprefs.c:2010
+#: src/gtkprefs.c:2175
 msgid "Summary"
 msgstr ""
 
-#: src/gtkprefs.c:2058
+#: src/gtkprefs.c:2223
 msgid "Details"
 msgstr ""
 
-#: src/gtkprefs.c:2101
+#: src/gtkprefs.c:2384
+msgid "_Edit"
+msgstr ""
+
+#: src/gtkprefs.c:2420
+msgid "Interface"
+msgstr ""
+
+#: src/gtkprefs.c:2423
+msgid "Message Text"
+msgstr ""
+
+#: src/gtkprefs.c:2424
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gtkprefs.c:2425
 msgid "Smiley Themes"
 msgstr ""
 
-#: src/gtkprefs.c:2102
+#: src/gtkprefs.c:2426
 msgid "Sounds"
 msgstr ""
 
-#: src/gtkprefs.c:2103 src/protocols/silc/silc.c:1598
+#: src/gtkprefs.c:2427 src/protocols/silc/silc.c:1588
 msgid "Network"
 msgstr ""
 
-#: src/gtkprefs.c:2108
+#: src/gtkprefs.c:2432
 msgid "Browser"
 msgstr ""
 
-#: src/gtkprefs.c:2111
+#: src/gtkprefs.c:2435
 msgid "Logging"
 msgstr ""
 
-#: src/gtkprefs.c:2112
+#: src/gtkprefs.c:2436
 msgid "Away / Idle"
 msgstr ""
 
-#: src/gtkprefs.c:2115
+#: src/gtkprefs.c:2437
+msgid "Away Messages"
+msgstr ""
+
+#: src/gtkprefs.c:2440
 msgid "Plugins"
 msgstr ""
 
@@ -4264,67 +4372,63 @@
 msgid "Block only the users below"
 msgstr ""
 
-#: src/gtkprivacy.c:398
+#: src/gtkprivacy.c:397 src/protocols/jabber/jabber.c:1504
 msgid "Privacy"
 msgstr ""
 
-#: src/gtkprivacy.c:411
+#: src/gtkprivacy.c:410
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: src/gtkprivacy.c:422
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: src/gtkprivacy.c:591 src/gtkprivacy.c:607
 msgid "Permit User"
 msgstr ""
 
-#: src/gtkprivacy.c:590
+#: src/gtkprivacy.c:592
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:593
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:596 src/gtkprivacy.c:609
 msgid "Permit"
 msgstr ""
 
-#: src/gtkprivacy.c:599
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr ""
-
 #: src/gtkprivacy.c:601
 #, c-format
+msgid "Allow %s to contact you?"
+msgstr ""
+
+#: src/gtkprivacy.c:603
+#, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: src/gtkprivacy.c:630 src/gtkprivacy.c:643
 msgid "Block User"
 msgstr "Блокирај го корисникот"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:631
 msgid "Type a user to block."
 msgstr ""
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:632
 msgid "Please enter the name of the user you wish to block."
 msgstr ""
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643
-msgid "Block"
-msgstr "Блокирај"
-
-#: src/gtkprivacy.c:637
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Block %s?"
 msgstr "Блокирај го/ја %s?"
 
-#: src/gtkprivacy.c:639
+#: src/gtkprivacy.c:641
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
@@ -4332,45 +4436,45 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1903
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1892
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1257
+#: src/request.h:1236
 msgid "Yes"
 msgstr ""
 
-#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1904
+#: src/gtkrequest.c:242 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1893
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1257
+#: src/request.h:1236
 msgid "No"
 msgstr ""
 
-#: src/gtkrequest.c:262
+#: src/gtkrequest.c:245
 msgid "Apply"
 msgstr ""
 
-#: src/gtkrequest.c:263 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:246 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr ""
 
-#: src/gtkrequest.c:1764
+#: src/gtkrequest.c:1421
 msgid "That file already exists"
 msgstr "Датотеката веќе постои"
 
-#: src/gtkrequest.c:1765
+#: src/gtkrequest.c:1422
 msgid "Would you like to overwrite it?"
 msgstr "Сакаш да ја пребришеш?"
 
-#: src/gtkrequest.c:1807 src/gtkrequest.c:1848
+#: src/gtkrequest.c:1460 src/gtkrequest.c:1481
 #, fuzzy
 msgid "Save File..."
 msgstr "Зачувај како..."
 
-#: src/gtkrequest.c:1808 src/gtkrequest.c:1849
+#: src/gtkrequest.c:1461 src/gtkrequest.c:1482
 #, fuzzy
 msgid "Open File..."
 msgstr "Отвори..."
@@ -4384,284 +4488,73 @@
 msgid "_Get List"
 msgstr ""
 
-#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:799 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr ""
-
-#: src/gtksavedstatuses.c:325
-msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:316
-#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
-#: src/protocols/gg/gg.c:334 src/protocols/gg/gg.c:340
-#: src/protocols/gg/gg.c:346 src/protocols/gg/gg.c:352
-#: src/protocols/irc/irc.c:181 src/protocols/jabber/jabber.c:977
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
-#: src/protocols/jabber/jabber.c:995 src/protocols/jabber/jabber.c:1001
-#: src/protocols/jabber/jabber.c:1007 src/protocols/jabber/jabber.c:1013
-#: src/protocols/novell/novell.c:2833 src/protocols/oscar/oscar.c:7057
-#: src/protocols/oscar/oscar.c:7064 src/protocols/yahoo/yahoo.c:3181
-#: src/protocols/yahoo/yahoo.c:3215 src/protocols/zephyr/zephyr.c:2260
-#, fuzzy
-msgid "Message"
-msgstr "_Порака:"
-
-#: src/gtksavedstatuses.c:399
-#, fuzzy
-msgid "Saved Statuses"
-msgstr "Статус:"
-
-#: src/gtksavedstatuses.c:520
-msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:611
-msgid "Custom status"
-msgstr ""
-
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:620
-#: src/protocols/jabber/buddy.c:627 src/protocols/jabber/buddy.c:638
-#: src/protocols/jabber/jabber.c:956 src/protocols/msn/msn.c:501
-#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2836
-#: src/protocols/oscar/oscar.c:754 src/protocols/oscar/oscar.c:760
-#: src/protocols/oscar/oscar.c:762 src/protocols/yahoo/yahoo.c:2756
-msgid "Status"
-msgstr ""
-
-#: src/gtksavedstatuses.c:733
-msgid "_Title:"
-msgstr ""
-
-#: src/gtksavedstatuses.c:744
-msgid "Out of the office"
-msgstr ""
-
-#: src/gtksavedstatuses.c:755
-#, fuzzy
-msgid "_Status:"
-msgstr "Статус:"
-
-#. Custom status message disclosure
-#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
-msgid "Use a different status for some accounts"
-msgstr ""
-
-#: src/gtksound.c:60
+#: src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr ""
 
-#: src/gtksound.c:61
-msgid "Buddy logs out"
-msgstr ""
-
-#: src/gtksound.c:62
-msgid "Message received"
-msgstr ""
-
-#: src/gtksound.c:63
-msgid "Message received begins conversation"
-msgstr ""
-
 #: src/gtksound.c:64
-msgid "Message sent"
+msgid "Buddy logs out"
 msgstr ""
 
 #: src/gtksound.c:65
-msgid "Person enters chat"
+msgid "Message received"
 msgstr ""
 
 #: src/gtksound.c:66
-msgid "Person leaves chat"
+msgid "Message received begins conversation"
 msgstr ""
 
 #: src/gtksound.c:67
-msgid "You talk in chat"
+msgid "Message sent"
 msgstr ""
 
 #: src/gtksound.c:68
-msgid "Others talk in chat"
+msgid "Person enters chat"
+msgstr ""
+
+#: src/gtksound.c:69
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/gtksound.c:70
+msgid "You talk in chat"
 msgstr ""
 
 #: src/gtksound.c:71
+msgid "Others talk in chat"
+msgstr ""
+
+#: src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr ""
 
-#: src/gtksound.c:257
+#: src/gtksound.c:173
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 
-#: src/gtksound.c:273
+#: src/gtksound.c:189
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 
-#: src/gtksound.c:285
+#: src/gtksound.c:201
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr ""
 
-#: src/gtkstatusbox.c:132
-msgid "Typing"
-msgstr ""
-
-#. connect to the server
-#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:262
-#: src/protocols/jabber/jabber.c:807 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2165
-#: src/protocols/oscar/oscar.c:1819 src/protocols/trepia/trepia.c:1069
-#: src/protocols/yahoo/yahoo.c:2426 src/protocols/zephyr/zephyr.c:1546
-msgid "Connecting"
-msgstr "Поврзување"
-
-#. hacks
-#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:176
-#: src/protocols/jabber/jabber.c:988 src/protocols/msn/msn.c:534
-#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
-#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
-#: src/protocols/novell/novell.c:2810 src/protocols/novell/novell.c:2948
-#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:801
-#: src/protocols/oscar/oscar.c:7056 src/protocols/silc/silc.c:50
-#: src/protocols/yahoo/yahoo.c:3175 src/status.c:156
-msgid "Available"
-msgstr ""
-
-#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:54
-#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7070
-#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:3219
-msgid "Invisible"
-msgstr ""
-
-#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:306
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1083
-#: src/protocols/jabber/jabber.c:977 src/protocols/msn/msn.c:526
-#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2941 src/protocols/oscar/oscar.c:762
-#: src/protocols/oscar/oscar.c:6892 src/protocols/oscar/oscar.c:7046
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2606
-#: src/protocols/yahoo/yahoo.c:3169 src/status.c:154
-msgid "Offline"
-msgstr ""
-
-#. TODO: Add saved statuses here?
-#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
-#, fuzzy
-msgid "New Status"
-msgstr "Статус:"
-
-#: src/gtkstock.c:101
-msgid "_Alias"
-msgstr "_Алиас"
-
-#: src/gtkstock.c:103
-#, fuzzy
-msgid "_Invite"
-msgstr "Покани"
-
-#: src/gtkstock.c:104
-msgid "_Modify"
-msgstr "_Измени"
-
-#: src/gtkstock.c:105
-msgid "_Open Mail"
-msgstr "_Отвори пошта"
-
-#: src/gtkstock.c:107
-msgid "_Warn"
-msgstr "_Предупреди"
-
-#: src/gtkutils.c:1386 src/gtkutils.c:1411
-#, fuzzy, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "Непозната грешка при најавување: %s."
-
-#: src/gtkutils.c:1388 src/gtkutils.c:1413
-msgid "Failed to load image"
-msgstr ""
-
-#: src/gtkutils.c:1488
-#, fuzzy, c-format
-msgid "Cannot send folder %s."
-msgstr "Не може да се прати датотека од 0 бајти."
-
-#: src/gtkutils.c:1490
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: src/gtkutils.c:1518 src/gtkutils.c:1527 src/gtkutils.c:1532
-msgid "You have dragged an image"
-msgstr ""
-
-#: src/gtkutils.c:1519
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1523 src/gtkutils.c:1538
-#, fuzzy
-msgid "Set as buddy icon"
-msgstr "Икона на пријател:"
-
-#: src/gtkutils.c:1524 src/gtkutils.c:1539
-#, fuzzy
-msgid "Send image file"
-msgstr "Испрати порака"
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1539
-#, fuzzy
-msgid "Insert in message"
-msgstr "Внеси слика"
-
-#: src/gtkutils.c:1528
-#, fuzzy
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Сакаш да ја пребришеш?"
-
-#: src/gtkutils.c:1533
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1535
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1589
-#, fuzzy
-msgid "Cannot send launcher"
-msgstr "Не може да се прати датотека од 0 бајти."
-
-#: src/gtkutils.c:1589
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: src/log.c:105
+#: src/log.c:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: src/log.c:746
+#: src/log.c:545
 msgid "XML"
 msgstr ""
 
-#: src/log.c:811
+#: src/log.c:608
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4670,7 +4563,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;АВТОМАТСКИ "
 "ОДОГОВОР&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:813
+#: src/log.c:610
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4679,48 +4572,144 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:864 src/log.c:995
+#: src/log.c:661 src/log.c:791
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: src/log.c:874 src/log.c:1007
+#: src/log.c:671 src/log.c:803
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: src/log.c:878
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:940
+#: src/log.c:736
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: src/log.c:1011
+#: src/log.c:807
 msgid "Plain text"
 msgstr "Обичен текст"
 
-#: src/plugin.c:324
+#: src/main.c:150
+msgid "Please create an account."
+msgstr ""
+
+#: src/main.c:232
+msgid "Login"
+msgstr "Најава"
+
+#: src/main.c:248
+#, fuzzy
+msgid "<b>_Account:</b>"
+msgstr ""
+"\n"
+"<b>Акаунт:</b>"
+
+#: src/main.c:262
+#, fuzzy
+msgid "<b>_Password:</b>"
+msgstr "<b>Лозинка:</b>"
+
+#. And now for the buttons
+#: src/main.c:279
+#, fuzzy
+msgid "A_ccounts"
+msgstr "Акаунти"
+
+#: src/main.c:285
+#, fuzzy
+msgid "P_references"
+msgstr "Параметри"
+
+#: src/main.c:291
+msgid "_Sign on"
+msgstr ""
+
+#. full help text
+#: src/main.c:513
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+
+#. short message
+#: src/main.c:528
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#: src/main.c:895
+msgid "Unable to load preferences"
+msgstr ""
+
+#: src/main.c:895
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+
+#: src/plugin.c:295
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:329 src/plugin.c:357
+#: src/plugin.c:300 src/plugin.c:328
 msgid "Gaim was unable to load your plugin."
 msgstr ""
 
-#: src/plugin.c:353
+#: src/plugin.c:324
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: src/prefs.c:1094
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr ""
 
+#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:513 src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2797
+#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
+#: src/protocols/oscar/oscar.c:770 src/protocols/yahoo/yahoo.c:3042
+#: src/protocols/yahoo/yahoo.c:3158
+msgid "Available"
+msgstr ""
+
 #: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr ""
@@ -4729,314 +4718,301 @@
 msgid "Away for friends only"
 msgstr ""
 
+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:1002
+#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:688
+#: src/protocols/oscar/oscar.c:5701 src/protocols/oscar/oscar.c:5779
+#: src/protocols/oscar/oscar.c:5803 src/protocols/oscar/oscar.c:6990
+#: src/protocols/oscar/oscar.c:6995 src/protocols/yahoo/yahoo.c:2695
+#: src/protocols/yahoo/yahoo.c:3062 src/protocols/yahoo/yahoo.c:3170
+msgid "Invisible"
+msgstr ""
+
 #: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:56 src/status.c:157
+#: src/protocols/gg/gg.c:56
 msgid "Unavailable"
 msgstr ""
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:137
 msgid "Unable to resolve hostname."
 msgstr ""
 
-#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1711
 msgid "Unable to connect to server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
-#: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
-#: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
-#: src/protocols/jabber/jabber.c:109
+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134
+#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
+#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
+#: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:160
+#: src/protocols/gg/gg.c:146
 msgid "Error while reading from socket."
 msgstr ""
 
-#: src/protocols/gg/gg.c:163
+#: src/protocols/gg/gg.c:149
 msgid "Error while writing to socket."
 msgstr ""
 
-#: src/protocols/gg/gg.c:166
+#: src/protocols/gg/gg.c:152
 msgid "Authentication failed."
 msgstr ""
 
-#: src/protocols/gg/gg.c:169
+#: src/protocols/gg/gg.c:155
 msgid "Unknown Error Code."
 msgstr ""
 
-#: src/protocols/gg/gg.c:271 src/protocols/oscar/oscar.c:4234
+#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr ""
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:272 src/protocols/gg/gg.c:1134
-#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4238
-#: src/protocols/oscar/oscar.c:4464 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:470
-#: src/protocols/zephyr/zephyr.c:730 src/protocols/zephyr/zephyr.c:1145
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
+#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1013
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4375 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1130
 msgid "Buddy Information"
 msgstr ""
 
-#. TODO: Do we need both an "online" and an "available" state?
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:310 src/protocols/irc/irc.c:172
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:982
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:579
-#: src/protocols/novell/novell.c:2945 src/protocols/oscar/oscar.c:704
-#: src/protocols/oscar/oscar.c:7051 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:3172
-#: src/protocols/zephyr/zephyr.c:2252 src/status.c:155
-msgid "Online"
-msgstr "Поврзано"
-
-#: src/protocols/gg/gg.c:365
+#: src/protocols/gg/gg.c:294
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: src/protocols/gg/gg.c:519
+#: src/protocols/gg/gg.c:447
 msgid "Could not connect"
 msgstr ""
 
-#: src/protocols/gg/gg.c:526
+#: src/protocols/gg/gg.c:454
 msgid "Unable to read socket"
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:818 src/protocols/napster/napster.c:502
-#: src/protocols/napster/napster.c:533 src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
+#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2335
+#: src/protocols/yahoo/yahoo.c:2364 src/protocols/yahoo/yahoo.c:2427
+#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr ""
 
-#: src/protocols/gg/gg.c:834
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr ""
 
-#: src/protocols/gg/gg.c:837
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr ""
 
-#: src/protocols/gg/gg.c:843
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr ""
 
-#: src/protocols/gg/gg.c:853
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr ""
 
-#: src/protocols/gg/gg.c:871 src/protocols/gg/gg.c:964
-#: src/protocols/toc/toc.c:148
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:921
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:933
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Испрати како порака"
 
-#: src/protocols/gg/gg.c:938
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:941
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: src/protocols/gg/gg.c:987
+#: src/protocols/gg/gg.c:841
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1040
+#: src/protocols/gg/gg.c:919
 msgid "Couldn't get search results"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:924
 msgid "Gadu-Gadu Search Engine"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:950
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1076 src/protocols/oscar/oscar.c:5302
+#: src/protocols/gg/gg.c:955 src/protocols/oscar/oscar.c:5190
 msgid "UIN"
 msgstr ""
 
 #. First Name
-#: src/protocols/gg/gg.c:1080 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:5313 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:959 src/protocols/jabber/jabber.c:624
+#: src/protocols/oscar/oscar.c:5201 src/protocols/silc/ops.c:808
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr ""
 
 #. Last Name
-#: src/protocols/gg/gg.c:1085 src/protocols/jabber/jabber.c:633
-#: src/protocols/oscar/oscar.c:5314 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:964 src/protocols/jabber/jabber.c:629
+#: src/protocols/oscar/oscar.c:5202 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1089 src/protocols/gg/gg.c:1833
-#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5303
-#: src/protocols/silc/ops.c:1202
+#: src/protocols/gg/gg.c:968 src/protocols/gg/gg.c:1712
+#: src/protocols/irc/msgs.c:219 src/protocols/oscar/oscar.c:5191
+#: src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1096 src/protocols/gg/gg.c:1099
+#: src/protocols/gg/gg.c:975 src/protocols/gg/gg.c:978
 msgid "Birth Year"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1105 src/protocols/gg/gg.c:1107
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:988
 msgid "Sex"
 msgstr ""
 
 #. City
-#: src/protocols/gg/gg.c:1113 src/protocols/jabber/jabber.c:643
-#: src/protocols/oscar/oscar.c:5357 src/protocols/oscar/oscar.c:5365
+#: src/protocols/gg/gg.c:992 src/protocols/jabber/jabber.c:639
+#: src/protocols/oscar/oscar.c:5245 src/protocols/oscar/oscar.c:5253
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1156
+#: src/protocols/gg/gg.c:1035
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1164
+#: src/protocols/gg/gg.c:1043
 msgid "Couldn't Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1226
+#: src/protocols/gg/gg.c:1105
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1234
+#: src/protocols/gg/gg.c:1113
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1242
+#: src/protocols/gg/gg.c:1121
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1250
+#: src/protocols/gg/gg.c:1129
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1259
+#: src/protocols/gg/gg.c:1138
 msgid "Password changed successfully"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1266
+#: src/protocols/gg/gg.c:1145
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1385
+#: src/protocols/gg/gg.c:1264
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1386
+#: src/protocols/gg/gg.c:1265
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1415
+#: src/protocols/gg/gg.c:1294
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1416
+#: src/protocols/gg/gg.c:1295
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1489
+#: src/protocols/gg/gg.c:1368
 msgid "Couldn't export buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1490 src/protocols/gg/gg.c:1513
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1392
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1512
+#: src/protocols/gg/gg.c:1391
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1563
+#: src/protocols/gg/gg.c:1442
 msgid "Unable to access directory"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1564
+#: src/protocols/gg/gg.c:1443
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1598
+#: src/protocols/gg/gg.c:1477
 msgid "Unable to change Gadu-Gadu password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1599
+#: src/protocols/gg/gg.c:1478
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1615
+#: src/protocols/gg/gg.c:1494
 msgid "Directory Search"
 msgstr ""
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1620 src/protocols/jabber/jabber.c:1117
-#: src/protocols/toc/toc.c:1694
+#: src/protocols/gg/gg.c:1499 src/protocols/jabber/jabber.c:1100
+#: src/protocols/toc/toc.c:1564
 msgid "Change Password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1624
+#: src/protocols/gg/gg.c:1503
 msgid "Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1628
+#: src/protocols/gg/gg.c:1507
 msgid "Export Buddy List to Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1632
+#: src/protocols/gg/gg.c:1511
 msgid "Delete Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1665
+#: src/protocols/gg/gg.c:1544
 msgid "Unable to access user profile."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1666
+#: src/protocols/gg/gg.c:1545
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5052,117 +5028,147 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1812 src/protocols/gg/gg.c:1814
+#: src/protocols/gg/gg.c:1691 src/protocols/gg/gg.c:1693
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1322
+#: src/protocols/icq/gaim_icq.c:223
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:293
+#, c-format
+msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:300
+#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3886
+#: src/protocols/oscar/oscar.c:6438
+msgid "Authorize"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:301
+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3888
+#: src/protocols/oscar/oscar.c:6439
+msgid "Deny"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:309
+msgid "Send message through server"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:351
+msgid "Connecting..."
+msgstr "Поврзување..."
+
+#: src/protocols/icq/gaim_icq.c:497
+msgid "Nick:"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:498
+msgid "Gaim User"
+msgstr ""
+
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1311
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1030
+#: src/protocols/irc/cmds.c:464 src/protocols/jabber/chat.c:576
+#: src/protocols/silc/silc.c:1019
 #, c-format
 msgid "current topic is: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1034
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:580
+#: src/protocols/silc/silc.c:1023
 msgid "No topic is set"
 msgstr ""
 
 #: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
 #: src/protocols/yahoo/yahoo_filexfer.c:185
 #: src/protocols/yahoo/yahoo_filexfer.c:194
-#, fuzzy
-msgid "File Transfer Failed"
-msgstr "Пренос на датотеки"
+msgid "File Transfer Aborted"
+msgstr ""
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr ""
 
+#: src/protocols/irc/irc.c:75
+msgid "Error displaying MOTD"
+msgstr ""
+
+#: src/protocols/irc/irc.c:75
+msgid "No MOTD available"
+msgstr ""
+
+#: src/protocols/irc/irc.c:76
+msgid "There is no MOTD associated with this connection."
+msgstr ""
+
 #: src/protocols/irc/irc.c:79
-msgid "Error displaying MOTD"
-msgstr ""
-
-#: src/protocols/irc/irc.c:79
-msgid "No MOTD available"
-msgstr ""
-
-#: src/protocols/irc/irc.c:80
-msgid "There is no MOTD associated with this connection."
-msgstr ""
-
-#: src/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD за %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:530
-#: src/protocols/irc/irc.c:552
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:405
 msgid "Server has disconnected"
 msgstr ""
 
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "Види MOTD"
 
-#: src/protocols/irc/irc.c:204 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Канал:"
 
-#: src/protocols/irc/irc.c:210 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: src/protocols/irc/irc.c:242
+#: src/protocols/irc/irc.c:217
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:410
-#: src/protocols/jabber/jabber.c:745
-msgid "SSL support unavailable"
-msgstr ""
-
-#: src/protocols/irc/irc.c:281
+#. connect to the server
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:798
+#: src/protocols/msn/session.c:364 src/protocols/napster/napster.c:510
+#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1759
+#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2558
+#: src/protocols/zephyr/zephyr.c:1452
+msgid "Connecting"
+msgstr "Поврзување"
+
+#: src/protocols/irc/irc.c:244
 msgid "Couldn't create socket"
 msgstr ""
 
-#: src/protocols/irc/irc.c:352 src/protocols/jabber/jabber.c:305
-#: src/protocols/oscar/oscar.c:1739 src/protocols/oscar/oscar.c:1815
+#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:304
+#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1755
 msgid "Couldn't connect to host"
 msgstr "Не може да се врзе со серверот"
 
-#: src/protocols/irc/irc.c:377 src/protocols/jabber/jabber.c:332
-msgid "Connection Failed"
-msgstr ""
-
-#: src/protocols/irc/irc.c:380 src/protocols/jabber/jabber.c:335
-msgid "SSL Handshake Failed"
-msgstr ""
-
-#: src/protocols/irc/irc.c:527 src/protocols/irc/irc.c:549
-#: src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:402 src/protocols/trepia/trepia.c:927
 msgid "Read error"
 msgstr ""
 
-#: src/protocols/irc/irc.c:698 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1400
+#: src/protocols/irc/irc.c:557 src/protocols/silc/chat.c:1373
+#: src/protocols/yahoo/yahoochat.c:1444
 msgid "Users"
 msgstr "Корисници"
 
-#: src/protocols/irc/irc.c:701 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1409
+#: src/protocols/irc/irc.c:560 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1453
 msgid "Topic"
 msgstr "Наслов"
 
-#: src/protocols/irc/irc.c:738
+#: src/protocols/irc/irc.c:597
 msgid "IRC"
 msgstr ""
 
-#: src/protocols/irc/irc.c:742
+#: src/protocols/irc/irc.c:601
 #, fuzzy
 msgid "Quit message"
 msgstr "Испрати порака"
@@ -5175,1103 +5181,1129 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:828
+#: src/protocols/irc/irc.c:688
 msgid "IRC Protocol Plugin"
 msgstr "Додаток за IRC протокол"
 
 #. *  summary
-#: src/protocols/irc/irc.c:829
+#: src/protocols/irc/irc.c:689
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Додатокот за IRC протокол што не е за никаде"
 
-#: src/protocols/irc/irc.c:848 src/protocols/irc/msgs.c:234
-#: src/protocols/jabber/jabber.c:1612 src/protocols/napster/napster.c:708
-#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
+#: src/protocols/irc/irc.c:708 src/protocols/irc/msgs.c:239
+#: src/protocols/jabber/jabber.c:1617 src/protocols/napster/napster.c:672
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "Сервер"
 
-#: src/protocols/irc/irc.c:851 src/protocols/jabber/jabber.c:1636
-#: src/protocols/msn/msn.c:1925 src/protocols/napster/napster.c:713
-#: src/protocols/silc/silc.c:1606 src/protocols/trepia/trepia.c:1304
+#: src/protocols/irc/irc.c:711 src/protocols/jabber/jabber.c:1638
+#: src/protocols/msn/msn.c:1934 src/protocols/napster/napster.c:677
+#: src/protocols/silc/silc.c:1596 src/protocols/trepia/trepia.c:1301
 msgid "Port"
 msgstr "Порта"
 
-#: src/protocols/irc/irc.c:854
+#: src/protocols/irc/irc.c:714
 #, fuzzy
 msgid "Encodings"
 msgstr "Кодирање"
 
-#: src/protocols/irc/irc.c:857 src/protocols/irc/msgs.c:228
-#: src/protocols/jabber/jabber.c:603 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
+#: src/protocols/irc/irc.c:717 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:599 src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "Корисничко име"
 
-#: src/protocols/irc/irc.c:860
+#: src/protocols/irc/irc.c:720
 #, fuzzy
 msgid "Real name"
 msgstr "Датотека"
 
-#: src/protocols/irc/irc.c:863
-msgid "Use SSL"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:105
+#: src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Лош режим"
 
-#: src/protocols/irc/msgs.c:116
+#: src/protocols/irc/msgs.c:120
 #, c-format
 msgid "You are banned from %s."
 msgstr "Баниран си од %s."
 
-#: src/protocols/irc/msgs.c:117
+#: src/protocols/irc/msgs.c:121
 msgid "Banned"
 msgstr "Баниран"
 
-#: src/protocols/irc/msgs.c:134
+#: src/protocols/irc/msgs.c:139
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:234
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:239
+#: src/protocols/irc/msgs.c:252
 #, fuzzy, c-format
 msgid "<b>%s:</b> %s"
 msgstr ""
 "\n"
 "<b>Алиас:</b>"
 
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:222
 msgid " <i>(ircop)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:218
+#: src/protocols/irc/msgs.c:223
 msgid " <i>(identified)</i>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:222 src/protocols/irc/msgs.c:228
-#: src/protocols/irc/msgs.c:229 src/protocols/irc/msgs.c:240
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/irc/msgs.c:227 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:234 src/protocols/irc/msgs.c:245
+#: src/protocols/msn/msn.c:1327 src/protocols/yahoo/yahoo_profile.c:664
 #, fuzzy, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>Статус:</b> Исклучен"
 
-#: src/protocols/irc/msgs.c:229 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1014
+#: src/protocols/irc/msgs.c:234 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Realname"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:240 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:245 src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:245
-#, c-format
-msgid "<b>Idle for:</b> %s<br>"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:247
-msgid "Online since"
-msgstr ""
-
 #: src/protocols/irc/msgs.c:250
+#, c-format
+msgid "<b>Idle for:</b> %s<br>"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:252
+msgid "Online since"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:255
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:257
+#: src/protocols/irc/msgs.c:262
 #, c-format
 msgid "Buddy Information for %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:320
-#, c-format
-msgid "%s has changed the topic to: %s"
-msgstr ""
-
 #: src/protocols/irc/msgs.c:325
 #, c-format
+msgid "%s has changed the topic to: %s"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:330
+#, c-format
 msgid "The topic for %s is: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:342
+#: src/protocols/irc/msgs.c:348
 #, c-format
 msgid "Unknown message '%s'"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:343
+#: src/protocols/irc/msgs.c:349
 msgid "Unknown message"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:343
+#: src/protocols/irc/msgs.c:349
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:366
+#: src/protocols/irc/msgs.c:373
 #, c-format
 msgid "Users on %s: %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:463
+#: src/protocols/irc/msgs.c:473
 #, fuzzy
 msgid "Time Response"
 msgstr "Време"
 
-#: src/protocols/irc/msgs.c:464
+#: src/protocols/irc/msgs.c:474
 msgid "The IRC server's local time is:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:475
+#: src/protocols/irc/msgs.c:488
 msgid "No such channel"
 msgstr ""
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:486
+#: src/protocols/irc/msgs.c:501
 msgid "no such channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:489
+#: src/protocols/irc/msgs.c:504
 msgid "User is not logged in"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:510
 msgid "No such nick or channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:514
+#: src/protocols/irc/msgs.c:531
 msgid "Could not send"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:587
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:571
+#: src/protocols/irc/msgs.c:588
 msgid "Invitation only"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:673
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:678
+#: src/protocols/irc/msgs.c:697
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:702
+#: src/protocols/irc/msgs.c:721
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:786
+#: src/protocols/irc/msgs.c:808
+#, c-format
+msgid "Invalid nickname '%s'"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:809
+msgid "Invalid nickname"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:811 src/protocols/irc/msgs.c:816
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 
-#: src/protocols/irc/msgs.c:825
+#: src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:825
+#: src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:846
+#: src/protocols/irc/msgs.c:880
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:888
+#: src/protocols/irc/msgs.c:922
 msgid "Error: invalid PONG from server"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:890
+#: src/protocols/irc/msgs.c:924
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:965
+#: src/protocols/irc/msgs.c:999
 #, c-format
 msgid "Cannot join %s:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:966 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:1001 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:1000
-#, fuzzy
-msgid "Nick or channel is temporarily unavailable."
-msgstr "Корисник е привремено недостапен"
-
-#: src/protocols/irc/msgs.c:1012
+#: src/protocols/irc/msgs.c:1038
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
+#: src/protocols/irc/parse.c:113
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
 #: src/protocols/irc/parse.c:114
-msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr ""
-
-#: src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:115
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:116
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:117
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:118
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
+#: src/protocols/irc/parse.c:119
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
 #: src/protocols/irc/parse.c:120
 msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
+"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:121
 msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
+"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:122
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
+msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr ""
 
 #: src/protocols/irc/parse.c:123
-msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr ""
-
-#: src/protocols/irc/parse.c:124
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:124
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:125
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1465
+#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1448
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
+#: src/protocols/irc/parse.c:127
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
 #: src/protocols/irc/parse.c:128
 msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-
-#: src/protocols/irc/parse.c:129
-msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:131
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
+#: src/protocols/irc/parse.c:132
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+
 #: src/protocols/irc/parse.c:133
-msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgid "quote [...]:  Send a raw command to the server."
 msgstr ""
 
 #: src/protocols/irc/parse.c:134
-msgid "quote [...]:  Send a raw command to the server."
+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:135
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
+msgid "time: Displays the current local time at the IRC server."
 msgstr ""
 
 #: src/protocols/irc/parse.c:136
-msgid "time: Displays the current local time at the IRC server."
+msgid "topic [new topic]:  View or change the channel topic."
 msgstr ""
 
 #: src/protocols/irc/parse.c:137
-msgid "topic [new topic]:  View or change the channel topic."
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 
 #: src/protocols/irc/parse.c:138
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+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:139
 msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
 msgstr ""
 
 #: src/protocols/irc/parse.c:140
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-
-#: src/protocols/irc/parse.c:141
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 
+#: src/protocols/irc/parse.c:421
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr ""
+
+#: src/protocols/irc/parse.c:422
+msgid "PONG"
+msgstr ""
+
 #: src/protocols/irc/parse.c:422
-#, c-format
-msgid "Reply time from %s: %lu seconds"
-msgstr ""
-
-#: src/protocols/irc/parse.c:423
-msgid "PONG"
-msgstr ""
-
-#: src/protocols/irc/parse.c:423
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1648 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
+#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:188
+#: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
+#: src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr ""
 
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:52
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:53
+#: src/protocols/jabber/auth.c:54
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 
-#: src/protocols/jabber/auth.c:114
+#: src/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
 msgid "Plaintext Authentication"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:396
+#: src/protocols/jabber/auth.c:390
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:661
-#: src/protocols/silc/ops.c:806
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:613
+#: src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:674
-#: src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:626
+#: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:678
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:630
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/jabber.c:623 src/protocols/msn/msn.c:1348
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1009
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:619 src/protocols/msn/msn.c:1317
+#: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
+#: src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:659
 msgid "URL"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:720
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:668
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:724
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:676
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:680
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/jabber.c:649
 msgid "Postal Code"
 msgstr ""
 
 #. Country
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:689
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:748
-#: src/protocols/jabber/buddy.c:755
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:707
 msgid "Telephone"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:766
-#: src/protocols/jabber/buddy.c:774 src/protocols/silc/silc.c:670
-#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1004
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:726 src/protocols/silc/silc.c:656
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:789
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:741
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:793
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:745
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:802
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:751
+#: src/protocols/novell/novell.c:1451
+msgid "Title"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:754
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
-#: src/protocols/oscar/oscar.c:5338
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:647
+#: src/protocols/oscar/oscar.c:5226
 msgid "Birthday"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:564
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:565
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:610
+#: src/protocols/jabber/buddy.c:556
 msgid "Jabber ID"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1615
-msgid "Resource"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:682 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:566 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:586 src/protocols/jabber/jabber.c:971
+#: src/protocols/msn/msn.c:489 src/protocols/novell/novell.c:2819
+#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:738
+#: src/protocols/yahoo/yahoo.c:2820
+msgid "Status"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:634 src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:638
-#: src/protocols/oscar/oscar.c:5356 src/protocols/oscar/oscar.c:5364
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:652 src/protocols/jabber/jabber.c:634
+#: src/protocols/oscar/oscar.c:5244 src/protocols/oscar/oscar.c:5252
+#: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:712
+#: src/protocols/jabber/buddy.c:664
 msgid "P.O. Box"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:824
+#: src/protocols/jabber/buddy.c:770
 msgid "Photo"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:824
+#: src/protocols/jabber/buddy.c:770
 msgid "Logo"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:849
+#: src/protocols/jabber/buddy.c:786
 msgid "Jabber Profile"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1031
+#: src/protocols/jabber/buddy.c:941
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1034
+#: src/protocols/jabber/buddy.c:944
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1041
+#: src/protocols/jabber/buddy.c:951
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1047
+#: src/protocols/jabber/buddy.c:957
 msgid "(Re-)Request authorization"
 msgstr ""
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1055
+#: src/protocols/jabber/buddy.c:965
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1081 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:964
-#: src/protocols/silc/ops.c:1239
-msgid "Error"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:994
-msgid "Chatty"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1006
-#: src/status.c:160
-msgid "Extended Away"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1012
-#: src/protocols/oscar/oscar.c:692 src/protocols/oscar/oscar.c:7090
-msgid "Do Not Disturb"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6619
-#: src/protocols/yahoo/yahoochat.c:995
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6509
+#: src/protocols/yahoo/yahoochat.c:1040
 msgid "_Room:"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:47
+#: src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:53
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room name"
 msgstr ""
 
+#: src/protocols/jabber/chat.c:213
+msgid "Invalid Room Name"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:218
+#, c-format
+msgid "%s is not a valid server name"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:219 src/protocols/jabber/chat.c:220
+msgid "Invalid Server Name"
+msgstr ""
+
 #: src/protocols/jabber/chat.c:224
-msgid "Invalid Room Name"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:229
-#, c-format
-msgid "%s is not a valid server name"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
-msgid "Invalid Server Name"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:225 src/protocols/jabber/chat.c:226
 msgid "Invalid Room Handle"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:395
+#: src/protocols/jabber/chat.c:379
 msgid "Configuration error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
 msgid "Unable to configure"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:420
+#: src/protocols/jabber/chat.c:404
 msgid "Room Configuration Error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:421
+#: src/protocols/jabber/chat.c:405
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
 msgid "Registration error"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:607
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1239
-#, fuzzy
-msgid "Error retrieving room list"
-msgstr "Вчитување листа на пријатели"
-
-#: src/protocols/jabber/chat.c:737
+#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662
+msgid "Roomlist Error"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663
+msgid "Error retreiving roomlist"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:711
 msgid "Invalid Server"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:775
+#: src/protocols/jabber/chat.c:749
 msgid "Enter a Conference Server"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:776
+#: src/protocols/jabber/chat.c:750
 msgid "Select a conference server to query"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:779
+#: src/protocols/jabber/chat.c:753
 msgid "Find Rooms"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:78
+#: src/protocols/jabber/jabber.c:77
 msgid "Error initializing session"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:214 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:991
-#: src/protocols/trepia/trepia.c:1036 src/protocols/trepia/trepia.c:1135
-#: src/protocols/trepia/trepia.c:1181
+#: src/protocols/jabber/jabber.c:213 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988
+#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131
+#: src/protocols/trepia/trepia.c:1177
 msgid "Write error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:252 src/protocols/jabber/jabber.c:272
+#: src/protocols/jabber/jabber.c:251 src/protocols/jabber/jabber.c:271
 msgid "Read Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:379 src/protocols/jabber/jabber.c:715
+#: src/protocols/jabber/jabber.c:331
+msgid "Connection Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:334
+msgid "SSL Handshake Failed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:378 src/protocols/jabber/jabber.c:711
 msgid "Invalid Jabber ID"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:755
-#: src/protocols/trepia/trepia.c:1075
+#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:741
+msgid "SSL support unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:751
+#: src/protocols/trepia/trepia.c:1071
 msgid "Unable to create socket"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:448
+#: src/protocols/jabber/jabber.c:444
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:451
+#: src/protocols/jabber/jabber.c:446 src/protocols/jabber/jabber.c:447
 msgid "Registration Successful"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:1219
 msgid "Unknown Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
+#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:456
 msgid "Registration Failed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:571 src/protocols/jabber/jabber.c:572
+#: src/protocols/jabber/jabber.c:567 src/protocols/jabber/jabber.c:568
 msgid "Already Registered"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:607 src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/jabber.c:603 src/protocols/jabber/jabber.c:1074
 msgid "Password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:618
+#: src/protocols/jabber/jabber.c:614
 msgid "E-Mail"
 msgstr ""
 
 #. State
-#: src/protocols/jabber/jabber.c:648 src/protocols/oscar/oscar.c:5358
-#: src/protocols/oscar/oscar.c:5366 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:644 src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:5254 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:658 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:654 src/protocols/silc/ops.c:853
+#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:668
+#: src/protocols/jabber/jabber.c:664
 msgid "Date"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:676
+#: src/protocols/jabber/jabber.c:672
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:679 src/protocols/jabber/jabber.c:680
+#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:676
 msgid "Register New Jabber Account"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:811
+#: src/protocols/jabber/jabber.c:759
+msgid "Logged out"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:802
 msgid "Initializing Stream"
 msgstr "Стартување"
 
-#: src/protocols/jabber/jabber.c:817 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:808 src/protocols/msn/session.c:370
 msgid "Authenticating"
 msgstr "Авторизирање"
 
-#: src/protocols/jabber/jabber.c:826
+#: src/protocols/jabber/jabber.c:817
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1214
-#: src/protocols/jabber/jabber.c:1255 src/protocols/jabber/jabber.c:1288
-#: src/protocols/oscar/oscar.c:760 src/protocols/oscar/oscar.c:6890
+#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1238 src/protocols/jabber/jabber.c:1271
+#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:6793
 msgid "Not Authorized"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:930
+#: src/protocols/jabber/jabber.c:938
 msgid "Both"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:932
+#: src/protocols/jabber/jabber.c:940
 msgid "From (To pending)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:934
+#: src/protocols/jabber/jabber.c:942
 msgid "From"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:945
 msgid "To"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:939
+#: src/protocols/jabber/jabber.c:947
 msgid "None (To pending)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943
+#: src/protocols/jabber/jabber.c:951
 msgid "Subscription"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/jabber/jabber.c:1006 src/protocols/jabber/jabber.c:1012
-#, fuzzy
-msgid "Priority"
-msgstr "Порта"
-
-#: src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:984
+msgid "Error"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
+msgid "Chatty"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:999 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
+msgid "Extended Away"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
+#: src/protocols/oscar/oscar.c:678 src/protocols/oscar/oscar.c:5791
+#: src/protocols/oscar/oscar.c:6986
+msgid "Do Not Disturb"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1017
 msgid "Password Changed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:1018
 msgid "Your password has been changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1022 src/protocols/jabber/jabber.c:1023
 msgid "Error changing password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1096
+#: src/protocols/jabber/jabber.c:1079
 msgid "Password (again)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1101 src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1084 src/protocols/jabber/jabber.c:1085
 msgid "Change Jabber Password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1085
 msgid "Please enter your new password"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1112 src/protocols/toc/toc.c:1684
+#: src/protocols/jabber/jabber.c:1095 src/protocols/toc/toc.c:1554
 msgid "Set User Info"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1177
 msgid "Bad Request"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1179
 msgid "Conflict"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1181
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1200
+#: src/protocols/jabber/jabber.c:1183
 msgid "Forbidden"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1185
 msgid "Gone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1204 src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1187 src/protocols/jabber/jabber.c:1261
 msgid "Internal Server Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1189
 msgid "Item Not Found"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1208
+#: src/protocols/jabber/jabber.c:1191
 msgid "Malformed Jabber ID"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1193
 msgid "Not Acceptable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1195
 msgid "Not Allowed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1199
 msgid "Payment Required"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1201
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1205
 msgid "Registration Required"
 msgstr ""
 
+#: src/protocols/jabber/jabber.c:1207
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1209
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1211
+msgid "Server Overloaded"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1213
+msgid "Service Unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1215
+msgid "Subscription Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1217
+msgid "Unexpected Request"
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:1224
-msgid "Remote Server Not Found"
+msgid "Authorization Aborted"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1226
-msgid "Remote Server Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1228
-msgid "Server Overloaded"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1230
-msgid "Service Unavailable"
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1229
+msgid "Invalid authzid"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1232
-msgid "Subscription Required"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1234
-msgid "Unexpected Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1241
-msgid "Authorization Aborted"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1243
-msgid "Incorrect encoding in authorization"
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1235
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1240
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1242
+msgid "Authentication Failure"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1246
-msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1249
-msgid "Invalid Authorization Mechanism"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1252
-msgid "Authorization mechanism too weak"
+msgid "Bad Format"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1248
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1251
+msgid "Resource Conflict"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1253 src/protocols/silc/ops.c:1519
+msgid "Connection Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1255
+msgid "Host Gone"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1257
-msgid "Temporary Authentication Failure"
+msgid "Host Unknown"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1259
-msgid "Authentication Failure"
+msgid "Improper Addressing"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1263
-msgid "Bad Format"
+msgid "Invalid ID"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1265
-msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1268
-msgid "Resource Conflict"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1270 src/protocols/silc/ops.c:1518
-msgid "Connection Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1272
-msgid "Host Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1274
-msgid "Host Unknown"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1276
-msgid "Improper Addressing"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1280
-msgid "Invalid ID"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1282
 msgid "Invalid Namespace"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1284
+#: src/protocols/jabber/jabber.c:1267
 msgid "Invalid XML"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1286
+#: src/protocols/jabber/jabber.c:1269
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1290
+#: src/protocols/jabber/jabber.c:1273
 msgid "Policy Violation"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1292
+#: src/protocols/jabber/jabber.c:1275
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1294
+#: src/protocols/jabber/jabber.c:1277
 msgid "Resource Constraint"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1296
+#: src/protocols/jabber/jabber.c:1279
 msgid "Restricted XML"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1298
+#: src/protocols/jabber/jabber.c:1281
 msgid "See Other Host"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1300
+#: src/protocols/jabber/jabber.c:1283
 msgid "System Shutdown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1302
+#: src/protocols/jabber/jabber.c:1285
 msgid "Undefined Condition"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1287
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1289
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1308
+#: src/protocols/jabber/jabber.c:1291
 msgid "Unsupported Version"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1310
+#: src/protocols/jabber/jabber.c:1293
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1312
+#: src/protocols/jabber/jabber.c:1295
 msgid "Stream Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1379
+#: src/protocols/jabber/jabber.c:1362
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1414
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1440
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1461
+#: src/protocols/jabber/jabber.c:1444
 msgid "configure:  Configure a chat room."
 msgstr ""
 
+#: src/protocols/jabber/jabber.c:1453
+msgid "part [room]:  Leave the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1458
+msgid "register:  Register with a chat room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1464
+msgid "topic [new topic]:  View or change the topic."
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:1470
-msgid "part [room]:  Leave the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1475
-msgid "register:  Register with a chat room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1481
-msgid "topic [new topic]:  View or change the topic."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1487
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
+#: src/protocols/jabber/jabber.c:1476
+msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1482
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1488
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr ""
+
 #: src/protocols/jabber/jabber.c:1493
-msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1499
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1505
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1510
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
+#: src/protocols/jabber/jabber.c:1508
+msgid "Hide Operating System"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6282,42 +6314,42 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1590 src/protocols/jabber/jabber.c:1592
+#: src/protocols/jabber/jabber.c:1595 src/protocols/jabber/jabber.c:1597
 msgid "Jabber Protocol Plugin"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1618
-msgid "Use TLS if available"
+#: src/protocols/jabber/jabber.c:1620
+msgid "Resource"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1623
-msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1626
-msgid "Force old (port 5223) SSL"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1631
+msgid "Use TLS if available"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1628
+msgid "Force old SSL"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1633
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1640 src/protocols/silc/silc.c:1602
+#: src/protocols/jabber/jabber.c:1642 src/protocols/silc/silc.c:1592
 msgid "Connect server"
 msgstr ""
 
-#: src/protocols/jabber/message.c:114
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:178
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr ""
 
-#: src/protocols/jabber/message.c:180
+#: src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr ""
@@ -6340,64 +6372,49 @@
 msgid "XML Parse error"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
-#, fuzzy, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr ""
-"\n"
-"\n"
-"Дали сакаш да го додадеш во листата на пријатели?"
-
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:6549
-#: src/protocols/yahoo/yahoo.c:861
-msgid "Authorize"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:6550
-#: src/protocols/yahoo/yahoo.c:863
-msgid "Deny"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:293
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr ""
+
+#: src/protocols/jabber/presence.c:348 src/protocols/jabber/presence.c:349
 msgid "Create New Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:347
+#: src/protocols/jabber/presence.c:350
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:349
+#: src/protocols/jabber/presence.c:352
 msgid "Configure Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:351
+#: src/protocols/jabber/presence.c:354
 msgid "Accept Defaults"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:388
+#: src/protocols/jabber/presence.c:384
 #, c-format
 msgid "Error in chat %s"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:391
+#: src/protocols/jabber/presence.c:387
 #, c-format
 msgid "Error joining chat %s"
 msgstr ""
 
-#: src/protocols/jabber/si.c:591
+#: src/protocols/jabber/si.c:594
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: src/protocols/jabber/si.c:595 src/protocols/jabber/si.c:596
 msgid "File Send Failed"
 msgstr ""
 
@@ -6464,7 +6481,7 @@
 msgid "Not on list"
 msgstr ""
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:680
 msgid "User is offline"
 msgstr ""
 
@@ -6516,7 +6533,7 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:200
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:192
 msgid "Not logged in"
 msgstr ""
 
@@ -6609,8 +6626,8 @@
 msgid "Server too busy"
 msgstr ""
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2338
-#: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2272
+#: src/protocols/silc/ops.c:1508 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr ""
 
@@ -6694,198 +6711,214 @@
 msgid "Page"
 msgstr ""
 
-#: src/protocols/msn/msn.c:501 src/protocols/msn/msn.c:508
-#: src/protocols/msn/msn.c:511 src/protocols/yahoo/yahoo.c:2756
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/msn/msn.c:489 src/protocols/msn/msn.c:497
+#: src/protocols/msn/msn.c:500 src/protocols/yahoo/yahoo.c:2820
 #, c-format
 msgid ""
 "\n"
 "<b>%s:</b> %s"
 msgstr ""
 
-#: src/protocols/msn/msn.c:508
+#: src/protocols/msn/msn.c:497
 msgid "Has you"
 msgstr ""
 
-#: src/protocols/msn/msn.c:511
+#: src/protocols/msn/msn.c:500
 #, fuzzy
 msgid "Blocked"
 msgstr "Блокирај"
 
-#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2584 src/protocols/yahoo/yahoo.c:3186
+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:801
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:803
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3160
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2816 src/protocols/novell/novell.c:2954
-#: src/protocols/novell/novell.c:3042 src/protocols/silc/buddy.c:1416
-#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2586
-#: src/protocols/yahoo/yahoo.c:3189
+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:805
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
+#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
+#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2679
+#: src/protocols/yahoo/yahoo.c:3046 src/protocols/yahoo/yahoo.c:3161
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2594 src/protocols/yahoo/yahoo.c:3201
+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:807
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/yahoo/yahoo.c:3054 src/protocols/yahoo/yahoo.c:3165
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:3207
+#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:809
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2691
+#: src/protocols/yahoo/yahoo.c:3058 src/protocols/yahoo/yahoo.c:3167
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:558 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:158
+#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:811
+#: src/protocols/zephyr/zephyr.c:2111 src/protocols/zephyr/zephyr.c:2143
 msgid "Hidden"
 msgstr ""
 
-#: src/protocols/msn/msn.c:570
+#: src/protocols/msn/msn.c:530
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:575
+#: src/protocols/msn/msn.c:535
 msgid "Set Home Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:579
+#: src/protocols/msn/msn.c:539
 msgid "Set Work Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:583
+#: src/protocols/msn/msn.c:543
 msgid "Set Mobile Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:589
+#: src/protocols/msn/msn.c:549
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:554
 msgid "Allow/Disallow Mobile Pages"
 msgstr ""
 
-#: src/protocols/msn/msn.c:617
+#: src/protocols/msn/msn.c:577
 msgid "Send to Mobile"
 msgstr "Испрати на мобилен"
 
-#: src/protocols/msn/msn.c:626 src/protocols/novell/novell.c:3440
+#: src/protocols/msn/msn.c:586 src/protocols/novell/novell.c:3369
 msgid "Initiate _Chat"
 msgstr ""
 
-#: src/protocols/msn/msn.c:663
+#: src/protocols/msn/msn.c:623
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 msgstr ""
 
-#: src/protocols/msn/msn.c:691
+#: src/protocols/msn/msn.c:651
 #, fuzzy
 msgid "Failed to connect to server."
 msgstr "Не може да се врзе со серверот"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1120
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr ""
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1695
-#: src/protocols/yahoo/yahoo_profile.c:1176 src/util.c:801
+#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1675
+#: src/protocols/yahoo/yahoo_profile.c:1174 src/util.c:796
 #, fuzzy, c-format
 msgid "<b>%s:</b> "
 msgstr ""
 "\n"
 "<b>Алиас:</b>"
 
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1405
 msgid "MSN Profile"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
-#: src/protocols/yahoo/yahoo_profile.c:765
+#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1662
+#: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5343
+#: src/protocols/msn/msn.c:1481 src/protocols/oscar/oscar.c:5231
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1024
+#: src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Age"
 msgstr ""
 
 #. Gender
-#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5330
+#: src/protocols/msn/msn.c:1488 src/protocols/oscar/oscar.c:5217
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1034
+#: src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Gender"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1029
+#: src/protocols/msn/msn.c:1497 src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Marital Status"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1019
+#: src/protocols/msn/msn.c:1504 src/protocols/novell/novell.c:1445
+#: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Location"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1039
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1037
 msgid "Occupation"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
-#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
-#: src/protocols/msn/msn.c:1577
+#: src/protocols/msn/msn.c:1529 src/protocols/msn/msn.c:1535
+#: src/protocols/msn/msn.c:1542 src/protocols/msn/msn.c:1550
+#: src/protocols/msn/msn.c:1557
 msgid "A Little About Me"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
-#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
+#: src/protocols/msn/msn.c:1566 src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1579 src/protocols/msn/msn.c:1586
 msgid "Favorite Things"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
-#: src/protocols/msn/msn.c:1628
+#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
+#: src/protocols/msn/msn.c:1608
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
-#: src/protocols/yahoo/yahoo_profile.c:1081
+#: src/protocols/msn/msn.c:1617 src/protocols/msn/msn.c:1623
+#: src/protocols/yahoo/yahoo_profile.c:1079
 msgid "Favorite Quote"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1631
 msgid "Last Updated"
 msgstr ""
 
 #. Homepage
-#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1642 src/protocols/silc/ops.c:844
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1684
+#: src/protocols/msn/msn.c:1664
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1685
+#: src/protocols/msn/msn.c:1665
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1689
+#: src/protocols/msn/msn.c:1669
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1695 src/protocols/yahoo/yahoo_profile.c:1176
+#: src/protocols/msn/msn.c:1675 src/protocols/yahoo/yahoo_profile.c:1174
 msgid "Profile URL"
 msgstr ""
 
+#: src/protocols/msn/msn.c:1816
+msgid "Display conversation closed notices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1821
+msgid "Display timeout notices"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6896,20 +6929,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1899 src/protocols/msn/msn.c:1901
+#: src/protocols/msn/msn.c:1908 src/protocols/msn/msn.c:1910
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1920 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1929 src/protocols/trepia/trepia.c:1296
 msgid "Login server"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:1938
 msgid "Use HTTP Method"
 msgstr ""
 
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/yahoo/yahoochat.c:1394
 msgid "Unable to connect"
 msgstr ""
 
@@ -6918,8 +6951,8 @@
 msgid "%s is not a valid group."
 msgstr ""
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
-#: src/protocols/msn/session.c:347
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:523
+#: src/protocols/msn/session.c:349
 #, fuzzy
 msgid "Unknown error."
 msgstr "_Непознато."
@@ -6929,42 +6962,40 @@
 msgid "%s on %s (%s)"
 msgstr "%s сака да ти испрати %s (%s)"
 
-#: src/protocols/msn/notification.c:496
+#: src/protocols/msn/notification.c:493
 #, fuzzy, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/msn/notification.c:500
+#: src/protocols/msn/notification.c:497
 #, fuzzy, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/msn/notification.c:504
+#: src/protocols/msn/notification.c:501
 #, fuzzy, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/msn/notification.c:512
+#: src/protocols/msn/notification.c:509
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
-#: src/protocols/msn/notification.c:521
+#: src/protocols/msn/notification.c:518
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr ""
 
-#: src/protocols/msn/notification.c:809
-#, fuzzy
+#: src/protocols/msn/notification.c:805
 msgid "Unable to rename group"
-msgstr "Додади го разговорот во листата на пријатели"
-
-#: src/protocols/msn/notification.c:864
-#, fuzzy
+msgstr ""
+
+#: src/protocols/msn/notification.c:860
 msgid "Unable to delete group"
-msgstr "Додади го разговорот во листата на пријатели"
-
-#: src/protocols/msn/notification.c:1297
+msgstr ""
+
+#: src/protocols/msn/notification.c:1287
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6991,8 +7022,8 @@
 msgid "Reading error"
 msgstr ""
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4296
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:341
+#: src/protocols/oscar/oscar.c:4209
 msgid "Unknown error"
 msgstr ""
 
@@ -7003,171 +7034,162 @@
 "%s"
 msgstr ""
 
-#: src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:319
 msgid "Our protocol is not supported by the server."
 msgstr ""
 
-#: src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:323
 msgid "Error parsing HTTP."
 msgstr ""
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:451
-#: src/protocols/oscar/oscar.c:4995 src/protocols/yahoo/yahoo.c:188
+#: src/protocols/msn/session.c:327
 msgid "You have signed on from another location."
 msgstr ""
 
-#: src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:330
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#: src/protocols/msn/session.c:333
+#: src/protocols/msn/session.c:335
 msgid "The MSN servers are going down temporarily."
 msgstr ""
 
-#: src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:339
 #, fuzzy, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:344
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:365 src/protocols/msn/session.c:367
 msgid "Handshaking"
 msgstr ""
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:366
 #, fuzzy
 msgid "Transferring"
 msgstr "Пренос на датотеки"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:368
 #, fuzzy
 msgid "Starting authentication"
 msgstr "Авторизирање"
 
-#: src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:369
 msgid "Getting cookie"
 msgstr ""
 
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:371
 #, fuzzy
 msgid "Sending cookie"
 msgstr "Испрати на мобилен"
 
-#: src/protocols/msn/session.c:370 src/protocols/trepia/trepia.c:637
+#: src/protocols/msn/session.c:372 src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
 msgstr "Вчитување листа на пријатели"
 
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:405
+#: src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 
+#: src/protocols/msn/switchboard.c:409
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr ""
+
 #: src/protocols/msn/switchboard.c:413
-msgid "Message could not be sent, not allowed while invisible:"
+msgid "Message could not be sent because the user is offline:"
 msgstr ""
 
 #: src/protocols/msn/switchboard.c:417
-msgid "Message could not be sent because the user is offline:"
+msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 
 #: src/protocols/msn/switchboard.c:421
-msgid "Message could not be sent because a connection error occurred:"
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:425
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:433
+#: src/protocols/msn/switchboard.c:429
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:689
+#: src/protocols/msn/switchboard.c:678
+msgid "The conversation has become inactive and timed out."
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:697
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr ""
 
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/userlist.c:87
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/userlist.c:276
+#: src/protocols/msn/userlist.c:96
 #, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
+msgid "The user %s wants to add %s to his or her buddy list."
 msgstr ""
 "\n"
 "\n"
 "Дали сакаш да го додадеш во листата на пријатели?"
 
-#: src/protocols/msn/userlist.c:340
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:655
+#: src/protocols/msn/userlist.c:627
 #, fuzzy, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/msn/userlist.c:657
+#: src/protocols/msn/userlist.c:629
 msgid "The screen name specified is invalid."
 msgstr ""
 
-#: src/protocols/napster/napster.c:260
+#: src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
 msgstr ""
 
-#: src/protocols/napster/napster.c:274
+#: src/protocols/napster/napster.c:255
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 
-#: src/protocols/napster/napster.c:290
-#, fuzzy
-msgid "Unknown server error."
-msgstr "_Непознато."
-
-#: src/protocols/napster/napster.c:339
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr ""
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr ""
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
+#: src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr ""
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
 msgstr ""
 
+#: src/protocols/napster/napster.c:433
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr ""
+
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:455
+#: src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:591 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1268
 msgid "_Group:"
 msgstr ""
 
@@ -7181,7 +7203,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:688 src/protocols/napster/napster.c:690
+#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
 msgid "NAPSTER Protocol Plugin"
 msgstr ""
 
@@ -7322,114 +7344,114 @@
 msgid "Login failed (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:379
 #, fuzzy, c-format
 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:407
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:569
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:617
+#: src/protocols/novell/novell.c:615
 #, fuzzy, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:688
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:734 src/protocols/novell/novell.c:880
 #, fuzzy, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:781
 #, fuzzy, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:834
 #, fuzzy, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:902
 #, fuzzy, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Додади го разговорот во листата на пријатели"
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1629
+#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1620
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:997
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1659
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1443
 msgid "Telephone Number"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1447
 msgid "Department"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1449
 #, fuzzy
 msgid "Personal Title"
 msgstr "Лична веб страница"
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1453
 #, fuzzy
 msgid "Mailstop"
 msgstr "Машко"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5316
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5204
+#: src/protocols/oscar/oscar.c:5211
 msgid "Email Address"
 msgstr "E-mail адреса"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1471
 #, fuzzy
 msgid "User ID"
 msgstr "Корисници"
@@ -7441,50 +7463,50 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1485
 #, fuzzy
 msgid "Full name"
 msgstr "Датотека"
 
-#: src/protocols/novell/novell.c:1515
+#: src/protocols/novell/novell.c:1506
 #, fuzzy
 msgid "User Properties"
 msgstr "Опции за корисникот"
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1610
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1644
+#: src/protocols/novell/novell.c:1635
 msgid "Unable to make SSL connection to server."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1674
+#: src/protocols/novell/novell.c:1665
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1708
+#: src/protocols/novell/novell.c:1699
 #, fuzzy
 msgid "Authenticating..."
 msgstr "Авторизирање"
 
-#: src/protocols/novell/novell.c:1723
+#: src/protocols/novell/novell.c:1714
 msgid "Waiting for response..."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1858
+#: src/protocols/novell/novell.c:1849
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1876
 #, fuzzy
 msgid "Invitation to Conversation"
 msgstr "Зачувај разговор"
 
-#: src/protocols/novell/novell.c:1887
+#: src/protocols/novell/novell.c:1877
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7492,16 +7514,16 @@
 "Sent: %s"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1889
+#: src/protocols/novell/novell.c:1879
 #, fuzzy
 msgid "Would you like to join the conversation?"
 msgstr "Сакаш да ја пребришеш?"
 
-#: src/protocols/novell/novell.c:1996
+#: src/protocols/novell/novell.c:1985
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2052
+#: src/protocols/novell/novell.c:2039
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7511,22 +7533,31 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2150
+#: src/protocols/novell/novell.c:2137
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2172
+#: src/protocols/novell/novell.c:2159
 msgid "Error. SSL support is not installed."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2476
+#: src/protocols/novell/novell.c:2463
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2957 src/protocols/novell/novell.c:3045
-#: src/protocols/yahoo/yahoo.c:2808
+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:738
+#: src/protocols/oscar/oscar.c:6795 src/protocols/yahoo/yahoo.c:2699
+msgid "Offline"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2820
+#, fuzzy
+msgid "Message"
+msgstr "_Порака:"
+
+#: src/protocols/novell/novell.c:2919 src/protocols/novell/novell.c:2975
 #, fuzzy
 msgid "Appear Offline"
 msgstr "Исклучен "
@@ -7541,297 +7572,296 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3538 src/protocols/novell/novell.c:3540
+#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr ""
 
-#: src/protocols/novell/novell.c:3559
+#: src/protocols/novell/novell.c:3489
 #, fuzzy
 msgid "Server address"
 msgstr "Домашна адреса"
 
-#: src/protocols/novell/novell.c:3563
+#: src/protocols/novell/novell.c:3493
 #, fuzzy
 msgid "Server port"
 msgstr "Сервер"
 
+#: src/protocols/oscar/oscar.c:188
+msgid "Invalid error"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:189
+msgid "Invalid SNAC"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:190
+msgid "Rate to host"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:191
+msgid "Rate to client"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:193
+msgid "Service unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:194
+msgid "Service not defined"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:195
+msgid "Obsolete SNAC"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:196
-msgid "Invalid error"
+msgid "Not supported by host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Invalid SNAC"
+msgid "Not supported by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:198
-msgid "Rate to host"
+msgid "Refused by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:199
-msgid "Rate to client"
+msgid "Reply too big"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:200
+msgid "Responses lost"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:201
-msgid "Service unavailable"
+msgid "Request denied"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:202
-msgid "Service not defined"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:203
-msgid "Obsolete SNAC"
+msgid "Insufficient rights"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:204
-msgid "Not supported by host"
+msgid "In local permit/deny"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:205
-msgid "Not supported by client"
+msgid "Too evil (sender)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:206
-msgid "Refused by client"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:207
-msgid "Reply too big"
-msgstr ""
+msgid "User temporarily unavailable"
+msgstr "Корисник е привремено недостапен"
 
 #: src/protocols/oscar/oscar.c:208
-msgid "Responses lost"
-msgstr ""
+msgid "No match"
+msgstr "Нема пронајдени резултати"
 
 #: src/protocols/oscar/oscar.c:209
-msgid "Request denied"
+msgid "List overflow"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:210
-msgid "Busted SNAC payload"
+msgid "Request ambiguous"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:211
-msgid "Insufficient rights"
-msgstr ""
+msgid "Queue full"
+msgstr "Редот е полн"
 
 #: src/protocols/oscar/oscar.c:212
-msgid "In local permit/deny"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:213
-msgid "Too evil (sender)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:214
-msgid "Too evil (receiver)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:215
-msgid "User temporarily unavailable"
-msgstr "Корисник е привремено недостапен"
-
-#: src/protocols/oscar/oscar.c:216
-msgid "No match"
-msgstr "Нема пронајдени резултати"
-
-#: src/protocols/oscar/oscar.c:217
-msgid "List overflow"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:218
-msgid "Request ambiguous"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:219
-msgid "Queue full"
-msgstr "Редот е полн"
-
-#: src/protocols/oscar/oscar.c:220
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:491
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:607
+#: src/protocols/oscar/oscar.c:593
 msgid "Voice"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:610
+#: src/protocols/oscar/oscar.c:596
 msgid "AIM Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:613 src/protocols/silc/silc.c:668
+#: src/protocols/oscar/oscar.c:599 src/protocols/silc/silc.c:654
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:616 src/protocols/oscar/oscar.c:7197
+#: src/protocols/oscar/oscar.c:602 src/protocols/oscar/oscar.c:7097
 msgid "Get File"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:623
+#: src/protocols/oscar/oscar.c:609
 msgid "Games"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:626
+#: src/protocols/oscar/oscar.c:612
 msgid "Add-Ins"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:629
+#: src/protocols/oscar/oscar.c:615
 msgid "Send Buddy List"
 msgstr "Испрати листа на пријатели"
 
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:618
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:621
 msgid "AP User"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:624
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:627
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:630
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:633
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:636
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:653
+#: src/protocols/oscar/oscar.c:639
 msgid "ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:642
 msgid "Hiptop"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:645
 msgid "Security Enabled"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:662
+#: src/protocols/oscar/oscar.c:648
 msgid "Video Chat"
 msgstr "Видео разговор"
 
-#: src/protocols/oscar/oscar.c:666
+#: src/protocols/oscar/oscar.c:652
 msgid "iChat AV"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:669
+#: src/protocols/oscar/oscar.c:655
 msgid "Live Video"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:672
+#: src/protocols/oscar/oscar.c:658
 msgid "Camera"
 msgstr "Камера"
 
-#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:7080
+#: src/protocols/oscar/oscar.c:676 src/protocols/oscar/oscar.c:5800
+#: src/protocols/oscar/oscar.c:6989
 msgid "Free For Chat"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:694 src/protocols/oscar/oscar.c:7095
+#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:5794
+#: src/protocols/oscar/oscar.c:6987
 msgid "Not Available"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:696 src/protocols/oscar/oscar.c:7085
+#: src/protocols/oscar/oscar.c:682 src/protocols/oscar/oscar.c:5797
+#: src/protocols/oscar/oscar.c:6988
 msgid "Occupied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:700
+#: src/protocols/oscar/oscar.c:686
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:4421
-msgid "Warning Level"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:785
+#: src/protocols/oscar/oscar.c:754
 msgid "Capabilities"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:763
 msgid "Buddy Comment"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:951
+#: src/protocols/oscar/oscar.c:898
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:953
+#: src/protocols/oscar/oscar.c:900
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:907
 msgid "Direct Connect failed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1038 src/protocols/oscar/oscar.c:1169
+#: src/protocols/oscar/oscar.c:984 src/protocols/oscar/oscar.c:1115
 #, c-format
 msgid "Direct IM with %s established"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1119
+#: src/protocols/oscar/oscar.c:1065
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1545
+#: src/protocols/oscar/oscar.c:1485
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1550
+#: src/protocols/oscar/oscar.c:1490
 msgid "Unable to open Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1525
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1589
+#: src/protocols/oscar/oscar.c:1529
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1593 src/protocols/oscar/oscar.c:3731
+#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3643
 msgid "Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1657
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1680
+#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:874
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1619
 msgid "Chat is currently unavailable"
 msgstr "Разговор е недостапен"
 
-#: src/protocols/oscar/oscar.c:1749
+#: src/protocols/oscar/oscar.c:1700
 msgid "Screen name sent"
 msgstr "Корисничкото име испратено"
 
-#: src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:1714
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7839,161 +7869,159 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1802
+#: src/protocols/oscar/oscar.c:1742
 msgid "Unable to login to AIM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1906 src/protocols/oscar/oscar.c:2428
+#: src/protocols/oscar/oscar.c:1844 src/protocols/oscar/oscar.c:2365
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1914
+#: src/protocols/oscar/oscar.c:1852
 msgid "Connection established, cookie sent"
 msgstr "Врската е воспоставена, испраќам колаче"
 
-#: src/protocols/oscar/oscar.c:2027
+#: src/protocols/oscar/oscar.c:1963
 #, c-format
 msgid "Transfer of file %s timed out."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2106 src/protocols/yahoo/yahoo_filexfer.c:177
+#: src/protocols/oscar/oscar.c:2047 src/protocols/yahoo/yahoo_filexfer.c:177
 #: src/protocols/yahoo/yahoo_filexfer.c:186
 #: src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2111
+#: src/protocols/oscar/oscar.c:2052
 msgid "Unable to create new connection."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2190
+#: src/protocols/oscar/oscar.c:2124
 msgid "Unable to establish listener socket."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2315 src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2249 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2320
+#: src/protocols/oscar/oscar.c:2254
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2324
+#: src/protocols/oscar/oscar.c:2258
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2329
+#: src/protocols/oscar/oscar.c:2263
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2334
+#: src/protocols/oscar/oscar.c:2268
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2365
+#: src/protocols/oscar/oscar.c:2300
 msgid "Internal Error"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2435
+#: src/protocols/oscar/oscar.c:2372
 msgid "Received authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2459
+#: src/protocols/oscar/oscar.c:2396
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2473
+#: src/protocols/oscar/oscar.c:2410
 msgid "Enter SecurID"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2474
+#: src/protocols/oscar/oscar.c:2411
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2514 src/protocols/oscar/oscar.c:2544
-#: src/protocols/oscar/oscar.c:2633
+#: src/protocols/oscar/oscar.c:2451 src/protocols/oscar/oscar.c:2481
+#: src/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2547
+#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2484
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2636
+#: src/protocols/oscar/oscar.c:2573
 msgid "Gaim was unable to get a valid login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2667
+#: src/protocols/oscar/oscar.c:2605
 msgid "Password sent"
 msgstr "Лозинката е пратена"
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3635
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3725
+#: src/protocols/oscar/oscar.c:3638
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3764
+#: src/protocols/oscar/oscar.c:3676
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3772
+#: src/protocols/oscar/oscar.c:3684
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3773
+#: src/protocols/oscar/oscar.c:3685
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3803
+#: src/protocols/oscar/oscar.c:3715
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3808 src/protocols/oscar/oscar.c:3810
+#: src/protocols/oscar/oscar.c:3720 src/protocols/oscar/oscar.c:3722
 msgid "Request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:3854
-#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3983
-#: src/protocols/oscar/oscar.c:6535 src/protocols/oscar/oscar.c:6587
+#: src/protocols/oscar/oscar.c:3770 src/protocols/oscar/oscar.c:3772
+#: src/protocols/oscar/oscar.c:3779 src/protocols/oscar/oscar.c:3876
+#: src/protocols/oscar/oscar.c:3896 src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:6476
 msgid "No reason given."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3853
+#: src/protocols/oscar/oscar.c:3778
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3961
-#, fuzzy, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:3876
+#, c-format
+msgid ""
+"The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"\n"
-"\n"
-"Дали сакаш да го додадеш во листата на пријатели?"
-
-#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:6547
+
+#: src/protocols/oscar/oscar.c:3884 src/protocols/oscar/oscar.c:6436
 msgid "Authorization Request"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:3896
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8001,17 +8029,17 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:3897
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:3912
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8020,7 +8048,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8029,7 +8057,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:3928
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8038,34 +8066,34 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4036
+#: src/protocols/oscar/oscar.c:3949
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4042
+#: src/protocols/oscar/oscar.c:3955
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:3959
 msgid "Decline"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4139
+#: src/protocols/oscar/oscar.c:4052
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8074,276 +8102,281 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4157
+#: src/protocols/oscar/oscar.c:4070
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4166
+#: src/protocols/oscar/oscar.c:4079
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4175
+#: src/protocols/oscar/oscar.c:4088
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4229 src/protocols/oscar/oscar.c:4463
-#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
+#: src/protocols/oscar/oscar.c:4142 src/protocols/oscar/oscar.c:4374
 #, fuzzy, c-format
 msgid "Info for %s"
 msgstr "ICQ инфо за %s"
 
-#: src/protocols/oscar/oscar.c:4295
+#: src/protocols/oscar/oscar.c:4208
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4332
+#: src/protocols/oscar/oscar.c:4244
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4332 src/protocols/oscar/oscar.c:4337
-#: src/protocols/oscar/oscar.c:4395 src/protocols/oscar/oscar.c:4399
+#: src/protocols/oscar/oscar.c:4244 src/protocols/oscar/oscar.c:4249
+#: src/protocols/oscar/oscar.c:4307 src/protocols/oscar/oscar.c:4311
 #, fuzzy
 msgid "Unknown reason."
 msgstr "_Непознато."
 
-#: src/protocols/oscar/oscar.c:4335
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4395
+#: src/protocols/oscar/oscar.c:4307
 #, fuzzy, c-format
 msgid "User information not available: %s"
 msgstr "Корисник е привремено недостапен"
 
-#: src/protocols/oscar/oscar.c:4398
+#: src/protocols/oscar/oscar.c:4310
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr ""
 
+#: src/protocols/oscar/oscar.c:4332
+msgid "Warning Level"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4336
+#, fuzzy
+msgid "Online Since"
+msgstr "Поврзано"
+
+#: src/protocols/oscar/oscar.c:4341 src/protocols/yahoo/yahoo_profile.c:1125
+msgid "Member Since"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:4425
-#, fuzzy
-msgid "Online Since"
-msgstr "Поврзано"
-
-#: src/protocols/oscar/oscar.c:4430 src/protocols/yahoo/yahoo_profile.c:1127
-msgid "Member Since"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4514
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4700
+#: src/protocols/oscar/oscar.c:4611
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4925
+#: src/protocols/oscar/oscar.c:4836
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4926
+#: src/protocols/oscar/oscar.c:4837
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4900
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4902
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5010 src/protocols/toc/toc.c:971
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr ""
-
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5035
+#: src/protocols/oscar/oscar.c:4933
 msgid "Finalizing connection"
 msgstr "Привршување на поврзувањето"
 
-#: src/protocols/oscar/oscar.c:5328 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5216 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Мобилен телефон"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5217
+msgid "Not specified"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5218 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Женско"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5218 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Машко"
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5234
 msgid "Personal Web Page"
 msgstr "Лична веб страница"
 
-#: src/protocols/oscar/oscar.c:5350
+#: src/protocols/oscar/oscar.c:5238
 msgid "Additional Information"
 msgstr "Дополнителни информации"
 
-#: src/protocols/oscar/oscar.c:5355
+#: src/protocols/oscar/oscar.c:5243
 msgid "Home Address"
 msgstr "Домашна адреса"
 
-#: src/protocols/oscar/oscar.c:5359 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5247 src/protocols/oscar/oscar.c:5255
 msgid "Zip Code"
 msgstr "Поштенски код"
 
-#: src/protocols/oscar/oscar.c:5363
+#: src/protocols/oscar/oscar.c:5251
 msgid "Work Address"
 msgstr "Адреса на работа"
 
-#: src/protocols/oscar/oscar.c:5371
+#: src/protocols/oscar/oscar.c:5259
 msgid "Work Information"
 msgstr "Работа информација"
 
-#: src/protocols/oscar/oscar.c:5372
+#: src/protocols/oscar/oscar.c:5260
 msgid "Company"
 msgstr "Компанија"
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5261
 msgid "Division"
 msgstr "Оддел"
 
-#: src/protocols/oscar/oscar.c:5374
+#: src/protocols/oscar/oscar.c:5262
 msgid "Position"
 msgstr "Позиција"
 
-#: src/protocols/oscar/oscar.c:5376
+#: src/protocols/oscar/oscar.c:5264
 msgid "Web Page"
 msgstr "Web страница"
 
-#: src/protocols/oscar/oscar.c:5386
+#: src/protocols/oscar/oscar.c:5274
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ инфо за %s"
 
-#: src/protocols/oscar/oscar.c:5435
+#: src/protocols/oscar/oscar.c:5323
 msgid "Pop-Up Message"
 msgstr ""
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:5344
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5482
+#: src/protocols/oscar/oscar.c:5348
+msgid "Search Results"
+msgstr "Резулатати од пребарувањето"
+
+#: src/protocols/oscar/oscar.c:5365
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5503
+#: src/protocols/oscar/oscar.c:5386
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Ќе добиете email за потврда на %s"
 
-#: src/protocols/oscar/oscar.c:5505
+#: src/protocols/oscar/oscar.c:5388
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:5419
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5539
+#: src/protocols/oscar/oscar.c:5422
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5542
+#: src/protocols/oscar/oscar.c:5425
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5545
+#: src/protocols/oscar/oscar.c:5428
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5548
+#: src/protocols/oscar/oscar.c:5431
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5551
+#: src/protocols/oscar/oscar.c:5434
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5554
+#: src/protocols/oscar/oscar.c:5437
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5557
+#: src/protocols/oscar/oscar.c:5440
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5567
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5568 src/protocols/oscar/oscar.c:5575
+#: src/protocols/oscar/oscar.c:5451 src/protocols/oscar/oscar.c:5458
 msgid "Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5573
+#: src/protocols/oscar/oscar.c:5456
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5640
+#: src/protocols/oscar/oscar.c:5521
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5780
+#: src/protocols/oscar/oscar.c:5649
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5781
+#: src/protocols/oscar/oscar.c:5650
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5808
+#: src/protocols/oscar/oscar.c:5677
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8354,22 +8387,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:5813
+#: src/protocols/oscar/oscar.c:5682
 msgid "Profile too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5843
+#: src/protocols/oscar/oscar.c:5698 src/protocols/oscar/oscar.c:6994
+msgid "Visible"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5716
 msgid "Unable to set AIM away message."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5844
+#: src/protocols/oscar/oscar.c:5717
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5891
+#: src/protocols/oscar/oscar.c:5757
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8380,11 +8417,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:5896
+#: src/protocols/oscar/oscar.c:5762
 msgid "Away message too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5994
+#: src/protocols/oscar/oscar.c:5839
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8392,40 +8429,40 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5996 src/protocols/oscar/oscar.c:6394
-#: src/protocols/oscar/oscar.c:6408
+#: src/protocols/oscar/oscar.c:5841 src/protocols/oscar/oscar.c:6296
+#: src/protocols/oscar/oscar.c:6310
 msgid "Unable To Add"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/oscar/oscar.c:6008
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/oscar/oscar.c:6009
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6286
-#: src/protocols/oscar/oscar.c:6291 src/protocols/oscar/oscar.c:6452
-#: src/protocols/oscar/oscar.c:6453 src/protocols/oscar/oscar.c:6458
+#: src/protocols/oscar/oscar.c:6191 src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6354
+#: src/protocols/oscar/oscar.c:6355 src/protocols/oscar/oscar.c:6360
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6392
+#: src/protocols/oscar/oscar.c:6294
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6406
+#: src/protocols/oscar/oscar.c:6294 src/protocols/oscar/oscar.c:6308
 msgid "(no name)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6406
+#: src/protocols/oscar/oscar.c:6308
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8433,39 +8470,36 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6489
+#: src/protocols/oscar/oscar.c:6391
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6495
+#: src/protocols/oscar/oscar.c:6397
 msgid "Authorization Given"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6538
-#, fuzzy, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:6430
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"\n"
-"\n"
-"Дали сакаш да го додадеш во листата на пријатели?"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6583
+#: src/protocols/oscar/oscar.c:6472
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6584
+#: src/protocols/oscar/oscar.c:6473
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6587
+#: src/protocols/oscar/oscar.c:6476
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8473,177 +8507,153 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6588
+#: src/protocols/oscar/oscar.c:6477
 msgid "Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6625 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:6514 src/protocols/toc/toc.c:1273
 msgid "_Exchange:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:6552
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6731
+#: src/protocols/oscar/oscar.c:6641
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6866
+#: src/protocols/oscar/oscar.c:6767
 msgid "Away Message"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7153
+#: src/protocols/oscar/oscar.c:7053
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7154
+#: src/protocols/oscar/oscar.c:7054
 msgid "Buddy Comment:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7173
+#: src/protocols/oscar/oscar.c:7073
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7179
+#: src/protocols/oscar/oscar.c:7079
 msgid "Get Status Msg"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7191
+#: src/protocols/oscar/oscar.c:7091
 msgid "Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7208
+#: src/protocols/oscar/oscar.c:7108
 msgid "Re-request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7268
-#, fuzzy
-msgid "Require authorization"
-msgstr "Авторизирање"
-
-#: src/protocols/oscar/oscar.c:7271
-#, fuzzy
-msgid "Hide IP address"
-msgstr "Домашна адреса"
-
-#: src/protocols/oscar/oscar.c:7274
-#, fuzzy
-msgid "Web aware"
-msgstr "Web страница"
-
-#: src/protocols/oscar/oscar.c:7279
-#, fuzzy
-msgid "ICQ Privacy Options"
-msgstr "Proxy Опции"
-
-#: src/protocols/oscar/oscar.c:7296
+#: src/protocols/oscar/oscar.c:7138
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7297
+#: src/protocols/oscar/oscar.c:7139
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7304
+#: src/protocols/oscar/oscar.c:7146
 msgid "New screen name formatting:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7356
+#: src/protocols/oscar/oscar.c:7198
 msgid "Change Address To:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7401
+#: src/protocols/oscar/oscar.c:7243
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7404
+#: src/protocols/oscar/oscar.c:7246
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7405
+#: src/protocols/oscar/oscar.c:7247
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7422
+#: src/protocols/oscar/oscar.c:7264
 msgid "Find Buddy by E-mail"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7423
+#: src/protocols/oscar/oscar.c:7265
 msgid "Search for a buddy by e-mail address"
 msgstr ""
 
+#: src/protocols/oscar/oscar.c:7266
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7283
+msgid "Available Message:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7284
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7365 src/protocols/silc/silc.c:812
+msgid "Set User Info..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7370
+msgid "Set User Info (URL)..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7376
+msgid "Set Available Message..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7381 src/protocols/silc/silc.c:808
+msgid "Change Password..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7386
+msgid "Change Password (URL)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7390
+msgid "Configure IM Forwarding (URL)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7399
+msgid "Format Screen Name..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7403
+msgid "Confirm Account"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7407
+msgid "Display Currently Registered Address"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7411
+msgid "Change Currently Registered Address..."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7418
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
 #: src/protocols/oscar/oscar.c:7424
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7505 src/protocols/silc/silc.c:826
-msgid "Set User Info..."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7511
-msgid "Set User Info (URL)..."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7516 src/protocols/silc/silc.c:822
-msgid "Change Password..."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7522
-msgid "Change Password (URL)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7526
-msgid "Configure IM Forwarding (URL)"
-msgstr ""
-
-#. ICQ actions
-#: src/protocols/oscar/oscar.c:7536
-#, fuzzy
-msgid "Show privacy options..."
-msgstr "Покажи повеќе опции"
-
-#. AIM actions
-#: src/protocols/oscar/oscar.c:7543
-msgid "Format Screen Name..."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7547
-msgid "Confirm Account"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7551
-msgid "Display Currently Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7555
-msgid "Change Currently Registered Address..."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7562
-msgid "Show Buddies Awaiting Authorization"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7568
 msgid "Search for Buddy by Email..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7573
+#: src/protocols/oscar/oscar.c:7429
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7643
-msgid "Use recent buddies group"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7646
-#, fuzzy
-msgid "Show how long you have been idle"
-msgstr "Нуди рачно конфигурирање на времето на неактивност."
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8654,19 +8664,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7763 src/protocols/oscar/oscar.c:7765
+#: src/protocols/oscar/oscar.c:7550 src/protocols/oscar/oscar.c:7552
 msgid "AIM/ICQ Protocol Plugin"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7788
+#: src/protocols/oscar/oscar.c:7571
 msgid "Auth host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7791
+#: src/protocols/oscar/oscar.c:7574
 msgid "Auth port"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7794 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:7577 src/protocols/zephyr/zephyr.c:2760
 msgid "Encoding"
 msgstr "Кодирање"
 
@@ -8755,33 +8765,33 @@
 msgstr "Лозинка:"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1293
+#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1295
 msgid "Get Public Key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1283
-#: src/protocols/silc/ops.c:1294
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1296
 msgid "Cannot fetch the public key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1578
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
 msgid "Show Public Key"
 msgstr ""
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1101
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
+#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
 #, fuzzy
 msgid "User Information"
 msgstr "Работа информација"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1102
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
 #, fuzzy
 msgid "Cannot get user information"
 msgstr "Промени корисничко инфо за %s"
@@ -8834,229 +8844,232 @@
 "from the list to add to the buddy list."
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1410
+#: src/protocols/silc/buddy.c:1386
 msgid "Detached"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:85
 msgid "Indisposed"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:60
+#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
+#: src/protocols/silc/silc.c:87
 msgid "Wake Me Up"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:52
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:79
 msgid "Hyper Active"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1422
+#: src/protocols/silc/buddy.c:1398
 msgid "Robot"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1429 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:629
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:631
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:633
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1435 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:651
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:653
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:482
 #, fuzzy
 msgid "Invincible"
 msgstr "Покани"
 
-#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:655
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:484
 #, fuzzy
 msgid "In Love"
 msgstr "Игнорирај"
 
-#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:657
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:659
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:488
 #, fuzzy
 msgid "Bored"
 msgstr "Задебелено"
 
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:661
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:663
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 #, fuzzy
 msgid "User Modes"
 msgstr "Корисници"
 
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
 #, fuzzy
 msgid "Status Text"
 msgstr "Статус:"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
 #, fuzzy
 msgid "Preferred Contact"
 msgstr "Параметри"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
 #, fuzzy
 msgid "Preferred Language"
 msgstr "Параметри"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:713
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
+#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:699
 #, fuzzy
 msgid "Timezone"
 msgstr "Време"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
 #, fuzzy
 msgid "Geolocation"
 msgstr "Известување"
 
-#: src/protocols/silc/buddy.c:1562
+#: src/protocols/silc/buddy.c:1538
 msgid "Reset IM Key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1543
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1571
+#: src/protocols/silc/buddy.c:1547
 #, fuzzy
 msgid "IM with Password"
 msgstr "Лозинка:"
 
-#: src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:1558
 msgid "Get Public Key..."
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1590 src/protocols/silc/ops.c:1413
+#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1417
 #, fuzzy
 msgid "Kill User"
 msgstr "Блокирај го корисникот"
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/chat.c:37
 #, fuzzy
 msgid "_Passphrase:"
 msgstr "_Лозинка:"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr ""
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
 #, fuzzy
 msgid "Channel Information"
 msgstr "Работа информација"
 
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:80
 #, fuzzy
 msgid "Cannot get channel information"
 msgstr "Промени корисничко инфо за %s"
 
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:117
 #, fuzzy, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Име за најава:</b>"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:120
 #, fuzzy, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr ""
 "\n"
 "<b>Акаунт:</b> %s"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr ""
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr ""
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr ""
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr ""
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
+#: src/protocols/silc/chat.c:162
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
 #: src/protocols/silc/chat.c:163
 #, c-format
-msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr ""
-
-#: src/protocols/silc/chat.c:164
-#, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr ""
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr ""
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr ""
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr ""
 
-#: src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9065,131 +9078,131 @@
 "able to join."
 msgstr ""
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
 #, fuzzy
 msgid "Channel Authentication"
 msgstr "Авторизирање"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
 #, fuzzy
 msgid "Add / Remove"
 msgstr "Отстрани"
 
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:575
 #, fuzzy
 msgid "Group Name"
 msgstr "Ново има на групата"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1698
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1697
 #, fuzzy
 msgid "Passphrase"
 msgstr "Лозинката е пратена"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr ""
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:719
 #, fuzzy
 msgid "User Limit"
 msgstr "Корисници"
 
-#: src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:720
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr "Инфо"
 
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:869
 #, fuzzy
 msgid "Invite List"
 msgstr "Покани"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:873
 #, fuzzy
 msgid "Ban List"
 msgstr "Листа на пријатели"
 
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:880
 #, fuzzy
 msgid "Add Private Group"
 msgstr "Додади група"
 
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr ""
 
+#: src/protocols/silc/chat.c:895
+msgid "Set Permanent"
+msgstr ""
+
 #: src/protocols/silc/chat.c:902
-msgid "Set Permanent"
-msgstr ""
-
-#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr ""
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr ""
 
+#: src/protocols/silc/chat.c:911
+msgid "Set Topic Restriction"
+msgstr ""
+
+#: src/protocols/silc/chat.c:917
+msgid "Reset Private Channel"
+msgstr ""
+
 #: src/protocols/silc/chat.c:921
-msgid "Set Topic Restriction"
-msgstr ""
-
-#: src/protocols/silc/chat.c:928
-msgid "Reset Private Channel"
-msgstr ""
-
-#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr ""
 
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr ""
 
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:993
 #, fuzzy, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Баниран си од %s."
 
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:997
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1071
+#: src/protocols/silc/chat.c:1056
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1073
+#: src/protocols/silc/chat.c:1058
 #, fuzzy
 msgid "Join Private Group"
 msgstr "Преименувај група"
 
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:926
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:911
 msgid "Cannot call command"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:927
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:912
 #, fuzzy
 msgid "Unknown command"
 msgstr "Непознато"
@@ -9218,9 +9231,8 @@
 msgstr ""
 
 #: src/protocols/silc/ft.c:102
-#, fuzzy
-msgid "File transfer session does not exist"
-msgstr "Датотеката не постои"
+msgid "File transfer sessions does not exist"
+msgstr ""
 
 #: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
@@ -9244,162 +9256,161 @@
 msgid "Cannot send file"
 msgstr "Не може да се прати датотека од 0 бајти."
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:423
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:427
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:460
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:468
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:497
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:614
 #, fuzzy
 msgid "Server signoff"
 msgstr "Одјави се"
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:801
 #, fuzzy
 msgid "Personal Information"
 msgstr "Дополнителни информации"
 
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr ""
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr ""
 
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr ""
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr ""
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:840
 #, fuzzy
 msgid "Unit"
 msgstr "Покани"
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:859
 #, fuzzy
 msgid "EMail"
 msgstr "Машко"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:864
 #, fuzzy
 msgid "Note"
 msgstr "Ништо"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:912
 #, fuzzy
 msgid "Join Chat"
 msgstr "Приклучи се на разговор..."
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1082
 #, fuzzy
 msgid "More..."
 msgstr "Нов..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:814
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:800
 msgid "Detach From Server"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1159
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1170
+#: src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1202
+#: src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1250
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
 msgid "Roomlist"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1250
-#, fuzzy
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
 msgid "Cannot get room list"
-msgstr "Промени корисничко инфо за %s"
-
-#: src/protocols/silc/ops.c:1295
+msgstr ""
+
+#: src/protocols/silc/ops.c:1297
 msgid "No public key was received"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1308 src/protocols/silc/ops.c:1321
+#: src/protocols/silc/ops.c:1310 src/protocols/silc/ops.c:1324
 #, fuzzy
 msgid "Server Information"
 msgstr "Работа информација"
 
-#: src/protocols/silc/ops.c:1309
+#: src/protocols/silc/ops.c:1311
 #, fuzzy
 msgid "Cannot get server information"
 msgstr "Промени корисничко инфо за %s"
 
-#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1347
+#: src/protocols/silc/ops.c:1342 src/protocols/silc/ops.c:1351
 #, fuzzy
 msgid "Server Statistics"
 msgstr "Домашна адреса"
 
-#: src/protocols/silc/ops.c:1339
+#: src/protocols/silc/ops.c:1343
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1348
+#: src/protocols/silc/ops.c:1352
 #, fuzzy
 msgid "No server statistics available"
 msgstr "Домашна адреса"
 
-#: src/protocols/silc/ops.c:1370
+#: src/protocols/silc/ops.c:1374
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9419,98 +9430,98 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1393
+#: src/protocols/silc/ops.c:1397
 msgid "Network Statistics"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1401 src/protocols/silc/ops.c:1406
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/ops.c:1410
 msgid "Ping"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1401
+#: src/protocols/silc/ops.c:1405
 msgid "Ping failed"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1406
+#: src/protocols/silc/ops.c:1410
 msgid "Ping reply received from server"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1414
+#: src/protocols/silc/ops.c:1418
 msgid "Could not kill user"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1498
+#: src/protocols/silc/ops.c:1499
 msgid "Error during connecting to SILC Server"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1503
+#: src/protocols/silc/ops.c:1504
 msgid "Key Exchange failed"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1512
+#: src/protocols/silc/ops.c:1513
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#: src/protocols/silc/ops.c:1547
+#: src/protocols/silc/ops.c:1548
 msgid "Disconnected by server"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1609 src/protocols/silc/ops.c:1656
-#: src/protocols/silc/silc.c:203
+#: src/protocols/silc/ops.c:1608 src/protocols/silc/ops.c:1655
+#: src/protocols/silc/silc.c:178
 msgid "Resuming session"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1611
+#: src/protocols/silc/ops.c:1610
 #, fuzzy
 msgid "Authenticating connection"
 msgstr "Авторизирање"
 
-#: src/protocols/silc/ops.c:1658
+#: src/protocols/silc/ops.c:1657
 msgid "Verifying server public key"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1699
+#: src/protocols/silc/ops.c:1698
 msgid "Passphrase required"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1728
+#: src/protocols/silc/ops.c:1727
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1731
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1734
+#: src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1737
+#: src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1740
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1743
+#: src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1745
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1748
+#: src/protocols/silc/ops.c:1747
 msgid "Failure: Incorrect signature"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1750
+#: src/protocols/silc/ops.c:1749
 msgid "Failure: Invalid cookie"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1761
+#: src/protocols/silc/ops.c:1760
 msgid "Failure: Authentication failed"
 msgstr ""
 
@@ -9548,290 +9559,294 @@
 msgid "Unsupported public key type"
 msgstr ""
 
-#: src/protocols/silc/silc.c:163
+#: src/protocols/silc/silc.c:138
 #, fuzzy
 msgid "Connection failed"
 msgstr "Поврзување"
 
-#: src/protocols/silc/silc.c:195
+#: src/protocols/silc/silc.c:170
 #, fuzzy
 msgid "Cannot initialize SILC Client connection"
 msgstr "Привршување на поврзувањето"
 
-#: src/protocols/silc/silc.c:206
+#: src/protocols/silc/silc.c:181
 msgid "Performing key exchange"
 msgstr ""
 
-#: src/protocols/silc/silc.c:279
+#: src/protocols/silc/silc.c:254
 msgid "Out of memory"
 msgstr ""
 
 #. Progress
-#: src/protocols/silc/silc.c:318
+#: src/protocols/silc/silc.c:293
 msgid "Connecting to SILC Server"
 msgstr ""
 
-#: src/protocols/silc/silc.c:639
+#: src/protocols/silc/silc.c:625
 msgid "Your Current Mood"
 msgstr ""
 
-#: src/protocols/silc/silc.c:641
+#: src/protocols/silc/silc.c:627
 msgid "Normal"
 msgstr ""
 
-#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/silc.c:652
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr ""
 
-#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr ""
 
-#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr ""
 
-#: src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:669
 msgid "Your Current Status"
 msgstr ""
 
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:676
 #, fuzzy
 msgid "Online Services"
 msgstr "Поврзано"
 
-#: src/protocols/silc/silc.c:693
+#: src/protocols/silc/silc.c:679
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: src/protocols/silc/silc.c:699
+#: src/protocols/silc/silc.c:685
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: src/protocols/silc/silc.c:706
+#: src/protocols/silc/silc.c:692
 msgid "Your VCard File"
 msgstr ""
 
-#: src/protocols/silc/silc.c:719 src/protocols/silc/silc.c:720
+#: src/protocols/silc/silc.c:705 src/protocols/silc/silc.c:706
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: src/protocols/silc/silc.c:721
+#: src/protocols/silc/silc.c:707
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
 
-#: src/protocols/silc/silc.c:761 src/protocols/silc/silc.c:767
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:747 src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:1160
 msgid "Message of the Day"
 msgstr ""
 
-#: src/protocols/silc/silc.c:761
+#: src/protocols/silc/silc.c:747
 msgid "No Message of the Day available"
 msgstr ""
 
-#: src/protocols/silc/silc.c:762 src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:748 src/protocols/silc/silc.c:1155
 msgid "There is no Message of the Day associated with this connection"
 msgstr ""
 
-#: src/protocols/silc/silc.c:809
+#: src/protocols/silc/silc.c:795
 #, fuzzy
 msgid "Online Status"
 msgstr "Поврзано"
 
-#: src/protocols/silc/silc.c:818
+#: src/protocols/silc/silc.c:804
 msgid "View Message of the Day"
 msgstr ""
 
-#: src/protocols/silc/silc.c:891
+#: src/protocols/silc/silc.c:876
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1042
+#: src/protocols/silc/silc.c:985
+msgid "Failed to leave channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1031
 msgid "Topic too long"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1123
+#: src/protocols/silc/silc.c:1112
 msgid "You must specify a nick"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1225
+#: src/protocols/silc/silc.c:1214
 #, c-format
 msgid "channel %s not found"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1230
+#: src/protocols/silc/silc.c:1219
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1221
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1234
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1275
+#: src/protocols/silc/silc.c:1264
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1338
+#: src/protocols/silc/silc.c:1327
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1331
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1335
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1351
+#: src/protocols/silc/silc.c:1340
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1355
+#: src/protocols/silc/silc.c:1344
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1348
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1352 src/protocols/zephyr/zephyr.c:2478
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1356
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1360
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1375
+#: src/protocols/silc/silc.c:1364
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1379
+#: src/protocols/silc/silc.c:1368
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1383
+#: src/protocols/silc/silc.c:1372
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1389
+#: src/protocols/silc/silc.c:1378
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1382
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1386
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1390
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1394
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1398
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1402
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1417
+#: src/protocols/silc/silc.c:1406
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1421
+#: src/protocols/silc/silc.c:1410
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1414
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1429
+#: src/protocols/silc/silc.c:1418
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1433
+#: src/protocols/silc/silc.c:1422
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1426
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1441
+#: src/protocols/silc/silc.c:1430
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1446
+#: src/protocols/silc/silc.c:1435
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1439
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1462
+#: src/protocols/silc/silc.c:1451
 #, fuzzy
 msgid "Instant Messages"
 msgstr "Инстант пораки"
 
-#: src/protocols/silc/silc.c:1467
+#: src/protocols/silc/silc.c:1456
 msgid "Digitally sign all IM messages"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1472
+#: src/protocols/silc/silc.c:1461
 msgid "Verify all IM message signatures"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1475
+#: src/protocols/silc/silc.c:1464
 #, fuzzy
 msgid "Channel Messages"
 msgstr "Испрати порака"
 
-#: src/protocols/silc/silc.c:1480
+#: src/protocols/silc/silc.c:1469
 msgid "Digitally sign all channel messages"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1485
+#: src/protocols/silc/silc.c:1474
 msgid "Verify all channel message signatures"
 msgstr ""
 
@@ -9844,44 +9859,44 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1573
+#: src/protocols/silc/silc.c:1563
 #, fuzzy
 msgid "SILC Protocol Plugin"
 msgstr "Додаток за IRC протокол"
 
 #. *  description
-#: src/protocols/silc/silc.c:1575
+#: src/protocols/silc/silc.c:1565
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1609
+#: src/protocols/silc/silc.c:1599
 #, fuzzy
 msgid "Public Key file"
 msgstr "Работа информација"
 
-#: src/protocols/silc/silc.c:1613
+#: src/protocols/silc/silc.c:1603
 msgid "Private Key file"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1616
+#: src/protocols/silc/silc.c:1606
 #, fuzzy
 msgid "Public key authentication"
 msgstr "Авторизирање"
 
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1610
 msgid "Reject watching by other users"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1623
+#: src/protocols/silc/silc.c:1613
 #, fuzzy
 msgid "Block invites"
 msgstr "Блокирај го корисникот"
 
-#: src/protocols/silc/silc.c:1626
+#: src/protocols/silc/silc.c:1616
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1629
+#: src/protocols/silc/silc.c:1619
 msgid "Reject online status attribute requests"
 msgstr ""
 
@@ -9968,200 +9983,195 @@
 msgid "Terminal"
 msgstr ""
 
-#: src/protocols/toc/toc.c:139
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Најавување: %s"
 
-#: src/protocols/toc/toc.c:482
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:485
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:488
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr ""
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr ""
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr ""
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr ""
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr ""
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr ""
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr ""
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr ""
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr ""
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr ""
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr ""
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr ""
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr ""
 
-#: src/protocols/toc/toc.c:549
+#: 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 ""
-"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:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Непозната грешка при најавување: %s."
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:584
-#, fuzzy
-msgid "Invalid Groupname"
-msgstr "Невавалидно име на група"
-
-#: src/protocols/toc/toc.c:668
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr ""
 
-#: src/protocols/toc/toc.c:708
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:786
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:989
+#: src/protocols/toc/toc.c:892
 msgid "Password Change Successful"
 msgstr ""
 
-#: src/protocols/toc/toc.c:993
+#: src/protocols/toc/toc.c:896
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:994
+#: src/protocols/toc/toc.c:897
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1549
+#: src/protocols/toc/toc.c:1423
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1689
+#: src/protocols/toc/toc.c:1559
 msgid "Set Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1811
+#: src/protocols/toc/toc.c:1681
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1847
+#: src/protocols/toc/toc.c:1717
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: src/protocols/toc/toc.c:1762 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1926 src/protocols/toc/toc.c:2014
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2089
+#: src/protocols/toc/toc.c:1959
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2189
+#: src/protocols/toc/toc.c:2059
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2223
+#: src/protocols/toc/toc.c:2093
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/toc/toc.c:2230
+#: src/protocols/toc/toc.c:2100
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
@@ -10176,15 +10186,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2187 src/protocols/toc/toc.c:2189
 msgid "TOC Protocol Plugin"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2208
 msgid "TOC host"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2212
 msgid "TOC port"
 msgstr ""
 
@@ -10253,7 +10263,7 @@
 msgid "Local Users"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:1032
+#: src/protocols/trepia/trepia.c:1028
 msgid "Logging in"
 msgstr ""
 
@@ -10267,56 +10277,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
 msgid "Trepia Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:419
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:912
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:718 src/protocols/yahoo/yahoo.c:3462
+#: src/protocols/yahoo/yahoo.c:936 src/protocols/yahoo/yahoo.c:3437
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:763
+#: src/protocols/yahoo/yahoo.c:981
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#. *
-#: src/protocols/yahoo/yahoo.c:853
-#, fuzzy, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr ""
-"\n"
-"\n"
-"Дали сакаш да го додадеш во листата на пријатели?"
-
-#: src/protocols/yahoo/yahoo.c:859
-#, fuzzy
-msgid "Message (optional) :"
-msgstr "Известување за порака"
-
-#: src/protocols/yahoo/yahoo.c:901
+#: src/protocols/yahoo/yahoo.c:1048
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:904
+#: src/protocols/yahoo/yahoo.c:1051
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:907
+#: src/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1659
+#: src/protocols/yahoo/yahoo.c:1815
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10324,31 +10324,31 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1662
+#: src/protocols/yahoo/yahoo.c:1818
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1735
+#: src/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1738
+#: src/protocols/yahoo/yahoo.c:1893
 msgid "Ignore buddy?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1772
+#: src/protocols/yahoo/yahoo.c:1927
 msgid "Invalid username."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1783
+#: src/protocols/yahoo/yahoo.c:1938
 #, fuzzy
 msgid "Normal authentication failed!"
 msgstr "Авторизирање"
 
-#: src/protocols/yahoo/yahoo.c:1784
+#: src/protocols/yahoo/yahoo.c:1939
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10356,117 +10356,98 @@
 "reduced functionality and features."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1792
+#: src/protocols/yahoo/yahoo.c:1947
 msgid "Incorrect password."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1795
+#: src/protocols/yahoo/yahoo.c:1950
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1798
+#: src/protocols/yahoo/yahoo.c:1953
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1852
+#: src/protocols/yahoo/yahoo.c:2007
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1855
+#: src/protocols/yahoo/yahoo.c:2010
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo.c:2243
-#: src/protocols/yahoo/ycht.c:415
+#: src/protocols/yahoo/yahoo.c:2247 src/protocols/yahoo/yahoo.c:2395
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2393
-#: src/protocols/yahoo/yahoo.c:2477 src/protocols/yahoo/yahoo.c:2487
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-#: src/protocols/yahoo/ycht.c:519
+#: src/protocols/yahoo/yahoo.c:2417 src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2577 src/protocols/yahoo/yahoo.c:2587
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:3192
+#: src/protocols/yahoo/yahoo.c:2681 src/protocols/yahoo/yahoo.c:3048
+#: src/protocols/yahoo/yahoo.c:3162
 msgid "Not At Home"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:3195
+#: src/protocols/yahoo/yahoo.c:2683 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3163
 msgid "Not At Desk"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:3198
+#: src/protocols/yahoo/yahoo.c:2685 src/protocols/yahoo/yahoo.c:3052
+#: src/protocols/yahoo/yahoo.c:3164
 msgid "Not In Office"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:3204
+#: src/protocols/yahoo/yahoo.c:2689 src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/yahoo/yahoo.c:3166
 msgid "On Vacation"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:3210
+#: src/protocols/yahoo/yahoo.c:2693 src/protocols/yahoo/yahoo.c:3060
+#: src/protocols/yahoo/yahoo.c:3168
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2692 src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2774 src/protocols/yahoo/yahoo.c:2800
 msgid "Not on server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2802
-#, fuzzy
-msgid "Appear Online"
-msgstr "Исклучен "
-
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2824
-#, fuzzy
-msgid "Appear Permanently Offline"
-msgstr "Исклучен "
-
-#: src/protocols/yahoo/yahoo.c:2763
-#, fuzzy
-msgid "Stealth"
-msgstr "Барај"
-
-#: src/protocols/yahoo/yahoo.c:2818
-#, fuzzy
-msgid "Don't Appear Permanently Offline"
-msgstr "Исклучен "
-
-#: src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2879
 msgid "Join in Chat"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2862
+#: src/protocols/yahoo/yahoo.c:2884
 msgid "Initiate Conference"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2887
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/yahoo/yahoo.c:2936
 msgid "Active which ID?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2929
+#: src/protocols/yahoo/yahoo.c:2945
 msgid "Join who in chat?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2955
 msgid "Activate ID..."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:2959
 msgid "Join user in chat..."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3505
+#: src/protocols/yahoo/yahoo.c:3479
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3509
+#: src/protocols/yahoo/yahoo.c:3483
 msgid "buzz: Buzz a contact to get their attention"
 msgstr ""
 
@@ -10480,301 +10461,297 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3588 src/protocols/yahoo/yahoo.c:3590
+#: src/protocols/yahoo/yahoo.c:3562 src/protocols/yahoo/yahoo.c:3564
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3609
+#: src/protocols/yahoo/yahoo.c:3583
 msgid "Yahoo Japan"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3612
+#: src/protocols/yahoo/yahoo.c:3586
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3615
+#: src/protocols/yahoo/yahoo.c:3589
 msgid "Japan Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3618
+#: src/protocols/yahoo/yahoo.c:3592
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3621
+#: src/protocols/yahoo/yahoo.c:3595
 msgid "File transfer host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3624
+#: src/protocols/yahoo/yahoo.c:3598
 #, fuzzy
 msgid "Japan File transfer host"
 msgstr "Пренос на датотеки"
 
-#: src/protocols/yahoo/yahoo.c:3627
+#: src/protocols/yahoo/yahoo.c:3601
 msgid "File transfer port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3630
+#: src/protocols/yahoo/yahoo.c:3604
 msgid "Chat Room Locale"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3633
+#: src/protocols/yahoo/yahoo.c:3607
 msgid "Chat Room List Url"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3636
+#: src/protocols/yahoo/yahoo.c:3610
 msgid "YCHT Host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3639
+#: src/protocols/yahoo/yahoo.c:3613
 #, fuzzy
 msgid "YCHT Port"
 msgstr "Порта"
 
-#: src/protocols/yahoo/yahoo_profile.c:677
+#: src/protocols/yahoo/yahoochat.c:206
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:208
+msgid "Invitation Rejected"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:363
+msgid "Failed to join chat"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:363
+msgid "Maybe the room is full?"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:441
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:616
+msgid "Failed to join buddy in chat"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:617
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1394
+msgid "Fetching the room list failed."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1447
+msgid "Voices"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1450
+msgid "Webcams"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+msgid "Unable to fetch room list."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1521
+msgid "User Rooms"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:753
+#: src/protocols/yahoo/yahoo_profile.c:751
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:754
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Profile"
 msgstr ""
 
+#: src/protocols/yahoo/yahoo_profile.c:796
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
 #: src/protocols/yahoo/yahoo_profile.c:798
 msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_profile.c:800
-msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:978
+#: src/protocols/yahoo/yahoo_profile.c:976
 msgid "Yahoo! ID"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1052
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
+#: src/protocols/yahoo/yahoo_profile.c:1050
+#: src/protocols/yahoo/yahoo_profile.c:1054
+#: src/protocols/yahoo/yahoo_profile.c:1058
 msgid "Hobbies"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1070
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: src/protocols/yahoo/yahoo_profile.c:1068
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Latest News"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1095
+#: src/protocols/yahoo/yahoo_profile.c:1093
 msgid "Home Page"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/yahoo/yahoo_profile.c:1108
 msgid "Cool Link 1"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1115
+#: src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1119
+#: src/protocols/yahoo/yahoo_profile.c:1117
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1132
+#: src/protocols/yahoo/yahoo_profile.c:1130
 #, fuzzy
 msgid "Last Update"
 msgstr "Презиме:"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1136
 #, c-format
 msgid "User information for %s unavailable"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1144
+#: src/protocols/yahoo/yahoo_profile.c:1142
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1160
+#: src/protocols/yahoo/yahoo_profile.c:1158
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1163
+#: src/protocols/yahoo/yahoo_profile.c:1161
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1171
+#: src/protocols/yahoo/yahoo_profile.c:1169
 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:205
-msgid "Invitation Rejected"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Failed to join chat"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Maybe the room is full?"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:438
-#, c-format
-msgid "You are now chatting in %s."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:613
-msgid "Failed to join buddy in chat"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:614
-msgid "Maybe they're not in a chat?"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1350
-msgid "Fetching the room list failed."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1403
-msgid "Voices"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1406
-msgid "Webcams"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-msgid "Unable to fetch room list."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1477
-msgid "User Rooms"
-msgstr ""
-
-#: src/protocols/yahoo/ycht.c:402
+#: src/protocols/yahoo/ycht.c:401
 msgid "Connection problem with the YCHT server."
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:331
+#: src/protocols/zephyr/zephyr.c:328
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
-msgid "Unable to send to chat %s,%s,%s"
-msgstr "Додади го разговорот во листата на пријатели"
-
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:676
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1118
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1123
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1125
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1408 src/protocols/zephyr/zephyr.c:1409
 msgid "Anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: src/protocols/zephyr/zephyr.c:2155
 msgid "_Class:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: src/protocols/zephyr/zephyr.c:2161
 msgid "_Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2167
 msgid "_Recipient:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: src/protocols/zephyr/zephyr.c:2178
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: src/protocols/zephyr/zephyr.c:2483
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: src/protocols/zephyr/zephyr.c:2488
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: src/protocols/zephyr/zephyr.c:2493
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2498
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2622
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2628
+#: src/protocols/zephyr/zephyr.c:2504
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: src/protocols/zephyr/zephyr.c:2509
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: src/protocols/zephyr/zephyr.c:2515
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: src/protocols/zephyr/zephyr.c:2521
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: src/protocols/zephyr/zephyr.c:2527
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: src/protocols/zephyr/zephyr.c:2532
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: src/protocols/zephyr/zephyr.c:2638
 msgid "Resubscribe"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: src/protocols/zephyr/zephyr.c:2641
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -10788,462 +10765,214 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2724 src/protocols/zephyr/zephyr.c:2726
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2751
 msgid "Export to .anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2754
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2880
-msgid "Import from .anyone"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2883
-msgid "Import from .zephyr.subs"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2886
-msgid "Realm"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2889
+#: src/protocols/zephyr/zephyr.c:2757
 msgid "Exposure"
 msgstr ""
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:1038
+#: src/proxy.c:958
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 
-#: src/proxy.c:1042
+#: src/proxy.c:962
 #, c-format
 msgid "Proxy connection error %d"
 msgstr ""
 
-#: src/proxy.c:1876
+#: src/proxy.c:1790
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: src/proxy.c:1876
+#: src/proxy.c:1790
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
+#. * Custom away message.
+#: src/prpl.h:187
+msgid "Custom"
+msgstr ""
+
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1276
+#: src/request.h:1255
 msgid "Accept"
 msgstr ""
 
-#: src/server.c:351
+#: src/server.c:64
+msgid "Please enter your password"
+msgstr ""
+
+#: src/server.c:533
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr ""
 
-#: src/server.c:733
+#: src/server.c:978
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/server.c:747
+#: src/server.c:992
 msgid "(1 message)"
 msgstr ""
 
-#: src/server.c:1008
+#: src/server.c:1215 src/server.c:1224
+#, c-format
+msgid "%s logged in."
+msgstr ""
+
+#: src/server.c:1236
+#, c-format
+msgid "%s signed on"
+msgstr ""
+
+#: src/server.c:1251
+#, c-format
+msgid "%s came back"
+msgstr ""
+
+#: src/server.c:1253
+#, c-format
+msgid "%s went away"
+msgstr ""
+
+#: src/server.c:1267
+#, c-format
+msgid "%s became idle"
+msgstr ""
+
+#: src/server.c:1278
+#, c-format
+msgid "%s became unidle"
+msgstr ""
+
+#: src/server.c:1288 src/server.c:1295
+#, c-format
+msgid "%s logged out."
+msgstr ""
+
+#: src/server.c:1308
+#, c-format
+msgid "%s signed off"
+msgstr ""
+
+#: src/server.c:1370
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+
+#: src/server.c:1373
+msgid "an anonymous person"
+msgstr ""
+
+#: src/server.c:1487
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
-"%s"
-msgstr ""
-
-#: src/server.c:1013
+"<b>%s</b>"
+msgstr ""
+
+#: src/server.c:1493
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr ""
 
-#: src/server.c:1017
+#: src/server.c:1502
 msgid "Accept chat invitation?"
 msgstr "Прифати ја поканата за разговор?"
 
-#: src/status.c:153
-#, fuzzy
-msgid "Unset"
-msgstr "Корисници"
-
-#: src/status.c:626
-#, c-format
-msgid "%s came back"
-msgstr ""
-
-#: src/status.c:631
-#, c-format
-msgid "%s went away"
-msgstr ""
-
-#: src/status.c:1314
-#, c-format
-msgid "%s became idle"
-msgstr ""
-
-#: src/status.c:1330
-#, c-format
-msgid "%s became unidle"
-msgstr ""
-
-#: src/util.c:2120
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr "Грешка при записот на сликата: %s"
-
-#: src/util.c:2121
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file been renamed to %s~."
-msgstr ""
-
-#: src/util.c:2558
+#. for people like myself who are too lazy to add an away msg :)
+#. I don't know who "myself" is in this context.  The exclamation point
+#. * makes it slightly less boring ;)
+#: src/status.c:36
+msgid "Sorry, I ran out for a bit!"
+msgstr ""
+
+#: src/stock.c:87
+msgid "_Alias"
+msgstr "_Алиас"
+
+#: src/stock.c:89
+#, fuzzy
+msgid "_Invite"
+msgstr "Покани"
+
+#: src/stock.c:90
+msgid "_Modify"
+msgstr "_Измени"
+
+#: src/stock.c:91
+msgid "_Open Mail"
+msgstr "_Отвори пошта"
+
+#: src/stock.c:93
+msgid "_Warn"
+msgstr "_Предупреди"
+
+#: src/util.c:2396
 msgid "Calculating..."
 msgstr "_Пресметувам..."
 
-#: src/util.c:2561
+#: src/util.c:2399
 msgid "Unknown."
 msgstr "_Непознато."
 
-#: src/util.c:2591
+#: src/util.c:2429
 #, fuzzy
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "Испрати"
 msgstr[1] "Испрати"
 
-#: src/util.c:2605
-#, fuzzy
+#: src/util.c:2443
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ден"
 msgstr[1] "ден"
 msgstr[2] "ден"
 
-#: src/util.c:2613
-#, fuzzy
+#: src/util.c:2451
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "час"
 msgstr[2] "час"
 
-#: src/util.c:2621
-#, fuzzy
+#: src/util.c:2459
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минута"
 msgstr[2] "минута"
 
-#: src/util.c:3041
+#: src/util.c:2879
 msgid "g003: Error opening connection.\n"
 msgstr ""
 
-#~ msgid "Mail Server"
-#~ msgstr "Сервер за пошта"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d нови/%d вкупно)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Провери пошта"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Провери пошта на секои X секунди.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Автоматска најава"
-
-#, fuzzy
-#~ msgid "Log Out"
-#~ msgstr "Логин опции"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Кога е отворен нов прозорец за разговор,овој додаток ќе го внеси "
-#~ "последниот разговор во тековниот."
-
-#, fuzzy
-#~ msgid "Auto log in"
-#~ msgstr "Автоматска најава"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Покажи помалку опции"
-
-#, fuzzy
-#~ msgid "Auto Log In"
-#~ msgstr "Автоматска најава"
-
-#, fuzzy
-#~ msgid "/Buddies/_Log Out"
-#~ msgstr "/Пријатели/Излез"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Алатки/_Отсутен"
-
-#~ msgid "Rename Group"
-#~ msgstr "Преименувај група"
-
-#~ msgid "New group name"
-#~ msgstr "Ново има на групата"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Внеси ново има за означената група."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Акаунт:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Неактивен:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Предупреден:</b>"
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Алатки/Отсутен"
-
-#~ msgid "Done."
-#~ msgstr "Завршено."
-
-#, fuzzy
-#~ msgid "Logging in: "
-#~ msgstr "Логин опции"
-
-#, fuzzy
-#~ msgid "Logging In"
-#~ msgstr "Најава"
-
-#~ msgid "Cancel All"
-#~ msgstr "Откажи ги сите"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Разговор/_Предупреди..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Разговор/Предупреди..."
-
-#~ msgid "Block the user"
-#~ msgstr "Блокирај го корисникот"
-
-#, fuzzy
-#~ msgid "Send a file to the user"
-#~ msgstr "Испрати порака до одбраниот пријател"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Додади го корисникот во листата на пријатели"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Острани го корисникот од листата на пријатели"
-
-#~ msgid "Send"
-#~ msgstr "Испрати"
-
-#~ msgid "Invite"
-#~ msgstr "Покани"
-
-#~ msgid "Invite a user"
-#~ msgstr "Покани корисник"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Додади го разговорот во листата на пријатели"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Разговор/Затвори"
-
-#~ msgid "Warn User"
-#~ msgstr "Предупреди го корисникот"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Предупреди %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Предупреди _анонимно?"
-
-#, fuzzy
-#~ msgid "<b>_Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Акаунт:</b>"
-
-#, fuzzy
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>Лозинка:</b>"
-
-#, fuzzy
-#~ msgid "A_ccounts"
-#~ msgstr "Акаунти"
-
-#, fuzzy
-#~ msgid "P_references"
-#~ msgstr "Параметри"
-
-#, fuzzy
-#~ msgid "_Log in"
-#~ msgstr "Најава"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Игнорирај типови на фонт"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Игнорирај големинина фонт"
-
-#, fuzzy
-#~ msgid "New conversation _placement:"
-#~ msgstr "Затвори разговор"
-
-#, fuzzy
-#~ msgid "Logging in: %s"
-#~ msgstr "Логин опции"
-
-#, fuzzy
-#~ msgid "Error reading from %s server"
-#~ msgstr "Грешка при записот на сликата: %s"
-
-#~ msgid "Signoff"
-#~ msgstr "Одјави се"
-
 #~ msgid "Local Addressbook"
 #~ msgstr "Локален адресар"
 
-#~ msgid "Away!"
-#~ msgstr "Отсутен!"
-
-#, fuzzy
-#~ msgid "Edit This Message"
-#~ msgstr "Испрати како порака"
-
-#~ msgid "I'm Back!"
-#~ msgstr "Се вратив!"
-
-#, fuzzy
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Сигурно сакаш да избришеш %s?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Отстрани порака за отсуство"
-
-#~ msgid "Set All Away"
-#~ msgstr "Постави „Отсутен“ на сите"
-
-#, fuzzy
-#~ msgid "_Save"
-#~ msgstr "Зачувај"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Пријатели/Исклучи се"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Испрати порака до одбраниот пријател"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Види информации за одбраниот пријател"
-
-#~ msgid "_Chat"
-#~ msgstr "_Разговор"
-
-#~ msgid "_Away"
-#~ msgstr "_Отсутен"
-
-#~ msgid "Set an away message"
-#~ msgstr "Намести порака за отсуство"
-
-#~ msgid "Signon: "
-#~ msgstr "Најавување: "
-
-#~ msgid "Signon"
-#~ msgstr "Најава"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Види причина за отсуство"
-
-#~ msgid "Warn"
-#~ msgstr "Предупреди"
-
-#~ msgid "Warn the user"
-#~ msgstr "Предупреди го корисникот"
-
-#~ msgid "Send Message"
-#~ msgstr "Испрати порака"
-
 #, fuzzy
 #~ msgid "_Accounts"
 #~ msgstr "Акаунти"
@@ -11252,12 +10981,17 @@
 #~ msgid "_Preferences"
 #~ msgstr "Параметри"
 
-#~ msgid "Connecting..."
-#~ msgstr "Поврзување..."
+#, fuzzy
+#~ msgid "Update Buddy Icon"
+#~ msgstr "Икона на пријател:"
 
 #~ msgid "Syncing with server"
 #~ msgstr "Синхронизирање со серверот"
 
+#, fuzzy
+#~ msgid "Error reading from %s server"
+#~ msgstr "Грешка при записот на сликата: %s"
+
 #~ msgid "Notification"
 #~ msgstr "Известување"