changeset 5111:a262ecfd83bb

[gaim-migrate @ 5474] Danilo Segan (dsegan) updated the serbian translation. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 11 Apr 2003 13:32:47 +0000 (2003-04-11)
parents 496ea7c1b77b
children 463b03cd8c90
files po/sr.po
diffstat 1 files changed, 1315 insertions(+), 1248 deletions(-) [+]
line wrap: on
line diff
--- a/po/sr.po	Fri Apr 11 08:09:21 2003 +0000
+++ b/po/sr.po	Fri Apr 11 13:32:47 2003 +0000
@@ -6,67 +6,69 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.60\n"
-"POT-Creation-Date: 2003-04-02 15:20+0200\n"
-"PO-Revision-Date: 2003-0-02 15:49+0100\n"
-"Last-Translator: �舒仆亳仍仂 丿亠亞舒仆<dsegan@gmx.net>\n"
+"POT-Creation-Date: 2003-04-11 14:45+0200\n"
+"PO-Revision-Date: 2003-04-08 17:26+0200\n"
+"Last-Translator: �舒仆亳仍仂 丿亠亞舒仆 <dsegan@gmx.net>\n"
 "Language-Team: 弌�仗�从亳 (�亳�亳仍亳�舒) <dsegan@gmx.net>\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"
-
-#: plugins/docklet/docklet.c:97 src/multi.c:280 src/win32/systray.c:295
+"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"
+
+#: plugins/docklet/docklet.c:95 src/multi.c:284 src/win32/systray.c:296
 msgid "Auto-login"
 msgstr "弌舒仄仂 仗�亳�舒于舒"
 
-#: plugins/docklet/docklet.c:102
+#: plugins/docklet/docklet.c:98
 msgid "New Message.."
 msgstr "�仂于舒 仗仂��从舒..."
 
-#: plugins/docklet/docklet.c:103
+#: plugins/docklet/docklet.c:99
 msgid "Join A Chat..."
 msgstr "��亳从���亳 �亠 �舒亰亞仂于仂��..."
 
-#: plugins/docklet/docklet.c:134
+#: plugins/docklet/docklet.c:130
 msgid "New..."
 msgstr "�仂于舒..."
 
-#: plugins/docklet/docklet.c:138 src/buddy.c:1274 src/prefs.c:1037
-#: src/protocols/gg/gg.c:71 src/protocols/jabber/jabber.c:1157
-#: src/protocols/oscar/oscar.c:2757 src/protocols/oscar/oscar.c:4438
-#: src/protocols/oscar/oscar.c:5559
+#: plugins/docklet/docklet.c:134 src/buddy.c:1281 src/gtkpounce.c:500
+#: src/prefs.c:1057 src/protocols/gg/gg.c:71
+#: src/protocols/jabber/jabber.c:1159 src/protocols/jabber/jabber.c:3348
+#: src/protocols/jabber/jabber.c:3395 src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:4394 src/protocols/oscar/oscar.c:5489
 msgid "Away"
 msgstr "�亟���舒仆"
 
-#: plugins/docklet/docklet.c:144 src/away.c:511
+#: plugins/docklet/docklet.c:140 src/away.c:511
 msgid "Back"
 msgstr "�舒亰舒亟"
 
-#: plugins/docklet/docklet.c:152
+#: plugins/docklet/docklet.c:148
 msgid "Mute Sounds"
 msgstr "丕�亳�舒� 亰于�从"
 
-#: plugins/docklet/docklet.c:157
+#: plugins/docklet/docklet.c:153
 msgid "File Transfers..."
 msgstr "��亠仆仂�亳 亟舒�仂�亠从舒..."
 
-#: plugins/docklet/docklet.c:158
+#: plugins/docklet/docklet.c:154
 msgid "Accounts..."
 msgstr "�舒仍仂亰亳..."
 
-#: plugins/docklet/docklet.c:159
+#: plugins/docklet/docklet.c:155
 msgid "Preferences..."
 msgstr "�仂��舒于从亠..."
 
-#: plugins/docklet/docklet.c:168 src/win32/systray.c:118
+#: plugins/docklet/docklet.c:164 src/win32/systray.c:119
 msgid "Signoff"
 msgstr "�亟�舒于亳 �亠"
 
-#: plugins/docklet/docklet.c:174
+#: plugins/docklet/docklet.c:168
 msgid "Quit"
 msgstr "�亰仍舒亰"
 
-#: plugins/docklet/docklet.c:479
+#: plugins/docklet/docklet.c:443
 msgid "Tray Icon Configuration"
 msgstr "�仂亟亠�舒于舒�舒 亳从仂仆亳�亠 仆舒 仗舒仆亠仍�"
 
@@ -74,15 +76,15 @@
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
 #. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:488
+#: plugins/docklet/docklet.c:452
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_��亳从�亳� 仆仂于亠 仗仂��从亠 亟仂从 �亠 仆亠 仗�亳�亳�仆亠 亳从仂仆亳�舒 仆舒 仗舒仆亠仍�"
 
-#: plugins/docklet/docklet.c:500 plugins/docklet/docklet.c:509
+#: plugins/docklet/docklet.c:464 plugins/docklet/docklet.c:473
 msgid "System Tray Icon"
 msgstr "�从仂仆亳�舒 仆舒 仗舒仆亠仍�"
 
-#: plugins/docklet/docklet.c:502 plugins/docklet/docklet.c:513
+#: plugins/docklet/docklet.c:466 plugins/docklet/docklet.c:477
 msgid ""
 "Interacts with a Notification Area applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
@@ -95,18 +97,6 @@
 "亟��亞舒�舒 亳仍亳 亰舒 仗�亳�舒于�. 丐舒从仂�亠, 仂仄仂亞��舒于舒 亳 仂亟仍舒亞舒�亠 仗仂��从舒 亟仂从 �亠 仆亠 从仍亳从仆亠 "
 "仆舒 亳从仂仆亳��, �仍亳�仆仂 从舒仂 亳 ICQ."
 
-#: plugins/ticker/ticker.c:95
-msgid "Gaim - Buddy Ticker"
-msgstr "Gaim �� ��舒从舒 �舒 �仗亳�从仂仄 亟��亞舒�舒"
-
-#: plugins/ticker/ticker.c:411 plugins/ticker/ticker.c:437
-msgid "Buddy Ticker"
-msgstr "丐�舒从舒 �舒 �仗亳�从仂仄 亟��亞舒�舒"
-
-#: plugins/ticker/ticker.c:415 plugins/ticker/ticker.c:439
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "�仂亟仂�舒于仆舒 于舒�亳�舒仆�舒 �仗亳�从舒 于舒�亳� 亟��亞舒�舒."
-
 #: plugins/autorecon.c:58
 msgid "Autoreconnect"
 msgstr "丼�于舒�亳 于亠亰�"
@@ -119,57 +109,57 @@
 msgid "Auto Reconnect"
 msgstr "丼�于舒�亳 于亠亰�"
 
-#: plugins/chatlist.c:78 src/buddy_chat.c:268
+#: plugins/chatlist.c:74 src/buddy_chat.c:268
 msgid "Buddy Chat"
 msgstr "�舒亰亞仂于仂� �舒 亟��亞舒�仂仄"
 
-#: plugins/chatlist.c:166 plugins/chatlist.c:168 plugins/chatlist.c:358
-#: plugins/chatlist.c:360
+#: plugins/chatlist.c:162 plugins/chatlist.c:164 plugins/chatlist.c:347
+#: plugins/chatlist.c:349
 msgid "Gaim Chat"
 msgstr "Gaim �舒亰亞仂于仂�"
 
-#: plugins/chatlist.c:309
+#: plugins/chatlist.c:305
 msgid "Chat Rooms"
 msgstr "��亳�舒仂仆亳�亠"
 
-#: plugins/chatlist.c:321
+#: plugins/chatlist.c:316
 msgid "Refresh"
 msgstr "��于亠亢亳"
 
-#: plugins/chatlist.c:322 src/dialogs.c:2218 src/gtkconv.c:774
-#: src/gtkconv.c:2608 src/gtkconv.c:3739 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2600 src/prpl.c:733
+#: plugins/chatlist.c:317 src/dialogs.c:2163 src/gtkconv.c:794
+#: src/gtkconv.c:2623 src/gtkconv.c:3758 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/oscar/oscar.c:2556 src/prpl.c:737
 msgid "Add"
 msgstr "�仂亟舒�"
 
-#: plugins/chatlist.c:323 src/gtkconv.c:772 src/gtkconv.c:2614
-#: src/gtkconv.c:3730
+#: plugins/chatlist.c:318 src/gtkconv.c:792 src/gtkconv.c:2629
+#: src/gtkconv.c:3749
 msgid "Remove"
 msgstr "丕从仍仂仆亳"
 
+#: plugins/chatlist.c:330
+msgid "List of available chats"
+msgstr "弌仗亳�舒从 �于亳� _�舒亰亞仂于仂�舒"
+
 #: plugins/chatlist.c:339
-msgid "List of available chats"
-msgstr "弌仗亳�舒从 亟仂���仗仆亳� �舒亰亞仂于仂�舒"
-
-#: plugins/chatlist.c:349
 msgid "List of subscribed chats"
 msgstr "弌仗亳�舒从 仗�亠�仗仍舒�亠仆亳� �舒亰亞仂于仂�舒"
 
-#: plugins/chatlist.c:413 plugins/chatlist.c:423
+#: plugins/chatlist.c:400 plugins/chatlist.c:410
 msgid "Chat List"
 msgstr "弌仗亳�舒从 �舒亰亞仂于仂�舒"
 
+#: plugins/chatlist.c:402
+msgid "Allows you to add chat rooms to your buddy list."
+msgstr "�仂亰于仂�舒于舒 亟舒 亟仂亟舒�亠 仗�亳�舒仂仆亳�亠 � 于舒� �仗亳�舒从 亟��亞舒�舒."
+
 #: plugins/chatlist.c:415
-msgid "Allows you to add chat rooms to your buddy list."
-msgstr "�仄仂亞��舒于舒 于舒仄 亟舒 亟仂亟舒�亠 仗�亳�舒仂仆亳�亠 � �仗亳�舒从 于舒�亳� 亟��亞舒�舒."
-
-#: plugins/chatlist.c:428
 msgid ""
 "Allows you to add chat rooms to your buddy list. Click the configure button "
 "to choose which rooms."
 msgstr ""
-"�仄仂亞��舒于舒 亟舒 亟仂亟舒�亠 亳 仗�亳�舒仂仆亳�亠 � �仗亳�舒从 亟��亞舒�舒. �仍亳从仆亳�亠 仆舒 亟�亞仄亠 亰舒 "
-"仗仂亟亠�舒于舒�舒 亟舒 亳亰舒弍亠�亠�亠 从仂�亠 仗�亳�舒仂仆亳�亠 亢亠仍亳�亠."
+"�仄仂亞��舒于舒 于舒仄 亟舒 亟仂亟舒�亠 仗�亳�舒仂仆亳�亠 � 于舒� �仗亳�舒从 亟��亞舒�舒. ��亳�亳�仆亳�亠 亟�亞仄亠 亰舒 "
+"仗仂亟亠�舒于舒�亠 亟舒 弍亳��亠 亳亰舒弍�舒仍亳 从仂�亠 仗�亳�舒仂仆亳�亠."
 
 #: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
@@ -228,7 +218,7 @@
 msgid "Idle Time"
 msgstr "��亠仄亠 仆亠�舒亟舒"
 
-#: plugins/idle.c:107 src/prefs.c:902
+#: plugins/idle.c:107
 msgid "Set"
 msgstr "�仂��舒于亳"
 
@@ -244,77 +234,77 @@
 msgid "_Set"
 msgstr "_�仂��舒于亳"
 
-#: plugins/notify.c:428
+#: plugins/notify.c:440
 msgid "Unable to write to config file"
 msgstr "�亠 仄仂亢亠 亟舒 �仗亳�亠 � 亟舒�仂�亠从� �舒 仗仂��舒于从舒仄舒"
 
-#: plugins/notify.c:428
+#: plugins/notify.c:440
 msgid "Notify plugin"
 msgstr "�仂亟舒�舒从 亰舒 仂弍舒于亠��亠�舒"
 
-#: plugins/notify.c:586 plugins/notify.c:595
+#: plugins/notify.c:598 plugins/notify.c:607
 msgid "Message Notification"
 msgstr "�弍舒于亠��亠�舒 仂 仗仂��从舒仄舒"
 
-#: plugins/notify.c:588 plugins/notify.c:599
+#: plugins/notify.c:600 plugins/notify.c:611
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "�仄仂亞��舒于舒 �舒亰仆亠 仆舒�亳仆亠 亰舒 仂弍舒于亠��舒于舒�亠 仂 仆亠仗�仂�亳�舒仆亳仄 仗仂��从舒仄舒."
 
-#: plugins/notify.c:609
+#: plugins/notify.c:621
 msgid "Notify For"
 msgstr "�弍舒于亠��舒于舒� 仂"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:622
 msgid "_IM windows"
 msgstr "弍�亰亳仄 仗仂��从舒仄舒"
 
-#: plugins/notify.c:615
+#: plugins/notify.c:627
 msgid "_Chat windows"
 msgstr "�舒亰亞仂于仂�亳仄舒"
 
 #. --------------
-#: plugins/notify.c:621
+#: plugins/notify.c:633
 msgid "Notification Methods"
 msgstr "�舒�亳仆亳 仂弍舒于亠��舒于舒�舒"
 
-#: plugins/notify.c:624
+#: plugins/notify.c:636
 msgid "Prepend _string into window title (hit enter to save):"
 msgstr "�仂亟舒�亳 �亠从�� � 仆舒�仍仂于 仗�仂亰仂�舒 (仗�亳�亳�仆亳�亠 亠仆�亠� 亟舒 �仆亳仄亳�亠):"
 
-#: plugins/notify.c:635
+#: plugins/notify.c:647
 msgid "_Quote window title"
 msgstr "_丶亳�亳�舒� 仆舒�仍仂于 仗�仂亰仂�舒"
 
-#: plugins/notify.c:640
+#: plugins/notify.c:652
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "�仂�舒�亳 仆舒亞仂于亠��舒� ��_丱亳�仆仂�� �仗�舒于仆亳从� 仗�仂亰仂�舒"
 
-#: plugins/notify.c:645
+#: plugins/notify.c:657
 msgid "Insert c_ount of new messages into window title"
 msgstr "丕弍舒�亳 _弍�仂� 仆仂于亳� 仗仂��从舒 � 仆舒�仍仂于 仗�仂亰仂�舒"
 
-#: plugins/notify.c:650
+#: plugins/notify.c:662
 msgid "_Notify even if conversation is in focus"
 msgstr "_�弍舒于亠��亳 �舒从 亳 舒从仂 �亠 �舒亰亞仂于仂� � �仂从�"
 
 #. --------------
-#: plugins/notify.c:656
+#: plugins/notify.c:668
 msgid "Notification Removal"
 msgstr "丕从仍舒�舒�亠 仂弍舒于亠��亠�舒"
 
-#: plugins/notify.c:657
+#: plugins/notify.c:669
 msgid "Remove when conversation window gains _focus"
 msgstr "丕从仍仂仆亳 从舒亟舒 仗�仂亰仂� �舒亰亞仂于仂�舒 ��亠 � _亢亳亢�"
 
-#: plugins/notify.c:662
+#: plugins/notify.c:674
 msgid "Remove when conversation window _receives click"
 msgstr "丕从仍仂仆亳 仗仂 从_仍亳从� 仆舒 仗�仂亰仂� �舒亰亞仂于仂�舒"
 
-#: plugins/notify.c:667
+#: plugins/notify.c:679
 msgid "Remove when _typing in conversation window"
 msgstr "丕从仍仂仆亳 仗�亳 _从��舒�� � 仗�仂亰仂�� �舒亰亞仂于仂�舒"
 
-#: plugins/notify.c:672
+#: plugins/notify.c:684
 msgid "Appl_y"
 msgstr "_��亳仄亠仆亳"
 
@@ -372,28 +362,28 @@
 msgstr "�仂亟舒于舒�亠 仂亰仆舒从舒 ��亠仆��从舒 � �舒亰亞仂于仂� 仗亠�亳仂亟亳�仆仂."
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:212
+#: plugins/gestures/gestures.c:213
 msgid "Mouse Gestures Configuration"
 msgstr "�仂仆舒�舒�亠 仄亳�舒"
 
-#: plugins/gestures/gestures.c:219
+#: plugins/gestures/gestures.c:220
 msgid "Middle mouse button"
 msgstr "弌�亠亟�亠 亟�亞仄亠 仄亳�舒"
 
-#: plugins/gestures/gestures.c:224
+#: plugins/gestures/gestures.c:225
 msgid "Right mouse button"
 msgstr "�亠�仆仂 亟�亞仄亠 仄亳�舒"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:236
+#: plugins/gestures/gestures.c:237
 msgid "_Visual gesture display"
 msgstr "��亳从舒亰 仗仂仆舒�舒�舒 仄亳�舒"
 
-#: plugins/gestures/gestures.c:252 plugins/gestures/gestures.c:271
+#: plugins/gestures/gestures.c:253 plugins/gestures/gestures.c:272
 msgid "Mouse Gestures"
 msgstr "�仂仆舒�舒�亠 仄亳�舒"
 
-#: plugins/gestures/gestures.c:255 plugins/gestures/gestures.c:277
+#: plugins/gestures/gestures.c:256 plugins/gestures/gestures.c:278
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -409,6 +399,18 @@
 "�仂于��亳�亠 亞仂�亠 亳 仂仆亟舒 仆舒 仍亠于仂 亟舒 �亠 仗�亠弍舒�亳�亠 仆舒 仗�亠��仂亟仆亳 �舒亰亞仂于仂�.\n"
 "�仂于��亳�亠 亞仂�亠 亳 仂仆亟舒 仆舒 亟亠�仆仂 亟舒 �亠 仗�亠弍舒�亳�亠 仆舒 �仍亠亟亠�亳 �舒亰亞仂于仂�."
 
+#: plugins/ticker/ticker.c:95
+msgid "Gaim - Buddy Ticker"
+msgstr "Gaim �� ��舒从舒 �舒 �仗亳�从仂仄 亟��亞舒�舒"
+
+#: plugins/ticker/ticker.c:411 plugins/ticker/ticker.c:437
+msgid "Buddy Ticker"
+msgstr "丐�舒从舒 �舒 �仗亳�从仂仄 亟��亞舒�舒"
+
+#: plugins/ticker/ticker.c:415 plugins/ticker/ticker.c:439
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "�仂亟仂�舒于仆舒 于舒�亳�舒仆�舒 �仗亳�从舒 于舒�亳� 亟��亞舒�舒."
+
 #: plugins/win32/transparency/win2ktrans.c:123
 #: plugins/win32/transparency/win2ktrans.c:432
 #: plugins/win32/transparency/win2ktrans.c:466
@@ -427,55 +429,55 @@
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"�于舒� 亟仂亟舒�舒从 仂仄仂亞��舒于舒 仗�仂仄亠仆�亳于� 仗�仂于亳亟仆仂�� 仗�仂亰仂�舒 亰舒 �舒亰亞仂于仂�.\n"
+"�于舒� 亟仂亟舒�舒从 仂仄仂亞��舒于舒 仗�仂仄亠仆�亳于� 仗�仂于亳亟仆仂�� 仗�仂亰仂�舒 亰舒 �舒亰亞仂于仂�亠.\n"
 "\n"
-"* �舒仗仂仄亠仆舒: �于舒� 亟仂亟舒�舒从 亰舒��亠于舒 �亳仆亟仂�� 2000 亳仍亳 �从�-�亠"
+"�舒仗仂仄亠仆舒: �于舒� 亟仂亟舒�舒从 亰舒��亠于舒 �亳仆亟仂�� 2000 亳仍亳 �从��亠."
 
 #. IM Convo trans options
 #: plugins/win32/transparency/win2ktrans.c:413
 msgid "IM Conversation Windows"
-msgstr "��仂亰仂�亳 亰舒 弍�亰亠 仗仂��从亠"
+msgstr "��仂亰仂��亳�亳 �舒 �舒亰亞仂于仂�亳仄舒"
 
 #: plugins/win32/transparency/win2ktrans.c:414
 msgid "_IM window transparency"
-msgstr "��仂于亳亟仆仂�� 仗�仂亰仂�舒 亰舒 _弍�亰亠 仗仂��从亠"
+msgstr "_��仂于亳亟仆仂�� 仗�仂亰仂�舒 仗仂��从舒"
 
 #: plugins/win32/transparency/win2ktrans.c:424
 msgid "_Show slider bar in IM window"
-msgstr "��亳从舒亰舒�亳 _从仍亳亰舒� � 仗�仂亰仂�� 亰舒 弍�亰亠 仗仂��从亠"
+msgstr "��亳从舒亢亳 _从仍亳亰舒� � 仗�仂亰仂�� 仗仂��从亠"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:449 src/prefs.c:550
+#: plugins/win32/transparency/win2ktrans.c:449 src/prefs.c:572
 msgid "Buddy List Window"
 msgstr "��仂亰仂� �舒 �仗亳�从仂仄 亟��亞舒�舒"
 
 #: plugins/win32/transparency/win2ktrans.c:450
 msgid "_Keep Buddy List window on top"
-msgstr "_��亢舒�亳 仗�仂亰仂� �舒 �仗亳�从仂仄 亟��亞舒�舒 仆舒 于���"
+msgstr "_��亢亳 仗�仂亰仂� �舒 �仗亳�从仂仄 亟��亞舒�舒 仆舒 于���"
 
 #: plugins/win32/transparency/win2ktrans.c:453
 msgid "_Buddy List window transparency"
-msgstr "_��仂于亳亟仆仂�� 仗�仂亰仂�舒 �舒 �仗亳�从仂仄 亟��亞舒�舒"
+msgstr "��仂于亳亟仆仂�_� 仗�仂亰仂�舒 �舒 �仗亳�从仂仄 亟��亞舒�舒"
 
 #: plugins/win32/winprefs/winprefs.c:144 plugins/win32/winprefs/winprefs.c:153
 msgid "WinGaim Options"
-msgstr "�仂��舒于从亠 WinGaim-舒"
+msgstr "�仂��舒于从亠 �亳仆亟仂�� �舒亳仄舒"
 
 #: plugins/win32/winprefs/winprefs.c:146 plugins/win32/winprefs/winprefs.c:157
 msgid "Options specific to Windows Gaim."
-msgstr "�仂��舒于从亠 仆舒�仂�亳�亠 亰舒 �亳仆亟仂�� Gaim."
+msgstr "�仂��舒于从亠 仆舒�仂�亳�亠 亰舒 �亳仆亟仂�� �舒亳仄."
 
 #. IM Convo trans options
 #: plugins/win32/winprefs/winprefs.c:170
 msgid "Startup"
-msgstr "��亳 仗仂从�亠�舒��"
+msgstr "�仂从�亠�舒�亠"
 
 #: plugins/win32/winprefs/winprefs.c:171
 msgid "_Start Gaim on Windows startup"
-msgstr "_�仂从�亠仆亳 Gaim 仗�亳 仗仂从�亠�舒�� �亳仆亟仂��舒"
-
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1165
-#: src/protocols/msn/msn.c:1515 src/protocols/msn/msn.c:1618
+msgstr "_�仂从�亠仆亳 �舒亳仄 仗�亳 仗仂从�亠�舒�� �亳仆亟仂��舒."
+
+#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1167
+#: src/protocols/msn/msn.c:1515 src/protocols/msn/msn.c:1620
 #: src/protocols/yahoo/yahoo.c:1245 src/protocols/yahoo/yahoo.c:1324
 msgid "Available"
 msgstr "�仂���仗舒仆"
@@ -488,9 +490,10 @@
 msgid "Away for friends only"
 msgstr "�亟���舒仆 �舒仄仂 亰舒 仗�亳�舒�亠�亠"
 
-#: src/protocols/gg/gg.c:73 src/protocols/oscar/oscar.c:2761
-#: src/protocols/oscar/oscar.c:4426 src/protocols/oscar/oscar.c:4453
-#: src/protocols/oscar/oscar.c:5564 src/protocols/yahoo/yahoo.c:1062
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3351
+#: src/protocols/jabber/jabber.c:3407 src/protocols/oscar/oscar.c:2717
+#: src/protocols/oscar/oscar.c:4382 src/protocols/oscar/oscar.c:4409
+#: src/protocols/oscar/oscar.c:5494 src/protocols/yahoo/yahoo.c:1062
 #: src/protocols/yahoo/yahoo.c:1267 src/protocols/yahoo/yahoo.c:1334
 msgid "Invisible"
 msgstr "弌舒从�亳于亠仆"
@@ -607,11 +610,11 @@
 msgid "Active"
 msgstr "�从�亳于舒仆"
 
-#: src/gtkft.c:1004 src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4930
+#: src/gtkft.c:1004 src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4886
 msgid "Yes"
 msgstr "�舒"
 
-#: src/gtkft.c:1005 src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4930
+#: src/gtkft.c:1005 src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4886
 msgid "No"
 msgstr "�亠"
 
@@ -641,7 +644,7 @@
 msgstr "�仂仍"
 
 #. Line 5
-#: src/dialogs.c:1798 src/dialogs.c:2468 src/protocols/gg/gg.c:726
+#: src/dialogs.c:1762 src/dialogs.c:2396 src/protocols/gg/gg.c:726
 msgid "City"
 msgstr "��舒亟"
 
@@ -745,8 +748,8 @@
 msgid "Directory Search"
 msgstr "��亠��舒亞舒 亳仄亠仆亳从舒"
 
-#: src/dialogs.c:1904 src/dialogs.c:1914 src/protocols/gg/gg.c:1185
-#: src/protocols/jabber/jabber.c:4199 src/protocols/oscar/oscar.c:5752
+#: src/dialogs.c:1869 src/dialogs.c:1878 src/protocols/gg/gg.c:1185
+#: src/protocols/jabber/jabber.c:4223 src/protocols/oscar/oscar.c:5682
 #: src/protocols/toc/toc.c:1446
 msgid "Change Password"
 msgstr "��仂仄亠仆亳�亠 仍仂亰亳仆从�"
@@ -776,7 +779,7 @@
 "仗仂于亠亰亳于舒�� 仆舒 �亠�于亠� �舒 亳仄亠仆亳从仂仄. �仂仆仂于亳�亠 仗仂从��舒� 从舒�仆亳�亠. "
 
 #: src/protocols/gg/gg.c:1323 src/protocols/icq/gaim_icq.c:497
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3820
 msgid "Nick:"
 msgstr "�舒亟亳仄舒从:"
 
@@ -789,15 +792,14 @@
 msgstr "Gaim �亠 仆舒亳�舒仂 仆舒 亞�亠�从� 仗�亳 �仗仂�舒亰�仄亠于舒�� �舒 ICQ �亠�于亠�仂仄."
 
 #. Cancel button.
-#: src/buddy_chat.c:307 src/dialogs.c:472 src/dialogs.c:480 src/dialogs.c:1856
-#: src/dialogs.c:1979 src/dialogs.c:2044 src/dialogs.c:2207 src/dialogs.c:2402
-#: src/dialogs.c:2579 src/dialogs.c:3236 src/dialogs.c:3435 src/dialogs.c:3601
-#: src/dialogs.c:4109 src/dialogs.c:4782 src/gtkft.c:1098 src/multi.c:1377
-#: src/multi.c:1759 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/irc/irc.c:1355 src/protocols/oscar/oscar.c:2366
-#: src/protocols/oscar/oscar.c:2426 src/protocols/oscar/oscar.c:5413
-#: src/protocols/toc/toc.c:2041 src/prpl.c:313 src/prpl.c:733
-#: src/server.c:1065
+#: src/buddy_chat.c:307 src/dialogs.c:458 src/dialogs.c:466 src/dialogs.c:1819
+#: src/dialogs.c:1930 src/dialogs.c:1990 src/dialogs.c:2152 src/dialogs.c:2338
+#: src/dialogs.c:2487 src/dialogs.c:3130 src/dialogs.c:3529 src/dialogs.c:4033
+#: src/dialogs.c:4605 src/gtkft.c:1098 src/multi.c:1468 src/multi.c:1850
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1362
+#: src/protocols/oscar/oscar.c:2322 src/protocols/oscar/oscar.c:2382
+#: src/protocols/oscar/oscar.c:5369 src/protocols/toc/toc.c:2041
+#: src/prpl.c:320 src/prpl.c:737 src/server.c:1064
 msgid "Cancel"
 msgstr "��从舒亢亳"
 
@@ -806,15 +808,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "�仂�亳�仆亳从 %s (%s%s%s%s%s) 亢亠仍亳 亟舒 于舒� 亟仂亟舒 � �于仂� �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1654
-#: src/protocols/msn/msn.c:514 src/protocols/oscar/oscar.c:2538
-#: src/protocols/oscar/oscar.c:4964
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1655
+#: src/protocols/msn/msn.c:514 src/protocols/oscar/oscar.c:2494
+#: src/protocols/oscar/oscar.c:4920
 msgid "Authorize"
 msgstr "�于仍舒��亳"
 
-#: src/dialogs.c:2206 src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/jabber.c:1654 src/protocols/msn/msn.c:514
-#: src/protocols/oscar/oscar.c:2538 src/protocols/oscar/oscar.c:4964
+#: src/dialogs.c:2151 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1655 src/protocols/msn/msn.c:514
+#: src/protocols/oscar/oscar.c:2494 src/protocols/oscar/oscar.c:4920
 msgid "Deny"
 msgstr "�亟弍亳�"
 
@@ -822,9 +824,9 @@
 msgid "Send message through server"
 msgstr "�仂�舒�亳 仗仂��从� 从�仂亰 �亠�于亠�"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2271
-#: src/protocols/jabber/jabber.c:2303 src/protocols/jabber/jabber.c:4117
-#: src/protocols/jabber/jabber.c:4163 src/protocols/msn/msn.c:1178
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2273
+#: src/protocols/jabber/jabber.c:2305 src/protocols/jabber/jabber.c:4141
+#: src/protocols/jabber/jabber.c:4187 src/protocols/msn/msn.c:1178
 #: src/protocols/msn/msn.c:1208
 msgid "Unable to connect"
 msgstr "�亠 仄仂亢亠 亟舒 �亠 仗仂于亠亢亠"
@@ -837,7 +839,7 @@
 msgid "Gaim User"
 msgstr "Gaim 从仂�亳�仆亳从"
 
-#: src/protocols/irc/irc.c:196
+#: src/protocols/irc/irc.c:200
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -845,80 +847,82 @@
 "(�仂�仍仂 �亠 亟仂 亞�亠�从亠 仗�亳 仗�亠�于舒�舒�� 仂于亠 仗仂��从亠. ��仂于亠�亳�亠 ���舒仗亳��� ��舒于从� � "
 "丕�亠亟仆亳从� 仆舒仍仂亞舒)"
 
-#: src/protocols/irc/irc.c:496 src/protocols/irc/irc.c:2481
+#: src/protocols/irc/irc.c:500 src/protocols/irc/irc.c:2504
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC �舒亰亞仂于仂� �舒 %s 仗�亠从亳仆��"
 
-#: src/protocols/irc/irc.c:549 src/protocols/irc/irc.c:2490
+#: src/protocols/irc/irc.c:553 src/protocols/irc/irc.c:2513
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "DCC �舒亰亞仂于仂� �舒 %s 亰舒仗仂�亠�"
 
-#: src/protocols/irc/irc.c:683
+#: src/protocols/irc/irc.c:687
 msgid "No topic is set"
 msgstr "丐亠仄舒 仆亳�亠 仗仂��舒于�亠仆舒"
 
-#: src/protocols/irc/irc.c:704 src/protocols/irc/irc.c:1638
+#: src/protocols/irc/irc.c:708 src/protocols/irc/irc.c:1645
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s �亠 亳亰仄亠仆亳仂 �亠仄� �: %s</B>"
 
-#: src/protocols/irc/irc.c:749
+#: src/protocols/irc/irc.c:753
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr "-:- 仄仂亟/%s [%c%c %s] 仂亟 ���舒仆亠 %s"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1082
+#: src/protocols/irc/irc.c:1086
 msgid "Rehashing server"
 msgstr "��于亠亢舒于舒 �亠�于亠�"
 
-#: src/protocols/irc/irc.c:1082 src/protocols/irc/irc.c:1531
+#: src/protocols/irc/irc.c:1086 src/protocols/irc/irc.c:1538
 msgid "IRC Operator"
 msgstr "IRC �仗�舒于仆亳从"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1085
+#: src/protocols/irc/irc.c:1089
 msgid "No such nick/channel"
 msgstr "�亠 仗仂��仂�亳 �舒从舒于 仆舒亟亳仄舒从/从舒仆舒仍"
 
-#: src/protocols/irc/irc.c:1085 src/protocols/irc/irc.c:1088
-#: src/protocols/irc/irc.c:1090 src/protocols/irc/irc.c:1093
-#: src/protocols/irc/irc.c:1489
+#: src/protocols/irc/irc.c:1089 src/protocols/irc/irc.c:1092
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1496
 msgid "IRC Error"
 msgstr "IRC 亞�亠�从舒"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1088
+#: src/protocols/irc/irc.c:1092
 msgid "No such server"
 msgstr "�亠 仗仂��仂�亳 �舒� �亠�于亠�"
 
+#. ERR_NOMOTD
+#. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1090
+#: src/protocols/irc/irc.c:1097
 msgid "No nickname given"
 msgstr "�亳�亠 仆舒于亠亟亠仆 仆舒亟亳仄舒从"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1093
+#: src/protocols/irc/irc.c:1100
 msgid "You're not an IRC operator!"
 msgstr "丐亳 仆亳�亳 IRC �仗�舒于仆亳从!"
 
-#: src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1103
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "�于舒� 仆舒亟亳仄舒从 �亠 于亠� � �仗仂��亠弍亳. �亰舒弍亠�亳�亠 仆仂于亳 仆舒亟亳仄舒从"
 
-#: src/protocols/irc/irc.c:1318 src/protocols/irc/irc.c:1324
-#: src/protocols/irc/irc.c:1330 src/protocols/irc/irc.c:1344
+#: src/protocols/irc/irc.c:1325 src/protocols/irc/irc.c:1331
+#: src/protocols/irc/irc.c:1337 src/protocols/irc/irc.c:1351
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 仗仂亟舒�亳"
 
-#: src/protocols/irc/irc.c:1354
+#: src/protocols/irc/irc.c:1361
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s 亢亠仍亳 亟舒 亰舒仗仂�仆亠 DCC �舒亰亞仂于仂�"
 
-#: src/protocols/irc/irc.c:1355
+#: src/protocols/irc/irc.c:1362
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
@@ -926,72 +930,72 @@
 "�于仂 亰舒��亠于舒 亟舒 �亠 ��仗仂��舒于亳 仆亠仗仂��亠亟仆舒 于亠亰舒 亳亰仄亠�� 亟于舒 �舒��仆舒�舒. �仂�仍舒�亠 "
 "仗仂��从亠 仆亠�亠 仗�仂仍舒亰亳�亳 从�仂亰 IRC �亠�于亠�."
 
-#: src/protocols/irc/irc.c:1355 src/protocols/oscar/oscar.c:2366
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/irc/irc.c:1362 src/protocols/oscar/oscar.c:2322
+#: src/protocols/oscar/oscar.c:5369
 msgid "Connect"
 msgstr "丕�仗仂��舒于亳 于亠亰�"
 
-#: src/protocols/irc/irc.c:1428 src/protocols/msn/msn.c:151
+#: src/protocols/irc/irc.c:1435 src/protocols/msn/msn.c:151
 #: src/protocols/msn/msn.c:523 src/protocols/msn/msn.c:1029
 msgid "Unable to write"
 msgstr "�亠 仄仂亢亠 亟舒 仗亳�亠"
 
-#: src/protocols/irc/irc.c:1487
+#: src/protocols/irc/irc.c:1494
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "�亰弍舒�亠仆亳 ��亠 �舒 %s: %s"
 
-#: src/protocols/irc/irc.c:1492
+#: src/protocols/irc/irc.c:1499
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "�亰弍舒�亠仆亳 仂亟 ���舒仆亠 %s: %s"
 
-#: src/protocols/irc/irc.c:1548 src/protocols/irc/irc.c:2787
+#: src/protocols/irc/irc.c:1555 src/protocols/irc/irc.c:2810
 msgid "CTCP ClientInfo"
 msgstr "CTCP 仗仂亟舒�亳 仂 从仍亳�亠仆��"
 
-#: src/protocols/irc/irc.c:1554 src/protocols/irc/irc.c:2793
+#: src/protocols/irc/irc.c:1561 src/protocols/irc/irc.c:2816
 msgid "CTCP UserInfo"
 msgstr "CTCP 仗仂亟舒�亳 仂 从仂�亳�仆亳从�"
 
-#: src/protocols/irc/irc.c:1560 src/protocols/irc/irc.c:2799
+#: src/protocols/irc/irc.c:1567 src/protocols/irc/irc.c:2822
 msgid "CTCP Version"
 msgstr "CTCP 亳亰亟舒�亠"
 
-#: src/protocols/irc/irc.c:1587 src/protocols/irc/irc.c:2805
+#: src/protocols/irc/irc.c:1594 src/protocols/irc/irc.c:2828
 msgid "CTCP Ping"
 msgstr "CTCP 仗亳仆亞"
 
-#: src/protocols/irc/irc.c:1824 src/protocols/oscar/oscar.c:633
+#: src/protocols/irc/irc.c:1847 src/protocols/oscar/oscar.c:596
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
 msgstr "��亳�舒于舒: %s"
 
-#: src/protocols/irc/irc.c:2080
+#: src/protocols/irc/irc.c:2103
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "丐亠仄舒 从舒仆舒仍舒 %s �亠 %s"
 
-#: src/protocols/irc/irc.c:2177
+#: src/protocols/irc/irc.c:2200
 #, c-format
 msgid "You have left %s"
 msgstr "�舒仗���亳仍亳 ��亠 %s"
 
 # Da li je ovo razdvajanje servera, ili /part naredba (napustanje kanala)?
-#: src/protocols/irc/irc.c:2178
+#: src/protocols/irc/irc.c:2201
 msgid "IRC Part"
 msgstr "�舒仗���舒�亠 IRC 从舒仆舒仍舒"
 
-#: src/protocols/irc/irc.c:2233
+#: src/protocols/irc/irc.c:2256
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>�舒��亠于舒 DCC �舒亰亞仂于仂�</I>"
 
-#: src/protocols/irc/irc.c:2250
+#: src/protocols/irc/irc.c:2273
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>�舒�亠亟弍亠 �仗�舒于仆亳从舒:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2255
+#: src/protocols/irc/irc.c:2278
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -999,11 +1003,11 @@
 "<B>CTCP 仆舒�亠亟弍亠:<BR>CLIENTINFO <仆舒亟亳仄舒从><BR>USERINFO <仆舒亟亳仄舒从><BR>VERSION "
 "<仆舒亟亳仄舒从><BR>PING <仆舒亟亳仄舒从></B><BR>"
 
-#: src/protocols/irc/irc.c:2263
+#: src/protocols/irc/irc.c:2286
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>DCC 仆舒�亠亟弍亠:<BR>CHAT <仆舒亟亳仄舒从></B>"
 
-#: src/protocols/irc/irc.c:2268
+#: src/protocols/irc/irc.c:2291
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
@@ -1015,52 +1019,53 @@
 "WHOWAS<BR>丕从��舒��亠 /HELP OPER 亰舒 仆舒�亠亟弍亠 �仗�舒于仆亳从舒<BR>丕从��舒��亠 /HELP CTCP 亰舒 "
 "CTCP 仆舒�亠亟弍亠<BR>丕从��舒��亠 /HELP DCC 亰舒 DCC 仆舒�亠亟弍亠"
 
-#: src/protocols/irc/irc.c:2291
+#: src/protocols/irc/irc.c:2314
 msgid "<B>Unknown command</B>"
 msgstr "<B>�亠仗仂亰仆舒�舒 仆舒�亠亟弍舒</B>"
 
-#: src/protocols/irc/irc.c:2351
+#: src/protocols/irc/irc.c:2374
 msgid "Channel:"
 msgstr "�舒仆舒仍:"
 
-#: src/main.c:349 src/multi.c:690 src/protocols/irc/irc.c:2355
+#: src/main.c:340 src/multi.c:766 src/protocols/irc/irc.c:2378
 msgid "Password:"
 msgstr "�仂亰亳仆从舒:"
 
-#: src/protocols/irc/irc.c:2774
+#: src/protocols/irc/irc.c:2797
 msgid "DCC Chat"
 msgstr "DCC �舒亰亞仂于仂�"
 
-#: src/protocols/irc/irc.c:2846 src/protocols/jabber/jabber.c:2870
-#: src/protocols/msn/msn.c:2043 src/protocols/napster/napster.c:617
+#: src/protocols/irc/irc.c:2871 src/protocols/jabber/jabber.c:2897
+#: src/protocols/jabber/jabber.c:4285 src/protocols/msn/msn.c:2047
+#: src/protocols/napster/napster.c:617
 msgid "Server:"
 msgstr "弌亠�于亠�:"
 
-#: src/multi.c:991 src/protocols/irc/irc.c:2852
-#: src/protocols/jabber/jabber.c:4259 src/protocols/msn/msn.c:2049
+#: src/multi.c:1081 src/protocols/irc/irc.c:2876
+#: src/protocols/jabber/jabber.c:4296 src/protocols/msn/msn.c:2059
 #: src/protocols/napster/napster.c:623
 msgid "Port:"
 msgstr "�仂��:"
 
-#: src/protocols/irc/irc.c:2858
+#: src/protocols/irc/irc.c:2882
 msgid "Encoding:"
 msgstr "�舒仗亳�:"
 
-#: src/protocols/jabber/jabber.c:985
+#: src/protocols/jabber/jabber.c:986
 msgid "Unable to change password."
 msgstr "�亠 仄仂亢亠 亟舒 亳亰仄亠仆亳 仍仂亰亳仆从�."
 
-#: src/protocols/jabber/jabber.c:986
+#: src/protocols/jabber/jabber.c:987
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr "�仂亰亳仆从舒 从仂�� ��亠 �仆亠仍亳 �亠 仆亠亳�仗�舒于仆舒. �舒�舒 仍仂亰亳仆从舒 仆亳�亠 亳亰仄亠�亠仆舒."
 
-#: src/protocols/jabber/jabber.c:991
+#: src/protocols/jabber/jabber.c:992
 msgid "Unable to change password"
 msgstr "�亠 仄仂亢亠 亟舒 亳亰仄亠仆亳 仍仂亰亳仆从�"
 
-#: src/protocols/jabber/jabber.c:992
+#: src/protocols/jabber/jabber.c:993
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
@@ -1068,240 +1073,256 @@
 "�仂亰亳仆从舒 从仂�� ��亠 �仆亠仍亳 �亠 亳��舒 从舒仂 亳 于舒�舒 �亠从��舒 仍仂亰亳仆从舒. �舒�舒 仍仂亰亳仆从舒 "
 "仂��舒�亠 亳��舒."
 
-#: src/list.c:402 src/pounce.c:338 src/protocols/jabber/jabber.c:1150
+#: src/gtkpounce.c:234 src/list.c:440 src/protocols/jabber/jabber.c:1152
 msgid "Unknown"
 msgstr "�亠仗仂亰仆舒�仂"
 
-#: src/protocols/jabber/jabber.c:1159
+#. once again, we don't have to put anything here
+#: src/protocols/jabber/jabber.c:1161 src/protocols/jabber/jabber.c:3347
+#: src/protocols/jabber/jabber.c:3391
 msgid "Chatty"
 msgstr "��亳��亳于"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/jabber.c:3349
+#: src/protocols/jabber/jabber.c:3399
 msgid "Extended Away"
 msgstr "��仂亟�亢亠仆仂 仂亟����于仂"
 
-#: src/protocols/jabber/jabber.c:1163 src/protocols/oscar/oscar.c:2751
-#: src/protocols/oscar/oscar.c:4441 src/protocols/oscar/oscar.c:5560
+#: src/protocols/jabber/jabber.c:1165 src/protocols/jabber/jabber.c:3350
+#: src/protocols/jabber/jabber.c:3403 src/protocols/oscar/oscar.c:2707
+#: src/protocols/oscar/oscar.c:4397 src/protocols/oscar/oscar.c:5490
 msgid "Do Not Disturb"
 msgstr "�亠 �亰仆亠仄亳�舒于舒�"
 
-#: src/protocols/jabber/jabber.c:1360
+#: src/protocols/jabber/jabber.c:1364
 #, c-format
 msgid "Jabber Error %s"
 msgstr "�舒弍亠� 亞�亠�从舒 %s"
 
-#: src/protocols/jabber/jabber.c:1469
+#: src/protocols/jabber/jabber.c:1470
 #, c-format
 msgid "Error %s: %s"
 msgstr "��亠�从舒 %s: %s"
 
-#: src/protocols/jabber/jabber.c:1472
+#: src/protocols/jabber/jabber.c:1473
 msgid "Unknown Error in presence"
 msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒 � 仗�亳����于�"
 
-#: src/protocols/jabber/jabber.c:1649
+#: src/protocols/jabber/jabber.c:1650
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "�仂�亳�仆亳从 %s 亢亠仍亳 亟舒 于舒� 亟仂亟舒 仆舒 �于仂� �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/jabber/jabber.c:1674
+#: src/protocols/jabber/jabber.c:1675
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr "�舒弍亠� 从仂�亳�仆亳从 %s 仆亠 仗仂��仂�亳, 亳 亰舒�仂 仆亳�亠 亟仂亟舒� � 于舒� �仗亳�舒从."
 
-#: src/protocols/jabber/jabber.c:1677
+#: src/protocols/jabber/jabber.c:1678
 msgid "No such user."
 msgstr "�亠仄舒 �舒从于仂亞 从仂�亳�仆亳从舒."
 
-#: src/dialogs.c:968 src/list.c:217 src/protocols/jabber/jabber.c:1768
+#: src/dialogs.c:940 src/list.c:245 src/protocols/jabber/jabber.c:1769
 #: src/protocols/msn/msn.c:541 src/protocols/msn/msn.c:543
 msgid "Buddies"
 msgstr "���亞舒�亳"
 
-#: src/protocols/jabber/jabber.c:1844
+#: src/protocols/jabber/jabber.c:1846
 msgid "Authenticating"
 msgstr "�亟亠仆�亳�亳从��亠"
 
-#: src/protocols/jabber/jabber.c:1878
+#: src/protocols/jabber/jabber.c:1880
 msgid "Unknown login error"
 msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒 仗�亳 仗�亳�舒于亳"
 
-#: src/protocols/jabber/jabber.c:2225
+#: src/protocols/jabber/jabber.c:2227
 msgid "Password successfully changed."
 msgstr "�仂亰亳仆从舒 ��仗亠�仆仂 亳亰仄亠�亠仆舒."
 
-#: src/protocols/jabber/jabber.c:2269 src/protocols/jabber/jabber.c:4115
+#: src/protocols/jabber/jabber.c:2271 src/protocols/jabber/jabber.c:4139
 msgid "Connection lost"
 msgstr "�亠亰舒 仗�亠从亳仆��舒"
 
-#: src/protocols/jabber/jabber.c:2277
+#: src/protocols/jabber/jabber.c:2279
 msgid "Connected"
 msgstr "�亠亰舒 ��仗仂��舒于�亠仆舒"
 
-#: src/protocols/jabber/jabber.c:2280
+#: src/protocols/jabber/jabber.c:2282
 msgid "Requesting Authentication Method"
 msgstr "�舒��亠于舒 仆舒�亳仆 亳亟亠仆�亳�亳从舒�亳�亠"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2298 src/protocols/msn/msn.c:1199
-#: src/protocols/yahoo/yahoo.c:963
+#: src/protocols/jabber/jabber.c:2300 src/protocols/msn/msn.c:1199
+#: src/protocols/yahoo/yahoo.c:965
 msgid "Connecting"
 msgstr "丕�仗仂��舒于�舒 于亠亰�"
 
-#: src/protocols/jabber/jabber.c:2598
+#: src/protocols/jabber/jabber.c:2625
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr "�仂�亳�仆亳从 %s �亠 仆亠亳�仗�舒于仆仂 �舒弍亠� 亳仄亠, 亳 ��仂亞舒 仆亳�亠 亟仂亟舒�."
 
-#: src/protocols/jabber/jabber.c:2600
+#: src/protocols/jabber/jabber.c:2627
 msgid "Jabber Error"
 msgstr "�舒弍亠� 亞�亠�从舒"
 
-#: src/protocols/jabber/jabber.c:2866
+#: src/protocols/jabber/jabber.c:2893
 msgid "Room:"
 msgstr "弌仂弍舒:"
 
-#: src/protocols/jabber/jabber.c:2875
+#: src/protocols/jabber/jabber.c:2902
 msgid "Handle:"
 msgstr "�舒亟亳仄舒从:"
 
-#: src/protocols/jabber/jabber.c:2899
+#: src/protocols/jabber/jabber.c:2926
 msgid "Unable to join chat"
 msgstr "�亠 仄仂亢亠 亟舒 仗�亳���仗亳 �舒亰亞仂于仂��"
 
-#: src/protocols/jabber/jabber.c:3242
+#: src/protocols/jabber/jabber.c:3266
 #, c-format
 msgid "<b>Status:</b> %s%s%s"
 msgstr "<b>弌�舒�亠:</b> %s%s%s"
 
-#: src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3305
 msgid "View Error Msg"
 msgstr "�仂亞仍亠亟舒��亠 仗仂��从亠 仂 亞�亠�从舒仄舒"
 
-#: src/gtkconv.c:761 src/protocols/jabber/jabber.c:3293
+#: src/gtkconv.c:781 src/protocols/jabber/jabber.c:3317
 msgid "Get Away Msg"
 msgstr "��亠�亰仄亳 仗仂��从� 亰舒 仂亟����于仂"
 
-#: src/protocols/jabber/jabber.c:3300
+#: src/protocols/jabber/jabber.c:3324
 msgid "Un-hide From"
 msgstr "�亠 �从�亳于舒� 仂亟"
 
-#: src/protocols/jabber/jabber.c:3303
+#: src/protocols/jabber/jabber.c:3327
 msgid "Temporarily Hide From"
 msgstr "��亳于�亠仄亠仆仂 �舒从�亳 仂亟"
 
-#: src/protocols/jabber/jabber.c:3310
+#: src/protocols/jabber/jabber.c:3334
 msgid "Cancel Presence Notification"
 msgstr "��从舒亢亳 仂弍舒于亠��亠�舒 仂 仗�亳����于�"
 
-#: src/protocols/jabber/jabber.c:3504
+#. state is one of our own strings. it won't be NULL.
+#: src/multi.c:274 src/protocols/jabber/jabber.c:3346
+#: src/protocols/jabber/jabber.c:3389 src/protocols/oscar/oscar.c:2719
+#: src/protocols/oscar/oscar.c:4392 src/protocols/oscar/oscar.c:5488
+#: src/protocols/yahoo/yahoo.c:1066
+msgid "Online"
+msgstr "�舒 于亠亰亳"
+
+#: src/protocols/jabber/jabber.c:3528
 msgid "Full Name"
 msgstr "��仆仂 亳仄亠"
 
-#: src/protocols/jabber/jabber.c:3505
+#: src/protocols/jabber/jabber.c:3529
 msgid "Family Name"
 msgstr "��亠亰亳仄亠"
 
-#: src/protocols/jabber/jabber.c:3506
+#: src/protocols/jabber/jabber.c:3530
 msgid "Given Name"
 msgstr "�仄亠"
 
-#: src/protocols/jabber/jabber.c:3507
+#: src/protocols/jabber/jabber.c:3531
 msgid "Nickname"
 msgstr "�舒亟亳仄舒从"
 
-#: src/dialogs.c:2704 src/protocols/jabber/jabber.c:3508
+#: src/dialogs.c:2608 src/protocols/jabber/jabber.c:3532
 msgid "URL"
 msgstr "�仆�亠�仆亠� 舒亟�亠�舒"
 
-#: src/protocols/jabber/jabber.c:3509
+#: src/protocols/jabber/jabber.c:3533
 msgid "Street Address"
 msgstr "丕仍亳�舒"
 
-#: src/protocols/jabber/jabber.c:3510
+#: src/protocols/jabber/jabber.c:3534
 msgid "Extended Address"
 msgstr "��仂�亳�亠仆舒 舒亟�亠�舒"
 
-#: src/protocols/jabber/jabber.c:3511
+#: src/protocols/jabber/jabber.c:3535
 msgid "Locality"
 msgstr "�仂从舒仍亳�亠�"
 
-#: src/protocols/jabber/jabber.c:3512
+#: src/protocols/jabber/jabber.c:3536
 msgid "Region"
 msgstr "�弍仍舒��"
 
-#: src/protocols/jabber/jabber.c:3513
+#: src/protocols/jabber/jabber.c:3537
 msgid "Postal Code"
 msgstr "�仂��舒仆�从亳 弍�仂�"
 
 #. Line 7
-#: src/dialogs.c:1820 src/dialogs.c:2490 src/protocols/jabber/jabber.c:3514
+#: src/dialogs.c:1784 src/dialogs.c:2414 src/protocols/jabber/jabber.c:3538
 msgid "Country"
 msgstr "��亢舒于舒"
 
-#: src/protocols/jabber/jabber.c:3515
+#: src/protocols/jabber/jabber.c:3539
 msgid "Telephone"
 msgstr "丐亠仍亠�仂仆"
 
-#: src/dialogs.c:2564 src/protocols/jabber/jabber.c:3516
+#: src/dialogs.c:2472 src/protocols/jabber/jabber.c:3540
 msgid "Email"
 msgstr "�-仗仂��舒"
 
-#: src/protocols/jabber/jabber.c:3517
+#: src/protocols/jabber/jabber.c:3541
 msgid "Organization Name"
 msgstr "�舒亰亳于 仂�亞舒仆亳亰舒�亳�亠"
 
-#: src/protocols/jabber/jabber.c:3518
+#: src/protocols/jabber/jabber.c:3542
 msgid "Organization Unit"
 msgstr "�亟亠�亠�亠 � 仂�亞舒仆亳亰舒�亳�亳"
 
-#: src/protocols/jabber/jabber.c:3519
+#: src/protocols/jabber/jabber.c:3543
 msgid "Title"
 msgstr "丐亳��仍舒"
 
-#: src/protocols/jabber/jabber.c:3520
+#: src/protocols/jabber/jabber.c:3544
 msgid "Role"
 msgstr "丕仍仂亞舒"
 
-#: src/protocols/jabber/jabber.c:3521
+#: src/protocols/jabber/jabber.c:3545
 msgid "Birthday"
 msgstr "�仂�亠仆亟舒仆"
 
-#: src/dialogs.c:2714 src/prefs.c:393 src/prefs.c:1293
-#: src/protocols/jabber/jabber.c:3522
+#: src/dialogs.c:2618 src/prefs.c:414 src/prefs.c:1312
+#: src/protocols/jabber/jabber.c:3546
 msgid "Description"
 msgstr "�仗亳�"
 
-#: src/protocols/jabber/jabber.c:3547
+#: src/protocols/jabber/jabber.c:3571
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 "�亳�亠亟仆舒 仂亟 ��舒于从亳 亳�仗仂亟 仆亳�亠 仂弍舒于亠亰仆舒. 丕仆亠�亳�亠 �舒仄仂 仗仂亟舒�从亠 从仂�亠 亢亠仍亳�亠"
 
-#: src/protocols/jabber/jabber.c:3548
+#: src/protocols/jabber/jabber.c:3572
 msgid "User Identity"
 msgstr "�亟亠仆�亳�亠� 从仂�亳�仆亳从舒"
 
-#: src/protocols/jabber/jabber.c:3972
+#: src/protocols/jabber/jabber.c:3996
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim �� ��亠亟亳�亠 �舒弍亠� 于亳亰亳�-从舒���"
 
-#: src/protocols/jabber/jabber.c:4045
+#: src/protocols/jabber/jabber.c:4069
 msgid "Server Registration successful!"
 msgstr "�亠亞亳���舒�亳�舒 �舒 �亠�于亠�仂仄 ��仗亠�仆舒!"
 
-#: src/protocols/jabber/jabber.c:4072
+#: src/protocols/jabber/jabber.c:4096
 msgid "Unknown registration error"
 msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒 仗�亳 �亠亞亳���舒�亳�亳"
 
-#: src/dialogs.c:2003 src/protocols/jabber/jabber.c:4185
-#: src/protocols/oscar/oscar.c:5745 src/protocols/toc/toc.c:1434
+#: src/dialogs.c:1954 src/protocols/jabber/jabber.c:4209
+#: src/protocols/oscar/oscar.c:5675 src/protocols/toc/toc.c:1434
 msgid "Set User Info"
 msgstr "�仂��舒于亳�亠 仗仂亟舒�从亠 仂 从仂�亳�仆亳从�"
 
-#: src/protocols/jabber/jabber.c:4265
+#: src/protocols/jabber/jabber.c:4291
+msgid "Resource:"
+msgstr "_�亠����:"
+
+#: src/protocols/jabber/jabber.c:4302
 msgid "Connect Server:"
 msgstr "�仂于亠亰亳于舒�亠 �舒 �亠�于亠�仂仄:"
 
@@ -1358,7 +1379,6 @@
 msgstr "�亠� � ��仗舒�仆亳�从仂仄 �仗亳�从�"
 
 #: src/protocols/msn/msn.c:105
-#, fuzzy
 msgid "Switchboard failed"
 msgstr "�亠��仗亠�仆仂 仗�亠弍舒�亳于舒�亠"
 
@@ -1370,7 +1390,7 @@
 msgid "Required fields missing"
 msgstr "�亠亟仂��舒�� 仂弍舒于亠亰仆舒 仗仂�舒"
 
-#: src/protocols/msn/msn.c:115 src/protocols/oscar/oscar.c:400
+#: src/protocols/msn/msn.c:115 src/protocols/oscar/oscar.c:364
 msgid "Not logged in"
 msgstr "�亳�亠 仗�亳�舒于�亠仆"
 
@@ -1456,14 +1476,14 @@
 
 #: src/protocols/msn/msn.c:291 src/protocols/msn/msn.c:313
 #: src/protocols/msn/msn.c:1445 src/protocols/msn/msn.c:1567
-#: src/protocols/msn/msn.c:1583 src/protocols/msn/msn.c:1699
-#: src/protocols/msn/msn.c:1712 src/protocols/msn/msn.c:1738
-#: src/protocols/msn/msn.c:1785 src/protocols/msn/msn.c:1803
-#: src/protocols/msn/msn.c:1837 src/protocols/msn/msn.c:1868
-#: src/protocols/msn/msn.c:1904 src/protocols/msn/msn.c:1911
-#: src/protocols/msn/msn.c:1924 src/protocols/msn/msn.c:1932
-#: src/protocols/msn/msn.c:1958 src/protocols/msn/msn.c:1967
-#: src/protocols/msn/msn.c:1980 src/protocols/msn/msn.c:1988
+#: src/protocols/msn/msn.c:1583 src/protocols/msn/msn.c:1701
+#: src/protocols/msn/msn.c:1714 src/protocols/msn/msn.c:1740
+#: src/protocols/msn/msn.c:1787 src/protocols/msn/msn.c:1805
+#: src/protocols/msn/msn.c:1839 src/protocols/msn/msn.c:1870
+#: src/protocols/msn/msn.c:1906 src/protocols/msn/msn.c:1913
+#: src/protocols/msn/msn.c:1926 src/protocols/msn/msn.c:1934
+#: src/protocols/msn/msn.c:1960 src/protocols/msn/msn.c:1969
+#: src/protocols/msn/msn.c:1982 src/protocols/msn/msn.c:1990
 msgid "Write error"
 msgstr "��亠�从舒 仗�亳 �仗亳��"
 
@@ -1547,30 +1567,30 @@
 msgstr "丕�从仍舒���亠 �舒 �亠�于亠�仂仄"
 
 #: src/protocols/msn/msn.c:1516 src/protocols/msn/msn.c:1543
-#: src/protocols/msn/msn.c:1610
+#: src/protocols/msn/msn.c:1612
 msgid "Away From Computer"
 msgstr "�亟���舒仆 仂亟 �舒��仆舒�舒"
 
 #: src/protocols/msn/msn.c:1517 src/protocols/msn/msn.c:1545
-#: src/protocols/msn/msn.c:1608 src/protocols/yahoo/yahoo.c:1044
+#: src/protocols/msn/msn.c:1610 src/protocols/yahoo/yahoo.c:1044
 #: src/protocols/yahoo/yahoo.c:1249 src/protocols/yahoo/yahoo.c:1325
 msgid "Be Right Back"
 msgstr "�亟仄舒� �亠 于�舒�舒仄"
 
 #: src/protocols/msn/msn.c:1518 src/protocols/msn/msn.c:1547
-#: src/protocols/msn/msn.c:1606 src/protocols/yahoo/yahoo.c:1046
+#: src/protocols/msn/msn.c:1608 src/protocols/yahoo/yahoo.c:1046
 #: src/protocols/yahoo/yahoo.c:1251 src/protocols/yahoo/yahoo.c:1326
 msgid "Busy"
 msgstr "�舒�亰亠�"
 
 #: src/protocols/msn/msn.c:1519 src/protocols/msn/msn.c:1549
-#: src/protocols/msn/msn.c:1612 src/protocols/yahoo/yahoo.c:1054
+#: src/protocols/msn/msn.c:1614 src/protocols/yahoo/yahoo.c:1054
 #: src/protocols/yahoo/yahoo.c:1259 src/protocols/yahoo/yahoo.c:1330
 msgid "On The Phone"
 msgstr "丐亠仍亠�仂仆亳�舒仄"
 
 #: src/protocols/msn/msn.c:1520 src/protocols/msn/msn.c:1551
-#: src/protocols/msn/msn.c:1614 src/protocols/yahoo/yahoo.c:1058
+#: src/protocols/msn/msn.c:1616 src/protocols/yahoo/yahoo.c:1058
 #: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1332
 msgid "Out To Lunch"
 msgstr "�亰舒�舒仂 仆舒 ���舒从"
@@ -1579,34 +1599,34 @@
 msgid "Hidden"
 msgstr "弌从�亳于亠仆"
 
-#: src/prefs.c:1054 src/protocols/msn/msn.c:1616
+#: src/gtkpounce.c:504 src/prefs.c:1073 src/protocols/msn/msn.c:1618
 #: src/protocols/yahoo/yahoo.c:1064
 msgid "Idle"
 msgstr "�亠舒从�亳于舒仆"
 
-#: src/protocols/msn/msn.c:1645 src/protocols/yahoo/yahoo.c:1117
+#: src/protocols/msn/msn.c:1647 src/protocols/yahoo/yahoo.c:1117
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>弌�舒�亠:</b> %s"
 
-#: src/protocols/msn/msn.c:1659 src/protocols/oscar/oscar.c:3008
-#: src/protocols/oscar/oscar.c:5593
+#: src/protocols/msn/msn.c:1661 src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:5523
 msgid "Send File"
 msgstr "�仂�舒�亳 亟舒�仂�亠从�"
 
-#: src/protocols/msn/msn.c:1731
+#: src/protocols/msn/msn.c:1733
 msgid "New MSN friendly name too long."
 msgstr "��亠亟�亞舒�从仂 �亠 仆仂于仂 MSN 亳仄亠."
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1748
 msgid "Set Friendly Name:"
 msgstr "�仂��舒于亳 亳仄亠:"
 
-#: src/protocols/msn/msn.c:1755
+#: src/protocols/msn/msn.c:1757
 msgid "Set Friendly Name"
 msgstr "�仂��舒于亳 亳仄亠"
 
-#: src/protocols/msn/msn.c:1891
+#: src/protocols/msn/msn.c:1893
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1615,11 +1635,11 @@
 "MSN 从仂�亳�仆亳�从仂 亳仄亠 仄仂�舒 弍亳�亳 仂弍仍亳从舒 ��从仂�亳�仆亳从@�亠�于亠�.仆亠���.  �亠�仂于舒�仆仂 ��亠 "
 "亢亠仍亠仍亳 ��%s@hotmail.com��.  丕 于舒�亠仄 �仗亳�从� 亟仂亰于仂仍舒 仆亳�� ��亳�亠仆亠 亳亰仄亠仆."
 
-#: src/protocols/msn/msn.c:1894 src/protocols/msn/msn.c:1948
+#: src/protocols/msn/msn.c:1896 src/protocols/msn/msn.c:1950
 msgid "Invalid MSN screenname"
 msgstr "�亠亳�仗�舒于仆仂 MSN 从仂�亳�仆亳�从仂 亳仄亠"
 
-#: src/protocols/msn/msn.c:1945
+#: src/protocols/msn/msn.c:1947
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
@@ -1628,6 +1648,10 @@
 "MSN 从仂�亳�仆亳�从仂 亳仄亠 仄仂�舒 弍亳�亳 仂弍仍亳从舒 ��从仂�亳�仆亳从@�亠�于亠�.仆亠���.  �亠�仂于舒�仆仂 ��亠 "
 "亢亠仍亠仍亳 ��%s@hotmail.com��.  丕 于舒�亠仄 �仗亳�从� 亰舒弍�舒仆舒 仆亳�� ��亳�亠仆亠 亳亰仄亠仆."
 
+#: src/protocols/msn/msn.c:2053
+msgid "Login Server:"
+msgstr "弌亠�于亠� 亰舒 仗�亳�舒于�:"
+
 #: src/protocols/msn/switchboard.c:104
 #, c-format
 msgid "%s has closed the conversation window"
@@ -1649,184 +1673,184 @@
 "Gaim �亠 仆舒亳�舒仂 仆舒 亞�亠�从� 仗�亳 �仗仂�舒亰�仄亠于舒�� �舒 MSN �亠�于亠�仂仄. �仂仆仂于亳�亠 仗仂从��舒� "
 "从舒�仆亳�亠."
 
-#: src/protocols/napster/napster.c:459 src/protocols/oscar/oscar.c:5032
+#: src/protocols/napster/napster.c:459 src/protocols/oscar/oscar.c:4988
 #: src/protocols/toc/toc.c:1187
 msgid "Join what group:"
 msgstr "��亳从���亳 �亠 从仂�仂� 亞��仗亳:"
 
-#: src/protocols/oscar/oscar.c:396
+#: src/protocols/oscar/oscar.c:360
 msgid "Invalid error"
 msgstr "�亠亳�仗�舒于仆舒 亞�亠�从舒 (!!!)"
 
-#: src/protocols/oscar/oscar.c:397
+#: src/protocols/oscar/oscar.c:361
 msgid "Invalid SNAC"
 msgstr "�亠亳�仗�舒于舒仆 SNAC (��舒 亞仂亟 �仂 弍亳仍仂 ;)"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:362
 msgid "Rate to host"
 msgstr "��亰亳仆舒 仗�亠仄舒 �亠�于亠��"
 
-#: src/protocols/oscar/oscar.c:399
+#: src/protocols/oscar/oscar.c:363
 msgid "Rate to client"
 msgstr "��亰亳仆舒 仗�亠仄舒 从仍亳�亠仆��"
 
-#: src/protocols/oscar/oscar.c:401
+#: src/protocols/oscar/oscar.c:365
 msgid "Service unavailable"
 msgstr "丕�仍�亞舒 仆亠亟仂���仗仆舒"
 
-#: src/protocols/oscar/oscar.c:402
+#: src/protocols/oscar/oscar.c:366
 msgid "Service not defined"
 msgstr "丕�仍�亞舒 仆亳�亠 ���舒仆仂于�亠仆舒"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:367
 msgid "Obsolete SNAC"
 msgstr "��亠于舒亰亳�亠仆亳 SNAC"
 
-#: src/protocols/oscar/oscar.c:404
+#: src/protocols/oscar/oscar.c:368
 msgid "Not supported by host"
 msgstr "�仂仄舒�亳仆 仆亠 仗仂亟�亢舒于舒"
 
-#: src/protocols/oscar/oscar.c:405
+#: src/protocols/oscar/oscar.c:369
 msgid "Not supported by client"
 msgstr "�仍亳�亠仆� 仆亠 仗仂亟�亢舒于舒"
 
-#: src/protocols/oscar/oscar.c:406
+#: src/protocols/oscar/oscar.c:370
 msgid "Refused by client"
 msgstr "�仍亳�亠仆� 仂亟弍亳仂"
 
-#: src/protocols/oscar/oscar.c:407
+#: src/protocols/oscar/oscar.c:371
 msgid "Reply too big"
 msgstr "�亟亞仂于仂� 仗�亠于亠仍亳从"
 
-#: src/protocols/oscar/oscar.c:408
+#: src/protocols/oscar/oscar.c:372
 msgid "Responses lost"
 msgstr "�亟亞仂于仂�亳 亳亰亞�弍�亠仆亳"
 
-#: src/protocols/oscar/oscar.c:409
+#: src/protocols/oscar/oscar.c:373
 msgid "Request denied"
 msgstr "�舒��亠于 仂亟弍亳�亠仆"
 
-#: src/protocols/oscar/oscar.c:410
+#: src/protocols/oscar/oscar.c:374
 #, fuzzy
 msgid "Busted SNAC payload"
 msgstr "�舒亰于舒�亠仆仂 SNAC 仂仗�亠�亠�亠�亠"
 
-#: src/protocols/oscar/oscar.c:411
+#: src/protocols/oscar/oscar.c:375
 msgid "Insufficient rights"
 msgstr "�亠亟仂于仂�仆仂 仂于仍舒��亠�舒"
 
-#: src/protocols/oscar/oscar.c:412
+#: src/protocols/oscar/oscar.c:376
 msgid "In local permit/deny"
 msgstr "丕 仍仂从舒仍仆仂仄 亟仂亰于仂仍亳/亰舒弍�舒仆亳"
 
-#: src/protocols/oscar/oscar.c:413
+#: src/protocols/oscar/oscar.c:377
 msgid "Too evil (sender)"
 msgstr "��亠于亳�亠 亰舒仂 (仗仂�亳�舒仍舒�)"
 
-#: src/protocols/oscar/oscar.c:414
+#: src/protocols/oscar/oscar.c:378
 msgid "Too evil (receiver)"
 msgstr "��亠于亳�亠 亰舒仂 (仗�亳仄舒仍舒�)"
 
-#: src/protocols/oscar/oscar.c:415
+#: src/protocols/oscar/oscar.c:379
 msgid "User temporarily unavailable"
 msgstr "�仂�亳�仆亳从 仗�亳于�亠仄亠仆仂 仆亠亟仂���仗舒仆"
 
-#: src/protocols/oscar/oscar.c:416
+#: src/protocols/oscar/oscar.c:380
 msgid "No match"
 msgstr "�亠仄舒 仗仂从仍舒仗舒�舒"
 
-#: src/protocols/oscar/oscar.c:417
+#: src/protocols/oscar/oscar.c:381
 msgid "List overflow"
 msgstr "��亠从仂�舒�亠�亠 �仗亳�从舒"
 
-#: src/protocols/oscar/oscar.c:418
+#: src/protocols/oscar/oscar.c:382
 msgid "Request ambiguous"
 msgstr "�舒��亠于 亟于仂�仄亳�仍亠仆"
 
-#: src/protocols/oscar/oscar.c:419
+#: src/protocols/oscar/oscar.c:383
 msgid "Queue full"
 msgstr "�亠亟 仗�仆"
 
-#: src/protocols/oscar/oscar.c:420
+#: src/protocols/oscar/oscar.c:384
 msgid "Not while on AOL"
 msgstr "�亠 亟仂从 �亠 仆舒 ���-�"
 
-#: src/protocols/oscar/oscar.c:441
+#: src/protocols/oscar/oscar.c:405
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "�亠仗仂��亠亟仆亠 弍�亰亠 仗仂��从亠 亰舒 %s 亰舒�于仂�亠仆亠"
 
-#: src/protocols/oscar/oscar.c:443
+#: src/protocols/oscar/oscar.c:407
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "�亠仗仂��亠亟仆亠 弍�亰亠 仗仂��从亠 亰舒 %s 仆亠��仗亠�仆亠"
 
-#: src/protocols/oscar/oscar.c:493 src/protocols/toc/toc.c:602
+#: src/protocols/oscar/oscar.c:457 src/protocols/toc/toc.c:602
 #: src/protocols/toc/toc.c:615 src/protocols/toc/toc.c:678
 msgid "Disconnected."
 msgstr "�亠亰舒 仗�亠从亳仆��舒."
 
-#: src/protocols/oscar/oscar.c:505 src/protocols/toc/toc.c:850
+#: src/protocols/oscar/oscar.c:469 src/protocols/toc/toc.c:850
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "�亠亰舒 �舒 仗�亳�舒仂仆亳�仂仄 %s �亠 仗�亠从亳仆�仍舒."
 
-#: src/protocols/oscar/oscar.c:518
+#: src/protocols/oscar/oscar.c:482
 msgid "Chat is currently unavailable"
 msgstr "�舒亰亞仂于仂� ��亠仆��仆仂 仆亳�亠 仄仂亞��"
 
-#: src/protocols/oscar/oscar.c:587 src/protocols/oscar/oscar.c:646
+#: src/protocols/oscar/oscar.c:551 src/protocols/oscar/oscar.c:609
 msgid "Couldn't connect to host"
 msgstr "�亠 仄仂亢亠 亟舒 �亠 仗仂于亠亢亠 仆舒 亟仂仄舒�亳仆舒"
 
-#: src/protocols/oscar/oscar.c:628
+#: src/protocols/oscar/oscar.c:591
 msgid "Unable to login to AIM"
 msgstr "�亠 仄仂亢亠 亟舒 �亠 仗�亳�舒于亳 仆舒 ���"
 
-#: src/protocols/oscar/oscar.c:739 src/protocols/oscar/oscar.c:1193
+#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:1156
 msgid "Could Not Connect"
 msgstr "�亠 仄仂亢亠 亟舒 �亠 仗仂于亠亢亠"
 
-#: src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:709
 msgid "Connection established, cookie sent"
 msgstr "�亠亰舒 ��仗仂��舒于�亠仆舒, 从仂仍舒�亳� 仗仂�仍舒�"
 
-#: src/protocols/oscar/oscar.c:829 src/protocols/oscar/oscar.c:840
-#: src/protocols/oscar/oscar.c:844
+#: src/protocols/oscar/oscar.c:792 src/protocols/oscar/oscar.c:803
+#: src/protocols/oscar/oscar.c:807
 msgid "File Transfer Aborted"
 msgstr "��亠仆仂� 亟舒�仂�亠从舒 仂弍���于舒�亠仆"
 
 # Mogu reci i "server soket", ali preveliko znacenje mogu ljudi dati "server" delu, i ne razumeti.
-#: src/protocols/oscar/oscar.c:829
+#: src/protocols/oscar/oscar.c:792
 msgid "Unable to establish listener socket."
 msgstr "�亠 仄仂亢亠 亟舒 ��仗仂��舒于亳 �仂从亠� 亰舒 于亠亰�."
 
 # Ovo je FD kao broj koji je ekvivalentan "file handle"-u, odnosno, to je jedinstvena oznaka otvorenog fajla za pristup; sta znaci "establish" u ovom kontekstu mi nije jasno
-#: src/protocols/oscar/oscar.c:840
+#: src/protocols/oscar/oscar.c:803
 msgid "Unable to establish file descriptor."
 msgstr "�亠 仄仂亢亠 亟舒 ��仗仂��舒于亳 亟亠�从�亳仗�仂� 亟舒�仂�亠从亠."
 
-#: src/protocols/oscar/oscar.c:844
+#: src/protocols/oscar/oscar.c:807
 msgid "Unable to create new connection."
 msgstr "�亠 仄仂亢亠 亟舒 ��仗仂��舒于亳 仆仂于� 于亠亰�."
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1089 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "�亠亳�仗�舒于舒仆 仆舒亟亳仄舒从 亳仍亳 仍仂亰亳仆从舒."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1093
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "�舒� 仆舒仍仂亞 �亠 ��亠仆��仆仂 仆亠亟仂���仗舒仆."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1097
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "丕�仍�亞舒 ��� 弍�亰亳� 仗仂��从舒 �亠 仗�亳于�亠仄亠仆仂 仆亠亟仂���仗仆舒."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1101
+#: src/protocols/oscar/oscar.c:1064
 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."
@@ -1835,22 +1859,22 @@
 "仗仂从��舒��亠 仗仂仆仂于仂. �从仂 仆舒��舒于亳�亠 亟舒 仗仂从��舒于舒�亠, 仄仂�舒�亠�亠 �舒�亠从舒�亳 �仂� 亟�亢亠."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1105
+#: src/protocols/oscar/oscar.c:1068
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "�亰亟舒�亠 从仍亳�亠仆�舒 从仂�亳 从仂�亳��亳�亠 �亠 仗�舒��舒�仂. ��于亠亢亳�亠 亞舒 仆舒 %s"
 
-#: src/protocols/oscar/oscar.c:1109 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1072 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "�亠��仗亠�仆舒 亳亟亠仆�亳�亳从舒�亳�舒"
 
-#: src/protocols/oscar/oscar.c:1131
+#: src/protocols/oscar/oscar.c:1094
 msgid "Internal Error"
 msgstr "丕仆���舒��舒 亞�亠�从舒"
 
 # Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#: src/protocols/oscar/oscar.c:1232 src/protocols/oscar/oscar.c:1268
-#: src/protocols/oscar/oscar.c:1350
+#: src/protocols/oscar/oscar.c:1195 src/protocols/oscar/oscar.c:1224
+#: src/protocols/oscar/oscar.c:1306
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -1859,29 +1883,29 @@
 "�亠亰舒 �亠 仄仂亢亠 仗�亠从亳仆��亳 ��从仂�仂. �仂亢亟舒 亢亠仍亳�亠 亟舒 从仂�亳��亳�亠 TOC 亟仂从 �亠 仂于仂 仆亠 "
 "亳�仗�舒于亳. �仂亞仍亠亟舒��亠 %s 亰舒 亟仂仗�仆亠."
 
-#: src/protocols/oscar/oscar.c:1234 src/protocols/oscar/oscar.c:1270
+#: src/protocols/oscar/oscar.c:1197 src/protocols/oscar/oscar.c:1226
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 仆亳�亠 ��仗亠仂 亟舒 仗�亠�亰仄亠 亳�仗�舒于舒仆 �亠� 亰舒 仗�亳�舒于� 仆舒 ���."
 
-#: src/protocols/oscar/oscar.c:1352
+#: src/protocols/oscar/oscar.c:1308
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 仆亳�亠 ��仗亠仂 亟舒 仗�亠�亰仄亠 亳�仗�舒于舒仆 �亠� 亰舒 仗�亳�舒于�."
 
-#: src/protocols/oscar/oscar.c:1886 src/protocols/oscar/oscar.c:5264
+#: src/protocols/oscar/oscar.c:1842 src/protocols/oscar/oscar.c:5220
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "�亠仗仂��亠亟仆亠 弍�亰亠 仗仂��从亠 亰舒 %s 仂仄仂亞��亠仆亠"
 
-#: src/protocols/oscar/oscar.c:2204 src/protocols/oscar/oscar.c:2224
+#: src/protocols/oscar/oscar.c:2160 src/protocols/oscar/oscar.c:2180
 msgid "(There was an error receiving this message)"
 msgstr "(�仂�仍仂 �亠 亟仂 亞�亠�从亠 仗�亳 仗�亳�亠仄� 仂于亠 仗仂��从亠)"
 
-#: src/protocols/oscar/oscar.c:2365
+#: src/protocols/oscar/oscar.c:2321
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "丕仗�舒于仂 �亠 %s 亰舒��舒亢亳仂 仆亠仗仂��亠亟仆� 于亠亰� �舒 %s"
 
-#: src/protocols/oscar/oscar.c:2366
+#: src/protocols/oscar/oscar.c:2322
 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 "
@@ -1891,19 +1915,19 @@
 "�仍亳从舒. �仂��仂 �亠 �亠 于舒�舒 IP 舒亟�亠�舒 仗�亳从舒亰舒�亳, 仂于仂 �亠 仄仂亢亠 �仄舒��舒�亳 "
 "仆舒���舒于舒�亠仄 仗�亳于舒�仆仂��亳."
 
-#: src/protocols/oscar/oscar.c:2389
+#: src/protocols/oscar/oscar.c:2345
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "�舒� 仄亳 仂于仍舒��亠�亠 从舒从仂 弍亳� 仄仂亞舒仂 亟舒 �亠 亟仂亟舒仄 � �于仂� �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/oscar/oscar.c:2397
+#: src/protocols/oscar/oscar.c:2353
 msgid "Authorization Request Message:"
 msgstr "�仂��从舒 �亰 亰舒��亠于 亰舒 仂于仍舒��亠�亠:"
 
-#: src/protocols/oscar/oscar.c:2397
+#: src/protocols/oscar/oscar.c:2353
 msgid "Please authorize me!"
 msgstr "�于仍舒��亳 仄亠, 从舒亟 �亠 仄仂仍亳仄!"
 
-#: src/protocols/oscar/oscar.c:2422
+#: src/protocols/oscar/oscar.c:2378
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -1912,23 +1936,23 @@
 "�仂�亳�仆亳从 %s 亰舒��亠于舒 仂于仍舒��亠�亠 仗�亠 仆亠亞仂 ��仂 亞舒 仄仂亢亠�亠 亟仂亟舒�亳 � �于仂� �仗亳�舒从 "
 "亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 仗仂�舒�亠�亠 亰舒��亠于 亰舒 仂于仍舒��亠�亠?"
 
-#: src/protocols/oscar/oscar.c:2426
+#: src/protocols/oscar/oscar.c:2382
 msgid "Request Authorization"
 msgstr "�舒��亠于舒��亠 仂于仍舒��亠�亠"
 
-#: src/protocols/oscar/oscar.c:2460 src/protocols/oscar/oscar.c:2462
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2533
-#: src/protocols/oscar/oscar.c:2545 src/protocols/oscar/oscar.c:2910
-#: src/protocols/oscar/oscar.c:2961 src/protocols/oscar/oscar.c:4959
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:2418
+#: src/protocols/oscar/oscar.c:2424 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2501 src/protocols/oscar/oscar.c:2866
+#: src/protocols/oscar/oscar.c:2917 src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:4956
 msgid "No reason given."
 msgstr "�舒亰仍仂亞 仆亳�亠 仆舒于亠亟亠仆."
 
-#: src/protocols/oscar/oscar.c:2468
+#: src/protocols/oscar/oscar.c:2424
 msgid "Authorization Denied Message:"
 msgstr "�仂��从舒 亰舒 仂亟弍亳�亠仆仂 仂于仍舒��亠�亠:"
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2489
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason:\n"
@@ -1938,11 +1962,11 @@
 "�舒亰仍仂亞:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2538 src/protocols/oscar/oscar.c:4964
+#: src/protocols/oscar/oscar.c:2494 src/protocols/oscar/oscar.c:4920
 msgid "Authorization Request"
 msgstr "�舒��亠于 亰舒 仂于仍舒��亠�亠"
 
-#: src/protocols/oscar/oscar.c:2545
+#: src/protocols/oscar/oscar.c:2501
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1953,18 +1977,18 @@
 "从仂仆�舒从舒�舒, 舒 仆舒于亠仂 �亠 �仍亠亟亠�亠 �舒亰仍仂亞亠 亰舒 �仂:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2546
+#: src/protocols/oscar/oscar.c:2502
 msgid "ICQ authorization denied."
 msgstr "�于仍舒��亠�亠 仂亟弍亳�亠仆仂."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:2508
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr ""
 "Korisnik %lu �亠 仗�亳�于舒�亳仂 于舒� 亰舒��亠于 亟舒 亞舒 亟仂亟舒�亠 � �于仂� �仗亳�舒从 从仂仆�舒从舒�舒."
 
-#: src/protocols/oscar/oscar.c:2559
+#: src/protocols/oscar/oscar.c:2515
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -1977,7 +2001,7 @@
 "�亟: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2567
+#: src/protocols/oscar/oscar.c:2523
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -1990,7 +2014,7 @@
 "�亟: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2575
+#: src/protocols/oscar/oscar.c:2531
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2003,20 +2027,20 @@
 "�仂��从舒 亞仍舒�亳:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2596
+#: src/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "ICQ 从仂�亳�仆亳从 %lu 于舒仄 �亠 仗仂�仍舒仂 从仂仆�舒从�: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2600
+#: src/protocols/oscar/oscar.c:2556
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "�舒 仍亳 亢亠仍亳�亠 亟舒 亟仂亟舒�亠 仂于舒� 从仂仆�舒从� � 于舒� �仗亳�舒从 亟��亞舒�舒?"
 
-#: src/protocols/oscar/oscar.c:2600
+#: src/protocols/oscar/oscar.c:2556
 msgid "Decline"
 msgstr "�亟弍亳�"
 
-#: src/protocols/oscar/oscar.c:2680
+#: src/protocols/oscar/oscar.c:2636
 #, 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."
@@ -2024,7 +2048,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 �� 弍亳仍亠 仆亠亳�仗�舒于仆亠."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 �� 弍亳仍亠 仆亠亳�仗�舒于仆亠."
 
-#: src/protocols/oscar/oscar.c:2691
+#: src/protocols/oscar/oscar.c:2647
 #, 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."
@@ -2032,7 +2056,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %� 亰舒�仂 ��仂 �� 弍亳仍亠 仗�亠于亠仍亳从亠."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %� 亰舒�仂 ��仂 �� 弍亳仍亠 仗�亠于亠仍亳从亠."
 
-#: src/protocols/oscar/oscar.c:2702
+#: src/protocols/oscar/oscar.c:2658
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2042,7 +2066,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 �亠 仂亞�舒仆亳�亠�亠 仗�亠从仂�舒�亠仆仂."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 �亠 仂亞�舒仆亳�亠�亠 仗�亠从仂�舒�亠仆仂."
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:2669
 #, 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."
@@ -2051,7 +2075,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 �亠 仂仆/仂仆舒 仗�亠于亳�亠 亰仍仂�亠��."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 �亠 仂仆/仂仆舒 仗�亠于亳�亠 亰仍仂�亠��."
 
-#: src/protocols/oscar/oscar.c:2724
+#: src/protocols/oscar/oscar.c:2680
 #, 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."
@@ -2059,7 +2083,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 ��亠 于亳 仗�亠于亳�亠 亰仍仂�亠��亳."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 ��亠 于亳 仗�亠于亳�亠 亰仍仂�亠��亳."
 
-#: src/protocols/oscar/oscar.c:2734
+#: src/protocols/oscar/oscar.c:2690
 #, 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."
@@ -2067,131 +2091,125 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亳亰 仆亠仗仂亰仆舒�亳� �舒亰仍仂亞舒."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亳亰 仆亠仗仂亰仆舒�亳� �舒亰仍仂亞舒."
 
-#: src/protocols/oscar/oscar.c:2749 src/protocols/oscar/oscar.c:4450
-#: src/protocols/oscar/oscar.c:5563
+#: src/protocols/oscar/oscar.c:2705 src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:5493
 msgid "Free For Chat"
 msgstr "�仂���仗舒仆 亰舒 �舒亰亞仂于仂�"
 
-#: src/protocols/oscar/oscar.c:2753 src/protocols/oscar/oscar.c:4444
-#: src/protocols/oscar/oscar.c:5561
+#: src/protocols/oscar/oscar.c:2709 src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:5491
 msgid "Not Available"
 msgstr "�亠亟仂���仗舒仆"
 
-#: src/protocols/oscar/oscar.c:2755 src/protocols/oscar/oscar.c:4447
-#: src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:2711 src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:5492
 msgid "Occupied"
 msgstr "�舒�亰亠�"
 
-#: src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:2715
 msgid "Web Aware"
 msgstr "��舒�亳 于亠弍"
 
-#: src/multi.c:270 src/protocols/oscar/oscar.c:2763
-#: src/protocols/oscar/oscar.c:4436 src/protocols/oscar/oscar.c:5558
-#: src/protocols/yahoo/yahoo.c:1066
-msgid "Online"
-msgstr "�舒 于亠亰亳"
-
-#: src/protocols/oscar/oscar.c:2816
+#: src/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>弌�舒�亠:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:2774
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>弌�舒�亠:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2874
+#: src/protocols/oscar/oscar.c:2830
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 亳亰弍舒�亳 亞�亠�从�: %s\n"
 
-#: src/protocols/oscar/oscar.c:2875
+#: src/protocols/oscar/oscar.c:2831
 msgid "Unknown error"
 msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2909
+#: src/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "�舒�舒 仗仂��从舒 亰舒 %s 仆亳�亠 仗仂�仍舒�舒:"
 
-#: src/protocols/oscar/oscar.c:2960
+#: src/protocols/oscar/oscar.c:2916
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "�仂亟舒�亳 仂 从仂�亳�仆亳从� %s 仆亠亟仂���仗仆亳:"
 
-#: src/protocols/oscar/oscar.c:2993
+#: src/protocols/oscar/oscar.c:2949
 msgid "Buddy Icon"
 msgstr "弌仍亳�亳�舒 亟��亞舒�舒"
 
-#: src/protocols/oscar/oscar.c:2996
+#: src/protocols/oscar/oscar.c:2952
 msgid "Voice"
 msgstr "�仍舒�"
 
-#: src/protocols/oscar/oscar.c:2999 src/protocols/oscar/oscar.c:5587
+#: src/protocols/oscar/oscar.c:2955 src/protocols/oscar/oscar.c:5517
 msgid "Direct IM"
 msgstr "�亠仗仂��亠亟仆舒 仗仂��从舒"
 
-#: src/buddy.c:1267 src/protocols/oscar/oscar.c:3002
+#: src/buddy.c:1273 src/protocols/oscar/oscar.c:2958
 msgid "Chat"
 msgstr "�舒亰亞仂于仂�"
 
-#: src/protocols/oscar/oscar.c:3005 src/protocols/oscar/oscar.c:5599
+#: src/protocols/oscar/oscar.c:2961 src/protocols/oscar/oscar.c:5529
 msgid "Get File"
 msgstr "��亠�亰仄亳 亟舒�仂�亠从�"
 
-#: src/protocols/oscar/oscar.c:3012
+#: src/protocols/oscar/oscar.c:2968
 msgid "Games"
 msgstr "�亞�亠"
 
-#: src/protocols/oscar/oscar.c:3015
+#: src/protocols/oscar/oscar.c:2971
 msgid "Add-Ins"
 msgstr "�仂亟舒�亳"
 
-#: src/protocols/oscar/oscar.c:3018
+#: src/protocols/oscar/oscar.c:2974
 msgid "Send Buddy List"
 msgstr "�仂�舒�亳 �仗亳�舒从 亟��亞舒�舒"
 
-#: src/protocols/oscar/oscar.c:3021
+#: src/protocols/oscar/oscar.c:2977
 msgid "EveryBuddy Bug"
 msgstr "�于�亳�舒亟亳 亞�亠�从舒"
 
-#: src/protocols/oscar/oscar.c:3024
+#: src/protocols/oscar/oscar.c:2980
 msgid "AP User"
 msgstr "AP 从仂�亳�仆亳从"
 
-#: src/protocols/oscar/oscar.c:3027
+#: src/protocols/oscar/oscar.c:2983
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3030
+#: src/protocols/oscar/oscar.c:2986
 msgid "Nihilist"
 msgstr "�亳�亳仍亳��舒"
 
-#: src/protocols/oscar/oscar.c:3033
+#: src/protocols/oscar/oscar.c:2989
 msgid "ICQ Server Relay"
 msgstr "ICQ 仗�亠��仄亠�舒于舒�亠 �亠�于亠�舒"
 
-#: src/protocols/oscar/oscar.c:3036
+#: src/protocols/oscar/oscar.c:2992
 msgid "ICQ Unknown"
 msgstr "�亠仗仂亰仆舒� ICQ"
 
-#: src/protocols/oscar/oscar.c:3039
+#: src/protocols/oscar/oscar.c:2995
 msgid "Trillian Encryption"
 msgstr "丐�亳仍亳�舒仆 亠仆从�亳仗�亳�舒"
 
-#: src/protocols/oscar/oscar.c:3042
+#: src/protocols/oscar/oscar.c:2998
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3068
+#: src/protocols/oscar/oscar.c:3024
 #, c-format
 msgid "<b>Logged In:</b> %s%s%s"
 msgstr "<b>��亳�舒于�亠仆:</b> %s%s%s"
 
-#: src/protocols/oscar/oscar.c:3069
+#: src/protocols/oscar/oscar.c:3025
 msgid ""
 "\n"
 "<b>Capabilities:</b> "
@@ -2199,39 +2217,41 @@
 "\n"
 "<b>�仂亞��仆仂��亳:</b> "
 
-#: src/protocols/oscar/oscar.c:3075
+#: src/protocols/oscar/oscar.c:3031
 msgid ""
 "\n"
 "<b>Status:</b> "
-msgstr "\n<b>弌�舒�亠:</b> "
-
-#: src/protocols/oscar/oscar.c:3121
+msgstr ""
+"\n"
+"<b>弌�舒�亠:</b> "
+
+#: src/protocols/oscar/oscar.c:3077
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr ""
 "<i>�亠 仄仂亢亠 亟舒 仗�亳从舒亢亠 仗仂亟舒�从亠 亰舒�仂 ��仂 �� 仗仂�仍舒�亳 �舒 仆亠仗仂亰仆舒�亳仄 亰舒仗亳�仂仄.</i>"
 
-#: src/protocols/oscar/oscar.c:3127
+#: src/protocols/oscar/oscar.c:3083
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "�舒 于亠亰亳 仂亟: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3088
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "丼仍舒仆 仂亟: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3094
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "�亠仆�舒�亳: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3097
 msgid "Idle: <b>Active</b>"
 msgstr "�亠仆�舒�亳: <b>舒从�亳于舒仆</b>"
 
-#: src/protocols/oscar/oscar.c:3144
+#: src/protocols/oscar/oscar.c:3100
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2244,27 +2264,27 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3176
+#: src/protocols/oscar/oscar.c:3132
 msgid "<i>User has no away message</i>"
 msgstr "<i>�仂�亳�仆亳从 仆亠仄舒 �舒亰仍仂亞 亰舒 仂亟����于仂</i>"
 
-#: src/protocols/oscar/oscar.c:3187
+#: src/protocols/oscar/oscar.c:3143
 msgid "Client Capabilities: "
 msgstr "�仂亞��仆仂��亳 从仍亳�亠仆�舒:"
 
-#: src/protocols/oscar/oscar.c:3194
+#: src/protocols/oscar/oscar.c:3150
 msgid "<i>No Information Provided</i>"
 msgstr "<i>�仂亟舒�亳 仆亳�� 仂弍亠亰弍亠�亠仆亳</i>"
 
-#: src/protocols/oscar/oscar.c:3215
+#: src/protocols/oscar/oscar.c:3171
 msgid "Your AIM connection may be lost."
 msgstr "�仂亢亟舒 于舒仄 �亠 仗�亠从亳仆�仍舒 ��� 于亠亰舒."
 
-#: src/protocols/oscar/oscar.c:3563
+#: src/protocols/oscar/oscar.c:3519
 msgid "Rate limiting error."
 msgstr "��亠�从舒 仗�亳 仂亞�舒仆亳�舒于舒�� 弍�亰亳仆亠."
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3520
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -2272,7 +2292,7 @@
 "�仂�仍亠亟�舒 仗仂��从舒 仆亳�亠 仗仂�仍舒�舒 亰舒�仂 ��仂 ��亠 仗�亠从仂�舒�亳仍亳 亟仂亰于仂�亠仆� 弍�亰亳仆�. "
 "弌舒�亠从舒��亠 10 �亠从�仆亟亳 亳 仗�仂弍舒��亠 仗仂仆仂于仂."
 
-#: src/protocols/oscar/oscar.c:3622
+#: src/protocols/oscar/oscar.c:3578
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -2280,113 +2300,113 @@
 "�亠亰舒 于舒仄 �亠 仗�亠从亳仆��舒 亰舒�仂 ��仂 ��亠 �亠 仗�亳�舒于亳仍亳 �舒 仂于亳仄 亳仄亠仆仂仄 仆舒 仆亠从仂仄 "
 "亟��亞仂仄 仄亠���."
 
-#: src/protocols/oscar/oscar.c:3624
+#: src/protocols/oscar/oscar.c:3580
 msgid "You have been signed off for an unknown reason."
 msgstr "�亟�舒于�亠仆亳 ��亠 亳亰 仆亠仗仂亰仆舒�亳� �舒亰仍仂亞舒."
 
-#: src/protocols/oscar/oscar.c:3862
+#: src/protocols/oscar/oscar.c:3818
 msgid "UIN:"
 msgstr "�仂�亳�仆亳�从亳 弍�仂�:"
 
-#: src/protocols/oscar/oscar.c:3867
+#: src/protocols/oscar/oscar.c:3823
 msgid "First Name:"
 msgstr "�仄亠:"
 
-#: src/protocols/oscar/oscar.c:3870
+#: src/protocols/oscar/oscar.c:3826
 msgid "Last Name:"
 msgstr "��亠亰亳仄亠:"
 
-#: src/protocols/oscar/oscar.c:3873 src/protocols/oscar/oscar.c:3879
+#: src/protocols/oscar/oscar.c:3829 src/protocols/oscar/oscar.c:3835
 msgid "Email Address:"
 msgstr "�亟�亠�舒 亠-仗仂��亠:"
 
-#: src/protocols/oscar/oscar.c:3884
+#: src/protocols/oscar/oscar.c:3840
 msgid "Mobile Phone:"
 msgstr "�仂弍亳仍仆亳 �亠仍亠�仂仆:"
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3843
 msgid "Gender:"
 msgstr "�仂仍:"
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3843
 msgid "Female"
 msgstr "�亠仆�从亳"
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3843
 msgid "Male"
 msgstr "���从亳"
 
-#: src/protocols/oscar/oscar.c:3896
+#: src/protocols/oscar/oscar.c:3852
 msgid "Birthday:"
 msgstr "�仂�亠仆亟舒仆:"
 
-#: src/protocols/oscar/oscar.c:3901
+#: src/protocols/oscar/oscar.c:3857
 msgid "Age:"
 msgstr "弌�舒�仂��:"
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3860
 msgid "Personal Web Page:"
 msgstr "�亳�仆舒 于亠弍 ���舒仆亳�舒:"
 
-#: src/protocols/oscar/oscar.c:3907
+#: src/protocols/oscar/oscar.c:3863
 msgid "Additional Information:"
 msgstr "�仂亟舒�仆亳 仗仂亟舒�亳:"
 
-#: src/protocols/oscar/oscar.c:3911
+#: src/protocols/oscar/oscar.c:3867
 msgid "Home Address:"
 msgstr "���仆舒 舒亟�亠�舒:"
 
 # Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-#: src/protocols/oscar/oscar.c:3913 src/protocols/oscar/oscar.c:3929
+#: src/protocols/oscar/oscar.c:3869 src/protocols/oscar/oscar.c:3885
 msgid "Address:"
 msgstr "丕仍亳�舒:"
 
-#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
+#: src/protocols/oscar/oscar.c:3872 src/protocols/oscar/oscar.c:3888
 msgid "City:"
 msgstr "��舒亟:"
 
 # I ovo ima vise smisla kod nas!
-#: src/protocols/oscar/oscar.c:3919 src/protocols/oscar/oscar.c:3935
+#: src/protocols/oscar/oscar.c:3875 src/protocols/oscar/oscar.c:3891
 msgid "State:"
 msgstr "�弍仍舒��:"
 
-#: src/protocols/oscar/oscar.c:3922 src/protocols/oscar/oscar.c:3938
+#: src/protocols/oscar/oscar.c:3878 src/protocols/oscar/oscar.c:3894
 msgid "Zip Code:"
 msgstr "�仂��舒仆�从亳 弍�仂�:"
 
-#: src/protocols/oscar/oscar.c:3927
+#: src/protocols/oscar/oscar.c:3883
 msgid "Work Address:"
 msgstr "�亟�亠�舒 仆舒 仗仂�仍�:"
 
-#: src/protocols/oscar/oscar.c:3943
+#: src/protocols/oscar/oscar.c:3899
 msgid "Work Information:"
 msgstr "�仂亟舒�亳 仂 仗仂�仍�:"
 
-#: src/protocols/oscar/oscar.c:3945
+#: src/protocols/oscar/oscar.c:3901
 msgid "Company:"
 msgstr "��亠亟�亰亠�亠:"
 
-#: src/protocols/oscar/oscar.c:3948
+#: src/protocols/oscar/oscar.c:3904
 msgid "Division:"
 msgstr "�亟亠�亠�亠:"
 
-#: src/protocols/oscar/oscar.c:3951
+#: src/protocols/oscar/oscar.c:3907
 msgid "Position:"
 msgstr "�仂亰亳�亳�舒:"
 
-#: src/protocols/oscar/oscar.c:3954
+#: src/protocols/oscar/oscar.c:3910
 msgid "Web Page:"
 msgstr "�亠弍 ���舒仆亳�舒:"
 
-#: src/protocols/oscar/oscar.c:4063
+#: src/protocols/oscar/oscar.c:4019
 msgid "Account Confirmation Requested"
 msgstr "�舒��亠于舒 �亠 仗仂�于�亟舒 仆舒仍仂亞舒"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4046
 msgid "Error Changing Account Info"
 msgstr "��亠�从舒 仗�亳 亳亰仄亠仆亳 仗仂亟舒�舒从舒 仂 仆舒仍仂亞�"
 
-#: src/protocols/oscar/oscar.c:4093
+#: src/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2395,7 +2415,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亢亠 亟舒 亳�仗亳�亠 从仂�亳�仆亳�从仂 亳仄亠 亰舒�仂 ��仂 �亠 ��舒亢亠仆仂 亳仄亠 "
 "�舒亰仍亳从��亠 仂亟 仂�亳亞亳仆舒仍舒."
 
-#: src/protocols/oscar/oscar.c:4096
+#: src/protocols/oscar/oscar.c:4052
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2404,7 +2424,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亢亠 亟舒 亳�仗亳�亠 从仂�亳�仆亳�从仂 亳仄亠 亰舒�仂 ��仂 �亠 ��舒亢亠仆仂 亳仄亠 "
 "亰舒于��舒于舒 �舒亰仄舒从仂仄."
 
-#: src/protocols/oscar/oscar.c:4099
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2413,7 +2433,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亢亠 亟舒 亳�仗亳�亠 从仂�亳�仆亳�从仂 亳仄亠 亰舒�仂 ��仂 �亠 ��舒亢亠仆仂 亳仄亠 "
 "仗�亠亟�亞舒�从仂."
 
-#: src/protocols/oscar/oscar.c:4102
+#: src/protocols/oscar/oscar.c:4058
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -2422,7 +2442,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亢亠 亟舒 仗�仂仄亠仆亳 舒亟�亠�� 亰舒 亠-仗仂��� 亰舒�仂 ��仂 �亠 于亠� 仗仂�仍舒� "
 "亰舒��亠于 亰舒 仂于仂 从仂�亳�仆亳�从仂 亳仄亠."
 
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -2431,7 +2451,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亢亠 亟舒 仗�仂仄亠仆亳 舒亟�亠�� 亰舒 亠-仗仂��� 亰舒�仂 ��仂 �亠 仗�亠于亳�亠 "
 "从仂�亳�仆亳�从亳� 亳仄亠仆舒 仗仂于亠亰舒仆仂 �舒 亟舒�仂仄 舒亟�亠�仂仄."
 
-#: src/protocols/oscar/oscar.c:4108
+#: src/protocols/oscar/oscar.c:4064
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -2440,12 +2460,12 @@
 "��亠�从舒 0x%04x: �亠 仄仂亢亠 亟舒 仗�仂仄亠仆亳 舒亟�亠�� 亰舒 亠-仗仂��� 亰舒�仂 ��仂 �亠 �仆亠�舒 舒亟�亠�舒 "
 "仆亠亳�仗�舒于仆舒."
 
-#: src/protocols/oscar/oscar.c:4111
+#: src/protocols/oscar/oscar.c:4067
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��亠�从舒 0x%04x: �亠仗仂亰仆舒�舒 亞�亠�从舒."
 
-#: src/protocols/oscar/oscar.c:4121
+#: src/protocols/oscar/oscar.c:4077
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2454,20 +2474,20 @@
 "�舒�亠 从仂�亳�仆亳�从仂 亳仄亠 ��亠仆��仆仂 亳亰亞仍亠亟舒 仂于舒从仂:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4122 src/protocols/oscar/oscar.c:4128
+#: src/protocols/oscar/oscar.c:4078 src/protocols/oscar/oscar.c:4084
 msgid "Account Info"
 msgstr "�仂亟舒�亳 仂 仆舒仍仂亞�"
 
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4083
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "�-仗仂��舒仆�从舒 舒亟�亠�舒 亰舒 %s �亠 %s"
 
-#: src/protocols/oscar/oscar.c:4335
+#: src/protocols/oscar/oscar.c:4291
 msgid "Unable to set AIM profile."
 msgstr "�亠 仄仂亢亠 亟舒 仗仂��舒于亳 ��� 仗�仂�亳仍."
 
-#: src/protocols/oscar/oscar.c:4336
+#: src/protocols/oscar/oscar.c:4292
 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 "
@@ -2477,7 +2497,7 @@
 "仗�亳�舒于亠 亰舒于��亠仆. �舒� 仗�仂�亳仍 仆亳�亠 仗仂��舒于�亠仆, 舒 仗仂仆仂于仂 仗仂从��舒��亠 从舒亟舒 ��亠 "
 "仂亟亞仂于舒�舒���亠 仗仂于亠亰舒仆亳."
 
-#: src/protocols/oscar/oscar.c:4342
+#: src/protocols/oscar/oscar.c:4298
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
@@ -2486,11 +2506,11 @@
 "�舒�于亠�舒 亟仂亰于仂�亠仆舒 于亠仍亳�亳仆舒 仗�仂�亳仍舒 仂亟 %d 弍舒��仂于舒 �亠 仗�亠从仂�舒�亠仆舒.  Gaim 亞舒 �亠 "
 "�从�舒�亳仂 亳 仗仂��舒于亳仂."
 
-#: src/protocols/oscar/oscar.c:4379
+#: src/protocols/oscar/oscar.c:4335
 msgid "Unable to set AIM away message."
 msgstr "�亠 仄仂亢亠 亟舒 仗仂��舒于亳 仗仂��从� 亰舒 ��� 仂亟����于仂."
 
-#: src/protocols/oscar/oscar.c:4380
+#: src/protocols/oscar/oscar.c:4336
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2500,7 +2520,7 @@
 "仗仂���仗舒从 仗�亳�舒于亠 � 仗仂�仗�仆仂��亳 亰舒于��亠仆. ���舒�亠�亠 � ���亠从��亠仄�� ��舒��; 仗仂从��舒��亠 "
 "仗仂仆仂于仂 从舒亟舒 �亠 仂亟亞仂于舒�舒���亠 仗仂于亠亢亠�亠."
 
-#: src/protocols/oscar/oscar.c:4396
+#: src/protocols/oscar/oscar.c:4352
 #, c-format
 msgid ""
 "The away message length of %d bytes has been exceeded.  Gaim has truncated "
@@ -2509,12 +2529,12 @@
 "�舒�于亠�舒 亟仂亰于仂�亠仆舒 亟�亢亳仆舒 仗仂��从亠 亰舒 仂亟����于仂 仂亟 %d 弍舒��仂于舒 �亠 仗�亠从仂�舒�亠仆舒.  "
 "Gaim �亠 �从�舒�亳仂 仗仂��从�, 亳 亰舒仗仂�亠仂 仂亟����于仂."
 
-#: src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:4572
 msgid "Unable To Retrive Buddy List"
 msgstr "�亠 仄仂亢亠 亟舒 仗�亠�亰仄亠 �仗亳�舒从 亟��亞舒�舒"
 
 # greska: retrive->retrieve
-#: src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:4572
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -2523,11 +2543,11 @@
 "��亳于�亠仄亠仆仂, Gaim 仆亳�亠 ��仗亠仂 亟舒 仗�亠�亰仄亠 于舒� �仗亳�舒从 亟��亞舒�舒 �舒 ��� �亠�于亠�舒. "
 "弌仗亳�舒从 亟��亞舒�舒 仆亳�亠 仆亠��舒仂, 亳 于亠�仂于舒�仆仂 �亠 弍亳�亳 亟仂���仗舒仆 亰舒 仆亠从仂仍亳从仂 �舒�亳."
 
-#: src/protocols/oscar/oscar.c:4701 src/protocols/oscar/oscar.c:4702
+#: src/protocols/oscar/oscar.c:4657 src/protocols/oscar/oscar.c:4658
 msgid "Orphans"
 msgstr "弌亳�仂�亳�亳"
 
-#: src/protocols/oscar/oscar.c:4841
+#: src/protocols/oscar/oscar.c:4797
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
@@ -2536,23 +2556,25 @@
 "�舒� �仗亳�舒从 亟��亞舒�舒 仄仂亢亠 �舒亟�亢舒�亳 仆舒�于亳�亠 %d 亟��亞舒�舒, 舒 于亳 亳仄舒�亠 %d.  �仂从 �亠 "
 "仆亠 �仗���亳�亠 亳�仗仂亟 亞�舒仆亳�亠, 仆亠�亠 �亠 于亳亟亠�亳 从舒亟舒 �� 仆亠从亳 亟��亞舒�亳 仆舒 于亠亰亳."
 
-#: src/protocols/oscar/oscar.c:4844
+#: src/protocols/oscar/oscar.c:4800
 msgid "Maximum buddy list length exceeded."
 msgstr "��亠从仂�舒�亠仆舒 仆舒�于亠�舒 亟仂亰于仂�亠仆舒 亟�亢亳仆舒 �仗亳�从舒 亟��亞舒�舒."
 
-#: src/protocols/oscar/oscar.c:4882
+#: src/protocols/oscar/oscar.c:4838
 #, 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 "�亠 仄仂亢亠 亟舒 亟仂亟舒 亟��亞舒�舒 %s 亰舒�仂 ��仂 亳仄舒�亠 仗�亠于亳�亠 亟��亞舒�舒 � �仗亳�从�. 丕从仍仂仆亳�亠 仆亠从仂亞舒 亳 仗仂从��舒��亠 仗仂仆仂于仂."
-
-#: src/protocols/oscar/oscar.c:4882
+msgstr ""
+"�亠 仄仂亢亠 亟舒 亟仂亟舒 亟��亞舒�舒 %s 亰舒�仂 ��仂 亳仄舒�亠 仗�亠于亳�亠 亟��亞舒�舒 � �仗亳�从�. 丕从仍仂仆亳�亠 "
+"仆亠从仂亞舒 亳 仗仂从��舒��亠 仗仂仆仂于仂."
+
+#: src/protocols/oscar/oscar.c:4838
 msgid "(no name)"
 msgstr "(弍亠亰 亳仄亠仆舒)"
 
 # Is it "them"? Or "him/her"?
-#: src/protocols/oscar/oscar.c:4925
+#: src/protocols/oscar/oscar.c:4881
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -2561,11 +2583,11 @@
 "�仂�亳�仆亳从 %s 于舒仄 亟仂亰于仂�舒于舒 亟舒 亞舒 亟仂亟舒�亠 � 于舒� �仗亳�舒从 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 "
 "亞舒 亟仂亟舒�亠?"
 
-#: src/protocols/oscar/oscar.c:4930
+#: src/protocols/oscar/oscar.c:4886
 msgid "Authorization Given"
 msgstr "�于仍舒��亠�亠 亟舒�仂"
 
-#: src/protocols/oscar/oscar.c:4959
+#: src/protocols/oscar/oscar.c:4915
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -2575,18 +2597,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:4996
+#: src/protocols/oscar/oscar.c:4952
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr ""
 "�仂�亳�仆亳从 %s �亠 仂亟仂弍�亳仂 于舒� 亰舒��亠于 亟舒 亞舒 亟仂亟舒�亠 � �于仂� �仗亳�舒从 从仂仆�舒从舒�舒."
 
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4953
 msgid "Authorization Granted"
 msgstr "�舒��亠于 仂亟仂弍�亠仆"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:4956
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -2597,24 +2619,24 @@
 "�仍亠亟亠�亳� �舒亰仍仂亞舒:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5001
+#: src/protocols/oscar/oscar.c:4957
 msgid "Authorization Denied"
 msgstr "�舒��亠于 仂亟弍亳�亠仆"
 
-#: src/protocols/oscar/oscar.c:5036 src/protocols/toc/toc.c:1191
+#: src/protocols/oscar/oscar.c:4992 src/protocols/toc/toc.c:1191
 msgid "Exchange:"
 msgstr "�舒亰仄亠仆舒:"
 
-#: src/protocols/oscar/oscar.c:5400
+#: src/protocols/oscar/oscar.c:5356
 msgid "Unable to open Direct IM"
 msgstr "�亠 仄仂亢亠 亟舒 仗仂�舒�亠 仆亠仗仂��亠亟仆� 弍�亰� 仗仂��从�"
 
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5368
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�亰舒弍�舒仍亳 ��亠 亟舒 ��仗仂��舒于亳�亠 于亠亰� 亰舒 仆亠仗仂��亠亟仆亠 弍�亰亠 仗仂��从亠 亰舒 %s."
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5369
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -2622,89 +2644,74 @@
 "�舒从仂 仂于仂 �舒亰仂�从�亳于舒 于舒�� IP 舒亟�亠��, 仄仂亢亠 �亠 �仄舒��舒�亳 仆舒���舒于舒�亠仄 "
 "仗�亳于舒�仆仂��亳. �亠仍亳�亠 仍亳 亟舒 仆舒��舒于亳�亠?"
 
-#: src/protocols/oscar/oscar.c:5424
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>Remote client does not support "
-"sending status messages.</I><BR>"
-msgstr ""
-"<B>UIN:</B> %s<BR><B>弌�舒�亠:</B> %s<HR><I>�仍亳�亠仆� 仆亠 仗仂亟�亢舒于舒 �仍舒�亠 仗仂��从舒 仂 "
-"��舒��.</I><BR>"
-
-#: src/protocols/oscar/oscar.c:5431
-#, c-format
-msgid ""
-"<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>User has no status message.</I><BR>"
-msgstr ""
-"<B>UIN:</B> %s<BR><B>弌�舒�亠:</B> %s<HR><I>�仂�亳�仆亳从 仆亠仄舒 仗仂��从� 仂 ��舒��.</"
-"I><BR>"
-
-#: src/protocols/oscar/oscar.c:5577
+#: src/protocols/oscar/oscar.c:5507
 msgid "Get Status Msg"
 msgstr "�仂亞仍亠亟舒��亠 仗仂��从� 仂 ��舒��"
 
-#: src/protocols/oscar/oscar.c:5610
+#: src/protocols/oscar/oscar.c:5540
 msgid "Re-request Authorization"
 msgstr "�仂仆仂于亳�亠 亰舒��亠于 亰舒 仂于仍舒��亠�亠"
 
-#: src/protocols/oscar/oscar.c:5633
+#: src/protocols/oscar/oscar.c:5563
 msgid "The new formatting is invalid."
 msgstr "�仂于亳 亰舒仗亳� �亠 仆亠亳�仗�舒于舒仆."
 
-#: src/protocols/oscar/oscar.c:5634
+#: src/protocols/oscar/oscar.c:5564
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "�舒仗亳� 从仂�亳�仆亳�从仂亞 亳仄亠仆舒 �亠 仄仂亢亠 仗�仂仄亠仆亳�亳 �舒仄仂 � 于亠仍亳�亳仆亳 �仍仂于舒 亳 弍�仂�� "
 "�舒亰仄舒从舒."
 
-#: src/protocols/oscar/oscar.c:5640
+#: src/protocols/oscar/oscar.c:5570
 msgid "New screenname formatting:"
 msgstr "�仂于亳 亰舒仗亳� 从仂�亳�仆亳�从仂亞 亳仄亠仆舒:"
 
-#: src/protocols/oscar/oscar.c:5685
+#: src/protocols/oscar/oscar.c:5615
 msgid "Change Address To: "
 msgstr "��仂仄亠仆亳�亠 舒亟�亠�� �:"
 
-#: src/protocols/oscar/oscar.c:5695
+#: src/protocols/oscar/oscar.c:5625
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "��亠从��亠�亠 仂于仍舒��亠�亠 仂亟 �仍亠亟亠�亳� 亟��亞舒�舒:<BR>"
 
-#: src/protocols/oscar/oscar.c:5720
+#: src/protocols/oscar/oscar.c:5650
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>仆亠 �亠从舒�亠 仆舒 仂于仍舒��亠�舒</i>"
 
-#: src/protocols/oscar/oscar.c:5725
+#: src/protocols/oscar/oscar.c:5655
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
 "clicking on them and clicking \"Re-request authorization.\""
-msgstr "%s<BR><BR>�仂亢亠�亠 仗仂仆仂于亳�亳 亰舒��亠于 亰舒 仂于仍舒��亠�亠 仂亟 仂于亳� 亟��亞舒�舒 亟亠�仆亳仄-从仍亳从仂仄 仆舒 �亳� 亳亰弍仂�仂仄 ���仂仆仂于亳�亠 亰舒��亠于 亰舒 仂于仍舒��亠�亠��."
-
-#: src/protocols/oscar/oscar.c:5760
+msgstr ""
+"%s<BR><BR>�仂亢亠�亠 仗仂仆仂于亳�亳 亰舒��亠于 亰舒 仂于仍舒��亠�亠 仂亟 仂于亳� 亟��亞舒�舒 亟亠�仆亳仄-从仍亳从仂仄 "
+"仆舒 �亳� 亳亰弍仂�仂仄 ���仂仆仂于亳�亠 亰舒��亠于 亰舒 仂于仍舒��亠�亠��."
+
+#: src/protocols/oscar/oscar.c:5690
 msgid "Change Password (URL)"
 msgstr "�亰仄亠仆亳�亠 仍仂亰亳仆从� (�仆�亠�仆亠� 舒亟�亠�舒)"
 
-#: src/protocols/oscar/oscar.c:5771
+#: src/protocols/oscar/oscar.c:5701
 msgid "Format Screenname"
 msgstr "�舒仗亳� 从仂�亳�仆亳�从仂亞 亳仄亠仆舒"
 
-#: src/protocols/oscar/oscar.c:5777
+#: src/protocols/oscar/oscar.c:5707
 msgid "Confirm Account"
 msgstr "�仂�于�亟亳�亠 仆舒仍仂亞"
 
-#: src/protocols/oscar/oscar.c:5783
+#: src/protocols/oscar/oscar.c:5713
 msgid "Display Current Registered Address"
 msgstr "��亳从舒亢亳 ��亠仆��仆仂 �亠亞亳���仂于舒仆� 舒亟�亠��"
 
-#: src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:5719
 msgid "Change Current Registered Address"
 msgstr "�亰仄亠仆亳 ��亠仆��仆仂 �亠亞亳���仂于舒仆� 舒亟�亠��"
 
-#: src/protocols/oscar/oscar.c:5798
+#: src/protocols/oscar/oscar.c:5728
 msgid "Show Buddies Awaiting Authorization"
 msgstr "��亳从舒亢亳 亟��亞舒�亠 亰舒 从仂�亠 �亠 �亠从舒 仂于仍舒��亠�亠"
 
-#: src/protocols/oscar/oscar.c:5806
+#: src/protocols/oscar/oscar.c:5736
 msgid "Search for Buddy by Email"
 msgstr "��仂仆舒�亳 亟��亞舒�舒 仗�亠仄舒 亠-仗仂��亳"
 
@@ -2911,12 +2918,11 @@
 msgid "%s requests you to send them a file"
 msgstr "%s 亰舒��亠于舒 仂亟 于舒� 亟舒 仗仂�舒�亠�亠 亟舒�仂�亠从�"
 
-#: src/gtkft.c:1097 src/protocols/toc/toc.c:2041 src/prpl.c:309
-#: src/server.c:1065
+#: src/gtkft.c:1097 src/protocols/toc/toc.c:2041 src/server.c:1064
 msgid "Accept"
 msgstr "��亳�于舒�亳"
 
-#: src/protocols/yahoo/yahoo.c:584
+#: src/protocols/yahoo/yahoo.c:586
 msgid "Your Yahoo! message did not get sent."
 msgstr "�舒�舒 �舒��! 仗仂��从舒 仆亳�亠 仗仂�仍舒�舒."
 
@@ -2977,12 +2983,12 @@
 msgid "Recipient:"
 msgstr "��亳仄舒仍舒�:"
 
-#: src/about.c:75
+#: src/about.c:74
 #, c-format
 msgid "About Gaim v%s"
 msgstr "� Gaim-� 亳亰亟.%s"
 
-#: src/about.c:112
+#: src/about.c:106
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -2992,57 +2998,68 @@
 "�舒��!, MSN, IRC, �舒弍亠�, �舒仗��亠�, �亠�亳� 亳 �舒亟�-�舒亟� 亳��仂于�亠仄亠仆仂. �舒仗亳�舒仆 �亠 "
 "仗仂仄仂�� Gtk+ 亳 仍亳�亠仆�亳�舒仆 仗仂亟 �仆�仂于仂仄 �仗��仂仄 �舒于仆仂仄 仍亳�亠仆�仂仄 (GPL).<BR><BR>"
 
-#: src/about.c:122
+#: src/about.c:116
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim 仆舒 irc.freenode.net<BR><BR>"
 
-#: src/about.c:126
+#: src/about.c:120
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">�从�亳于仆亳 仗�仂亞�舒仄亠�亳:</FONT><BR>"
 
-#: src/about.c:128
+#: src/about.c:122
 msgid ""
 "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
-"A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
-"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+"A>&gt;<BR>  Sean Egan (lead developer) &lt;<A HREF=\"mailto:"
+"bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian "
+"'ChipX86' Hammond (developer & webmaster)<BR>  Herman Bloggs (win32 port) "
+"&lt;<A HREF=\"mailto:hermanator12002@yahoo.com\">hermanator12002@yahoo.com</"
+"A>&gt;<BR>  Nathan 'faceprint' Walp (developer)<BR>  Mark 'KingAnt' Doliner "
+"(developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
 msgstr ""
 "  Rob Flynn (仂亟�亢舒于舒) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
-"A>&gt;<BR>  Sean Egan (仗�仂亞�舒仄亠�) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
-"\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+"A>&gt;<BR>  Sean Egan (于仂亟亠�亳 仗�仂亞�舒仄亠�) &lt;<A HREF=\"mailto:"
+"bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian "
+"'ChipX86' Hammond (仗�仂亞�舒仄亠� 亳 亰舒亟�亢亠仆 亰舒 于亠弍)<BR>  Herman Bloggs (�亳仆亟仂�� "
+"亳亰亟舒�亠) &lt;<A HREF=\"mailto:hermanator12002@yahoo.com"
+"\">hermanator12002@yahoo.com</A>&gt;<BR>  Nathan 'faceprint' Walp (仗�仂亞�舒仄亠�)"
+"<BR>  Mark 'KingAnt' Doliner (仗�仂亞�舒仄亠�)<BR>  Luke 'LSchiere' Schierer "
+"(仗仂亟��从舒)<BR><BR>"
 
 # Ili je ovo: "Ludi pisci dopuna"?
-#: src/about.c:136
+#: src/about.c:137
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">�亳��亳 仍�亟亳� 亟仂仗�仆舒:</FONT><BR>"
 
-#: src/about.c:144
-msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
-msgstr "<FONT SIZE=\"3\">�亳仆亟仂�� 亳亰亟舒�亠:</FONT><BR>"
-
-#: src/about.c:151
+#: src/about.c:147
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
-msgstr "�亠仆亰亳仂仆亳�舒仆亳 仗�仂亞�舒仄亠�亳:"
-
-#: src/about.c:153
+msgstr "<FONT SIZE=\"3\">�亠仆亰亳仂仆亳�舒仆亳 仗�仂亞�舒仄亠�亳:</FONT><BR>"
+
+#: src/about.c:149
 msgid ""
-"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
-"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (original author) &lt;<A "
-"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
+"  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
+"lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (former maintainer)<BR>  "
+"Jim Seymour (former Jabber developer)<BR>  Mark Spencer (original author) "
+"&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
+"Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 msgstr ""
-"  Jim Duchek<BR>  Eric Warmenhoven &lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
-"\">warmenhoven@yahoo.com</A>&gt;<BR>  Mark Spencer (仗�于仂弍亳�仆亳 �于仂�舒�) &lt;<A "
-"HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR><BR>"
-
-#: src/about.c:174 src/dialogs.c:3889 src/prpl.c:532 src/prpl.c:835
-#: src/server.c:1253
+"  Adam Fritzler (仗�亠��仂亟仆仂 仂亟�亢舒于舒仂 libfaim)<BR>  Eric Warmenhoven (弍亳于�亳 "
+"于仂亟亠�亳 仗�仂亞�舒仄亠�)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (仗�亠��仂亟仆仂 仂亟�亢舒于舒仂)<BR>  "
+"Jim Seymour (弍亳于�亳 �舒弍亠� 仗�仂亞�舒仄亠�)<BR>  Mark Spencer (仗�于仂弍亳�仆亳 舒��仂�) &lt;"
+"<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  Syd "
+"Logan (�舒从亠� 亳 仂亟�亠�亠仆亳 ��从仂于仂亟亳仍舒� [仍亠仆��亞舒])<BR><BR>"
+
+#: src/about.c:169 src/dialogs.c:3816 src/prpl.c:536 src/prpl.c:834
+#: src/server.c:1252
 msgid "Close"
 msgstr "�舒�于仂�亳"
 
-#: src/away.c:220
+#: src/away.c:219
 msgid "Gaim - Away!"
 msgstr "Gaim �� �亟���舒仆!"
 
-#: src/away.c:280
+#: src/away.c:279
 msgid "I'm Back!"
 msgstr "��舒�亳仂 �舒仄 �亠!"
 
@@ -3079,166 +3096,161 @@
 msgid "There was an error launching your chosen browser: %s"
 msgstr "�仂�仍仂 �亠 亟仂 亞�亠�从亠 仗�亳 仗仂从�亠�舒�� 于舒�亠亞 亳亰舒弍�舒仆仂亞 仗�亠亞仍亠亟仆亳从舒: %s"
 
-#: src/buddy.c:302
+#: src/buddy.c:306
 msgid "_Add a Buddy"
 msgstr "_�仂亟舒��亠 亟��亞舒�舒"
 
-#: src/buddy.c:308
+#: src/buddy.c:312
 msgid "_Delete Group"
 msgstr "丕_从仍仂仆亳 亞��仗�"
 
-#: src/buddy.c:314
+#: src/buddy.c:318
 msgid "_Rename"
 msgstr "��亠_亳仄亠仆��"
 
-#: src/buddy.c:322
+#: src/buddy.c:326
 msgid "_Get Info"
 msgstr "�仂亟舒_�亳"
 
-#: src/buddy.c:327
+#: src/buddy.c:331
 msgid "_IM"
 msgstr "_�仂��从舒"
 
-#: src/buddy.c:333
-msgid "Add Buddy _Pounce"
-msgstr "�仂亟舒� _亰舒�从舒从亳于舒�亠 亟��亞舒�舒"
-
 #: src/buddy.c:337
+msgid "Add Buddy _Pounce"
+msgstr "�仂亟舒� _亰舒�从舒从亳于舒�亠 亟��亞舒�舒"
+
+#: src/buddy.c:341
 msgid "View _Log"
 msgstr "�仂亞仍亠亟舒��亠 仗仂��从亠 仂 亞�亠�从舒仄舒"
 
-#: src/buddy.c:355
+#: src/buddy.c:360
 msgid "_Alias"
 msgstr "�_舒亟亠仆亳 亳仄亠"
 
-#: src/buddy.c:359
+#: src/buddy.c:366
 msgid "_Remove"
 msgstr "_丕从仍仂仆亳"
 
 #. Buddies menu
-#: src/buddy.c:635
+#: src/buddy.c:641
 msgid "/_Buddies"
 msgstr "/_���亞舒�亳"
 
-#: src/buddy.c:636
+#: src/buddy.c:642
 msgid "/Buddies/New _Instant Message..."
-msgstr "/���亞舒�亳/_�仂亟舒� 亟��亞舒�舒..."
-
-#: src/buddy.c:638
+msgstr "/���亞舒�亳/_�仂于舒 弍�亰舒 仗仂��从舒..."
+
+#: src/buddy.c:643
 msgid "/Buddies/Join a _Chat..."
 msgstr "/���亞舒�亳/_��亳从���亳 �亠 �舒亰亞仂于仂��..."
 
-#: src/buddy.c:641
+#: src/buddy.c:644
 msgid "/Buddies/Get _User Info..."
 msgstr "/���亞舒�亳/��亠�亰仄亳 仗仂亟舒�从亠 仂 _从仂�亳�仆亳从�..."
 
-#: src/buddy.c:644
+#: src/buddy.c:646
+msgid "/Buddies/_Show Offline Buddies"
+msgstr "/���亞舒�亳/_��亳从舒亢亳 仆亠仗仂于亠亰舒仆亠 亟��亞舒�亠"
+
+#: src/buddy.c:647
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/���亞舒�亳/��亳从舒亢亳 _仗�舒亰仆亠 亞��仗亠"
+
+#: src/buddy.c:648
+msgid "/Buddies/_Add a Buddy..."
+msgstr "/���亞舒�亳/_�仂亟舒� 亟��亞舒�舒..."
+
+#: src/buddy.c:649
+msgid "/Buddies/Add a _Group..."
+msgstr "/���亞舒�亳/�仂亟舒� _亞��仗�..."
+
+#: src/buddy.c:651
 msgid "/Buddies/_Signoff"
 msgstr "/���亞舒�亳/_�亟�舒于舒"
 
-#: src/buddy.c:645
+#: src/buddy.c:652
 msgid "/Buddies/_Quit"
 msgstr "/���亞舒�亳/�_亰仍舒亰"
 
-#. Edit menu
-#: src/buddy.c:649
-msgid "/_Edit"
-msgstr "/_丕�亠亟亳"
-
-#: src/buddy.c:650
-msgid "/Edit/_Show Offline Buddies"
-msgstr "/丕�亠亟亳/_��亳从舒亢亳 仆亠仗仂于亠亰舒仆亠 亟��亞舒�亠"
-
-#: src/buddy.c:651
-msgid "/Edit/_Add a Buddy..."
-msgstr "/丕�亠亟亳/_�仂亟舒� 亟��亞舒�舒..."
-
-#: src/buddy.c:652
-msgid "/Edit/Add a _Group..."
-msgstr "/丕�亠亟亳/�仂亟舒� _亞��仗�..."
-
-#: src/buddy.c:654
-msgid "/Edit/A_ccounts"
-msgstr "/丕�亠亟亳/_�舒仍仂亰亳"
-
+#. Tools
 #: src/buddy.c:655
-msgid "/Edit/Preferences"
-msgstr "/丕�亠亟亳/�仂��舒于从亠"
+msgid "/_Tools"
+msgstr "/_�仍舒�亳"
+
+#: src/buddy.c:656
+msgid "/Tools/_Away"
+msgstr "/�仍舒�亳/_�亟���舒仆"
 
 #: src/buddy.c:657
-msgid "/Edit/Pr_ivacy"
-msgstr "/丕�亠亟亳/�_�亳于舒�仆仂��"
-
-#. Tools
+msgid "/Tools/Buddy _Pounce"
+msgstr "/�仍舒�亳/_�舒�从仂�亳�亳 亟��亞舒�舒"
+
+#: src/buddy.c:658
+msgid "/Tools/P_rotocol Actions"
+msgstr "/�仍舒�亳/�_从�亳�亠 仗仂 仗�仂�仂从仂仍�"
+
 #: src/buddy.c:660
-msgid "/_Tools"
-msgstr "/_�仍舒�亳"
+msgid "/Tools/A_ccounts..."
+msgstr "/�仍舒�亳/_�舒仍仂亰亳"
 
 #: src/buddy.c:661
-msgid "/Tools/_Away"
-msgstr "/�仍舒�亳/_�亟���舒仆"
+msgid "/Tools/_File Transfers..."
+msgstr "/�仍舒�亳/��亠仆仂�亳 _亟舒�仂�亠从舒..."
 
 #: src/buddy.c:662
-msgid "/Tools/Buddy _Pounce"
-msgstr "/�仍舒�亳/_�舒�从仂�亳�亳 亟��亞舒�舒"
+msgid "/Tools/Preferences..."
+msgstr "/�仍舒�亳/_�仂��舒于从亠"
 
 #: src/buddy.c:663
-msgid "/Tools/sep1"
-msgstr "/�仍舒�亳/�舒亰亟1"
-
-#: src/buddy.c:664
-msgid "/Tools/_File Transfers"
-msgstr "/�仍舒�亳/��亠仆仂�亳 _亟舒�仂�亠从舒"
-
-#: src/buddy.c:667
-msgid "/Tools/P_rotocol Actions"
-msgstr "/�仍舒�亳/�_从�亳�亠 仗仂 仗�仂�仂从仂仍�"
-
-#: src/buddy.c:668
-msgid "/Tools/View System _Log"
-msgstr "/�仍舒�亳/��亠亞仍亠亟舒��亠 _�亳��亠仄�从亠 亰舒仗亳�亠"
+msgid "/Tools/Pr_ivacy..."
+msgstr "/�仍舒�亳/_��亳于舒�仆仂��"
+
+#: src/buddy.c:665
+msgid "/Tools/View System _Log..."
+msgstr "/�仍舒�亳/��亠亞仍亠亟舒��亠 _�亳��亠仄�从亠 亰舒仗亳�亠..."
 
 #. Help
-#: src/buddy.c:671
+#: src/buddy.c:668
 msgid "/_Help"
 msgstr "/_�仂仄仂�"
 
-#: src/buddy.c:672
+#: src/buddy.c:669
 msgid "/Help/Online _Help"
 msgstr "/_�仂仄仂�/�仂仄仂� 亳亰 _仗�仂亞�舒仄舒"
 
-#: src/buddy.c:674
-msgid "/Help/_Debug Window"
+#: src/buddy.c:670
+msgid "/Help/_Debug Window..."
 msgstr "/_�仂仄仂�/��仂亰仂� 亰舒 �舒亰_弍�弍亳�舒�亠"
 
-#: src/buddy.c:675
-msgid "/Help/_About"
+#: src/buddy.c:671
+msgid "/Help/_About..."
 msgstr "/_�仂仄仂�/_� 仗�仂亞�舒仄�"
 
-#: src/buddy.c:710
+#: src/buddy.c:705
 #, c-format
 msgid "%dh%02dm"
 msgstr "%dh%02dm"
 
-#: src/buddy.c:712
+#: src/buddy.c:707
 #, c-format
 msgid "%dm"
 msgstr "%dm"
 
-#: src/buddy.c:722
+#: src/buddy.c:717
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/buddy.c:732
+#: src/buddy.c:728
 msgid ""
 "\n"
 "<b>Alias:</b>"
 msgstr ""
 "\n"
-"<b>�仍亳�舒�:</b>"
-
-#: src/buddy.c:733
+"<b>�仂亰仆舒� 从舒仂:</b>"
+
+#: src/buddy.c:729
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -3246,7 +3258,7 @@
 "\n"
 "<b>�舒亟亳仄舒从:</b>"
 
-#: src/buddy.c:734
+#: src/buddy.c:730
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -3254,7 +3266,7 @@
 "\n"
 "<b>�亠舒从�亳于舒仆:</b>"
 
-#: src/buddy.c:735
+#: src/buddy.c:731
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -3262,44 +3274,46 @@
 "\n"
 "<b>丕仗仂亰仂�亠仆:</b>"
 
-#: src/buddy.c:736
+#: src/buddy.c:732
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
-msgstr "\n<b>弌�舒�亠:</b> �亠仗仂于亠亰舒仆"
-
-#: src/buddy.c:1003
+msgstr ""
+"\n"
+"<b>弌�舒�亠:</b> �亠仗仂于亠亰舒仆"
+
+#: src/buddy.c:997
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "�亠仆�舒�亳 (%dh%02dm) "
 
-#: src/buddy.c:1005
+#: src/buddy.c:999
 #, c-format
 msgid "Idle (%dm) "
 msgstr "�亠仆�舒�亳 (%dm) "
 
-#: src/buddy.c:1009
+#: src/buddy.c:1003
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "丕仗仂亰仂�亠仆 (%d%%) "
 
-#: src/buddy.c:1018 src/buddy.c:1028
+#: src/buddy.c:1012 src/buddy.c:1022
 msgid "Offline "
 msgstr "�亠仗仂于亠亰舒仆"
 
-#: src/buddy.c:1140
-msgid "Biatches List"
-msgstr "弌仗亳�舒从 仂��舒从舒"
-
-#: src/buddy.c:1160
+#: src/buddy.c:1129 src/prefs.c:1715
+msgid "Buddy List"
+msgstr "弌仗亳�舒从 亟��亞舒�舒"
+
+#: src/buddy.c:1151
 msgid "/Tools/Away"
 msgstr "/�仍舒�亳/_�亟���舒仆"
 
-#: src/buddy.c:1163
+#: src/buddy.c:1154
 msgid "/Tools/Buddy Pounce"
 msgstr "/�仍舒�亳/_�舒�从仂�亳�亳 亟��亞舒�舒"
 
-#: src/buddy.c:1166
+#: src/buddy.c:1157
 msgid "/Tools/Protocol Actions"
 msgstr "/�仍舒�亳/�_从�亳�亠 仗仂 仗�仂�仂从仂仍�"
 
@@ -3307,17 +3321,37 @@
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 #: src/buddy.c:1235
-msgid "/Edit/Show Offline Buddies"
-msgstr "/丕�亠亟亳/��亳从舒亢亳 仆亠仗仂于亠亰舒仆亠 亟��亞舒�亠"
-
-#: src/buddy.c:1251 src/gtkconv.c:733
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/���亞舒�亳/��亳从舒亢亳 仆亠仗仂于亠亰舒仆亠 亟��亞舒�亠"
+
+#: src/buddy.c:1237
+msgid "/Buddies/Show Empty Groups"
+msgstr "/���亞舒�亳/��亳从舒亢亳 仗�舒亰仆亠 亞��仗亠"
+
+#: src/buddy.c:1255 src/gtkconv.c:753
 msgid "IM"
 msgstr "�仂��从舒"
 
-#: src/buddy.c:1259
+#: src/buddy.c:1261
+msgid "Send a message to the selected buddy"
+msgstr "�仂�舒�亳 仗仂��从� 亳亰舒弍�舒仆仂仄 亟��亞舒��"
+
+#: src/buddy.c:1264
 msgid "Get Info"
 msgstr "�仂亟舒�亳"
 
+#: src/buddy.c:1270
+msgid "Get information on the selected buddy"
+msgstr "�舒弍舒于亳 仗仂亟舒�从亠 仂 亳亰舒弍�舒仆仂仄 亟��亞舒��"
+
+#: src/buddy.c:1278
+msgid "Join a chat room"
+msgstr "��亳从���亳 �亠 仗�亳�舒仂仆亳�亳"
+
+#: src/buddy.c:1286
+msgid "Set an away message"
+msgstr "�仂��舒于亳 仗仂��从� 亰舒 仂亟����于仂"
+
 #: src/buddy_chat.c:249
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
@@ -3387,15 +3421,15 @@
 msgid "By account"
 msgstr "��亠仄舒 仆舒仍仂亞�"
 
-#: src/dialogs.c:377
+#: src/dialogs.c:363
 msgid "Warn User"
 msgstr "丕仗仂亰仂�亳 从仂�亳�仆亳从舒"
 
-#: src/dialogs.c:377
+#: src/dialogs.c:363
 msgid "_Warn"
 msgstr "_丕仗仂亰仂�亳"
 
-#: src/dialogs.c:393
+#: src/dialogs.c:379
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3408,84 +3442,86 @@
 "�于仂 �亠 �于亠�舒�亳 仆亳于仂 仂弍舒亰�亳于仂��亳 亰舒 ��%s�� 亳 仂仆/仂仆舒 �亠 亳仄舒�亳 ���仂亢亳�亠 "
 "仂亞�舒仆亳�舒于舒�亠 弍�亰亳仆亠 �仍舒�舒 仗仂��从舒.\n"
 
-#: src/dialogs.c:402
+#: src/dialogs.c:388
 msgid "Warn _anonymously?"
 msgstr "丕仗仂亰仂�亳 _舒仆仂仆亳仄仆仂?"
 
-#: src/dialogs.c:409
+#: src/dialogs.c:395
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�仆仂仆亳仄仆舒 �仗仂亰仂�亠�舒 �� 仄舒�亠亞 ��亳�舒�舒.</b>"
 
 #. b->name is null after remove_buddy
-#: src/dialogs.c:432
+#: src/dialogs.c:418
 #, c-format
 msgid "Removing '%s' from buddy list.\n"
 msgstr "丕从仍舒�舒 ��%s�� �舒 �仗亳�从舒 亟��亞舒�舒.\n"
 
-#: src/dialogs.c:471
+#: src/dialogs.c:457
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "丕从仍舒�舒�亠 %s �舒 �仗亳�从舒 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 仆舒��舒于亳�亠?"
 
-#: src/dialogs.c:472
+#: src/dialogs.c:458
 msgid "Remove Buddy"
 msgstr "丕从仍仂仆亳 亟��亞舒�舒"
 
-#: src/dialogs.c:478
+#: src/dialogs.c:464
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
-msgstr "丕从仍舒�舒�亠 亞��仗� %s 亳 �于亠 �亠仆亠 �仍舒仆仂于亠 亳亰 �仗亳�从舒 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 仆舒��舒于亳�亠?"
-
-#: src/dialogs.c:480
+msgstr ""
+"丕从仍舒�舒�亠 亞��仗� %s 亳 �于亠 �亠仆亠 �仍舒仆仂于亠 亳亰 �仗亳�从舒 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 "
+"仆舒��舒于亳�亠?"
+
+#: src/dialogs.c:466
 msgid "Remove Group"
-msgstr "��亠亳仄亠仆�� 亞��仗�"
-
-#: src/dialogs.c:702
+msgstr "丕从仍仂仆亳 亞��仗�"
+
+#: src/dialogs.c:676
 msgid "New Message"
 msgstr "�仂于舒 仗仂��从舒"
 
-#: src/dialogs.c:720
+#: src/dialogs.c:694
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "丕仆亠�亳�亠 亳仄亠 仂�仂弍亠 从仂�仂� 亢亠仍亳�亠 亟舒 �仗��亳�亠 弍�亰� 仗仂��从�.\n"
 
-#: src/dialogs.c:736 src/dialogs.c:837
+#: src/dialogs.c:710 src/dialogs.c:809 src/dialogs.c:3356
 msgid "_Screenname:"
 msgstr "_�仄亠:"
 
-#: src/dialogs.c:751 src/dialogs.c:853
+#: src/dialogs.c:725 src/dialogs.c:825 src/gtkpounce.c:454
 msgid "_Account:"
 msgstr "_�舒仍仂亞:"
 
-#: src/dialogs.c:806
+#: src/dialogs.c:778
 msgid "Get User Info"
 msgstr "��亠�亰仄亳�亠 仗仂亟舒�从亠 仂 从仂�亳�仆亳从�"
 
-#: src/dialogs.c:825
+#: src/dialogs.c:797
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "丕仆亠�亳�亠 亳仄亠 仂�仂弍亠 �亳�亠 仗仂亟舒�从亠 亢亠仍亳�亠 亟舒 于亳亟亳�亠.\n"
 
-#: src/dialogs.c:1004
+#: src/dialogs.c:974
 msgid "Add Group"
 msgstr "�仂亟舒� 亞��仗�"
 
-#: src/dialogs.c:1021
+#: src/dialogs.c:991
 msgid "Please enter the name of the group to be added.\n"
 msgstr "丕仆亠�亳�亠 亳仄亠 亞��仗亠 从仂�� 亢亠仍亳�亠 亟舒 亟仂亟舒�亠.\n"
 
-#: src/dialogs.c:1030 src/dialogs.c:4006
+#: src/dialogs.c:1000 src/dialogs.c:3930
 msgid "_Group:"
 msgstr "_���仗舒:"
 
-#: src/dialogs.c:1118
+#: src/dialogs.c:1082
 msgid "Add Buddy"
 msgstr "�仂亟舒��亠 亟��亞舒�舒"
 
-#: src/dialogs.c:1137
+#: src/dialogs.c:1101
 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. "
@@ -3495,180 +3531,180 @@
 "仄仂亢亠�亠 �仆亠�亳 亳 舒仍亳�舒� 亳仍亳 仆舒亟亳仄舒从 亰舒 亟��亞舒�舒. �仍亳�舒� �亠 �亠 仗�亳从舒亰亳于舒�亳 "
 "仆舒仄亠��仂 亳仄亠仆舒 从舒亟 亞仂亟 �亠 �仂 仄仂亞��亠.\n"
 
-#: src/dialogs.c:1156
+#: src/dialogs.c:1120
 msgid "Screen Name"
 msgstr "�仄亠"
 
-#: src/dialogs.c:1169 src/dialogs.c:3420 src/dialogs.c:3434
+#: src/dialogs.c:1133
 msgid "Alias"
-msgstr "�仍亳�舒�"
-
-#: src/dialogs.c:1179
+msgstr "�舒亟亠仆亳 亳仄亠"
+
+#: src/dialogs.c:1143
 msgid "Group"
 msgstr "���仗舒"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1188
+#: src/dialogs.c:1152
 msgid "Add To"
 msgstr "�仂亟舒�亳 �"
 
-#: src/dialogs.c:1518
+#: src/dialogs.c:1482
 msgid "Privacy"
 msgstr "��亳于舒�仆仂��"
 
 # Ovo sam izvukao iz...
-#: src/dialogs.c:1529
+#: src/dialogs.c:1493
 msgid "Changes to privacy settings take effect immediately."
 msgstr "�亰仄亠仆亠 仗仂��舒于从亳 仗�亳于舒�仆仂��亳 亳��仂于�亠仄亠仆仂 �亰亳仄舒�� 仄舒�舒."
 
-#: src/dialogs.c:1538
+#: src/dialogs.c:1502
 msgid "Set privacy for:"
 msgstr "�仂��舒于亳 仗�亳于舒�仆仂�� 亰舒:"
 
-#: src/dialogs.c:1555
+#: src/dialogs.c:1519
 msgid "Allow all users to contact me"
 msgstr "�仂亰于仂仍亳 �于亳仄 从仂�亳�仆亳�亳仄舒 亟舒 仄亠 从仂仆�舒从�亳�舒��"
 
-#: src/dialogs.c:1559
+#: src/dialogs.c:1523
 msgid "Allow only users on my buddy list"
 msgstr "�仂亰于仂仍亳 �舒仄仂 从仂�亳�仆亳�亳仄舒 �舒 仄仂亞 �仗亳�从舒 亟��亞舒�舒"
 
-#: src/dialogs.c:1563
+#: src/dialogs.c:1527
 msgid "Allow only the users below"
 msgstr "�仂亰于仂仍亳 �舒仄仂 从仂�亳�仆亳�亳仄舒 仆亳亢亠 仆舒于亠亟亠仆亳仄"
 
-#: src/dialogs.c:1601
+#: src/dialogs.c:1565
 msgid "Deny all users"
 msgstr "�亟弍亳� �于亠 从仂�亳�仆亳从亠"
 
-#: src/dialogs.c:1605
+#: src/dialogs.c:1569
 msgid "Block the users below"
 msgstr "�仍仂从亳�舒� 仆亳亢亠 仆舒于亠亟亠仆亠 从仂�亳�仆亳从亠"
 
-#: src/dialogs.c:1720
+#: src/dialogs.c:1684
 msgid "Set Directory Info"
 msgstr "�仂��舒于亳 仗仂亟舒�从亠 � 亳仄亠仆亳从�"
 
-#: src/dialogs.c:1728
+#: src/dialogs.c:1692
 msgid "Directory Info"
 msgstr "�仄亠仆亳从 �舒 仗仂亟舒�亳仄舒"
 
-#: src/dialogs.c:1738
+#: src/dialogs.c:1702
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "�仂��舒于�舒 仗仂亟舒�从亠 � 亳仄亠仆亳从� 亰舒 %s:"
 
-#: src/dialogs.c:1750
+#: src/dialogs.c:1714
 msgid "Allow Web Searches To Find Your Info"
 msgstr "�仂亰于仂仍亳�亳 亟舒 仗�亠��舒亞亠 于亠弍舒 仗�仂仆舒�� 于舒�亠 仗仂亟舒�从亠"
 
 #. Line 1
-#: src/dialogs.c:1753 src/dialogs.c:2420
+#: src/dialogs.c:1717 src/dialogs.c:2356
 msgid "First Name"
 msgstr "�仄亠"
 
 #. Line 2
-#: src/dialogs.c:1764 src/dialogs.c:2432
+#: src/dialogs.c:1728 src/dialogs.c:2366
 msgid "Middle Name"
 msgstr "�仄亠 仂�舒"
 
 #. Line 3
-#: src/dialogs.c:1776 src/dialogs.c:2444
+#: src/dialogs.c:1740 src/dialogs.c:2376
 msgid "Last Name"
 msgstr "��亠亰亳仄亠"
 
 #. Line 4
-#: src/dialogs.c:1787 src/dialogs.c:2456
+#: src/dialogs.c:1751 src/dialogs.c:2386
 msgid "Maiden Name"
 msgstr "�亠于仂�舒�从仂 仗�亠亰亳仄亠"
 
 #. Line 6
-#: src/dialogs.c:1809 src/dialogs.c:2479
+#: src/dialogs.c:1773 src/dialogs.c:2405
 msgid "State"
 msgstr "�弍仍舒��"
 
-#: src/dialogs.c:1852 src/dialogs.c:2040 src/dialogs.c:3224 src/dialogs.c:3898
-#: src/dialogs.c:4776
+#: src/dialogs.c:1815 src/dialogs.c:1986 src/dialogs.c:3118 src/dialogs.c:3825
+#: src/dialogs.c:4600
 msgid "Save"
 msgstr "弌仆亳仄亳"
 
-#: src/dialogs.c:1874
+#: src/dialogs.c:1837
 msgid "New Passwords Do Not Match"
 msgstr "�仂于亠 仍仂亰亳仆从亠 �亠 仆亠 仗仂从仍舒仗舒��"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:1842
 msgid "Fill out all fields completely"
 msgstr "�仂仗�仆亳�亠 �于舒 仗仂�舒 � 仗仂�仗�仆仂��亳"
 
-#: src/dialogs.c:1923
+#: src/dialogs.c:1885
 #, c-format
 msgid "Changing password for %s:"
 msgstr "�亰仄亠仆舒 仍仂亰亳仆从亠 亰舒 %s:"
 
-#: src/dialogs.c:1933
+#: src/dialogs.c:1893
 msgid "Original Password"
 msgstr "��于仂弍亳�仆舒 仍仂亰亳仆从舒"
 
-#: src/dialogs.c:1947
+#: src/dialogs.c:1904
 msgid "New Password"
 msgstr "�仂于舒 仍仂亰亳仆从舒"
 
-#: src/dialogs.c:1961
+#: src/dialogs.c:1915
 msgid "New Password (again)"
 msgstr "�仂于舒 仍仂亰亳仆从舒 (仗仂仆仂于亳�亳)"
 
 #. Build OK Button
-#: src/dialogs.c:1975 src/dialogs.c:2113 src/dialogs.c:2401 src/dialogs.c:2575
-#: src/dialogs.c:4103
+#: src/dialogs.c:1926 src/dialogs.c:2058 src/dialogs.c:2337 src/dialogs.c:2483
+#: src/dialogs.c:3522 src/dialogs.c:4027 src/prpl.c:316
 msgid "OK"
 msgstr "丕 �亠亟�"
 
-#: src/dialogs.c:2013
+#: src/dialogs.c:1963
 #, c-format
 msgid "Changing info for %s:"
 msgstr "�亠�舒 仗仂亟舒�从亠 亰舒 %s:"
 
-#: src/dialogs.c:2099
+#: src/dialogs.c:2044
 msgid "Below are the results of your search: "
 msgstr "�亳亢亠 �� �亠亰�仍�舒�亳 于舒�亠 仗�亠��舒亞亠: "
 
-#: src/dialogs.c:2204
+#: src/dialogs.c:2149
 msgid "Permit"
 msgstr "�仂亰于仂仍亠"
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2181
 msgid "Add Permit"
 msgstr "�仂亟舒� 亟仂仗���亠�亠"
 
-#: src/dialogs.c:2246
+#: src/dialogs.c:2183
 msgid "Add Deny"
 msgstr "�仂亟舒� 亰舒弍�舒仆�"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2251
 msgid "Log Conversation"
 msgstr "�舒仗亳�亳 �舒亰亞仂于仂�亠"
 
-#: src/dialogs.c:2396 src/dialogs.c:2557
+#: src/dialogs.c:2332 src/dialogs.c:2465
 msgid "Search for Buddy"
 msgstr "丐�舒亢亳 亟��亞舒�舒"
 
-#: src/dialogs.c:2524
+#: src/dialogs.c:2432
 msgid "Find Buddy By Info"
 msgstr "��仂仆舒�亳 亟��亞舒�舒 仗�亠仄舒 仗仂亟舒�亳仄舒"
 
-#: src/dialogs.c:2551
+#: src/dialogs.c:2459
 msgid "Find Buddy By Email"
 msgstr "��仂仆舒�亳 亟��亞舒�舒 仗仂仄仂�� 亠-舒亟�亠�亠"
 
-#: src/dialogs.c:2659
+#: src/dialogs.c:2563
 msgid "Insert Link"
 msgstr "丕弍舒�亳 于亠亰�"
 
-#: src/dialogs.c:2661
+#: src/dialogs.c:2565
 msgid "Insert"
 msgstr "丕弍舒�亳"
 
-#: src/dialogs.c:2680
+#: src/dialogs.c:2584
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -3676,24 +3712,24 @@
 "丕仆亠�亳�亠 �仆�亠�仆亠� 舒亟�亠�� 亳 仂仗亳� 于亠亰亠 从仂�� 亢亠仍亳�亠 亟舒 �弍舒�亳�亠. �仗亳� 仆亳�亠 "
 "仂弍舒于亠亰舒仆.\n"
 
-#: src/dialogs.c:2843 src/dialogs.c:2860
+#: src/dialogs.c:2747 src/dialogs.c:2764
 msgid "Select Text Color"
 msgstr "�亰舒弍亠�亳�亠 弍仂�� �亠从��舒"
 
-#: src/dialogs.c:2891 src/dialogs.c:2908
+#: src/dialogs.c:2795 src/dialogs.c:2812
 msgid "Select Background Color"
 msgstr "�亰舒弍亠�亳�亠 弍仂�� 仗仂亰舒亟亳仆亠"
 
-#: src/dialogs.c:2992 src/dialogs.c:3015
+#: src/dialogs.c:2896 src/dialogs.c:2919
 msgid "Select Font"
 msgstr "�亰舒弍亠�亳�亠 仗亳�仄仂"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3080
+#: src/dialogs.c:2984
 msgid "You cannot save an away message with a blank title"
 msgstr "�亠 仄仂亢亠�亠 �仆亳仄亳�亳 仗仂��从� 亰舒 仂亟����于仂 弍亠亰 仆舒�仍仂于舒"
 
-#: src/dialogs.c:3081
+#: src/dialogs.c:2985
 msgid ""
 "Please give the message a title, or choose \"Make Away\" to use without "
 "saving."
@@ -3701,109 +3737,114 @@
 "�舒于亠亟亳�亠 亳 仆舒�仍仂于 仗仂��从亠, 亳仍亳 亳亰舒弍亠�亳�亠 ���仂�亳��亳�� 亟舒 从仂�亳��亳�亠 弍亠亰 �仆亳仄舒�舒."
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3090
+#: src/dialogs.c:2994
 msgid "You cannot create an empty away message"
 msgstr "�亠 仄仂亢亠�亠 仆舒仗�舒于亳�亳 仗�舒亰仆� 仗仂��从� 亰舒 仂亟����于仂"
 
-#: src/dialogs.c:3155 src/dialogs.c:3164
+#: src/dialogs.c:3059 src/dialogs.c:3067
 msgid "New away message"
 msgstr "�仂于舒 仗仂��从舒 亰舒 仂亟����于仂"
 
-#: src/dialogs.c:3177
+#: src/dialogs.c:3077
 msgid "Away title: "
 msgstr "�舒�仍仂于 仂亟����于舒: "
 
-#: src/dialogs.c:3228
+#: src/dialogs.c:3122
 msgid "Save & Use"
 msgstr "弌仆亳仄亳 亳 从仂�亳��亳"
 
-#: src/dialogs.c:3232
+#: src/dialogs.c:3126
 msgid "Use"
 msgstr "�仂�亳��亳"
 
 #. show everything
-#: src/dialogs.c:3367
+#: src/dialogs.c:3261
 msgid "Smile!"
 msgstr "弌仄亠�舒从!"
 
-#: src/dialogs.c:3410 src/pounce.c:419
-msgid "Buddy"
-msgstr "���亞舒�"
-
-#: src/dialogs.c:3456
+#: src/dialogs.c:3305
 msgid "Alias Buddy"
-msgstr "�舒亟亠仆亳 舒仍亳�舒� 亟��亞舒��"
-
-#: src/dialogs.c:3494 src/dialogs.c:3501
+msgstr "�舒亟亠仆亳 亳仄亠 亟��亞舒��"
+
+#. Setup the label containing the description.
+#: src/dialogs.c:3335
+msgid ""
+"Please enter an aliased name for the person below, or rename this contact in "
+"your buddy list.\n"
+msgstr ""
+"丕仆亠�亳�亠 亳仄亠 从仂�亠 亢亠仍亳�亠 亟舒 仆舒亟亠仆亠�亠 仂�仂弍亳 亳�仗仂亟, 亳仍亳 仗�亠亳仄亠仆���亠 仂于舒� "
+"从仂仆�舒从� � 于舒�亠仄 �仗亳�从� 亟��亞舒�舒.\n"
+
+#: src/dialogs.c:3370
+msgid "_Alias:"
+msgstr "�_舒亟亠仆亳 亳仄亠"
+
+#: src/dialogs.c:3424 src/dialogs.c:3431
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "�亠 仄仂亢亠 亟舒 仗亳�亠 � %s."
 
-#: src/dialogs.c:3525
+#: src/dialogs.c:3455
 msgid "Save Log File"
 msgstr "弌仆亳仄亳 亰舒仗亳�亠"
 
-#: src/dialogs.c:3555
+#: src/dialogs.c:3485
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "�亠 仄仂亢亠 亟舒 �从仍仂仆亳 亟舒�仂�亠从� %s."
 
-#: src/dialogs.c:3574
+#: src/dialogs.c:3504
 msgid "Clear Log"
 msgstr "��亳��亳 亰舒仗亳�亠"
 
-#: src/dialogs.c:3583
+#: src/dialogs.c:3513
 msgid "Really clear log?"
 msgstr "�舒亳��舒 仂�亳��亳�亳 亰舒仗亳�亠?"
 
-#: src/dialogs.c:3593
-msgid "Okay"
-msgstr "丕 �亠亟�"
-
-#: src/dialogs.c:3631
+#: src/dialogs.c:3558
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "�亠 仄仂亢亠 亟舒 仂�于仂�亳 亟舒�仂�亠从� 亰舒仗亳�舒 %s."
 
-#: src/dialogs.c:3770
+#: src/dialogs.c:3697
 #, c-format
 msgid "Conversations with %s"
 msgstr "�舒亰亞仂于仂�亳 �舒 %s"
 
-#: src/dialogs.c:3772
+#: src/dialogs.c:3699
 msgid "System Log"
 msgstr "弌亳��亠仄�从亳 亰舒仗亳�亳"
 
-#: src/dialogs.c:3793
+#: src/dialogs.c:3720
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "�亠 仄仂亢亠 亟舒 仂�于仂�亳 亟舒�仂�亠从� 亰舒仗亳�舒 %s"
 
-#: src/dialogs.c:3814
+#: src/dialogs.c:3741
 msgid "Date"
 msgstr "�舒��仄"
 
-#: src/dialogs.c:3871
+#: src/dialogs.c:3798
 msgid "Conversation"
 msgstr "�舒亰亞仂于仂�"
 
-#: src/dialogs.c:3893
+#: src/dialogs.c:3820
 msgid "Clear"
 msgstr "��亳��亳"
 
-#: src/dialogs.c:3980
+#: src/dialogs.c:3904
 msgid "Rename Group"
 msgstr "��亠亳仄亠仆�� 亞��仗�"
 
-#: src/dialogs.c:3997
+#: src/dialogs.c:3921
 msgid "Please enter a new name for the selected group.\n"
 msgstr "丕仆亠�亳�亠 仆仂于仂 亳仄亠 亰舒 亳亰舒弍�舒仆� 亞��仗�.\n"
 
-#: src/dialogs.c:4073 src/dialogs.c:4082
+#: src/dialogs.c:3997 src/dialogs.c:4006
 msgid "Rename Buddy"
 msgstr "��亠亳仄亠仆�� 亟��亞舒�舒"
 
-#: src/dialogs.c:4089
+#: src/dialogs.c:4013
 msgid "New name:"
 msgstr "�仂于仂 亳仄亠:"
 
@@ -3827,6 +3868,14 @@
 msgid "File transfer from %s aborted.\n"
 msgstr "��亠仆仂� 亟舒�仂�亠从亠 仂亟 %s 仗�亠从亳仆��.\n"
 
+#: 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:32
 #, c-format
 msgid ""
@@ -3849,42 +3898,42 @@
 "       -h, --help [仆舒�亠亟弍舒]     ��亳从舒亢亳 仗仂仄仂� 亰舒 仆舒�亠亟弍�\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:48
+#: src/gaimrc.c:50
 msgid "sorry, i ran out for a while. bbl"
 msgstr "�舒仍亳仄, 舒仍亳 仄亠仆亠 仆亠仄舒. ��舒�亳�� �亠 �亠亟仆仂亞 亟舒仆舒, 仆亠 亰仆舒仄 仆亳 �舒 从舒亟!"
 
-#: src/gaimrc.c:265 src/gaimrc.c:298 src/gaimrc.c:1297
+#: src/gaimrc.c:291 src/gaimrc.c:324 src/gaimrc.c:1447
 msgid "boring default"
 msgstr "�仂亟�舒亰�仄亠于舒仆仂 (仆亠 �舒从仂) 亟仂�舒亟仆仂"
 
-#: src/gaimrc.c:1390
+#: src/gaimrc.c:1540
 #, c-format
 msgid "Could not open config file %s."
 msgstr "�亠 仄仂亢亠 亟舒 仂�于仂�亳 亟舒�仂�亠从� %s 亰舒 仗仂��舒于从亠."
 
-#: src/gtkconv.c:205
+#: src/gtkconv.c:218
 msgid "Gaim - Insert Image"
 msgstr "Gaim �� �弍舒�亳 �仍亳从�"
 
-#: src/gtkconv.c:741
+#: src/gtkconv.c:761
 msgid "Un-Ignore"
 msgstr "�亠 亳亞仆仂�亳�亳"
 
-#: src/gtkconv.c:743 src/prefs.c:505
+#: src/gtkconv.c:763 src/prefs.c:526
 msgid "Ignore"
 msgstr "�亞仆仂�亳�亳"
 
 #. Info button
-#: src/gtkconv.c:752 src/gtkconv.c:2631
+#: src/gtkconv.c:772 src/gtkconv.c:2646
 msgid "Info"
 msgstr "�仂亟舒�亳"
 
-#: src/gtkconv.c:853
+#: src/gtkconv.c:866
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim �� 仗仂亰仂于亳 亟��亞舒�舒 � 仗�亳�舒仂仆亳��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:881
+#: src/gtkconv.c:894
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -3892,201 +3941,201 @@
 "丕仆亠�亳�亠 亳仄亠 从仂�亳�仆亳从舒 从仂亞舒 亢亠仍亳�亠 亟舒 仗仂亰仂于亠�亠, 舒 仗仂 亢亠�亳 亟仂亟舒��亠 亳 仗仂��从� � "
 "仗仂亰亳于仆亳��."
 
-#: src/gtkconv.c:902
+#: src/gtkconv.c:915
 msgid "_Buddy:"
 msgstr "_���亞舒�:"
 
-#: src/gtkconv.c:922
+#: src/gtkconv.c:935
 msgid "_Message:"
 msgstr "_�仂��从舒:"
 
-#: src/gtkconv.c:1944
+#: src/gtkconv.c:1959
 msgid "User is typing..."
 msgstr "�仂�亳�仆亳从 从��舒..."
 
-#: src/gtkconv.c:1952
+#: src/gtkconv.c:1967
 msgid "User has typed something and paused"
 msgstr "�仂�亳�仆亳从 �亠 仆亠��仂 �从��舒仂 亳 亰舒��舒仂"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2059
+#: src/gtkconv.c:2074
 msgid "_Send As"
 msgstr "�仂�舒�亳 _从舒仂"
 
 #. Conversation menu
-#: src/gtkconv.c:2509
+#: src/gtkconv.c:2524
 msgid "/_Conversation"
 msgstr "/_�舒亰亞仂于仂�"
 
-#: src/gtkconv.c:2510
+#: src/gtkconv.c:2525
 msgid "/Conversation/_Save As..."
 msgstr "/_�舒亰亞仂于仂�/_弌仆亳仄亳 从舒仂..."
 
-#: src/gtkconv.c:2512
+#: src/gtkconv.c:2527
 msgid "/Conversation/View _History..."
 msgstr "/_�舒亰亞仂于仂�/�仂亞仍亠亟舒� _亳��仂�亳�舒�..."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2529
 msgid "/Conversation/Insert _URL..."
 msgstr "/_�舒亰亞仂于仂�/_丕弍舒�亳 �仆�亠�仆亠� 舒亟�亠��..."
 
-#: src/gtkconv.c:2516
+#: src/gtkconv.c:2531
 msgid "/Conversation/Insert _Image..."
 msgstr "/_�舒亰亞仂于仂�/丕弍舒�亳 �_仍亳从�"
 
-#: src/gtkconv.c:2519
+#: src/gtkconv.c:2534
 msgid "/Conversation/_Close"
 msgstr "/_�舒亰亞仂于仂�/_�舒于��亳"
 
 #. Options
-#: src/gtkconv.c:2523
+#: src/gtkconv.c:2538
 msgid "/_Options"
 msgstr "/_�亰弍仂�亳"
 
-#: src/gtkconv.c:2524
+#: src/gtkconv.c:2539
 msgid "/Options/Enable _Logging"
 msgstr "/_�亰弍仂�亳/�仄仂亞��亳 _亰舒仗亳�亠"
 
-#: src/gtkconv.c:2525
+#: src/gtkconv.c:2540
 msgid "/Options/Enable _Sounds"
 msgstr "/_�亰弍仂�亳/�仄仂亞��亳 亰_于�从亠"
 
-#: src/gtkconv.c:2556
+#: src/gtkconv.c:2571
 msgid "/Conversation/View History..."
 msgstr "/�舒亰亞仂于仂�/�仂亞仍亠亟舒� _亳��仂�亳�舒�..."
 
-#: src/gtkconv.c:2558
+#: src/gtkconv.c:2573
 msgid "/Conversation/Insert URL..."
 msgstr "/�舒亰亞仂于仂�/_丕弍舒�亳 �仆�亠�仆亠� 舒亟�亠��..."
 
-#: src/gtkconv.c:2560
+#: src/gtkconv.c:2575
 msgid "/Conversation/Insert Image..."
 msgstr "/�舒亰亞仂于仂�/丕弍舒�亳 �_仍亳从�..."
 
-#: src/gtkconv.c:2562
+#: src/gtkconv.c:2577
 msgid "/Options/Enable Logging"
 msgstr "/�亰弍仂�亳/�仄仂亞��亳 _亰舒仗亳�亠"
 
-#: src/gtkconv.c:2564
+#: src/gtkconv.c:2579
 msgid "/Options/Enable Sounds"
 msgstr "/�亰弍仂�亳/�仄仂亞��亳 亰_于�从亠"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2588 src/gtkconv.c:2590 src/gtkconv.c:2688 src/gtkconv.c:2690
-#: src/gtkconv.c:4963
+#: src/gtkconv.c:2603 src/gtkconv.c:2605 src/gtkconv.c:2703 src/gtkconv.c:2705
+#: src/gtkconv.c:4982
 msgid "Send"
 msgstr "�仂�舒�亳"
 
-#: src/gtkconv.c:2611 src/gtkconv.c:3742
+#: src/gtkconv.c:2626 src/gtkconv.c:3761
 msgid "Add the user to your buddy list"
 msgstr "�仂亟舒� 从仂�亳�仆亳从舒 � �于仂� �仗亳�舒从 亟��亞舒�舒"
 
-#: src/gtkconv.c:2617 src/gtkconv.c:3733
+#: src/gtkconv.c:2632 src/gtkconv.c:3752
 msgid "Remove the user from your buddy list"
 msgstr "丕从仍仂仆亳 从仂�亳�仆亳从舒 �舒 �于仂亞 �仗亳�舒从 亟��亞舒�舒"
 
 #. Warn button
-#: src/gtkconv.c:2624
+#: src/gtkconv.c:2639
 msgid "Warn"
 msgstr "丕仗仂亰仂�亳"
 
-#: src/gtkconv.c:2628
+#: src/gtkconv.c:2643
 msgid "Warn the user"
 msgstr "丕仗仂亰仂�亳 从仂�亳�仆亳从舒"
 
-#: src/gtkconv.c:2635 src/gtkconv.c:3081
+#: src/gtkconv.c:2650 src/gtkconv.c:3077
 msgid "Get the user's information"
 msgstr "��亠�亰仄亳 仗仂亟舒�从亠 仂 从仂�亳�仆亳从�"
 
 #. Block button
-#: src/gtkconv.c:2638
+#: src/gtkconv.c:2653
 msgid "Block"
 msgstr "�仍仂从亳�舒�"
 
-#: src/gtkconv.c:2642
+#: src/gtkconv.c:2657
 msgid "Block the user"
 msgstr "�仍仂从亳�舒� 从仂�亳�仆亳从舒"
 
 #. Invite
-#: src/gtkconv.c:2700 src/gtkconv.c:4966
+#: src/gtkconv.c:2715 src/gtkconv.c:4985
 msgid "Invite"
 msgstr "�仂亰仂于亳"
 
-#: src/gtkconv.c:2703
+#: src/gtkconv.c:2718
 msgid "Invite a user"
 msgstr "�仂亰仂于亳 从仂�亳�仆亳从舒"
 
-#: src/gtkconv.c:2742
+#: src/gtkconv.c:2757
 msgid "Bold"
 msgstr "�舒�仆仂"
 
-#: src/gtkconv.c:2753
+#: src/gtkconv.c:2768
 msgid "Italic"
 msgstr "���亰亳于"
 
-#: src/gtkconv.c:2764
+#: src/gtkconv.c:2779
 msgid "Underline"
 msgstr "�仂亟于��亠仆仂"
 
-#: src/gtkconv.c:2780
+#: src/gtkconv.c:2795
 msgid "Larger font size"
 msgstr "�亠�舒 �仍仂于舒"
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:2807
 msgid "Normal font size"
 msgstr "�弍亳�仆舒 �仍仂于舒"
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2819
 msgid "Smaller font size"
 msgstr "�舒�舒 �仍仂于舒"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2836
 msgid "Font Face"
 msgstr "�亳�仄仂"
 
-#: src/gtkconv.c:2829
+#: src/gtkconv.c:2848
 msgid "Foreground font color"
 msgstr "�仂�舒 �亠从��舒"
 
-#: src/gtkconv.c:2841
+#: src/gtkconv.c:2860
 msgid "Background color"
 msgstr "�仂�舒 仗仂亰舒亟亳仆亠"
 
-#: src/gtkconv.c:2856
+#: src/gtkconv.c:2875
 msgid "Insert image"
 msgstr "丕弍舒�亳 �仍亳从�"
 
-#: src/gtkconv.c:2867
+#: src/gtkconv.c:2886
 msgid "Insert link"
 msgstr "丕弍舒�亳 于亠亰�"
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:2897
 msgid "Insert smiley"
 msgstr "丕弍舒�亳 �仄亠�舒从"
 
-#: src/gtkconv.c:2931
+#: src/gtkconv.c:2950
 msgid "Topic:"
 msgstr "丐亠仄舒:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3001
+#: src/gtkconv.c:2997
 msgid "0 people in room"
 msgstr "�亠仄舒 仆亳从仂亞 � 仗�亳�舒仂仆亳�亳."
 
-#: src/gtkconv.c:3058
+#: src/gtkconv.c:3054
 msgid "IM the user"
 msgstr "�仂�舒�亳 弍�亰� 仗仂��从� 从仂�亳�仆亳从�"
 
-#: src/gtkconv.c:3070
+#: src/gtkconv.c:3066
 msgid "Ignore the user"
 msgstr "�亞仆仂�亳�亳 从仂�亳�仆亳从舒"
 
-#: src/gtkconv.c:3576
+#: src/gtkconv.c:3595
 msgid "Close conversation"
 msgstr "�从仂仆�舒� �舒亰亞仂于仂�"
 
-#: src/gtkconv.c:4171 src/gtkconv.c:4293
+#: src/gtkconv.c:4190 src/gtkconv.c:4312
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -4094,19 +4143,19 @@
 msgstr[1] "%d 仂�仂弍亠 � 仗�亳�舒仂仆亳�亳."
 msgstr[2] "%d 仂�仂弍舒 � 仗�亳�舒仂仆亳�亳."
 
-#: src/gtkconv.c:4652
+#: src/gtkconv.c:4671
 msgid "Disable Animation"
 msgstr "�仆亠仄仂亞��亳 舒仆亳仄舒�亳�亠"
 
-#: src/gtkconv.c:4661
+#: src/gtkconv.c:4680
 msgid "Enable Animation"
 msgstr "�仄仂亞��亳 舒仆亳仄舒�亳�亠"
 
-#: src/gtkconv.c:4668
+#: src/gtkconv.c:4687
 msgid "Hide Icon"
 msgstr "弌舒从�亳 亳从仂仆亳��"
 
-#: src/gtkconv.c:4674
+#: src/gtkconv.c:4693
 msgid "Save Icon As..."
 msgstr "弌仆亳仄亳 亳从仂仆亳�� 从舒仂..."
 
@@ -4215,14 +4264,164 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 亢亠仍亳 亟舒 于舒仄 仗仂�舒�亠 %s (%s)"
 
-#: src/gtkimhtml.c:324
+#: src/gtkimhtml.c:342
 msgid "_Copy Link Location"
 msgstr "_�仂仗亳�舒� 舒亟�亠�� 于亠亰亠"
 
-#: src/gtkimhtml.c:331
+#: src/gtkimhtml.c:349
 msgid "_Open Link in Browser"
 msgstr "_��于仂�亳 于亠亰� � 仗�亠亞仍亠亟仆亳从�"
 
+#: src/gtkimhtml.c:1625
+msgid ""
+"Gaim was unable to guess the image type base on the file extension "
+"supplied.  Defaulting to PNG."
+msgstr ""
+"Gaim 仆亳�亠 ��仗亠仂 亟舒 仗仂亞仂亟亳 于���� 亰舒仗亳�舒 �仍亳从亠 仆舒 仂�仆仂于� 仆舒于亠亟亠仆亠 亠从��亠仆亰亳�亠 "
+"亟舒�仂�亠从亠. �仂亟�舒亰�仄亠于舒 亟舒 �亠 �舒亟亳 仂 PNG 亰舒仗亳��."
+
+#: src/gtkimhtml.c:1633
+#, c-format
+msgid "Error saving image: %s"
+msgstr "��亠�从舒 仗�亳 �仆亳仄舒�� �仍亳从亠: %s"
+
+#: src/gtkimhtml.c:1642
+msgid "Gaim - Save Image"
+msgstr "Gaim �� 弌仆亳仄亳 �仍亳从�"
+
+#: src/gtkimhtml.c:1664
+msgid "_Save Image..."
+msgstr "_弌仆亳仄亳 �仍亳从� 从舒仂..."
+
+#: src/gtkpounce.c:108
+msgid "Please enter a buddy to pounce."
+msgstr "丕仆亠�亳 亟��亞舒�舒 从仂�亠亞 亢亠仍亳� 亟舒 亰舒�从仂�亳�."
+
+#: src/gtkpounce.c:280
+#, c-format
+msgid "%s has started typing to you"
+msgstr "%s 仗仂�亠 亟舒 �亳 仗亳�亠"
+
+#: src/gtkpounce.c:281
+#, c-format
+msgid "%s has signed on"
+msgstr "%s �亠 仗�亳�舒于亳"
+
+#: src/gtkpounce.c:282
+#, c-format
+msgid "%s has returned from being idle"
+msgstr "%s �亠 于�舒�亳 亳亰 亰亠仄�亠 亟亠仄弍亠仍亳�亠"
+
+#: src/gtkpounce.c:283
+#, c-format
+msgid "%s has returned from being away"
+msgstr "%s �亠 于�舒�亳 �舒 仂亟����于舒"
+
+#: src/gtkpounce.c:284
+#, c-format
+msgid "%s has stopped typing to you"
+msgstr "%s 仗�亠��舒亟亠 亟舒 �亳 仗亳�亠"
+
+#: src/gtkpounce.c:285
+#, c-format
+msgid "%s has signed off"
+msgstr "%s �亠 仂亟�舒于亳"
+
+#: src/gtkpounce.c:286
+#, c-format
+msgid "%s has become idle"
+msgstr "%s �亠 ��仗舒于舒仂"
+
+#: src/gtkpounce.c:287
+#, c-format
+msgid "%s has gone away."
+msgstr "%s �亰亠 仂亟����于仂."
+
+#: src/gtkpounce.c:288
+msgid "Unknown pounce event. Please report this!"
+msgstr "�亠仗仂亰仆舒� 亰舒�从仂从. �仂仍亳仄仂 于舒� 亟舒 仂于仂 仗�亳�舒于亳�亠!"
+
+#. "New Buddy Pounce"
+#: src/gtkpounce.c:429 src/gtkpounce.c:737
+msgid "New Buddy Pounce"
+msgstr "�仂于仂 _亰舒�从舒从舒�亠 亟��亞舒�舒"
+
+#: src/gtkpounce.c:429
+msgid "Edit Buddy Pounce"
+msgstr "丕�亠亟亳 _亰舒�从舒从亳于舒�亠 亟��亞舒�舒"
+
+#. Create the "Pounce Who" frame.
+#: src/gtkpounce.c:447
+msgid "Pounce Who"
+msgstr "�舒�从仂�亳 从仂亞舒"
+
+#: src/gtkpounce.c:469
+msgid "_Buddy Name:"
+msgstr "_�仄亠 亟��亞舒�舒:"
+
+#. Create the "Pounce When" frame.
+#: src/gtkpounce.c:488
+msgid "Pounce When"
+msgstr "�舒�从仂�亳 从舒亟舒"
+
+#: src/gtkpounce.c:496
+msgid "Sign on"
+msgstr "��亳�舒于亳 �亠"
+
+#: src/gtkpounce.c:498
+msgid "Sign off"
+msgstr "�亟�舒于亳 �亠"
+
+#: src/gtkpounce.c:502
+msgid "Return from away"
+msgstr "��舒�亳 �亠 �舒 仂亟����于舒"
+
+#: src/gtkpounce.c:506
+msgid "Return from idle"
+msgstr "��仂弍�亟亳 �亠"
+
+#: src/gtkpounce.c:508
+msgid "Buddy starts typing"
+msgstr "���亞舒� 仗仂�亳�亠 亟舒 从��舒"
+
+#: src/gtkpounce.c:510
+msgid "Buddy stops typing"
+msgstr "���亞舒� 仗�亠��舒�亠 亟舒 从��舒"
+
+#. Create the "Pounce Action" frame.
+#: src/gtkpounce.c:539
+msgid "Pounce Action"
+msgstr "丼亳仄亠 亰舒�从仂�亳�亳"
+
+#: src/gtkpounce.c:546
+msgid "Open an IM window"
+msgstr "��于仂�亳 仗�仂亰仂� 亰舒 弍�亰� 仗仂��从�"
+
+#: src/gtkpounce.c:547
+msgid "Popup notification"
+msgstr "��从舒�亠 仂弍舒于亠��亠�亠"
+
+#: src/gtkpounce.c:548
+msgid "Send a message"
+msgstr "�仂�舒�亳 仗仂��从�"
+
+#: src/gtkpounce.c:549
+msgid "Execute a command"
+msgstr "�亰于��亳 仆舒�亠亟弍�"
+
+#: src/gtkpounce.c:550
+msgid "Play a sound"
+msgstr "����亳 亰于�从"
+
+#: src/gtkpounce.c:605
+msgid "_Save this pounce after activation"
+msgstr "_弌仆亳仄亳 仂于舒� 亰舒�从仂从 仗仂�仍亠 仗仂从�亠�舒�舒"
+
+#. "Remove Buddy Pounce"
+#: src/gtkpounce.c:744
+msgid "Remove Buddy Pounce"
+msgstr "丕从仍仂仆亳 亰舒�从舒从舒�亠 亟��亞舒�舒"
+
 #: src/gtkutils.c:318
 msgid "Gaim - Save Icon"
 msgstr "Gaim �� 弌仆亳仄亳 亳从仂仆亳��"
@@ -4236,34 +4435,36 @@
 msgid "g003: Error opening connection.\n"
 msgstr "��亠�从舒 仗�亳 仂�于舒�舒�� 于亠亰亠.\n"
 
-#: src/list.c:367
+#: src/list.c:405
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies, and the group were not removed.\n"
-msgstr "%d 亟��亞舒�舒 亳亰 亞��仗亠 %s 仆亳�亠 �从仍仂�亠仆仂 仗仂��仂 �亳�仂于亳 仆舒仍仂亰亳 仆亳�� 仗�亳�舒于�亠仆亳. �于亳 亟��亞舒�亳 亳 �亳�仂于舒 亞��仗舒 仆亳�� �从仍仂�亠仆亳.\n"
-
-#: src/list.c:371
+msgstr ""
+"%d 亟��亞舒�舒 亳亰 亞��仗亠 %s 仆亳�亠 �从仍仂�亠仆仂 仗仂��仂 �亳�仂于亳 仆舒仍仂亰亳 仆亳�� 仗�亳�舒于�亠仆亳. "
+"�于亳 亟��亞舒�亳 亳 �亳�仂于舒 亞��仗舒 仆亳�� �从仍仂�亠仆亳.\n"
+
+#: src/list.c:409
 msgid "Group Not Removed"
 msgstr "���仗舒 仆亳�亠 �从仍仂�亠仆舒"
 
-#: src/list.c:506
+#: src/list.c:544
 msgid "Invalid Groupname"
 msgstr "�亠亳�仗�舒于仆仂 亳仄亠 亞��仗亠"
 
-#: src/list.c:1135
+#: src/list.c:1173
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "�仂�仍仂 �亠 亟仂 亞�亠�从亠 仗�亳 仂弍�舒亟亳 于舒�亠亞 �仗亳�从舒 亟��亞舒�舒. 弌仗亳�舒从 仆亳�亠 ��亳�舒仆."
 
-#: src/list.c:1137
+#: src/list.c:1175
 msgid "Buddy List Error"
 msgstr "��亠�从舒 � �仗亳�从� 亟��亞舒�舒"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/list.c:1143
+#: src/list.c:1181
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
@@ -4272,7 +4473,7 @@
 "Gaim 仗�亠于仂亟亳 于舒� ��舒�亳 �仗亳�舒从 亟��亞舒�舒 � 仆仂于亳 亰舒仗亳�, 从仂�亳 �亠 �亠 �舒亟舒 仆舒仍舒亰亳�亳 "
 "仆舒 %s"
 
-#: src/list.c:1146
+#: src/list.c:1184
 msgid "Converting Buddy List"
 msgstr "��亠于仂亟亳 �仗亳�舒从 亟��亞舒�舒"
 
@@ -4390,145 +4591,145 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) �亠 仗�亳�舒于亳仂 亟舒 �亠 %s 仗�仂弍�亟亳仂 亳亰 �仄��于�亠仆仂��亳 @ %s"
 
-#: src/main.c:178
+#: src/main.c:177
 msgid "Please enter your login."
 msgstr "丕仆亠�亳�亠 于舒�亠 仗仂亟舒�从亠."
 
-#: src/main.c:265
+#: src/main.c:264
 msgid "<New User>"
 msgstr "<�仂于亳 从仂�亳�仆亳从>"
 
-#: src/main.c:308
+#: src/main.c:306
 msgid "Login"
 msgstr "��亳�舒于舒"
 
-#: src/main.c:331
+#: src/main.c:322
 msgid "Screen Name:"
 msgstr "�仂�亳�仆亳�从仂 亳仄亠:"
 
 #. And now for the buttons
-#: src/main.c:365
+#: src/main.c:356
 msgid "Accounts"
 msgstr "�舒仍仂亰亳"
 
-#: src/main.c:375
-msgid "Settings"
+#: src/main.c:366 src/prefs.c:1770 src/win32/systray.c:294
+msgid "Preferences"
 msgstr "�仂��舒于从亠"
 
-#: src/main.c:381 src/win32/systray.c:145
+#: src/main.c:372 src/win32/systray.c:146
 msgid "Sign On"
 msgstr "��亳�舒于亳 �亠"
 
-#: src/multi.c:260
+#: src/multi.c:264
 msgid "Screenname"
 msgstr "�仄亠"
 
-#: src/multi.c:288
+#: src/multi.c:292
 msgid "Protocol"
 msgstr "��仂�仂从仂仍"
 
-#: src/multi.c:591
+#: src/multi.c:618
 msgid "Load Buddy Icon"
 msgstr "丕�亳�舒� 亳从仂仆亳�� 亟��亞舒�舒"
 
-#: src/multi.c:634
+#: src/multi.c:661
 msgid "Buddy Icon File:"
 msgstr "�舒�仂�亠从舒 亳从仂仆亳�亠 亟��亞舒�舒:"
 
-#: src/multi.c:647
+#: src/multi.c:674
 msgid "Browse"
 msgstr "��亠��舒亢亳"
 
-#: src/multi.c:652 src/prefs.c:906 src/prefs.c:1527
+#: src/multi.c:679 src/prefs.c:1546
 msgid "Reset"
 msgstr "�亟弍舒�亳"
 
-#: src/multi.c:669
+#: src/multi.c:705
 msgid "Login Options"
 msgstr "�亰弍仂�亳 仗�亳�舒于舒"
 
-#: src/multi.c:679
-msgid "Screenname:"
-msgstr "�仄亠:"
-
-#: src/multi.c:702
-msgid "Alias:"
-msgstr "�仍亳�舒�:"
-
-#: src/multi.c:714
+#: src/multi.c:717
 msgid "Protocol:"
 msgstr "��仂�仂从仂仍:"
 
-#: src/multi.c:721
+#: src/multi.c:731
+msgid "Screenname:"
+msgstr "�仄亠:"
+
+#: src/multi.c:778
+msgid "Alias:"
+msgstr "�舒亟亳仄舒从:"
+
+#: src/multi.c:786
 msgid "Remember Password"
 msgstr "�舒仗舒仄�亳 仍仂亰亳仆从�"
 
-#: src/multi.c:722
+#: src/multi.c:787
 msgid "Auto-Login"
 msgstr "弌舒仄仂-仗�亳�舒于舒"
 
-#: src/multi.c:755
+#: src/multi.c:843
 msgid "User Options"
 msgstr "�仂�亳�仆亳�从亳 亳亰弍仂�亳"
 
-#: src/multi.c:764
+#: src/multi.c:853
 msgid "New Mail Notifications"
 msgstr "�弍舒于亠��亠�舒 仂 仆仂于仂� 仗仂��亳"
 
-#: src/multi.c:816
+#: src/multi.c:905
 #, c-format
 msgid "%s Options"
 msgstr "%s 仂仗�亳�亠"
 
-#: src/multi.c:858
+#: src/multi.c:948
 msgid "Register with server"
 msgstr "�亠亞亳����� �亠 仆舒 �亠�于亠��"
 
-#: src/multi.c:891
+#: src/multi.c:981
 msgid "Proxy Options"
 msgstr "�仂��舒于从亠 仗�仂从�亳�舒"
 
-#: src/multi.c:905
+#: src/multi.c:995
 msgid "Proxy _Type"
 msgstr "_����舒 仗�仂从�亳�舒"
 
-#: src/multi.c:914
+#: src/multi.c:1004
 msgid "Use Global Proxy Settings"
 msgstr "�仂�亳��亳 仂仗��舒 仗仂亟亠�舒于舒�舒 仗�仂从�亳�舒"
 
-#: src/multi.c:923
+#: src/multi.c:1013
 msgid "No Proxy"
 msgstr "�亠仄舒 仗�仂从�亳�舒"
 
-#: src/multi.c:975
+#: src/multi.c:1065
 msgid "_Host:"
 msgstr "_弌亠�于亠�:"
 
-#: src/multi.c:1011
+#: src/multi.c:1101
 msgid "_User:"
 msgstr "_�仂�亳�仆亳从:"
 
-#: src/multi.c:1027
+#: src/multi.c:1117
 msgid "Pa_ssword:"
 msgstr "_�仂亰亳仆从舒:"
 
-#: src/multi.c:1094
+#: src/multi.c:1188
 msgid "Modify Account"
 msgstr "�亰仄亠仆亳 仆舒仍仂亞"
 
-#: src/multi.c:1112
+#: src/multi.c:1206
 msgid "Show more options"
 msgstr "�仂从舒亢亳 于亳�亠 仗仂��舒于从亳"
 
-#: src/multi.c:1112
+#: src/multi.c:1206
 msgid "Show fewer options"
 msgstr "�仂从舒亢亳 仄舒�亠 仗仂��舒于从亳"
 
-#: src/multi.c:1224
+#: src/multi.c:1315
 msgid "_Login"
 msgstr "_��亳�舒于亳 �亠"
 
-#: src/multi.c:1242
+#: src/multi.c:1333
 #, c-format
 msgid ""
 "Please enter your password for %s.\n"
@@ -4537,15 +4738,15 @@
 "丕仆亠�亳�亠 于舒�� 仍仂亰亳仆从� 亰舒 %s.\n"
 "\n"
 
-#: src/multi.c:1253
+#: src/multi.c:1344
 msgid "_Password"
 msgstr "_�仂亰亳仆从舒"
 
-#: src/multi.c:1292
+#: src/multi.c:1383
 msgid "TOC not found."
 msgstr "TOC 仆亳�亠 仆舒�亠仆."
 
-#: src/multi.c:1293
+#: src/multi.c:1384
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
@@ -4555,11 +4756,11 @@
 "仗�仂�仂从仂仍 �仍舒弍亳�亳 仂亟 OSCAR-舒, �仂 �亠 仗�亠于亠亟亠仆 从舒仂 亟仂亟舒�舒从. �舒 弍亳��亠 �亠 "
 "仗�亳�舒于亳仍亳, ��亠亟亳�亠 仂于舒� 仆舒仍仂亞 �舒从仂 亟舒 从仂�亳��亳 OSCAR 亳仍亳 ��亳�舒��亠 TOC 亟仂亟舒�舒从."
 
-#: src/multi.c:1299
+#: src/multi.c:1390
 msgid "Protocol not found."
 msgstr "��仂�仂从仂仍 仆亳�亠 仆舒�亠仆."
 
-#: src/multi.c:1300
+#: src/multi.c:1391
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -4567,40 +4768,40 @@
 "�亠 仄仂亢亠�亠 �亠 仗�亳�舒于亳�亳 仗仂仄仂�� 仂于仂亞 仆舒仍仂亞舒; 仗�仂�仂从仂仍 从仂�亳 仂仆 从仂�亳��亳 于舒仄 仆亳�亠 "
 "��亳�舒仆, 亳仍亳 仆亠 仗仂亟�亢舒于舒 仗�亳�舒于�亳于舒�亠."
 
-#: src/multi.c:1376
+#: src/multi.c:1467
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�舒 仍亳 ��亠 �亳亞��仆亳 亟舒 亢亠仍亳�亠 亟舒 仂弍�亳�亠�亠 %s?"
 
-#: src/multi.c:1377
+#: src/multi.c:1468
 msgid "Delete"
 msgstr "�弍�亳�亳"
 
-#: src/multi.c:1406
+#: src/multi.c:1497
 msgid "Account Editor"
 msgstr "丕�亠亟仆亳从 仆舒仍仂亞舒"
 
-#: src/multi.c:1471
+#: src/multi.c:1562
 msgid "_Modify"
 msgstr "_�亰仄亠仆亳"
 
-#: src/multi.c:1519
+#: src/multi.c:1610
 msgid "Done."
 msgstr "�仂�仂于仂."
 
-#: src/multi.c:1749
+#: src/multi.c:1840
 msgid "Signon: "
 msgstr "��亳�舒于舒:"
 
-#: src/multi.c:1807
+#: src/multi.c:1898
 msgid "Signon"
 msgstr "��亳�舒于舒"
 
-#: src/multi.c:1819
+#: src/multi.c:1910
 msgid "Cancel All"
 msgstr "��从舒亢亳 �于亠"
 
-#: src/multi.c:1876
+#: src/multi.c:1963
 #, c-format
 msgid ""
 "%s\n"
@@ -4609,25 +4810,25 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:1897
+#: src/multi.c:1984
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s 仆亳�亠 仄仂亞舒仂 亟舒 �亠 仗�亳�舒于亳"
 
-#: src/multi.c:1898
+#: src/multi.c:1985
 msgid "Signon Error"
 msgstr "��亠�从舒 仗�亳 仗�亳�舒于亳"
 
-#: src/multi.c:1909
+#: src/multi.c:1996
 msgid "Notice"
 msgstr "�弍舒于亠��亠�亠"
 
-#: src/multi.c:1921
+#: src/multi.c:2008
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s �亠 仂亟�舒于亳仂"
 
-#: src/multi.c:1922
+#: src/multi.c:2009
 msgid "Connection Error"
 msgstr "��亠�从舒 仗�亳 仗仂于亠亰亳于舒��"
 
@@ -4637,293 +4838,300 @@
 "GAIM::register �亠 仗仂亰于舒仆 �舒 仆亠仂亟亞仂于舒�舒���亳仄 舒�亞�仄亠仆�亳仄舒. �仂亞仍亠亟舒��亠 PERL-"
 "HOWTO."
 
-#: src/prefs.c:191
+#: src/prefs.c:193
 msgid "Interface Options"
 msgstr "�仂��舒于从亠 亳亰亞仍亠亟舒"
 
-#: src/prefs.c:193
+#: src/prefs.c:195
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "��亳从舒亢亳 �亟舒�亠仆亠 仆舒亟亳仄从亠 �从仂仍亳从仂 舒仍亳�舒� 仆亳�亠 仗仂��舒于�亠仆"
 
-#: src/prefs.c:353
+#: src/prefs.c:374
 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/prefs.c:386
+msgstr ""
+"�亰舒弍亠�亳�亠 �从�仗 �仄亠�舒从舒 从仂�亳 亢亠仍亳�亠 亟舒 从仂�亳��亳�亠 亳亰 �仗亳�从舒 仆亳亢亠. �仂于亳 �从�仗仂于亳 "
+"�亠 仄仂亞� 亟仂亟舒�亳 仗�亠于仍舒�亠�亠仄 亳 仗���舒�亠仄 亳��亳� 仆舒 �仗亳�舒从 �从�仗仂于舒."
+
+#: src/prefs.c:407
 msgid "Icon"
 msgstr "�从仂仆亳�舒"
 
-#: src/prefs.c:420
+#: src/prefs.c:441
 msgid "Style"
 msgstr "弌�亳仍"
 
-#: src/prefs.c:421
+#: src/prefs.c:442
 msgid "_Bold"
 msgstr "_�舒�仆仂"
 
-#: src/prefs.c:422
+#: src/prefs.c:443
 msgid "_Italics"
 msgstr "_���亰亳于"
 
-#: src/prefs.c:423
+#: src/prefs.c:444
 msgid "_Underline"
 msgstr "_�仂亟于��亠仆仂"
 
-#: src/prefs.c:424
+#: src/prefs.c:445
 msgid "_Strikethrough"
 msgstr "_��亠���舒仆仂"
 
-#: src/prefs.c:426
+#: src/prefs.c:447
 msgid "Face"
 msgstr "�亳�仄仂"
 
-#: src/prefs.c:429
+#: src/prefs.c:450
 msgid "Use custo_m face"
 msgstr "�仂�亳��亳 亳_亰舒弍�舒仆仂 仗亳�仄仂"
 
-#: src/prefs.c:443
+#: src/prefs.c:464
 msgid "Use custom si_ze"
 msgstr "�仂�亳��亳 亳亰舒弍�舒仆� _于亠仍亳�亳仆�"
 
-#: src/prefs.c:451
+#: src/prefs.c:472
 msgid "Color"
 msgstr "�仂�舒"
 
-#: src/prefs.c:456
+#: src/prefs.c:477
 msgid "_Text color"
 msgstr "�仂�舒 _�亠从��舒"
 
-#: src/prefs.c:473
+#: src/prefs.c:494
 msgid "Bac_kground color"
 msgstr "_�仂�舒 仗仂亰舒亟亳仆亠"
 
-#: src/prefs.c:498 src/prefs.c:634 src/prefs.c:674
+#: src/prefs.c:519 src/prefs.c:662 src/prefs.c:703
 msgid "Display"
 msgstr "��亳从舒亰"
 
-#: src/prefs.c:499
+#: src/prefs.c:520
 msgid "Show graphical _smileys"
 msgstr "��亳从舒亢亳 亞�舒�亳�从亳 _�仄亠�舒从"
 
-#: src/prefs.c:500
+#: src/prefs.c:521
 msgid "Show _timestamp on messages"
 msgstr "��亳从舒亢亳 仂亰仆舒从亠 于�亠仄亠仆舒 仆舒 仗仂��从舒仄舒"
 
-#: src/prefs.c:501
+#: src/prefs.c:522
 msgid "Show _URLs as links"
 msgstr "��亳从舒亢亳 �仆�亠�仆亠� _舒亟�亠�亠 从舒仂 于亠亰亠"
 
-#: src/prefs.c:503
+#: src/prefs.c:524
 msgid "_Highlight misspelled words"
 msgstr "_���舒从仆亳 亞�亠�从亠 � 从��舒��"
 
-#: src/prefs.c:506
+#: src/prefs.c:527
 msgid "Ignore c_olors"
 msgstr "�舒仆亠仄舒�亳 _弍仂�亠"
 
-#: src/prefs.c:507
+#: src/prefs.c:528
 msgid "Ignore font _faces"
 msgstr "�舒仆亠仄舒�亳 _仗亳�仄仂"
 
-#: src/prefs.c:508
+#: src/prefs.c:529
 msgid "Ignore font si_zes"
 msgstr "�舒仆亠仄舒�亳 _于亠仍亳�亳仆� �仍仂于舒"
 
-#: src/pounce.c:512 src/prefs.c:521
+#: src/prefs.c:542
 msgid "Send Message"
 msgstr "弌仍舒�亠 仗仂��从舒"
 
-#: src/prefs.c:522
+#: src/prefs.c:543
 msgid "_Enter sends message"
 msgstr "_�仆�亠� �舒�亠 仗仂��从�"
 
-#: src/prefs.c:523
+#: src/prefs.c:544
 msgid "C_ontrol-Enter sends message"
 msgstr "�仂仆��仂仍+�仆�亠� �舒�亠 仗仂��从�"
 
-#: src/prefs.c:525
+#: src/prefs.c:546
 msgid "Window Closing"
 msgstr "�舒�于舒�舒�亠 仗�仂亰仂�舒"
 
-#: src/prefs.c:526
+#: src/prefs.c:547
 msgid "E_scape closes window"
 msgstr "_��从亠�仗 亰舒�于舒�舒 仗�仂亰仂�"
 
-#: src/prefs.c:527
+#: src/prefs.c:548
 msgid "Control-_W closes window"
 msgstr "�仂仆��仂仍+W 亰舒�于舒�舒 仗�仂亰仂�"
 
-#: src/prefs.c:530
+#: src/prefs.c:551
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "�仂仆��仂仍-{B/I/U/S} �弍舒���亠 _HTML 仂亰仆舒从亠"
 
-#: src/prefs.c:531
+#: src/prefs.c:552
 msgid "Control-(number) inserts _smileys"
 msgstr "�仂仆��仂仍-(弍�仂�) �弍舒���亠 �仄亠�舒从"
 
-#: src/prefs.c:543
+#: src/prefs.c:565
 msgid "Buddy List Toolbar"
 msgstr "�仍舒�从亠 � �仗亳�从� 亟��亞舒�舒"
 
-#: src/prefs.c:544 src/prefs.c:617 src/prefs.c:659
+#: src/prefs.c:566 src/prefs.c:645 src/prefs.c:688
 msgid "Show _buttons as:"
 msgstr "��亳从舒亢亳 _亟�亞仄亳�亠 从舒仂:"
 
-#: src/prefs.c:545 src/prefs.c:618 src/prefs.c:660
+#: src/prefs.c:567 src/prefs.c:646 src/prefs.c:689
 msgid "Pictures"
 msgstr "弌仍亳从亠"
 
-#: src/prefs.c:546 src/prefs.c:619 src/prefs.c:661
+#: src/prefs.c:568 src/prefs.c:647 src/prefs.c:690
 msgid "Text"
 msgstr "丐亠从��"
 
-#: src/prefs.c:547 src/prefs.c:620 src/prefs.c:662
+#: src/prefs.c:569 src/prefs.c:648 src/prefs.c:691
 msgid "Pictures and text"
 msgstr "弌仍亳从亠 亳 �亠从��"
 
-#: src/prefs.c:548 src/prefs.c:1056
+#: src/prefs.c:570 src/prefs.c:1075
 msgid "None"
 msgstr "�亳��舒"
 
-#: src/prefs.c:551
-msgid "_Save window size/position"
-msgstr "弌仆亳仄亳 _于亠仍亳�亳仆�/�舒亰仄亠��舒� 仗�仂亰仂�舒"
-
-#: src/prefs.c:552
+#: src/prefs.c:573
 msgid "_Raise window on events"
 msgstr "_�亰亟亳亞仆亳 仗�仂亰仂� 仆舒 亟仂亞舒�舒�亠"
 
-#. vbox = make_frame (ret, _("Group Display"));
+#: src/prefs.c:575
+msgid "Group Display"
+msgstr "��亳从舒亰 亞��仗舒"
+
 #. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#. gaim_button(_("Show _numbers in groups"), &blist_options, OPT_BLIST_SHOW_GRPNUM, vbox);
-#: src/prefs.c:558
+#: src/prefs.c:577
+msgid "Show _numbers in groups"
+msgstr "��亳从舒亢亳 _弍�仂�亠于亠 � 亞��仗舒仄舒"
+
+#: src/prefs.c:579
 msgid "Buddy Display"
 msgstr "��亳从舒亰 亟��亞舒�舒"
 
-#: src/prefs.c:559
+#: src/prefs.c:580
 msgid "Show buddy _icons"
 msgstr "��亳从舒亢亳 _亳从仂仆亳�亠 亟��亞舒�舒"
 
-#. gaim_button(_("Show buddy t_ype icons"), &blist_options, OPT_BLIST_SHOW_PIXMAPS, vbox);
-#: src/prefs.c:561
+#: src/prefs.c:581
 msgid "Show _warning levels"
 msgstr "��亳从舒亢亳 仆亳于仂亠 _�仗仂亰仂�亠�舒"
 
-#: src/prefs.c:562
+#: src/prefs.c:586
 msgid "Show idle _times"
 msgstr "��亳从舒亢亳 ��舒�舒�亠 _仆亠舒从�亳于仆仂��亳"
 
-#: src/prefs.c:563
+#: src/prefs.c:591
 msgid "Dim i_dle buddies"
 msgstr "��亠仆�亳 仆亠舒从�亳于仆亠 _亟��亞舒�亠"
 
-#: src/prefs.c:581 src/prefs.c:1697
+#: src/prefs.c:609 src/prefs.c:1716
 msgid "Conversations"
 msgstr "�舒亰亞仂于仂�亳"
 
-#: src/prefs.c:589
+#: src/prefs.c:617
 msgid "_Placement:"
 msgstr "_�舒亰仄亠��舒�:"
 
-#: src/prefs.c:597
+#: src/prefs.c:625
 msgid "Show IMs and chats in _same tabbed window."
 msgstr "��亳从舒亢亳 弍�亰亠 仗仂��从亠 亳 �舒亰亞仂于仂�亠 � _亳��仂仄 仗�仂亰仂�� 仗仂仄仂�� 仍亳��仂于舒."
 
-#: src/prefs.c:616 src/prefs.c:658
+#: src/prefs.c:644 src/prefs.c:687
 msgid "Window"
 msgstr "��仂亰仂�"
 
-#: src/prefs.c:623 src/prefs.c:665
+#: src/prefs.c:651 src/prefs.c:694
 msgid "New window _width:"
 msgstr "_丿亳�亳仆舒 仆仂于仂亞 仗�仂亰仂�舒:"
 
-#: src/prefs.c:624 src/prefs.c:666
+#: src/prefs.c:652 src/prefs.c:695
 msgid "New window _height:"
 msgstr "_�亳�亳仆舒 仆仂于仂亞 仗�仂亰仂�舒:"
 
-#: src/prefs.c:625 src/prefs.c:667
+#: src/prefs.c:653 src/prefs.c:696
 msgid "_Entry widget height:"
 msgstr "�亳�亳仆舒 仗仂�舒 亰舒 _�仆仂�:"
 
-#: src/prefs.c:626 src/prefs.c:668
+#: src/prefs.c:654 src/prefs.c:697
 msgid "_Raise windows on events"
 msgstr "_�亰亟亳亞仆亳 仗�仂亰仂�亠 仆舒 亟仂亞舒�舒�亠"
 
-#: src/prefs.c:627
+#: src/prefs.c:655
 msgid "Hide window on _send"
 msgstr "弌舒从�亳� 仗�仂亰仂� 仗�亳 _�仍舒��"
 
-#: src/prefs.c:630
+#: src/prefs.c:658
 msgid "Buddy Icons"
 msgstr "�从仂仆亳�亠 亟��亞舒�舒"
 
-#: src/prefs.c:631
+#: src/prefs.c:659
 msgid "Hide buddy _icons"
 msgstr "弌舒从�亳� 亳从仂仆亳�亠 _亟��亞舒�舒"
 
-#: src/prefs.c:632
+#: src/prefs.c:660
 msgid "Disable buddy icon a_nimation"
 msgstr "��从���亳 舒仆亳仄舒�亳�� 亳从仂仆亳�亠 亟��亞舒�舒"
 
-#: src/prefs.c:635
+#: src/prefs.c:663
 msgid "Show _logins in window"
 msgstr "��亳从舒亢亳 _仗�亳�舒于亠 � 仗�仂亰仂��"
 
-#: src/prefs.c:637
+#: src/prefs.c:664
+msgid "Show a_liases in tabs/titles"
+msgstr "��亳从舒亢亳 _舒仍亳�舒�亠 � 亰舒仍亳���亳仄舒/仆舒�仍仂于亳仄舒"
+
+#: src/prefs.c:666
 msgid "Typing Notification"
 msgstr "�弍舒于亠��亠�亠 仂 从��舒��"
 
-#: src/prefs.c:638
+#: src/prefs.c:667
 msgid "Notify buddies that you are _typing to them"
 msgstr "�弍舒于亠��亳 亟��亞舒�亠 _从舒亟舒 亳仄 仗亳�亠�亠"
 
-#: src/prefs.c:670
+#: src/prefs.c:699
 msgid "Tab Completion"
 msgstr "�仂于��舒于舒�亠 �舒弍�仍舒�仂�仂仄"
 
-#: src/prefs.c:671
+#: src/prefs.c:700
 msgid "_Tab-complete nicks"
 msgstr "_�仂于��亳 仆舒亟亳仄从亠 仆舒 仗�亳�亳�舒从 �舒弍�仍舒�仂�舒"
 
-#: src/prefs.c:672
+#: src/prefs.c:701
 msgid "_Old-style tab completion"
 msgstr "_弌�舒�仂仄仂亟仆仂 亟仂于��舒于舒�亠 仗仂仄仂�� �舒弍�仍舒�仂�舒"
 
-#: src/prefs.c:675
+#: src/prefs.c:704
 msgid "_Show people joining/leaving in window"
 msgstr "��亳从舒亢亳 � 仗�仂亰仂�� _��亟亠 从仂�亳 �亠 仗�亳从������/仆舒仗���舒��"
 
-#: src/prefs.c:676
+#: src/prefs.c:705
 msgid "Co_lorize screennames"
 msgstr "_�仂�亳 亳仄亠仆舒"
 
-#: src/prefs.c:693
+#: src/prefs.c:722
 msgid "IM Tabs"
 msgstr "�亳��仂于亳 弍�亰亳� 仗仂��从舒"
 
-#: src/prefs.c:694 src/prefs.c:704
+#: src/prefs.c:723 src/prefs.c:733
 msgid "Tab _placement:"
 msgstr "�仂��舒于从舒 _亰舒仍亳��舒从舒:"
 
-#: src/prefs.c:695 src/prefs.c:705
+#: src/prefs.c:724 src/prefs.c:734
 msgid "Top"
 msgstr "�舒 于���"
 
-#: src/prefs.c:696 src/prefs.c:706
+#: src/prefs.c:725 src/prefs.c:735
 msgid "Bottom"
 msgstr "�舒 亟仆�"
 
-#: src/prefs.c:697 src/prefs.c:707
+#: src/prefs.c:726 src/prefs.c:736
 msgid "Left"
 msgstr "�亠于仂"
 
-#: src/prefs.c:698 src/prefs.c:708
+#: src/prefs.c:727 src/prefs.c:737
 msgid "Right"
 msgstr "�亠�仆仂"
 
-#: src/prefs.c:700
+#: src/prefs.c:729
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
@@ -4931,180 +5139,176 @@
 "��亳从舒亢亳 �于亠 _弍�亰亠 仗仂��从亠 � �亠亟仆仂仄 仍亳�仆舒�仂仄\n"
 "仗�仂亰仂��"
 
-#: src/prefs.c:701
-msgid "Show a_liases in tabs/titles"
-msgstr "��亳从舒亢亳 _舒仍亳�舒�亠 � 亰舒仍亳���亳仄舒/仆舒�仍仂于亳仄舒"
-
-#: src/prefs.c:703
+#: src/prefs.c:732
 msgid "Chat Tabs"
 msgstr "�亳��仂于亳 �舒 �舒亰亞仂于仂�亳仄舒"
 
-#: src/prefs.c:710
+#: src/prefs.c:739
 msgid "Show all c_hats in one tabbed window"
 msgstr "��亳从舒亢亳 �于亠 �舒亰亞仂于仂�亠 � �亠亟仆仂仄 仍亳�仆舒�仂仄 仗�仂亰仂��"
 
-#: src/prefs.c:713
+#: src/prefs.c:742
 msgid "Tab Options"
 msgstr "�仂��舒于从亠 仍亳��仂于舒"
 
-#: src/prefs.c:714
+#: src/prefs.c:743
 msgid "Show _close button on tabs."
 msgstr "��亳从舒亢亳 亟�亞仄亳�亠 亰舒 _亰舒�于舒�舒�亠 仆舒 亰舒仍亳���亳仄舒."
 
-#: src/prefs.c:734
+#: src/prefs.c:763
 msgid "Proxy Type"
 msgstr "����舒 仗�仂从�亳�舒"
 
-#: src/prefs.c:735
+#: src/prefs.c:764
 msgid "Proxy _type:"
 msgstr "_����舒 仗�仂从�亳�舒:"
 
-#: src/prefs.c:736
+#: src/prefs.c:765
 msgid "No proxy"
 msgstr "�亠仄舒 仗�仂从�亳�舒"
 
-#: src/prefs.c:741
+#: src/prefs.c:770
 msgid "Proxy Server"
 msgstr "��仂从�亳 �亠�于亠�"
 
-#: src/prefs.c:754
+#: src/prefs.c:783
 msgid "_Host"
 msgstr "_�仄亠 �亠�于亠�舒"
 
-#: src/prefs.c:768
+#: src/prefs.c:797
 msgid "Port"
 msgstr "�仂��"
 
-#: src/prefs.c:784
+#: src/prefs.c:813
 msgid "_User"
 msgstr "_�仂�亳�仆亳从"
 
-#: src/prefs.c:798
+#: src/prefs.c:827
 msgid "Pa_ssword"
 msgstr "_�仂亰亳仆从舒"
 
-#: src/prefs.c:819
+#: src/prefs.c:848
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr "���仆仂 �仆亠�亳 仗�亠亞仍亠亟仆亳从 ��%s�� �亠 仆亠亳�仗�舒于舒仆. �舒亟于亠亰亠 仆亠�亠 �舒亟亳�亳."
 
-#: src/prefs.c:841
+#: src/prefs.c:869
 msgid "Konqueror"
 msgstr "�仂仆从于亠�仂�"
 
-#: src/prefs.c:842
+#: src/prefs.c:870
 msgid "Opera"
 msgstr "�仗亠�舒"
 
-#: src/prefs.c:843
+#: src/prefs.c:871
 msgid "Galeon"
 msgstr "�舒仍亠仂仆"
 
-#: src/prefs.c:844
+#: src/prefs.c:872
 msgid "Netscape"
 msgstr "�亠��从亠�仗"
 
-#: src/prefs.c:845
+#: src/prefs.c:873
 msgid "Mozilla"
 msgstr "�仂亰亳仍舒"
 
-#: src/prefs.c:853
-msgid "Manual"
-msgstr "���仆舒 仗仂��舒于从舒"
-
-#: src/prefs.c:877
-msgid "Browser Selection"
-msgstr "�亰弍仂� 仗�亠亞仍亠亟仆亳从舒"
-
 #: src/prefs.c:881
+msgid "Manual"
+msgstr "���仆舒 仗仂��舒于从舒"
+
+#: src/prefs.c:905
+msgid "Browser Selection"
+msgstr "�亰弍仂� 仗�亠亞仍亠亟仆亳从舒"
+
+#: src/prefs.c:909
 msgid "_Browser"
 msgstr "_��亠亞仍亠亟仆亳从"
 
-#: src/prefs.c:889
+#: src/prefs.c:917
 msgid "_Manual: "
 msgstr "_���仆仂:"
 
-#: src/prefs.c:912
+#: src/prefs.c:932
 msgid "Browser Options"
 msgstr "�仂��舒于从亠 仗�亠亞仍亠亟仆亳从舒"
 
-#: src/prefs.c:913
+#: src/prefs.c:933
 msgid "Open new _window by default"
 msgstr "�仂亟�舒亰�仄亠于舒� 仂�于舒�舒�亠 仆仂于仂亞 _仗�仂亰仂�舒"
 
-#: src/prefs.c:927
+#: src/prefs.c:947
 msgid "Message Logs"
 msgstr "�舒仗亳�亳 仗仂��从舒"
 
-#: src/prefs.c:928
+#: src/prefs.c:948
 msgid "_Log all instant messages"
 msgstr "_�亠仍亠亢亳 �于亠 弍�亰亠 仗仂��从亠"
 
-#: src/prefs.c:929
+#: src/prefs.c:949
 msgid "Log all c_hats"
 msgstr "�亠仍亠亢亳 �于亠 _�舒亰亞仂于仂�亠"
 
-#: src/prefs.c:930
+#: src/prefs.c:950
 msgid "Strip _HTML from logs"
 msgstr "�亰弍舒�亳 _HTML 亳亰 亰舒仗亳�舒"
 
-#: src/prefs.c:932
+#: src/prefs.c:952
 msgid "System Logs"
 msgstr "弌亳��亠仄�从亳 亰舒仗亳�亳"
 
-#: src/prefs.c:933
+#: src/prefs.c:953
 msgid "Log when buddies _sign on/sign off"
 msgstr "�舒仗亳�亳 从舒亟舒 �亠 亟��亞舒�亳 _仗�亳�舒于����/仂亟�舒于����"
 
-#: src/prefs.c:935
+#: src/prefs.c:955
 msgid "Log when buddies become _idle/un-idle"
 msgstr "�舒仗亳�亳 从舒亟舒 �亠 亟��亞舒�亳 _�仍亠�亠/仗�仂弍�亟亠"
 
-#: src/prefs.c:937
+#: src/prefs.c:957
 msgid "Log when buddies go away/come _back"
 msgstr "�舒仗亳�亳 从舒亟舒 亟��亞舒�亳 �亰仄� _仂亟����于仂/�亠 于�舒�亠"
 
-#: src/prefs.c:938
+#: src/prefs.c:958
 msgid "Log your _own signons/idleness/awayness"
 msgstr "�舒仗亳�亳 _�于仂�亠 仗�亳�舒于亠/仆亠舒从�亳于仆仂��/仂亟����于舒"
 
-#: src/prefs.c:940
+#: src/prefs.c:960
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "_�仂�亠亟亳仆舒�仆舒 亟舒�仂�亠从舒 �舒 亰舒仗亳�亳仄舒 亰舒 仗�亳�舒于亠 �于舒从仂亞 亟��亞舒�舒"
 
-#: src/prefs.c:973
+#: src/prefs.c:993
 msgid "Sound Options"
 msgstr "�仂��舒于从亠 亰于�从舒"
 
-#: src/prefs.c:974
+#: src/prefs.c:994
 msgid "_No sounds when you log in"
 msgstr "_�亠亰 亰于�从舒 仗仂 仗�亳�舒于亳"
 
-#: src/prefs.c:975
+#: src/prefs.c:995
 msgid "_Sounds while away"
 msgstr "_�于��亳 亟仂从 ��亠 仂亟���仆亳"
 
-#: src/prefs.c:978
+#: src/prefs.c:998
 msgid "Sound Method"
 msgstr "�舒�亳仆 仂亞仍舒�舒于舒�舒"
 
-#: src/prefs.c:979
+#: src/prefs.c:999
 msgid "_Method"
 msgstr "_�亠�仂亟舒"
 
-#: src/prefs.c:982
+#: src/prefs.c:1002
 msgid "Console beep"
 msgstr "�仂仆亰仂仍仆亳 亰于�从"
 
-#: src/prefs.c:984
+#: src/prefs.c:1004
 msgid "Automatic"
 msgstr "���仂仄舒��从亳"
 
-#: src/prefs.c:991
+#: src/prefs.c:1011
 msgid "Command"
 msgstr "�舒�亠亟弍舒"
 
-#: src/prefs.c:1000
+#: src/prefs.c:1020
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5113,71 +5317,67 @@
 "�舒�亠亟弍舒 亰舒 亰于�从\n"
 "(%s 亰舒 仆舒亰亳于 亟舒�仂�亠从亠)"
 
-#: src/prefs.c:1038
+#: src/prefs.c:1058
 msgid "_Sending messages removes away status"
 msgstr "弌仍舒�亠 仗仂��从舒 于舒� 于�舒�舒 �舒 仂亟����于舒"
 
-#: src/prefs.c:1039
+#: src/prefs.c:1059
 msgid "_Queue new messages when away"
 msgstr "_�亟仍舒亢亳 � �亠亟 仗仂��从亠 仆舒 仂亟����于�"
 
-#: src/prefs.c:1040
-msgid "_Ignore new conversations when away"
-msgstr "_�舒仆亠仄舒�亳 仆仂于亠 �舒亰亞仂于仂�亠 仆舒 仂亟���于�"
-
-#: src/prefs.c:1042
+#: src/prefs.c:1061
 msgid "Auto-response"
 msgstr "弌舒仄仂-仂亟亞仂于仂�"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1064
 msgid "Seconds before _resending:"
 msgstr "��仂� �亠从�仆亟亳 仗�亠 _仗仂仆仂于仆仂亞 �仍舒�舒:"
 
-#: src/prefs.c:1047
+#: src/prefs.c:1066
 msgid "_Don't send auto-response"
 msgstr "_�亠 �舒�亳 �舒仄仂-仂亟亞仂于仂�"
 
-#: src/prefs.c:1048
+#: src/prefs.c:1067
 msgid "_Only send auto-response when idle"
 msgstr "_弌舒仄仂 �舒�亳 �舒仄仂-仂亟亞仂于仂� 从舒亟舒 ��亠 仆亠舒从�亳于仆亳"
 
-#: src/prefs.c:1049
+#: src/prefs.c:1068
 msgid "Do_n't send auto-response in active conversations"
 msgstr "�亠 �舒�亳 �舒仄仂-仂亟亞仂于仂� � 舒从�亳于仆亳仄 �舒亰亞仂于仂�亳仄舒"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1074
 msgid "Idle _time reporting:"
 msgstr "��亳�舒于舒 _��舒�舒�舒 仍亠仆�舒�亠�舒:"
 
-#: src/prefs.c:1057
+#: src/prefs.c:1076
 msgid "Gaim usage"
 msgstr "丕仗仂��亠弍舒 Gaim-舒:"
 
-#: src/prefs.c:1060
+#: src/prefs.c:1079
 msgid "X usage"
 msgstr "丕仗仂��亠弍舒 � X-�"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1081
 msgid "Windows usage"
 msgstr "丕仗仂��亠弍舒 � �亳仆亟仂���"
 
-#: src/prefs.c:1069
+#: src/prefs.c:1088
 msgid "Auto-away"
 msgstr "弌舒仄仂-仂亟���于仂"
 
-#: src/prefs.c:1070
+#: src/prefs.c:1089
 msgid "Set away _when idle"
 msgstr "�亟亠�亠 仆舒 仂亟����于仂 从舒亟舒 ��亠 _仆亠舒从�亳于仆亳"
 
-#: src/prefs.c:1071
+#: src/prefs.c:1090
 msgid "_Minutes before setting away:"
 msgstr "��仂� _仄亳仆��舒 仗�亠 仂亟仍舒�从舒 仆舒 仂亟����于仂:"
 
-#: src/prefs.c:1077
+#: src/prefs.c:1096
 msgid "Away m_essage:"
 msgstr "�仂��从舒 亰舒 _仂亟����于仂:"
 
-#: src/prefs.c:1121
+#: src/prefs.c:1140
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5192,7 +5392,7 @@
 "<span weight=\"bold\">�亠弍 ���舒仆亳�舒:</span>\t\t%s\n"
 "<span weight=\"bold\">�舒�仂�亠从舒:</span>\t%s"
 
-#: src/prefs.c:1126
+#: src/prefs.c:1145
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5207,124 +5407,116 @@
 "<span weight=\"bold\">�仆�亠�仆亠� 舒亟�亠�舒:</span>  %s\n"
 "<span weight=\"bold\">�舒�仂�亠从舒:</span>  %s"
 
-#: src/prefs.c:1257
+#: src/prefs.c:1276
 msgid "Load"
 msgstr "丕�亳�舒�"
 
-#: src/prefs.c:1264
+#: src/prefs.c:1283
 msgid "Name"
 msgstr "�仄亠"
 
-#: src/prefs.c:1311
+#: src/prefs.c:1330
 msgid "Details"
 msgstr "�亠�舒�亳"
 
-#: src/prefs.c:1409
+#: src/prefs.c:1428
 msgid "Sound Selection"
 msgstr "�亰弍仂� 亰于�从舒"
 
-#: src/prefs.c:1500
+#: src/prefs.c:1519
 msgid "Play"
 msgstr "����亳"
 
-#: src/prefs.c:1507
+#: src/prefs.c:1526
 msgid "Event"
 msgstr "�仂亞舒�舒�"
 
-#: src/prefs.c:1523
+#: src/prefs.c:1542
 msgid "Test"
 msgstr "��仗�仂弍舒�"
 
-#: src/prefs.c:1531
+#: src/prefs.c:1550
 msgid "Choose..."
 msgstr "�亰舒弍亠�亳..."
 
-#: src/prefs.c:1653
+#: src/prefs.c:1672
 msgid "_Edit"
 msgstr "_丕�亠亟亳"
 
-#: src/prefs.c:1691
+#: src/prefs.c:1710
 msgid "Interface"
 msgstr "�仆�亠��亠��"
 
-#: src/prefs.c:1692
+#: src/prefs.c:1711
 msgid "Smiley Themes"
 msgstr "弌从�仗仂于亳 �仄亠�舒从舒"
 
-#: src/prefs.c:1693
+#: src/prefs.c:1712
 msgid "Fonts"
 msgstr "�亳�仄舒"
 
-#: src/prefs.c:1694
+#: src/prefs.c:1713
 msgid "Message Text"
 msgstr "丐亠从�� 仗仂��从舒"
 
-#: src/prefs.c:1695
+#: src/prefs.c:1714
 msgid "Shortcuts"
 msgstr "��亠�亳�亠"
 
-#: src/prefs.c:1696
-msgid "Buddy List"
-msgstr "弌仗亳�舒从 亟��亞舒�舒"
-
-#: src/prefs.c:1698
+#: src/prefs.c:1717
 msgid "IMs"
 msgstr "��亰亠 仗仂��从亠"
 
-#: src/prefs.c:1699
+#: src/prefs.c:1718
 msgid "Chats"
 msgstr "�舒亰亞仂于仂�亳"
 
-#: src/prefs.c:1700
+#: src/prefs.c:1719
 msgid "Tabs"
 msgstr "�亳��仂于亳"
 
-#: src/prefs.c:1701
+#: src/prefs.c:1720
 msgid "Proxy"
 msgstr "��仂从�亳"
 
 #. We use the registered default browser in windows
-#: src/prefs.c:1704
+#: src/prefs.c:1723
 msgid "Browser"
 msgstr "��亠亞仍亠亟仆亳从"
 
-#: src/prefs.c:1706
+#: src/prefs.c:1725
 msgid "Logging"
 msgstr "�舒仗亳�亳于舒�亠"
 
-#: src/prefs.c:1707
+#: src/prefs.c:1726
 msgid "Sounds"
 msgstr "�于��亳"
 
-#: src/prefs.c:1708
+#: src/prefs.c:1727
 msgid "Sound Events"
 msgstr "�于��仆亳 亟仂亞舒�舒�亳"
 
-#: src/prefs.c:1709
+#: src/prefs.c:1728
 msgid "Away / Idle"
 msgstr "�亟����于仂/仆亠舒从�亳于仆仂��"
 
-#: src/prefs.c:1710
+#: src/prefs.c:1729
 msgid "Away Messages"
 msgstr "�仂��从亠 亰舒 仂亟����于仂"
 
-#: src/prefs.c:1712
+#: src/prefs.c:1731
 msgid "Plugins"
 msgstr "�仂亟舒�亳"
 
-#: src/prefs.c:1751 src/win32/systray.c:293
-msgid "Preferences"
-msgstr "�仂��舒于从亠"
-
-#: src/prefs.c:1871
+#: src/prefs.c:1890
 msgid "Debug Window"
 msgstr "��仂亰仂� 亰舒 �舒亰弍�弍亳�舒�亠"
 
-#: src/prpl.c:103
+#: src/prpl.c:99
 msgid "ICQ Protocol detected."
 msgstr "��亠仗仂亰仆舒� ICQ 仗�仂�仂从仂仍."
 
-#: src/prpl.c:104
+#: src/prpl.c:100
 msgid ""
 "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
 "it was probably not compiled from the same version of the source as this "
@@ -5336,29 +5528,29 @@
 "仆亠 仄仂亢亠 �亠 亞舒�舒仆�仂于舒�亳 亟舒 �亠 �舒亟亳�亳. ��亠仗仂�����亠 �亠 亟舒 从仂�亳��亳�亠 ���/ICQ "
 "仗�仂�仂从仂仍 亰舒 仗仂于亠亰亳于舒�亠 仆舒 ICQ"
 
-#: src/prpl.c:285
+#: src/prpl.c:292
 msgid "Gaim - Prompt"
 msgstr "Gaim �� �亳�舒�亠"
 
-#: src/prpl.c:359
+#: src/prpl.c:366
 msgid "No actions available"
 msgstr "�亠仄舒 亟仂���仗仆亳� 舒从�亳�舒"
 
-#: src/prpl.c:484
+#: src/prpl.c:491
 #, c-format
 msgid "%s has mail from %s: %s"
 msgstr "%s �亠 亟仂弍亳仂 仗仂��� 仂亟 %s: %s"
 
-#: src/prpl.c:484
+#: src/prpl.c:491
 msgid "No Subject"
 msgstr "�亠亰 �亠仄亠"
 
-#: src/prpl.c:486
+#: src/prpl.c:493
 #, c-format
 msgid "%s has new mail."
 msgstr "%s �亠 仗�亳仄亳仂 仆仂于� 仗仂���."
 
-#: src/prpl.c:489
+#: src/prpl.c:496
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -5366,20 +5558,20 @@
 msgstr[1] "%s �亠 仗�亳仄亳仂 %d 仆仂于亠 仗仂��从亠."
 msgstr[2] "%s �亠 仗�亳仄亳仂 %d 仆仂于亳� 仗仂��从舒."
 
-#: src/prpl.c:505
+#: src/prpl.c:512
 msgid "Gaim - New Mail"
 msgstr "Gaim �� �仂于舒 仗仂��舒"
 
-#: src/prpl.c:526
+#: src/prpl.c:530
 msgid "Open Mail"
 msgstr "��于仂�亳 仗仂���"
 
-#: src/prpl.c:721
+#: src/prpl.c:725
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s �亠 ��亳仆亳仂 %s �于仂�亳仄 亟��亞舒�仂仄 %s%s%s"
 
-#: src/prpl.c:729
+#: src/prpl.c:733
 msgid ""
 "\n"
 "\n"
@@ -5389,15 +5581,15 @@
 "\n"
 "�舒 仍亳 亢亠仍亳�亠 亟舒 亟仂亟舒�亠 ��/�亠亞舒 � �于仂� �仗亳�舒从 亟��亞舒�舒?"
 
-#: src/prpl.c:731
+#: src/prpl.c:735
 msgid "Gaim - Information"
 msgstr "Gaim �� 仗仂亟舒�亳"
 
-#: src/prpl.c:733
+#: src/prpl.c:737
 msgid "Gaim - Confirm"
 msgstr "Gaim �� 仗仂�于�亟舒"
 
-#: src/prpl.c:772
+#: src/prpl.c:776
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -5405,42 +5597,42 @@
 "丐�亠仆��仆仂 仆亠仄舒�亠 仆亳�亠亟舒仆 仗�仂�仂从仂仍 仆舒 �舒�仗仂仍舒亞舒�� 从仂�亳 仂仄仂亞��舒于舒 �亠亞亳���仂于舒�亠 "
 "仆仂于亳� 仆舒仍仂亞舒."
 
-#: src/prpl.c:809
+#: src/prpl.c:813
 msgid "Gaim - Registration"
 msgstr "Gaim �� �亠亞亳���舒�亳�舒"
 
-#: src/prpl.c:823
+#: src/prpl.c:825
 msgid "Registration Information"
 msgstr "�仂亟舒�亳 仂 �亠亞亳���舒�亳�亳"
 
-#: src/prpl.c:840
+#: src/prpl.c:838
 msgid "Register"
 msgstr "�亠亞亳����� �亠"
 
-#: src/server.c:58
+#: src/server.c:54
 msgid "Please enter your password"
 msgstr "丕仆亠�亳�亠 于舒�� 仍仂亰亳仆从�"
 
-#: src/server.c:707
+#: src/server.c:704
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 仗仂��从舒)"
 
-#: src/server.c:719
+#: src/server.c:716
 msgid "(1 message)"
 msgstr "(1 仗仂��从舒)"
 
-#: src/server.c:908 src/server.c:915
+#: src/server.c:895 src/server.c:902
 #, c-format
 msgid "%s logged in."
 msgstr "%s �亠 仗�亳�舒于�亠仆."
 
-#: src/server.c:932 src/server.c:939
+#: src/server.c:919 src/server.c:926
 #, c-format
 msgid "%s logged out."
 msgstr "%s �亠 仂亟�舒于�亠仆."
 
-#: src/server.c:972
+#: src/server.c:960
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -5449,11 +5641,11 @@
 "%s �亠 �仗�舒于仂 �仗仂亰仂�亠仆 仂亟 ���舒仆亠 %s.\n"
 "�舒� 仆仂于亳 仆亳于仂 仂弍舒亰�亳于仂��亳 �亠 %d%%"
 
-#: src/server.c:975
+#: src/server.c:963
 msgid "an anonymous person"
 msgstr "舒仆仂仆亳仄仆舒 仂�仂弍舒"
 
-#: src/server.c:1055
+#: src/server.c:1054
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -5462,16 +5654,16 @@
 "�仂�亳�仆亳从 ��%s�� 仗仂亰亳于舒 %s � 仗�亳�舒仂仆亳��: ��%s��\n"
 "%s"
 
-#: src/server.c:1059
+#: src/server.c:1058
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "�仂�亳�仆亳从 ��%s�� 仗仂亰亳于舒 %s � 仗�亳�舒仂仆亳��: ��%s��\n"
 
-#: src/server.c:1065
+#: src/server.c:1064
 msgid "Buddy Chat Invite"
 msgstr "�仂亰仂于亳 亟��亞舒�舒 仆舒 �舒亰亞仂于仂�"
 
-#: src/server.c:1257
+#: src/server.c:1256
 msgid "More Info"
 msgstr "�亳�亠 仗仂亟舒�舒从舒"
 
@@ -5558,201 +5750,76 @@
 msgstr[1] "仄亳仆��舒"
 msgstr[2] "仄亳仆��舒"
 
-#: src/util.c:1007
+#: src/util.c:1012
 msgid "Not connected to AIM"
 msgstr "�亳�亠 仗仂于亠亰舒仆 仆舒 ���"
 
-#: src/util.c:1016 src/util.c:1055
+#: src/util.c:1021 src/util.c:1060
 msgid "No screenname given."
 msgstr "�仄亠 仆亳�亠 仆舒于亠亟亠仆仂."
 
-#: src/util.c:1091
+#: src/util.c:1096
 msgid "No roomname given."
 msgstr "弌仂弍舒 仆亳�亠 仆舒于亠亟亠仆舒."
 
-#: src/util.c:1107
+#: src/util.c:1112
 msgid "Invalid AIM URI"
 msgstr "�亠亳�仗�舒于仆舒 ��� �仆�亠�仆亠� 舒亟�亠�舒"
 
-#. * Custom away message.
-#: src/prpl.h:162
-msgid "Custom"
-msgstr "��亳仍舒亞仂�亠仆仂"
-
-#: src/gaim-disclosure.c:253
-msgid "Expander Size"
-msgstr "�亠仍亳�亳仆舒 仗�仂�亳�亳于舒�舒"
-
-#: src/gaim-disclosure.c:254
-msgid "Size of the expander arrow"
-msgstr "�亠仍亳�亳仆舒 ���亠仍亳�亠 仗�仂�亳�亳于舒�舒"
-
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
-#: src/win32/systray.c:19
+#: src/win32/systray.c:20
 msgid "Gaim Instant Messenger"
-msgstr "Gaim 弍�亰亠 于亠亰亠"
-
-#: src/win32/systray.c:20
-msgid "Gaim Instant Messenger - Signed off"
-msgstr "Gaim 弍�亰亠 于亠亰亠 �� 仂亟�舒于�亠仆"
+msgstr "�舒亳仄 弍�亰亳 仗仂�亳�舒仂�"
 
 #: src/win32/systray.c:21
+msgid "Gaim Instant Messenger - Signed off"
+msgstr "�舒亳仄 弍�亰亳 仗仂�亳�舒仂� �� �亠仗�亳�舒于�亠仆"
+
+#: src/win32/systray.c:22
 msgid "Gaim Instant Messenger - Away"
-msgstr "Gaim 弍�亰亠 于亠亰亠 �� 仂亟���舒仆"
-
-#: src/win32/systray.c:103
+msgstr "�舒亳仄 弍�亰亳 仗仂�亳�舒仂� �� �亟���舒仆"
+
+#: src/win32/systray.c:104
 msgid "New"
 msgstr "�仂于舒"
 
-#: src/win32/systray.c:127
+#: src/win32/systray.c:128
 msgid "Set Away Message"
 msgstr "�仂��舒于亳 仗仂��从� 亰舒 仂亟����于仂"
 
-#: src/win32/systray.c:134
+#: src/win32/systray.c:135
 msgid "I'm Back"
 msgstr "��舒�亳仂 �舒仄 �亠"
 
-#: src/win32/systray.c:299
+#: src/win32/systray.c:300
 msgid "Exit"
-msgstr "�亰仍舒亰"
-
-#: src/pounce.c:83
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s 仗仂�亠 亟舒 �亳 仗亳�亠"
-
-#: src/pounce.c:84
-#, c-format
-msgid "%s has signed on"
-msgstr "%s �亠 仗�亳�舒于亳"
-
-#: src/pounce.c:85
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s �亠 于�舒�亳 亳亰 亰亠仄�亠 亟亠仄弍亠仍亳�亠"
-
-#: src/pounce.c:86
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s �亠 于�舒�亳 �舒 仂亟����于舒"
-
-#: src/pounce.c:183 src/pounce.c:389
-msgid "New Buddy Pounce"
-msgstr "�仂于仂 _亰舒�从舒从舒�亠 亟��亞舒�舒"
-
-#: src/pounce.c:201
-msgid "Remove Buddy Pounce"
-msgstr "丕从仍仂仆亳 亰舒�从舒从舒�亠 亟��亞舒�舒"
-
-#: src/pounce.c:230
-msgid "[no message]"
-msgstr "[仆亠仄舒 仗仂��从舒]"
-
-#: src/pounce.c:232
-msgid "[Click to edit]"
-msgstr "[�仍亳从仆亳�亠 亟舒 ��亠亟亳�亠]"
-
-#: src/pounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr "丕仆亠�亳 亟��亞舒�舒 从仂�亠亞 亢亠仍亳� 亟舒 亰舒�从仂�亳�."
-
-#. <pounce type="who">
-#: src/pounce.c:399
-msgid "Pounce Who"
-msgstr "�舒�从仂�亳 从仂亞舒"
-
-#: src/pounce.c:410
-msgid "Account"
-msgstr "�舒仍仂亞"
-
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/pounce.c:436
-msgid "Pounce When"
-msgstr "�舒�从仂�亳 从舒亟舒"
-
-#: src/pounce.c:446
-msgid "Pounce on sign on"
-msgstr "�舒�从仂�亳 仗�亳 仗�亳�舒于亳"
-
-#: src/pounce.c:455
-msgid "Pounce on return from away"
-msgstr "�舒�从仂�亳 仗仂 仗仂于�舒�从� �舒 仂亟����于舒"
-
-#: src/pounce.c:464
-msgid "Pounce on return from idle"
-msgstr "�舒�从仂�亳 仗�亳 仗�亠从亳亟� 仍亠仆�舒�亠�舒"
-
-#: src/pounce.c:473
-msgid "Pounce when buddy is typing to you"
-msgstr "�舒�从仂�亳 从舒亟舒 亟��亞舒� 仗仂�仆亠 亟舒 �亳 仗亳�亠"
-
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/pounce.c:483
-msgid "Pounce Action"
-msgstr "丼亳仄亠 亰舒�从仂�亳�亳"
-
-#: src/pounce.c:494
-msgid "Open IM Window"
-msgstr "��亰仂仄 仗仂��从仂仄"
-
-#: src/pounce.c:503
-msgid "Popup Notification"
-msgstr "�弍舒于亠��亠�亠 亟舒 亳�从仂�亳"
-
-#: src/pounce.c:534
-msgid "Execute command on pounce"
-msgstr "�亰于��亳 仆舒�亠亟弍� 仗�亳 亰舒�从仂从�"
-
-#: src/pounce.c:557
-msgid "Play sound on pounce"
-msgstr "����亳 亰于�从 仗�亳 亰舒�从仂从�"
-
-#. </pounce type="action">
-#: src/pounce.c:580
-msgid "Save this pounce after activation"
-msgstr "弌仆亳仄亳 仂于舒� 亰舒�从仂从 仗仂�仍亠 仗仂从�亠�舒�舒"
-
-#: src/pounce.c:600
-msgid "_Save"
-msgstr "_弌仆亳仄亳"
-
-#: src/pounce.c:606
-msgid "C_ancel"
-msgstr "��从_舒亢亳"
-
-#~ msgid "Remove From Roster"
-#~ msgstr "丕从仍仂仆亳 �舒 �仗亳�从舒"
-
-#~ msgid "IM Image"
-#~ msgstr "弌仍舒�亠 �仍亳从亠"
-
-#~ msgid "Stocks"
-#~ msgstr "�亠�亰舒"
-
-#~ msgid "Get Capabilities"
-#~ msgstr "弌舒亰仆舒��亠 仄仂亞��仆仂��亳"
-
-#~ msgid "/Buddies/sep1"
-#~ msgstr "/���亞舒�亳/�舒亰亟1"
-
-#~ msgid "/Buddies/sep2"
-#~ msgstr "/���亞舒�亳/�舒亰亟2"
-
-#~ msgid "/Tools/Preferences"
-#~ msgstr "/�仍舒�亳/_�仂��舒于从亠"
-
-#~ msgid "/Tools/sep2"
-#~ msgstr "/�仍舒�亳/�舒亰亟2"
-
-#~ msgid "Buttons"
-#~ msgstr "��亞仄亳�亳"
-
-#~ msgid "_Hide IM/Info/Chat buttons"
-#~ msgstr "_弌舒从�亳� 亟�亞仄亳�亠 亰舒 弍�亰亠 仗仂��从亠/仗仂亟舒�从亠/�舒亰亞仂于仂�"
-
-#~ msgid "Show _pictures on buttons"
-#~ msgstr "��亳从舒亢亳 �_仍亳从亠 仆舒 亟�亞仄亳�亳仄舒"
+msgstr "�_亰仍舒亰"
+
+#~ msgid "Custom"
+#~ msgstr "��亳仍舒亞仂�亠仆仂"
+
+#~ msgid "Buddy"
+#~ msgstr "���亞舒�"
+
+#~ msgid "[no message]"
+#~ msgstr "[仆亠仄舒 仗仂��从舒]"
+
+#~ msgid "[Click to edit]"
+#~ msgstr "[�仍亳从仆亳�亠 亟舒 ��亠亟亳�亠]"
+
+#~ msgid "Account"
+#~ msgstr "�舒仍仂亞"
+
+#~ msgid "Pounce on sign on"
+#~ msgstr "�舒�从仂�亳 仗�亳 仗�亳�舒于亳"
+
+#~ msgid "Pounce when buddy is typing to you"
+#~ msgstr "�舒�从仂�亳 从舒亟舒 亟��亞舒� 仗仂�仆亠 亟舒 �亳 仗亳�亠"
+
+#~ msgid "_Save"
+#~ msgstr "_弌仆亳仄亳"
+
+#~ msgid "C_ancel"
+#~ msgstr "��从_舒亢亳"