changeset 7885:ec9a1e76581c

[gaim-migrate @ 8543] sr updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 15 Dec 2003 16:32:07 +0000 (2003-12-15)
parents 71354edf06d7
children 818835fb55cc
files ChangeLog po/sr.po po/sr@Latn.po
diffstat 3 files changed, 3334 insertions(+), 2948 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 15 02:07:03 2003 +0000
+++ b/ChangeLog	Mon Dec 15 16:32:07 2003 +0000
@@ -15,6 +15,8 @@
 	* Italian translation updated (Claudio Satriano)
 	* Portuguese (Brazilian) translation updated (Mauricio de Lemos
 	  Rodrigues Collares Neto)
+	* Serbian translation updated (Danilo Segan)
+	* Serbian Latin translation updated (Danilo Segan)
 	* Swedish translation updated (Tore Lundqvist (luntor))
 	* Vietnamese translation updated (T.M.Thanh)
 
--- a/po/sr.po	Mon Dec 15 02:07:03 2003 +0000
+++ b/po/sr.po	Mon Dec 15 16:32:07 2003 +0000
@@ -9,14 +9,15 @@
 msgstr ""
 "Project-Id-Version: gaim 0.73\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-15 12:57-0500\n"
-"PO-Revision-Date: 2003-11-15 19:15+0100\n"
+"POT-Creation-Date: 2003-12-15 00:00-0500\n"
+"PO-Revision-Date: 2003-12-15 10:43+0100\n"
 "Last-Translator: �舒仆亳仍仂 丿亠亞舒仆 <dsegan@gmx.net>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. *< api_version
 #. *< type
@@ -83,9 +84,11 @@
 "will use what used to be the built-in order active->idle->away->away+idle-"
 ">offline."
 msgstr ""
-"���亞舒� �舒 仆舒�仄舒�亳仄 �亠亰�仍�舒�仂仄 �亠 亟��亞舒� 从仂�亳 �亠 亳仄舒�亳 仗�于亠仆��于仂 亰舒 ���仗舒�亠 � 于亠亰�.\n"
+"���亞舒� �舒 仆舒�仄舒�亳仄 �亠亰�仍�舒�仂仄 �亠 亟��亞舒� 从仂�亳 �亠 亳仄舒�亳 仗�于亠仆��于仂 亰舒 ���仗舒�亠 � "
+"于亠亰�.\n"
 "�仂亟�舒亰�仄亠于舒仆亠 于�亠亟仆仂��亳 (仆亠仗仂于亠亰舒仆 = 4, 仂亟���舒仆 = 2 亳 仄亳�舒仆 = 1)\n"
-"�亠 从仂�亳��亳�亳 仂仆仂 ��仂 �亠 弍亳仍仂 �亞�舒�亠仆 �舒�仗仂�亠亟 舒从�亳于舒仆->仄亳�舒仆->仂亟���舒仆->仂亟���舒仆+仄亳�舒仆->仆亠仗仂于亠亰舒仆."
+"�亠 从仂�亳��亳�亳 仂仆仂 ��仂 �亠 弍亳仍仂 �亞�舒�亠仆 �舒�仗仂�亠亟 舒从�亳于舒仆->仄亳�舒仆->仂亟���舒仆-"
+">仂亟���舒仆+仄亳�舒仆->仆亠仗仂于亠亰舒仆."
 
 #: plugins/contact_priority.c:142
 msgid "Point values to use for Account..."
@@ -115,7 +118,9 @@
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
-msgstr "�仂亰于仂�舒于舒 亳亰仄亠仆� 于�亠亟仆仂��亳 仗仂亠仆舒 亰舒 仄亳�仆舒/仂亟���仆舒/仆亠仗仂于亠亰舒仆舒 ��舒�舒 亟��亞舒�舒 仗�亳 �舒��仆舒�� 仗�于亠仆��于舒 从仂仆�舒从�舒."
+msgstr ""
+"�仂亰于仂�舒于舒 亳亰仄亠仆� 于�亠亟仆仂��亳 仗仂亠仆舒 亰舒 仄亳�仆舒/仂亟���仆舒/仆亠仗仂于亠亰舒仆舒 ��舒�舒 亟��亞舒�舒 "
+"仗�亳 �舒��仆舒�� 仗�于亠仆��于舒 从仂仆�舒从�舒."
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
@@ -132,7 +137,7 @@
 msgid "Gaim - Away"
 msgstr "�舒亳仄 �� �亟���舒仆"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1769
 msgid "Auto-login"
 msgstr "���仂仄舒��从舒 仗�亳�舒于舒"
 
@@ -148,12 +153,12 @@
 msgid "New..."
 msgstr "�仂于舒..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2313 src/gtkpounce.c:411
-#: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:5534
-#: src/protocols/oscar/oscar.c:6135
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2530 src/gtkpounce.c:411
+#: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
+#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:6163
 msgid "Away"
 msgstr "�亟���舒仆"
 
@@ -165,16 +170,16 @@
 msgid "Mute Sounds"
 msgstr "��从���亳 亰于�从"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:581
 msgid "File Transfers"
 msgstr "��亠仆仂�亳 亟舒�仂�亠从舒"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1928 src/main.c:323
 msgid "Accounts"
 msgstr "�舒仍仂亰亳"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2331 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2333 src/main.c:329
 msgid "Preferences"
 msgstr "�仂��舒于从亠"
 
@@ -233,14 +238,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:223
 msgid "Gaim File Control"
 msgstr "�仂仆��仂仍舒 �舒亳仄-舒 亟舒�仂�亠从仂仄"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "�仄仂亞��舒于舒 �舒仄 亟舒 �仗�舒于�舒�亠 �舒亳仄仂仄 �仆仂�仂仄 仆舒�亠亟弍亳 � 亟舒�仂�亠从�."
 
@@ -267,19 +272,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:715
 msgid "Remote Control"
 msgstr "丕亟舒�亠仆仂 �仗�舒于�舒�亠"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:718
 msgid "Provides remote control for gaim applications."
 msgstr "�仄仂亞��舒于舒 �亟舒�亠仆仂 �仗�舒于�舒�亠 �舒亳仄 仗�仂亞�舒仄亳仄舒."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:720
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -294,19 +299,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "�舒亳仄 亟仂亟舒�舒从 亰舒 仗�亳仄亠�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr "��亳仄亠� 亟仂亟舒�从舒 从仂�亳 �舒亟亳 仆亠从亠 ��于舒�亳 �� 于亳亟亠�亳 仂仗亳�."
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -371,50 +376,19 @@
 "�仂于��亳�亠 亞仂�亠 亳 仂仆亟舒 仆舒 仍亠于仂 亟舒 仗�亠�亠�亠 仆舒 仗�亠��仂亟仆亳 �舒亰亞仂于仂�.\n"
 "�仂于��亳�亠 亞仂�亠 亳 仂仆亟舒 仆舒 亟亠�仆仂 亟舒 仗�亠�亠�亠 仆舒 �仍亠亟亠�亳 �舒亰亞仂于仂�."
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "�仂��舒于从亠 仗�舒�亠�舒 弍亠�亰亠"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "丕�亠��舒仍仂�� 仂�于亠亢舒于舒�舒 � 仄亳仆��亳仄舒"
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "丕仆亠�亳�亠 �亳仄弍仂仍亠 �舒亰亟于仂�亠仆亠 仗仂仄仂�� ��+�� � 仗仂�亠 亳�仗仂亟."
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "丕从���亳�亠 仂于� 仂仗�亳�� 亰舒 仗�亳从舒亰 �舒仄仂 �亳仄弍仂仍舒 亳 �亠仆亠:"
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "丕从���亳�亠 仂于� 仂仗�亳�� 亰舒 仗仂仄亠�舒�亠 � 仍亠于舒 仆舒 亟亠�仆仂:"
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(�亠仄舒"
-
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "亳亰仄亠仆亠"
-
-#: plugins/history.c:65
+#: plugins/history.c:74
 msgid "History"
 msgstr "���仂�亳�舒�"
 
-#: plugins/history.c:67
+#: plugins/history.c:76
 msgid "Shows recently logged conversations in new conversations."
 msgstr "��亳从舒亰��亠 仗仂�仍亠亟�亠 亰舒弍亠仍亠亢亠仆亠 �舒亰亞仂于仂�亠 仄亠�� 仆仂于亳仄 �舒亰亞仂于仂�亳仄舒."
 
-#: plugins/history.c:68
-msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
-msgstr ""
-"�舒亟舒 �亠 仗仂从�亠仆亠 仆仂于亳 �舒亰亞仂于仂�, 仂于舒� 亟仂亟舒�舒从 �亠 �弍舒�亳�亳 仗仂�仍亠亟�亳� � 仍亳仆亳�舒 亳亰 "
-"仗仂�仍亠亟�亠亞 �舒亰亞仂于仂�舒 � �亠从��亳 �舒亰亞仂于仂�."
+#: plugins/history.c:77
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr "�舒亟舒 �亠 仗仂从�亠仆亠 仆仂于亳 �舒亰亞仂于仂�, 仂于舒� 亟仂亟舒�舒从 �亠 �弍舒�亳�亳 仗仂�仍亠亟�亳 �舒亰亞仂于仂� � �亠从��亳."
 
 #. *< api_version
 #. *< type
@@ -640,6 +614,56 @@
 "�弌�, ��丶, 丐�丶). ��亳�亳�仆亳�亠 ���仆�亠��� � 仗仂�� 亰舒 �仆仂� 亰舒 �仍舒�亠. ��舒�亳�亠 仗�仂亰仂� "
 "亰舒 亞�亠�从亠."
 
+#: plugins/relnot.c:62
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "�仂�亳��亳�亠 亳亰亟舒�亠 �舒亳仄舒 %s.  丐亠从��亠 亳亰亟舒�亠 �亠 %s.<hr>"
+
+#: plugins/relnot.c:68
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>�仆亠于仆亳从 仗�仂仄亠仆舒:</b>\n"
+"%s<br><br>"
+
+#: plugins/relnot.c:73
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr "�仂亢亠�亠 仆舒弍舒于亳�亳 亳亰亟舒�亠 %s �舒:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+
+#: plugins/relnot.c:77 plugins/relnot.c:78
+msgid "New Version Available"
+msgstr "�仂于仂 亳亰亟舒�亠 �亠 亟仂���仗仆仂"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/relnot.c:134
+msgid "Release Notification"
+msgstr "�弍舒于亠��亠�亠 仂 亳亰亟舒��"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/relnot.c:137
+msgid "Checks periodically for new releases."
+msgstr "��仂于亠�舒于舒 仗仂于�亠仄亠仆仂 亰舒 仆仂于舒 亳亰亟舒�舒."
+
+#. *  description
+#: plugins/relnot.c:139
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr "��仂于亠�舒于舒 仗仂于�亠仄亠仆仂 亰舒 仆仂于舒 亳亰亟舒�舒 亳 仂弍舒于亠��舒于舒 从仂�亳�仆亳从舒 �亰 亟仆亠于仆亳从 仗�仂仄亠仆舒."
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -715,14 +739,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:197
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:200 plugins/ssl/ssl-gnutls.c:202
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "�弍亠亰弍亠���亠 弌弌� 仗仂亟��从� 从�仂亰 GNUTLS."
 
@@ -733,14 +757,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:296
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:299 plugins/ssl/ssl-nss.c:301
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "�弍亠亰弍亠���亠 弌弌� 仗仂亟��从� 从�仂亰 �仂亰亳仍亳仆 NSS."
 
@@ -804,11 +828,11 @@
 "�弍舒于亠��舒于舒 � 仗�仂亰仂�� �舒亰亞仂于仂�舒 从舒亟舒 亟��亞舒� 仂亟亠 仆舒 亳仍亳 �亠 于�舒�亳 �舒 仂亟����于舒 "
 "亳仍亳 仆亠舒从�亳于仆仂��亳."
 
-#: plugins/tcl/tcl.c:344
+#: plugins/tcl/tcl.c:348
 msgid "Tcl Plugin Loader"
 msgstr "丕�亳�舒于舒�亠 Tcl 亟仂亟舒�舒从舒"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
 msgid "Provides support for loading Tcl plugins"
 msgstr "�仄仂亞��舒于舒 仗仂亟��从� 亰舒 ��亳�舒于舒�亠 Tcl 亟仂亟舒�舒从舒."
 
@@ -927,8 +951,8 @@
 msgstr "_�仂从�亠仆亳 �舒亳仄 仗�亳 仗仂从�亠�舒�� �亳仆亟仂��舒."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2150
-#: src/gtkprefs.c:2264
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2364
+#: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "弌仗亳�舒从 亟��亞舒�舒"
 
@@ -947,8 +971,8 @@
 msgstr "_�亟�亢舒于舒� 仗�仂亰仂� �舒 �仗亳�从仂仄 亟��亞舒�舒 仆舒 于���"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:880
-#: src/gtkprefs.c:2265
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:882
+#: src/gtkprefs.c:2267
 msgid "Conversations"
 msgstr "�舒亰亞仂于仂�亳"
 
@@ -1015,160 +1039,171 @@
 msgid "Crazy Patch Writers"
 msgstr "��亟亳 仗亳��亳 亳�仗�舒于从亳"
 
-#: src/about.c:145
+#: src/about.c:138
 msgid "Retired Developers"
 msgstr "�亠仆亰亳仂仆亳�舒仆亳 仗�仂亞�舒仄亠�亳"
 
-#: src/about.c:146
+#: src/about.c:139
 msgid "former libfaim maintainer"
 msgstr "仗�亠��仂亟仆亳 仂亟�亢舒于舒仍舒� libfaim-舒"
 
-#: src/about.c:147
+#: src/about.c:140
 msgid "former lead developer"
 msgstr "弍亳于�亳 亞仍舒于仆亳 仗�仂亞�舒仄亠�"
 
-#: src/about.c:150
+#: src/about.c:143
 msgid "former maintainer"
 msgstr "弍亳于�亳 仂亟�亢舒于舒仍舒�"
 
-#: src/about.c:151
+#: src/about.c:144
 msgid "former Jabber developer"
 msgstr "弍亳于�亳 �舒弍亠� 仗�仂亞�舒仄亠�"
 
-#: src/about.c:152
+#: src/about.c:145
 msgid "original author"
 msgstr "仗�于亳 舒��仂�"
 
-#: src/about.c:155
+#: src/about.c:148
 msgid "hacker and designated driver [lazy bum]"
 msgstr "�舒从亠� 亳 仂亟�亠�亠仆亳 仗仂从�亠�舒� [仍亠�舒 弍�弍舒]"
 
-#: src/about.c:163
+#: src/about.c:156
 msgid "Current Translators"
 msgstr "丐亠从��亳 仗�亠于仂亟亳仂�亳"
 
-#: src/about.c:164 src/about.c:195
+#: src/about.c:157 src/about.c:190
 msgid "Catalan"
-msgstr "�舒�舒仍仂仆�从亳"
-
-#: src/about.c:165 src/about.c:196
+msgstr "从舒�舒仍仂仆�从亳"
+
+#: src/about.c:158 src/about.c:191
 msgid "Czech"
-msgstr "丼亠�从亳"
+msgstr "�亠�从亳"
+
+#: src/about.c:159
+msgid "Danish"
+msgstr "亟舒仆�从亳"
+
+#: src/about.c:160
+msgid "British English"
+msgstr "弍�亳�舒仆�从亳 亠仆亞仍亠�从亳"
+
+#: src/about.c:161 src/about.c:192
+msgid "German"
+msgstr "仆亠仄舒�从亳"
+
+#: src/about.c:162 src/about.c:193
+msgid "Spanish"
+msgstr "�仗舒仆�从亳"
+
+#: src/about.c:163 src/about.c:194
+msgid "Finnish"
+msgstr "�亳仆�从亳"
+
+#: src/about.c:164 src/about.c:195
+msgid "French"
+msgstr "��舒仆���从亳"
+
+#: src/about.c:165
+msgid "Hindi"
+msgstr "�亳仆亟�"
 
 #: src/about.c:166
-msgid "Danish"
-msgstr "�舒仆�从亳"
+msgid "Hungarian"
+msgstr "仄舒�舒��从亳"
 
 #: src/about.c:167 src/about.c:197
-msgid "German"
-msgstr "�亠仄舒�从亳"
-
-#: src/about.c:168 src/about.c:198
-msgid "Spanish"
-msgstr "丿仗舒仆�从亳"
+msgid "Italian"
+msgstr "亳�舒仍亳�舒仆�从亳"
+
+#: src/about.c:168 src/about.c:199
+msgid "Korean"
+msgstr "从仂�亠��从亳"
 
 #: src/about.c:169
-msgid "Finnish"
-msgstr "个亳仆�从亳"
-
-#: src/about.c:170 src/about.c:199
-msgid "French"
-msgstr "个�舒仆���从亳"
-
-#: src/about.c:171
-msgid "Hindi"
-msgstr "丱亳仆亟�"
+msgid "Dutch; Flemish"
+msgstr "�仂仍舒仆亟�从亳; �仍舒仄舒仆�从亳"
+
+#: src/about.c:170
+msgid "Norwegian"
+msgstr "仆仂�于亠�从亳"
+
+#: src/about.c:171 src/about.c:200
+msgid "Polish"
+msgstr "仗仂��从亳"
 
 #: src/about.c:172
-msgid "Hungarian"
-msgstr "�舒�舒��从亳"
-
-#: src/about.c:173 src/about.c:201
-msgid "Italian"
-msgstr "��舒仍亳�舒仆�从亳"
-
-#: src/about.c:174 src/about.c:203
-msgid "Korean"
-msgstr "�仂�亠��从亳"
-
-#: src/about.c:175
-msgid "Dutch; Flemish"
-msgstr "丱仂仍舒仆亟�从亳; 个仍舒仄舒仆�从亳"
+msgid "Portuguese"
+msgstr "仗仂���亞舒仍�从亳"
+
+#: src/about.c:173
+msgid "Portuguese-Brazil"
+msgstr "仗仂���亞舒仍�从亳 � ��舒亰亳仍�"
+
+#: src/about.c:174
+msgid "Romanian"
+msgstr "��仄�仆�从亳"
+
+#: src/about.c:175 src/about.c:201
+msgid "Russian"
+msgstr "���从亳"
 
 #: src/about.c:176
-msgid "Norwegian"
-msgstr "�仂�于亠�从亳"
-
-#: src/about.c:177 src/about.c:204
-msgid "Polish"
-msgstr "�仂��从亳"
+msgid "Serbian"
+msgstr "��仗�从亳"
+
+#: src/about.c:177 src/about.c:203
+msgid "Swedish"
+msgstr "�于亠亟�从亳"
 
 #: src/about.c:178
-msgid "Portuguese"
-msgstr "�仂���亞舒仍�从亳"
+msgid "Vietnamese"
+msgstr "于亳�亠�仆舒仄�从亳"
+
+#: src/about.c:178
+msgid "Gnome Vi Team"
+msgstr "�亳�亠�仆舒仄�从亳 �仆仂仄 �亳仄"
 
 #: src/about.c:179
-msgid "Portuguese-Brazil"
-msgstr "�仂���亞舒仍�从亳 � ��舒亰亳仍�"
+msgid "Simplified Chinese"
+msgstr "�仗�仂��亠仆亳 从亳仆亠�从亳"
 
 #: src/about.c:180
-msgid "Romanian"
-msgstr "��仄�仆�从亳"
-
-#: src/about.c:181 src/about.c:205
-msgid "Russian"
-msgstr "���从亳"
-
-#: src/about.c:182
-msgid "Serbian"
-msgstr "弌�仗�从亳"
-
-#: src/about.c:183 src/about.c:207
-msgid "Swedish"
-msgstr "丿于亠亟�从亳"
-
-#: src/about.c:184
-msgid "Simplified Chinese"
-msgstr "�仂�亠亟仆仂��舒于�亠仆亳 从亳仆亠�从亳"
-
-#: src/about.c:185
 msgid "Traditional Chinese"
-msgstr "丐�舒亟亳�亳仂仆舒仍仆亳 从亳仆亠�从亳"
-
-#: src/about.c:192
+msgstr "��舒亟亳�亳仂仆舒仍仆亳 从亳仆亠�从亳"
+
+#: src/about.c:187
 msgid "Past Translators"
 msgstr "��亠��仂亟仆亳 仗�亠于仂亟亳仂�亳"
 
-#: src/about.c:193
+#: src/about.c:188
 msgid "Amharic"
-msgstr "�仄�舒��从亳"
-
-#: src/about.c:194
+msgstr "舒仄�舒��从亳"
+
+#: src/about.c:189
 msgid "Bulgarian"
-msgstr "��亞舒��从亳"
-
-#: src/about.c:200
+msgstr "弍�亞舒��从亳"
+
+#: src/about.c:196
 msgid "Hebrew"
-msgstr "丱亠弍�亠��从亳"
+msgstr "�亠弍�亠��从亳"
+
+#: src/about.c:198
+msgid "Japanese"
+msgstr "�舒仗舒仆�从亳"
 
 #: src/about.c:202
-msgid "Japanese"
-msgstr "�舒仗舒仆�从亳"
-
-#: src/about.c:206
 msgid "Slovak"
-msgstr "弌仍仂于舒�从亳"
-
-#: src/about.c:208
+msgstr "�仍仂于舒�从亳"
+
+#: src/about.c:204
 msgid "Chinese"
-msgstr "�亳仆亠�从亳"
-
-#: src/about.c:221 src/dialogs.c:2190 src/gtkrequest.c:205
-#: src/protocols/msn/msn.c:247
+msgstr "从亳仆亠�从亳"
+
+#: src/about.c:217 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "�舒�于仂�亳"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:980
+#: src/account.c:275 src/protocols/jabber/jabber.c:978
 msgid "New passwords do not match."
 msgstr "�仂于亠 仍仂亰亳仆从亠 �亠 仆亠 仗仂从仍舒仗舒��."
 
@@ -1193,62 +1228,60 @@
 msgid "Change password for %s"
 msgstr "�亰仄亠仆舒 仍仂亰亳仆从亠 亰舒 %s"
 
-#: src/account.c:331
+#: src/account.c:333
 msgid "Please enter your current password and your new password."
 msgstr "丕仆亠�亳�亠 �亠从��� 仍仂亰亳仆从� 亳 仆仂于� 仍仂亰亳仆从�."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:334 src/connection.c:193 src/dialogs.c:1730
-#: src/dialogs.c:1747 src/dialogs.c:1790 src/gtkblist.c:1512
-#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:1025
+#: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
+#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1730
+#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:6185 src/protocols/oscar/oscar.c:6281
-#: src/protocols/oscar/oscar.c:6330 src/protocols/oscar/oscar.c:6412
-#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
+#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6213 src/protocols/oscar/oscar.c:6309
+#: src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6440
+#: src/protocols/yahoo/yahoo.c:2380 src/protocols/yahoo/yahoo.c:2388
+#: src/request.h:852
 msgid "OK"
 msgstr "丕 �亠亟�"
 
-#. Cancel button.
-#: src/account.c:335 src/account.c:369 src/buddy_chat.c:375
-#: src/connection.c:194 src/dialogs.c:467 src/dialogs.c:479 src/dialogs.c:492
-#: src/dialogs.c:513 src/dialogs.c:898 src/dialogs.c:1564 src/dialogs.c:1731
-#: src/dialogs.c:1748 src/dialogs.c:1791 src/dialogs.c:1907
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1513
-#: src/gtkblist.c:3452 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1334
+#: src/dialogs.c:1493 src/dialogs.c:1510 src/dialogs.c:1529
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
+#: src/gtkblist.c:3670 src/gtkconn.c:148 src/gtkprivacy.c:568
 #: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
-#: src/gtkrequest.c:203 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:657
-#: src/protocols/jabber/jabber.c:1026 src/protocols/msn/msn.c:182
+#: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
 #: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
-#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6013 src/protocols/oscar/oscar.c:6186
-#: src/protocols/oscar/oscar.c:6282 src/protocols/oscar/oscar.c:6331
-#: src/protocols/oscar/oscar.c:6396 src/protocols/oscar/oscar.c:6413
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2233
-#: src/request.h:852 src/request.h:862
+#: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2457
+#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2537
+#: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
+#: src/protocols/oscar/oscar.c:6424 src/protocols/oscar/oscar.c:6441
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2381
+#: src/protocols/yahoo/yahoo.c:2389 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "��从舒亢亳"
 
-#: src/account.c:361
+#: src/account.c:363
 #, c-format
 msgid "Change user information for %s"
 msgstr "�亰仄亠仆亳 仗仂亟舒�从亠 仂 从仂�亳�仆亳从� 亰舒 %s"
 
-#: src/account.c:368 src/dialogs.c:894 src/dialogs.c:1552 src/dialogs.c:2199
-#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:511
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:370 src/dialogs.c:1322 src/gtkrequest.c:202
+#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "弌舒��于舒�"
 
 #: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "�舒亳仄 �� �亟���舒仆!"
+msgid "Away!"
+msgstr "�亟���舒仆!"
 
 #: src/away.c:269
 msgid "I'm Back!"
@@ -1266,16 +1299,16 @@
 msgid "Set All Away"
 msgstr "�仂��舒于亳 仂亟����于仂 亰舒 �于亠"
 
-#: src/blist.c:550 src/gtkprefs.c:2267
+#: src/blist.c:566 src/gtkprefs.c:2269
 msgid "Chats"
 msgstr "�舒亰亞仂于仂�亳"
 
-#: src/blist.c:645 src/blist.c:833 src/blist.c:2041 src/gtkblist.c:2930
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1159
+#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3146
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "���亞舒�亳"
 
-#: src/blist.c:1133
+#: src/blist.c:1148
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1293,51 +1326,53 @@
 "%d 亟��亞舒�舒 亳亰 亞��仗亠 %s 仆亳�亠 �从仍仂�亠仆仂 仗仂��仂 �亳�仂于亳 仆舒仍仂亰亳 仆亳�� 仗�亳�舒于�亠仆亳. "
 "�于亳 亟��亞舒�亳 亳 �亳�仂于舒 亞��仗舒 仆亳�� �从仍仂�亠仆亳.\n"
 
-#: src/blist.c:1142
+#: src/blist.c:1157
 msgid "Group not removed"
 msgstr "���仗舒 仆亳�亠 �从仍仂�亠仆舒"
 
-#: src/blist.c:1192 src/gtkaccount.c:159 src/gtkutils.c:841
-#: src/protocols/jabber/auth.c:110 src/protocols/jabber/buddy.c:563
+#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:847
+#: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "�亠仗仂亰仆舒�仂"
 
-#: src/blist.c:1515
+#: src/blist.c:1530
 msgid "Invalid Groupname"
 msgstr "�亠亳�仗�舒于舒仆 仆舒亰亳于 亞��仗亠"
 
-#: src/blist.c:2158
+#: src/blist.c:2180
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "�仂�仍仂 �亠 亟仂 亞�亠�从亠 仗�亳 仂弍�舒亟亳 �仗亳�从舒 亟��亞舒�舒. 弌仗亳�舒从 仆亳�亠 ��亳�舒仆."
 
-#: src/blist.c:2160
+#: src/blist.c:2182
 msgid "Buddy List Error"
 msgstr "��亠�从舒 � �仗亳�从� 亟��亞舒�舒"
 
-#: src/buddy_chat.c:316 src/gtkblist.c:3344
+#: src/buddy_chat.c:212 src/gtkblist.c:3560
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 "丐�亠仆��仆仂 仆亳��亠 仗仂于亠亰舒仆亳 仆亳�亳 仆舒 �亠亟舒仆 仗�仂�仂从仂仍 从仂�亳 仂仄仂亞��舒于舒 �舒亰亞仂于仂�亠."
 
-#: src/buddy_chat.c:330
-msgid "Join Chat"
+#: src/buddy_chat.c:223
+msgid "Join a Chat"
 msgstr "��亳从���亳 �亠 �舒亰亞仂于仂��"
 
-#: src/buddy_chat.c:336
-msgid "Buddy Chat"
-msgstr "�舒亰亞仂于仂� �舒 亟��亞舒�仂仄"
-
-#: src/buddy_chat.c:346
-msgid "Join Chat As:"
-msgstr "��亳从���亳 �亠 �舒亰亞仂于仂�� 从舒仂:"
-
-#. Join button.
-#: src/buddy_chat.c:369
-msgid "Join"
-msgstr "��亳从���亳 �亠"
+#: src/buddy_chat.c:225 src/gtkblist.c:924
+msgid "_Join"
+msgstr "_��亳从���亳 �亠"
+
+#: src/buddy_chat.c:242
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "丕仆亠�亳�亠 仗仂亟舒�从亠 仂 �舒亰亞仂于仂�� 从仂�亠仄 亢亠仍亳�亠 亟舒 �亠 仗�亳从���亳�亠.\n"
+
+#: src/buddy_chat.c:253 src/dialogs.c:589 src/dialogs.c:664
+#: src/gtkpounce.c:358
+msgid "_Account:"
+msgstr "_�舒仍仂亞:"
 
 #: src/connection.c:117 src/connection.c:165
 #, c-format
@@ -1357,75 +1392,75 @@
 msgid "Enter password for %s"
 msgstr "丕仆亠�亳�亠 仍仂亰亳仆从� 亰舒 %s"
 
-#: src/conversation.c:324
+#: src/conversation.c:327
 msgid "Unable to send message. The message is too large."
 msgstr "�亠 仄仂亞� 亟舒 仗仂�舒�亠仄 仗仂��从�. �仂��从舒 �亠 仗�亠于亠仍亳从舒."
 
-#: src/conversation.c:332
+#: src/conversation.c:335
 msgid "Unable to send message."
 msgstr "�亠 仄仂亞� 亟舒 仗仂�舒�亠仄 仗仂��从�."
 
-#: src/conversation.c:1907
+#: src/conversation.c:1916
 #, c-format
 msgid "%s entered the room."
 msgstr "%s �亠 ��舒仂(仍舒) � 仗�亳�舒仂仆亳��."
 
-#: src/conversation.c:1910
+#: src/conversation.c:1919
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] �亠 ��舒仂(仍舒) � 仗�亳�舒仂仆亳��."
 
-#: src/conversation.c:1995
+#: src/conversation.c:2004
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �亠 仗�仂仄亠仆亳仂(仍舒) 亳仄亠 � %s"
 
-#: src/conversation.c:2037
+#: src/conversation.c:2046
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s �亠 仆舒仗���亳仂(仍舒) 仗�亳�舒仂仆亳�� (%s)."
 
-#: src/conversation.c:2039
+#: src/conversation.c:2048
 #, c-format
 msgid "%s left the room."
 msgstr "%s �亠 仆舒仗���亳仂(仍舒) 仗�亳�舒仂仆亳��."
 
 # bug: plural-forms
-#: src/conversation.c:2112
+#: src/conversation.c:2121
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d 仗仂��从舒)"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2123
 #, c-format
 msgid " left the room (%s)."
 msgstr "仆舒仗���亳 仗�亳�舒仂仆亳�� (%s)."
 
-#: src/conversation.c:2396
+#: src/conversation.c:2405
 msgid "Last created window"
 msgstr "�仂�仍亠亟�亠 仆舒仗�舒于�亠仆亳 仗�仂亰仂�"
 
-#: src/conversation.c:2398
+#: src/conversation.c:2407
 msgid "New window"
 msgstr "�仂于亳 仗�仂亰仂�"
 
-#: src/conversation.c:2400
+#: src/conversation.c:2409
 msgid "By group"
 msgstr "��亠仄舒 亞��仗亳"
 
-#: src/conversation.c:2402
+#: src/conversation.c:2411
 msgid "By account"
 msgstr "��亠仄舒 仆舒仍仂亞�"
 
-#: src/dialogs.c:315
+#: src/dialogs.c:201
 msgid "Warn User"
 msgstr "丕仗仂亰仂�亳 从仂�亳�仆亳从舒"
 
-#: src/dialogs.c:318
+#: src/dialogs.c:204
 msgid "_Warn"
 msgstr "_丕仗仂亰仂�亳"
 
-#: src/dialogs.c:334
+#: src/dialogs.c:220
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1438,36 +1473,36 @@
 "�于仂 �亠 �于亠�舒�亳 仆亳于仂 仂弍舒亰�亳于仂��亳 亰舒 ��%s�� 亳 仂仆 亳仍亳 仂仆舒 �亠 亳仄舒�亳 ���仂亢亳�亠 "
 "仂亞�舒仆亳�亠�亠 弍�亰亳仆亠 �仍舒�舒 仗仂��从舒.\n"
 
-#: src/dialogs.c:343
+#: src/dialogs.c:229
 msgid "Warn _anonymously?"
 msgstr "丕仗仂亰仂�亳 _舒仆仂仆亳仄仆仂?"
 
-#: src/dialogs.c:350
+#: src/dialogs.c:236
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�仆仂仆亳仄仆舒 �仗仂亰仂�亠�舒 �� 仄舒�亠亞 ��亳�舒�舒.</b>"
 
-#: src/dialogs.c:463
+#: src/dialogs.c:349
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "丕从仍舒�舒�亠 %s �舒 �仗亳�从舒 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 仆舒��舒于亳�亠?"
 
-#: src/dialogs.c:465 src/dialogs.c:466
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "丕从仍仂仆亳 亟��亞舒�舒"
 
-#: src/dialogs.c:475
+#: src/dialogs.c:361
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "丕从仍舒�舒�亠 �舒亰亞仂于仂� %s �舒 �仗亳�从舒 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 仆舒��舒于亳�亠?"
 
-#: src/dialogs.c:477 src/dialogs.c:478
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "丕从仍仂仆亳 �舒亰亞仂于仂�"
 
-#: src/dialogs.c:487
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1476,12 +1511,12 @@
 "丕从仍舒�舒�亠 亞��仗� %s 亳 �于亠 �亠仆亠 �仍舒仆仂于亠 亳亰 �仗亳�从舒 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 "
 "仆舒��舒于亳�亠?"
 
-#: src/dialogs.c:490 src/dialogs.c:491
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "丕从仍仂仆亳 亞��仗�"
 
 # bug: plural-forms
-#: src/dialogs.c:508
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1490,55 +1525,41 @@
 "丕从仍舒�舒�亠 亞��仗� %s 亳 %d 仂��舒仍亳� �仍舒仆仂于舒 亳亰 �仗亳�从舒 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 "
 "仆舒��舒于亳�亠?"
 
-#: src/dialogs.c:511 src/dialogs.c:512
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "丕从仍仂仆亳 从仂仆�舒从�"
 
-#: src/dialogs.c:660
-msgid "New Message"
-msgstr "�仂于舒 仗仂��从舒"
-
-#: src/dialogs.c:678
+#: src/dialogs.c:543
+msgid "New Instant Message"
+msgstr "�仂于舒 弍�亰舒 仗仂��从舒"
+
+#: src/dialogs.c:561
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "丕仆亠�亳�亠 亳仄亠 仂�仂弍亠 从仂�仂� 亢亠仍亳�亠 亟舒 �仗��亳�亠 弍�亰� 仗仂��从�.\n"
 
-#: src/dialogs.c:694 src/dialogs.c:771
+#: src/dialogs.c:573 src/dialogs.c:648
 msgid "_Screenname:"
 msgstr "_�仄亠:"
 
-#: src/dialogs.c:709 src/dialogs.c:787 src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "_�舒仍仂亞:"
-
-#: src/dialogs.c:740
+#: src/dialogs.c:618
 msgid "Get User Info"
 msgstr "��亳弍舒于亳 仗仂亟舒�从亠 仂 从仂�亳�仆亳从�"
 
-#: src/dialogs.c:759
+#: src/dialogs.c:636
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "丕仆亠�亳�亠 亳仄亠 仂�仂弍亠 �亳�亠 仗仂亟舒�从亠 亢亠仍亳�亠 亟舒 于亳亟亳�亠.\n"
 
-#: src/dialogs.c:853 src/protocols/jabber/jabber.c:1036
-#: src/protocols/oscar/oscar.c:6481 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr "�仂��舒于亳 仗仂亟舒�从亠 仂 从仂�亳�仆亳从�"
-
-#: src/dialogs.c:862
-#, c-format
-msgid "Changing info for %s:"
-msgstr "�亠�舒仄 仗仂亟舒�从亠 亰舒 %s:"
-
-#: src/dialogs.c:977
+#: src/dialogs.c:757
 msgid "Insert Link"
-msgstr "丕弍舒�亳 于亠亰�"
-
-#: src/dialogs.c:979
-msgid "Insert"
-msgstr "丕弍舒�亳"
-
-#: src/dialogs.c:1001
+msgstr "丕仄亠�仆亳 于亠亰�"
+
+#: src/dialogs.c:759
+msgid "_Insert"
+msgstr "丕_仄亠�仆亳"
+
+#: src/dialogs.c:782
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -1546,176 +1567,102 @@
 "丕仆亠�亳�亠 �仆�亠�仆亠� 舒亟�亠�� 亳 仂仗亳� 于亠亰亠 从仂�� 亢亠仍亳�亠 亟舒 �弍舒�亳�亠. �仗亳� 仆亳�亠 "
 "仂弍舒于亠亰舒仆.\n"
 
-#: src/dialogs.c:1019 src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/jabber.c:638
-msgid "URL"
-msgstr "�仆�亠�仆亠� 舒亟�亠�舒"
-
-#: src/dialogs.c:1029 src/gtkprefs.c:601 src/gtkprefs.c:1803
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
-msgid "Description"
-msgstr "�仗亳�"
-
-#: src/dialogs.c:1165 src/dialogs.c:1182
+#: src/dialogs.c:795
+msgid "_URL:"
+msgstr "_�亟�亠�舒:"
+
+#: src/dialogs.c:808
+msgid "_Description:"
+msgstr "_�仗亳�:"
+
+#: src/dialogs.c:937 src/dialogs.c:954
 msgid "Select Text Color"
 msgstr "�亰舒弍亠�亳�亠 弍仂�� �亠从��舒"
 
-#: src/dialogs.c:1217 src/dialogs.c:1234
+#: src/dialogs.c:989 src/dialogs.c:1006
 msgid "Select Background Color"
 msgstr "�亰舒弍亠�亳�亠 弍仂�� 仗仂亰舒亟亳仆亠"
 
-#: src/dialogs.c:1319 src/dialogs.c:1345
+#: src/dialogs.c:1091 src/dialogs.c:1117
 msgid "Select Font"
 msgstr "�亰舒弍亠�亳�亠 仗亳�仄仂"
 
-#: src/dialogs.c:1411
+#: src/dialogs.c:1183
 msgid "You cannot save an away message with a blank title"
 msgstr "�亠 仄仂亢亠�亠 �仆亳仄亳�亳 仗仂��从� 亰舒 仂亟����于仂 弍亠亰 仆舒�仍仂于舒"
 
-#: src/dialogs.c:1413
+#: src/dialogs.c:1185
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "�舒于亠亟亳�亠 亳 仆舒�仍仂于 仗仂��从亠, 亳仍亳 亳亰舒弍亠�亳�亠 ���仂�亳��亳�� 亰舒 从仂�亳��亠�亠 弍亠亰 �仆亳仄舒�舒."
 
-#: src/dialogs.c:1423
+#: src/dialogs.c:1195
 msgid "You cannot create an empty away message"
 msgstr "�亠 仄仂亢亠�亠 仆舒仗�舒于亳�亳 仗�舒亰仆� 仗仂��从� 亰舒 仂亟����于仂"
 
-#: src/dialogs.c:1488 src/dialogs.c:1496
+#: src/dialogs.c:1260 src/dialogs.c:1268
 msgid "New away message"
 msgstr "�仂于舒 仗仂��从舒 亰舒 仂亟����于仂"
 
-#: src/dialogs.c:1506
+#: src/dialogs.c:1278
 msgid "Away title: "
 msgstr "�舒�仍仂于 仂亟����于舒: "
 
-#: src/dialogs.c:1556
+#: src/dialogs.c:1326
 msgid "Save & Use"
 msgstr "弌舒��于舒� 亳 从仂�亳��亳"
 
-#: src/dialogs.c:1560
+#: src/dialogs.c:1330
 msgid "Use"
 msgstr "�仂�亳��亳"
 
 #. show everything
-#: src/dialogs.c:1709
+#: src/dialogs.c:1471
 msgid "Smile!"
 msgstr "弌仄亠�舒从!"
 
-#: src/dialogs.c:1727
+#: src/dialogs.c:1489
 msgid "Alias Chat"
 msgstr "�舒亟亠仆亳 亳仄亠 �舒亰亞仂于仂��"
 
-#: src/dialogs.c:1727
-msgid "Alias chat"
-msgstr "�舒亟亠仆亳 亳仄亠 �舒亰亞仂于仂��"
-
-#: src/dialogs.c:1728
-msgid "Please enter an aliased name for this chat."
-msgstr "丕仆亠�亳�亠 仆仂于仂 亳仄亠 亰舒 仂于舒� �舒亰亞仂于仂�."
-
-#: src/dialogs.c:1744
+#: src/dialogs.c:1490
+msgid "Enter an alias for this chat."
+msgstr "丕仆亠�亳�亠 仆舒亟亳仄舒从 亰舒 仂于舒� �舒亰亞仂于仂�."
+
+#: src/dialogs.c:1506
 msgid "Alias Contact"
 msgstr "�舒亟亠仆亳 亳仄亠 从仂仆�舒从��"
 
-#: src/dialogs.c:1744
-msgid "Alias contact"
-msgstr "�舒亟亠仆亳 亳仄亠 从仂仆�舒从��"
-
-#: src/dialogs.c:1745
-msgid "Please enter an aliased name for this contact."
-msgstr "丕仆亠�亳�亠 仆仂于仂 亳仄亠 亰舒 仂于舒� 从仂仆�舒从�."
-
-#: src/dialogs.c:1776
-msgid "_Screenname"
-msgstr "_�仄亠:"
-
-#: src/dialogs.c:1781 src/gtkblist.c:838 src/gtkblist.c:931 src/gtkblist.c:937
-msgid "_Alias"
-msgstr "�_舒亟亠仆亳 亳仄亠"
-
-#: src/dialogs.c:1785
+#: src/dialogs.c:1507
+msgid "Enter an alias for this contact."
+msgstr "丕仆亠�亳�亠 仆舒亟亳仄舒从 亰舒 仂于舒� 从仂仆�舒从�."
+
+#: src/dialogs.c:1524
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "丕仆亠�亳�亠 仆舒亟亳仄舒从 亰舒 %s."
+
+#: src/dialogs.c:1526
 msgid "Alias Buddy"
 msgstr "�舒亟亠仆亳 亳仄亠 亟��亞舒��"
 
-#: src/dialogs.c:1786
-msgid "Alias buddy"
-msgstr "�舒亟亠仆亳 亳仄亠 亟��亞舒��"
-
-#: src/dialogs.c:1787
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-"丕仆亠�亳�亠 亳仄亠 从仂�亠 亢亠仍亳�亠 亟舒 仆舒亟亠仆亠�亠 亳亰舒弍�舒仆仂� 仂�仂弍亳, 亳仍亳 仗�亠亳仄亠仆���亠 仂于舒� "
-"从仂仆�舒从� � �仗亳�从� 亟��亞舒�舒."
-
-#: src/dialogs.c:1823 src/dialogs.c:1830
-#, c-format
-msgid "Couldn't write to %s."
-msgstr "�亠 仄仂亞� 亟舒 仗亳�亠仄 � %s."
-
-#: src/dialogs.c:1854
-msgid "Save Log File"
-msgstr "弌舒��于舒� 亟舒�仂�亠从� 亟仆亠于仆亳从舒"
-
-#: src/dialogs.c:1882
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr "�亠 仄仂亞� 亟舒 �从仍仂仆亳仄 亟舒�仂�亠从� %s."
-
-#: src/dialogs.c:1901
-#, c-format
-msgid "You are about to remove the log file for %s.  Do you want to continue?"
-msgstr "丕从仍舒�舒�亠 亟仆亠于仆亳从 �舒亰亞仂于仂�舒 亰舒 %s. �舒 仍亳 亢亠仍亳�亠 亟舒 仆舒��舒于亳�亠?"
-
-#: src/dialogs.c:1902 src/dialogs.c:2072
-msgid "System Log"
-msgstr "弌亳��亠仄�从亳 亟仆亠于仆亳从"
-
-#: src/dialogs.c:1903 src/dialogs.c:1905
-msgid "Remove Log"
-msgstr "丕从仍仂仆亳 亟仆亠于仆亳从"
-
-#: src/dialogs.c:1933 src/dialogs.c:2093
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr "�亠 仄仂亞� 亟舒 仂�于仂�亳仄 亟舒�仂�亠从� 亟仆亠于仆亳从舒 %s."
-
-#: src/dialogs.c:2070
-#, c-format
-msgid "Conversations with %s"
-msgstr "�舒亰亞仂于仂�亳 �舒 %s"
-
-#: src/dialogs.c:2114 src/protocols/jabber/jabber.c:643
-msgid "Date"
-msgstr "�舒��仄"
-
-#: src/dialogs.c:2171
-msgid "Log"
-msgstr "�仆亠于仆亳从 �舒亟舒"
-
-#: src/dialogs.c:2194
-msgid "Clear"
-msgstr "��亳��亳"
-
-#: src/ft.c:123
+#: src/ft.c:139
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 仆亳�亠 亳�仗�舒于舒仆 仆舒亰亳于 亟舒�仂�亠从亠.\n"
 
-#: src/ft.c:137
+#: src/ft.c:152
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 仆亳�亠 仗�仂仆舒�亠仆.\n"
 
-#: src/ft.c:693
+#: src/ft.c:754
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "��亠仆仂� 亟舒�仂�亠从亠 亟仂 %s 仗�亠从亳仆��.\n"
 
-#: src/ft.c:695
+#: src/ft.c:756
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "��亠仆仂� 亟舒�仂�亠从亠 仂亟 %s 仗�亠从亳仆��.\n"
@@ -1728,7 +1675,7 @@
 msgid "Size of the expander arrow"
 msgstr "�亠仍亳�亳仆舒 ���亠仍亳�亠 仗�仂�亳�亳于舒�舒"
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:66
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1749,11 +1696,11 @@
 "    ������:\n"
 "       -h, --help [仆舒�亠亟弍舒]     ��亳从舒亢亳 仗仂仄仂� 亰舒 仆舒�亠亟弍�\n"
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:175 src/gaim-remote.c:191
 msgid "Gaim not running (on session 0)\n"
 msgstr "�舒亳仄 仆亳�亠 仗仂从�亠仆�� (� �亠�亳�亳 0)\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:204
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1765,37 +1712,37 @@
 "needs to be escaped, or the command will stop at that point.\n"
 "Also,the following will just open a conversation window to a screenname,\n"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
-"�仂�亳��亳 ���: URI-�亳:\n"
+"丕仗仂��亠弍舒 ���-舒: 舒亟�亠�亠:\n"
 "弌仍舒�亠 弍�亰亠 仗仂��从亠 仆舒 亳仄亠:\n"
-"\tgaim-remote uri 'aim:goim?screenname=�亳仆亞于亳仆&message=�亳仆�从�+�舒���于仂'\n"
+"\tgaim-remote uri 'aim:goim?screenname=�亳仆亞于亳仆&message=��丕+�于亠�'\n"
 "丕 仂于仂仄 �仍��舒��, ���亳仆亞于亳仆�� �亠 亳仄亠 从仂�亳�仆亳从舒 从仂仄亠 �舒�亠仄仂 仗仂��从�, 舒 \n"
-"���亳仆�从� �舒���于仂�� �亠 �舒仄舒 仗仂��从舒. �仂�舒 �亠 从仂�亳��亳�亳 ��+�� �仄亠��仂 �舒亰仄舒从舒. \n"
+"����丕 �于亠��� �亠 �舒仄舒 仗仂��从舒. �仂�舒 �亠 从仂�亳��亳�亳 ��+�� �仄亠��仂 �舒亰仄舒从舒. \n"
 "�弍�舒�亳�亠 仗舒亢�� 仆舒 仆舒�亳仆 �亳�亳�舒�舒 亳亰仆舒亟 �� �从仂仍亳从仂 仂于仂 从仂�亳��亳�亠 亳亰 ���从亠, \n"
 "亰仆舒从 ��&�� �亠 仄仂�舒 亳��舒从仆��亳, 亳仍亳 �亠 仆舒�亠亟弍舒 ��舒�亳 仆舒 �仂仄 仄亠���.\n"
 "丐舒从仂�亠, �仍亠亟亠�亠 �亠 �舒仄仂 仂�于仂�亳�亳 仆仂于亳 仗�仂亰仂� 亰舒 �舒亰亞仂于仂� �舒 从仂�亳�仆亳从仂仄, \n"
 "弍亠亰 �仍舒�舒 仗仂��从亠:\n"
-"\tgaim-remote uri aim:goim?screenname=�亳仆亞于亳仆\n"
+"\tgaim-remote uri 'aim:goim?screenname=�亳仆亞于亳仆'\n"
 "\n"
 "��亳从���亳于舒�亠 �舒亰亞仂于仂��:\n"
-"\tgaim-remote uri aim:gochat?roomname=�亠仄�舒�亳仆�从�舒\n"
-"�仂仄仂�� 仂于仂亞舒 �亠 仗�亳从�����亠�亠 �仂弍亳 ���亠仄�舒�亳仆�从�舒��.\n"
+"\tgaim-remote uri 'aim:gochat?roomname=�亠仄�舒�仆�舒'\n"
+"�仂仄仂�� 仂于仂亞舒 �亠 仗�亳从�����亠�亠 �仂弍亳 ���亠仄�舒�仆�舒��.\n"
 "\n"
 "�仂亟舒于舒�亠 亟��亞舒�舒 � �舒� �仗亳�舒从 亟��亞舒�舒:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=�亳仆亞于亳仆\n"
-"�于亟亠 �舒� 仗亳�舒 亟舒 亟仂亟舒�亠 ���亳仆亞于亳仆�� � �舒� �仗亳�舒从 亟��亞舒�舒.\n"
-
-#: src/gaim-remote.c:187
+"\tgaim-remote uri 'aim:addbuddy?screenname=�亳仆亞于亳仆'\n"
+"�亳�亠�亠 �仗亳�舒仆亳 亟舒 亟仂亟舒�亠 ���亳仆亞于亳仆舒�� � �舒� �仗亳�舒从 亟��亞舒�舒.\n"
+
+#: src/gaim-remote.c:223
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1808,23 +1755,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "�舒仍亳仄, 舒仍亳 仄亠仆亠 仆亠仄舒. ��舒�亳�� �亠 �亠亟仆仂亞 亟舒仆舒, 仆亠 亰仆舒仄 仆亳 �舒 从舒亟!"
 
-#: src/gaimrc.c:373 src/gaimrc.c:1464
+#: src/gaimrc.c:373 src/gaimrc.c:1450
 msgid "boring default"
 msgstr "�仂亟�舒亰�仄亠于舒仆仂 (仆亠 �舒从仂) 亟仂�舒亟仆仂"
 
-#: src/gaimrc.c:1271 src/gtkblist.c:2111
+#: src/gaimrc.c:1259 src/gtkblist.c:2326
 msgid "Alphabetical"
 msgstr "�仂 舒亰弍��仆仂仄 �亠亟�"
 
-#: src/gaimrc.c:1273 src/gtkblist.c:2112
+#: src/gaimrc.c:1261 src/gtkblist.c:2327
 msgid "By status"
 msgstr "�仂 ��舒��"
 
-#: src/gaimrc.c:1275 src/gtkblist.c:2113
+#: src/gaimrc.c:1263 src/gtkblist.c:2328
 msgid "By log size"
 msgstr "�仂 于亠仍亳�亳仆亳 亟仆亠于仆亳从舒"
 
-#: src/gaimrc.c:1562
+#: src/gaimrc.c:1548
 #, c-format
 msgid "Could not open config file %s."
 msgstr "�亠 仄仂亞� 亟舒 仂�于仂�亳仄 亟舒�仂�亠从� %s 亰舒 仗仂��舒于从亠."
@@ -1840,7 +1787,7 @@
 "<b>�亠仍亳�亳仆舒:</b> %s\n"
 "<b>�亳仄亠仆亰亳�亠 �仍亳从亠:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3077
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3080
 msgid "Buddy Icon"
 msgstr "弌仍亳�亳�舒 亟��亞舒�舒"
 
@@ -1857,12 +1804,11 @@
 msgid "Screenname:"
 msgstr "�仄亠:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:56
+#: src/gtkaccount.c:464 src/main.c:307
 msgid "Password:"
 msgstr "�仂亰亳仆从舒:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3084 src/gtkblist.c:3403
+#: src/gtkaccount.c:469 src/gtkblist.c:3299 src/gtkblist.c:3619
 msgid "Alias:"
 msgstr "�舒亟亳仄舒从:"
 
@@ -1923,7 +1869,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1101
+#: src/gtkaccount.c:782 src/gtkprefs.c:1103
 msgid "Use Environmental Settings"
 msgstr "�仂�亳��亳 仗仂亟亠�舒于舒�舒 仂从��亢亠�舒"
 
@@ -1939,15 +1885,15 @@
 msgid "Proxy Options"
 msgstr "�仂��舒于从亠 仗�仂从�亳�舒"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1095
+#: src/gtkaccount.c:851 src/gtkprefs.c:1097
 msgid "Proxy _type:"
 msgstr "_����舒 仗�仂从�亳�舒:"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:860 src/gtkprefs.c:1127
 msgid "_Host:"
 msgstr "_弌亠�于亠�:"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:864 src/gtkprefs.c:1144
 msgid "_Port:"
 msgstr "_�仂��:"
 
@@ -1955,7 +1901,7 @@
 msgid "_Username:"
 msgstr "_�仂�亳�仆亳�从仂 亳仄亠:"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:877 src/gtkprefs.c:1179
 msgid "Pa_ssword:"
 msgstr "_�仂亰亳仆从舒:"
 
@@ -1977,7 +1923,7 @@
 msgstr "�仂从舒亢亳 仄舒�亠 仗仂��舒于从亳"
 
 #. Register button
-#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:656
+#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:650
 msgid "Register"
 msgstr "�亠亞亳����� �亠"
 
@@ -1986,31 +1932,31 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "�舒 仍亳 ��亠 �亳亞��仆亳 亟舒 亢亠仍亳�亠 仂弍�亳�舒�亳 %s?"
 
-#: src/gtkaccount.c:1621 src/gtkrequest.c:206
+#: src/gtkaccount.c:1621 src/gtkrequest.c:199
 msgid "Delete"
 msgstr "�弍�亳�亳"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1735
 msgid "Screen Name"
 msgstr "�仄亠"
 
-#: src/gtkaccount.c:1757 src/protocols/jabber/jabber.c:926
-#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4586
-#: src/protocols/oscar/oscar.c:6134 src/protocols/yahoo/yahoo.c:2032
+#: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
+#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2175
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "�舒 于亠亰亳"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1776
 msgid "Protocol"
 msgstr "��仂�仂从仂仍"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2066
 #, 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/gtkaccount.c:2079
+#: src/gtkaccount.c:2080
 msgid ""
 "\n"
 "\n"
@@ -2020,184 +1966,190 @@
 "\n"
 "�舒 仍亳 亢亠仍亳�亠 亟舒 亟仂亟舒�亠 �� 亳仍亳 �亠亞舒 � �于仂� �仗亳�舒从 亟��亞舒�舒?"
 
-#: src/gtkaccount.c:2083
-msgid "Gaim - Information"
-msgstr "�舒亳仄 �� 仗仂亟舒�亳"
-
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2084
+msgid "Information"
+msgstr "�仂亟舒�亳"
+
+#: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
-msgstr "�仂亟舒�亳 亟��亞舒�舒 � �舒� �仗亳�舒从?"
-
-#: src/gtkaccount.c:2089 src/gtkblist.c:3451 src/gtkconv.c:1258
-#: src/gtkconv.c:3149 src/gtkconv.c:4355 src/gtkrequest.c:207
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
+msgstr "�仂亟舒�亳 亟��亞舒�舒 � �仗亳�舒从?"
+
+#: src/gtkaccount.c:2090 src/gtkblist.c:3669 src/gtkconv.c:1272
+#: src/gtkconv.c:3087 src/gtkconv.c:4292 src/gtkrequest.c:200
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
 msgstr "�仂亟舒�"
 
-#: src/gtkblist.c:811
+#: src/gtkblist.c:813
 msgid "_Get Info"
 msgstr "��亳弍舒于亳 仗仂亟舒_�从亠"
 
-#: src/gtkblist.c:814
-msgid "_IM"
-msgstr "_�仂��从舒"
-
 #: src/gtkblist.c:816
-msgid "Add Buddy _Pounce"
-msgstr "�仂亟舒� _亰舒�亠亟� 亟��亞舒��"
+msgid "_IM"
+msgstr "_�仂��从舒"
 
 #: src/gtkblist.c:818
+msgid "Add Buddy _Pounce"
+msgstr "�仂亟舒� _亰舒�亠亟� 亟��亞舒��"
+
+#: src/gtkblist.c:820
 msgid "View _Log"
 msgstr "��亠亞仍亠亟 亟仆亠于仆亳_从舒"
 
-#: src/gtkblist.c:840 src/gtkblist.c:933 src/gtkblist.c:942
+#: src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
+msgid "_Alias..."
+msgstr "�_舒亟亠仆亳 亳仄亠..."
+
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:424
+#: src/gtkconn.c:460
 msgid "_Remove"
 msgstr "_丕从仍仂仆亳"
 
-#: src/gtkblist.c:912
+#: src/gtkblist.c:905
 msgid "Add a _Buddy"
 msgstr "_�仂亟舒� 亟��亞舒�舒"
 
-#: src/gtkblist.c:914
+#: src/gtkblist.c:907
 msgid "Add a C_hat"
 msgstr "�仂亟舒� _�舒亰亞仂于仂�"
 
-#: src/gtkblist.c:916
+#: src/gtkblist.c:909
 msgid "_Delete Group"
 msgstr "丕_从仍仂仆亳 亞��仗�"
 
-#: src/gtkblist.c:918
+#: src/gtkblist.c:911
 msgid "_Rename"
 msgstr "��亠_亳仄亠仆��"
 
 #: src/gtkblist.c:926
-msgid "_Join"
-msgstr "_��亳从���亳 �亠"
-
-#: src/gtkblist.c:928
 msgid "Auto-Join"
 msgstr "���仂仄舒��从舒 仗�亳�舒于舒"
 
-#: src/gtkblist.c:939 src/gtkblist.c:969
+#: src/gtkblist.c:950 src/gtkblist.c:985
 msgid "_Collapse"
 msgstr "_弌从�仗亳"
 
-#: src/gtkblist.c:974
+#: src/gtkblist.c:990
 msgid "_Expand"
 msgstr "_�舒亰亞�舒仆舒�"
 
+#: src/gtkblist.c:1389 src/gtkconv.c:3808
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "丐�亠仆��仆仂 仆亳��亠 仗�亳�舒于�亠仆亳 仆舒 仆舒仍仂亞 从仂�亳 仂仄仂亞��舒于舒 亟仂亟舒于舒�亠 �仂亞 亟��亞舒�舒."
+
 #. Buddies menu
-#: src/gtkblist.c:1462
+#: src/gtkblist.c:1680
 msgid "/_Buddies"
 msgstr "/_���亞舒�亳"
 
-#: src/gtkblist.c:1463
+#: src/gtkblist.c:1681
 msgid "/Buddies/New _Instant Message..."
 msgstr "/���亞舒�亳/_�仂于舒 弍�亰舒 仗仂��从舒..."
 
-#: src/gtkblist.c:1464
+#: src/gtkblist.c:1682
 msgid "/Buddies/Join a _Chat..."
 msgstr "/���亞舒�亳/_��亳从���亳 �亠 �舒亰亞仂于仂��..."
 
-#: src/gtkblist.c:1465
+#: src/gtkblist.c:1683
 msgid "/Buddies/Get _User Info..."
 msgstr "/���亞舒�亳/��亳弍舒于亳 仗仂亟舒�从亠 仂 _从仂�亳�仆亳从�..."
 
-#: src/gtkblist.c:1467
+#: src/gtkblist.c:1685
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/���亞舒�亳/��亳从舒亢亳 仆亠仗_仂于亠亰舒仆亠 亟��亞舒�亠"
 
-#: src/gtkblist.c:1468
+#: src/gtkblist.c:1686
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/���亞舒�亳/��亳从舒亢亳 _仗�舒亰仆亠 亞��仗亠"
 
-#: src/gtkblist.c:1469
-msgid "/Buddies/_Add a Buddy..."
+#: src/gtkblist.c:1687
+msgid "/Buddies/_Add Buddy..."
 msgstr "/���亞舒�亳/_�仂亟舒� 亟��亞舒�舒..."
 
-#: src/gtkblist.c:1470
-msgid "/Buddies/Add a C_hat..."
+#: src/gtkblist.c:1688
+msgid "/Buddies/Add C_hat..."
 msgstr "/���亞舒�亳/�仂亟舒� �舒亰亞仂_于仂�..."
 
-#: src/gtkblist.c:1471
-msgid "/Buddies/Add a _Group..."
+#: src/gtkblist.c:1689
+msgid "/Buddies/Add _Group..."
 msgstr "/���亞舒�亳/�仂亟舒� _亞��仗�..."
 
-#: src/gtkblist.c:1473
+#: src/gtkblist.c:1691
 msgid "/Buddies/_Signoff"
 msgstr "/���亞舒�亳/_�亟�舒于舒"
 
-#: src/gtkblist.c:1474
+#: src/gtkblist.c:1692
 msgid "/Buddies/_Quit"
 msgstr "/���亞舒�亳/�_亰仍舒亰"
 
 #. Tools
-#: src/gtkblist.c:1477
+#: src/gtkblist.c:1695
 msgid "/_Tools"
 msgstr "/_�仍舒�亳"
 
-#: src/gtkblist.c:1478
+#: src/gtkblist.c:1696
 msgid "/Tools/_Away"
 msgstr "/�仍舒�亳/_�亟���舒仆"
 
-#: src/gtkblist.c:1479
+#: src/gtkblist.c:1697
 msgid "/Tools/Buddy _Pounce"
 msgstr "/�仍舒�亳/_�舒�亠亟舒 亟��亞舒��"
 
-#: src/gtkblist.c:1480
+#: src/gtkblist.c:1698
 msgid "/Tools/P_rotocol Actions"
 msgstr "/�仍舒�亳/�_从�亳�亠 仗仂 仗�仂�仂从仂仍�"
 
-#: src/gtkblist.c:1482
+#: src/gtkblist.c:1700
 msgid "/Tools/A_ccounts"
 msgstr "/�仍舒�亳/_�舒仍仂亰亳"
 
-#: src/gtkblist.c:1483
-msgid "/Tools/_File Transfers..."
+#: src/gtkblist.c:1701
+msgid "/Tools/_File Transfers"
 msgstr "/�仍舒�亳/��亠仆仂�亳 _亟舒�仂�亠从舒..."
 
-#: src/gtkblist.c:1484
-msgid "/Tools/Preferences"
-msgstr "/�仍舒�亳/�仂��舒于从亠"
-
-#: src/gtkblist.c:1485
+#: src/gtkblist.c:1702
+msgid "/Tools/Pr_eferences"
+msgstr "/�仍舒�亳/_�仂��舒于从亠"
+
+#: src/gtkblist.c:1703
 msgid "/Tools/Pr_ivacy"
 msgstr "/�仍舒�亳/_��亳于舒�仆仂��"
 
-#: src/gtkblist.c:1487
+#: src/gtkblist.c:1705
 msgid "/Tools/View System _Log"
 msgstr "/�仍舒�亳/��亠亞仍亠亟 _�亳��亠仄�从仂亞 亟仆亠于仆亳从舒 �舒亟舒"
 
 #. Help
-#: src/gtkblist.c:1490
+#: src/gtkblist.c:1708
 msgid "/_Help"
 msgstr "/_�仂仄仂�"
 
-#: src/gtkblist.c:1491
+#: src/gtkblist.c:1709
 msgid "/Help/Online _Help"
 msgstr "/�仂仄仂�/�仂仄仂� 亳亰 _仗�仂亞�舒仄舒"
 
-#: src/gtkblist.c:1492
+#: src/gtkblist.c:1710
 msgid "/Help/_Debug Window"
 msgstr "/�仂仄仂�/��仂亰仂� 亰舒 仆舒仍舒亢亠�亠 _亞�亠�舒从舒"
 
-#: src/gtkblist.c:1493
+#: src/gtkblist.c:1711
 msgid "/Help/_About"
 msgstr "/�仂仄仂�/_� 仗�仂亞�舒仄�"
 
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:1727
 msgid "Rename Group"
 msgstr "��亠亳仄亠仆�� 亞��仗�"
 
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:1727
 msgid "New group name"
 msgstr "�舒亰亳于 仆仂于亠 亞��仗亠"
 
-#: src/gtkblist.c:1510
+#: src/gtkblist.c:1728
 msgid "Please enter a new name for the selected group."
 msgstr "丕仆亠�亳�亠 仆仂于亳 仆舒亰亳于 亰舒 亳亰舒弍�舒仆� 亞��仗�."
 
-#: src/gtkblist.c:1539
+#: src/gtkblist.c:1756
 #, c-format
 msgid ""
 "\n"
@@ -2206,16 +2158,16 @@
 "\n"
 "<b>�舒仍仂亞:</b> %s"
 
-#: src/gtkblist.c:1602 src/protocols/oscar/oscar.c:5514
+#: src/gtkblist.c:1817 src/protocols/oscar/oscar.c:5542
 msgid "<b>Status:</b> Offline"
 msgstr "<b>弌�舒�亠:</b> �亠仗仂于亠亰舒仆"
 
-#: src/gtkblist.c:1614
+#: src/gtkblist.c:1829
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1629
+#: src/gtkblist.c:1844
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2223,7 +2175,7 @@
 "\n"
 "<b>�舒仍仂亞:</b>"
 
-#: src/gtkblist.c:1630
+#: src/gtkblist.c:1845
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2231,7 +2183,7 @@
 "\n"
 "<b>�仂仆�舒从� 仗仂亰仆舒� 从舒仂:</b>"
 
-#: src/gtkblist.c:1631
+#: src/gtkblist.c:1846
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2239,7 +2191,7 @@
 "\n"
 "<b>�仂亰仆舒� 从舒仂:</b>"
 
-#: src/gtkblist.c:1632
+#: src/gtkblist.c:1847
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2247,7 +2199,7 @@
 "\n"
 "<b>�舒亟亳仄舒从:</b>"
 
-#: src/gtkblist.c:1633
+#: src/gtkblist.c:1848
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2255,7 +2207,7 @@
 "\n"
 "<b>�亠舒从�亳于舒仆:</b>"
 
-#: src/gtkblist.c:1634
+#: src/gtkblist.c:1849
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2263,7 +2215,7 @@
 "\n"
 "<b>丕仗仂亰仂�亠仆:</b>"
 
-#: src/gtkblist.c:1636
+#: src/gtkblist.c:1851
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2271,7 +2223,7 @@
 "\n"
 "<b>�仗亳�:</b> �舒弍仍舒�仆仂"
 
-#: src/gtkblist.c:1637
+#: src/gtkblist.c:1852
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2279,7 +2231,7 @@
 "\n"
 "<b>弌�舒�亠:</b> ��舒�仆仂"
 
-#: src/gtkblist.c:1638
+#: src/gtkblist.c:1853
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2287,85 +2239,85 @@
 "\n"
 "<b>弌�舒�亠:</b> �舒亰弍亳�舒"
 
-#: src/gtkblist.c:1906
+#: src/gtkblist.c:2121
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "�亠舒从�亳于舒仆 (%dh%02dm) "
 
-#: src/gtkblist.c:1908
+#: src/gtkblist.c:2123
 #, c-format
 msgid "Idle (%dm) "
 msgstr "�亠舒从�亳于舒仆 (%dm) "
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:2128
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "丕仗仂亰仂�亠仆 (%d%%) "
 
-#: src/gtkblist.c:1916
+#: src/gtkblist.c:2131
 msgid "Offline "
 msgstr "�亠仗仂于亠亰舒仆"
 
-#: src/gtkblist.c:2109 src/gtkprefs.c:841 src/gtkprefs.c:1495
+#: src/gtkblist.c:2324 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "�亳��舒"
 
-#: src/gtkblist.c:2177
+#: src/gtkblist.c:2391
 msgid "/Tools/Away"
 msgstr "/�仍舒�亳/�亟���舒仆"
 
-#: src/gtkblist.c:2180
+#: src/gtkblist.c:2394
 msgid "/Tools/Buddy Pounce"
 msgstr "/�仍舒�亳/�舒�亠亟舒 亟��亞舒��"
 
-#: src/gtkblist.c:2183
+#: src/gtkblist.c:2397
 msgid "/Tools/Protocol Actions"
 msgstr "/�仍舒�亳/�从�亳�亠 仗仂 仗�仂�仂从仂仍�"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2267
+#: src/gtkblist.c:2484
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/���亞舒�亳/��亳从舒亢亳 仆亠仗仂于亠亰舒仆亠 亟��亞舒�亠"
 
-#: src/gtkblist.c:2269
+#: src/gtkblist.c:2486
 msgid "/Buddies/Show Empty Groups"
 msgstr "/���亞舒�亳/��亳从舒亢亳 仗�舒亰仆亠 亞��仗亠"
 
-#: src/gtkblist.c:2287 src/gtkconv.c:1217
+#: src/gtkblist.c:2504 src/gtkconv.c:1231
 msgid "IM"
 msgstr "�仂��从舒"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2510
 msgid "Send a message to the selected buddy"
 msgstr "�仂�舒�亳 仗仂��从� 亳亰舒弍�舒仆仂仄 亟��亞舒��"
 
-#: src/gtkblist.c:2296 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2513 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "�仂亟舒�亳"
 
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2519
 msgid "Get information on the selected buddy"
 msgstr "��亳弍舒于亳 仗仂亟舒�从亠 仂 亳亰舒弍�舒仆仂仄 亟��亞舒��"
 
-#: src/gtkblist.c:2305 src/protocols/oscar/oscar.c:3086
+#: src/gtkblist.c:2522 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "�舒亰亞仂于仂�"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2527
 msgid "Join a chat room"
 msgstr "��亳从���亳 �亠 仗�亳�舒仂仆亳�亳"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2535
 msgid "Set an away message"
 msgstr "�仂��舒于亳 仗仂��从� 亰舒 仂亟����于仂"
 
-#: src/gtkblist.c:3026 src/protocols/yahoo/yahoo.c:2166
+#: src/gtkblist.c:3241 src/protocols/yahoo/yahoo.c:2307
 msgid "Add Buddy"
 msgstr "�仂亟舒� 亟��亞舒�舒"
 
-#: src/gtkblist.c:3049
+#: src/gtkblist.c:3264
 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. "
@@ -2375,24 +2327,24 @@
 "�仆亠�亳 亳 舒仍亳�舒� 亳仍亳 仆舒亟亳仄舒从 亰舒 亟��亞舒�舒. �仍亳�舒� �亠 �亠 仗�亳从舒亰亳于舒�亳 �仄亠��仂 "
 "亳仄亠仆舒, 从舒亟 亞仂亟 �亠 �仂 仄仂亞��亠.\n"
 
-#: src/gtkblist.c:3071 src/main.c:289
+#: src/gtkblist.c:3286 src/main.c:289
 msgid "Screen Name:"
 msgstr "�仂�亳�仆亳�从仂 亳仄亠:"
 
-#: src/gtkblist.c:3097 src/gtkblist.c:3414
+#: src/gtkblist.c:3312 src/gtkblist.c:3632
 msgid "Group:"
 msgstr "���仗舒:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3106 src/gtkblist.c:3384
+#: src/gtkblist.c:3321 src/gtkblist.c:3600
 msgid "Account:"
 msgstr "�舒仍仂亞:"
 
-#: src/gtkblist.c:3351
+#: src/gtkblist.c:3567
 msgid "Add Chat"
 msgstr "�仂亟舒� �舒亰亞仂于仂�"
 
-#: src/gtkblist.c:3374
+#: src/gtkblist.c:3590
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2400,19 +2352,15 @@
 "丕仆亠�亳�亠 亳仄亠 从仂�亠 亢亠仍亳�亠 亟舒 仆舒亟亠仆亠�亠 �舒亰亞仂于仂��, 亳 仗仂亟舒�从亠 仂 �舒亰亞仂于仂�� 从仂�亳 "
 "亢亠仍亳�亠 亟舒 亟仂亟舒�亠 � �仗亳�舒从 亟��亞舒�舒.\n"
 
-#: src/gtkblist.c:3448
+#: src/gtkblist.c:3666
 msgid "Add Group"
 msgstr "�仂亟舒� 亞��仗�"
 
-#: src/gtkblist.c:3448
-msgid "Add a new group"
-msgstr "�仂亟舒� 仆仂于� 亞��仗�"
-
-#: src/gtkblist.c:3449
+#: src/gtkblist.c:3667
 msgid "Please enter the name of the group to be added."
 msgstr "丕仆亠�亳�亠 仆舒亰亳于 亞��仗亠 从仂�� 亢亠仍亳�亠 亟舒 亟仂亟舒�亠."
 
-#: src/gtkblist.c:3964
+#: src/gtkblist.c:4184
 msgid "No actions available"
 msgstr "�亠仄舒 亟仂���仗仆亳� 舒从�亳�舒"
 
@@ -2432,45 +2380,62 @@
 msgid "Cancel All"
 msgstr "��从舒亢亳 �于亠"
 
-#: src/gtkconn.c:362
+#: src/gtkconn.c:425 src/gtkconn.c:460 src/gtkconn.c:526
+msgid "_Reconnect"
+msgstr "�仂_仆仂于仂 �亠 仗仂于亠亢亳"
+
+#: src/gtkconn.c:490
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s 仗�亠从亳仆� 于亠亰�.</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+#: src/gtkconn.c:492
 msgid "Reason Unknown."
 msgstr "�舒亰仍仂亞 仆亠仗仂亰仆舒�."
 
-#: src/gtkconn.c:371
-msgid "Reconnect"
-msgstr "�仂仆仂于仂 �亠 仗仂于亠亢亳"
-
-#: src/gtkconn.c:410
+#: src/gtkconn.c:531
+msgid "Reconnect _All"
+msgstr "�仂仆仂于仂 仗仂于亠亢亳 _�于亠"
+
+#: src/gtkconn.c:554
 msgid "Account"
 msgstr "�舒仍仂亞"
 
-#: src/gtkconn.c:418
+#: src/gtkconn.c:562
 msgid "Time"
 msgstr "��亠仄亠"
 
-#: src/gtkconv.c:186
+#: src/gtkconv.c:187
 msgid "That file already exists"
 msgstr "�舒�仂�亠从舒 于亠� 仗仂��仂�亳."
 
-#: src/gtkconv.c:187 src/gtkft.c:1034
+#: src/gtkconv.c:188 src/gtkft.c:1076
 msgid "Would you like to overwrite it?"
 msgstr "�舒 仍亳 亢亠仍亳�亠 亟舒 �亠 仗�亠仗亳�亠�亠?"
 
-#: src/gtkconv.c:242
+#: src/gtkconv.c:243
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "�亠 仄仂亞� 亟舒 �舒��于舒仄 �仍亳从�: %s.\n"
 
-#: src/gtkconv.c:312
-msgid "Gaim - Insert Image"
-msgstr "�舒亳仄 �� �弍舒�亳 �仍亳从�"
-
-#: src/gtkconv.c:616
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "�舒亳仄 �� 仗仂亰仂于亳 亟��亞舒�舒 � 仗�亳�舒仂仆亳��"
+#: src/gtkconv.c:313
+msgid "Insert Image"
+msgstr "丕仄亠�仆亳 �仍亳从�"
+
+#: src/gtkconv.c:620
+msgid "Invite Buddy Into Chat Room"
+msgstr "�仂亰仂于亳 亟��亞舒�舒 � 仗�亳�舒仂仆亳��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:644
+#: src/gtkconv.c:648
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2478,315 +2443,311 @@
 "丕仆亠�亳�亠 亳仄亠 从仂�亳�仆亳从舒 从仂亞舒 亢亠仍亳�亠 亟舒 仗仂亰仂于亠�亠, 舒 仗仂 亢亠�亳 亟仂亟舒��亠 亳 仗仂��从� � "
 "仗仂亰亳于仆亳��."
 
-#: src/gtkconv.c:665
+#: src/gtkconv.c:669
 msgid "_Buddy:"
 msgstr "_���亞舒�:"
 
-#: src/gtkconv.c:685
+#: src/gtkconv.c:689
 msgid "_Message:"
 msgstr "_�仂��从舒:"
 
-#: src/gtkconv.c:781
-msgid ""
-"<span weight='bold' size='larger'>Enter a search phrase\n"
-"</span>"
-msgstr ""
-"<span weight='bold' size='larger'>丕仆亠�亳�亠 亳亰�舒亰 亰舒 仗�亠��舒亞�\n"
-"</span>"
-
-#: src/gtkconv.c:788
-msgid "Search term: "
-msgstr "丐�舒亢亳 亳亰�舒亰:"
-
-#: src/gtkconv.c:1225
+#: src/gtkconv.c:775
+msgid "Find"
+msgstr "�舒�亳"
+
+#: src/gtkconv.c:793
+msgid "_Search for:"
+msgstr "_丐�舒亢亳 亳亰�舒亰:"
+
+#: src/gtkconv.c:1239
 msgid "Un-Ignore"
 msgstr "�亠 亳亞仆仂�亳�亳"
 
-#: src/gtkconv.c:1227 src/gtkprefs.c:774
+#: src/gtkconv.c:1241 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "�亞仆仂�亳�亳"
 
 #. Info button
-#: src/gtkconv.c:1236 src/gtkconv.c:3172
+#: src/gtkconv.c:1250 src/gtkconv.c:3110
 msgid "Info"
 msgstr "�仂亟舒�亳"
 
-#: src/gtkconv.c:1245
+#: src/gtkconv.c:1259
 msgid "Get Away Msg"
 msgstr "��亳弍舒于亳 仗仂��从� 亰舒 仂亟����于仂"
 
-#: src/gtkconv.c:1256 src/gtkconv.c:3155 src/gtkconv.c:4340
-#: src/gtkrequest.c:208
+#: src/gtkconv.c:1270 src/gtkconv.c:3093 src/gtkconv.c:4277
+#: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "丕从仍仂仆亳"
 
-#: src/gtkconv.c:2373
+#: src/gtkconv.c:2343
 msgid "User is typing..."
 msgstr "�仂�亳�仆亳从 从��舒..."
 
-#: src/gtkconv.c:2381
+#: src/gtkconv.c:2351
 msgid "User has typed something and paused"
 msgstr "�仂�亳�仆亳从 �亠 仆亠��仂 �从��舒仂 亳 亰舒��舒仂"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2484
+#: src/gtkconv.c:2454
 msgid "_Send As"
 msgstr "�仂�舒�亳 _从舒仂"
 
-#: src/gtkconv.c:2944
-msgid "Gaim - Save Conversation"
-msgstr "�舒亳仄 �� �舒��于舒� �舒亰亞仂于仂�"
+#: src/gtkconv.c:2875
+msgid "Save Conversation"
+msgstr "弌舒��于舒� �舒亰亞仂于仂�"
 
 #. Conversation menu
-#: src/gtkconv.c:2961
+#: src/gtkconv.c:2892
 msgid "/_Conversation"
 msgstr "/_�舒亰亞仂于仂�"
 
-#: src/gtkconv.c:2963
-msgid "/Conversation/_Save As..."
-msgstr "/�舒亰亞仂于仂�/_弌舒��于舒� 从舒仂..."
-
-#: src/gtkconv.c:2965
+#: src/gtkconv.c:2894
+msgid "/Conversation/New _Instant Message..."
+msgstr "/�舒亰亞仂于仂�/�仂于舒 _弍�亰舒 仗仂��从舒..."
+
+#: src/gtkconv.c:2899
+msgid "/Conversation/_Find..."
+msgstr "/�舒亰亞仂于仂�/_�舒�亳..."
+
+#: src/gtkconv.c:2900
 msgid "/Conversation/View _Log"
 msgstr "/�舒亰亞仂于仂�/�仂亞仍亠亟舒� _亟仆亠于仆亳从"
 
-#: src/gtkconv.c:2966
-msgid "/Conversation/Search..."
-msgstr "/�舒亰亞仂于仂�/��亠��舒亞舒..."
-
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:2901
+msgid "/Conversation/_Save As..."
+msgstr "/�舒亰亞仂于仂�/_弌舒��于舒� 从舒仂..."
+
+#: src/gtkconv.c:2906
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/�舒亰亞仂于仂�/�仂亟舒� _亰舒�亠亟� 亟��亞舒��..."
 
-#: src/gtkconv.c:2972
+#: src/gtkconv.c:2908
+msgid "/Conversation/_Get Info"
+msgstr "/�舒亰亞仂于仂�/��亳弍舒_于亳 仗仂亟舒�从亠..."
+
+#: src/gtkconv.c:2910
+msgid "/Conversation/_Warn..."
+msgstr "/�舒亰亞仂于仂�/_丕仗仂亰仂�亳..."
+
+#: src/gtkconv.c:2912
+msgid "/Conversation/In_vite..."
+msgstr "/�舒亰亞仂于仂�/_�仂亰仂于亳..."
+
+#: src/gtkconv.c:2917
 msgid "/Conversation/A_lias..."
 msgstr "/�舒亰亞仂于仂�/_�舒亟亠仆亳 亳仄亠..."
 
-#: src/gtkconv.c:2974
-msgid "/Conversation/_Get Info..."
-msgstr "/�舒亰亞仂于仂�/��亳_弍舒于亳 仗仂亟舒�从亠..."
-
-#: src/gtkconv.c:2976
-msgid "/Conversation/In_vite..."
-msgstr "/�舒亰亞仂于仂�/_�仂亰仂于亳..."
-
-#: src/gtkconv.c:2981
-msgid "/Conversation/Insert _URL..."
-msgstr "/�舒亰亞仂于仂�/_丕弍舒�亳 �仆�亠�仆亠� 舒亟�亠��..."
-
-#: src/gtkconv.c:2983
-msgid "/Conversation/Insert _Image..."
-msgstr "/�舒亰亞仂于仂�/丕弍舒�亳 �_仍亳从�..."
-
-#: src/gtkconv.c:2988
-msgid "/Conversation/_Warn..."
-msgstr "/�舒亰亞仂于仂�/_丕仗仂亰仂�亳..."
-
-#: src/gtkconv.c:2990
+#: src/gtkconv.c:2919
 msgid "/Conversation/_Block..."
 msgstr "/�舒亰亞仂于仂�/_�仍仂从亳�舒�..."
 
-#: src/gtkconv.c:2992
+#: src/gtkconv.c:2921
 msgid "/Conversation/_Add..."
 msgstr "/�舒亰亞仂于仂�/_�仂亟舒�..."
 
-#: src/gtkconv.c:2994
+#: src/gtkconv.c:2923
 msgid "/Conversation/_Remove..."
 msgstr "/�舒亰亞仂于仂�/_丕从仍仂仆亳..."
 
-#: src/gtkconv.c:2999
+#: src/gtkconv.c:2928
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/�舒亰亞仂于仂�/丕仄_亠�仆亳 于亠亰�..."
+
+#: src/gtkconv.c:2930
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/�舒亰亞仂于仂�/丕仄亠�仆亳 _�仍亳从�..."
+
+#: src/gtkconv.c:2935
 msgid "/Conversation/_Close"
 msgstr "/�舒亰亞仂于仂�/_�舒于��亳"
 
 #. Options
-#: src/gtkconv.c:3003
+#: src/gtkconv.c:2939
 msgid "/_Options"
 msgstr "/_�亰弍仂�亳"
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:2940
 msgid "/Options/Enable _Logging"
 msgstr "/�亰弍仂�亳/�仄仂亞��亳 _亟仆亠于仆亳从 �舒亟舒"
 
-#: src/gtkconv.c:3005
+#: src/gtkconv.c:2941
 msgid "/Options/Enable _Sounds"
 msgstr "/�亰弍仂�亳/�仄仂亞��亳 亰_于�从亠"
 
-#: src/gtkconv.c:3006
+#: src/gtkconv.c:2942
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/�亰弍仂�亳/��亳从舒亢亳 _舒仍舒�从亠 亰舒 �仂�仄舒�亳�舒�亠"
 
-#: src/gtkconv.c:3048
+#: src/gtkconv.c:2984
 msgid "/Conversation/View Log"
 msgstr "/�舒亰亞仂于仂�/��亳从舒亢亳 亟仆亠于仆亳从"
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:2989
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/�舒亰亞仂于仂�/�仂亟舒� _亰舒�亠亟� 亟��亞舒��..."
 
-#: src/gtkconv.c:3057
-msgid "/Conversation/Alias..."
-msgstr "/�舒亰亞仂于仂�/�舒亟亠仆亳 亳仄亠..."
-
-#: src/gtkconv.c:3061
-msgid "/Conversation/Get Info..."
+#: src/gtkconv.c:2995
+msgid "/Conversation/Get Info"
 msgstr "/�舒亰亞仂于仂�/��亳弍舒于亳 仗仂亟舒�从亠..."
 
-#: src/gtkconv.c:3065
+#: src/gtkconv.c:2999
+msgid "/Conversation/Warn..."
+msgstr "/�舒亰亞仂于仂�/丕仗仂亰仂�亳..."
+
+#: src/gtkconv.c:3003
 msgid "/Conversation/Invite..."
 msgstr "/�舒亰亞仂于仂�/�仂亟舒�亳..."
 
-#: src/gtkconv.c:3071
-msgid "/Conversation/Insert URL..."
-msgstr "/�舒亰亞仂于仂�/丕弍舒�亳 �仆�亠�仆亠� 舒亟�亠��..."
-
-#: src/gtkconv.c:3075
-msgid "/Conversation/Insert Image..."
-msgstr "/�舒亰亞仂于仂�/丕弍舒�亳 �仍亳从�..."
-
-#: src/gtkconv.c:3081
-msgid "/Conversation/Warn..."
-msgstr "/�舒亰亞仂于仂�/丕仗仂亰仂�亳..."
-
-#: src/gtkconv.c:3085
+#: src/gtkconv.c:3009
+msgid "/Conversation/Alias..."
+msgstr "/�舒亰亞仂于仂�/�舒亟亠仆亳 亳仄亠..."
+
+#: src/gtkconv.c:3013
 msgid "/Conversation/Block..."
 msgstr "/�舒亰亞仂于仂�/�仍仂从亳�舒�..."
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3017
 msgid "/Conversation/Add..."
 msgstr "/�舒亰亞仂于仂�/�仂亟舒�..."
 
-#: src/gtkconv.c:3093
+#: src/gtkconv.c:3021
 msgid "/Conversation/Remove..."
 msgstr "/�舒亰亞仂于仂�/丕从仍仂仆亳..."
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3027
+msgid "/Conversation/Insert Link..."
+msgstr "/�舒亰亞仂于仂�/丕弍舒�亳 于亠亰�..."
+
+#: src/gtkconv.c:3031
+msgid "/Conversation/Insert Image..."
+msgstr "/�舒亰亞仂于仂�/丕弍舒�亳 �仍亳从�..."
+
+#: src/gtkconv.c:3037
 msgid "/Options/Enable Logging"
 msgstr "/�亰弍仂�亳/�仄仂亞��亳 亰舒仗亳�亠"
 
-#: src/gtkconv.c:3102
+#: src/gtkconv.c:3040
 msgid "/Options/Enable Sounds"
 msgstr "/�亰弍仂�亳/�仄仂亞��亳 亰于�从亠"
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3043
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/�亰弍仂�亳/��亳从舒亢亳 舒仍舒�从亠 亰舒 �仂�仄舒�亳�舒�亠"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3129 src/gtkconv.c:3131 src/gtkconv.c:3229 src/gtkconv.c:3231
-#: src/gtkconv.c:6063
+#: src/gtkconv.c:3067 src/gtkconv.c:3069 src/gtkconv.c:3167 src/gtkconv.c:3169
+#: src/gtkconv.c:5987
 msgid "Send"
 msgstr "�仂�舒�亳"
 
-#: src/gtkconv.c:3152 src/gtkconv.c:4358
+#: src/gtkconv.c:3090 src/gtkconv.c:4295
 msgid "Add the user to your buddy list"
 msgstr "�仂亟舒于舒�亠 从仂�亳�仆亳从舒 � �舒� �仗亳�舒从 亟��亞舒�舒"
 
-#: src/gtkconv.c:3158 src/gtkconv.c:4343
+#: src/gtkconv.c:3096 src/gtkconv.c:4280
 msgid "Remove the user from your buddy list"
 msgstr "丕从仍舒�舒�亠 从仂�亳�仆亳从舒 �舒 �舒�亠亞 �仗亳�舒从 亟��亞舒�舒"
 
 #. Warn button
-#: src/gtkconv.c:3165
+#: src/gtkconv.c:3103
 msgid "Warn"
 msgstr "丕仗仂亰仂�亳"
 
-#: src/gtkconv.c:3169
+#: src/gtkconv.c:3107
 msgid "Warn the user"
 msgstr "丕仗仂亰仂�亳 从仂�亳�仆亳从舒"
 
-#: src/gtkconv.c:3176 src/gtkconv.c:3614
+#: src/gtkconv.c:3114 src/gtkconv.c:3553
 msgid "Get the user's information"
 msgstr "��亳弍舒于亳 仗仂亟舒�从亠 仂 从仂�亳�仆亳从�"
 
 #. Block button
-#: src/gtkconv.c:3179 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3117 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "�仍仂从亳�舒�"
 
-#: src/gtkconv.c:3183
+#: src/gtkconv.c:3121
 msgid "Block the user"
 msgstr "�仍仂从亳�舒� 从仂�亳�仆亳从舒"
 
 #. Invite
-#: src/gtkconv.c:3241 src/gtkconv.c:6066
+#: src/gtkconv.c:3179 src/gtkconv.c:5990
 msgid "Invite"
 msgstr "�仂亰仂于亳"
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3182
 msgid "Invite a user"
 msgstr "�仂亰仂于亳 从仂�亳�仆亳从舒"
 
-#: src/gtkconv.c:3283
+#: src/gtkconv.c:3221
 msgid "Bold"
 msgstr "�舒�仆仂"
 
-#: src/gtkconv.c:3294
+#: src/gtkconv.c:3232
 msgid "Italic"
 msgstr "���亰亳于"
 
-#: src/gtkconv.c:3305
+#: src/gtkconv.c:3243
 msgid "Underline"
 msgstr "�仂亟于��亠仆仂"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3259
 msgid "Larger font size"
 msgstr "�亠�舒 �仍仂于舒"
 
-#: src/gtkconv.c:3333
-msgid "Normal font size"
-msgstr "�弍亳�仆舒 �仍仂于舒"
-
-#: src/gtkconv.c:3345
+#: src/gtkconv.c:3284
 msgid "Smaller font size"
 msgstr "�舒�舒 �仍仂于舒"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3301
 msgid "Font Face"
 msgstr "�亳�仄仂"
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3313
 msgid "Foreground font color"
 msgstr "�仂�舒 �亠从��舒"
 
-#: src/gtkconv.c:3386
+#: src/gtkconv.c:3325
 msgid "Background color"
 msgstr "�仂�舒 仗仂亰舒亟亳仆亠"
 
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3340
 msgid "Insert image"
 msgstr "丕弍舒�亳 �仍亳从�"
 
-#: src/gtkconv.c:3412
+#: src/gtkconv.c:3351
 msgid "Insert link"
 msgstr "丕弍舒�亳 于亠亰�"
 
-#: src/gtkconv.c:3423
+#: src/gtkconv.c:3362
 msgid "Insert smiley"
 msgstr "丕弍舒�亳 �仄亠�舒从"
 
-#: src/gtkconv.c:3483
+#: src/gtkconv.c:3422
 msgid "Topic:"
 msgstr "丐亠仄舒:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3534
+#: src/gtkconv.c:3473
 msgid "0 people in room"
 msgstr "�亠仄舒 仆亳从仂亞舒 � 仗�亳�舒仂仆亳�亳"
 
-#: src/gtkconv.c:3591
+#: src/gtkconv.c:3530
 msgid "IM the user"
 msgstr "�仂�舒�亳 弍�亰� 仗仂��从� 从仂�亳�仆亳从�"
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3542
 msgid "Ignore the user"
 msgstr "�亞仆仂�亳�亳 从仂�亳�仆亳从舒"
 
-#: src/gtkconv.c:4156
+#: src/gtkconv.c:4093
 msgid "Close conversation"
 msgstr "�从仂仆�舒� �舒亰亞仂于仂�"
 
-#: src/gtkconv.c:4756 src/gtkconv.c:4788 src/gtkconv.c:4909 src/gtkconv.c:4976
+#: src/gtkconv.c:4680 src/gtkconv.c:4712 src/gtkconv.c:4833 src/gtkconv.c:4900
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2794,19 +2755,19 @@
 msgstr[1] "%d 仂�仂弍亠 � 仗�亳�舒仂仆亳�亳."
 msgstr[2] "%d 仂�仂弍舒 � 仗�亳�舒仂仆亳�亳."
 
-#: src/gtkconv.c:5310
+#: src/gtkconv.c:5234
 msgid "Animate"
 msgstr "�仆亳仄亳�舒�"
 
-#: src/gtkconv.c:5315
+#: src/gtkconv.c:5239
 msgid "Hide Icon"
 msgstr "弌舒从�亳� 亳从仂仆亳��"
 
-#: src/gtkconv.c:5321
+#: src/gtkconv.c:5245
 msgid "Save Icon As..."
 msgstr "弌舒��于舒� 亳从仂仆亳�� 从舒仂..."
 
-#: src/gtkconv.c:5800 src/gtkconv.c:5803
+#: src/gtkconv.c:5724 src/gtkconv.c:5727
 msgid "<main>/Conversation/Close"
 msgstr "<main>/�舒亰亞仂于仂�/�舒于��亳"
 
@@ -2822,120 +2783,128 @@
 msgid "Timestamps"
 msgstr "��亠仄亠仆�从舒 仂亰仆舒从舒"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:200
+#: src/gtkft.c:207
 msgid "<b>Receiving From:</b>"
 msgstr "<b>��亳仄舒�亠 仂亟:</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:210
 msgid "<b>Sending To:</b>"
 msgstr "<b>弌仍舒�亠 亰舒:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:458
 msgid "Progress"
 msgstr "�舒仗�亠亟舒从"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:465
 msgid "Filename"
 msgstr "�舒亰亳于 亟舒�仂�亠从亠"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:472
 msgid "Size"
 msgstr "�亠仍亳�亳仆舒"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:479
 msgid "Remaining"
 msgstr "��亠仂��舒仍仂"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:509
 msgid "Filename:"
 msgstr "�舒亰亳于 亟舒�仂�亠从亠:"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:510
 msgid "Status:"
 msgstr "弌�舒�亠:"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:511
 msgid "Speed:"
 msgstr "��亰亳仆舒:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:512
 msgid "Time Elapsed:"
 msgstr "��仂�亠从仍仂 于�亠仄亠:"
 
-#: src/gtkft.c:491
+#: src/gtkft.c:513
 msgid "Time Remaining:"
 msgstr "��亠仂��舒仍仂 于�亠仄亠:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:610
 msgid "_Keep the dialog open"
 msgstr "_���舒于亳 仗�仂亰仂� 仂�于仂�亠仆"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:620
 msgid "_Clear finished transfers"
 msgstr "_�亰弍舒�亳 亰舒于��亠仆亠 仗�亠仆仂�亠"
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
+#: src/gtkft.c:629
+msgid "Show transfer details"
 msgstr "��亳从舒亢亳 亟亠�舒�亠 仗�亠仆仂�舒"
 
-#: src/gtkft.c:608
-msgid "Hide download details"
+#: src/gtkft.c:630
+msgid "Hide transfer details"
 msgstr "弌舒从�亳� 亟亠�舒�亠 仗�亠仆仂�舒"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:672 src/stock.c:85
 msgid "_Pause"
 msgstr "_�舒��舒仆亳"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:682
 msgid "_Resume"
 msgstr "_�舒��舒于亳"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:882
+msgid "Canceled"
+msgstr "��从舒亢亳"
+
+#: src/gtkft.c:884
+msgid "Failed"
+msgstr "�亠��仗亠�"
+
+#: src/gtkft.c:1053
 msgid "That file does not exist."
 msgstr "�舒�仂�亠从舒 仆亠 仗仂��仂�亳."
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1062
 msgid "Cannot send a file of 0 bytes."
 msgstr "�亠 仄仂亞� 亟舒 仗仂�舒�亠仄 亟舒�仂�亠从� 仂亟 0 弍舒��仂于舒."
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1075
 msgid "That file already exists."
 msgstr "�舒�仂�亠从舒 于亠� 仗仂��仂�亳."
 
-#: src/gtkft.c:1058
-msgid "Gaim - Open..."
-msgstr "�舒亳仄 �� ��于仂�亳..."
-
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "�舒亳仄 �� 弌舒��于舒� 从舒仂..."
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1100
+msgid "Open..."
+msgstr "��于仂�亳..."
+
+#: src/gtkft.c:1102
+msgid "Save As..."
+msgstr "弌舒��于舒� 从舒仂..."
+
+#: src/gtkft.c:1149
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 亢亠仍亳 亟舒 �舒仄 仗仂�舒�亠 %s (%s)"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:691
 msgid "_Copy E-Mail Address"
 msgstr "_�仂仗亳�舒� 舒亟�亠�� 亠-仗仂��亠"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:703
 msgid "_Copy Link Location"
 msgstr "_�仂仗亳�舒� 舒亟�亠�� 于亠亰亠"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:713
 msgid "_Open Link in Browser"
 msgstr "_��于仂�亳 于亠亰� � 仗�亠亞仍亠亟仆亳从�"
 
-#: src/gtkimhtml.c:1744
+#: src/gtkimhtml.c:1849
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2943,20 +2912,20 @@
 "�舒亳仄 仆亳�亠 ��仗亠仂 亟舒 仗仂亞仂亟亳 于���� 亰舒仗亳�舒 �仍亳从亠 仆舒 仂�仆仂于� 仆舒于亠亟亠仆仂亞 仆舒��舒于从舒 "
 "亟舒�仂�亠从亠. �仂亟�舒亰�仄亠于舒仆仂 �亠 �舒亟亳 仂 PNG 亰舒仗亳��."
 
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:1857
 #, c-format
 msgid "Error saving image: %s"
 msgstr "��亠�从舒 仗�亳 �仆亳仄舒�� �仍亳从亠: %s"
 
-#: src/gtkimhtml.c:1761
+#: src/gtkimhtml.c:1866
 msgid "Save Image"
 msgstr "弌舒��于舒� �仍亳从�"
 
-#: src/gtkimhtml.c:1784
+#: src/gtkimhtml.c:1889
 msgid "_Save Image..."
 msgstr "_弌舒��于舒� �仍亳从�..."
 
-#: src/gtklog.c:184
+#: src/gtklog.c:255
 msgid "Conversations with"
 msgstr "�舒亰亞仂于仂�亳 �舒"
 
@@ -3050,7 +3019,7 @@
 msgid "Pounce When"
 msgstr "�舒亟舒 亟舒 亳亰于��亳仄 舒从�亳��?"
 
-#: src/gtkpounce.c:407 src/main.c:339
+#: src/gtkpounce.c:407 src/main.c:335
 msgid "Sign on"
 msgstr "��亳�舒于亳 �亠"
 
@@ -3062,8 +3031,8 @@
 msgid "Return from away"
 msgstr "��舒�亳 �亠 �舒 仂亟����于舒"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2171
 msgid "Idle"
 msgstr "�亠舒从�亳于舒仆"
 
@@ -3108,7 +3077,7 @@
 msgid "Browse"
 msgstr "��亠��舒亢亳"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2081
+#: src/gtkpounce.c:468 src/gtkprefs.c:2083
 msgid "Test"
 msgstr "��仗�仂弍舒�"
 
@@ -3180,6 +3149,11 @@
 msgid "Icon"
 msgstr "�从仂仆亳�舒"
 
+#: src/gtkprefs.c:601 src/gtkprefs.c:1805 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:738
+msgid "Description"
+msgstr "�仗亳�"
+
 #: src/gtkprefs.c:668
 msgid "Style"
 msgstr "弌�亳仍"
@@ -3224,7 +3198,7 @@
 msgid "Bac_kground color"
 msgstr "�仂�舒 _仗仂亰舒亟亳仆亠"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:992 src/gtkprefs.c:1045
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "��亳从舒亰"
 
@@ -3300,23 +3274,23 @@
 msgid "Buddy List Toolbar"
 msgstr "�仍舒�从亠 � �仗亳�从� 亟��亞舒�舒"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
+#: src/gtkprefs.c:836 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr "��亳从舒亢亳 _亟�亞仄舒亟 从舒仂:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
+#: src/gtkprefs.c:838 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "弌仍亳从亠"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:965 src/gtkprefs.c:1021
+#: src/gtkprefs.c:839 src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "丐亠从��"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:966 src/gtkprefs.c:1022
+#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "弌仍亳从亠 亳 �亠从��"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:845 src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise window on events"
 msgstr "_�亰亟亳亞仆亳 仗�仂亰仂� 仆舒 亟仂亞舒�舒�亠"
 
@@ -3332,7 +3306,7 @@
 msgid "Buddy Display"
 msgstr "��亳从舒亰 亟��亞舒�舒"
 
-#: src/gtkprefs.c:853 src/gtkprefs.c:987
+#: src/gtkprefs.c:853 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr "��亳从舒亢亳 亳_从仂仆亳�亠 亟��亞舒�舒"
 
@@ -3348,189 +3322,179 @@
 msgid "Dim i_dle buddies"
 msgstr "_��亠仆�亳 仆亠舒从�亳于仆亠 亟��亞舒�亠"
 
-#: src/gtkprefs.c:884
+#: src/gtkprefs.c:861
+msgid "_Automatically expand contacts"
+msgstr "_弌舒仄 �舒亰亞�舒仆舒� 从仂仆�舒从�亠"
+
+#: src/gtkprefs.c:886
 msgid "_Placement:"
 msgstr "_�舒亰仄亠��舒�:"
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:893
 msgid "Send _URLs as Links"
 msgstr "��亳从舒亢亳 _�仆�亠�仆亠� 舒亟�亠�亠 从舒仂 于亠亰亠"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:896
 msgid "Show Formatting Toolbar"
 msgstr "��亳从舒亢亳 舒仍舒�从亠 亰舒 �仂�仄舒�亳�舒�亠"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:899
 msgid "Tab Options"
 msgstr "�仂��舒于从亠 仍亳��仂于舒"
 
-#: src/gtkprefs.c:899
-msgid "_Tab Placement:"
-msgstr "�仂��舒于从舒 _�亠亰亳�舒从舒:"
-
 #: src/gtkprefs.c:901
+msgid "_Tab Placement:"
+msgstr "�仂��舒于从舒 _�亠亰亳�舒从舒:"
+
+#: src/gtkprefs.c:903
 msgid "Top"
 msgstr "�舒 于���"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:904
 msgid "Bottom"
 msgstr "�舒 亟仆�"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:905
 msgid "Left"
 msgstr "�亠于仂"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:906
 msgid "Right"
 msgstr "�亠�仆仂"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:912
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "��亳从舒亢亳 弍�亰亠 仗仂��从亠 亳 �舒亰亞仂于仂�亠 � 仗�仂亰仂�亳仄舒 仗仂仄仂�� _仍亳��仂于舒"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:915
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "��亳从舒亢亳 弍�亰亠 仗仂��从亠 亳 �舒亰亞仂于仂�亠 � _亳��仂仄 仍亳�仆舒�仂仄 仗�仂亰仂��"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:925
 msgid "Show _close button on tabs"
 msgstr "��亳从舒亢亳 亟�亞仄亠 亰舒 亰舒�于舒�舒_�亠 仆舒 �亠亰亳��亳仄舒."
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:936
 msgid "Show status _icons on tabs"
 msgstr "��亳从舒亢亳 亳从仂仆亳�� ��舒�舒 仆舒 �亠亰亳��亳仄舒."
 
-#: src/gtkprefs.c:961 src/gtkprefs.c:1017
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "��仂亰仂�"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "_丿亳�亳仆舒 仆仂于仂亞 仗�仂亰仂�舒:"
 
-#: src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr "_�亳�亳仆舒 仆仂于仂亞 仗�仂亰仂�舒:"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
 msgid "_Entry field height:"
 msgstr "�亳�亳仆舒 仗仂�舒 亰舒 _�仆仂�:"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr "_弌舒从�亳� 仗�仂亰仂� 仗�亳 �仍舒��"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "�从仂仆亳�亠 亟��亞舒�舒"
 
-#: src/gtkprefs.c:989
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "丕从���亳 _舒仆亳仄舒�亳�� 亳从仂仆亳�亠 亟��亞舒�舒"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr "��亳从舒亢亳 _仗�亳�舒于亠 � 仗�仂亰仂��"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr "��亳从舒亢亳 舒_仍亳�舒�亠 � �亠亰亳��亳仄舒/仆舒�仍仂于亳仄舒"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "�弍舒于亠��亠�亠 仂 从��舒��"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "弌仍舒�亠 仂弍舒于亠��亠�舒 亟��亞舒�亳仄舒 从舒亟舒 亳仄 仗亳�亠_�亠"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr "�仂于��舒于舒�亠 �舒弍�仍舒�仂�仂仄"
 
-#: src/gtkprefs.c:1040
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr "�仂于��亳 仆舒亟亳仄从亠 仆舒 仗�亳�亳�舒从 _�舒弍�仍舒�仂�舒"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr "_弌�舒�仂仄仂亟仆仂 亟仂于��舒于舒�亠 仗仂仄仂�� �舒弍�仍舒�仂�舒"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1048
 msgid "_Show people joining in window"
 msgstr "��亳从舒亢亳 � 仗�仂亰仂�� ��亟亠 从仂�亳 �亠 _仗�亳从������"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1050
 msgid "_Show people leaving in window"
 msgstr "��亳从舒亢亳 � 仗�仂亰仂�� ��亟亠 从仂�亳 _仂亟仍舒亰亠"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1052
 msgid "Co_lorize screennames"
 msgstr "_�仂�亠�亠 亳仄亠仆舒"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr "����舒 仗�仂从�亳�舒"
 
-#: src/gtkprefs.c:1097
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr "�亠亰 仗�仂从�亳�舒"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1106
 msgid "Proxy Server"
 msgstr "��仂从�亳 �亠�于亠�"
 
-#: src/gtkprefs.c:1125
-msgid "_Host"
-msgstr "_�仄亠 �亠�于亠�舒"
-
-#: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
-#: src/protocols/jabber/jabber.c:1152 src/protocols/msn/msn.c:1640
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
-msgid "Port"
-msgstr "�仂��"
-
-#: src/gtkprefs.c:1160
-msgid "_User"
-msgstr "_�仂�亳�仆亳从"
-
-#: src/gtkprefs.c:1177
-msgid "Pa_ssword"
-msgstr "_�仂亰亳仆从舒"
-
-#: src/gtkprefs.c:1214
+#: src/gtkprefs.c:1162
+msgid "_User:"
+msgstr "_�仂�亳�仆亳从:"
+
+#: src/gtkprefs.c:1216
 msgid "Opera"
 msgstr "�仗亠�舒"
 
-#: src/gtkprefs.c:1215
+#: src/gtkprefs.c:1217
 msgid "Netscape"
 msgstr "�亠��从亠�仗"
 
-#: src/gtkprefs.c:1216
+#: src/gtkprefs.c:1218
 msgid "Mozilla"
 msgstr "�仂亰亳仍舒"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1219
 msgid "Konqueror"
 msgstr "�仂仆从于亠�仂�"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1220
 msgid "Galeon"
 msgstr "�舒仍亠仂仆"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1229
 msgid "Manual"
 msgstr "���仆舒 仗仂��舒于从舒"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1270
 msgid "Browser Selection"
 msgstr "�亰弍仂� 仗�亠亞仍亠亟仆亳从舒"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1274
 msgid "_Browser:"
 msgstr "_�亠弍 仗�亠亞仍亠亟仆亳从:"
 
-#: src/gtkprefs.c:1282
+#: src/gtkprefs.c:1284
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3539,87 +3503,63 @@
 "_���仆仂:\n"
 "(%s 亰舒 舒亟�亠��)"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1305
 msgid "Browser Options"
 msgstr "�仂��舒于从亠 于亠弍 仗�亠亞仍亠亟仆亳从舒"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1306
 msgid "Open new _window by default"
 msgstr "��于舒�舒�亠 仆仂于仂亞 _仗�仂亰仂�舒 �亠 仗仂亟�舒亰�仄亠于舒仆仂"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1322
 msgid "Message Logs"
 msgstr "�仆亠于仆亳从 仗仂��从舒"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1325
 msgid "Log _Format:"
 msgstr "�弍仍亳从 _亟仆亠于仆亳从舒:"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1329
 msgid "_Log all instant messages"
 msgstr "�亠仍亠亢亳 �于亠 _弍�亰亠 仗仂��从亠"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1331
 msgid "Log all c_hats"
 msgstr "�亠仍亠亢亳 �于亠 _�舒亰亞仂于仂�亠"
 
-#: src/gtkprefs.c:1332
-msgid "System Logs"
-msgstr "弌亳��亠仄�从亳 亟仆亠于仆亳从"
-
-#: src/gtkprefs.c:1333
-msgid "Log when buddies _sign on/sign off"
-msgstr "�亠仍亠亢亳 从舒亟舒 �亠 亟��亞舒�亳 _仗�亳�舒于����/仂亟�舒于����"
-
-#: src/gtkprefs.c:1335
-msgid "Log when buddies become _idle/un-idle"
-msgstr "�亠仍亠亢亳 从舒亟舒 �� 亟��亞舒�亳 _仆亠舒从�亳于仆亳/舒从�亳于仆亳"
-
-#: src/gtkprefs.c:1337
-msgid "Log when buddies go away/come _back"
-msgstr "�亠仍亠亢亳 从舒亟舒 �� 亟��亞舒�亳 _仂亟����仆亳/仗�亳���仆亳"
-
-#: src/gtkprefs.c:1339
-msgid "Log your _own signons/idleness/awayness"
-msgstr "�亠仍亠亢亳 _仍亳�仆亠 仗�亳�舒于亠/仆亠舒从�亳于仆仂��/仂亟����于舒"
-
-#: src/gtkprefs.c:1341
-msgid "I_ndividual log file for each buddy's signons"
-msgstr "�仂�亠亟亳仆舒�仆舒 亟舒�仂�亠从舒 亟亠仆于仆亳从舒 亰舒 _�于舒从仂亞 亟��亞舒�舒"
-
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1386
 msgid "Sound Options"
 msgstr "�仂��舒于从亠 亰于�从舒"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1387
 msgid "_No sounds when you log in"
 msgstr "_�亠亰 亰于�从舒 仗仂 仗�亳�舒于亳"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1389
 msgid "_Sounds while away"
 msgstr "�于�从 �亠 _舒从�亳于舒仆 亟仂从 ��亠 仂亟���仆亳"
 
-#: src/gtkprefs.c:1391
+#: src/gtkprefs.c:1393
 msgid "Sound Method"
 msgstr "�舒�亳仆 仂亞仍舒�舒于舒�舒"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1394
 msgid "_Method:"
 msgstr "_�舒�亳仆:"
 
-#: src/gtkprefs.c:1394
+#: src/gtkprefs.c:1396
 msgid "Console beep"
 msgstr "�仂仆亰仂仍仆亳 亰于�从"
 
-#: src/gtkprefs.c:1396
+#: src/gtkprefs.c:1398
 msgid "Automatic"
 msgstr "���仂仄舒��从亳"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1405
 msgid "Command"
 msgstr "�舒�亠亟弍舒"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1415
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3628,67 +3568,67 @@
 "�舒�亠亟弍舒 亰舒 亰于�从:\n"
 "(%s 亰舒 仆舒亰亳于 亟舒�仂�亠从亠)"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1470
 msgid "_Sending messages removes away status"
 msgstr "弌仍舒�亠 仗仂��从舒 �舒� 于�舒�舒 �舒 _仂亟����于舒"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1472
 msgid "_Queue new messages when away"
 msgstr "�亟仍舒亢亳 � _�亠亟 仗仂��从亠 仆舒 仂亟����于�"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1475
 msgid "Auto-response"
 msgstr "���仂仄舒��从亳 仂亟亞仂于仂�"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1478
 msgid "Seconds before _resending:"
 msgstr "��仂� _�亠从�仆亟亳 仗�亠 仗仂仆仂于仆仂亞 �仍舒�舒:"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1481
 msgid "_Send auto-response"
 msgstr "弌仍舒�亠 _舒��仂仄舒��从仂亞 仂亟亞仂于仂�"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1483
 msgid "_Only send auto-response when idle"
 msgstr "弌仍舒�亠 舒��仂仄舒��从仂亞 仂亟亞仂于仂�舒 �舒仄仂 从舒亟舒 ��亠 _仆亠舒从�亳于仆亳"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1485
 msgid "Send auto-response in _active conversations"
 msgstr "弌仍舒�亠 舒��仂仄舒��从仂亞 仂亟亞仂于仂�舒 � 舒_从�亳于仆亳仄 �舒亰亞仂于仂�亳仄舒"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1495
 msgid "Idle _time reporting:"
 msgstr "��亳�舒于�亳于舒�亠 仆亠舒从_�亳于仆仂��亳:"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1498
 msgid "Gaim usage"
 msgstr "�从�亳于仆仂�� � �舒亳仄�"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1501
 msgid "X usage"
 msgstr "�从�亳于仆仂�� � ��弌-亳仄舒"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1503
 msgid "Windows usage"
 msgstr "�从�亳于仆仂�� � �亳仆亟仂���"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1511
 msgid "Auto-away"
 msgstr "���仂仄舒��从仂 仂亟���于仂"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1512
 msgid "Set away _when idle"
 msgstr "�亟亠�亠 仆舒 仂_亟����于仂 从舒亟舒 ��亠 仆亠舒从�亳于仆亳"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1514
 msgid "_Minutes before setting away:"
 msgstr "��仂� _仄亳仆��舒 仗�亠 仂亟仍舒�从舒 仆舒 仂亟����于仂:"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1521
 msgid "Away m_essage:"
 msgstr "_�仂��从舒 亰舒 仂亟����于仂:"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1583
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3703,7 +3643,7 @@
 "<span weight=\"bold\">�亠弍 ���舒仆亳�舒:</span>\t\t%s\n"
 "<span weight=\"bold\">�舒�仂�亠从舒:</span>\t%s"
 
-#: src/gtkprefs.c:1586
+#: src/gtkprefs.c:1588
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3718,97 +3658,97 @@
 "<span weight=\"bold\">�仆�亠�仆亠� 舒亟�亠�舒:</span>  %s\n"
 "<span weight=\"bold\">�舒�仂�亠从舒:</span>  %s"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1769
 msgid "Load"
 msgstr "丕�亳�舒�"
 
-#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:588
-#: src/protocols/msn/msn.c:1328 src/protocols/trepia/trepia.c:401
+#: src/gtkprefs.c:1776 src/protocols/jabber/jabber.c:582
+#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "�仄亠"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1823
 msgid "Details"
 msgstr "�亠�舒�亳"
 
-#: src/gtkprefs.c:1948
+#: src/gtkprefs.c:1950
 msgid "Sound Selection"
 msgstr "�亰弍仂� 亰于�从舒"
 
-#: src/gtkprefs.c:2055
+#: src/gtkprefs.c:2057
 msgid "Play"
 msgstr "����亳"
 
-#: src/gtkprefs.c:2062
+#: src/gtkprefs.c:2064
 msgid "Event"
 msgstr "�仂亞舒�舒�"
 
-#: src/gtkprefs.c:2085
+#: src/gtkprefs.c:2087
 msgid "Reset"
 msgstr "�亟弍舒�亳"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2091
 msgid "Choose..."
 msgstr "�亰舒弍亠�亳..."
 
-#: src/gtkprefs.c:2223
+#: src/gtkprefs.c:2225
 msgid "_Edit"
 msgstr "_丕�亠亟亳"
 
-#: src/gtkprefs.c:2259
-msgid "Interface"
-msgstr "弌��亠�亠"
-
-#: src/gtkprefs.c:2260
-msgid "Smiley Themes"
-msgstr "弌从�仗仂于亳 �仄亠�舒从舒"
-
 #: src/gtkprefs.c:2261
-msgid "Fonts"
-msgstr "�亳�仄舒"
+msgid "Interface"
+msgstr "弌��亠�亠"
 
 #: src/gtkprefs.c:2262
-msgid "Message Text"
-msgstr "丐亠从�� 仗仂��从亠"
+msgid "Smiley Themes"
+msgstr "弌从�仗仂于亳 �仄亠�舒从舒"
 
 #: src/gtkprefs.c:2263
+msgid "Fonts"
+msgstr "�亳�仄舒"
+
+#: src/gtkprefs.c:2264
+msgid "Message Text"
+msgstr "丐亠从�� 仗仂��从亠"
+
+#: src/gtkprefs.c:2265
 msgid "Shortcuts"
 msgstr "��亠�亳�亠"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2268
 msgid "IMs"
 msgstr "��亰亠 仗仂��从亠"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2270
 msgid "Proxy"
 msgstr "��仂从�亳"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2273
 msgid "Browser"
 msgstr "��亠亞仍亠亟仆亳从"
 
-#: src/gtkprefs.c:2273
-msgid "Logging"
-msgstr "�舒仗亳�亳于舒�亠"
-
-#: src/gtkprefs.c:2274
-msgid "Sounds"
-msgstr "�于�从"
-
 #: src/gtkprefs.c:2275
+msgid "Logging"
+msgstr "�舒仗亳�亳于舒�亠"
+
+#: src/gtkprefs.c:2276
+msgid "Sounds"
+msgstr "�于�从"
+
+#: src/gtkprefs.c:2277
 msgid "Sound Events"
 msgstr "�于��仆亳 亟仂亞舒�舒�亳"
 
-#: src/gtkprefs.c:2276
+#: src/gtkprefs.c:2278
 msgid "Away / Idle"
 msgstr "�亟����于仂 / �亠舒从�亳于仆仂��"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2279
 msgid "Away Messages"
 msgstr "�仂��从亠 亰舒 仂亟����于仂"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2282
 msgid "Plugins"
 msgstr "�仂亟舒�亳"
 
@@ -3896,15 +3836,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:193 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "�舒"
 
-#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:194 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "�亠"
 
-#: src/gtkrequest.c:204
+#: src/gtkrequest.c:197
 msgid "Apply"
 msgstr "��亳仄亠仆亳"
 
@@ -3970,51 +3910,53 @@
 "�亠 仄仂亞� �亠仗�仂亟�从仂于舒�亳 亰于�从 亰舒�仂 ��仂 �亠 仆亠 仄仂亢亠 仗仂从�亠仆��亳 仗仂��舒于�亠仆舒 亰于��仆舒 "
 "仆舒�亠亟弍舒: %s"
 
-#: src/gtkutils.c:288
+#: src/gtkutils.c:294
 msgid "Can't save icon file to disk."
 msgstr "�亠 仄仂亞� �舒��于舒�亳 亟舒�仂�亠从� �舒 亳从仂仆亳�仂仄 仆舒 亟亳�从."
 
-#: src/gtkutils.c:323
-msgid "Gaim - Save Icon"
-msgstr "�舒亳仄 �� 弌舒��于舒� 亳从仂仆亳��"
-
-#: src/log.c:79
+#: src/gtkutils.c:329
+msgid "Save Icon"
+msgstr "弌舒��于舒� 亳从仂仆�"
+
+#: src/log.c:83
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">�仆亠于仆亳从 仆亠 仂仄仂亞��舒于舒 �亳�舒�亠</font></b>"
 
-#: src/log.c:370
+#: src/log.c:407
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:448
+#: src/log.c:487
 #, c-format
 msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\">(%s) <b>%s <弌���-�������>:</b></font> %s<br/>\n"
-
-#: src/log.c:450
+msgstr ""
+"<font color=\"#16569E\">(%s) <b>%s <弌���-�������>:</b></font> %s<br/>\n"
+
+#: src/log.c:489
 #, c-format
 msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\">(%s) <b>%s <弌���-�������>:</b></font> %s<br/>\n"
-
-#: src/log.c:478 src/log.c:602
-msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-msgstr "<font color=\"red\"><b>log->logger_data �亠 NULL!</b></font>"
-
-#: src/log.c:488 src/log.c:612
+msgstr ""
+"<font color=\"#A82F2F\">(%s) <b>%s <弌���-�������>:</b></font> %s<br/>\n"
+
+#: src/log.c:533 src/log.c:668
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<font color=\"red\"><b>�亠 仄仂亞� 亟舒 仆舒�亠仄 仗��舒�� 亟仆亠于仆亳从舒!</b></font>"
+
+#: src/log.c:543 src/log.c:678
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>�亠 仄仂亞� 亟舒 �亳�舒仄 亟舒�仂�亠从�: %s</b></font>"
 
-#: src/log.c:492
+#: src/log.c:547
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:572
+#: src/log.c:621
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <弌���-�������>: %s\n"
 
-#: src/log.c:616
+#: src/log.c:682
 msgid "Plain text"
 msgstr "�弍亳�舒仆 �亠从��"
 
@@ -4031,7 +3973,7 @@
 msgstr "��亳�舒于舒"
 
 #. full help text
-#: src/main.c:550
+#: src/main.c:549
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4068,7 +4010,7 @@
 "  -h, --help           仗�亳从舒亰��亠 仂于� 仗仂仄仂� 亳 亳亰舒�亳\n"
 
 #. short message
-#: src/main.c:565
+#: src/main.c:564
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "�舒亳仄 %s. �仂从��舒��亠 ��%s -h�� 亰舒 于亳�亠 仗仂亟舒�舒从舒.\n"
@@ -4098,8 +4040,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2474
+#: src/protocols/yahoo/yahoo.c:2583
 msgid "Available"
 msgstr "�仂���仗舒仆"
 
@@ -4111,11 +4053,11 @@
 msgid "Away for friends only"
 msgstr "�亟���舒仆 �舒仄仂 亰舒 仗�亳�舒�亠�亠"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:931
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
-#: src/protocols/oscar/oscar.c:4576 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6140 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
+#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
+#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2169
+#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2593
 msgid "Invisible"
 msgstr "�亠于亳亟�亳于"
 
@@ -4170,7 +4112,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:200 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:141
 msgid "Unable to connect."
 msgstr "�亠 仄仂亞� 亟舒 �亠 仗仂于亠亢亠仄."
 
@@ -4233,7 +4176,7 @@
 msgid "Active"
 msgstr "�从�亳于舒仆"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3954
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
 msgid "UIN"
 msgstr "�仂�亳�仆亳�从亳 弍�仂�"
 
@@ -4242,13 +4185,13 @@
 msgstr "�仄亠"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:608
-#: src/protocols/oscar/oscar.c:3962 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
+#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "��亠亰亳仄亠"
 
 #: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3956
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "�舒亟亳仄舒从"
 
@@ -4262,19 +4205,19 @@
 msgstr "�仂仍"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
+#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "��舒亟"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1266
-#: src/protocols/msn/msn.c:1508 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3197
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
-#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
+#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2788 src/protocols/yahoo/yahoo.c:2811
+#: src/protocols/yahoo/yahoo.c:2969 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "�仂亟舒�亳 仂 亟��亞舒��"
 
@@ -4378,8 +4321,8 @@
 msgid "Directory Search"
 msgstr "��亠��舒亞舒 亳仄亠仆亳从舒"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1043
-#: src/protocols/oscar/oscar.c:6495 src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "��仂仄亠仆舒 仍仂亰亳仆从亠"
 
@@ -4432,17 +4375,17 @@
 "�仂�亳�仆亳从 %s (%s%s%s%s%s) 亢亠仍亳 亟舒 �舒� 亟仂亟舒 � �于仂� �仗亳�舒从 亟��亞舒�舒 亳 ��舒亢亳 �舒�� "
 "亟仂亰于仂仍� 亰舒 �仂."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:184
-#: src/protocols/msn/notification.c:948 src/protocols/msn/notification.c:1269
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
+#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
+#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2621
+#: src/protocols/oscar/oscar.c:5142
 msgid "Authorize"
 msgstr "�于仍舒��亳"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:185
-#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1271
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
+#: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
+#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:5143
 msgid "Deny"
 msgstr "�亟弍亳�"
 
@@ -4494,44 +4437,52 @@
 msgid "No topic is set"
 msgstr "丐亠仄舒 仆亳�亠 仗仂��舒于�亠仆舒"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "Error displaying MOTD"
 msgstr "��亠�从舒 仗�亳 仗�亳从舒亰亳于舒�� 仗仂��从亠 亟舒仆舒"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "No MOTD available"
 msgstr "�亳�亠 亟仂���仗仆舒 仗仂��从舒 亟舒仆舒"
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:73
 msgid "There is no MOTD associated with this connection."
 msgstr "�亠仄舒 仗仂��从亠 亟舒仆舒 亰舒 仂于� 于亠亰�."
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:76
 #, c-format
 msgid "MOTD for %s"
 msgstr "�仂��从舒 亟舒仆舒 亰舒 %s"
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:139
 msgid "View MOTD"
 msgstr "�仂亞仍亠亟舒��亠 仗仂��从� 亟舒仆舒"
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
-msgstr "�舒仆舒仍:"
-
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:158
+msgid "_Channel:"
+msgstr "_�舒仆舒仍:"
+
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:56
+msgid "_Password:"
+msgstr "_�仂亰亳仆从舒:"
+
+#: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 仆舒亟亳仄�亳 仆亠 仄仂亞� �舒亟�亢舒�亳 弍亠仍亳仆亠"
 
-#: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "��亳�舒于舒: %s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:210
 msgid "Couldn't create socket"
 msgstr "�亠 仄仂亞� 亟舒 仆舒�亳仆亳仄 �仂从亠�"
 
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+msgid "Read error"
+msgstr "��亠�从舒 仗�亳 �亳�舒��"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4541,26 +4492,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:532
+#: src/protocols/irc/irc.c:534
 msgid "IRC Protocol Plugin"
 msgstr "�仂亟舒�舒从 亰舒 ��丶 仗�仂�仂从仂仍"
 
 #. *  summary
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:535
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "�仂亟舒�舒从 亰舒 ��丶 仗�仂�仂从仂仍"
 
-#: src/protocols/irc/irc.c:550 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1142 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:552 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1140 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "弌亠�于亠�"
 
-#: src/protocols/irc/irc.c:556
+#: src/protocols/irc/irc.c:555 src/protocols/jabber/jabber.c:1155
+#: src/protocols/msn/msn.c:1662 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1345
+msgid "Port"
+msgstr "�仂��"
+
+#: src/protocols/irc/irc.c:558
 msgid "Encoding"
 msgstr "�舒�亳仆 亰舒仗亳�舒"
 
-#: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:578
+#: src/protocols/irc/irc.c:561 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:572
 msgid "Username"
 msgstr "�仂�亳�仆亳�从仂 亳仄亠"
 
@@ -4585,7 +4542,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(亳亟亠仆�亳�亳从仂于舒仆亳)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2869
 msgid "Realname"
 msgstr "�仄亠"
 
@@ -4634,84 +4591,88 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "��丶 �亠�于亠� 仆亳�亠 �舒亰�仄亠仂 仗仂��从� 从仂�� �亠 仗仂�仍舒仂 �舒亳仄."
 
+#: src/protocols/irc/msgs.c:370
+msgid "No such channel"
+msgstr "�亠仄舒 �舒从于仂亞 从舒仆舒仍舒"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
 msgstr "仆亠 仗仂��仂�亳 �舒从舒于 从舒仆舒仍"
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:384
 msgid "User is not logged in"
 msgstr "�仂�亳�仆亳从 仆亳�亠 仗�亳�舒于�亠仆"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "�亠 仗仂��仂�亳 �舒从舒于 仆舒亟亳仄舒从/从舒仆舒仍"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:409
 msgid "Could not send"
 msgstr "�亠 仄仂亞� 亟舒 仗仂�舒�亠仄"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "��亳���仗舒�亠 仆舒 %s 亰舒��亠于舒 仗仂亰亳于舒�亠."
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr "弌舒仄仂 仗仂亰亳于舒仆亳"
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:562
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "�亰弍舒�亳仂 �舒� �亠 %s: (%s)"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "�亰弍舒�亠仆亳 仂亟 ���舒仆亠 %s: (%s)"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "仄仂亟 (%s %s) 仂亟 ���舒仆亠 %s"
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:670
 msgid "Could not change nick"
 msgstr "�亠 仄仂亞� 亟舒 仗�仂仄亠仆亳仄 仆舒亟亳仄舒从"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr "�亠 仄仂亞� 亟舒 仗�仂仄亠仆亳仄 仆舒亟亳仄舒从"
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "�舒仗���亳仍亳 ��亠 仗�亳�舒仂仆亳��%s%s"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:730
 msgid "Error: invalid PONG from server"
 msgstr "��亠�从舒: 仗仂亞�亠�舒仆 仂亟亰亳于 �亠�于亠�舒 (����)"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "���� 仂亟亞仂于仂� �� �舒亞: %lu �亠从�仆亟亳"
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:802
 #, c-format
 msgid "Cannot join %s:"
 msgstr "�亠 仄仂亞� 亟舒 �亠 仗�亳从���亳仄 � %s:"
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr "�亠 仄仂亞� 亟舒 �亠 仗�亳从���亳仄 从舒仆舒仍�"
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops �舒 %s"
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:161
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4719,75 +4680,80 @@
 "(�仂�仍仂 �亠 亟仂 亞�亠�从亠 仗�亳 仗�亠�于舒�舒�� 仂于亠 仗仂��从亠. ��仂于亠�亳�亠 仂仗�亳�� ���舒�亳仆 "
 "亰舒仗亳�舒�� � 丕�亠亟仆亳从� 仆舒仍仂亞舒)"
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "��亠仄亠 仂亟亰亳于舒 仂亟 %s: %lu �亠从�仆亟亳"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "����"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr "丶丐丶� ���� 仂亟亞仂于仂�"
 
-#: src/protocols/irc/parse.c:391
+#: src/protocols/irc/parse.c:392
 msgid "Disconnected"
 msgstr "�亠亰舒 �亠 仗�亠从亳仆��舒"
 
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:52
 msgid "Server requires SSL for login"
 msgstr "弌亠�于亠� 亰舒��亠于舒 弌弌� 亰舒 仗�亳�舒于�"
 
-#: src/protocols/jabber/auth.c:59 src/protocols/jabber/auth.c:281
-#: src/protocols/jabber/auth.c:380 src/protocols/jabber/auth.c:392
+#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:153
+#: src/protocols/jabber/auth.c:312 src/protocols/jabber/auth.c:412
+#: src/protocols/jabber/auth.c:424
 msgid "Invalid response from server"
 msgstr "�亠亳�仗�舒于舒仆 仂亟亞仂于仂� �亠�于亠�舒"
 
-#: src/protocols/jabber/auth.c:86 src/protocols/jabber/auth.c:143
+#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:176
 msgid "Server does not use any supported authentication method"
 msgstr "弌亠�于亠� 仆亠 从仂�亳��亳 仆亳�亠亟舒仆 仂亟 仗仂亟�亢舒仆亳� 仆舒�亳仆舒 亳亟亠仆�亳�亳从仂于舒�舒"
 
-#: src/protocols/jabber/auth.c:301
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/jabber.c:458
+msgid "Unknown Error"
+msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒"
+
+#: src/protocols/jabber/auth.c:333
 msgid "Invalid challenge from server"
 msgstr "�亠亳�仗�舒于舒仆 亳亰舒亰仂于 �亠�于亠�舒"
 
-#: src/protocols/jabber/auth.c:395
+#: src/protocols/jabber/auth.c:427
 msgid "Bad Protocol"
 msgstr "�仂� 仗�仂�仂从仂仍"
 
-#: src/protocols/jabber/auth.c:398
+#: src/protocols/jabber/auth.c:430
 msgid "Encryption Required"
 msgstr "�弍舒于亠亰仆仂 �亠 �亳��仂于舒�亠"
 
-#: src/protocols/jabber/auth.c:401
+#: src/protocols/jabber/auth.c:433
 msgid "Invalid authzid"
 msgstr "�亠亳�仗�舒于舒仆 authzid"
 
-#: src/protocols/jabber/auth.c:404
+#: src/protocols/jabber/auth.c:436
 msgid "Invalid Mechanism"
 msgstr "�亠亳�仗�舒于舒仆 仄亠�舒仆亳亰舒仄"
 
-#: src/protocols/jabber/auth.c:406
+#: src/protocols/jabber/auth.c:438
 msgid "Invalid Realm"
 msgstr "�亠亳�仗�舒于舒仆 亟仂仄亠仆"
 
-#: src/protocols/jabber/auth.c:409
+#: src/protocols/jabber/auth.c:441
 msgid "Mechanism Too Weak"
 msgstr "�亠�舒仆亳亰舒仄 �亠 仗�亠�仍舒弍"
 
-#: src/protocols/jabber/auth.c:412 src/protocols/jabber/jabber.c:158
-#: src/protocols/jabber/jabber.c:866 src/protocols/jabber/jabber.c:916
-#: src/protocols/oscar/oscar.c:5542
+#: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:147
+#: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
+#: src/protocols/oscar/oscar.c:5570
 msgid "Not Authorized"
 msgstr "�亠仂于仍舒��亠仆"
 
-#: src/protocols/jabber/auth.c:415
+#: src/protocols/jabber/auth.c:447
 msgid "Temporary Authentication Failure"
 msgstr "��亳于�亠仄亠仆仂 仆亠��仗亠�仆舒 亳亟亠仆�亳�亳从舒�亳�舒"
 
-#: src/protocols/jabber/auth.c:417
+#: src/protocols/jabber/auth.c:449
 msgid "Authentication Failure"
 msgstr "�亠��仗亠�仆舒 亳亟亠仆�亳�亳从舒�亳�舒"
 
@@ -4804,10 +4770,14 @@
 msgstr "�仄亠"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:598 src/protocols/yahoo/yahoo.c:2675
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2865
 msgid "Nickname"
 msgstr "�舒亟亳仄舒从"
 
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:632
+msgid "URL"
+msgstr "�仆�亠�仆亠� 舒亟�亠�舒"
+
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
 msgid "Street Address"
 msgstr "丕仍亳�舒"
@@ -4825,7 +4795,7 @@
 msgstr "�弍仍舒��"
 
 #: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:665
-#: src/protocols/jabber/jabber.c:628
+#: src/protocols/jabber/jabber.c:622
 msgid "Postal Code"
 msgstr "�仂��舒仆�从亳 弍�仂�"
 
@@ -4841,7 +4811,7 @@
 msgstr "丐亠仍亠�仂仆"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2669
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2861
 msgid "Email"
 msgstr "�-仗仂��舒"
 
@@ -4863,7 +4833,7 @@
 msgstr "丕仍仂亞舒"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3988
+#: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "�仂�亠仆亟舒仆"
 
@@ -4883,12 +4853,12 @@
 msgstr "�舒弍亠� ��"
 
 #: src/protocols/jabber/buddy.c:556 src/protocols/jabber/buddy.c:563
-#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:903
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:901
+#: src/protocols/jabber/jabber.c:914
 msgid "Status"
 msgstr "弌�舒�亠"
 
-#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1143
 msgid "Resource"
 msgstr "�亠����"
 
@@ -4897,8 +4867,8 @@
 msgstr "�仄亠 仂�舒"
 
 # Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4005 src/protocols/oscar/oscar.c:4021
+#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
+#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "丕仍亳�舒"
 
@@ -4918,37 +4888,37 @@
 msgid "Jabber Profile"
 msgstr "�舒弍亠� 仗�仂�亳仍"
 
-#: src/protocols/jabber/buddy.c:904
+#: src/protocols/jabber/buddy.c:905
 msgid "Un-hide From"
 msgstr "�亠 �舒从�亳于舒� 仂亟"
 
-#: src/protocols/jabber/buddy.c:907
+#: src/protocols/jabber/buddy.c:908
 msgid "Temporarily Hide From"
 msgstr "��亳于�亠仄亠仆仂 �舒从�亳� 仂亟"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:916
 msgid "Cancel Presence Notification"
 msgstr "��从舒亢亳 仂弍舒于亠��亠�舒 仂 仗�亳����于�"
 
-#: src/protocols/jabber/buddy.c:923
+#: src/protocols/jabber/buddy.c:924
 msgid "(Re-)Request authorization"
 msgstr "(�仂仆仂于仂) 亰舒��亠于舒� 仂于仍舒��亠�亠"
 
-#: src/protocols/jabber/buddy.c:929
+#: src/protocols/jabber/buddy.c:930
 msgid "Unsubscribe"
 msgstr "�亟�舒于亳 �亠"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
-msgstr "弌仂弍舒:"
+#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:938
+msgid "_Room:"
+msgstr "_弌仂弍舒:"
 
 #: src/protocols/jabber/chat.c:44
-msgid "Server:"
-msgstr "弌亠�于亠�:"
+msgid "_Server:"
+msgstr "弌亠_�于亠�:"
 
 #: src/protocols/jabber/chat.c:50
-msgid "Handle:"
-msgstr "�舒亟亳仄舒从:"
+msgid "_Handle:"
+msgstr "_���从舒:"
 
 #: src/protocols/jabber/chat.c:158
 #, c-format
@@ -4977,275 +4947,283 @@
 msgid "Invalid Room Handle"
 msgstr "�亠亳�仗�舒于仆舒 ���从舒 �仂弍亠"
 
-#: src/protocols/jabber/jabber.c:82
+#: src/protocols/jabber/jabber.c:71
 msgid "Error initializing session"
 msgstr "��亠�从舒 仗�亳 仗仂从�亠�舒�� �亠�亳�亠"
 
-#: src/protocols/jabber/jabber.c:133
+#: src/protocols/jabber/jabber.c:122
 msgid "Bad Format"
 msgstr "�仂� 仂弍仍亳从"
 
-#: src/protocols/jabber/jabber.c:135
+#: src/protocols/jabber/jabber.c:124
 msgid "Bad Namespace Prefix"
 msgstr "�仂� 仗�亠亟仄亠�舒从 仗�仂��仂�舒 亳仄亠仆舒"
 
-#: src/protocols/jabber/jabber.c:138
+#: src/protocols/jabber/jabber.c:127
 msgid "Resource Conflict"
 msgstr "弌�亟舒� �亠����舒"
 
-#: src/protocols/jabber/jabber.c:140
+#: src/protocols/jabber/jabber.c:129
 msgid "Connection Timeout"
 msgstr "��亠仄亠仆�从亳 �仂从 于亠亰亠"
 
-#: src/protocols/jabber/jabber.c:142
+#: src/protocols/jabber/jabber.c:131
 msgid "Host Gone"
 msgstr "�仂仄舒�亳仆 �亠 仆亠��舒仂"
 
-#: src/protocols/jabber/jabber.c:144
+#: src/protocols/jabber/jabber.c:133
 msgid "Host Unknown"
 msgstr "�仂仄舒�亳仆 �亠 仆亠仗仂亰仆舒�"
 
-#: src/protocols/jabber/jabber.c:146
+#: src/protocols/jabber/jabber.c:135
 msgid "Improper Addressing"
 msgstr "�亠仂亟亞仂于舒�舒���亠 舒亟�亠�亳�舒�亠"
 
-#: src/protocols/jabber/jabber.c:148
+#: src/protocols/jabber/jabber.c:137
 msgid "Internal Server Error"
 msgstr "丕仆���舒��舒 亞�亠�从舒 �亠�于亠�舒"
 
-#: src/protocols/jabber/jabber.c:150
+#: src/protocols/jabber/jabber.c:139
 msgid "Invalid ID"
 msgstr "�亠亳�仗�舒于舒仆 ��"
 
-#: src/protocols/jabber/jabber.c:152
+#: src/protocols/jabber/jabber.c:141
 msgid "Invalid Namespace"
 msgstr "�亠亳�仗�舒于舒仆 仗�仂��仂� 亳仄亠仆舒"
 
-#: src/protocols/jabber/jabber.c:154
+#: src/protocols/jabber/jabber.c:143
 msgid "Invalid XML"
 msgstr "�亠亳�仗�舒于舒仆 XML"
 
-#: src/protocols/jabber/jabber.c:156
+#: src/protocols/jabber/jabber.c:145
 msgid "Non-matching Hosts"
 msgstr "�亠仗仂从仍舒仗舒���亳 亟仂仄舒�亳仆亳"
 
-#: src/protocols/jabber/jabber.c:160
+#: src/protocols/jabber/jabber.c:149
 msgid "Policy Violation"
 msgstr "��亠从仂�舒�亠�亠 仂于仍舒��亠�舒"
 
-#: src/protocols/jabber/jabber.c:162
+#: src/protocols/jabber/jabber.c:151
 msgid "Remote Connection Failed"
 msgstr "丕亟舒�亠仆舒 于亠亰舒 仆亠��仗亠�仆舒"
 
-#: src/protocols/jabber/jabber.c:164
+#: src/protocols/jabber/jabber.c:153
 msgid "Resource Constraint"
 msgstr "�亞�舒仆亳�亠�亠 �亠����舒"
 
-#: src/protocols/jabber/jabber.c:166
+#: src/protocols/jabber/jabber.c:155
 msgid "Restricted XML"
 msgstr "�亞�舒仆亳�亠仆亳 XML"
 
-#: src/protocols/jabber/jabber.c:168
+#: src/protocols/jabber/jabber.c:157
 msgid "See Other Host"
 msgstr "�仂亞仍亠亟舒��亠 亟��亞仂亞 亟仂仄舒�亳仆舒"
 
-#: src/protocols/jabber/jabber.c:170
+#: src/protocols/jabber/jabber.c:159
 msgid "System Shutdown"
 msgstr "�舒�亠�亠 �亳��亠仄舒"
 
-#: src/protocols/jabber/jabber.c:172
+#: src/protocols/jabber/jabber.c:161
 msgid "Undefined Condition"
 msgstr "�亠亟亠�亳仆亳�舒仆亳 ��仍仂于"
 
-#: src/protocols/jabber/jabber.c:174
+#: src/protocols/jabber/jabber.c:163
 msgid "Unsupported Encoding"
 msgstr "�亠仗仂亟�亢舒仆仂 从仂亟亳�舒�亠"
 
 # ���仂�舒 弍舒� 亳 仆亳�亠 仂亟亞仂于舒�舒���舒 :-)
-#: src/protocols/jabber/jabber.c:176
+#: src/protocols/jabber/jabber.c:165
 msgid "Unsupported Stanza Type"
 msgstr "�亠仗仂亟�亢舒仆舒 于���舒 仂亟亠�从舒"
 
-#: src/protocols/jabber/jabber.c:178
+#: src/protocols/jabber/jabber.c:167
 msgid "Unsupported Version"
 msgstr "�亠仗仂亟�亢舒仆仂 亳亰亟舒�亠"
 
-#: src/protocols/jabber/jabber.c:180
+#: src/protocols/jabber/jabber.c:169
 msgid "XML Not Well Formed"
 msgstr "XML 仆亳�亠 亟仂弍�仂 �舒�亳�亠仆"
 
-#: src/protocols/jabber/jabber.c:182
+#: src/protocols/jabber/jabber.c:171
 msgid "Stream Error"
 msgstr "��亠�从舒 �仂从舒"
 
-#: src/protocols/jabber/jabber.c:245 src/protocols/msn/httpmethod.c:216
+#: src/protocols/jabber/jabber.c:234 src/protocols/msn/httpmethod.c:234
 #: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
 #: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:536 src/protocols/msn/msn.c:647
-#: src/protocols/msn/msn.c:663 src/protocols/msn/msn.c:711
-#: src/protocols/msn/msn.c:734 src/protocols/msn/msn.c:766
-#: src/protocols/msn/msn.c:774 src/protocols/msn/msn.c:807
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:829
-#: src/protocols/msn/msn.c:838 src/protocols/msn/msn.c:852
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:926
-#: src/protocols/msn/msn.c:964 src/protocols/msn/msn.c:1062
-#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1115
-#: src/protocols/msn/msn.c:1126 src/protocols/msn/msn.c:1137
-#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1173
-#: src/protocols/msn/msn.c:1243 src/protocols/msn/notification.c:179
-#: src/protocols/msn/notification.c:207 src/protocols/msn/notification.c:1668
-#: src/protocols/msn/notification.c:1688 src/protocols/trepia/trepia.c:248
+#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
+#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
+#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
+#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
+#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
+#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
+#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
+#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
 #: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
 #: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
 #: src/protocols/trepia/trepia.c:1232
 msgid "Write error"
 msgstr "��亠�从舒 仗�亳 仗亳�舒��"
 
-#: src/protocols/jabber/jabber.c:282 src/protocols/jabber/jabber.c:302
+#: src/protocols/jabber/jabber.c:272 src/protocols/jabber/jabber.c:292
 msgid "Read Error"
 msgstr "��亠�从舒 仗�亳 �亳�舒��"
 
-#: src/protocols/jabber/jabber.c:356
+#: src/protocols/jabber/jabber.c:346
 msgid "SSL Handshake Failed"
 msgstr "�亠��仗亠�仆仂 SSL ��从仂于舒�亠"
 
-#: src/protocols/jabber/jabber.c:393 src/protocols/jabber/jabber.c:687
+#: src/protocols/jabber/jabber.c:383 src/protocols/jabber/jabber.c:681
 msgid "Invalid Jabber ID"
 msgstr "�亠亳�仗�舒于舒仆 �舒弍亠� ��"
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:721
+#: src/protocols/jabber/jabber.c:411 src/protocols/jabber/jabber.c:708
+msgid "SSL support unavailable"
+msgstr "SSL 仗仂亟��从舒 �亠 仆亠亟仂���仗仆舒"
+
+#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:718
 #: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "�亠 仄仂亞� 仆舒�亳仆亳�亳 �仂从亠�"
 
-#: src/protocols/jabber/jabber.c:452
+#: src/protocols/jabber/jabber.c:446
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "�亠亞亳���舒�亳�舒 %s@%s ��仗亠�仆舒"
 
-#: src/protocols/jabber/jabber.c:454 src/protocols/jabber/jabber.c:455
+#: src/protocols/jabber/jabber.c:448 src/protocols/jabber/jabber.c:449
 msgid "Registration Successful"
 msgstr "�亠亞亳���舒�亳�舒 ��仗亠�仆舒"
 
-#: src/protocols/jabber/jabber.c:464
-msgid "Unknown Error"
-msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒"
-
-#: src/protocols/jabber/jabber.c:467
+#: src/protocols/jabber/jabber.c:461
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr "�亠亞亳���舒�亳�舒 %s@%s 仆亠��仗亠�仆舒: %s"
 
-#: src/protocols/jabber/jabber.c:469 src/protocols/jabber/jabber.c:470
+#: src/protocols/jabber/jabber.c:463 src/protocols/jabber/jabber.c:464
 msgid "Registration Failed"
 msgstr "��亠�从舒 仗�亳 �亠亞亳���舒�亳�亳"
 
-#: src/protocols/jabber/jabber.c:568 src/protocols/jabber/jabber.c:569
+#: src/protocols/jabber/jabber.c:562 src/protocols/jabber/jabber.c:563
 msgid "Already Registered"
 msgstr "�亠� �亠 �亠亞亳���仂于舒仆"
 
-#: src/protocols/jabber/jabber.c:582 src/protocols/jabber/jabber.c:1013
+#: src/protocols/jabber/jabber.c:576 src/protocols/jabber/jabber.c:1011
 msgid "Password"
 msgstr "�仂亰亳仆从舒"
 
-#: src/protocols/jabber/jabber.c:593
+#: src/protocols/jabber/jabber.c:587
 msgid "E-Mail"
 msgstr "�-仗仂��舒"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:603 src/protocols/oscar/oscar.c:3959
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3967
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "�仄亠"
 
 #. State
-#: src/protocols/jabber/jabber.c:623 src/protocols/oscar/oscar.c:4011
-#: src/protocols/oscar/oscar.c:4027 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "�弍仍舒��"
 
-#: src/protocols/jabber/jabber.c:633
+#: src/protocols/jabber/jabber.c:627
 msgid "Phone"
 msgstr "丐亠仍亠�仂仆"
 
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:637
+msgid "Date"
+msgstr "�舒��仄"
+
+#: src/protocols/jabber/jabber.c:645
 msgid "Please fill out the information below to register your new account."
 msgstr "�仂仍亳仄 亳�仗�仆亳�亠 仗仂亟舒�从亠 亳�仗仂亟 亟舒 �亠亞亳�����亠�亠 仆仂于亳 仆舒仍仂亞."
 
-#: src/protocols/jabber/jabber.c:654 src/protocols/jabber/jabber.c:655
+#: src/protocols/jabber/jabber.c:648 src/protocols/jabber/jabber.c:649
 msgid "Register New Jabber Account"
 msgstr "�亠亞亳����� 仆仂于亳 �舒弍亠� 仆舒仍仂亞"
 
-#: src/protocols/jabber/jabber.c:769 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
+#: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1923
+#: src/protocols/yahoo/yahoo.c:2057
 msgid "Connecting"
 msgstr "丕�仗仂��舒于�舒�亠 于亠亰亠"
 
-#: src/protocols/jabber/jabber.c:773
+#: src/protocols/jabber/jabber.c:771
 msgid "Initializing Stream"
 msgstr "�仂从�亠�舒�亠 �仂从舒"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:777
 msgid "Authenticating"
 msgstr "�亟亠仆�亳�亳从舒�亳�舒"
 
-#: src/protocols/jabber/jabber.c:787
+#: src/protocols/jabber/jabber.c:785
 msgid "Re-initializing Stream"
 msgstr "�仂仆仂于仆仂 仗仂从�亠�舒�亠 �仂从舒"
 
-#: src/protocols/jabber/jabber.c:911 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:270
+#: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/presence.c:296
 msgid "Error"
 msgstr "��亠�从舒"
 
-#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/jabber.c:925 src/protocols/jabber/jutil.c:101
 #: src/protocols/jabber/presence.c:82
 msgid "Chatty"
 msgstr "��亳��亳于"
 
-#: src/protocols/jabber/jabber.c:929 src/protocols/jabber/jutil.c:104
+#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:104
 #: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
 msgstr "��仂亟�亢亠仆仂 仂亟����于仂"
 
-#: src/protocols/jabber/jabber.c:930 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
-#: src/protocols/oscar/oscar.c:4591 src/protocols/oscar/oscar.c:6136
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6164
 msgid "Do Not Disturb"
 msgstr "�亠 �亰仆亠仄亳�舒于舒�"
 
-#: src/protocols/jabber/jabber.c:946
+#: src/protocols/jabber/jabber.c:944
 msgid "Password Changed"
 msgstr "�仂亰亳仆从舒 亳亰仄亠�亠仆舒"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:945
 msgid "Your password has been changed."
 msgstr "�舒�舒 仍仂亰亳仆从舒 �亠 亳亰仄亠�亠仆舒."
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:955
 #, c-format
 msgid "Error changing password: %s"
 msgstr "��亠�从舒 仗�亳 亳亰仄亠仆亳 仍仂亰亳仆从亠: %s"
 
-#: src/protocols/jabber/jabber.c:961
+#: src/protocols/jabber/jabber.c:959
 msgid "Unknown error occurred changing password"
 msgstr "�仂�仍仂 �亠 亟仂 仆亠仗仂亰仆舒�亠 亞�亠�从亠 仗�亳 亳亰仄亠仆亳 仍仂亰亳仆从亠"
 
-#: src/protocols/jabber/jabber.c:1018
+#: src/protocols/jabber/jabber.c:1016
 msgid "Password (again)"
 msgstr "�仂亰亳仆从舒 (仗仂仆仂于亳�亠)"
 
-#: src/protocols/jabber/jabber.c:1023 src/protocols/jabber/jabber.c:1024
+#: src/protocols/jabber/jabber.c:1021 src/protocols/jabber/jabber.c:1022
 msgid "Change Jabber Password"
 msgstr "�亰仄亠仆亳�亠 �舒弍亠� 仍仂亰亳仆从�"
 
-#: src/protocols/jabber/jabber.c:1024
+#: src/protocols/jabber/jabber.c:1022
 msgid "Please enter your new password"
 msgstr "丕仆亠�亳�亠 仆仂于� 仍仂亰亳仆从�"
 
+#: src/protocols/jabber/jabber.c:1034 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "�仂��舒于亳 仗仂亟舒�从亠 仂 从仂�亳�仆亳从�"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5256,15 +5234,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1122 src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1120 src/protocols/jabber/jabber.c:1122
 msgid "Jabber Protocol Plugin"
 msgstr "�仂亟舒�舒从 亰舒 �舒弍亠� 仗�仂�仂从仂仍"
 
-#: src/protocols/jabber/jabber.c:1148
-msgid "Force Old SSL"
+#: src/protocols/jabber/jabber.c:1146
+msgid "Use TLS if available"
+msgstr "�仂�亳��亳 TLS 舒从仂 �亠 亟仂���仗舒仆"
+
+#: src/protocols/jabber/jabber.c:1151
+msgid "Force old SSL"
 msgstr "�舒仄亠�仆亳 ��舒�亳 弌弌�"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1159
 msgid "Connect server"
 msgstr "�仂于亠亰亳于舒�亠 �舒 �亠�于亠�仂仄"
 
@@ -5273,16 +5255,16 @@
 msgid "Message from %s"
 msgstr "�仂��从舒 仂亟 %s"
 
-#: src/protocols/jabber/message.c:219
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "��仗仂��从舒 仗仂��从亠 亰舒 %s 仆亳�亠 ��仗亠仍舒: %s"
 
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "�舒弍亠� 亞�亠�从舒 仗仂��从亠"
 
-#: src/protocols/jabber/message.c:281
+#: src/protocols/jabber/message.c:288
 #, c-format
 msgid " (Code %s)"
 msgstr " (从担亟 %s)"
@@ -5291,25 +5273,20 @@
 msgid "XML Parse error"
 msgstr "��亠�从舒 仗�亳 XML 仂弍�舒亟亳"
 
-#: src/protocols/jabber/presence.c:170
-#, c-format
-msgid "%s (Code %s)"
-msgstr "%s (从担亟 %s)"
-
-#: src/protocols/jabber/presence.c:175
+#: src/protocols/jabber/presence.c:177
 msgid "Unknown Error in presence"
 msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒 � 仗�亳����于�"
 
-#: src/protocols/jabber/presence.c:179
+#: src/protocols/jabber/presence.c:182
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "�仂�亳�仆亳从 %s 亢亠仍亳 亟舒 �舒� 亟仂亟舒 仆舒 �于仂� �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/jabber/presence.c:260 src/protocols/oscar/oscar.c:2949
+#: src/protocols/jabber/presence.c:286 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒"
 
-#: src/protocols/jabber/presence.c:266
+#: src/protocols/jabber/presence.c:292
 msgid "Unable to join chat"
 msgstr "�亠 仄仂亞� 仗�亳���仗亳�亳 �舒亰亞仂于仂��"
 
@@ -5323,7 +5300,7 @@
 msgstr "�亠��仗亠�仆仂 �仍舒�亠 亟舒�仂�亠从亠"
 
 #: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:520
+#: src/protocols/msn/notification.c:521
 msgid "Unable to request USR\n"
 msgstr "�亠 仄仂亞� 亟舒 亰舒��舒亢亳仄 USR\n"
 
@@ -5343,15 +5320,15 @@
 msgid "Protocol version not supported"
 msgstr "�亰亟舒�亠 仗�仂�仂从仂仍舒 仆亳�亠 仗仂亟�亢舒仆仂"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:784
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:785
 msgid "Unable to request CVR\n"
 msgstr "�亠 仄仂亞� 亟舒 亰舒��舒亢亳仄 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:793
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:794
 msgid "Unable to request INF\n"
 msgstr "�亠 仄仂亞� 亟舒 亰舒��舒亢亳仄 INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1915
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1911
 msgid "Got invalid XFR"
 msgstr "��亳仄�亠仆 仆亠亳�仗�舒于舒仆 XFR"
 
@@ -5364,23 +5341,23 @@
 msgid "Unable to parse message."
 msgstr "�亠 仄仂亞� 亟舒 仂弍�舒亟亳仄 仗仂��从�."
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
-#: src/protocols/msn/notification.c:2145 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
+#: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1849
+#: src/protocols/yahoo/yahoo.c:1880 src/protocols/yahoo/yahoo.c:1945
 msgid "Unable to connect"
 msgstr "�亠仄仂亞��亠 仗仂于亠亰亳于舒�亠"
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:889
-#: src/protocols/msn/notification.c:2167
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:890
+#: src/protocols/msn/notification.c:2171
 msgid "Unable to write to server"
 msgstr "�亠 仄仂亞� 亟舒 仗亳�亠仄 仆舒 �亠�于亠�"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2174
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2178
 msgid "Syncing with server"
 msgstr "丕�从仍舒�亳于舒�亠 �舒 �亠�于亠�仂仄"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2188
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2192
 msgid "Error reading from server"
 msgstr "��亠�从舒 仗�亳 �亳�舒�� �舒 �亠�于亠�舒"
 
@@ -5529,8 +5506,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 仗舒�舒仄亠��亳 �� 亳仍亳 仆亠仗仂亰仆舒�亳 亳仍亳 仆亠亟仂亰于仂�亠仆亳"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:635
-#: src/protocols/msn/notification.c:1282 src/protocols/msn/notification.c:1450
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
 msgid "Unable to write"
 msgstr "�亠 仄仂亞� 亟舒 仗亳�亠仄"
 
@@ -5641,41 +5617,41 @@
 msgid "Page"
 msgstr "弌��舒仆亳�舒"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2283
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>弌�舒�亠:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:623
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "�亟���舒仆 仂亟 �舒��仆舒�舒"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:625
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2151
+#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2584
 msgid "Be Right Back"
 msgstr "�亟仄舒� �亠 于�舒�舒仄"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:627
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2153
+#: src/protocols/yahoo/yahoo.c:2478 src/protocols/yahoo/yahoo.c:2585
 msgid "Busy"
 msgstr "�舒�亰亠�"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:629
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2161
+#: src/protocols/yahoo/yahoo.c:2486 src/protocols/yahoo/yahoo.c:2589
 msgid "On The Phone"
 msgstr "丐亠仍亠�仂仆亳�舒仄"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:631
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2165
+#: src/protocols/yahoo/yahoo.c:2490 src/protocols/yahoo/yahoo.c:2591
 msgid "Out To Lunch"
 msgstr "�舒 ���从� �舒仄"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
 #: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "弌从�亳于亠仆"
@@ -5716,7 +5692,7 @@
 msgid "SSL support is needed for MSN. Please install it."
 msgstr "SSL 仗仂亟��从舒 �亠 仆亠仂仗�仂亟仆舒 亰舒 MSN. �仆��舒仍亳�舒��亠 �亠."
 
-#: src/protocols/msn/msn.c:747
+#: src/protocols/msn/msn.c:745
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5725,11 +5701,11 @@
 "�弌� 从仂�亳�仆亳�从仂 亳仄亠 仄仂�舒 弍亳�亳 仂弍仍亳从舒 ��从仂�亳�仆亳从@�亠�于亠�.����. �亠�仂于舒�仆仂 ��亠 "
 "亢亠仍亠仍亳 ��%s@hotmail.com��. 丕 于舒�亠仄 �仗亳�从� 亟仂亰于仂仍舒 仆亳�� ��亳�亠仆亠 亳亰仄亠仆亠."
 
-#: src/protocols/msn/msn.c:751 src/protocols/msn/msn.c:791
+#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
 msgid "Invalid MSN screenname"
 msgstr "�亠亳�仗�舒于仆仂 �弌� 从仂�亳�仆亳�从仂 亳仄亠"
 
-#: src/protocols/msn/msn.c:787
+#: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5738,73 +5714,73 @@
 "�弌� 从仂�亳�仆亳�从仂 亳仄亠 仄仂�舒 弍亳�亳 仂弍仍亳从舒 ��从仂�亳�仆亳从@�亠�于亠�.����. �亠�仂于舒�仆仂 ��亠 "
 "亢亠仍亠仍亳 ��%s@hotmail.com��. 丕 于舒�亠仄 �仗亳�从� 亰舒弍�舒仆舒 仆亳�� ��亳�亠仆亠 亳亰仄亠仆亠."
 
-#: src/protocols/msn/msn.c:1267 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2767
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>��亠�从舒 仗�亳 仗�亠�亰亳仄舒�� 仗�仂�亳仍舒</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1335 src/protocols/oscar/oscar.c:3993
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/yahoo/yahoo.c:2877
 msgid "Age"
 msgstr "弌�舒�仂��"
 
 #. Gender
-#: src/protocols/msn/msn.c:1342 src/protocols/oscar/oscar.c:3979
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2705
+#: src/protocols/yahoo/yahoo.c:2885
 msgid "Gender"
 msgstr "�仂仍"
 
-#: src/protocols/msn/msn.c:1350 src/protocols/yahoo/yahoo.c:2699
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2881
 msgid "Marital Status"
 msgstr "��舒�仆仂 ��舒�亠"
 
-#: src/protocols/msn/msn.c:1357 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2873
 msgid "Location"
 msgstr "�亠��仂"
 
-#: src/protocols/msn/msn.c:1365 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2889
 msgid "Occupation"
 msgstr "�舒仆亳仄舒�亠"
 
-#: src/protocols/msn/msn.c:1382 src/protocols/msn/msn.c:1388
-#: src/protocols/msn/msn.c:1395 src/protocols/msn/msn.c:1402
-#: src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1431
 msgid "A Little About Me"
 msgstr "�仂仆亠��仂 仂 仄亠仆亳"
 
-#: src/protocols/msn/msn.c:1418 src/protocols/msn/msn.c:1431
-#: src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Favorite Things"
 msgstr "�仄亳�亠仆亠 ��于舒�亳"
 
-#: src/protocols/msn/msn.c:1447 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1482
 msgid "Hobbies and Interests"
 msgstr "丱仂弍亳�亳 亳 亳仆�亠�亠�仂于舒�舒"
 
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
-#: src/protocols/yahoo/yahoo.c:2755
+#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
+#: src/protocols/yahoo/yahoo.c:2924
 msgid "Favorite Quote"
 msgstr "�仄亳�亠仆舒 亳亰�亠从舒"
 
-#: src/protocols/msn/msn.c:1483 src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2960
 msgid "Last Updated"
 msgstr "�仂�仍亠亟�舒 亟仂仗�仆舒"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "�亳�仆舒 ���舒仆亳�舒"
 
-#: src/protocols/msn/msn.c:1516 src/protocols/yahoo/yahoo.c:2817
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2975
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�仂亟舒�亳 仂 从仂�亳�仆亳从� %s 仆亠亟仂���仗仆亳"
 
-#: src/protocols/msn/msn.c:1518 src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2977
 msgid "The user's profile is empty."
 msgstr "��仂�亳仍 从仂�亳�仆亳从舒 �亠 仗�舒亰舒仆."
 
@@ -5818,15 +5794,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1616 src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1638 src/protocols/msn/msn.c:1640
 msgid "MSN Protocol Plugin"
 msgstr "�仂亟舒�舒从 亰舒 �弌� 仗�仂�仂从仂仍"
 
-#: src/protocols/msn/msn.c:1635 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1657 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "弌亠�于亠� 亰舒 仗�亳�舒于�"
 
-#: src/protocols/msn/msn.c:1645
+#: src/protocols/msn/msn.c:1666
 msgid "Use HTTP Method"
 msgstr "�仂�亳��亳 HTTP �亠亢亳仄"
 
@@ -5839,72 +5815,72 @@
 msgid "Unable to connect to server"
 msgstr "�亠 仄仂亞� 亟舒 �亠 仗仂于亠亢亠仄 仆舒 �亠�于亠�"
 
-#: src/protocols/msn/notification.c:376 src/protocols/msn/notification.c:545
+#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
 msgid "Unable to write to MSN Nexus server."
 msgstr "�亠 仄仂亞� 亟舒 仗亳�亠仄 仆舒 �弌� �亠从��� �亠�于亠�"
 
-#: src/protocols/msn/notification.c:385 src/protocols/msn/notification.c:560
+#: src/protocols/msn/notification.c:386 src/protocols/msn/notification.c:561
 msgid "Unable to read from MSN Nexus server."
 msgstr "�亠 仄仂亞� 亟舒 ��亳�舒仄 亰舒亞仍舒于�亠 �舒 �弌� �亠从��� �亠�于亠�舒"
 
-#: src/protocols/msn/notification.c:405
+#: src/protocols/msn/notification.c:406
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "�弌� �亠从��� �亠�于亠� �亠 于�舒�亳仂 仆亠亳�仗�舒于仆亠 仗仂亟舒�从亠 仂 仗�亠��仄亠�舒于舒��."
 
-#: src/protocols/msn/notification.c:459
+#: src/protocols/msn/notification.c:460
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 "�亠仗仂亰仆舒�舒 亞�亠�从舒 仗�亳 仗仂从��舒�� 亳亟亠仆�亳�亳从舒�亳�亠 仆舒 �弌�-仂于仂仄 �亠�于亠�� 亰舒 仗�亳�舒于�."
 
-#: src/protocols/msn/notification.c:571
+#: src/protocols/msn/notification.c:572
 msgid "MSN Nexus server returned invalid information."
 msgstr "�弌� �亠从��� �亠�于亠� �亠 于�舒�亳仂 仆亠亳�仗�舒于仆亠 仗仂亟舒�从亠."
 
-#: src/protocols/msn/notification.c:640 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "��亠�亰亳仄舒仄 �仗亳�舒从 亟��亞舒�舒"
 
-#: src/protocols/msn/notification.c:703
+#: src/protocols/msn/notification.c:704
 msgid "Unable to connect to passport server"
 msgstr "�亠 仄仂亞� 亟舒 �亠 仗仂于亠亢亠仄 仆舒 �亠�于亠� 仗舒�仂�舒"
 
-#: src/protocols/msn/notification.c:708 src/protocols/msn/notification.c:740
+#: src/protocols/msn/notification.c:709 src/protocols/msn/notification.c:741
 #: src/protocols/oscar/oscar.c:1362
 msgid "Password sent"
 msgstr "�仂亰亳仆从舒 仗仂�仍舒�舒"
 
-#: src/protocols/msn/notification.c:735
+#: src/protocols/msn/notification.c:736
 msgid "Unable to send password"
 msgstr "�亠 仄仂亞� 亟舒 仗仂�舒�亠仄 仍仂亰亳仆从�"
 
-#: src/protocols/msn/notification.c:771
+#: src/protocols/msn/notification.c:772
 msgid "Protocol not supported"
 msgstr "��仂从仂仍 仆亳�亠 仗仂亟�亢舒仆"
 
-#: src/protocols/msn/notification.c:813
+#: src/protocols/msn/notification.c:814
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "�亠亰舒 �舒仄 �亠 仗�亠从亳仆��舒, 仗�亳�舒于亳仍亳 ��亠 �亠 �舒 仆亠从仂亞 亟��亞仂亞 仄亠��舒."
 
-#: src/protocols/msn/notification.c:818
+#: src/protocols/msn/notification.c:819
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "�亠亰舒 �舒仄 �亠 仗�亠从亳仆��舒. ��亳于�亠仄亠仆仂 �亠 亞舒�亠 �弌� �亠�于亠�亳."
 
-#: src/protocols/msn/notification.c:944
+#: src/protocols/msn/notification.c:945
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "�仂�亳�仆亳从 %s (%s) 亢亠仍亳 亟舒 亟仂亟舒 %s � �于仂� �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/msn/notification.c:1263 src/protocols/msn/notification.c:1429
+#: src/protocols/msn/notification.c:1264 src/protocols/msn/notification.c:1429
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "�仂�亳�仆亳从 %s (%s) 亢亠仍亳 亟舒 �舒� 亟仂亟舒 � �于仂� �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/msn/notification.c:1960
+#: src/protocols/msn/notification.c:1956
 msgid "Unable to transfer to notification server"
 msgstr "�亠 仄仂亞� 亟舒 �亠 �仗仂�舒亰�仄亠仄 �舒 �亠�于亠�仂仄 亰舒 仂弍舒于亠��亠�舒"
 
 # bug: plural-forms
-#: src/protocols/msn/notification.c:2108
+#: src/protocols/msn/notification.c:2112
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5936,7 +5912,7 @@
 "\n"
 "�舒从仂仆 ��仂 �亠 仂亟�亢舒于舒�亠 亰舒于��亳, 仄仂�亳 �亠�亠 �亠 仗仂仆仂于仂 仗�亳�舒于亳�亳."
 
-#: src/protocols/msn/servconn.c:528
+#: src/protocols/msn/servconn.c:533
 msgid "Received HTTP error. Please report this."
 msgstr "��亳仄亳仂 �亠 HTTP 亞�亠�从�. ��亳�舒于亳�亠 仂于仂."
 
@@ -5996,10 +5972,10 @@
 msgid "%s requested a PING"
 msgstr "%s 亰舒��亠于舒 仗亳仆亞"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5205
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
 #: src/protocols/toc/toc.c:1259
-msgid "Join what group:"
-msgstr "��亳从���亳 �亠 亞��仗亳 (从仂�仂�?):"
+msgid "_Group:"
+msgstr "_���仗舒:"
 
 #. *< api_version
 #. *< type
@@ -6157,7 +6133,8 @@
 msgstr "�亠亰舒 �亠 ��仗仂��舒于�亠仆舒, 从仂仍舒�亳� �亠 仗仂�仍舒�"
 
 #: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:204
+#: src/protocols/yahoo/yahoo_filexfer.c:212
 msgid "File Transfer Aborted"
 msgstr "��亠仆仂� 亟舒�仂�亠从亠 �亠 仂弍���于舒�亠仆"
 
@@ -6167,7 +6144,8 @@
 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:868
+#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:205
+#: src/protocols/yahoo/yahoo_filexfer.c:213
 msgid "Unable to establish file descriptor."
 msgstr "�亠 仄仂亞� 亟舒 ��仗仂��舒于亳仄 仂仗亳�仆亳从 亟舒�仂�亠从亠."
 
@@ -6228,21 +6206,21 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "�舒亳仄 仆亳�亠 ��仗亠仂 亟舒 仗�亳仄亳 亳�仗�舒于舒仆 �亠� 亰舒 仗�亳�舒于�."
 
-#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5643
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5671
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "�亠仗仂��亠亟舒仆 �舒亰亞仂于仂� �舒 %s �亠 仂仄仂亞��亠仆"
 
-#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
+#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
 msgid "(There was an error receiving this message)"
 msgstr "(�仂�仍仂 �亠 亟仂 亞�亠�从亠 仗�亳 仗�亳�亠仄� 仂于亠 仗仂��从亠)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s �亠 �仗�舒于仂 亰舒��舒亢亳仂 仆亠仗仂��亠亟仆� 于亠亰� �舒 %s"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2414
 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 "
@@ -6252,23 +6230,23 @@
 "�仍亳从舒. �仂��仂 �亠 �亠 �舒�舒 �� 舒亟�亠�舒 仗�亳从舒亰舒�亳, 仂于仂 �亠 仄仂亢亠 �仄舒��舒�亳 "
 "仆舒���舒于舒�亠仄 仗�亳于舒�仆仂��亳."
 
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6040
 msgid "Connect"
 msgstr "丕�仗仂��舒于亳 于亠亰�"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2446
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "�舒� 仄亳 仂于仍舒��亠�亠 从舒从仂 弍亳� 仄仂亞舒仂 亟舒 �亠 亟仂亟舒仄 � �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2454
 msgid "Authorization Request Message:"
 msgstr "�仂��从舒 �亰 亰舒��亠于 亰舒 仂于仍舒��亠�亠:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2455
 msgid "Please authorize me!"
 msgstr "�于仍舒��亳 仄亠!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2483
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6277,23 +6255,23 @@
 "�仂�亳�仆亳从 %s 亰舒��亠于舒 仂于仍舒��亠�亠 仗�亠 仆亠亞仂 ��仂 亞舒 仄仂亢亠�亠 亟仂亟舒�亳 � �仗亳�舒从 "
 "亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 仗仂�舒�亠�亠 亰舒��亠于 亰舒 仂于仍舒��亠�亠?"
 
-#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
 msgid "Request Authorization"
 msgstr "�舒��亠于舒� 仂于仍舒��亠�亠"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3043 src/protocols/oscar/oscar.c:5126
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5180
 msgid "No reason given."
 msgstr "�舒亰仍仂亞 仆亳�亠 仆舒于亠亟亠仆."
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2534
 msgid "Authorization Denied Message:"
 msgstr "�舒亰仍仂亞 仂亟弍亳�舒�舒 仂于仍舒��亠�舒:"
 
-#: src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6303,11 +6281,11 @@
 "�舒亰仍仂亞:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "�舒��亠于 亰舒 仂于仍舒��亠�亠"
 
-#: src/protocols/oscar/oscar.c:2630
+#: src/protocols/oscar/oscar.c:2631
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6318,17 +6296,17 @@
 "舒 仆舒于亠仂 �亠 �仍亠亟亠�亳 �舒亰仍仂亞:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2632
 msgid "ICQ authorization denied."
 msgstr "ICQ 仂于仍舒��亠�亠 仂亟弍亳�亠仆仂."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2638
+#: src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Korisnik %u �亠 仗�亳�于舒�亳仂 �舒� 亰舒��亠于 亟舒 亞舒 亟仂亟舒�亠 � �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/oscar/oscar.c:2646
+#: src/protocols/oscar/oscar.c:2647
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6341,7 +6319,7 @@
 "�亟: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2654
+#: src/protocols/oscar/oscar.c:2655
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6354,7 +6332,7 @@
 "�亟: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2662
+#: src/protocols/oscar/oscar.c:2663
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6367,20 +6345,20 @@
 "�仂��从舒 亞仍舒�亳:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:2684
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 从仂�亳�仆亳从 %u �舒仄 �亠 仗仂�仍舒仂 从仂仆�舒从�: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:2690
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "�舒 仍亳 亢亠仍亳�亠 亟舒 亟仂亟舒�亠 仂于舒� 从仂仆�舒从� � �仗亳�舒从 亟��亞舒�舒?"
 
-#: src/protocols/oscar/oscar.c:2693
+#: src/protocols/oscar/oscar.c:2694
 msgid "Decline"
 msgstr "�亟弍亳�"
 
-#: src/protocols/oscar/oscar.c:2775
+#: src/protocols/oscar/oscar.c:2776
 #, 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."
@@ -6388,7 +6366,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 �� 弍亳仍亠 仆亠亳�仗�舒于仆亠."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 �� 弍亳仍亠 仆亠亳�仗�舒于仆亠."
 
-#: src/protocols/oscar/oscar.c:2784
+#: src/protocols/oscar/oscar.c:2785
 #, 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."
@@ -6396,7 +6374,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 �� 弍亳仍亠 仗�亠于亠仍亳从亠."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 �� 弍亳仍亠 仗�亠于亠仍亳从亠."
 
-#: src/protocols/oscar/oscar.c:2793
+#: src/protocols/oscar/oscar.c:2794
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6406,7 +6384,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 �亠 仂亞�舒仆亳�亠�亠 仗�亠从仂�舒�亠仆仂."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 �亠 仂亞�舒仆亳�亠�亠 仗�亠从仂�舒�亠仆仂."
 
-#: src/protocols/oscar/oscar.c:2802
+#: src/protocols/oscar/oscar.c:2803
 #, 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."
@@ -6414,7 +6392,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 �亠 仂仆/仂仆舒 仗�亠于亳�亠 亰仍仂�亠��."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 �亠 仂仆/仂仆舒 仗�亠于亳�亠 亰仍仂�亠��."
 
-#: src/protocols/oscar/oscar.c:2811
+#: src/protocols/oscar/oscar.c:2812
 #, 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."
@@ -6422,7 +6400,7 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亰舒�仂 ��仂 ��亠 于亳 仗�亠于亳�亠 亰仍仂�亠��亳."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亰舒�仂 ��仂 ��亠 于亳 仗�亠于亳�亠 亰仍仂�亠��亳."
 
-#: src/protocols/oscar/oscar.c:2820
+#: src/protocols/oscar/oscar.c:2821
 #, 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."
@@ -6430,152 +6408,157 @@
 msgstr[1] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从亠 仂亟 %s 亳亰 仆亠仗仂亰仆舒�亳� �舒亰仍仂亞舒."
 msgstr[2] "��仂仗���亳仍亳 ��亠 %hu 仗仂��从舒 仂亟 %s 亳亰 仆亠仗仂亰仆舒�亳� �舒亰仍仂亞舒."
 
-#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6167
 msgid "Free For Chat"
 msgstr "�仂���仗舒仆 亰舒 �舒亰亞仂于仂�"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6137
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6165
 msgid "Not Available"
 msgstr "�亠亟仂���仗舒仆"
 
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6166
 msgid "Occupied"
 msgstr "�舒�亰亠�"
 
-#: src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:2847
 msgid "Web Aware"
 msgstr "��舒�亳仄 于亠弍"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2890
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>�仂�亳�仆亳�从亳 弍�仂�:</B> %s<BR><B>弌�舒�亠:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2948
+#: src/protocols/oscar/oscar.c:2949
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 仗�亳�舒于���亠 亞�亠�从�: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2985
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "�舒�舒 仗仂��从舒 亰舒 %s 仆亳�亠 仗仂�仍舒�舒:"
 
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3044
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "�仂亟舒�亳 仂 从仂�亳�仆亳从� %s 仆亠亟仂���仗仆亳:"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3083
 msgid "Voice"
 msgstr "�仍舒�"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3086
 msgid "AIM Direct IM"
 msgstr "�亠仗仂��亠亟仆舒 ��� 仗仂��从舒"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6266
 msgid "Get File"
 msgstr "��亳弍舒于亳 亟舒�仂�亠从�"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6258
+#: src/protocols/yahoo/yahoo.c:2332
 msgid "Send File"
 msgstr "�仂�舒�亳 亟舒�仂�亠从�"
 
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3099
 msgid "Games"
 msgstr "�亞�亠"
 
-#: src/protocols/oscar/oscar.c:3099
-msgid "Add-Ins"
-msgstr "�仂亟舒�亳"
-
 #: src/protocols/oscar/oscar.c:3102
-msgid "Send Buddy List"
-msgstr "�仂�舒�亳 �仗亳�舒从 亟��亞舒�舒"
+msgid "Add-Ins"
+msgstr "�仂亟舒�亳"
 
 #: src/protocols/oscar/oscar.c:3105
+msgid "Send Buddy List"
+msgstr "�仂�舒�亳 �仗亳�舒从 亟��亞舒�舒"
+
+#: src/protocols/oscar/oscar.c:3108
 msgid "ICQ Direct Connect"
 msgstr "�亠仗仂��亠亟仆舒 ICQ 于亠亰舒"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3111
 msgid "AP User"
 msgstr "�� 从仂�亳�仆亳从"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3114
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3117
 msgid "Nihilist"
 msgstr "�亳�亳仍亳��舒"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3120
 msgid "ICQ Server Relay"
 msgstr "ICQ 仗�亠��仄亠�舒于舒�亠 �亠�于亠�舒"
 
-#: src/protocols/oscar/oscar.c:3120
-msgid "Old ICQ UTF8"
-msgstr "弌�舒�亳 ICQ UTF8"
-
 #: src/protocols/oscar/oscar.c:3123
+msgid "Old ICQ UTF8"
+msgstr "弌�舒�亳 ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3126
 msgid "Trillian Encryption"
 msgstr "丐�亳仍亳�舒仆 亠仆从�亳仗�亳�舒"
 
-#: src/protocols/oscar/oscar.c:3126
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
 #: src/protocols/oscar/oscar.c:3129
-msgid "Hiptop"
-msgstr "���从�从舒"
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
 
 #: src/protocols/oscar/oscar.c:3132
+msgid "Hiptop"
+msgstr "���从�从舒"
+
+#: src/protocols/oscar/oscar.c:3135
 msgid "Security Enabled"
 msgstr "�亠亰弍亠亟仆仂�� �从���亠仆舒"
 
-#: src/protocols/oscar/oscar.c:3161
+#: src/protocols/oscar/oscar.c:3138
+msgid "Video Chat"
+msgstr "�亳亟亠仂 �舒亰亞仂于仂�"
+
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "�仂�亳�仆亳�从仂 亳仄亠: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3162
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "�亳于仂 �仗仂亰仂�亠�舒: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "�舒 于亠亰亳 仂亟: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3169
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "丼仍舒仆 仂亟: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3174
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "�亠舒从�亳于仆仂��: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3183
 msgid "Idle: <b>Active</b>"
 msgstr "�亠舒从�亳于仆仂��: <b>舒从�亳于舒仆</b>"
 
-#: src/protocols/oscar/oscar.c:3216
+#: src/protocols/oscar/oscar.c:3222
 msgid "Your AIM connection may be lost."
 msgstr "�仂亢亟舒 ��� 于亠亰舒 仗�亠从亳仆��舒."
 
-#: src/protocols/oscar/oscar.c:3610
+#: src/protocols/oscar/oscar.c:3616
 msgid "Rate limiting error."
 msgstr "��亠�从舒 仗�亳 仂亞�舒仆亳�舒于舒�� 弍�亰亳仆亠."
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3617
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6583,7 +6566,7 @@
 "�仂�仍亠亟�舒 仗仂��从舒 仆亳�亠 仗仂�仍舒�舒 亰舒�仂 ��仂 ��亠 仗�亠从仂�舒�亳仍亳 亟仂亰于仂�亠仆� 弍�亰亳仆�. "
 "弌舒�亠从舒��亠 10 �亠从�仆亟亳 亳 仗�仂弍舒��亠 仗仂仆仂于仂."
 
-#: src/protocols/oscar/oscar.c:3672
+#: src/protocols/oscar/oscar.c:3680
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6591,109 +6574,109 @@
 "�亠亰舒 �亠 仗�亠从亳仆��舒 亰舒�仂 ��仂 ��亠 �亠 仗�亳�舒于亳仍亳 仗仂亟 仂于亳仄 亳仄亠仆仂仄 �舒 仆亠从仂亞 亟��亞仂亞 "
 "仄亠��舒."
 
-#: src/protocols/oscar/oscar.c:3674
+#: src/protocols/oscar/oscar.c:3682
 msgid "You have been signed off for an unknown reason."
 msgstr "�亟�舒于�亠仆亳 ��亠 亳亰 仆亠仗仂亰仆舒�亳� �舒亰仍仂亞舒."
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3713
 msgid "Finalizing connection"
 msgstr "�仂于��舒于舒 仗仂于亠亰亳于舒�亠"
 
-#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3971
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
 msgid "Email Address"
 msgstr "�亟�亠�舒 亠-仗仂��亠"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3984
 msgid "Mobile Phone"
 msgstr "�仂弍亳仍仆亳 �亠仍亠�仂仆"
 
-#: src/protocols/oscar/oscar.c:3979 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "�亠仆�从亳"
 
-#: src/protocols/oscar/oscar.c:3979 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "���从亳"
 
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/oscar/oscar.c:4004
 msgid "Personal Web Page"
 msgstr "�亳�仆舒 于亠弍 ���舒仆亳�舒"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4007
 msgid "Additional Information"
 msgstr "�仂亟舒�仆亳 仗仂亟舒�亳"
 
-#: src/protocols/oscar/oscar.c:4003
+#: src/protocols/oscar/oscar.c:4011
 msgid "Home Address"
 msgstr "���仆舒 舒亟�亠�舒"
 
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
 msgid "Zip Code"
 msgstr "�仂��舒仆�从亳 弍�仂�"
 
-#: src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4027
 msgid "Work Address"
 msgstr "�亟�亠�舒 仆舒 仗仂�仍�"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:4043
 msgid "Work Information"
 msgstr "�仂亟舒�亳 仂 仗仂�仍�"
 
-#: src/protocols/oscar/oscar.c:4037
+#: src/protocols/oscar/oscar.c:4045
 msgid "Company"
 msgstr "��亠亟�亰亠�亠"
 
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4048
 msgid "Division"
 msgstr "�亟亠�亠�亠"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4051
 msgid "Position"
 msgstr "�仂亰亳�亳�舒"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4054
 msgid "Web Page"
 msgstr "�亠弍 ���舒仆亳�舒"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:4060
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ 仗仂亟舒�亳 亰舒 %s"
 
-#: src/protocols/oscar/oscar.c:4102
+#: src/protocols/oscar/oscar.c:4110
 msgid "Pop-Up Message"
 msgstr "��从舒���舒 仗仂��从舒"
 
-#: src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4131
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "�舒�亠亟仆亳 仆舒亟亳仄�亳 �� � 于亠亰亳 �舒 %s"
 
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4135
 msgid "Search Results"
 msgstr "�亠亰�仍�舒�亳 仗�亠��舒亞亠"
 
-#: src/protocols/oscar/oscar.c:4144
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�亳�亠 仗�仂仆舒�亠仆仂 仆亳�亳 �亠亟仆仂 仗仂从仍舒仗舒�亠 亰舒 舒亟�亠�� 亠-仗仂��亠 %s"
 
-#: src/protocols/oscar/oscar.c:4165
+#: src/protocols/oscar/oscar.c:4173
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "丐�亠弍舒�亠 亟舒 仗�亳仄亳�亠 亠-仗仂��� �舒亟亳 仗仂�于��亳于舒�舒 %s."
 
-#: src/protocols/oscar/oscar.c:4167
+#: src/protocols/oscar/oscar.c:4175
 msgid "Account Confirmation Requested"
 msgstr "�舒��亠于舒 �亠 仗仂�于�亟舒 仆舒仍仂亞舒"
 
-#: src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4203
 msgid "Error Changing Account Info"
 msgstr "��亠�从舒 仗�亳 亳亰仄亠仆亳 仗仂亟舒�舒从舒 仂 仆舒仍仂亞�"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4206
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6702,7 +6685,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亞� 亟舒 亳�仗亳�亠仄 从仂�亳�仆亳�从仂 亳仄亠 亰舒�仂 ��仂 �亠 ��舒亢亠仆仂 亳仄亠 "
 "�舒亰仍亳从��亠 仂亟 仂�亳亞亳仆舒仍舒."
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6711,7 +6694,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亞� 亟舒 亳�仗亳�亠仄 从仂�亳�仆亳�从仂 亳仄亠 亰舒�仂 ��仂 �亠 ��舒亢亠仆仂 亳仄亠 "
 "亰舒于��舒于舒 �舒亰仄舒从仂仄."
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4212
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6720,7 +6703,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亞� 亟舒 亳�仗亳�亠仄 从仂�亳�仆亳�从仂 亳仄亠 亰舒�仂 ��仂 �亠 ��舒亢亠仆仂 亳仄亠 "
 "仗�亠亟�亞舒�从仂."
 
-#: src/protocols/oscar/oscar.c:4207
+#: src/protocols/oscar/oscar.c:4215
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6729,7 +6712,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亞� 仗�仂仄亠仆亳�亳 舒亟�亠�� 亠-仗仂��亠 亰舒�仂 ��仂 �亠 于亠� 仗仂�仍舒� "
 "亰舒��亠于 亰舒 仂于仂 从仂�亳�仆亳�从仂 亳仄亠."
 
-#: src/protocols/oscar/oscar.c:4210
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6738,7 +6721,7 @@
 "��亠�从舒 0x%04x: �亠 仄仂亞� 仗�仂仄亠仆亳�亳 舒亟�亠�� 亠-仗仂��亠 亰舒�仂 ��仂 �亠 仗�亠于亳�亠 "
 "从仂�亳�仆亳�从亳� 亳仄亠仆舒 仗仂于亠亰舒仆仂 �舒 亟舒�仂仄 舒亟�亠�仂仄."
 
-#: src/protocols/oscar/oscar.c:4213
+#: src/protocols/oscar/oscar.c:4221
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6747,12 +6730,12 @@
 "��亠�从舒 0x%04x: �亠 仄仂亞� 仗�仂仄亠仆亳�亳 舒亟�亠�� 亠-仗仂��亠 亰舒�仂 ��仂 �亠 �仆亠�舒 舒亟�亠�舒 "
 "仆亠亳�仗�舒于仆舒."
 
-#: src/protocols/oscar/oscar.c:4216
+#: src/protocols/oscar/oscar.c:4224
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��亠�从舒 0x%04x: �亠仗仂亰仆舒�舒 亞�亠�从舒."
 
-#: src/protocols/oscar/oscar.c:4226
+#: src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6761,20 +6744,20 @@
 "�舒�亠 从仂�亳�仆亳�从仂 亳仄亠 ��亠仆��仆仂 亳亰亞仍亠亟舒 仂于舒从仂:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4227 src/protocols/oscar/oscar.c:4234
+#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
 msgid "Account Info"
 msgstr "�仂亟舒�亳 仂 仆舒仍仂亞�"
 
-#: src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4240
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "�亟�亠�舒 亠-仗仂��亠 亰舒 %s �亠 %s"
 
-#: src/protocols/oscar/oscar.c:4464
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "�亠 仄仂亞� 亟舒 仗仂��舒于亳仄 ��� 仗�仂�亳仍."
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:4473
 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 "
@@ -6785,7 +6768,7 @@
 "仗仂于亠亢亠�亠."
 
 # bug: plural-forms
-#: src/protocols/oscar/oscar.c:4492
+#: src/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6803,15 +6786,15 @@
 "�舒�于亠�舒 亟仂亰于仂�亠仆舒 于亠仍亳�亳仆舒 仗�仂�亳仍舒 仂亟 %d 弍舒��仂于舒 �亠 仗�亠从仂�舒�亠仆舒. �舒亳仄 亞舒 �亠 "
 "�从�舒�亳仂 亳 仗仂��舒于亳仂."
 
-#: src/protocols/oscar/oscar.c:4497
+#: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "��仂�亳仍 �亠 仗�亠亟�亞舒�舒从."
 
-#: src/protocols/oscar/oscar.c:4514
+#: src/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM away message."
 msgstr "�亠 仄仂亞� 亟舒 仗仂��舒于亳仄 仗仂��从� 亰舒 ��� 仂亟����于仂."
 
-#: src/protocols/oscar/oscar.c:4515
+#: src/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6822,7 +6805,7 @@
 "仗仂从��舒��亠 仗仂仆仂于仂 从舒亟舒 �亠 仗�仂仗亳�仆仂 仗仂于亠亢亠�亠."
 
 # bug: plural-forms
-#: src/protocols/oscar/oscar.c:4555
+#: src/protocols/oscar/oscar.c:4563
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6840,15 +6823,15 @@
 "�舒�于亠�舒 亟仂亰于仂�亠仆舒 亟�亢亳仆舒 仗仂��从亠 亰舒 仂亟����于仂 仂亟 %d 弍舒��仂于舒 �亠 仗�亠从仂�舒�亠仆舒. "
 "�舒亳仄 �亠 �从�舒�亳仂 仗仂��从�, 亳 亰舒仗仂�亠仂 仂亟����于仂."
 
-#: src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
 msgstr "�仂��从舒 亰舒 仂亟����于仂 �亠 仗�亠亟�亞舒�从舒."
 
-#: src/protocols/oscar/oscar.c:4774
+#: src/protocols/oscar/oscar.c:4782
 msgid "Unable To Retrieve Buddy List"
 msgstr "�亠 仄仂亞� 仗�亠�亰亠�亳 �仗亳�舒从 亟��亞舒�舒"
 
-#: src/protocols/oscar/oscar.c:4775
+#: src/protocols/oscar/oscar.c:4783
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -6857,12 +6840,12 @@
 "��亳于�亠仄亠仆仂, �舒亳仄 仆亳�亠 ��仗亠仂 亟舒 仗�亠�亰仄亠 �舒� �仗亳�舒从 亟��亞舒�舒 �舒 ��� �亠�于亠�舒. "
 "弌仗亳�舒从 亟��亞舒�舒 仆亳�亠 仆亠��舒仂, 亳 于亠�仂于舒�仆仂 �亠 弍亳�亳 亟仂���仗舒仆 亰舒 仆亠从仂仍亳从仂 �舒�亳."
 
-#: src/protocols/oscar/oscar.c:4867 src/protocols/oscar/oscar.c:4868
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4881
 msgid "Orphans"
 msgstr "弌亳�仂�亳�亳"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6871,15 +6854,15 @@
 "�亠 仄仂亞� 亟舒 亟仂亟舒仄 亟��亞舒�舒 %s 亰舒�仂 ��仂 亳仄舒�亠 仗�亠于亳�亠 亟��亞舒�舒 � �仗亳�从�. "
 "丕从仍仂仆亳�亠 仆亠从仂亞舒 亳 仗仂从��舒��亠 仗仂仆仂于仂."
 
-#: src/protocols/oscar/oscar.c:5039 src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
 msgid "(no name)"
 msgstr "(弍亠亰 亳仄亠仆舒)"
 
-#: src/protocols/oscar/oscar.c:5040 src/protocols/oscar/oscar.c:5053
+#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
 msgid "Unable To Add"
 msgstr "�亠 仄仂亞� 亟舒 亟仂亟舒仄"
 
-#: src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6890,7 +6873,7 @@
 "于亠� 亳仄舒�亠 仆舒�于亳�亠 亟仂亰于仂�亠仆亳� 亟��亞舒�舒 � �舒�亠仄 �仗亳�从�."
 
 # Is it "them"? Or "him/her"?
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6899,11 +6882,11 @@
 "�仂�亳�仆亳从 %s �舒仄 亟仂亰于仂�舒于舒 亟舒 亞舒 亟仂亟舒�亠 � �仗亳�舒从 亟��亞舒�舒. �舒 仍亳 亢亠仍亳�亠 亟舒 亞舒 "
 "亟仂亟舒�亠?"
 
-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5101
 msgid "Authorization Given"
 msgstr "�于仍舒��亠�亠 �亠 亟舒�仂"
 
-#: src/protocols/oscar/oscar.c:5126
+#: src/protocols/oscar/oscar.c:5134
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6913,17 +6896,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5168
+#: src/protocols/oscar/oscar.c:5176
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "�仂�亳�仆亳从 %s �亠 仂亟仂弍�亳仂 �舒� 亰舒��亠于 亟舒 亞舒 亟仂亟舒�亠 � �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/oscar/oscar.c:5169
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Granted"
 msgstr "�舒��亠于 仂亟仂弍�亠仆"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:5180
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6934,56 +6917,60 @@
 "�舒亰仍仂亞舒:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5173
+#: src/protocols/oscar/oscar.c:5181
 msgid "Authorization Denied"
 msgstr "�舒��亠于 仂亟弍亳�亠仆"
 
-#: src/protocols/oscar/oscar.c:5210 src/protocols/toc/toc.c:1264
-msgid "Exchange:"
-msgstr "�舒亰仄亠仆舒:"
-
-#: src/protocols/oscar/oscar.c:5447
+#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+msgid "_Exchange:"
+msgstr "�舒亰_仄亠仆舒:"
+
+#: src/protocols/oscar/oscar.c:5456
 msgid "<b>Status:</b> "
 msgstr "<b>弌�舒�亠:</b> "
 
-#: src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5473
 msgid "<b>Logged In:</b> "
 msgstr "<b>��亳�舒于�亠仆:</b> "
 
-#: src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>IP Address:</b> "
 msgstr "<b>�� 舒亟�亠�舒:</b> "
 
-#: src/protocols/oscar/oscar.c:5476
+#: src/protocols/oscar/oscar.c:5493
 msgid "<b>Capabilities:</b> "
 msgstr "<b>�仂亞��仆仂��亳:</b> "
 
-#: src/protocols/oscar/oscar.c:5483
+#: src/protocols/oscar/oscar.c:5502
+msgid "<b>Buddy Comment:</b> "
+msgstr "<b>��亳仄亠亟弍舒 亰舒 亟��亞舒�舒:</b>"
+
+#: src/protocols/oscar/oscar.c:5511
 msgid "<b>Available:</b> "
 msgstr "<b>�仂���仗仆仂:</b> "
 
-#: src/protocols/oscar/oscar.c:5501
+#: src/protocols/oscar/oscar.c:5529
 msgid "<b>Away Message:</b> "
 msgstr "<b>�仂��从舒 亰舒 仂亟����于仂:</b>"
 
-#: src/protocols/oscar/oscar.c:5510
+#: src/protocols/oscar/oscar.c:5538
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>弌�舒�亠:</b> �亠仂于仍舒��亠仆"
 
-#: src/protocols/oscar/oscar.c:5544 src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2173
 msgid "Offline"
 msgstr "�亠仗仂于亠亰舒仆"
 
-#: src/protocols/oscar/oscar.c:5992
+#: src/protocols/oscar/oscar.c:6020
 msgid "Unable to open Direct IM"
 msgstr "�亠 仄仂亞� 亟舒 仗仂�舒�亠仄 仆亠仗仂��亠亟仆� 弍�亰� 仗仂��从�"
 
-#: src/protocols/oscar/oscar.c:6005
+#: src/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�亰舒弍�舒仍亳 ��亠 亟舒 ��仗仂��舒于亳�亠 于亠亰� 亰舒 仆亠仗仂��亠亟仆亠 弍�亰亠 仗仂��从亠 �舒 %s."
 
-#: src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:6036
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6991,53 +6978,53 @@
 "�舒从仂 仂于仂 �舒亰仂�从�亳于舒 �舒�� �� 舒亟�亠��, 仄仂亢亠 �亠 �仄舒��舒�亳 仆舒���舒于舒�亠仄 "
 "仗�亳于舒�仆仂��亳. �亠仍亳�亠 仍亳 亟舒 仆舒��舒于亳�亠?"
 
-#: src/protocols/oscar/oscar.c:6183
+#: src/protocols/oscar/oscar.c:6211
 msgid "Buddy Comment:"
 msgstr "��亳仄亠亟弍舒 亰舒 亟��亞舒�舒:"
 
-#: src/protocols/oscar/oscar.c:6199
+#: src/protocols/oscar/oscar.c:6227
 msgid "Edit Buddy Comment"
 msgstr "丕�亠亟亳 仗�亳仄亠亟弍� 亰舒 亟��亞舒�舒"
 
-#: src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:6235
 msgid "Get Status Msg"
 msgstr "��亳弍舒于亳 仗仂��从� 仂 ��舒��"
 
-#: src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6250
 msgid "Direct IM"
 msgstr "�亠仗仂��亠亟仆舒 仗仂��从舒"
 
-#: src/protocols/oscar/oscar.c:6251
+#: src/protocols/oscar/oscar.c:6279
 msgid "Re-request Authorization"
 msgstr "�仂仆仂于亳 亰舒��亠于 亰舒 仂于仍舒��亠�亠"
 
-#: src/protocols/oscar/oscar.c:6272
+#: src/protocols/oscar/oscar.c:6300
 msgid "The new formatting is invalid."
 msgstr "�仂于亳 亰舒仗亳� �亠 仆亠亳�仗�舒于舒仆."
 
-#: src/protocols/oscar/oscar.c:6273
+#: src/protocols/oscar/oscar.c:6301
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "�舒仗亳� 从仂�亳�仆亳�从仂亞 亳仄亠仆舒 �亠 仄仂亢亠 仗�仂仄亠仆亳�亳 �舒仄仂 � 于亠仍亳�亳仆亳 �仍仂于舒 亳 弍�仂�� "
 "�舒亰仄舒从舒."
 
-#: src/protocols/oscar/oscar.c:6279
+#: src/protocols/oscar/oscar.c:6307
 msgid "New screenname formatting:"
 msgstr "�仂于亳 亰舒仗亳� 从仂�亳�仆亳�从仂亞 亳仄亠仆舒:"
 
-#: src/protocols/oscar/oscar.c:6328
+#: src/protocols/oscar/oscar.c:6356
 msgid "Change Address To:"
 msgstr "��仂仄亠仆舒 舒亟�亠�亠 �:"
 
-#: src/protocols/oscar/oscar.c:6372
+#: src/protocols/oscar/oscar.c:6400
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>仆亠 �亠从舒�亠 仆舒 仂于仍舒��亠�亠</i>"
 
-#: src/protocols/oscar/oscar.c:6375
+#: src/protocols/oscar/oscar.c:6403
 msgid "You are awaiting authorization from the following buddies"
 msgstr "��亠从��亠�亠 仂于仍舒��亠�亠 仂亟 �仍亠亟亠�亳� 亟��亞舒�舒"
 
-#: src/protocols/oscar/oscar.c:6376
+#: src/protocols/oscar/oscar.c:6404
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7045,65 +7032,73 @@
 "�仂亢亠�亠 仗仂仆仂于亳�亳 亰舒��亠于 亰舒 仂于仍舒��亠�亠 仂亟 仂于亳� 亟��亞舒�舒 亟亠�仆亳仄 从仍亳从仂仄 仆舒 �亳� 亳 "
 "亳亰弍仂�仂仄 ���仂仆仂于亳 亰舒��亠于 亰舒 仂于仍舒��亠�亠��."
 
-#: src/protocols/oscar/oscar.c:6390
+#: src/protocols/oscar/oscar.c:6418
 msgid "Find Buddy by E-mail"
 msgstr "��仂仆舒�亳 亟��亞舒�舒 仗仂仄仂�� 舒亟�亠�亠 亠-仗仂��亠"
 
-#: src/protocols/oscar/oscar.c:6391
+#: src/protocols/oscar/oscar.c:6419
 msgid "Search for a buddy by e-mail address"
 msgstr "��仂仆舒�亳 亟��亞舒�舒 仗仂仄仂�� 舒亟�亠�亠 亠-仗仂��亠"
 
-#: src/protocols/oscar/oscar.c:6392
+#: src/protocols/oscar/oscar.c:6420
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "丕从��舒��亠 亠-仗仂��舒仆�从� 舒亟�亠�� 亟��亞舒�舒 从仂亞舒 ��舒亢亳�亠."
 
-#: src/protocols/oscar/oscar.c:6395
+#: src/protocols/oscar/oscar.c:6423
 msgid "Search"
 msgstr "丐�舒亢亳"
 
-#: src/protocols/oscar/oscar.c:6409
+#: src/protocols/oscar/oscar.c:6437
 msgid "Available Message:"
 msgstr "�仂��从舒 亰舒 亟仂���仗仆仂��:"
 
-#: src/protocols/oscar/oscar.c:6410
+#: src/protocols/oscar/oscar.c:6438
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "�弍舒于�舒仄 仗仂�舒仂 亳 仆舒亟舒仄 �亠 仂仄亠�舒�� �� �亳弍仆亳 仄亳 仗仂��从�!"
 
-#: src/protocols/oscar/oscar.c:6488
-msgid "Set Available Message"
-msgstr "�仂��舒于亳 仗仂��从� 亰舒 亟仂���仗仆仂��"
-
-#: src/protocols/oscar/oscar.c:6502
+#: src/protocols/oscar/oscar.c:6509
+msgid "Set User Info..."
+msgstr "�仂��舒于亳 仗仂亟舒�从亠 仂 从仂�亳�仆亳从�..."
+
+#: src/protocols/oscar/oscar.c:6516
+msgid "Set Available Message..."
+msgstr "�仂��舒于亳 仗仂��从� 亰舒 亟仂���仗仆仂��..."
+
+#: src/protocols/oscar/oscar.c:6523
+msgid "Change Password..."
+msgstr "��仂仄亠仆亳 仍仂亰亳仆从�..."
+
+#: src/protocols/oscar/oscar.c:6530
 msgid "Change Password (URL)"
 msgstr "�亰仄亠仆舒 仍仂亰亳仆从亠 (�仆�亠�仆亠� 舒亟�亠�舒)"
 
-#: src/protocols/oscar/oscar.c:6510
+#: src/protocols/oscar/oscar.c:6538
 msgid "Configure IM Forwarding (URL)"
 msgstr "�仂亟亠�亳 仗�仂�仍亠�亳于舒�亠 弍�亰亳� 仗仂��从舒 (舒亟�亠�舒)"
 
-#: src/protocols/oscar/oscar.c:6521
-msgid "Format Screenname"
-msgstr "�舒仗亳� 从仂�亳�仆亳�从仂亞 亳仄亠仆舒"
-
-#: src/protocols/oscar/oscar.c:6527
+#: src/protocols/oscar/oscar.c:6549
+msgid "Format Screenname..."
+msgstr "�舒仗亳� 亠从�舒仆�从仂亞 亳仄亠仆舒..."
+
+#: src/protocols/oscar/oscar.c:6555
 msgid "Confirm Account"
 msgstr "�仂�于�亟亳�亠 仆舒仍仂亞"
 
-#: src/protocols/oscar/oscar.c:6533
-msgid "Display Current Registered Address"
+#: src/protocols/oscar/oscar.c:6561
+msgid "Display Currently Registered Address"
 msgstr "��亳从舒亢亳 ��亠仆��仆仂 �亠亞亳���仂于舒仆� 舒亟�亠��"
 
-#: src/protocols/oscar/oscar.c:6539
-msgid "Change Current Registered Address"
-msgstr "�亰仄亠仆亳 ��亠仆��仆仂 �亠亞亳���仂于舒仆� 舒亟�亠��"
-
-#: src/protocols/oscar/oscar.c:6548
+#: src/protocols/oscar/oscar.c:6567
+msgid "Change Currently Registered Address..."
+msgstr "�亰仄亠仆亳 ��亠仆��仆仂 �亠亞亳���仂于舒仆� 舒亟�亠��..."
+
+#: src/protocols/oscar/oscar.c:6576
 msgid "Show Buddies Awaiting Authorization"
 msgstr "��亳从舒亢亳 亟��亞舒�亠 亰舒 从仂�亠 �亠 �亠从舒 仂于仍舒��亠�亠"
 
-#: src/protocols/oscar/oscar.c:6556
-msgid "Search for Buddy by Email"
-msgstr "��仂仆舒�亳 亟��亞舒�舒 仗�亠仄舒 舒亟�亠�亳 亠-仗仂��亠"
+#: src/protocols/oscar/oscar.c:6584
+msgid "Search for Buddy by Email..."
+msgstr "��仂仆舒�亳 亟��亞舒�舒 仗�亠仄舒 亠-舒亟�亠�亳..."
 
 #. *< api_version
 #. *< type
@@ -7115,15 +7110,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6677 src/protocols/oscar/oscar.c:6679
+#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "�仂亟舒�舒从 亰舒 AIM/ICQ 仗�仂�仂从仂仍亠"
 
-#: src/protocols/oscar/oscar.c:6696
+#: src/protocols/oscar/oscar.c:6724
 msgid "Auth host"
 msgstr "�仂仄舒�亳仆 亰舒 亳亟亠仆�亳�亳从舒�亳��"
 
-#: src/protocols/oscar/oscar.c:6701
+#: src/protocols/oscar/oscar.c:6729
 msgid "Auth port"
 msgstr "�仂��"
 
@@ -7309,6 +7304,10 @@
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "�亠 仄仂亞� 亟舒 �仗亳�亠仄 亰舒亞仍舒于�亠 亟舒�仂�亠从亠. �舒�仂�亠从舒 �亠 仆亠�亠 仗�亠仆亠�亳."
 
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "�舒亳仄 �� 弌舒��于舒� 从舒仂..."
+
 #: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -7409,10 +7408,6 @@
 msgid "Local Users"
 msgstr "�仂从舒仍仆亳 从仂�亳�仆亳�亳"
 
-#: src/protocols/trepia/trepia.c:972
-msgid "Read error"
-msgstr "��亠�从舒 仗�亳 �亳�舒��"
-
 #: src/protocols/trepia/trepia.c:1073
 msgid "Logging in"
 msgstr "��亳�舒于舒"
@@ -7431,17 +7426,22 @@
 msgid "Trepia Protocol Plugin"
 msgstr "�仂亟舒�舒从 亰舒 丐�亠仗亳舒 仗�仂�仂从仂仍"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: src/protocols/yahoo/yahoo.c:726
 msgid "Your Yahoo! message did not get sent."
 msgstr "�舒�舒 �舒��! 仗仂��从舒 仆亳�亠 仗仂�仍舒�舒."
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:768
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "�舒��! �亳��亠仄�从舒 仗仂��从舒 亰舒 %s:"
+
+#: src/protocols/yahoo/yahoo.c:834
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "�仂�亳�仆亳从 %s �亠 (仆舒从仆舒亟仆仂) 仂亟弍亳仂 亰舒��亠于 亟舒 亞舒 亟仂亟舒�亠 � 于舒� �仗亳�舒从 亟��亞舒�舒."
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:837
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7450,11 +7450,11 @@
 "�仂�亳�仆亳从 %s �亠 (仆舒从仆舒亟仆仂) 仂亟弍亳仂 亰舒��亠于 亟舒 亞舒 亟仂亟舒�亠 � 于舒� �仗亳�舒从 亟��亞舒�舒 亳亰 "
 "�仍亠亟亠�亠亞 �舒亰仍仂亞舒: %s."
 
-#: src/protocols/yahoo/yahoo.c:761
+#: src/protocols/yahoo/yahoo.c:840
 msgid "Add buddy rejected"
 msgstr "�亟弍亳�亠仆仂 亟仂亟舒于舒�亠 亟��亞舒�舒"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1490
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7465,11 +7465,11 @@
 "亳亰亟舒�亠 �舒亳仄舒 仆舒�于亠�仂于舒�仆亳�亠 仆亠�亠 仄仂�亳 亟舒 �亠 仗�亳�舒于亳 仆舒 �舒��. ��仂于亠�亳�亠 %s "
 "�舒亟亳 亟仂仗�仆舒."
 
-#: src/protocols/yahoo/yahoo.c:1384
+#: src/protocols/yahoo/yahoo.c:1493
 msgid "Failed Yahoo! Authentication"
 msgstr "�亠��仗亠�仆舒 �舒��! 亳亟亠仆�亳�亳从舒�亳�舒"
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1566
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7478,86 +7478,99 @@
 "�仂从��舒仍亳 ��亠 亟舒 亳亞仆仂�亳�亠�亠 %s, 舒仍亳 �舒� 从仂�亳�仆亳从 �亠 于亠� � 于舒�亠仄 �仗亳�从� "
 "亟��亞舒�舒. �仍亳从仂仄 仆舒 ���舒�� �亠�亠 �从仍仂仆亳�亳 亳 亳亞仆仂�亳�舒�亳 仂于仂亞 亟��亞舒�舒."
 
-#: src/protocols/yahoo/yahoo.c:1460
+#: src/protocols/yahoo/yahoo.c:1569
 msgid "Ignore buddy?"
 msgstr "�亞仆仂�亳�亳 亟��亞舒�舒?"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1602
 msgid "Invalid username."
 msgstr "�亠亳�仗�舒于仆仂 从仂�亳�仆亳�从仂 亳仄亠."
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1605
 msgid "Incorrect password."
 msgstr "�亠亳�仗�舒于仆舒 仍仂亰亳仆从舒."
 
-#: src/protocols/yahoo/yahoo.c:1495
-msgid "Unknown error."
-msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒."
-
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1608
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr "�舒� 仆舒仍仂亞 �亠 亰舒从���舒仆, 仗�亳�舒于亳�亠 �亠 仆舒 �舒��! 于亠弍 ���舒仆亳��."
+
+#: src/protocols/yahoo/yahoo.c:1611
+#, c-format
+msgid "Unknown error number %d."
+msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒 �舒 从仂亟仂仄 %d."
+
+#: src/protocols/yahoo/yahoo.c:1668
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "�亠 仄仂亞� 亟舒 亟仂亟舒仄 亟��亞舒�舒 %s � 亞��仗� %s � �仗亳�舒从 �亠�于亠�舒 亰舒 仆舒仍仂亞 %s."
 
-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1670
 msgid "Could not add buddy to server list"
 msgstr "�亠 仄仂亞� 亟舒 亟仂亟舒仄 亟��亞舒�舒 � �仗亳�舒从 �亠�于亠�舒"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1780 src/protocols/yahoo/yahoo.c:1910
 msgid "Unable to read"
 msgstr "�亠 仄仂亞� 亟舒 仗亳�亠仄"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:1935 src/protocols/yahoo/yahoo.c:2044
+#: src/protocols/yahoo/yahoo.c:2071
 msgid "Connection problem"
 msgstr "��亠�从舒 仗�亳 仗仂于亠亰亳于舒��"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2480
+#: src/protocols/yahoo/yahoo.c:2586
 msgid "Not At Home"
 msgstr "�亳�舒仄 从仂亟 从��亠"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2157 src/protocols/yahoo/yahoo.c:2482
+#: src/protocols/yahoo/yahoo.c:2587
 msgid "Not At Desk"
 msgstr "�亳�舒仄 亰舒 ��仂仍仂仄"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2159 src/protocols/yahoo/yahoo.c:2484
+#: src/protocols/yahoo/yahoo.c:2588
 msgid "Not In Office"
 msgstr "�亳�舒仄 � 从舒仆�亠仍舒�亳�亳"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2163 src/protocols/yahoo/yahoo.c:2488
+#: src/protocols/yahoo/yahoo.c:2590
 msgid "On Vacation"
 msgstr "�舒 �舒�仗���� �舒仄"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2167 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2592
 msgid "Stepped Out"
 msgstr "�亰舒�舒仂 �舒仄 仆舒 从�舒�从仂"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2231 src/protocols/yahoo/yahoo.c:2263
 msgid "Not on server list"
 msgstr "�亳�亠 仆舒 �仗亳�从� 仆舒 �亠�于亠��"
 
-#: src/protocols/yahoo/yahoo.c:2178
+#: src/protocols/yahoo/yahoo.c:2319
 msgid "Join in Chat"
 msgstr "��亳从���亳 �亠 �舒亰亞仂于仂��"
 
-#: src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2325
 msgid "Initiate Conference"
 msgstr "�仂从�亠仆亳 �舒亰亞仂于仂�"
 
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2378
 msgid "Active which ID?"
 msgstr "�从�亳于亳�舒� �� (从仂�亳)?"
 
-#: src/protocols/yahoo/yahoo.c:2241
-msgid "Activate ID"
-msgstr "�从�亳于亳�舒� ��"
-
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2386
+msgid "Join who in chat?"
+msgstr "��亳从���亳 �亠 从仂仄亠 �舒亰亞仂于仂��?"
+
+#: src/protocols/yahoo/yahoo.c:2397
+msgid "Activate ID..."
+msgstr "�从�亳于亳�舒� ��..."
+
+#: src/protocols/yahoo/yahoo.c:2403
+msgid "Join user in chat..."
+msgstr "��亳从���亳 从仂�亳�仆亳从舒 �舒亰亞仂于仂��..."
+
+#: src/protocols/yahoo/yahoo.c:2784
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7565,7 +7578,7 @@
 "<b>�舒亢舒仍仂��, 亰舒 �舒亟舒 仆亳�� 仗仂亟�亢舒仆亳 仗�仂�亳仍亳 从仂�亳 �舒亟�亢亠 仗仂仆亠��仂 �舒仄仂 亰舒 "
 "仂亟�舒�仍亠.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/yahoo/yahoo.c:2785 src/protocols/yahoo/yahoo.c:2808
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7573,41 +7586,41 @@
 "丕从仂仍亳从仂 亢亠仍亳�亠 亟舒 仗仂亞仍亠亟舒�亠 仂于舒� 仗�仂�亳仍, ��亠弍舒 亟舒 仗仂�亠�亳�亠 仂于� 于亠亰� � 于舒�亠仄 "
 "�亳�舒�� 于亠弍舒.<br>"
 
-#: src/protocols/yahoo/yahoo.c:2619
+#: src/protocols/yahoo/yahoo.c:2807
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>�舒亢舒仍仂��, 仆亠-亠仆亞仍亠�从亳 仗�仂�亳仍亳 仆亳�� 仗仂亟�亢舒仆亳 亰舒 �舒亟舒.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2856
 msgid "Yahoo! ID"
 msgstr "�舒��! ��"
 
-#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
-#: src/protocols/yahoo/yahoo.c:2732
+#: src/protocols/yahoo/yahoo.c:2900 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/yahoo/yahoo.c:2906
 msgid "Hobbies"
 msgstr "丱仂弍亳�亳"
 
-#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
+#: src/protocols/yahoo/yahoo.c:2915 src/protocols/yahoo/yahoo.c:2918
 msgid "Latest News"
 msgstr "�舒�仆仂于亳�亠 于亠��亳"
 
-#: src/protocols/yahoo/yahoo.c:2765
+#: src/protocols/yahoo/yahoo.c:2932
 msgid "Home Page"
 msgstr "�亳�仆舒 ���舒仆亳�舒"
 
-#: src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:2944
 msgid "Cool Link 1"
 msgstr "�舒仆亳仄�亳于舒 于亠亰舒 1"
 
-#: src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:2948
 msgid "Cool Link 2"
 msgstr "�舒仆亳仄�亳于舒 于亠亰舒 2"
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:2950
 msgid "Cool Link 3"
 msgstr "�舒仆亳仄�亳于舒 于亠亰舒 3"
 
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2956
 msgid "Member Since"
 msgstr "丼仍舒仆 仂亟"
 
@@ -7621,18 +7634,26 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/yahoo/yahoo.c:3157 src/protocols/yahoo/yahoo.c:3159
 msgid "Yahoo Protocol Plugin"
 msgstr "�仂亟舒�舒从 亰舒 �舒�� 仗�仂�仂从仂仍"
 
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:3176
 msgid "Pager host"
 msgstr "弌亠�于亠�"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3179
 msgid "Pager port"
 msgstr "�仂��"
 
+#: src/protocols/yahoo/yahoo.c:3182
+msgid "File transfer host"
+msgstr "�仂仄舒�亳仆 亰舒 仗�亠仆仂� 亟舒�仂�亠从舒"
+
+#: src/protocols/yahoo/yahoo.c:3185
+msgid "File transfer port"
+msgstr "�仂�� 亰舒 仗�亠仆仂� 亟舒�仂�亠从舒"
+
 #: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -7642,19 +7663,19 @@
 msgid "Invitation Rejected"
 msgstr "�仂亰亳于 仂亟弍亳�亠仆"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
 msgstr "�亠��仗亠�仆仂 仗�亳从���亠�亠 �舒亰亞仂于仂��"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr "�仂亢亟舒 �亠 �仂弍舒 仗仂仗��亠仆舒?"
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: src/protocols/yahoo/yahoochat.c:558
 msgid "Failed to join buddy in chat"
 msgstr "�亠��仗亠�仆仂 仗�亳从���亳于舒�亠 亟��亞舒�舒 �舒亰亞仂于仂��"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
 msgstr "�仂亢亟舒 仆亠 �舒亰亞仂于舒�舒��?"
 
@@ -7698,16 +7719,16 @@
 msgstr "�亠�亳� 仗�亠��舒亞舒"
 
 #: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr "�舒亰�亠亟:"
+msgid "_Class:"
+msgstr "_�舒亰�亠亟:"
 
 #: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr "�仆��舒仆�舒:"
+msgid "_Instance:"
+msgstr "_��亳仄亠�舒从:"
 
 #: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
-msgstr "��亳仄舒仍舒�:"
+msgid "_Recipient:"
+msgstr "��亳_仄舒仍舒�:"
 
 #. *< api_version
 #. *< type
@@ -7723,11 +7744,21 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "�仂亟舒�舒从 亰舒 �亠�亳� 仗�仂�仂从仂仍"
 
-#: src/proxy.c:1681
+#. Forbidden
+#: src/proxy.c:1002
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr "��亳���仗 仂亟弍亳�亠仆: 仗仂��亠亟仆亳从 仂亟弍亳�舒 ��仆亠仍 仆舒 仗仂��� 80."
+
+#: src/proxy.c:1004
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "��亠�从舒 仗�亳 仗仂于亠亰亳于舒�� 仗仂��亠亟仆亳从舒 %d"
+
+#: src/proxy.c:1721
 msgid "Invalid proxy settings"
 msgstr "�仂�舒 仗仂亟亠�舒于舒�舒 仗仂��亠亟仆亳从舒"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1721
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7812,54 +7843,215 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "�舒仍亳仄, 舒仍亳 仄亠仆亠 仆亠仄舒. ��舒�亳�� �亠 �亠亟仆仂亞 亟舒仆舒, 仆亠 亰仆舒仄 仆亳 �舒 从舒亟!"
 
-#: src/stock.c:84
+#: src/stock.c:83
 msgid "_Modify"
 msgstr "_�亰仄亠仆亳"
 
-#: src/stock.c:85
+#: src/stock.c:84
 msgid "_Open Mail"
 msgstr "_��于仂�亳 仗仂���"
 
-#: src/util.c:1590
+#: src/util.c:1893
 msgid "Calculating..."
 msgstr "�舒��仆舒仄..."
 
-#: src/util.c:1593
+#: src/util.c:1896
 msgid "Unknown."
 msgstr "�亠仗仂亰仆舒�仂."
 
-#: src/util.c:1624 src/util.c:1629 src/util.c:1634 src/util.c:1637
+#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
 msgid "day"
 msgid_plural "days"
 msgstr[0] "亟舒仆"
 msgstr[1] "亟舒仆舒"
 msgstr[2] "亟舒仆舒"
 
-#: src/util.c:1625 src/util.c:1629 src/util.c:1643 src/util.c:1645
+#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "�舒�"
 msgstr[1] "�舒�舒"
 msgstr[2] "�舒�仂于舒"
 
-#: src/util.c:1625 src/util.c:1634 src/util.c:1643 src/util.c:1648
+#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "仄亳仆��"
 msgstr[1] "仄亳仆��舒"
 msgstr[2] "仄亳仆��舒"
 
-#: src/util.c:1980
+#: src/util.c:2283
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ��亠�从舒 仗�亳 仂�于舒�舒�� 于亠亰亠.\n"
 
-#: src/win32/win32dep.c:387
+# bug: s+..+...+
+#: src/win32/win32dep.c:271
+msgid "Moving Gaim Settings.."
+msgstr "��亠仄亠��舒 仗仂亟亠�舒于舒�舒 �舒亳仄舒..."
+
+#: src/win32/win32dep.c:274
+msgid "Moving Gaim user settings to: "
+msgstr "��亠仄亠��舒 仗仂亟亠�舒于舒�舒 �舒亳仄舒 �: "
+
+#: src/win32/win32dep.c:276
 msgid "Notification"
 msgstr "�弍舒于亠��亠�亠"
 
-#: src/win32/win32dep.c:388
-msgid "Moving Gaim user settings directory to:"
-msgstr "��亠仄亠��亳 亟亳�亠从�仂�亳��仄 仗仂亟亠�舒于舒�舒 �舒亳仄 从仂�亳�仆亳从舒 �:"
+#~ msgid "Gnome Stock Ticker Properties"
+#~ msgstr "�仂��舒于从亠 仗�舒�亠�舒 弍亠�亰亠"
+
+#~ msgid "Update Frequency in min"
+#~ msgstr "丕�亠��舒仍仂�� 仂�于亠亢舒于舒�舒 � 仄亳仆��亳仄舒"
+
+#~ msgid "Enter symbols delimited with \"+\" in the box below."
+#~ msgstr "丕仆亠�亳�亠 �亳仄弍仂仍亠 �舒亰亟于仂�亠仆亠 仗仂仄仂�� ��+�� � 仗仂�亠 亳�仗仂亟."
+
+#~ msgid "Check this box to display only symbols and price:"
+#~ msgstr "丕从���亳�亠 仂于� 仂仗�亳�� 亰舒 仗�亳从舒亰 �舒仄仂 �亳仄弍仂仍舒 亳 �亠仆亠:"
+
+#~ msgid "Check this box to scroll left to right:"
+#~ msgstr "丕从���亳�亠 仂于� 仂仗�亳�� 亰舒 仗仂仄亠�舒�亠 � 仍亠于舒 仆舒 亟亠�仆仂:"
+
+#~ msgid "(No"
+#~ msgstr "(�亠仄舒"
+
+#~ msgid "Change"
+#~ msgstr "亳亰仄亠仆亠"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "�舒亳仄 �� �亟���舒仆!"
+
+#~ msgid "Buddy Chat"
+#~ msgstr "�舒亰亞仂于仂� �舒 亟��亞舒�仂仄"
+
+#~ msgid "Join Chat As:"
+#~ msgstr "��亳从���亳 �亠 �舒亰亞仂于仂�� 从舒仂:"
+
+#~ msgid "Join"
+#~ msgstr "��亳从���亳 �亠"
+
+#~ msgid "New Message"
+#~ msgstr "�仂于舒 仗仂��从舒"
+
+#~ msgid "Changing info for %s:"
+#~ msgstr "�亠�舒仄 仗仂亟舒�从亠 亰舒 %s:"
+
+#~ msgid "Alias chat"
+#~ msgstr "�舒亟亠仆亳 亳仄亠 �舒亰亞仂于仂��"
+
+#~ msgid "Alias contact"
+#~ msgstr "�舒亟亠仆亳 亳仄亠 从仂仆�舒从��"
+
+#~ msgid "_Screenname"
+#~ msgstr "_�仄亠:"
+
+#~ msgid "Alias buddy"
+#~ msgstr "�舒亟亠仆亳 亳仄亠 亟��亞舒��"
+
+#~ msgid ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+#~ msgstr ""
+#~ "丕仆亠�亳�亠 亳仄亠 从仂�亠 亢亠仍亳�亠 亟舒 仆舒亟亠仆亠�亠 亳亰舒弍�舒仆仂� 仂�仂弍亳, 亳仍亳 仗�亠亳仄亠仆���亠 仂于舒� "
+#~ "从仂仆�舒从� � �仗亳�从� 亟��亞舒�舒."
+
+#~ msgid "Couldn't write to %s."
+#~ msgstr "�亠 仄仂亞� 亟舒 仗亳�亠仄 � %s."
+
+#~ msgid "Save Log File"
+#~ msgstr "弌舒��于舒� 亟舒�仂�亠从� 亟仆亠于仆亳从舒"
+
+#~ msgid "Couldn't remove file %s."
+#~ msgstr "�亠 仄仂亞� 亟舒 �从仍仂仆亳仄 亟舒�仂�亠从� %s."
+
+#~ msgid ""
+#~ "You are about to remove the log file for %s.  Do you want to continue?"
+#~ msgstr "丕从仍舒�舒�亠 亟仆亠于仆亳从 �舒亰亞仂于仂�舒 亰舒 %s. �舒 仍亳 亢亠仍亳�亠 亟舒 仆舒��舒于亳�亠?"
+
+#~ msgid "System Log"
+#~ msgstr "弌亳��亠仄�从亳 亟仆亠于仆亳从"
+
+#~ msgid "Remove Log"
+#~ msgstr "丕从仍仂仆亳 亟仆亠于仆亳从"
+
+#~ msgid "Couldn't open log file %s."
+#~ msgstr "�亠 仄仂亞� 亟舒 仂�于仂�亳仄 亟舒�仂�亠从� 亟仆亠于仆亳从舒 %s."
+
+#~ msgid "Conversations with %s"
+#~ msgstr "�舒亰亞仂于仂�亳 �舒 %s"
+
+#~ msgid "Log"
+#~ msgstr "�仆亠于仆亳从 �舒亟舒"
+
+#~ msgid "Clear"
+#~ msgstr "��亳��亳"
+
+#~ msgid "Gaim - Information"
+#~ msgstr "�舒亳仄 �� 仗仂亟舒�亳"
+
+#~ msgid "Add a new group"
+#~ msgstr "�仂亟舒� 仆仂于� 亞��仗�"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "�舒亳仄 �� �弍舒�亳 �仍亳从�"
+
+#~ msgid ""
+#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
+#~ "</span>"
+#~ msgstr ""
+#~ "<span weight='bold' size='larger'>丕仆亠�亳�亠 亳亰�舒亰 亰舒 仗�亠��舒亞�\n"
+#~ "</span>"
+
+#~ msgid "/Conversation/Search..."
+#~ msgstr "/�舒亰亞仂于仂�/��亠��舒亞舒..."
+
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "/�舒亰亞仂于仂�/_丕弍舒�亳 �仆�亠�仆亠� 舒亟�亠��..."
+
+#~ msgid "/Conversation/Insert _Image..."
+#~ msgstr "/�舒亰亞仂于仂�/丕弍舒�亳 �_仍亳从�..."
+
+#~ msgid "Normal font size"
+#~ msgstr "�弍亳�仆舒 �仍仂于舒"
+
+#~ msgid "_Host"
+#~ msgstr "_�仄亠 �亠�于亠�舒"
+
+#~ msgid "Pa_ssword"
+#~ msgstr "_�仂亰亳仆从舒"
+
+#~ msgid "System Logs"
+#~ msgstr "弌亳��亠仄�从亳 亟仆亠于仆亳从"
+
+#~ msgid "Log when buddies _sign on/sign off"
+#~ msgstr "�亠仍亠亢亳 从舒亟舒 �亠 亟��亞舒�亳 _仗�亳�舒于����/仂亟�舒于����"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "�亠仍亠亢亳 从舒亟舒 �� 亟��亞舒�亳 _仆亠舒从�亳于仆亳/舒从�亳于仆亳"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "�亠仍亠亢亳 从舒亟舒 �� 亟��亞舒�亳 _仂亟����仆亳/仗�亳���仆亳"
+
+#~ msgid "Log your _own signons/idleness/awayness"
+#~ msgstr "�亠仍亠亢亳 _仍亳�仆亠 仗�亳�舒于亠/仆亠舒从�亳于仆仂��/仂亟����于舒"
+
+#~ msgid "I_ndividual log file for each buddy's signons"
+#~ msgstr "�仂�亠亟亳仆舒�仆舒 亟舒�仂�亠从舒 亟亠仆于仆亳从舒 亰舒 _�于舒从仂亞 亟��亞舒�舒"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "�舒亳仄 �� 弌舒��于舒� 亳从仂仆亳��"
+
+#~ msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
+#~ msgstr "<font color=\"red\"><b>log->logger_data �亠 NULL!</b></font>"
+
+#~ msgid "%s (Code %s)"
+#~ msgstr "%s (从担亟 %s)"
+
+#~ msgid "Join what group:"
+#~ msgstr "��亳从���亳 �亠 亞��仗亳 (从仂�仂�?):"
+
+#~ msgid "Unknown error."
+#~ msgstr "�亠仗仂亰仆舒�舒 亞�亠�从舒."
 
 #~ msgid "Log Conversation"
 #~ msgstr "�仆亠于仆亳从 �舒亰亞仂于仂�舒"
--- a/po/sr@Latn.po	Mon Dec 15 02:07:03 2003 +0000
+++ b/po/sr@Latn.po	Mon Dec 15 16:32:07 2003 +0000
@@ -9,14 +9,15 @@
 msgstr ""
 "Project-Id-Version: gaim 0.73\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-15 12:57-0500\n"
-"PO-Revision-Date: 2003-11-15 19:15+0100\n"
+"POT-Creation-Date: 2003-12-15 00:00-0500\n"
+"PO-Revision-Date: 2003-12-15 10:43+0100\n"
 "Last-Translator: Danilo �egan <dsegan@gmx.net>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. *< api_version
 #. *< type
@@ -83,9 +84,11 @@
 "will use what used to be the built-in order active->idle->away->away+idle-"
 ">offline."
 msgstr ""
-"Drugar sa najmanjim rezultatom je drugar koji �e imati prvenstvo za stupanje u vezu.\n"
+"Drugar sa najmanjim rezultatom je drugar koji �e imati prvenstvo za stupanje u "
+"vezu.\n"
 "Podrazumevane vrednosti (nepovezan = 4, odsutan = 2 i miran = 1)\n"
-"�e koristiti ono 邸to je bilo ugra�en raspored aktivan->miran->odsutan->odsutan+miran->nepovezan."
+"�e koristiti ono 邸to je bilo ugra�en raspored aktivan->miran->odsutan-"
+">odsutan+miran->nepovezan."
 
 #: plugins/contact_priority.c:142
 msgid "Point values to use for Account..."
@@ -115,7 +118,9 @@
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
-msgstr "Dozvoljava izmenu vrednosti poena za mirna/odsutna/nepovezana stanja drugara pri ra�unanju prvenstva kontakta."
+msgstr ""
+"Dozvoljava izmenu vrednosti poena za mirna/odsutna/nepovezana stanja drugara "
+"pri ra�unanju prvenstva kontakta."
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
@@ -132,7 +137,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim �� Odsutan"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1769
 msgid "Auto-login"
 msgstr "Automatska prijava"
 
@@ -148,12 +153,12 @@
 msgid "New..."
 msgstr "Nova..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2313 src/gtkpounce.c:411
-#: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:5534
-#: src/protocols/oscar/oscar.c:6135
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2530 src/gtkpounce.c:411
+#: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
+#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:6163
 msgid "Away"
 msgstr "Odsutan"
 
@@ -165,16 +170,16 @@
 msgid "Mute Sounds"
 msgstr "Isklju�i zvuk"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:581
 msgid "File Transfers"
 msgstr "Prenosi datoteka"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1928 src/main.c:323
 msgid "Accounts"
 msgstr "Nalozi"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2331 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2333 src/main.c:329
 msgid "Preferences"
 msgstr "Postavke"
 
@@ -233,14 +238,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:223
 msgid "Gaim File Control"
 msgstr "Kontrola Gaim-a datotekom"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Omogu�ava Vam da upravljate Gaimom unosom naredbi u datoteku."
 
@@ -267,19 +272,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:715
 msgid "Remote Control"
 msgstr "Udaljeno upravljanje"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:718
 msgid "Provides remote control for gaim applications."
 msgstr "Omogu�ava udaljeno upravljanje Gaim programima."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:720
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -294,19 +299,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim dodatak za primer"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr "Primer dodatka koji radi neke stvari �� videti opis."
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -371,50 +376,19 @@
 "Povucite gore i onda na levo da pre�ete na prethodni razgovor.\n"
 "Povucite gore i onda na desno da pre�ete na slede�i razgovor."
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "Postavke pra�enja berze"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "U�estalost osve転avanja u minutima"
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "Unesite simbole razdvojene pomo�u ��+�� u polje ispod."
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "Uklju�ite ovu opciju za prikaz samo simbola i cene:"
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "Uklju�ite ovu opciju za pomeranje s leva na desno:"
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(Nema"
-
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "izmene"
-
-#: plugins/history.c:65
+#: plugins/history.c:74
 msgid "History"
 msgstr "Istorijat"
 
-#: plugins/history.c:67
+#: plugins/history.c:76
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Prikazuje poslednje zabele転ene razgovore me�u novim razgovorima."
 
-#: plugins/history.c:68
-msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
-msgstr ""
-"Kada se pokrene novi razgovor, ovaj dodatak �e ubaciti poslednjih N linija iz "
-"poslednjeg razgovora u teku�i razgovor."
+#: plugins/history.c:77
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr "Kada se pokrene novi razgovor, ovaj dodatak �e ubaciti poslednji razgovor u teku�i."
 
 #. *< api_version
 #. *< type
@@ -640,6 +614,56 @@
 "MSN, IRC, TOC). Pritisnite ��Enter�� u polju za unos za slanje. Pratite prozor "
 "za gre邸ke."
 
+#: plugins/relnot.c:62
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "Koristite izdanje Gaima %s.  Teku�e izdanje je %s.<hr>"
+
+#: plugins/relnot.c:68
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Dnevnik promena:</b>\n"
+"%s<br><br>"
+
+#: plugins/relnot.c:73
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr "Mo転ete nabaviti izdanje %s sa:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+
+#: plugins/relnot.c:77 plugins/relnot.c:78
+msgid "New Version Available"
+msgstr "Novo izdanje je dostupno"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/relnot.c:134
+msgid "Release Notification"
+msgstr "Obave邸tenje o izdanju"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/relnot.c:137
+msgid "Checks periodically for new releases."
+msgstr "Proverava povremeno za nova izdanja."
+
+#. *  description
+#: plugins/relnot.c:139
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr "Proverava povremeno za nova izdanja i obave邸tava korisnika uz dnevnik promena."
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -715,14 +739,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:197
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:200 plugins/ssl/ssl-gnutls.c:202
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "Obezbe�uje SSL podr邸ku kroz GNUTLS."
 
@@ -733,14 +757,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:296
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:299 plugins/ssl/ssl-nss.c:301
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Obezbe�uje SSL podr邸ku kroz Mozilin NSS."
 
@@ -804,11 +828,11 @@
 "Obave邸tava u prozoru razgovora kada drugar ode na ili se vrati sa odsustva "
 "ili neaktivnosti."
 
-#: plugins/tcl/tcl.c:344
+#: plugins/tcl/tcl.c:348
 msgid "Tcl Plugin Loader"
 msgstr "U�itavanje Tcl dodataka"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
 msgid "Provides support for loading Tcl plugins"
 msgstr "Omogu�ava podr邸ku za u�itavanje Tcl dodataka."
 
@@ -927,8 +951,8 @@
 msgstr "_Pokreni Gaim pri pokretanju Vindousa."
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2150
-#: src/gtkprefs.c:2264
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2364
+#: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "Spisak drugara"
 
@@ -947,8 +971,8 @@
 msgstr "_Odr転avaj prozor sa spiskom drugara na vrhu"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:880
-#: src/gtkprefs.c:2265
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:882
+#: src/gtkprefs.c:2267
 msgid "Conversations"
 msgstr "Razgovori"
 
@@ -1015,160 +1039,171 @@
 msgid "Crazy Patch Writers"
 msgstr "Ludi pisci ispravki"
 
-#: src/about.c:145
+#: src/about.c:138
 msgid "Retired Developers"
 msgstr "Penzionisani programeri"
 
-#: src/about.c:146
+#: src/about.c:139
 msgid "former libfaim maintainer"
 msgstr "prethodni odr転avalac libfaim-a"
 
-#: src/about.c:147
+#: src/about.c:140
 msgid "former lead developer"
 msgstr "biv邸i glavni programer"
 
-#: src/about.c:150
+#: src/about.c:143
 msgid "former maintainer"
 msgstr "biv邸i odr転avalac"
 
-#: src/about.c:151
+#: src/about.c:144
 msgid "former Jabber developer"
 msgstr "biv邸i D貼aber programer"
 
-#: src/about.c:152
+#: src/about.c:145
 msgid "original author"
 msgstr "prvi autor"
 
-#: src/about.c:155
+#: src/about.c:148
 msgid "hacker and designated driver [lazy bum]"
 msgstr "haker i odre�eni pokreta� [lenja buba]"
 
-#: src/about.c:163
+#: src/about.c:156
 msgid "Current Translators"
 msgstr "Teku�i prevodioci"
 
-#: src/about.c:164 src/about.c:195
+#: src/about.c:157 src/about.c:190
 msgid "Catalan"
-msgstr "Katalonski"
-
-#: src/about.c:165 src/about.c:196
+msgstr "katalonski"
+
+#: src/about.c:158 src/about.c:191
 msgid "Czech"
-msgstr "�e邸ki"
+msgstr "�e邸ki"
+
+#: src/about.c:159
+msgid "Danish"
+msgstr "danski"
+
+#: src/about.c:160
+msgid "British English"
+msgstr "britanski engleski"
+
+#: src/about.c:161 src/about.c:192
+msgid "German"
+msgstr "nema�ki"
+
+#: src/about.c:162 src/about.c:193
+msgid "Spanish"
+msgstr "邸panski"
+
+#: src/about.c:163 src/about.c:194
+msgid "Finnish"
+msgstr "finski"
+
+#: src/about.c:164 src/about.c:195
+msgid "French"
+msgstr "francuski"
+
+#: src/about.c:165
+msgid "Hindi"
+msgstr "hindu"
 
 #: src/about.c:166
-msgid "Danish"
-msgstr "Danski"
+msgid "Hungarian"
+msgstr "ma�arski"
 
 #: src/about.c:167 src/about.c:197
-msgid "German"
-msgstr "Nema�ki"
-
-#: src/about.c:168 src/about.c:198
-msgid "Spanish"
-msgstr "�panski"
+msgid "Italian"
+msgstr "italijanski"
+
+#: src/about.c:168 src/about.c:199
+msgid "Korean"
+msgstr "korejski"
 
 #: src/about.c:169
-msgid "Finnish"
-msgstr "Finski"
-
-#: src/about.c:170 src/about.c:199
-msgid "French"
-msgstr "Francuski"
-
-#: src/about.c:171
-msgid "Hindi"
-msgstr "Hindu"
+msgid "Dutch; Flemish"
+msgstr "holandski; flamanski"
+
+#: src/about.c:170
+msgid "Norwegian"
+msgstr "norve邸ki"
+
+#: src/about.c:171 src/about.c:200
+msgid "Polish"
+msgstr "poljski"
 
 #: src/about.c:172
-msgid "Hungarian"
-msgstr "Ma�arski"
-
-#: src/about.c:173 src/about.c:201
-msgid "Italian"
-msgstr "Italijanski"
-
-#: src/about.c:174 src/about.c:203
-msgid "Korean"
-msgstr "Korejski"
-
-#: src/about.c:175
-msgid "Dutch; Flemish"
-msgstr "Holandski; Flamanski"
+msgid "Portuguese"
+msgstr "portugalski"
+
+#: src/about.c:173
+msgid "Portuguese-Brazil"
+msgstr "portugalski u Brazilu"
+
+#: src/about.c:174
+msgid "Romanian"
+msgstr "rumunski"
+
+#: src/about.c:175 src/about.c:201
+msgid "Russian"
+msgstr "ruski"
 
 #: src/about.c:176
-msgid "Norwegian"
-msgstr "Norve邸ki"
-
-#: src/about.c:177 src/about.c:204
-msgid "Polish"
-msgstr "Poljski"
+msgid "Serbian"
+msgstr "srpski"
+
+#: src/about.c:177 src/about.c:203
+msgid "Swedish"
+msgstr "邸vedski"
 
 #: src/about.c:178
-msgid "Portuguese"
-msgstr "Portugalski"
+msgid "Vietnamese"
+msgstr "vijetnamski"
+
+#: src/about.c:178
+msgid "Gnome Vi Team"
+msgstr "Vijetnamski Gnom tim"
 
 #: src/about.c:179
-msgid "Portuguese-Brazil"
-msgstr "Portugalski u Brazilu"
+msgid "Simplified Chinese"
+msgstr "upro邸�eni kineski"
 
 #: src/about.c:180
-msgid "Romanian"
-msgstr "Rumunski"
-
-#: src/about.c:181 src/about.c:205
-msgid "Russian"
-msgstr "Ruski"
-
-#: src/about.c:182
-msgid "Serbian"
-msgstr "Srpski"
-
-#: src/about.c:183 src/about.c:207
-msgid "Swedish"
-msgstr "�vedski"
-
-#: src/about.c:184
-msgid "Simplified Chinese"
-msgstr "Pojednostavljeni kineski"
-
-#: src/about.c:185
 msgid "Traditional Chinese"
-msgstr "Tradicionalni kineski"
-
-#: src/about.c:192
+msgstr "tradicionalni kineski"
+
+#: src/about.c:187
 msgid "Past Translators"
 msgstr "Prethodni prevodioci"
 
-#: src/about.c:193
+#: src/about.c:188
 msgid "Amharic"
-msgstr "Amharski"
-
-#: src/about.c:194
+msgstr "amharski"
+
+#: src/about.c:189
 msgid "Bulgarian"
-msgstr "Bugarski"
-
-#: src/about.c:200
+msgstr "bugarski"
+
+#: src/about.c:196
 msgid "Hebrew"
-msgstr "Hebrejski"
+msgstr "hebrejski"
+
+#: src/about.c:198
+msgid "Japanese"
+msgstr "japanski"
 
 #: src/about.c:202
-msgid "Japanese"
-msgstr "Japanski"
-
-#: src/about.c:206
 msgid "Slovak"
-msgstr "Slova�ki"
-
-#: src/about.c:208
+msgstr "slova�ki"
+
+#: src/about.c:204
 msgid "Chinese"
-msgstr "Kineski"
-
-#: src/about.c:221 src/dialogs.c:2190 src/gtkrequest.c:205
-#: src/protocols/msn/msn.c:247
+msgstr "kineski"
+
+#: src/about.c:217 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:980
+#: src/account.c:275 src/protocols/jabber/jabber.c:978
 msgid "New passwords do not match."
 msgstr "Nove lozinke se ne poklapaju."
 
@@ -1193,62 +1228,60 @@
 msgid "Change password for %s"
 msgstr "Izmena lozinke za %s"
 
-#: src/account.c:331
+#: src/account.c:333
 msgid "Please enter your current password and your new password."
 msgstr "Unesite teku�u lozinku i novu lozinku."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:334 src/connection.c:193 src/dialogs.c:1730
-#: src/dialogs.c:1747 src/dialogs.c:1790 src/gtkblist.c:1512
-#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:1025
+#: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
+#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1730
+#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:6185 src/protocols/oscar/oscar.c:6281
-#: src/protocols/oscar/oscar.c:6330 src/protocols/oscar/oscar.c:6412
-#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
+#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6213 src/protocols/oscar/oscar.c:6309
+#: src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6440
+#: src/protocols/yahoo/yahoo.c:2380 src/protocols/yahoo/yahoo.c:2388
+#: src/request.h:852
 msgid "OK"
 msgstr "U redu"
 
-#. Cancel button.
-#: src/account.c:335 src/account.c:369 src/buddy_chat.c:375
-#: src/connection.c:194 src/dialogs.c:467 src/dialogs.c:479 src/dialogs.c:492
-#: src/dialogs.c:513 src/dialogs.c:898 src/dialogs.c:1564 src/dialogs.c:1731
-#: src/dialogs.c:1748 src/dialogs.c:1791 src/dialogs.c:1907
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1513
-#: src/gtkblist.c:3452 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1334
+#: src/dialogs.c:1493 src/dialogs.c:1510 src/dialogs.c:1529
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
+#: src/gtkblist.c:3670 src/gtkconn.c:148 src/gtkprivacy.c:568
 #: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
-#: src/gtkrequest.c:203 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:657
-#: src/protocols/jabber/jabber.c:1026 src/protocols/msn/msn.c:182
+#: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
 #: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
-#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6013 src/protocols/oscar/oscar.c:6186
-#: src/protocols/oscar/oscar.c:6282 src/protocols/oscar/oscar.c:6331
-#: src/protocols/oscar/oscar.c:6396 src/protocols/oscar/oscar.c:6413
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2233
-#: src/request.h:852 src/request.h:862
+#: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2457
+#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2537
+#: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
+#: src/protocols/oscar/oscar.c:6424 src/protocols/oscar/oscar.c:6441
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2381
+#: src/protocols/yahoo/yahoo.c:2389 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "Otka転i"
 
-#: src/account.c:361
+#: src/account.c:363
 #, c-format
 msgid "Change user information for %s"
 msgstr "Izmeni podatke o korisniku za %s"
 
-#: src/account.c:368 src/dialogs.c:894 src/dialogs.c:1552 src/dialogs.c:2199
-#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:511
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:370 src/dialogs.c:1322 src/gtkrequest.c:202
+#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Sa�uvaj"
 
 #: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim �� Odsutan!"
+msgid "Away!"
+msgstr "Odsutan!"
 
 #: src/away.c:269
 msgid "I'm Back!"
@@ -1266,16 +1299,16 @@
 msgid "Set All Away"
 msgstr "Postavi odsustvo za sve"
 
-#: src/blist.c:550 src/gtkprefs.c:2267
+#: src/blist.c:566 src/gtkprefs.c:2269
 msgid "Chats"
 msgstr "Razgovori"
 
-#: src/blist.c:645 src/blist.c:833 src/blist.c:2041 src/gtkblist.c:2930
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1159
+#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3146
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "Drugari"
 
-#: src/blist.c:1133
+#: src/blist.c:1148
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1293,51 +1326,53 @@
 "%d drugara iz grupe %s nije uklonjeno po邸to njihovi nalozi nisu prijavljeni. "
 "Ovi drugari i njihova grupa nisu uklonjeni.\n"
 
-#: src/blist.c:1142
+#: src/blist.c:1157
 msgid "Group not removed"
 msgstr "Grupa nije uklonjena"
 
-#: src/blist.c:1192 src/gtkaccount.c:159 src/gtkutils.c:841
-#: src/protocols/jabber/auth.c:110 src/protocols/jabber/buddy.c:563
+#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:847
+#: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/blist.c:1515
+#: src/blist.c:1530
 msgid "Invalid Groupname"
 msgstr "Neispravan naziv grupe"
 
-#: src/blist.c:2158
+#: src/blist.c:2180
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "Do邸lo je do gre邸ke pri obradi spiska drugara. Spisak nije u�itan."
 
-#: src/blist.c:2160
+#: src/blist.c:2182
 msgid "Buddy List Error"
 msgstr "Gre邸ka u spisku drugara"
 
-#: src/buddy_chat.c:316 src/gtkblist.c:3344
+#: src/buddy_chat.c:212 src/gtkblist.c:3560
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 "Trenutno niste povezani niti na jedan protokol koji omogu�ava razgovore."
 
-#: src/buddy_chat.c:330
-msgid "Join Chat"
+#: src/buddy_chat.c:223
+msgid "Join a Chat"
 msgstr "Priklju�i se razgovoru"
 
-#: src/buddy_chat.c:336
-msgid "Buddy Chat"
-msgstr "Razgovor sa drugarom"
-
-#: src/buddy_chat.c:346
-msgid "Join Chat As:"
-msgstr "Priklju�i se razgovoru kao:"
-
-#. Join button.
-#: src/buddy_chat.c:369
-msgid "Join"
-msgstr "Priklju�i se"
+#: src/buddy_chat.c:225 src/gtkblist.c:924
+msgid "_Join"
+msgstr "_Priklju�i se"
+
+#: src/buddy_chat.c:242
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "Unesite podatke o razgovoru kojem 転elite da se priklju�ite.\n"
+
+#: src/buddy_chat.c:253 src/dialogs.c:589 src/dialogs.c:664
+#: src/gtkpounce.c:358
+msgid "_Account:"
+msgstr "_Nalog:"
 
 #: src/connection.c:117 src/connection.c:165
 #, c-format
@@ -1357,75 +1392,75 @@
 msgid "Enter password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: src/conversation.c:324
+#: src/conversation.c:327
 msgid "Unable to send message. The message is too large."
 msgstr "Ne mogu da po邸aljem poruku. Poruka je prevelika."
 
-#: src/conversation.c:332
+#: src/conversation.c:335
 msgid "Unable to send message."
 msgstr "Ne mogu da po邸aljem poruku."
 
-#: src/conversation.c:1907
+#: src/conversation.c:1916
 #, c-format
 msgid "%s entered the room."
 msgstr "%s je u邸ao(la) u pri�aonicu."
 
-#: src/conversation.c:1910
+#: src/conversation.c:1919
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] je u邸ao(la) u pri�aonicu."
 
-#: src/conversation.c:1995
+#: src/conversation.c:2004
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je promenio(la) ime u %s"
 
-#: src/conversation.c:2037
+#: src/conversation.c:2046
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s je napustio(la) pri�aonicu (%s)."
 
-#: src/conversation.c:2039
+#: src/conversation.c:2048
 #, c-format
 msgid "%s left the room."
 msgstr "%s je napustio(la) pri�aonicu."
 
 # bug: plural-forms
-#: src/conversation.c:2112
+#: src/conversation.c:2121
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d poruka)"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2123
 #, c-format
 msgid " left the room (%s)."
 msgstr "napusti pri�aonicu (%s)."
 
-#: src/conversation.c:2396
+#: src/conversation.c:2405
 msgid "Last created window"
 msgstr "Poslednje napravljeni prozor"
 
-#: src/conversation.c:2398
+#: src/conversation.c:2407
 msgid "New window"
 msgstr "Novi prozor"
 
-#: src/conversation.c:2400
+#: src/conversation.c:2409
 msgid "By group"
 msgstr "Prema grupi"
 
-#: src/conversation.c:2402
+#: src/conversation.c:2411
 msgid "By account"
 msgstr "Prema nalogu"
 
-#: src/dialogs.c:315
+#: src/dialogs.c:201
 msgid "Warn User"
 msgstr "Upozori korisnika"
 
-#: src/dialogs.c:318
+#: src/dialogs.c:204
 msgid "_Warn"
 msgstr "_Upozori"
 
-#: src/dialogs.c:334
+#: src/dialogs.c:220
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1438,36 +1473,36 @@
 "Ovo �e uve�ati nivo obazrivosti za ��%s�� i on ili ona �e imati stro転ije "
 "ograni�enje brzine slanja poruka.\n"
 
-#: src/dialogs.c:343
+#: src/dialogs.c:229
 msgid "Warn _anonymously?"
 msgstr "Upozori _anonimno?"
 
-#: src/dialogs.c:350
+#: src/dialogs.c:236
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonimna upozorenja su manjeg uticaja.</b>"
 
-#: src/dialogs.c:463
+#: src/dialogs.c:349
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Uklanjate %s sa spiska drugara. Da li 転elite da nastavite?"
 
-#: src/dialogs.c:465 src/dialogs.c:466
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "Ukloni drugara"
 
-#: src/dialogs.c:475
+#: src/dialogs.c:361
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Uklanjate razgovor %s sa spiska drugara. Da li 転elite da nastavite?"
 
-#: src/dialogs.c:477 src/dialogs.c:478
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "Ukloni razgovor"
 
-#: src/dialogs.c:487
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1476,12 +1511,12 @@
 "Uklanjate grupu %s i sve njene �lanove iz spiska drugara. Da li 転elite da "
 "nastavite?"
 
-#: src/dialogs.c:490 src/dialogs.c:491
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
 # bug: plural-forms
-#: src/dialogs.c:508
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1490,55 +1525,41 @@
 "Uklanjate grupu %s i %d ostalih �lanova iz spiska drugara. Da li 転elite da "
 "nastavite?"
 
-#: src/dialogs.c:511 src/dialogs.c:512
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "Ukloni kontakt"
 
-#: src/dialogs.c:660
-msgid "New Message"
-msgstr "Nova poruka"
-
-#: src/dialogs.c:678
+#: src/dialogs.c:543
+msgid "New Instant Message"
+msgstr "Nova brza poruka"
+
+#: src/dialogs.c:561
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Unesite ime osobe kojoj 転elite da uputite brzu poruku.\n"
 
-#: src/dialogs.c:694 src/dialogs.c:771
+#: src/dialogs.c:573 src/dialogs.c:648
 msgid "_Screenname:"
 msgstr "_Ime:"
 
-#: src/dialogs.c:709 src/dialogs.c:787 src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "_Nalog:"
-
-#: src/dialogs.c:740
+#: src/dialogs.c:618
 msgid "Get User Info"
 msgstr "Pribavi podatke o korisniku"
 
-#: src/dialogs.c:759
+#: src/dialogs.c:636
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "Unesite ime osobe �ije podatke 転elite da vidite.\n"
 
-#: src/dialogs.c:853 src/protocols/jabber/jabber.c:1036
-#: src/protocols/oscar/oscar.c:6481 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr "Postavi podatke o korisniku"
-
-#: src/dialogs.c:862
-#, c-format
-msgid "Changing info for %s:"
-msgstr "Menjam podatke za %s:"
-
-#: src/dialogs.c:977
+#: src/dialogs.c:757
 msgid "Insert Link"
-msgstr "Ubaci vezu"
-
-#: src/dialogs.c:979
-msgid "Insert"
-msgstr "Ubaci"
-
-#: src/dialogs.c:1001
+msgstr "Umetni vezu"
+
+#: src/dialogs.c:759
+msgid "_Insert"
+msgstr "U_metni"
+
+#: src/dialogs.c:782
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -1546,176 +1567,102 @@
 "Unesite Internet adresu i opis veze koju 転elite da ubacite. Opis nije "
 "obavezan.\n"
 
-#: src/dialogs.c:1019 src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/jabber.c:638
-msgid "URL"
-msgstr "Internet adresa"
-
-#: src/dialogs.c:1029 src/gtkprefs.c:601 src/gtkprefs.c:1803
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
-msgid "Description"
-msgstr "Opis"
-
-#: src/dialogs.c:1165 src/dialogs.c:1182
+#: src/dialogs.c:795
+msgid "_URL:"
+msgstr "_Adresa:"
+
+#: src/dialogs.c:808
+msgid "_Description:"
+msgstr "_Opis:"
+
+#: src/dialogs.c:937 src/dialogs.c:954
 msgid "Select Text Color"
 msgstr "Izaberite boju teksta"
 
-#: src/dialogs.c:1217 src/dialogs.c:1234
+#: src/dialogs.c:989 src/dialogs.c:1006
 msgid "Select Background Color"
 msgstr "Izaberite boju pozadine"
 
-#: src/dialogs.c:1319 src/dialogs.c:1345
+#: src/dialogs.c:1091 src/dialogs.c:1117
 msgid "Select Font"
 msgstr "Izaberite pismo"
 
-#: src/dialogs.c:1411
+#: src/dialogs.c:1183
 msgid "You cannot save an away message with a blank title"
 msgstr "Ne mo転ete snimiti poruku za odsustvo bez naslova"
 
-#: src/dialogs.c:1413
+#: src/dialogs.c:1185
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Navedite i naslov poruke, ili izaberite ��Koristi�� za kori邸�enje bez snimanja."
 
-#: src/dialogs.c:1423
+#: src/dialogs.c:1195
 msgid "You cannot create an empty away message"
 msgstr "Ne mo転ete napraviti praznu poruku za odsustvo"
 
-#: src/dialogs.c:1488 src/dialogs.c:1496
+#: src/dialogs.c:1260 src/dialogs.c:1268
 msgid "New away message"
 msgstr "Nova poruka za odsustvo"
 
-#: src/dialogs.c:1506
+#: src/dialogs.c:1278
 msgid "Away title: "
 msgstr "Naslov odsustva: "
 
-#: src/dialogs.c:1556
+#: src/dialogs.c:1326
 msgid "Save & Use"
 msgstr "Sa�uvaj i koristi"
 
-#: src/dialogs.c:1560
+#: src/dialogs.c:1330
 msgid "Use"
 msgstr "Koristi"
 
 #. show everything
-#: src/dialogs.c:1709
+#: src/dialogs.c:1471
 msgid "Smile!"
 msgstr "Sme邸ak!"
 
-#: src/dialogs.c:1727
+#: src/dialogs.c:1489
 msgid "Alias Chat"
 msgstr "Nadeni ime razgovoru"
 
-#: src/dialogs.c:1727
-msgid "Alias chat"
-msgstr "Nadeni ime razgovoru"
-
-#: src/dialogs.c:1728
-msgid "Please enter an aliased name for this chat."
-msgstr "Unesite novo ime za ovaj razgovor."
-
-#: src/dialogs.c:1744
+#: src/dialogs.c:1490
+msgid "Enter an alias for this chat."
+msgstr "Unesite nadimak za ovaj razgovor."
+
+#: src/dialogs.c:1506
 msgid "Alias Contact"
 msgstr "Nadeni ime kontaktu"
 
-#: src/dialogs.c:1744
-msgid "Alias contact"
-msgstr "Nadeni ime kontaktu"
-
-#: src/dialogs.c:1745
-msgid "Please enter an aliased name for this contact."
-msgstr "Unesite novo ime za ovaj kontakt."
-
-#: src/dialogs.c:1776
-msgid "_Screenname"
-msgstr "_Ime:"
-
-#: src/dialogs.c:1781 src/gtkblist.c:838 src/gtkblist.c:931 src/gtkblist.c:937
-msgid "_Alias"
-msgstr "N_adeni ime"
-
-#: src/dialogs.c:1785
+#: src/dialogs.c:1507
+msgid "Enter an alias for this contact."
+msgstr "Unesite nadimak za ovaj kontakt."
+
+#: src/dialogs.c:1524
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Unesite nadimak za %s."
+
+#: src/dialogs.c:1526
 msgid "Alias Buddy"
 msgstr "Nadeni ime drugaru"
 
-#: src/dialogs.c:1786
-msgid "Alias buddy"
-msgstr "Nadeni ime drugaru"
-
-#: src/dialogs.c:1787
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-"Unesite ime koje 転elite da nadenete izabranoj osobi, ili preimenujte ovaj "
-"kontakt u spisku drugara."
-
-#: src/dialogs.c:1823 src/dialogs.c:1830
-#, c-format
-msgid "Couldn't write to %s."
-msgstr "Ne mogu da pi邸em u %s."
-
-#: src/dialogs.c:1854
-msgid "Save Log File"
-msgstr "Sa�uvaj datoteku dnevnika"
-
-#: src/dialogs.c:1882
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr "Ne mogu da uklonim datoteku %s."
-
-#: src/dialogs.c:1901
-#, c-format
-msgid "You are about to remove the log file for %s.  Do you want to continue?"
-msgstr "Uklanjate dnevnik razgovora za %s. Da li 転elite da nastavite?"
-
-#: src/dialogs.c:1902 src/dialogs.c:2072
-msgid "System Log"
-msgstr "Sistemski dnevnik"
-
-#: src/dialogs.c:1903 src/dialogs.c:1905
-msgid "Remove Log"
-msgstr "Ukloni dnevnik"
-
-#: src/dialogs.c:1933 src/dialogs.c:2093
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr "Ne mogu da otvorim datoteku dnevnika %s."
-
-#: src/dialogs.c:2070
-#, c-format
-msgid "Conversations with %s"
-msgstr "Razgovori sa %s"
-
-#: src/dialogs.c:2114 src/protocols/jabber/jabber.c:643
-msgid "Date"
-msgstr "Datum"
-
-#: src/dialogs.c:2171
-msgid "Log"
-msgstr "Dnevnik rada"
-
-#: src/dialogs.c:2194
-msgid "Clear"
-msgstr "O�isti"
-
-#: src/ft.c:123
+#: src/ft.c:139
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s nije ispravan naziv datoteke.\n"
 
-#: src/ft.c:137
+#: src/ft.c:152
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s nije prona�en.\n"
 
-#: src/ft.c:693
+#: src/ft.c:754
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Prenos datoteke do %s prekinut.\n"
 
-#: src/ft.c:695
+#: src/ft.c:756
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Prenos datoteke od %s prekinut.\n"
@@ -1728,7 +1675,7 @@
 msgid "Size of the expander arrow"
 msgstr "Veli�ina strelice pro邸iriva�a"
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:66
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1749,11 +1696,11 @@
 "    IZBORI:\n"
 "       -h, --help [naredba]     Prika転i pomo� za naredbu\n"
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:175 src/gaim-remote.c:191
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim nije pokrenut (u sesiji 0)\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:204
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1765,37 +1712,37 @@
 "needs to be escaped, or the command will stop at that point.\n"
 "Also,the following will just open a conversation window to a screenname,\n"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
-"Koristi AIM: URI-ji:\n"
+"Upotreba AIM-a: adrese:\n"
 "Slanje brze poruke na ime:\n"
-"\tgaim-remote uri 'aim:goim?screenname=Pingvin&message=Linuks+carstvo'\n"
+"\tgaim-remote uri 'aim:goim?screenname=Pingvin&message=GNU+svet'\n"
 "U ovom slu�aju, ��Pingvin�� je ime korisnika kome 邸aljemo poruku, a \n"
-"��Linuks carstvo�� je sama poruka. Mora se koristiti ��+�� umesto razmaka. \n"
+"��GNU svet�� je sama poruka. Mora se koristiti ��+�� umesto razmaka. \n"
 "Obratite pa転nju na na�in citiranja iznad �� ukoliko ovo koristite iz ljuske, \n"
 "znak ��&�� se mora istaknuti, ili �e naredba stati na tom mestu.\n"
 "Tako�e, slede�e �e samo otvoriti novi prozor za razgovor sa korisnikom, \n"
 "bez slanja poruke:\n"
-"\tgaim-remote uri aim:goim?screenname=Pingvin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Pingvin'\n"
 "\n"
 "Priklju�ivanje razgovoru:\n"
-"\tgaim-remote uri aim:gochat?roomname=ZemljaLinuksa\n"
-"Pomo�u ovoga se priklju�ujete sobi ��ZemljaLinuksa��.\n"
+"\tgaim-remote uri 'aim:gochat?roomname=ZemljaGnua'\n"
+"Pomo�u ovoga se priklju�ujete sobi ��ZemljaGnua��.\n"
 "\n"
 "Dodavanje drugara u Va邸 spisak drugara:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Pingvin\n"
-"Ovde Vas pita da dodate ��Pingvin�� u Va邸 spisak drugara.\n"
-
-#: src/gaim-remote.c:187
+"\tgaim-remote uri 'aim:addbuddy?screenname=Pingvin'\n"
+"Bi�ete upitani da dodate ��Pingvina�� u Va邸 spisak drugara.\n"
+
+#: src/gaim-remote.c:223
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1808,23 +1755,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "貼alim, ali mene nema. Vrati�u se jednog dana, ne znam ni ja kad!"
 
-#: src/gaimrc.c:373 src/gaimrc.c:1464
+#: src/gaimrc.c:373 src/gaimrc.c:1450
 msgid "boring default"
 msgstr "Podrazumevano (ne tako) dosadno"
 
-#: src/gaimrc.c:1271 src/gtkblist.c:2111
+#: src/gaimrc.c:1259 src/gtkblist.c:2326
 msgid "Alphabetical"
 msgstr "Po azbu�nom redu"
 
-#: src/gaimrc.c:1273 src/gtkblist.c:2112
+#: src/gaimrc.c:1261 src/gtkblist.c:2327
 msgid "By status"
 msgstr "Po stanju"
 
-#: src/gaimrc.c:1275 src/gtkblist.c:2113
+#: src/gaimrc.c:1263 src/gtkblist.c:2328
 msgid "By log size"
 msgstr "Po veli�ini dnevnika"
 
-#: src/gaimrc.c:1562
+#: src/gaimrc.c:1548
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ne mogu da otvorim datoteku %s za postavke."
@@ -1840,7 +1787,7 @@
 "<b>Veli�ina:</b> %s\n"
 "<b>Dimenzije slike:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3077
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3080
 msgid "Buddy Icon"
 msgstr "Sli�ica drugara"
 
@@ -1857,12 +1804,11 @@
 msgid "Screenname:"
 msgstr "Ime:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:56
+#: src/gtkaccount.c:464 src/main.c:307
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3084 src/gtkblist.c:3403
+#: src/gtkaccount.c:469 src/gtkblist.c:3299 src/gtkblist.c:3619
 msgid "Alias:"
 msgstr "Nadimak:"
 
@@ -1923,7 +1869,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1101
+#: src/gtkaccount.c:782 src/gtkprefs.c:1103
 msgid "Use Environmental Settings"
 msgstr "Koristi pode邸avanja okru転enja"
 
@@ -1939,15 +1885,15 @@
 msgid "Proxy Options"
 msgstr "Postavke proksija"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1095
+#: src/gtkaccount.c:851 src/gtkprefs.c:1097
 msgid "Proxy _type:"
 msgstr "_Vrsta proksija:"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:860 src/gtkprefs.c:1127
 msgid "_Host:"
 msgstr "_Server:"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:864 src/gtkprefs.c:1144
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -1955,7 +1901,7 @@
 msgid "_Username:"
 msgstr "_Korisni�ko ime:"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:877 src/gtkprefs.c:1179
 msgid "Pa_ssword:"
 msgstr "_Lozinka:"
 
@@ -1977,7 +1923,7 @@
 msgstr "Poka転i manje postavki"
 
 #. Register button
-#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:656
+#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:650
 msgid "Register"
 msgstr "Registruj se"
 
@@ -1986,31 +1932,31 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "Da li ste sigurni da 転elite obrisati %s?"
 
-#: src/gtkaccount.c:1621 src/gtkrequest.c:206
+#: src/gtkaccount.c:1621 src/gtkrequest.c:199
 msgid "Delete"
 msgstr "Obri邸i"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1735
 msgid "Screen Name"
 msgstr "Ime"
 
-#: src/gtkaccount.c:1757 src/protocols/jabber/jabber.c:926
-#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4586
-#: src/protocols/oscar/oscar.c:6134 src/protocols/yahoo/yahoo.c:2032
+#: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
+#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2175
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Na vezi"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1776
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2066
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s u�ini %s svojim drugarom%s%s%s"
 
-#: src/gtkaccount.c:2079
+#: src/gtkaccount.c:2080
 msgid ""
 "\n"
 "\n"
@@ -2020,184 +1966,190 @@
 "\n"
 "Da li 転elite da dodate nju ili njega u svoj spisak drugara?"
 
-#: src/gtkaccount.c:2083
-msgid "Gaim - Information"
-msgstr "Gaim �� podaci"
-
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2084
+msgid "Information"
+msgstr "Podaci"
+
+#: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
-msgstr "Dodati drugara u Va邸 spisak?"
-
-#: src/gtkaccount.c:2089 src/gtkblist.c:3451 src/gtkconv.c:1258
-#: src/gtkconv.c:3149 src/gtkconv.c:4355 src/gtkrequest.c:207
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
+msgstr "Dodati drugara u spisak?"
+
+#: src/gtkaccount.c:2090 src/gtkblist.c:3669 src/gtkconv.c:1272
+#: src/gtkconv.c:3087 src/gtkconv.c:4292 src/gtkrequest.c:200
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gtkblist.c:811
+#: src/gtkblist.c:813
 msgid "_Get Info"
 msgstr "Pribavi poda_tke"
 
-#: src/gtkblist.c:814
-msgid "_IM"
-msgstr "_Poruka"
-
 #: src/gtkblist.c:816
-msgid "Add Buddy _Pounce"
-msgstr "Dodaj _zasedu drugaru"
+msgid "_IM"
+msgstr "_Poruka"
 
 #: src/gtkblist.c:818
+msgid "Add Buddy _Pounce"
+msgstr "Dodaj _zasedu drugaru"
+
+#: src/gtkblist.c:820
 msgid "View _Log"
 msgstr "Pregled dnevni_ka"
 
-#: src/gtkblist.c:840 src/gtkblist.c:933 src/gtkblist.c:942
+#: src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
+msgid "_Alias..."
+msgstr "N_adeni ime..."
+
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:424
+#: src/gtkconn.c:460
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: src/gtkblist.c:912
+#: src/gtkblist.c:905
 msgid "Add a _Buddy"
 msgstr "_Dodaj drugara"
 
-#: src/gtkblist.c:914
+#: src/gtkblist.c:907
 msgid "Add a C_hat"
 msgstr "Dodaj _razgovor"
 
-#: src/gtkblist.c:916
+#: src/gtkblist.c:909
 msgid "_Delete Group"
 msgstr "U_kloni grupu"
 
-#: src/gtkblist.c:918
+#: src/gtkblist.c:911
 msgid "_Rename"
 msgstr "Pre_imenuj"
 
 #: src/gtkblist.c:926
-msgid "_Join"
-msgstr "_Priklju�i se"
-
-#: src/gtkblist.c:928
 msgid "Auto-Join"
 msgstr "Automatska prijava"
 
-#: src/gtkblist.c:939 src/gtkblist.c:969
+#: src/gtkblist.c:950 src/gtkblist.c:985
 msgid "_Collapse"
 msgstr "_Skupi"
 
-#: src/gtkblist.c:974
+#: src/gtkblist.c:990
 msgid "_Expand"
 msgstr "_Razgranaj"
 
+#: src/gtkblist.c:1389 src/gtkconv.c:3808
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "Trenutno niste prijavljeni na nalog koji omogu�ava dodavanje tog drugara."
+
 #. Buddies menu
-#: src/gtkblist.c:1462
+#: src/gtkblist.c:1680
 msgid "/_Buddies"
 msgstr "/_Drugari"
 
-#: src/gtkblist.c:1463
+#: src/gtkblist.c:1681
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Drugari/_Nova brza poruka..."
 
-#: src/gtkblist.c:1464
+#: src/gtkblist.c:1682
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Drugari/_Priklju�i se razgovoru..."
 
-#: src/gtkblist.c:1465
+#: src/gtkblist.c:1683
 msgid "/Buddies/Get _User Info..."
 msgstr "/Drugari/Pribavi podatke o _korisniku..."
 
-#: src/gtkblist.c:1467
+#: src/gtkblist.c:1685
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Drugari/Prika転i nep_ovezane drugare"
 
-#: src/gtkblist.c:1468
+#: src/gtkblist.c:1686
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Drugari/Prika転i _prazne grupe"
 
-#: src/gtkblist.c:1469
-msgid "/Buddies/_Add a Buddy..."
+#: src/gtkblist.c:1687
+msgid "/Buddies/_Add Buddy..."
 msgstr "/Drugari/_Dodaj drugara..."
 
-#: src/gtkblist.c:1470
-msgid "/Buddies/Add a C_hat..."
+#: src/gtkblist.c:1688
+msgid "/Buddies/Add C_hat..."
 msgstr "/Drugari/Dodaj razgo_vor..."
 
-#: src/gtkblist.c:1471
-msgid "/Buddies/Add a _Group..."
+#: src/gtkblist.c:1689
+msgid "/Buddies/Add _Group..."
 msgstr "/Drugari/Dodaj _grupu..."
 
-#: src/gtkblist.c:1473
+#: src/gtkblist.c:1691
 msgid "/Buddies/_Signoff"
 msgstr "/Drugari/_Odjava"
 
-#: src/gtkblist.c:1474
+#: src/gtkblist.c:1692
 msgid "/Buddies/_Quit"
 msgstr "/Drugari/I_zlaz"
 
 #. Tools
-#: src/gtkblist.c:1477
+#: src/gtkblist.c:1695
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/gtkblist.c:1478
+#: src/gtkblist.c:1696
 msgid "/Tools/_Away"
 msgstr "/Alati/_Odsutan"
 
-#: src/gtkblist.c:1479
+#: src/gtkblist.c:1697
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Alati/_Zaseda drugaru"
 
-#: src/gtkblist.c:1480
+#: src/gtkblist.c:1698
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Alati/A_kcije po protokolu"
 
-#: src/gtkblist.c:1482
+#: src/gtkblist.c:1700
 msgid "/Tools/A_ccounts"
 msgstr "/Alati/_Nalozi"
 
-#: src/gtkblist.c:1483
-msgid "/Tools/_File Transfers..."
+#: src/gtkblist.c:1701
+msgid "/Tools/_File Transfers"
 msgstr "/Alati/Prenosi _datoteka..."
 
-#: src/gtkblist.c:1484
-msgid "/Tools/Preferences"
-msgstr "/Alati/Postavke"
-
-#: src/gtkblist.c:1485
+#: src/gtkblist.c:1702
+msgid "/Tools/Pr_eferences"
+msgstr "/Alati/_Postavke"
+
+#: src/gtkblist.c:1703
 msgid "/Tools/Pr_ivacy"
 msgstr "/Alati/_Privatnost"
 
-#: src/gtkblist.c:1487
+#: src/gtkblist.c:1705
 msgid "/Tools/View System _Log"
 msgstr "/Alati/Pregled _sistemskog dnevnika rada"
 
 #. Help
-#: src/gtkblist.c:1490
+#: src/gtkblist.c:1708
 msgid "/_Help"
 msgstr "/_Pomo�"
 
-#: src/gtkblist.c:1491
+#: src/gtkblist.c:1709
 msgid "/Help/Online _Help"
 msgstr "/Pomo�/Pomo� iz _programa"
 
-#: src/gtkblist.c:1492
+#: src/gtkblist.c:1710
 msgid "/Help/_Debug Window"
 msgstr "/Pomo�/Prozor za nala転enje _gre邸aka"
 
-#: src/gtkblist.c:1493
+#: src/gtkblist.c:1711
 msgid "/Help/_About"
 msgstr "/Pomo�/_O programu"
 
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:1727
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:1727
 msgid "New group name"
 msgstr "Naziv nove grupe"
 
-#: src/gtkblist.c:1510
+#: src/gtkblist.c:1728
 msgid "Please enter a new name for the selected group."
 msgstr "Unesite novi naziv za izabranu grupu."
 
-#: src/gtkblist.c:1539
+#: src/gtkblist.c:1756
 #, c-format
 msgid ""
 "\n"
@@ -2206,16 +2158,16 @@
 "\n"
 "<b>Nalog:</b> %s"
 
-#: src/gtkblist.c:1602 src/protocols/oscar/oscar.c:5514
+#: src/gtkblist.c:1817 src/protocols/oscar/oscar.c:5542
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Stanje:</b> Nepovezan"
 
-#: src/gtkblist.c:1614
+#: src/gtkblist.c:1829
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1629
+#: src/gtkblist.c:1844
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2223,7 +2175,7 @@
 "\n"
 "<b>Nalog:</b>"
 
-#: src/gtkblist.c:1630
+#: src/gtkblist.c:1845
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2231,7 +2183,7 @@
 "\n"
 "<b>Kontakt poznat kao:</b>"
 
-#: src/gtkblist.c:1631
+#: src/gtkblist.c:1846
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2239,7 +2191,7 @@
 "\n"
 "<b>Poznat kao:</b>"
 
-#: src/gtkblist.c:1632
+#: src/gtkblist.c:1847
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2247,7 +2199,7 @@
 "\n"
 "<b>Nadimak:</b>"
 
-#: src/gtkblist.c:1633
+#: src/gtkblist.c:1848
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2255,7 +2207,7 @@
 "\n"
 "<b>Neaktivan:</b>"
 
-#: src/gtkblist.c:1634
+#: src/gtkblist.c:1849
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2263,7 +2215,7 @@
 "\n"
 "<b>Upozoren:</b>"
 
-#: src/gtkblist.c:1636
+#: src/gtkblist.c:1851
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2271,7 +2223,7 @@
 "\n"
 "<b>Opis:</b> sablasno"
 
-#: src/gtkblist.c:1637
+#: src/gtkblist.c:1852
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2279,7 +2231,7 @@
 "\n"
 "<b>Stanje:</b> sjajno"
 
-#: src/gtkblist.c:1638
+#: src/gtkblist.c:1853
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2287,85 +2239,85 @@
 "\n"
 "<b>Stanje:</b> razbija"
 
-#: src/gtkblist.c:1906
+#: src/gtkblist.c:2121
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Neaktivan (%dh%02dm) "
 
-#: src/gtkblist.c:1908
+#: src/gtkblist.c:2123
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Neaktivan (%dm) "
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:2128
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Upozoren (%d%%) "
 
-#: src/gtkblist.c:1916
+#: src/gtkblist.c:2131
 msgid "Offline "
 msgstr "Nepovezan"
 
-#: src/gtkblist.c:2109 src/gtkprefs.c:841 src/gtkprefs.c:1495
+#: src/gtkblist.c:2324 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "Ni邸ta"
 
-#: src/gtkblist.c:2177
+#: src/gtkblist.c:2391
 msgid "/Tools/Away"
 msgstr "/Alati/Odsutan"
 
-#: src/gtkblist.c:2180
+#: src/gtkblist.c:2394
 msgid "/Tools/Buddy Pounce"
 msgstr "/Alati/Zaseda drugaru"
 
-#: src/gtkblist.c:2183
+#: src/gtkblist.c:2397
 msgid "/Tools/Protocol Actions"
 msgstr "/Alati/Akcije po protokolu"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2267
+#: src/gtkblist.c:2484
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Drugari/Prika転i nepovezane drugare"
 
-#: src/gtkblist.c:2269
+#: src/gtkblist.c:2486
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Drugari/Prika転i prazne grupe"
 
-#: src/gtkblist.c:2287 src/gtkconv.c:1217
+#: src/gtkblist.c:2504 src/gtkconv.c:1231
 msgid "IM"
 msgstr "Poruka"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2510
 msgid "Send a message to the selected buddy"
 msgstr "Po邸alji poruku izabranom drugaru"
 
-#: src/gtkblist.c:2296 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2513 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Podaci"
 
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2519
 msgid "Get information on the selected buddy"
 msgstr "Pribavi podatke o izabranom drugaru"
 
-#: src/gtkblist.c:2305 src/protocols/oscar/oscar.c:3086
+#: src/gtkblist.c:2522 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "Razgovor"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:2527
 msgid "Join a chat room"
 msgstr "Priklju�i se pri�aonici"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2535
 msgid "Set an away message"
 msgstr "Postavi poruku za odsustvo"
 
-#: src/gtkblist.c:3026 src/protocols/yahoo/yahoo.c:2166
+#: src/gtkblist.c:3241 src/protocols/yahoo/yahoo.c:2307
 msgid "Add Buddy"
 msgstr "Dodaj drugara"
 
-#: src/gtkblist.c:3049
+#: src/gtkblist.c:3264
 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. "
@@ -2375,24 +2327,24 @@
 "uneti i alijas ili nadimak za drugara. Alijas �e se prikazivati umesto "
 "imena, kad god je to mogu�e.\n"
 
-#: src/gtkblist.c:3071 src/main.c:289
+#: src/gtkblist.c:3286 src/main.c:289
 msgid "Screen Name:"
 msgstr "Korisni�ko ime:"
 
-#: src/gtkblist.c:3097 src/gtkblist.c:3414
+#: src/gtkblist.c:3312 src/gtkblist.c:3632
 msgid "Group:"
 msgstr "Grupa:"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3106 src/gtkblist.c:3384
+#: src/gtkblist.c:3321 src/gtkblist.c:3600
 msgid "Account:"
 msgstr "Nalog:"
 
-#: src/gtkblist.c:3351
+#: src/gtkblist.c:3567
 msgid "Add Chat"
 msgstr "Dodaj razgovor"
 
-#: src/gtkblist.c:3374
+#: src/gtkblist.c:3590
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2400,19 +2352,15 @@
 "Unesite ime koje 転elite da nadenete razgovoru, i podatke o razgovoru koji "
 "転elite da dodate u spisak drugara.\n"
 
-#: src/gtkblist.c:3448
+#: src/gtkblist.c:3666
 msgid "Add Group"
 msgstr "Dodaj grupu"
 
-#: src/gtkblist.c:3448
-msgid "Add a new group"
-msgstr "Dodaj novu grupu"
-
-#: src/gtkblist.c:3449
+#: src/gtkblist.c:3667
 msgid "Please enter the name of the group to be added."
 msgstr "Unesite naziv grupe koju 転elite da dodate."
 
-#: src/gtkblist.c:3964
+#: src/gtkblist.c:4184
 msgid "No actions available"
 msgstr "Nema dostupnih akcija"
 
@@ -2432,45 +2380,62 @@
 msgid "Cancel All"
 msgstr "Otka転i sve"
 
-#: src/gtkconn.c:362
+#: src/gtkconn.c:425 src/gtkconn.c:460 src/gtkconn.c:526
+msgid "_Reconnect"
+msgstr "Po_novo se pove転i"
+
+#: src/gtkconn.c:490
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s prekinu vezu.</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+#: src/gtkconn.c:492
 msgid "Reason Unknown."
 msgstr "Razlog nepoznat."
 
-#: src/gtkconn.c:371
-msgid "Reconnect"
-msgstr "Ponovo se pove転i"
-
-#: src/gtkconn.c:410
+#: src/gtkconn.c:531
+msgid "Reconnect _All"
+msgstr "Ponovo pove転i _sve"
+
+#: src/gtkconn.c:554
 msgid "Account"
 msgstr "Nalog"
 
-#: src/gtkconn.c:418
+#: src/gtkconn.c:562
 msgid "Time"
 msgstr "Vreme"
 
-#: src/gtkconv.c:186
+#: src/gtkconv.c:187
 msgid "That file already exists"
 msgstr "Datoteka ve� postoji."
 
-#: src/gtkconv.c:187 src/gtkft.c:1034
+#: src/gtkconv.c:188 src/gtkft.c:1076
 msgid "Would you like to overwrite it?"
 msgstr "Da li 転elite da je prepi邸ete?"
 
-#: src/gtkconv.c:242
+#: src/gtkconv.c:243
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Ne mogu da sa�uvam sliku: %s.\n"
 
-#: src/gtkconv.c:312
-msgid "Gaim - Insert Image"
-msgstr "Gaim �� ubaci sliku"
-
-#: src/gtkconv.c:616
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "Gaim �� pozovi drugara u pri�aonicu"
+#: src/gtkconv.c:313
+msgid "Insert Image"
+msgstr "Umetni sliku"
+
+#: src/gtkconv.c:620
+msgid "Invite Buddy Into Chat Room"
+msgstr "Pozovi drugara u pri�aonicu"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:644
+#: src/gtkconv.c:648
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2478,315 +2443,311 @@
 "Unesite ime korisnika koga 転elite da pozovete, a po 転elji dodajte i poruku u "
 "pozivnicu."
 
-#: src/gtkconv.c:665
+#: src/gtkconv.c:669
 msgid "_Buddy:"
 msgstr "_Drugar:"
 
-#: src/gtkconv.c:685
+#: src/gtkconv.c:689
 msgid "_Message:"
 msgstr "_Poruka:"
 
-#: src/gtkconv.c:781
-msgid ""
-"<span weight='bold' size='larger'>Enter a search phrase\n"
-"</span>"
-msgstr ""
-"<span weight='bold' size='larger'>Unesite izraz za pretragu\n"
-"</span>"
-
-#: src/gtkconv.c:788
-msgid "Search term: "
-msgstr "Tra転i izraz:"
-
-#: src/gtkconv.c:1225
+#: src/gtkconv.c:775
+msgid "Find"
+msgstr "Na�i"
+
+#: src/gtkconv.c:793
+msgid "_Search for:"
+msgstr "_Tra転i izraz:"
+
+#: src/gtkconv.c:1239
 msgid "Un-Ignore"
 msgstr "Ne ignori邸i"
 
-#: src/gtkconv.c:1227 src/gtkprefs.c:774
+#: src/gtkconv.c:1241 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "Ignori邸i"
 
 #. Info button
-#: src/gtkconv.c:1236 src/gtkconv.c:3172
+#: src/gtkconv.c:1250 src/gtkconv.c:3110
 msgid "Info"
 msgstr "Podaci"
 
-#: src/gtkconv.c:1245
+#: src/gtkconv.c:1259
 msgid "Get Away Msg"
 msgstr "Pribavi poruku za odsustvo"
 
-#: src/gtkconv.c:1256 src/gtkconv.c:3155 src/gtkconv.c:4340
-#: src/gtkrequest.c:208
+#: src/gtkconv.c:1270 src/gtkconv.c:3093 src/gtkconv.c:4277
+#: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "Ukloni"
 
-#: src/gtkconv.c:2373
+#: src/gtkconv.c:2343
 msgid "User is typing..."
 msgstr "Korisnik kuca..."
 
-#: src/gtkconv.c:2381
+#: src/gtkconv.c:2351
 msgid "User has typed something and paused"
 msgstr "Korisnik je ne邸to ukucao i zastao"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2484
+#: src/gtkconv.c:2454
 msgid "_Send As"
 msgstr "Po邸alji _kao"
 
-#: src/gtkconv.c:2944
-msgid "Gaim - Save Conversation"
-msgstr "Gaim �� sa�uvaj razgovor"
+#: src/gtkconv.c:2875
+msgid "Save Conversation"
+msgstr "Sa�uvaj razgovor"
 
 #. Conversation menu
-#: src/gtkconv.c:2961
+#: src/gtkconv.c:2892
 msgid "/_Conversation"
 msgstr "/_Razgovor"
 
-#: src/gtkconv.c:2963
-msgid "/Conversation/_Save As..."
-msgstr "/Razgovor/_Sa�uvaj kao..."
-
-#: src/gtkconv.c:2965
+#: src/gtkconv.c:2894
+msgid "/Conversation/New _Instant Message..."
+msgstr "/Razgovor/Nova _brza poruka..."
+
+#: src/gtkconv.c:2899
+msgid "/Conversation/_Find..."
+msgstr "/Razgovor/_Na�i..."
+
+#: src/gtkconv.c:2900
 msgid "/Conversation/View _Log"
 msgstr "/Razgovor/Pogledaj _dnevnik"
 
-#: src/gtkconv.c:2966
-msgid "/Conversation/Search..."
-msgstr "/Razgovor/Pretraga..."
-
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:2901
+msgid "/Conversation/_Save As..."
+msgstr "/Razgovor/_Sa�uvaj kao..."
+
+#: src/gtkconv.c:2906
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Razgovor/Dodaj _zasedu drugaru..."
 
-#: src/gtkconv.c:2972
+#: src/gtkconv.c:2908
+msgid "/Conversation/_Get Info"
+msgstr "/Razgovor/Priba_vi podatke..."
+
+#: src/gtkconv.c:2910
+msgid "/Conversation/_Warn..."
+msgstr "/Razgovor/_Upozori..."
+
+#: src/gtkconv.c:2912
+msgid "/Conversation/In_vite..."
+msgstr "/Razgovor/_Pozovi..."
+
+#: src/gtkconv.c:2917
 msgid "/Conversation/A_lias..."
 msgstr "/Razgovor/_Nadeni ime..."
 
-#: src/gtkconv.c:2974
-msgid "/Conversation/_Get Info..."
-msgstr "/Razgovor/Pri_bavi podatke..."
-
-#: src/gtkconv.c:2976
-msgid "/Conversation/In_vite..."
-msgstr "/Razgovor/_Pozovi..."
-
-#: src/gtkconv.c:2981
-msgid "/Conversation/Insert _URL..."
-msgstr "/Razgovor/_Ubaci Internet adresu..."
-
-#: src/gtkconv.c:2983
-msgid "/Conversation/Insert _Image..."
-msgstr "/Razgovor/Ubaci s_liku..."
-
-#: src/gtkconv.c:2988
-msgid "/Conversation/_Warn..."
-msgstr "/Razgovor/_Upozori..."
-
-#: src/gtkconv.c:2990
+#: src/gtkconv.c:2919
 msgid "/Conversation/_Block..."
 msgstr "/Razgovor/_Blokiraj..."
 
-#: src/gtkconv.c:2992
+#: src/gtkconv.c:2921
 msgid "/Conversation/_Add..."
 msgstr "/Razgovor/_Dodaj..."
 
-#: src/gtkconv.c:2994
+#: src/gtkconv.c:2923
 msgid "/Conversation/_Remove..."
 msgstr "/Razgovor/_Ukloni..."
 
-#: src/gtkconv.c:2999
+#: src/gtkconv.c:2928
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Razgovor/Um_etni vezu..."
+
+#: src/gtkconv.c:2930
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Razgovor/Umetni _sliku..."
+
+#: src/gtkconv.c:2935
 msgid "/Conversation/_Close"
 msgstr "/Razgovor/_Zavr邸i"
 
 #. Options
-#: src/gtkconv.c:3003
+#: src/gtkconv.c:2939
 msgid "/_Options"
 msgstr "/_Izbori"
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:2940
 msgid "/Options/Enable _Logging"
 msgstr "/Izbori/Omogu�i _dnevnik rada"
 
-#: src/gtkconv.c:3005
+#: src/gtkconv.c:2941
 msgid "/Options/Enable _Sounds"
 msgstr "/Izbori/Omogu�i z_vuke"
 
-#: src/gtkconv.c:3006
+#: src/gtkconv.c:2942
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Izbori/Prika転i _alatke za formatiranje"
 
-#: src/gtkconv.c:3048
+#: src/gtkconv.c:2984
 msgid "/Conversation/View Log"
 msgstr "/Razgovor/Prika転i dnevnik"
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:2989
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Razgovor/Dodaj _zasedu drugaru..."
 
-#: src/gtkconv.c:3057
-msgid "/Conversation/Alias..."
-msgstr "/Razgovor/Nadeni ime..."
-
-#: src/gtkconv.c:3061
-msgid "/Conversation/Get Info..."
+#: src/gtkconv.c:2995
+msgid "/Conversation/Get Info"
 msgstr "/Razgovor/Pribavi podatke..."
 
-#: src/gtkconv.c:3065
+#: src/gtkconv.c:2999
+msgid "/Conversation/Warn..."
+msgstr "/Razgovor/Upozori..."
+
+#: src/gtkconv.c:3003
 msgid "/Conversation/Invite..."
 msgstr "/Razgovor/Podaci..."
 
-#: src/gtkconv.c:3071
-msgid "/Conversation/Insert URL..."
-msgstr "/Razgovor/Ubaci Internet adresu..."
-
-#: src/gtkconv.c:3075
-msgid "/Conversation/Insert Image..."
-msgstr "/Razgovor/Ubaci sliku..."
-
-#: src/gtkconv.c:3081
-msgid "/Conversation/Warn..."
-msgstr "/Razgovor/Upozori..."
-
-#: src/gtkconv.c:3085
+#: src/gtkconv.c:3009
+msgid "/Conversation/Alias..."
+msgstr "/Razgovor/Nadeni ime..."
+
+#: src/gtkconv.c:3013
 msgid "/Conversation/Block..."
 msgstr "/Razgovor/Blokiraj..."
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3017
 msgid "/Conversation/Add..."
 msgstr "/Razgovor/Dodaj..."
 
-#: src/gtkconv.c:3093
+#: src/gtkconv.c:3021
 msgid "/Conversation/Remove..."
 msgstr "/Razgovor/Ukloni..."
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3027
+msgid "/Conversation/Insert Link..."
+msgstr "/Razgovor/Ubaci vezu..."
+
+#: src/gtkconv.c:3031
+msgid "/Conversation/Insert Image..."
+msgstr "/Razgovor/Ubaci sliku..."
+
+#: src/gtkconv.c:3037
 msgid "/Options/Enable Logging"
 msgstr "/Izbori/Omogu�i zapise"
 
-#: src/gtkconv.c:3102
+#: src/gtkconv.c:3040
 msgid "/Options/Enable Sounds"
 msgstr "/Izbori/Omogu�i zvuke"
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3043
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Izbori/Prika転i alatke za formatiranje"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3129 src/gtkconv.c:3131 src/gtkconv.c:3229 src/gtkconv.c:3231
-#: src/gtkconv.c:6063
+#: src/gtkconv.c:3067 src/gtkconv.c:3069 src/gtkconv.c:3167 src/gtkconv.c:3169
+#: src/gtkconv.c:5987
 msgid "Send"
 msgstr "Po邸alji"
 
-#: src/gtkconv.c:3152 src/gtkconv.c:4358
+#: src/gtkconv.c:3090 src/gtkconv.c:4295
 msgid "Add the user to your buddy list"
 msgstr "Dodavanje korisnika u Va邸 spisak drugara"
 
-#: src/gtkconv.c:3158 src/gtkconv.c:4343
+#: src/gtkconv.c:3096 src/gtkconv.c:4280
 msgid "Remove the user from your buddy list"
 msgstr "Uklanjanje korisnika sa Va邸eg spisak drugara"
 
 #. Warn button
-#: src/gtkconv.c:3165
+#: src/gtkconv.c:3103
 msgid "Warn"
 msgstr "Upozori"
 
-#: src/gtkconv.c:3169
+#: src/gtkconv.c:3107
 msgid "Warn the user"
 msgstr "Upozori korisnika"
 
-#: src/gtkconv.c:3176 src/gtkconv.c:3614
+#: src/gtkconv.c:3114 src/gtkconv.c:3553
 msgid "Get the user's information"
 msgstr "Pribavi podatke o korisniku"
 
 #. Block button
-#: src/gtkconv.c:3179 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3117 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Blokiraj"
 
-#: src/gtkconv.c:3183
+#: src/gtkconv.c:3121
 msgid "Block the user"
 msgstr "Blokiraj korisnika"
 
 #. Invite
-#: src/gtkconv.c:3241 src/gtkconv.c:6066
+#: src/gtkconv.c:3179 src/gtkconv.c:5990
 msgid "Invite"
 msgstr "Pozovi"
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3182
 msgid "Invite a user"
 msgstr "Pozovi korisnika"
 
-#: src/gtkconv.c:3283
+#: src/gtkconv.c:3221
 msgid "Bold"
 msgstr "Masno"
 
-#: src/gtkconv.c:3294
+#: src/gtkconv.c:3232
 msgid "Italic"
 msgstr "Kurziv"
 
-#: src/gtkconv.c:3305
+#: src/gtkconv.c:3243
 msgid "Underline"
 msgstr "Podvu�eno"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3259
 msgid "Larger font size"
 msgstr "Ve�a slova"
 
-#: src/gtkconv.c:3333
-msgid "Normal font size"
-msgstr "Obi�na slova"
-
-#: src/gtkconv.c:3345
+#: src/gtkconv.c:3284
 msgid "Smaller font size"
 msgstr "Manja slova"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3301
 msgid "Font Face"
 msgstr "Pismo"
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3313
 msgid "Foreground font color"
 msgstr "Boja teksta"
 
-#: src/gtkconv.c:3386
+#: src/gtkconv.c:3325
 msgid "Background color"
 msgstr "Boja pozadine"
 
-#: src/gtkconv.c:3401
+#: src/gtkconv.c:3340
 msgid "Insert image"
 msgstr "Ubaci sliku"
 
-#: src/gtkconv.c:3412
+#: src/gtkconv.c:3351
 msgid "Insert link"
 msgstr "Ubaci vezu"
 
-#: src/gtkconv.c:3423
+#: src/gtkconv.c:3362
 msgid "Insert smiley"
 msgstr "Ubaci sme邸ak"
 
-#: src/gtkconv.c:3483
+#: src/gtkconv.c:3422
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3534
+#: src/gtkconv.c:3473
 msgid "0 people in room"
 msgstr "Nema nikoga u pri�aonici"
 
-#: src/gtkconv.c:3591
+#: src/gtkconv.c:3530
 msgid "IM the user"
 msgstr "Po邸alji brzu poruku korisniku"
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3542
 msgid "Ignore the user"
 msgstr "Ignori邸i korisnika"
 
-#: src/gtkconv.c:4156
+#: src/gtkconv.c:4093
 msgid "Close conversation"
 msgstr "Okon�aj razgovor"
 
-#: src/gtkconv.c:4756 src/gtkconv.c:4788 src/gtkconv.c:4909 src/gtkconv.c:4976
+#: src/gtkconv.c:4680 src/gtkconv.c:4712 src/gtkconv.c:4833 src/gtkconv.c:4900
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2794,19 +2755,19 @@
 msgstr[1] "%d osobe u pri�aonici."
 msgstr[2] "%d osoba u pri�aonici."
 
-#: src/gtkconv.c:5310
+#: src/gtkconv.c:5234
 msgid "Animate"
 msgstr "Animiraj"
 
-#: src/gtkconv.c:5315
+#: src/gtkconv.c:5239
 msgid "Hide Icon"
 msgstr "Sakrij ikonicu"
 
-#: src/gtkconv.c:5321
+#: src/gtkconv.c:5245
 msgid "Save Icon As..."
 msgstr "Sa�uvaj ikonicu kao..."
 
-#: src/gtkconv.c:5800 src/gtkconv.c:5803
+#: src/gtkconv.c:5724 src/gtkconv.c:5727
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Razgovor/Zavr邸i"
 
@@ -2822,120 +2783,128 @@
 msgid "Timestamps"
 msgstr "Vremenska oznaka"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:200
+#: src/gtkft.c:207
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Primanje od:</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:210
 msgid "<b>Sending To:</b>"
 msgstr "<b>Slanje za:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:458
 msgid "Progress"
 msgstr "Napredak"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:465
 msgid "Filename"
 msgstr "Naziv datoteke"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:472
 msgid "Size"
 msgstr "Veli�ina"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:479
 msgid "Remaining"
 msgstr "Preostalo"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:509
 msgid "Filename:"
 msgstr "Naziv datoteke:"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:510
 msgid "Status:"
 msgstr "Stanje:"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:511
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:512
 msgid "Time Elapsed:"
 msgstr "Proteklo vreme:"
 
-#: src/gtkft.c:491
+#: src/gtkft.c:513
 msgid "Time Remaining:"
 msgstr "Preostalo vreme:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:610
 msgid "_Keep the dialog open"
 msgstr "_Ostavi prozor otvoren"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:620
 msgid "_Clear finished transfers"
 msgstr "_Izbaci zavr邸ene prenose"
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
+#: src/gtkft.c:629
+msgid "Show transfer details"
 msgstr "Prika転i detalje prenosa"
 
-#: src/gtkft.c:608
-msgid "Hide download details"
+#: src/gtkft.c:630
+msgid "Hide transfer details"
 msgstr "Sakrij detalje prenosa"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:672 src/stock.c:85
 msgid "_Pause"
 msgstr "_Zastani"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:682
 msgid "_Resume"
 msgstr "_Nastavi"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:882
+msgid "Canceled"
+msgstr "Otka転i"
+
+#: src/gtkft.c:884
+msgid "Failed"
+msgstr "Neuspeh"
+
+#: src/gtkft.c:1053
 msgid "That file does not exist."
 msgstr "Datoteka ne postoji."
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1062
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ne mogu da po邸aljem datoteku od 0 bajtova."
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1075
 msgid "That file already exists."
 msgstr "Datoteka ve� postoji."
 
-#: src/gtkft.c:1058
-msgid "Gaim - Open..."
-msgstr "Gaim �� Otvori..."
-
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "Gaim �� Sa�uvaj kao..."
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1100
+msgid "Open..."
+msgstr "Otvori..."
+
+#: src/gtkft.c:1102
+msgid "Save As..."
+msgstr "Sa�uvaj kao..."
+
+#: src/gtkft.c:1149
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 転eli da Vam po邸alje %s (%s)"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:691
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj adresu e-po邸te"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:703
 msgid "_Copy Link Location"
 msgstr "_Kopiraj adresu veze"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:713
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: src/gtkimhtml.c:1744
+#: src/gtkimhtml.c:1849
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2943,20 +2912,20 @@
 "Gaim nije uspeo da pogodi vrstu zapisa slike na osnovu navedenog nastavka "
 "datoteke. Podrazumevano se radi o PNG zapisu."
 
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:1857
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Gre邸ka pri snimanju slike: %s"
 
-#: src/gtkimhtml.c:1761
+#: src/gtkimhtml.c:1866
 msgid "Save Image"
 msgstr "Sa�uvaj sliku"
 
-#: src/gtkimhtml.c:1784
+#: src/gtkimhtml.c:1889
 msgid "_Save Image..."
 msgstr "_Sa�uvaj sliku..."
 
-#: src/gtklog.c:184
+#: src/gtklog.c:255
 msgid "Conversations with"
 msgstr "Razgovori sa"
 
@@ -3050,7 +3019,7 @@
 msgid "Pounce When"
 msgstr "Kada da izvr邸im akciju?"
 
-#: src/gtkpounce.c:407 src/main.c:339
+#: src/gtkpounce.c:407 src/main.c:335
 msgid "Sign on"
 msgstr "Prijavi se"
 
@@ -3062,8 +3031,8 @@
 msgid "Return from away"
 msgstr "Vrati se sa odsustva"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2171
 msgid "Idle"
 msgstr "Neaktivan"
 
@@ -3108,7 +3077,7 @@
 msgid "Browse"
 msgstr "Pretra転i"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2081
+#: src/gtkpounce.c:468 src/gtkprefs.c:2083
 msgid "Test"
 msgstr "Isprobaj"
 
@@ -3180,6 +3149,11 @@
 msgid "Icon"
 msgstr "Ikonica"
 
+#: src/gtkprefs.c:601 src/gtkprefs.c:1805 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:738
+msgid "Description"
+msgstr "Opis"
+
 #: src/gtkprefs.c:668
 msgid "Style"
 msgstr "Stil"
@@ -3224,7 +3198,7 @@
 msgid "Bac_kground color"
 msgstr "Boja _pozadine"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:992 src/gtkprefs.c:1045
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "Prikaz"
 
@@ -3300,23 +3274,23 @@
 msgid "Buddy List Toolbar"
 msgstr "Alatke u spisku drugara"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
+#: src/gtkprefs.c:836 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr "Prika転i _dugmad kao:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
+#: src/gtkprefs.c:838 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "Slike"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:965 src/gtkprefs.c:1021
+#: src/gtkprefs.c:839 src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:966 src/gtkprefs.c:1022
+#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "Slike i tekst"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:845 src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise window on events"
 msgstr "_Izdigni prozor na doga�aje"
 
@@ -3332,7 +3306,7 @@
 msgid "Buddy Display"
 msgstr "Prikaz drugara"
 
-#: src/gtkprefs.c:853 src/gtkprefs.c:987
+#: src/gtkprefs.c:853 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr "Prika転i i_konice drugara"
 
@@ -3348,189 +3322,179 @@
 msgid "Dim i_dle buddies"
 msgstr "_Osen�i neaktivne drugare"
 
-#: src/gtkprefs.c:884
+#: src/gtkprefs.c:861
+msgid "_Automatically expand contacts"
+msgstr "_Sam razgranaj kontakte"
+
+#: src/gtkprefs.c:886
 msgid "_Placement:"
 msgstr "_Razme邸taj:"
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:893
 msgid "Send _URLs as Links"
 msgstr "Prika転i _Internet adrese kao veze"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:896
 msgid "Show Formatting Toolbar"
 msgstr "Prika転i alatke za formatiranje"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:899
 msgid "Tab Options"
 msgstr "Postavke listova"
 
-#: src/gtkprefs.c:899
-msgid "_Tab Placement:"
-msgstr "Postavka _jezi�aka:"
-
 #: src/gtkprefs.c:901
+msgid "_Tab Placement:"
+msgstr "Postavka _jezi�aka:"
+
+#: src/gtkprefs.c:903
 msgid "Top"
 msgstr "Na vrhu"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:904
 msgid "Bottom"
 msgstr "Na dnu"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:905
 msgid "Left"
 msgstr "Levo"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:906
 msgid "Right"
 msgstr "Desno"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:912
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prika転i brze poruke i razgovore u prozorima pomo�u _listova"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:915
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Prika転i brze poruke i razgovore u _istom lisnatom prozoru"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:925
 msgid "Show _close button on tabs"
 msgstr "Prika転i dugme za zatvara_nje na jezi�cima."
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:936
 msgid "Show status _icons on tabs"
 msgstr "Prika転i ikonicu stanja na jezi�cima."
 
-#: src/gtkprefs.c:961 src/gtkprefs.c:1017
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "Prozor"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "_�irina novog prozora:"
 
-#: src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr "_Visina novog prozora:"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
 msgid "_Entry field height:"
 msgstr "Visina polja za _unos:"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr "_Sakrij prozor pri slanju"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "Ikonice drugara"
 
-#: src/gtkprefs.c:989
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "Uklju�i _animaciju ikonice drugara"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr "Prika転i _prijave u prozoru"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr "Prika転i a_lijase u jezi�cima/naslovima"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "Obave邸tenje o kucanju"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "Slanje obave邸tenja drugarima kada im pi邸e_te"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr "Dovr邸avanje tabulatorom"
 
-#: src/gtkprefs.c:1040
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr "Dovr邸i nadimke na pritisak _tabulatora"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr "_Staromodno dovr邸avanje pomo�u tabulatora"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1048
 msgid "_Show people joining in window"
 msgstr "Prika転i u prozoru ljude koji se _priklju�uju"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1050
 msgid "_Show people leaving in window"
 msgstr "Prika転i u prozoru ljude koji _odlaze"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1052
 msgid "Co_lorize screennames"
 msgstr "_Bojenje imena"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr "Vrsta proksija"
 
-#: src/gtkprefs.c:1097
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr "Bez proksija"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1106
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: src/gtkprefs.c:1125
-msgid "_Host"
-msgstr "_Ime servera"
-
-#: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
-#: src/protocols/jabber/jabber.c:1152 src/protocols/msn/msn.c:1640
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
-msgid "Port"
-msgstr "Port"
-
-#: src/gtkprefs.c:1160
-msgid "_User"
-msgstr "_Korisnik"
-
-#: src/gtkprefs.c:1177
-msgid "Pa_ssword"
-msgstr "_Lozinka"
-
-#: src/gtkprefs.c:1214
+#: src/gtkprefs.c:1162
+msgid "_User:"
+msgstr "_Korisnik:"
+
+#: src/gtkprefs.c:1216
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1215
+#: src/gtkprefs.c:1217
 msgid "Netscape"
 msgstr "Netskejp"
 
-#: src/gtkprefs.c:1216
+#: src/gtkprefs.c:1218
 msgid "Mozilla"
 msgstr "Mozila"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1219
 msgid "Konqueror"
 msgstr "Konkveror"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1220
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1229
 msgid "Manual"
 msgstr "Ru�na postavka"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1270
 msgid "Browser Selection"
 msgstr "Izbor preglednika"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1274
 msgid "_Browser:"
 msgstr "_Veb preglednik:"
 
-#: src/gtkprefs.c:1282
+#: src/gtkprefs.c:1284
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3539,87 +3503,63 @@
 "_Ru�no:\n"
 "(%s za adresu)"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1305
 msgid "Browser Options"
 msgstr "Postavke veb preglednika"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1306
 msgid "Open new _window by default"
 msgstr "Otvaranje novog _prozora je podrazumevano"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1322
 msgid "Message Logs"
 msgstr "Dnevnik poruka"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1325
 msgid "Log _Format:"
 msgstr "Oblik _dnevnika:"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1329
 msgid "_Log all instant messages"
 msgstr "Bele転i sve _brze poruke"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1331
 msgid "Log all c_hats"
 msgstr "Bele転i sve _razgovore"
 
-#: src/gtkprefs.c:1332
-msgid "System Logs"
-msgstr "Sistemski dnevnik"
-
-#: src/gtkprefs.c:1333
-msgid "Log when buddies _sign on/sign off"
-msgstr "Bele転i kada se drugari _prijavljuju/odjavljuju"
-
-#: src/gtkprefs.c:1335
-msgid "Log when buddies become _idle/un-idle"
-msgstr "Bele転i kada su drugari _neaktivni/aktivni"
-
-#: src/gtkprefs.c:1337
-msgid "Log when buddies go away/come _back"
-msgstr "Bele転i kada su drugari _odsustni/prisutni"
-
-#: src/gtkprefs.c:1339
-msgid "Log your _own signons/idleness/awayness"
-msgstr "Bele転i _li�ne prijave/neaktivnost/odsustva"
-
-#: src/gtkprefs.c:1341
-msgid "I_ndividual log file for each buddy's signons"
-msgstr "Pojedina�na datoteka denvnika za _svakog drugara"
-
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1386
 msgid "Sound Options"
 msgstr "Postavke zvuka"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1387
 msgid "_No sounds when you log in"
 msgstr "_Bez zvuka po prijavi"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1389
 msgid "_Sounds while away"
 msgstr "Zvuk je _aktivan dok ste odsutni"
 
-#: src/gtkprefs.c:1391
+#: src/gtkprefs.c:1393
 msgid "Sound Method"
 msgstr "Na�in ogla邸avanja"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1394
 msgid "_Method:"
 msgstr "_Na�in:"
 
-#: src/gtkprefs.c:1394
+#: src/gtkprefs.c:1396
 msgid "Console beep"
 msgstr "Konzolni zvuk"
 
-#: src/gtkprefs.c:1396
+#: src/gtkprefs.c:1398
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1405
 msgid "Command"
 msgstr "Naredba"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1415
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3628,67 +3568,67 @@
 "Naredba za zvuk:\n"
 "(%s za naziv datoteke)"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1470
 msgid "_Sending messages removes away status"
 msgstr "Slanje poruka Vas vra�a sa _odsustva"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1472
 msgid "_Queue new messages when away"
 msgstr "Odla転i u _red poruke na odsustvu"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1475
 msgid "Auto-response"
 msgstr "Automatski odgovor"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1478
 msgid "Seconds before _resending:"
 msgstr "Broj _sekundi pre ponovnog slanja:"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1481
 msgid "_Send auto-response"
 msgstr "Slanje _automatskog odgovor"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1483
 msgid "_Only send auto-response when idle"
 msgstr "Slanje automatskog odgovora samo kada ste _neaktivni"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1485
 msgid "Send auto-response in _active conversations"
 msgstr "Slanje automatskog odgovora u a_ktivnim razgovorima"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1495
 msgid "Idle _time reporting:"
 msgstr "Prijavljivanje neak_tivnosti:"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1498
 msgid "Gaim usage"
 msgstr "Aktivnost u Gaimu"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1501
 msgid "X usage"
 msgstr "Aktivnost u IKS-ima"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1503
 msgid "Windows usage"
 msgstr "Aktivnost u Vindousu"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1511
 msgid "Auto-away"
 msgstr "Automatsko odustvo"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1512
 msgid "Set away _when idle"
 msgstr "Idete na o_dsustvo kada ste neaktivni"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1514
 msgid "_Minutes before setting away:"
 msgstr "Broj _minuta pre odlaska na odsustvo:"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1521
 msgid "Away m_essage:"
 msgstr "_Poruka za odsustvo:"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1583
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3703,7 +3643,7 @@
 "<span weight=\"bold\">Veb stranica:</span>\t\t%s\n"
 "<span weight=\"bold\">Datoteka:</span>\t%s"
 
-#: src/gtkprefs.c:1586
+#: src/gtkprefs.c:1588
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3718,97 +3658,97 @@
 "<span weight=\"bold\">Internet adresa:</span>  %s\n"
 "<span weight=\"bold\">Datoteka:</span>  %s"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1769
 msgid "Load"
 msgstr "U�itaj"
 
-#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:588
-#: src/protocols/msn/msn.c:1328 src/protocols/trepia/trepia.c:401
+#: src/gtkprefs.c:1776 src/protocols/jabber/jabber.c:582
+#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "Ime"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1823
 msgid "Details"
 msgstr "Detalji"
 
-#: src/gtkprefs.c:1948
+#: src/gtkprefs.c:1950
 msgid "Sound Selection"
 msgstr "Izbor zvuka"
 
-#: src/gtkprefs.c:2055
+#: src/gtkprefs.c:2057
 msgid "Play"
 msgstr "Pusti"
 
-#: src/gtkprefs.c:2062
+#: src/gtkprefs.c:2064
 msgid "Event"
 msgstr "Doga�aj"
 
-#: src/gtkprefs.c:2085
+#: src/gtkprefs.c:2087
 msgid "Reset"
 msgstr "Odbaci"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2091
 msgid "Choose..."
 msgstr "Izaberi..."
 
-#: src/gtkprefs.c:2223
+#: src/gtkprefs.c:2225
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: src/gtkprefs.c:2259
-msgid "Interface"
-msgstr "Su�elje"
-
-#: src/gtkprefs.c:2260
-msgid "Smiley Themes"
-msgstr "Skupovi sme邸aka"
-
 #: src/gtkprefs.c:2261
-msgid "Fonts"
-msgstr "Pisma"
+msgid "Interface"
+msgstr "Su�elje"
 
 #: src/gtkprefs.c:2262
-msgid "Message Text"
-msgstr "Tekst poruke"
+msgid "Smiley Themes"
+msgstr "Skupovi sme邸aka"
 
 #: src/gtkprefs.c:2263
+msgid "Fonts"
+msgstr "Pisma"
+
+#: src/gtkprefs.c:2264
+msgid "Message Text"
+msgstr "Tekst poruke"
+
+#: src/gtkprefs.c:2265
 msgid "Shortcuts"
 msgstr "Pre�ice"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2268
 msgid "IMs"
 msgstr "Brze poruke"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2270
 msgid "Proxy"
 msgstr "Proksi"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2273
 msgid "Browser"
 msgstr "Preglednik"
 
-#: src/gtkprefs.c:2273
-msgid "Logging"
-msgstr "Zapisivanje"
-
-#: src/gtkprefs.c:2274
-msgid "Sounds"
-msgstr "Zvuk"
-
 #: src/gtkprefs.c:2275
+msgid "Logging"
+msgstr "Zapisivanje"
+
+#: src/gtkprefs.c:2276
+msgid "Sounds"
+msgstr "Zvuk"
+
+#: src/gtkprefs.c:2277
 msgid "Sound Events"
 msgstr "Zvu�ni doga�aji"
 
-#: src/gtkprefs.c:2276
+#: src/gtkprefs.c:2278
 msgid "Away / Idle"
 msgstr "Odsustvo / Neaktivnost"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2279
 msgid "Away Messages"
 msgstr "Poruke za odsustvo"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2282
 msgid "Plugins"
 msgstr "Dodaci"
 
@@ -3896,15 +3836,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:193 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "Da"
 
-#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:194 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "Ne"
 
-#: src/gtkrequest.c:204
+#: src/gtkrequest.c:197
 msgid "Apply"
 msgstr "Primeni"
 
@@ -3970,51 +3910,53 @@
 "Ne mogu reprodukovati zvuk zato 邸to se ne mo転e pokrenuti postavljena zvu�na "
 "naredba: %s"
 
-#: src/gtkutils.c:288
+#: src/gtkutils.c:294
 msgid "Can't save icon file to disk."
 msgstr "Ne mogu sa�uvati datoteku sa ikonicom na disk."
 
-#: src/gtkutils.c:323
-msgid "Gaim - Save Icon"
-msgstr "Gaim �� Sa�uvaj ikonicu"
-
-#: src/log.c:79
+#: src/gtkutils.c:329
+msgid "Save Icon"
+msgstr "Sa�uvaj ikonu"
+
+#: src/log.c:83
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Dnevnik ne omogu�ava �itanje</font></b>"
 
-#: src/log.c:370
+#: src/log.c:407
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:448
+#: src/log.c:487
 #, c-format
 msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\">(%s) <b>%s <SAMO-ODGOVOR>:</b></font> %s<br/>\n"
-
-#: src/log.c:450
+msgstr ""
+"<font color=\"#16569E\">(%s) <b>%s <SAMO-ODGOVOR>:</b></font> %s<br/>\n"
+
+#: src/log.c:489
 #, c-format
 msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\">(%s) <b>%s <SAMO-ODGOVOR>:</b></font> %s<br/>\n"
-
-#: src/log.c:478 src/log.c:602
-msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-msgstr "<font color=\"red\"><b>log->logger_data je NULL!</b></font>"
-
-#: src/log.c:488 src/log.c:612
+msgstr ""
+"<font color=\"#A82F2F\">(%s) <b>%s <SAMO-ODGOVOR>:</b></font> %s<br/>\n"
+
+#: src/log.c:533 src/log.c:668
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<font color=\"red\"><b>Ne mogu da na�em putanju dnevnika!</b></font>"
+
+#: src/log.c:543 src/log.c:678
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ne mogu da �itam datoteku: %s</b></font>"
 
-#: src/log.c:492
+#: src/log.c:547
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:572
+#: src/log.c:621
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <SAMO-ODGOVOR>: %s\n"
 
-#: src/log.c:616
+#: src/log.c:682
 msgid "Plain text"
 msgstr "Obi�an tekst"
 
@@ -4031,7 +3973,7 @@
 msgstr "Prijava"
 
 #. full help text
-#: src/main.c:550
+#: src/main.c:549
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4068,7 +4010,7 @@
 "  -h, --help           prikazuje ovu pomo� i iza�i\n"
 
 #. short message
-#: src/main.c:565
+#: src/main.c:564
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Poku邸ajte ��%s -h�� za vi邸e podataka.\n"
@@ -4098,8 +4040,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2474
+#: src/protocols/yahoo/yahoo.c:2583
 msgid "Available"
 msgstr "Dostupan"
 
@@ -4111,11 +4053,11 @@
 msgid "Away for friends only"
 msgstr "Odsutan samo za prijatelje"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:931
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
-#: src/protocols/oscar/oscar.c:4576 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6140 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
+#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
+#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2169
+#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2593
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -4170,7 +4112,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:200 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:141
 msgid "Unable to connect."
 msgstr "Ne mogu da se pove転em."
 
@@ -4233,7 +4176,7 @@
 msgid "Active"
 msgstr "Aktivan"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3954
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
 msgid "UIN"
 msgstr "Korisni�ki broj"
 
@@ -4242,13 +4185,13 @@
 msgstr "Ime"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:608
-#: src/protocols/oscar/oscar.c:3962 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
+#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Prezime"
 
 #: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3956
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "Nadimak"
 
@@ -4262,19 +4205,19 @@
 msgstr "Pol"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
+#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "Grad"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1266
-#: src/protocols/msn/msn.c:1508 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3197
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
-#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
+#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2788 src/protocols/yahoo/yahoo.c:2811
+#: src/protocols/yahoo/yahoo.c:2969 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "Podaci o drugaru"
 
@@ -4378,8 +4321,8 @@
 msgid "Directory Search"
 msgstr "Pretraga imenika"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1043
-#: src/protocols/oscar/oscar.c:6495 src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Promena lozinke"
 
@@ -4432,17 +4375,17 @@
 "Korisnik %s (%s%s%s%s%s) 転eli da Vas doda u svoj spisak drugara i tra転i Va邸u "
 "dozvolu za to."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:184
-#: src/protocols/msn/notification.c:948 src/protocols/msn/notification.c:1269
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
+#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
+#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2621
+#: src/protocols/oscar/oscar.c:5142
 msgid "Authorize"
 msgstr "Ovlasti"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:185
-#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1271
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
+#: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
+#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:5143
 msgid "Deny"
 msgstr "Odbij"
 
@@ -4494,44 +4437,52 @@
 msgid "No topic is set"
 msgstr "Tema nije postavljena"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "Error displaying MOTD"
 msgstr "Gre邸ka pri prikazivanju poruke dana"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "No MOTD available"
 msgstr "Nije dostupna poruka dana"
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:73
 msgid "There is no MOTD associated with this connection."
 msgstr "Nema poruke dana za ovu vezu."
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:76
 #, c-format
 msgid "MOTD for %s"
 msgstr "Poruka dana za %s"
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:139
 msgid "View MOTD"
 msgstr "Pogledajte poruku dana"
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
-msgstr "Kanal:"
-
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:158
+msgid "_Channel:"
+msgstr "_Kanal:"
+
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:56
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nadimci ne mogu sadr転ati beline"
 
-#: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Prijava: %s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:210
 msgid "Couldn't create socket"
 msgstr "Ne mogu da na�inim soket"
 
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+msgid "Read error"
+msgstr "Gre邸ka pri �itanju"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4541,26 +4492,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:532
+#: src/protocols/irc/irc.c:534
 msgid "IRC Protocol Plugin"
 msgstr "Dodatak za IRC protokol"
 
 #. *  summary
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:535
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Dodatak za IRC protokol"
 
-#: src/protocols/irc/irc.c:550 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1142 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:552 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1140 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:556
+#: src/protocols/irc/irc.c:555 src/protocols/jabber/jabber.c:1155
+#: src/protocols/msn/msn.c:1662 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1345
+msgid "Port"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:558
 msgid "Encoding"
 msgstr "Na�in zapisa"
 
-#: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:578
+#: src/protocols/irc/irc.c:561 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:572
 msgid "Username"
 msgstr "Korisni�ko ime"
 
@@ -4585,7 +4542,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikovani)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2869
 msgid "Realname"
 msgstr "Ime"
 
@@ -4634,84 +4591,88 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "IRC server nije razumeo poruku koju je poslao Gaim."
 
+#: src/protocols/irc/msgs.c:370
+msgid "No such channel"
+msgstr "Nema takvog kanala"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
 msgstr "ne postoji takav kanal"
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:384
 msgid "User is not logged in"
 msgstr "Korisnik nije prijavljen"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "Ne postoji takav nadimak/kanal"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:409
 msgid "Could not send"
 msgstr "Ne mogu da po邸aljem"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pristupanje na %s zahteva pozivanje."
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr "Samo pozivani"
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:562
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Izbacio Vas je %s: (%s)"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Izba�eni od strane %s: (%s)"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mod (%s %s) od strane %s"
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:670
 msgid "Could not change nick"
 msgstr "Ne mogu da promenim nadimak"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr "Ne mogu da promenim nadimak"
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Napustili ste pri�aonicu%s%s"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:730
 msgid "Error: invalid PONG from server"
 msgstr "Gre邸ka: pogre邸an odziv servera (PONG)"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor �� Lag: %lu sekundi"
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:802
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne mogu da se priklju�im u %s:"
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr "Ne mogu da se priklju�im kanalu"
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops sa %s"
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:161
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4719,75 +4680,80 @@
 "(Do邸lo je do gre邸ke pri pretvaranju ove poruke. Proverite opciju ��Na�in "
 "zapisa�� u Uredniku naloga)"
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vreme odziva od %s: %lu sekundi"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr "CTCP PING odgovor"
 
-#: src/protocols/irc/parse.c:391
+#: src/protocols/irc/parse.c:392
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:52
 msgid "Server requires SSL for login"
 msgstr "Server zahteva SSL za prijavu"
 
-#: src/protocols/jabber/auth.c:59 src/protocols/jabber/auth.c:281
-#: src/protocols/jabber/auth.c:380 src/protocols/jabber/auth.c:392
+#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:153
+#: src/protocols/jabber/auth.c:312 src/protocols/jabber/auth.c:412
+#: src/protocols/jabber/auth.c:424
 msgid "Invalid response from server"
 msgstr "Neispravan odgovor servera"
 
-#: src/protocols/jabber/auth.c:86 src/protocols/jabber/auth.c:143
+#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:176
 msgid "Server does not use any supported authentication method"
 msgstr "Server ne koristi nijedan od podr転anih na�ina identifikovanja"
 
-#: src/protocols/jabber/auth.c:301
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/jabber.c:458
+msgid "Unknown Error"
+msgstr "Nepoznata gre邸ka"
+
+#: src/protocols/jabber/auth.c:333
 msgid "Invalid challenge from server"
 msgstr "Neispravan izazov servera"
 
-#: src/protocols/jabber/auth.c:395
+#: src/protocols/jabber/auth.c:427
 msgid "Bad Protocol"
 msgstr "Lo邸 protokol"
 
-#: src/protocols/jabber/auth.c:398
+#: src/protocols/jabber/auth.c:430
 msgid "Encryption Required"
 msgstr "Obavezno je 邸ifrovanje"
 
-#: src/protocols/jabber/auth.c:401
+#: src/protocols/jabber/auth.c:433
 msgid "Invalid authzid"
 msgstr "Neispravan authzid"
 
-#: src/protocols/jabber/auth.c:404
+#: src/protocols/jabber/auth.c:436
 msgid "Invalid Mechanism"
 msgstr "Neispravan mehanizam"
 
-#: src/protocols/jabber/auth.c:406
+#: src/protocols/jabber/auth.c:438
 msgid "Invalid Realm"
 msgstr "Neispravan domen"
 
-#: src/protocols/jabber/auth.c:409
+#: src/protocols/jabber/auth.c:441
 msgid "Mechanism Too Weak"
 msgstr "Mehanizam je preslab"
 
-#: src/protocols/jabber/auth.c:412 src/protocols/jabber/jabber.c:158
-#: src/protocols/jabber/jabber.c:866 src/protocols/jabber/jabber.c:916
-#: src/protocols/oscar/oscar.c:5542
+#: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:147
+#: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
+#: src/protocols/oscar/oscar.c:5570
 msgid "Not Authorized"
 msgstr "Neovla邸�en"
 
-#: src/protocols/jabber/auth.c:415
+#: src/protocols/jabber/auth.c:447
 msgid "Temporary Authentication Failure"
 msgstr "Privremeno neuspe邸na identifikacija"
 
-#: src/protocols/jabber/auth.c:417
+#: src/protocols/jabber/auth.c:449
 msgid "Authentication Failure"
 msgstr "Neuspe邸na identifikacija"
 
@@ -4804,10 +4770,14 @@
 msgstr "Ime"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:598 src/protocols/yahoo/yahoo.c:2675
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2865
 msgid "Nickname"
 msgstr "Nadimak"
 
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:632
+msgid "URL"
+msgstr "Internet adresa"
+
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
 msgid "Street Address"
 msgstr "Ulica"
@@ -4825,7 +4795,7 @@
 msgstr "Oblast"
 
 #: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:665
-#: src/protocols/jabber/jabber.c:628
+#: src/protocols/jabber/jabber.c:622
 msgid "Postal Code"
 msgstr "Po邸tanski broj"
 
@@ -4841,7 +4811,7 @@
 msgstr "Telefon"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2669
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2861
 msgid "Email"
 msgstr "E-po邸ta"
 
@@ -4863,7 +4833,7 @@
 msgstr "Uloga"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3988
+#: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "Ro�endan"
 
@@ -4883,12 +4853,12 @@
 msgstr "D貼aber ID"
 
 #: src/protocols/jabber/buddy.c:556 src/protocols/jabber/buddy.c:563
-#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:903
-#: src/protocols/jabber/jabber.c:916
+#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:901
+#: src/protocols/jabber/jabber.c:914
 msgid "Status"
 msgstr "Stanje"
 
-#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1143
 msgid "Resource"
 msgstr "Resurs"
 
@@ -4897,8 +4867,8 @@
 msgstr "Ime oca"
 
 # Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4005 src/protocols/oscar/oscar.c:4021
+#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
+#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "Ulica"
 
@@ -4918,37 +4888,37 @@
 msgid "Jabber Profile"
 msgstr "D貼aber profil"
 
-#: src/protocols/jabber/buddy.c:904
+#: src/protocols/jabber/buddy.c:905
 msgid "Un-hide From"
 msgstr "Ne sakrivaj od"
 
-#: src/protocols/jabber/buddy.c:907
+#: src/protocols/jabber/buddy.c:908
 msgid "Temporarily Hide From"
 msgstr "Privremeno sakrij od"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:916
 msgid "Cancel Presence Notification"
 msgstr "Otka転i obave邸tenja o prisustvu"
 
-#: src/protocols/jabber/buddy.c:923
+#: src/protocols/jabber/buddy.c:924
 msgid "(Re-)Request authorization"
 msgstr "(Ponovo) zahtevaj ovla邸�enje"
 
-#: src/protocols/jabber/buddy.c:929
+#: src/protocols/jabber/buddy.c:930
 msgid "Unsubscribe"
 msgstr "Odjavi se"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
-msgstr "Soba:"
+#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:938
+msgid "_Room:"
+msgstr "_Soba:"
 
 #: src/protocols/jabber/chat.c:44
-msgid "Server:"
-msgstr "Server:"
+msgid "_Server:"
+msgstr "Se_rver:"
 
 #: src/protocols/jabber/chat.c:50
-msgid "Handle:"
-msgstr "Nadimak:"
+msgid "_Handle:"
+msgstr "_Ru�ka:"
 
 #: src/protocols/jabber/chat.c:158
 #, c-format
@@ -4977,275 +4947,283 @@
 msgid "Invalid Room Handle"
 msgstr "Neispravna ru�ka sobe"
 
-#: src/protocols/jabber/jabber.c:82
+#: src/protocols/jabber/jabber.c:71
 msgid "Error initializing session"
 msgstr "Gre邸ka pri pokretanju sesije"
 
-#: src/protocols/jabber/jabber.c:133
+#: src/protocols/jabber/jabber.c:122
 msgid "Bad Format"
 msgstr "Lo邸 oblik"
 
-#: src/protocols/jabber/jabber.c:135
+#: src/protocols/jabber/jabber.c:124
 msgid "Bad Namespace Prefix"
 msgstr "Lo邸 predmetak prostora imena"
 
-#: src/protocols/jabber/jabber.c:138
+#: src/protocols/jabber/jabber.c:127
 msgid "Resource Conflict"
 msgstr "Sudar resursa"
 
-#: src/protocols/jabber/jabber.c:140
+#: src/protocols/jabber/jabber.c:129
 msgid "Connection Timeout"
 msgstr "Vremenski rok veze"
 
-#: src/protocols/jabber/jabber.c:142
+#: src/protocols/jabber/jabber.c:131
 msgid "Host Gone"
 msgstr "Doma�in je nestao"
 
-#: src/protocols/jabber/jabber.c:144
+#: src/protocols/jabber/jabber.c:133
 msgid "Host Unknown"
 msgstr "Doma�in je nepoznat"
 
-#: src/protocols/jabber/jabber.c:146
+#: src/protocols/jabber/jabber.c:135
 msgid "Improper Addressing"
 msgstr "Neodgovaraju�e adresiranje"
 
-#: src/protocols/jabber/jabber.c:148
+#: src/protocols/jabber/jabber.c:137
 msgid "Internal Server Error"
 msgstr "Unutra邸nja gre邸ka servera"
 
-#: src/protocols/jabber/jabber.c:150
+#: src/protocols/jabber/jabber.c:139
 msgid "Invalid ID"
 msgstr "Neispravan IB"
 
-#: src/protocols/jabber/jabber.c:152
+#: src/protocols/jabber/jabber.c:141
 msgid "Invalid Namespace"
 msgstr "Neispravan prostor imena"
 
-#: src/protocols/jabber/jabber.c:154
+#: src/protocols/jabber/jabber.c:143
 msgid "Invalid XML"
 msgstr "Neispravan XML"
 
-#: src/protocols/jabber/jabber.c:156
+#: src/protocols/jabber/jabber.c:145
 msgid "Non-matching Hosts"
 msgstr "Nepoklapaju�i doma�ini"
 
-#: src/protocols/jabber/jabber.c:160
+#: src/protocols/jabber/jabber.c:149
 msgid "Policy Violation"
 msgstr "Prekora�enje ovla邸�enja"
 
-#: src/protocols/jabber/jabber.c:162
+#: src/protocols/jabber/jabber.c:151
 msgid "Remote Connection Failed"
 msgstr "Udaljena veza neuspe邸na"
 
-#: src/protocols/jabber/jabber.c:164
+#: src/protocols/jabber/jabber.c:153
 msgid "Resource Constraint"
 msgstr "Ograni�enje resursa"
 
-#: src/protocols/jabber/jabber.c:166
+#: src/protocols/jabber/jabber.c:155
 msgid "Restricted XML"
 msgstr "Ograni�eni XML"
 
-#: src/protocols/jabber/jabber.c:168
+#: src/protocols/jabber/jabber.c:157
 msgid "See Other Host"
 msgstr "Pogledajte drugog doma�ina"
 
-#: src/protocols/jabber/jabber.c:170
+#: src/protocols/jabber/jabber.c:159
 msgid "System Shutdown"
 msgstr "Ga邸enje sistema"
 
-#: src/protocols/jabber/jabber.c:172
+#: src/protocols/jabber/jabber.c:161
 msgid "Undefined Condition"
 msgstr "Nedefinisani uslov"
 
-#: src/protocols/jabber/jabber.c:174
+#: src/protocols/jabber/jabber.c:163
 msgid "Unsupported Encoding"
 msgstr "Nepodr転ano kodiranje"
 
 # strofa ba邸 i nije odgovaraju�a :-)
-#: src/protocols/jabber/jabber.c:176
+#: src/protocols/jabber/jabber.c:165
 msgid "Unsupported Stanza Type"
 msgstr "Nepodr転ana vrsta odeljka"
 
-#: src/protocols/jabber/jabber.c:178
+#: src/protocols/jabber/jabber.c:167
 msgid "Unsupported Version"
 msgstr "Nepodr転ano izdanje"
 
-#: src/protocols/jabber/jabber.c:180
+#: src/protocols/jabber/jabber.c:169
 msgid "XML Not Well Formed"
 msgstr "XML nije dobro sa�injen"
 
-#: src/protocols/jabber/jabber.c:182
+#: src/protocols/jabber/jabber.c:171
 msgid "Stream Error"
 msgstr "Gre邸ka toka"
 
-#: src/protocols/jabber/jabber.c:245 src/protocols/msn/httpmethod.c:216
+#: src/protocols/jabber/jabber.c:234 src/protocols/msn/httpmethod.c:234
 #: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
 #: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:536 src/protocols/msn/msn.c:647
-#: src/protocols/msn/msn.c:663 src/protocols/msn/msn.c:711
-#: src/protocols/msn/msn.c:734 src/protocols/msn/msn.c:766
-#: src/protocols/msn/msn.c:774 src/protocols/msn/msn.c:807
-#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:829
-#: src/protocols/msn/msn.c:838 src/protocols/msn/msn.c:852
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:926
-#: src/protocols/msn/msn.c:964 src/protocols/msn/msn.c:1062
-#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1115
-#: src/protocols/msn/msn.c:1126 src/protocols/msn/msn.c:1137
-#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1173
-#: src/protocols/msn/msn.c:1243 src/protocols/msn/notification.c:179
-#: src/protocols/msn/notification.c:207 src/protocols/msn/notification.c:1668
-#: src/protocols/msn/notification.c:1688 src/protocols/trepia/trepia.c:248
+#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
+#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
+#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
+#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
+#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
+#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
+#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
+#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
 #: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
 #: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
 #: src/protocols/trepia/trepia.c:1232
 msgid "Write error"
 msgstr "Gre邸ka pri pisanju"
 
-#: src/protocols/jabber/jabber.c:282 src/protocols/jabber/jabber.c:302
+#: src/protocols/jabber/jabber.c:272 src/protocols/jabber/jabber.c:292
 msgid "Read Error"
 msgstr "Gre邸ka pri �itanju"
 
-#: src/protocols/jabber/jabber.c:356
+#: src/protocols/jabber/jabber.c:346
 msgid "SSL Handshake Failed"
 msgstr "Neuspe邸no SSL rukovanje"
 
-#: src/protocols/jabber/jabber.c:393 src/protocols/jabber/jabber.c:687
+#: src/protocols/jabber/jabber.c:383 src/protocols/jabber/jabber.c:681
 msgid "Invalid Jabber ID"
 msgstr "Neispravan D貼aber IB"
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:721
+#: src/protocols/jabber/jabber.c:411 src/protocols/jabber/jabber.c:708
+msgid "SSL support unavailable"
+msgstr "SSL podr邸ka je nedostupna"
+
+#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:718
 #: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "Ne mogu na�initi soket"
 
-#: src/protocols/jabber/jabber.c:452
+#: src/protocols/jabber/jabber.c:446
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspe邸na"
 
-#: src/protocols/jabber/jabber.c:454 src/protocols/jabber/jabber.c:455
+#: src/protocols/jabber/jabber.c:448 src/protocols/jabber/jabber.c:449
 msgid "Registration Successful"
 msgstr "Registracija uspe邸na"
 
-#: src/protocols/jabber/jabber.c:464
-msgid "Unknown Error"
-msgstr "Nepoznata gre邸ka"
-
-#: src/protocols/jabber/jabber.c:467
+#: src/protocols/jabber/jabber.c:461
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr "Registracija %s@%s neuspe邸na: %s"
 
-#: src/protocols/jabber/jabber.c:469 src/protocols/jabber/jabber.c:470
+#: src/protocols/jabber/jabber.c:463 src/protocols/jabber/jabber.c:464
 msgid "Registration Failed"
 msgstr "Gre邸ka pri registraciji"
 
-#: src/protocols/jabber/jabber.c:568 src/protocols/jabber/jabber.c:569
+#: src/protocols/jabber/jabber.c:562 src/protocols/jabber/jabber.c:563
 msgid "Already Registered"
 msgstr "Ve� je registrovan"
 
-#: src/protocols/jabber/jabber.c:582 src/protocols/jabber/jabber.c:1013
+#: src/protocols/jabber/jabber.c:576 src/protocols/jabber/jabber.c:1011
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/protocols/jabber/jabber.c:593
+#: src/protocols/jabber/jabber.c:587
 msgid "E-Mail"
 msgstr "E-po邸ta"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:603 src/protocols/oscar/oscar.c:3959
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3967
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Ime"
 
 #. State
-#: src/protocols/jabber/jabber.c:623 src/protocols/oscar/oscar.c:4011
-#: src/protocols/oscar/oscar.c:4027 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Oblast"
 
-#: src/protocols/jabber/jabber.c:633
+#: src/protocols/jabber/jabber.c:627
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:637
+msgid "Date"
+msgstr "Datum"
+
+#: src/protocols/jabber/jabber.c:645
 msgid "Please fill out the information below to register your new account."
 msgstr "Molim ispunite podatke ispod da registrujete novi nalog."
 
-#: src/protocols/jabber/jabber.c:654 src/protocols/jabber/jabber.c:655
+#: src/protocols/jabber/jabber.c:648 src/protocols/jabber/jabber.c:649
 msgid "Register New Jabber Account"
 msgstr "Registruj novi D貼aber nalog"
 
-#: src/protocols/jabber/jabber.c:769 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
+#: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1923
+#: src/protocols/yahoo/yahoo.c:2057
 msgid "Connecting"
 msgstr "Uspostavljanje veze"
 
-#: src/protocols/jabber/jabber.c:773
+#: src/protocols/jabber/jabber.c:771
 msgid "Initializing Stream"
 msgstr "Pokretanje toka"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:777
 msgid "Authenticating"
 msgstr "Identifikacija"
 
-#: src/protocols/jabber/jabber.c:787
+#: src/protocols/jabber/jabber.c:785
 msgid "Re-initializing Stream"
 msgstr "Ponovno pokretanje toka"
 
-#: src/protocols/jabber/jabber.c:911 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:270
+#: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/presence.c:296
 msgid "Error"
 msgstr "Gre邸ka"
 
-#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/jabber.c:925 src/protocols/jabber/jutil.c:101
 #: src/protocols/jabber/presence.c:82
 msgid "Chatty"
 msgstr "Pri�ljiv"
 
-#: src/protocols/jabber/jabber.c:929 src/protocols/jabber/jutil.c:104
+#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:104
 #: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
 msgstr "Produ転eno odsustvo"
 
-#: src/protocols/jabber/jabber.c:930 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
-#: src/protocols/oscar/oscar.c:4591 src/protocols/oscar/oscar.c:6136
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6164
 msgid "Do Not Disturb"
 msgstr "Ne uznemiravaj"
 
-#: src/protocols/jabber/jabber.c:946
+#: src/protocols/jabber/jabber.c:944
 msgid "Password Changed"
 msgstr "Lozinka izmenjena"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:945
 msgid "Your password has been changed."
 msgstr "Va邸a lozinka je izmenjena."
 
-#: src/protocols/jabber/jabber.c:957
+#: src/protocols/jabber/jabber.c:955
 #, c-format
 msgid "Error changing password: %s"
 msgstr "Gre邸ka pri izmeni lozinke: %s"
 
-#: src/protocols/jabber/jabber.c:961
+#: src/protocols/jabber/jabber.c:959
 msgid "Unknown error occurred changing password"
 msgstr "Do邸lo je do nepoznate gre邸ke pri izmeni lozinke"
 
-#: src/protocols/jabber/jabber.c:1018
+#: src/protocols/jabber/jabber.c:1016
 msgid "Password (again)"
 msgstr "Lozinka (ponovite)"
 
-#: src/protocols/jabber/jabber.c:1023 src/protocols/jabber/jabber.c:1024
+#: src/protocols/jabber/jabber.c:1021 src/protocols/jabber/jabber.c:1022
 msgid "Change Jabber Password"
 msgstr "Izmenite D貼aber lozinku"
 
-#: src/protocols/jabber/jabber.c:1024
+#: src/protocols/jabber/jabber.c:1022
 msgid "Please enter your new password"
 msgstr "Unesite novu lozinku"
 
+#: src/protocols/jabber/jabber.c:1034 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "Postavi podatke o korisniku"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5256,15 +5234,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1122 src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1120 src/protocols/jabber/jabber.c:1122
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatak za D貼aber protokol"
 
-#: src/protocols/jabber/jabber.c:1148
-msgid "Force Old SSL"
+#: src/protocols/jabber/jabber.c:1146
+msgid "Use TLS if available"
+msgstr "Koristi TLS ako je dostupan"
+
+#: src/protocols/jabber/jabber.c:1151
+msgid "Force old SSL"
 msgstr "Nametni stari SSL"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1159
 msgid "Connect server"
 msgstr "Povezivanje sa serverom"
 
@@ -5273,16 +5255,16 @@
 msgid "Message from %s"
 msgstr "Poruka od %s"
 
-#: src/protocols/jabber/message.c:219
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Isporuka poruke za %s nije uspela: %s"
 
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "D貼aber gre邸ka poruke"
 
-#: src/protocols/jabber/message.c:281
+#: src/protocols/jabber/message.c:288
 #, c-format
 msgid " (Code %s)"
 msgstr " (k担d %s)"
@@ -5291,25 +5273,20 @@
 msgid "XML Parse error"
 msgstr "Gre邸ka pri XML obradi"
 
-#: src/protocols/jabber/presence.c:170
-#, c-format
-msgid "%s (Code %s)"
-msgstr "%s (k担d %s)"
-
-#: src/protocols/jabber/presence.c:175
+#: src/protocols/jabber/presence.c:177
 msgid "Unknown Error in presence"
 msgstr "Nepoznata gre邸ka u prisustvu"
 
-#: src/protocols/jabber/presence.c:179
+#: src/protocols/jabber/presence.c:182
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Korisnik %s 転eli da Vas doda na svoj spisak drugara."
 
-#: src/protocols/jabber/presence.c:260 src/protocols/oscar/oscar.c:2949
+#: src/protocols/jabber/presence.c:286 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "Nepoznata gre邸ka"
 
-#: src/protocols/jabber/presence.c:266
+#: src/protocols/jabber/presence.c:292
 msgid "Unable to join chat"
 msgstr "Ne mogu pristupiti razgovoru"
 
@@ -5323,7 +5300,7 @@
 msgstr "Neuspe邸no slanje datoteke"
 
 #: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:520
+#: src/protocols/msn/notification.c:521
 msgid "Unable to request USR\n"
 msgstr "Ne mogu da zatra転im USR\n"
 
@@ -5343,15 +5320,15 @@
 msgid "Protocol version not supported"
 msgstr "Izdanje protokola nije podr転ano"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:784
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:785
 msgid "Unable to request CVR\n"
 msgstr "Ne mogu da zatra転im CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:793
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:794
 msgid "Unable to request INF\n"
 msgstr "Ne mogu da zatra転im INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1915
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1911
 msgid "Got invalid XFR"
 msgstr "Primljen neispravan XFR"
 
@@ -5364,23 +5341,23 @@
 msgid "Unable to parse message."
 msgstr "Ne mogu da obradim poruku."
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
-#: src/protocols/msn/notification.c:2145 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
+#: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1849
+#: src/protocols/yahoo/yahoo.c:1880 src/protocols/yahoo/yahoo.c:1945
 msgid "Unable to connect"
 msgstr "Nemogu�e povezivanje"
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:889
-#: src/protocols/msn/notification.c:2167
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:890
+#: src/protocols/msn/notification.c:2171
 msgid "Unable to write to server"
 msgstr "Ne mogu da pi邸em na server"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2174
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2178
 msgid "Syncing with server"
 msgstr "Uskla�ivanje sa serverom"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2188
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2192
 msgid "Error reading from server"
 msgstr "Gre邸ka pri �itanju sa servera"
 
@@ -5529,8 +5506,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametri su ili nepoznati ili nedozvoljeni"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:635
-#: src/protocols/msn/notification.c:1282 src/protocols/msn/notification.c:1450
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
 msgid "Unable to write"
 msgstr "Ne mogu da pi邸em"
 
@@ -5641,41 +5617,41 @@
 msgid "Page"
 msgstr "Stranica"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2283
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Stanje:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:623
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Odsutan od ra�unara"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:625
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2151
+#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2584
 msgid "Be Right Back"
 msgstr "Odmah se vra�am"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:627
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2153
+#: src/protocols/yahoo/yahoo.c:2478 src/protocols/yahoo/yahoo.c:2585
 msgid "Busy"
 msgstr "Zauzet"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:629
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2161
+#: src/protocols/yahoo/yahoo.c:2486 src/protocols/yahoo/yahoo.c:2589
 msgid "On The Phone"
 msgstr "Telefoniram"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:631
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2165
+#: src/protocols/yahoo/yahoo.c:2490 src/protocols/yahoo/yahoo.c:2591
 msgid "Out To Lunch"
 msgstr "Na ru�ku sam"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
 #: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Skriven"
@@ -5716,7 +5692,7 @@
 msgid "SSL support is needed for MSN. Please install it."
 msgstr "SSL podr邸ka je neophodna za MSN. Instalirajte je."
 
-#: src/protocols/msn/msn.c:747
+#: src/protocols/msn/msn.c:745
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5725,11 +5701,11 @@
 "MSN korisni�ko ime mora biti oblika ��korisnik@server.cs��. Verovatno ste "
 "転eleli ��%s@hotmail.com��. U va邸em spisku dozvola nisu u�injene izmene."
 
-#: src/protocols/msn/msn.c:751 src/protocols/msn/msn.c:791
+#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
 msgid "Invalid MSN screenname"
 msgstr "Neispravno MSN korisni�ko ime"
 
-#: src/protocols/msn/msn.c:787
+#: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5738,73 +5714,73 @@
 "MSN korisni�ko ime mora biti oblika ��korisnik@server.cs��. Verovatno ste "
 "転eleli ��%s@hotmail.com��. U va邸em spisku zabrana nisu u�injene izmene."
 
-#: src/protocols/msn/msn.c:1267 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2767
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Gre邸ka pri preuzimanju profila</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1335 src/protocols/oscar/oscar.c:3993
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/yahoo/yahoo.c:2877
 msgid "Age"
 msgstr "Starost"
 
 #. Gender
-#: src/protocols/msn/msn.c:1342 src/protocols/oscar/oscar.c:3979
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2705
+#: src/protocols/yahoo/yahoo.c:2885
 msgid "Gender"
 msgstr "Pol"
 
-#: src/protocols/msn/msn.c:1350 src/protocols/yahoo/yahoo.c:2699
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2881
 msgid "Marital Status"
 msgstr "Bra�no stanje"
 
-#: src/protocols/msn/msn.c:1357 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2873
 msgid "Location"
 msgstr "Mesto"
 
-#: src/protocols/msn/msn.c:1365 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2889
 msgid "Occupation"
 msgstr "Zanimanje"
 
-#: src/protocols/msn/msn.c:1382 src/protocols/msn/msn.c:1388
-#: src/protocols/msn/msn.c:1395 src/protocols/msn/msn.c:1402
-#: src/protocols/msn/msn.c:1409
+#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1431
 msgid "A Little About Me"
 msgstr "Pone邸to o meni"
 
-#: src/protocols/msn/msn.c:1418 src/protocols/msn/msn.c:1431
-#: src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Favorite Things"
 msgstr "Omiljene stvari"
 
-#: src/protocols/msn/msn.c:1447 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1482
 msgid "Hobbies and Interests"
 msgstr "Hobiji i interesovanja"
 
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
-#: src/protocols/yahoo/yahoo.c:2755
+#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
+#: src/protocols/yahoo/yahoo.c:2924
 msgid "Favorite Quote"
 msgstr "Omiljena izreka"
 
-#: src/protocols/msn/msn.c:1483 src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2960
 msgid "Last Updated"
 msgstr "Poslednja dopuna"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Li�na stranica"
 
-#: src/protocols/msn/msn.c:1516 src/protocols/yahoo/yahoo.c:2817
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2975
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Podaci o korisniku %s nedostupni"
 
-#: src/protocols/msn/msn.c:1518 src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2977
 msgid "The user's profile is empty."
 msgstr "Profil korisnika je prazan."
 
@@ -5818,15 +5794,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1616 src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1638 src/protocols/msn/msn.c:1640
 msgid "MSN Protocol Plugin"
 msgstr "Dodatak za MSN protokol"
 
-#: src/protocols/msn/msn.c:1635 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1657 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "Server za prijavu"
 
-#: src/protocols/msn/msn.c:1645
+#: src/protocols/msn/msn.c:1666
 msgid "Use HTTP Method"
 msgstr "Koristi HTTP re転im"
 
@@ -5839,72 +5815,72 @@
 msgid "Unable to connect to server"
 msgstr "Ne mogu da se pove転em na server"
 
-#: src/protocols/msn/notification.c:376 src/protocols/msn/notification.c:545
+#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
 msgid "Unable to write to MSN Nexus server."
 msgstr "Ne mogu da pi邸em na MSN Neksus server"
 
-#: src/protocols/msn/notification.c:385 src/protocols/msn/notification.c:560
+#: src/protocols/msn/notification.c:386 src/protocols/msn/notification.c:561
 msgid "Unable to read from MSN Nexus server."
 msgstr "Ne mogu da u�itam zaglavlje sa MSN Neksus servera"
 
-#: src/protocols/msn/notification.c:405
+#: src/protocols/msn/notification.c:406
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Neksus server je vratio neispravne podatke o preusmeravanju."
 
-#: src/protocols/msn/notification.c:459
+#: src/protocols/msn/notification.c:460
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 "Nepoznata gre邸ka pri poku邸aju identifikacije na MSN-ovom serveru za prijavu."
 
-#: src/protocols/msn/notification.c:571
+#: src/protocols/msn/notification.c:572
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN Neksus server je vratio neispravne podatke."
 
-#: src/protocols/msn/notification.c:640 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "Preuzimam spisak drugara"
 
-#: src/protocols/msn/notification.c:703
+#: src/protocols/msn/notification.c:704
 msgid "Unable to connect to passport server"
 msgstr "Ne mogu da se pove転em na server paso邸a"
 
-#: src/protocols/msn/notification.c:708 src/protocols/msn/notification.c:740
+#: src/protocols/msn/notification.c:709 src/protocols/msn/notification.c:741
 #: src/protocols/oscar/oscar.c:1362
 msgid "Password sent"
 msgstr "Lozinka poslata"
 
-#: src/protocols/msn/notification.c:735
+#: src/protocols/msn/notification.c:736
 msgid "Unable to send password"
 msgstr "Ne mogu da po邸aljem lozinku"
 
-#: src/protocols/msn/notification.c:771
+#: src/protocols/msn/notification.c:772
 msgid "Protocol not supported"
 msgstr "Prokol nije podr転an"
 
-#: src/protocols/msn/notification.c:813
+#: src/protocols/msn/notification.c:814
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Veza Vam je prekinuta, prijavili ste se sa nekog drugog mesta."
 
-#: src/protocols/msn/notification.c:818
+#: src/protocols/msn/notification.c:819
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Veza Vam je prekinuta. Privremeno se gase MSN serveri."
 
-#: src/protocols/msn/notification.c:944
+#: src/protocols/msn/notification.c:945
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Korisnik %s (%s) 転eli da doda %s u svoj spisak drugara."
 
-#: src/protocols/msn/notification.c:1263 src/protocols/msn/notification.c:1429
+#: src/protocols/msn/notification.c:1264 src/protocols/msn/notification.c:1429
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Korisnik %s (%s) 転eli da Vas doda u svoj spisak drugara."
 
-#: src/protocols/msn/notification.c:1960
+#: src/protocols/msn/notification.c:1956
 msgid "Unable to transfer to notification server"
 msgstr "Ne mogu da se sporazumem sa serverom za obave邸tenja"
 
 # bug: plural-forms
-#: src/protocols/msn/notification.c:2108
+#: src/protocols/msn/notification.c:2112
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5936,7 +5912,7 @@
 "\n"
 "Nakon 邸to se odr転avanje zavr邸i, mo�i �ete se ponovo prijaviti."
 
-#: src/protocols/msn/servconn.c:528
+#: src/protocols/msn/servconn.c:533
 msgid "Received HTTP error. Please report this."
 msgstr "Primio je HTTP gre邸ku. Prijavite ovo."
 
@@ -5996,10 +5972,10 @@
 msgid "%s requested a PING"
 msgstr "%s zahteva ping"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5205
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
 #: src/protocols/toc/toc.c:1259
-msgid "Join what group:"
-msgstr "Priklju�i se grupi (kojoj?):"
+msgid "_Group:"
+msgstr "_Grupa:"
 
 #. *< api_version
 #. *< type
@@ -6157,7 +6133,8 @@
 msgstr "Veza je uspostavljena, kola�i� je poslat"
 
 #: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:204
+#: src/protocols/yahoo/yahoo_filexfer.c:212
 msgid "File Transfer Aborted"
 msgstr "Prenos datoteke je obustvaljen"
 
@@ -6167,7 +6144,8 @@
 msgstr "Ne mogu da uspostavim soket za vezu."
 
 # 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:868
+#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:205
+#: src/protocols/yahoo/yahoo_filexfer.c:213
 msgid "Unable to establish file descriptor."
 msgstr "Ne mogu da uspostavim opisnik datoteke."
 
@@ -6228,21 +6206,21 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim nije uspeo da primi ispravan he邸 za prijavu."
 
-#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5643
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5671
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Neposredan razgovor sa %s je omogu�en"
 
-#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
+#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
 msgid "(There was an error receiving this message)"
 msgstr "(Do邸lo je do gre邸ke pri prijemu ove poruke)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s je upravo zatra転io neposrednu vezu sa %s"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2414
 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 "
@@ -6252,23 +6230,23 @@
 "slika. Po邸to �e se Va邸a IP adresa prikazati, ovo se mo転e smatrati "
 "naru邸avanjem privatnosti."
 
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6040
 msgid "Connect"
 msgstr "Uspostavi vezu"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2446
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Daj mi ovla邸�enje kako bih mogao da te dodam u spisak drugara."
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2454
 msgid "Authorization Request Message:"
 msgstr "Poruka uz zahtev za ovla邸�enje:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2455
 msgid "Please authorize me!"
 msgstr "Ovlasti me!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2483
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6277,23 +6255,23 @@
 "Korisnik %s zahteva ovla邸�enje pre nego 邸to ga mo転ete dodati u spisak "
 "drugara. Da li 転elite da po邸aljete zahtev za ovla邸�enje?"
 
-#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
 msgid "Request Authorization"
 msgstr "Zahtevaj ovla邸�enje"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3043 src/protocols/oscar/oscar.c:5126
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5180
 msgid "No reason given."
 msgstr "Razlog nije naveden."
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2534
 msgid "Authorization Denied Message:"
 msgstr "Razlog odbijanja ovla邸�enja:"
 
-#: src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6303,11 +6281,11 @@
 "razlog:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "Zahtev za ovla邸�enje"
 
-#: src/protocols/oscar/oscar.c:2630
+#: src/protocols/oscar/oscar.c:2631
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6318,17 +6296,17 @@
 "a naveo je slede�i razlog:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2632
 msgid "ICQ authorization denied."
 msgstr "ICQ ovla邸�enje odbijeno."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2638
+#: src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Korisnik %u je prihvatio Va邸 zahtev da ga dodate u spisak drugara."
 
-#: src/protocols/oscar/oscar.c:2646
+#: src/protocols/oscar/oscar.c:2647
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6341,7 +6319,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2654
+#: src/protocols/oscar/oscar.c:2655
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6354,7 +6332,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2662
+#: src/protocols/oscar/oscar.c:2663
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6367,20 +6345,20 @@
 "Poruka glasi:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:2684
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ korisnik %u Vam je poslao kontakt: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:2690
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Da li 転elite da dodate ovaj kontakt u spisak drugara?"
 
-#: src/protocols/oscar/oscar.c:2693
+#: src/protocols/oscar/oscar.c:2694
 msgid "Decline"
 msgstr "Odbij"
 
-#: src/protocols/oscar/oscar.c:2775
+#: src/protocols/oscar/oscar.c:2776
 #, 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."
@@ -6388,7 +6366,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato 邸to su bile neispravne."
 msgstr[2] "Propustili ste %hu poruka od %s zato 邸to su bile neispravne."
 
-#: src/protocols/oscar/oscar.c:2784
+#: src/protocols/oscar/oscar.c:2785
 #, 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."
@@ -6396,7 +6374,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato 邸to su bile prevelike."
 msgstr[2] "Propustili ste %hu poruka od %s zato 邸to su bile prevelike."
 
-#: src/protocols/oscar/oscar.c:2793
+#: src/protocols/oscar/oscar.c:2794
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6406,7 +6384,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato 邸to je ograni�enje prekora�eno."
 msgstr[2] "Propustili ste %hu poruka od %s zato 邸to je ograni�enje prekora�eno."
 
-#: src/protocols/oscar/oscar.c:2802
+#: src/protocols/oscar/oscar.c:2803
 #, 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."
@@ -6414,7 +6392,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato 邸to je on/ona previ邸e zlo�est."
 msgstr[2] "Propustili ste %hu poruka od %s zato 邸to je on/ona previ邸e zlo�est."
 
-#: src/protocols/oscar/oscar.c:2811
+#: src/protocols/oscar/oscar.c:2812
 #, 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."
@@ -6422,7 +6400,7 @@
 msgstr[1] "Propustili ste %hu poruke od %s zato 邸to ste vi previ邸e zlo�esti."
 msgstr[2] "Propustili ste %hu poruka od %s zato 邸to ste vi previ邸e zlo�esti."
 
-#: src/protocols/oscar/oscar.c:2820
+#: src/protocols/oscar/oscar.c:2821
 #, 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."
@@ -6430,152 +6408,157 @@
 msgstr[1] "Propustili ste %hu poruke od %s iz nepoznatih razloga."
 msgstr[2] "Propustili ste %hu poruka od %s iz nepoznatih razloga."
 
-#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6167
 msgid "Free For Chat"
 msgstr "Dostupan za razgovor"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:6137
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6165
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6166
 msgid "Occupied"
 msgstr "Zauzet"
 
-#: src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:2847
 msgid "Web Aware"
 msgstr "Pratim veb"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2890
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>Korisni�ki broj:</B> %s<BR><B>Stanje:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2948
+#: src/protocols/oscar/oscar.c:2949
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC prijavljuje gre邸ku: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2985
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Va邸a poruka za %s nije poslata:"
 
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3044
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Podaci o korisniku %s nedostupni:"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3083
 msgid "Voice"
 msgstr "Glas"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3086
 msgid "AIM Direct IM"
 msgstr "Neposredna AIM poruka"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6266
 msgid "Get File"
 msgstr "Pribavi datoteku"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6258
+#: src/protocols/yahoo/yahoo.c:2332
 msgid "Send File"
 msgstr "Po邸alji datoteku"
 
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3099
 msgid "Games"
 msgstr "Igre"
 
-#: src/protocols/oscar/oscar.c:3099
-msgid "Add-Ins"
-msgstr "Dodaci"
-
 #: src/protocols/oscar/oscar.c:3102
-msgid "Send Buddy List"
-msgstr "Po邸alji spisak drugara"
+msgid "Add-Ins"
+msgstr "Dodaci"
 
 #: src/protocols/oscar/oscar.c:3105
+msgid "Send Buddy List"
+msgstr "Po邸alji spisak drugara"
+
+#: src/protocols/oscar/oscar.c:3108
 msgid "ICQ Direct Connect"
 msgstr "Neposredna ICQ veza"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3111
 msgid "AP User"
 msgstr "AP korisnik"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3114
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3117
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3120
 msgid "ICQ Server Relay"
 msgstr "ICQ preusmeravanje servera"
 
-#: src/protocols/oscar/oscar.c:3120
-msgid "Old ICQ UTF8"
-msgstr "Stari ICQ UTF8"
-
 #: src/protocols/oscar/oscar.c:3123
+msgid "Old ICQ UTF8"
+msgstr "Stari ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3126
 msgid "Trillian Encryption"
 msgstr "Trilijan enkripcija"
 
-#: src/protocols/oscar/oscar.c:3126
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
 #: src/protocols/oscar/oscar.c:3129
-msgid "Hiptop"
-msgstr "Vrhkuka"
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
 
 #: src/protocols/oscar/oscar.c:3132
+msgid "Hiptop"
+msgstr "Vrhkuka"
+
+#: src/protocols/oscar/oscar.c:3135
 msgid "Security Enabled"
 msgstr "Bezbednost uklju�ena"
 
-#: src/protocols/oscar/oscar.c:3161
+#: src/protocols/oscar/oscar.c:3138
+msgid "Video Chat"
+msgstr "Video razgovor"
+
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "Korisni�ko ime: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3162
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "Nivo upozorenja: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Na vezi od: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3169
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "�lan od: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3174
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Neaktivnost: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3183
 msgid "Idle: <b>Active</b>"
 msgstr "Neaktivnost: <b>aktivan</b>"
 
-#: src/protocols/oscar/oscar.c:3216
+#: src/protocols/oscar/oscar.c:3222
 msgid "Your AIM connection may be lost."
 msgstr "Mo転da AIM veza prekinuta."
 
-#: src/protocols/oscar/oscar.c:3610
+#: src/protocols/oscar/oscar.c:3616
 msgid "Rate limiting error."
 msgstr "Gre邸ka pri ograni�avanju brzine."
 
-#: src/protocols/oscar/oscar.c:3611
+#: src/protocols/oscar/oscar.c:3617
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6583,7 +6566,7 @@
 "Poslednja poruka nije poslata zato 邸to ste prekora�ili dozvoljenu brzinu. "
 "Sa�ekajte 10 sekundi i probajte ponovo."
 
-#: src/protocols/oscar/oscar.c:3672
+#: src/protocols/oscar/oscar.c:3680
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6591,109 +6574,109 @@
 "Veza je prekinuta zato 邸to ste se prijavili pod ovim imenom sa nekog drugog "
 "mesta."
 
-#: src/protocols/oscar/oscar.c:3674
+#: src/protocols/oscar/oscar.c:3682
 msgid "You have been signed off for an unknown reason."
 msgstr "Odjavljeni ste iz nepoznatih razloga."
 
-#: src/protocols/oscar/oscar.c:3705
+#: src/protocols/oscar/oscar.c:3713
 msgid "Finalizing connection"
 msgstr "Dovr邸ava povezivanje"
 
-#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3971
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
 msgid "Email Address"
 msgstr "Adresa e-po邸te"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3984
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: src/protocols/oscar/oscar.c:3979 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "貼enski"
 
-#: src/protocols/oscar/oscar.c:3979 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Mu邸ki"
 
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/oscar/oscar.c:4004
 msgid "Personal Web Page"
 msgstr "Li�na veb stranica"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4007
 msgid "Additional Information"
 msgstr "Dodatni podaci"
 
-#: src/protocols/oscar/oscar.c:4003
+#: src/protocols/oscar/oscar.c:4011
 msgid "Home Address"
 msgstr "Ku�na adresa"
 
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
 msgid "Zip Code"
 msgstr "Po邸tanski broj"
 
-#: src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4027
 msgid "Work Address"
 msgstr "Adresa na poslu"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:4043
 msgid "Work Information"
 msgstr "Podaci o poslu"
 
-#: src/protocols/oscar/oscar.c:4037
+#: src/protocols/oscar/oscar.c:4045
 msgid "Company"
 msgstr "Preduze�e"
 
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4048
 msgid "Division"
 msgstr "Odeljenje"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4051
 msgid "Position"
 msgstr "Pozicija"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4054
 msgid "Web Page"
 msgstr "Veb stranica"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:4060
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ podaci za %s"
 
-#: src/protocols/oscar/oscar.c:4102
+#: src/protocols/oscar/oscar.c:4110
 msgid "Pop-Up Message"
 msgstr "Iska�u�a poruka"
 
-#: src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4131
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "Naredni nadimci su u vezi sa %s"
 
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4135
 msgid "Search Results"
 msgstr "Rezultati pretrage"
 
-#: src/protocols/oscar/oscar.c:4144
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nije prona�eno niti jedno poklapanje za adresu e-po邸te %s"
 
-#: src/protocols/oscar/oscar.c:4165
+#: src/protocols/oscar/oscar.c:4173
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Trebate da primite e-po邸tu radi potvr�ivanja %s."
 
-#: src/protocols/oscar/oscar.c:4167
+#: src/protocols/oscar/oscar.c:4175
 msgid "Account Confirmation Requested"
 msgstr "Zahteva se potvrda naloga"
 
-#: src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4203
 msgid "Error Changing Account Info"
 msgstr "Gre邸ka pri izmeni podataka o nalogu"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4206
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6702,7 +6685,7 @@
 "Gre邸ka 0x%04x: Ne mogu da ispi邸em korisni�ko ime zato 邸to se tra転eno ime "
 "razlikuje od originala."
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6711,7 +6694,7 @@
 "Gre邸ka 0x%04x: Ne mogu da ispi邸em korisni�ko ime zato 邸to se tra転eno ime "
 "zavr邸ava razmakom."
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4212
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6720,7 +6703,7 @@
 "Gre邸ka 0x%04x: Ne mogu da ispi邸em korisni�ko ime zato 邸to je tra転eno ime "
 "preduga�ko."
 
-#: src/protocols/oscar/oscar.c:4207
+#: src/protocols/oscar/oscar.c:4215
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6729,7 +6712,7 @@
 "Gre邸ka 0x%04x: Ne mogu promeniti adresu e-po邸te zato 邸to je ve� poslat "
 "zahtev za ovo korisni�ko ime."
 
-#: src/protocols/oscar/oscar.c:4210
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6738,7 +6721,7 @@
 "Gre邸ka 0x%04x: Ne mogu promeniti adresu e-po邸te zato 邸to je previ邸e "
 "korisni�kih imena povezano sa datom adresom."
 
-#: src/protocols/oscar/oscar.c:4213
+#: src/protocols/oscar/oscar.c:4221
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6747,12 +6730,12 @@
 "Gre邸ka 0x%04x: Ne mogu promeniti adresu e-po邸te zato 邸to je uneta adresa "
 "neispravna."
 
-#: src/protocols/oscar/oscar.c:4216
+#: src/protocols/oscar/oscar.c:4224
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Gre邸ka 0x%04x: Nepoznata gre邸ka."
 
-#: src/protocols/oscar/oscar.c:4226
+#: src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6761,20 +6744,20 @@
 "Va邸e korisni�ko ime trenutno izgleda ovako:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4227 src/protocols/oscar/oscar.c:4234
+#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
 msgid "Account Info"
 msgstr "Podaci o nalogu"
 
-#: src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4240
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Adresa e-po邸te za %s je %s"
 
-#: src/protocols/oscar/oscar.c:4464
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "Ne mogu da postavim AIM profil."
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:4473
 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 "
@@ -6785,7 +6768,7 @@
 "pove転ete."
 
 # bug: plural-forms
-#: src/protocols/oscar/oscar.c:4492
+#: src/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6803,15 +6786,15 @@
 "Najve�a dozvoljena veli�ina profila od %d bajtova je prekora�ena. Gaim ga je "
 "skratio i postavio."
 
-#: src/protocols/oscar/oscar.c:4497
+#: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "Profil je preduga�ak."
 
-#: src/protocols/oscar/oscar.c:4514
+#: src/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM away message."
 msgstr "Ne mogu da postavim poruku za AIM odsustvo."
 
-#: src/protocols/oscar/oscar.c:4515
+#: src/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6822,7 +6805,7 @@
 "poku邸ajte ponovo kada se propisno pove転ete."
 
 # bug: plural-forms
-#: src/protocols/oscar/oscar.c:4555
+#: src/protocols/oscar/oscar.c:4563
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6840,15 +6823,15 @@
 "Najve�a dozvoljena du転ina poruke za odsustvo od %d bajtova je prekora�ena. "
 "Gaim je skratio poruku, i zapo�eo odsustvo."
 
-#: src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
 msgstr "Poruka za odsustvo je preduga�ka."
 
-#: src/protocols/oscar/oscar.c:4774
+#: src/protocols/oscar/oscar.c:4782
 msgid "Unable To Retrieve Buddy List"
 msgstr "Ne mogu preuzeti spisak drugara"
 
-#: src/protocols/oscar/oscar.c:4775
+#: src/protocols/oscar/oscar.c:4783
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -6857,12 +6840,12 @@
 "Privremeno, Gaim nije uspeo da preuzme Va邸 spisak drugara sa AIM servera. "
 "Spisak drugara nije nestao, i verovatno �e biti dostupan za nekoliko sati."
 
-#: src/protocols/oscar/oscar.c:4867 src/protocols/oscar/oscar.c:4868
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4881
 msgid "Orphans"
 msgstr "Siro�i�i"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6871,15 +6854,15 @@
 "Ne mogu da dodam drugara %s zato 邸to imate previ邸e drugara u spisku. "
 "Uklonite nekoga i poku邸ajte ponovo."
 
-#: src/protocols/oscar/oscar.c:5039 src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
 msgid "(no name)"
 msgstr "(bez imena)"
 
-#: src/protocols/oscar/oscar.c:5040 src/protocols/oscar/oscar.c:5053
+#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
 msgid "Unable To Add"
 msgstr "Ne mogu da dodam"
 
-#: src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6890,7 +6873,7 @@
 "ve� imate najvi邸e dozvoljenih drugara u Va邸em spisku."
 
 # Is it "them"? Or "him/her"?
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6899,11 +6882,11 @@
 "Korisnik %s Vam dozvoljava da ga dodate u spisak drugara. Da li 転elite da ga "
 "dodate?"
 
-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5101
 msgid "Authorization Given"
 msgstr "Ovla邸�enje je dato"
 
-#: src/protocols/oscar/oscar.c:5126
+#: src/protocols/oscar/oscar.c:5134
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6913,17 +6896,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5168
+#: src/protocols/oscar/oscar.c:5176
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Korisnik %s je odobrio Va邸 zahtev da ga dodate u spisak drugara."
 
-#: src/protocols/oscar/oscar.c:5169
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Granted"
 msgstr "Zahtev odobren"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:5180
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6934,56 +6917,60 @@
 "razloga:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5173
+#: src/protocols/oscar/oscar.c:5181
 msgid "Authorization Denied"
 msgstr "Zahtev odbijen"
 
-#: src/protocols/oscar/oscar.c:5210 src/protocols/toc/toc.c:1264
-msgid "Exchange:"
-msgstr "Razmena:"
-
-#: src/protocols/oscar/oscar.c:5447
+#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+msgid "_Exchange:"
+msgstr "Raz_mena:"
+
+#: src/protocols/oscar/oscar.c:5456
 msgid "<b>Status:</b> "
 msgstr "<b>Stanje:</b> "
 
-#: src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5473
 msgid "<b>Logged In:</b> "
 msgstr "<b>Prijavljen:</b> "
 
-#: src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP adresa:</b> "
 
-#: src/protocols/oscar/oscar.c:5476
+#: src/protocols/oscar/oscar.c:5493
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Mogu�nosti:</b> "
 
-#: src/protocols/oscar/oscar.c:5483
+#: src/protocols/oscar/oscar.c:5502
+msgid "<b>Buddy Comment:</b> "
+msgstr "<b>Primedba za drugara:</b>"
+
+#: src/protocols/oscar/oscar.c:5511
 msgid "<b>Available:</b> "
 msgstr "<b>Dostupno:</b> "
 
-#: src/protocols/oscar/oscar.c:5501
+#: src/protocols/oscar/oscar.c:5529
 msgid "<b>Away Message:</b> "
 msgstr "<b>Poruka za odsustvo:</b>"
 
-#: src/protocols/oscar/oscar.c:5510
+#: src/protocols/oscar/oscar.c:5538
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Stanje:</b> Neovla邸�en"
 
-#: src/protocols/oscar/oscar.c:5544 src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2173
 msgid "Offline"
 msgstr "Nepovezan"
 
-#: src/protocols/oscar/oscar.c:5992
+#: src/protocols/oscar/oscar.c:6020
 msgid "Unable to open Direct IM"
 msgstr "Ne mogu da po邸aljem neposrednu brzu poruku"
 
-#: src/protocols/oscar/oscar.c:6005
+#: src/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izabrali ste da uspostavite vezu za neposredne brze poruke sa %s."
 
-#: src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:6036
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6991,53 +6978,53 @@
 "Kako ovo razotkriva Va邸u IP adresu, mo転e se smatrati naru邸avanjem "
 "privatnosti. 貼elite li da nastavite?"
 
-#: src/protocols/oscar/oscar.c:6183
+#: src/protocols/oscar/oscar.c:6211
 msgid "Buddy Comment:"
 msgstr "Primedba za drugara:"
 
-#: src/protocols/oscar/oscar.c:6199
+#: src/protocols/oscar/oscar.c:6227
 msgid "Edit Buddy Comment"
 msgstr "Uredi primedbu za drugara"
 
-#: src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:6235
 msgid "Get Status Msg"
 msgstr "Pribavi poruku o stanju"
 
-#: src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6250
 msgid "Direct IM"
 msgstr "Neposredna poruka"
 
-#: src/protocols/oscar/oscar.c:6251
+#: src/protocols/oscar/oscar.c:6279
 msgid "Re-request Authorization"
 msgstr "Ponovi zahtev za ovla邸�enje"
 
-#: src/protocols/oscar/oscar.c:6272
+#: src/protocols/oscar/oscar.c:6300
 msgid "The new formatting is invalid."
 msgstr "Novi zapis je neispravan."
 
-#: src/protocols/oscar/oscar.c:6273
+#: src/protocols/oscar/oscar.c:6301
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "Zapis korisni�kog imena se mo転e promeniti samo u veli�ini slova i broju "
 "razmaka."
 
-#: src/protocols/oscar/oscar.c:6279
+#: src/protocols/oscar/oscar.c:6307
 msgid "New screenname formatting:"
 msgstr "Novi zapis korisni�kog imena:"
 
-#: src/protocols/oscar/oscar.c:6328
+#: src/protocols/oscar/oscar.c:6356
 msgid "Change Address To:"
 msgstr "Promena adrese u:"
 
-#: src/protocols/oscar/oscar.c:6372
+#: src/protocols/oscar/oscar.c:6400
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne �ekate na ovla邸�enje</i>"
 
-#: src/protocols/oscar/oscar.c:6375
+#: src/protocols/oscar/oscar.c:6403
 msgid "You are awaiting authorization from the following buddies"
 msgstr "O�ekujete ovla邸�enje od slede�ih drugara"
 
-#: src/protocols/oscar/oscar.c:6376
+#: src/protocols/oscar/oscar.c:6404
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7045,65 +7032,73 @@
 "Mo転ete ponoviti zahtev za ovla邸�enje od ovih drugara desnim klikom na njih i "
 "izborom ��Ponovi zahtev za ovla邸�enje��."
 
-#: src/protocols/oscar/oscar.c:6390
+#: src/protocols/oscar/oscar.c:6418
 msgid "Find Buddy by E-mail"
 msgstr "Prona�i drugara pomo�u adrese e-po邸te"
 
-#: src/protocols/oscar/oscar.c:6391
+#: src/protocols/oscar/oscar.c:6419
 msgid "Search for a buddy by e-mail address"
 msgstr "Prona�i drugara pomo�u adrese e-po邸te"
 
-#: src/protocols/oscar/oscar.c:6392
+#: src/protocols/oscar/oscar.c:6420
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Ukucajte e-po邸tansku adresu drugara koga tra転ite."
 
-#: src/protocols/oscar/oscar.c:6395
+#: src/protocols/oscar/oscar.c:6423
 msgid "Search"
 msgstr "Tra転i"
 
-#: src/protocols/oscar/oscar.c:6409
+#: src/protocols/oscar/oscar.c:6437
 msgid "Available Message:"
 msgstr "Poruka za dostupnost:"
 
-#: src/protocols/oscar/oscar.c:6410
+#: src/protocols/oscar/oscar.c:6438
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Obavljam posao i nadam se ometanju �� 邸ibni mi poruku!"
 
-#: src/protocols/oscar/oscar.c:6488
-msgid "Set Available Message"
-msgstr "Postavi poruku za dostupnost"
-
-#: src/protocols/oscar/oscar.c:6502
+#: src/protocols/oscar/oscar.c:6509
+msgid "Set User Info..."
+msgstr "Postavi podatke o korisniku..."
+
+#: src/protocols/oscar/oscar.c:6516
+msgid "Set Available Message..."
+msgstr "Postavi poruku za dostupnost..."
+
+#: src/protocols/oscar/oscar.c:6523
+msgid "Change Password..."
+msgstr "Promeni lozinku..."
+
+#: src/protocols/oscar/oscar.c:6530
 msgid "Change Password (URL)"
 msgstr "Izmena lozinke (Internet adresa)"
 
-#: src/protocols/oscar/oscar.c:6510
+#: src/protocols/oscar/oscar.c:6538
 msgid "Configure IM Forwarding (URL)"
 msgstr "Podesi prosle�ivanje brzih poruka (adresa)"
 
-#: src/protocols/oscar/oscar.c:6521
-msgid "Format Screenname"
-msgstr "Zapis korisni�kog imena"
-
-#: src/protocols/oscar/oscar.c:6527
+#: src/protocols/oscar/oscar.c:6549
+msgid "Format Screenname..."
+msgstr "Zapis ekranskog imena..."
+
+#: src/protocols/oscar/oscar.c:6555
 msgid "Confirm Account"
 msgstr "Potvrdite nalog"
 
-#: src/protocols/oscar/oscar.c:6533
-msgid "Display Current Registered Address"
+#: src/protocols/oscar/oscar.c:6561
+msgid "Display Currently Registered Address"
 msgstr "Prika転i trenutno registrovanu adresu"
 
-#: src/protocols/oscar/oscar.c:6539
-msgid "Change Current Registered Address"
-msgstr "Izmeni trenutno registrovanu adresu"
-
-#: src/protocols/oscar/oscar.c:6548
+#: src/protocols/oscar/oscar.c:6567
+msgid "Change Currently Registered Address..."
+msgstr "Izmeni trenutno registrovanu adresu..."
+
+#: src/protocols/oscar/oscar.c:6576
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Prika転i drugare za koje se �eka ovla邸�enje"
 
-#: src/protocols/oscar/oscar.c:6556
-msgid "Search for Buddy by Email"
-msgstr "Prona�i drugara prema adresi e-po邸te"
+#: src/protocols/oscar/oscar.c:6584
+msgid "Search for Buddy by Email..."
+msgstr "Prona�i drugara prema e-adresi..."
 
 #. *< api_version
 #. *< type
@@ -7115,15 +7110,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6677 src/protocols/oscar/oscar.c:6679
+#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Dodatak za AIM/ICQ protokole"
 
-#: src/protocols/oscar/oscar.c:6696
+#: src/protocols/oscar/oscar.c:6724
 msgid "Auth host"
 msgstr "Doma�in za identifikaciju"
 
-#: src/protocols/oscar/oscar.c:6701
+#: src/protocols/oscar/oscar.c:6729
 msgid "Auth port"
 msgstr "Port"
 
@@ -7309,6 +7304,10 @@
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Ne mogu da upi邸em zaglavlje datoteke. Datoteka se ne�e preneti."
 
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "Gaim �� Sa�uvaj kao..."
+
 #: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -7409,10 +7408,6 @@
 msgid "Local Users"
 msgstr "Lokalni korisnici"
 
-#: src/protocols/trepia/trepia.c:972
-msgid "Read error"
-msgstr "Gre邸ka pri �itanju"
-
 #: src/protocols/trepia/trepia.c:1073
 msgid "Logging in"
 msgstr "Prijava"
@@ -7431,17 +7426,22 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Dodatak za Trepia protokol"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: src/protocols/yahoo/yahoo.c:726
 msgid "Your Yahoo! message did not get sent."
 msgstr "Va邸a Jahu! poruka nije poslata."
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:768
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "Jahu! sistemska poruka za %s:"
+
+#: src/protocols/yahoo/yahoo.c:834
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Korisnik %s je (naknadno) odbio zahtev da ga dodate u va邸 spisak drugara."
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:837
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7450,11 +7450,11 @@
 "Korisnik %s je (naknadno) odbio zahtev da ga dodate u va邸 spisak drugara iz "
 "slede�eg razloga: %s."
 
-#: src/protocols/yahoo/yahoo.c:761
+#: src/protocols/yahoo/yahoo.c:840
 msgid "Add buddy rejected"
 msgstr "Odbijeno dodavanje drugara"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1490
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7465,11 +7465,11 @@
 "izdanje Gaima najverovatnije ne�e mo�i da se prijavi na Jahu. Proverite %s "
 "radi dopuna."
 
-#: src/protocols/yahoo/yahoo.c:1384
+#: src/protocols/yahoo/yahoo.c:1493
 msgid "Failed Yahoo! Authentication"
 msgstr "Neuspe邸na Jahu! identifikacija"
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1566
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7478,86 +7478,99 @@
 "Poku邸ali ste da ignori邸ete %s, ali taj korisnik je ve� u va邸em spisku "
 "drugara. Klikom na ��Da�� �ete ukloniti i ignorisati ovog drugara."
 
-#: src/protocols/yahoo/yahoo.c:1460
+#: src/protocols/yahoo/yahoo.c:1569
 msgid "Ignore buddy?"
 msgstr "Ignori邸i drugara?"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1602
 msgid "Invalid username."
 msgstr "Neispravno korisni�ko ime."
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1605
 msgid "Incorrect password."
 msgstr "Neispravna lozinka."
 
-#: src/protocols/yahoo/yahoo.c:1495
-msgid "Unknown error."
-msgstr "Nepoznata gre邸ka."
-
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1608
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr "Va邸 nalog je zaklju�an, prijavite se na Jahu! veb stranicu."
+
+#: src/protocols/yahoo/yahoo.c:1611
+#, c-format
+msgid "Unknown error number %d."
+msgstr "Nepoznata gre邸ka sa kodom %d."
+
+#: src/protocols/yahoo/yahoo.c:1668
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Ne mogu da dodam drugara %s u grupu %s u spisak servera za nalog %s."
 
-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1670
 msgid "Could not add buddy to server list"
 msgstr "Ne mogu da dodam drugara u spisak servera"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1780 src/protocols/yahoo/yahoo.c:1910
 msgid "Unable to read"
 msgstr "Ne mogu da pi邸em"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:1935 src/protocols/yahoo/yahoo.c:2044
+#: src/protocols/yahoo/yahoo.c:2071
 msgid "Connection problem"
 msgstr "Gre邸ka pri povezivanju"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2480
+#: src/protocols/yahoo/yahoo.c:2586
 msgid "Not At Home"
 msgstr "Nisam kod ku�e"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2157 src/protocols/yahoo/yahoo.c:2482
+#: src/protocols/yahoo/yahoo.c:2587
 msgid "Not At Desk"
 msgstr "Nisam za stolom"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2159 src/protocols/yahoo/yahoo.c:2484
+#: src/protocols/yahoo/yahoo.c:2588
 msgid "Not In Office"
 msgstr "Nisam u kancelariji"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2163 src/protocols/yahoo/yahoo.c:2488
+#: src/protocols/yahoo/yahoo.c:2590
 msgid "On Vacation"
 msgstr "Na raspustu sam"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2167 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2592
 msgid "Stepped Out"
 msgstr "Iza邸ao sam na kratko"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2231 src/protocols/yahoo/yahoo.c:2263
 msgid "Not on server list"
 msgstr "Nije na spisku na serveru"
 
-#: src/protocols/yahoo/yahoo.c:2178
+#: src/protocols/yahoo/yahoo.c:2319
 msgid "Join in Chat"
 msgstr "Priklju�i se razgovoru"
 
-#: src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2325
 msgid "Initiate Conference"
 msgstr "Pokreni razgovor"
 
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2378
 msgid "Active which ID?"
 msgstr "Aktiviraj ID (koji)?"
 
-#: src/protocols/yahoo/yahoo.c:2241
-msgid "Activate ID"
-msgstr "Aktiviraj ID"
-
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2386
+msgid "Join who in chat?"
+msgstr "Priklju�i se kome razgovoru?"
+
+#: src/protocols/yahoo/yahoo.c:2397
+msgid "Activate ID..."
+msgstr "Aktiviraj ID..."
+
+#: src/protocols/yahoo/yahoo.c:2403
+msgid "Join user in chat..."
+msgstr "Priklju�i korisnika razgovoru..."
+
+#: src/protocols/yahoo/yahoo.c:2784
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7565,7 +7578,7 @@
 "<b>Na転alost, za sada nisu podr転ani profili koji sadr転e pone邸to samo za "
 "odrasle.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2620
+#: src/protocols/yahoo/yahoo.c:2785 src/protocols/yahoo/yahoo.c:2808
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7573,41 +7586,41 @@
 "Ukoliko 転elite da pogledate ovaj profil, treba da posetite ovu vezu u va邸em "
 "�ita�u veba.<br>"
 
-#: src/protocols/yahoo/yahoo.c:2619
+#: src/protocols/yahoo/yahoo.c:2807
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>Na転alost, ne-engleski profili nisu podr転ani za sada.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2856
 msgid "Yahoo! ID"
 msgstr "Jahu! ID"
 
-#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
-#: src/protocols/yahoo/yahoo.c:2732
+#: src/protocols/yahoo/yahoo.c:2900 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/yahoo/yahoo.c:2906
 msgid "Hobbies"
 msgstr "Hobiji"
 
-#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
+#: src/protocols/yahoo/yahoo.c:2915 src/protocols/yahoo/yahoo.c:2918
 msgid "Latest News"
 msgstr "Najnovije vesti"
 
-#: src/protocols/yahoo/yahoo.c:2765
+#: src/protocols/yahoo/yahoo.c:2932
 msgid "Home Page"
 msgstr "Li�na stranica"
 
-#: src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:2944
 msgid "Cool Link 1"
 msgstr "Zanimljiva veza 1"
 
-#: src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:2948
 msgid "Cool Link 2"
 msgstr "Zanimljiva veza 2"
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:2950
 msgid "Cool Link 3"
 msgstr "Zanimljiva veza 3"
 
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2956
 msgid "Member Since"
 msgstr "�lan od"
 
@@ -7621,18 +7634,26 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
+#: src/protocols/yahoo/yahoo.c:3157 src/protocols/yahoo/yahoo.c:3159
 msgid "Yahoo Protocol Plugin"
 msgstr "Dodatak za Jahu protokol"
 
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:3176
 msgid "Pager host"
 msgstr "Server"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3179
 msgid "Pager port"
 msgstr "Port"
 
+#: src/protocols/yahoo/yahoo.c:3182
+msgid "File transfer host"
+msgstr "Doma�in za prenos datoteka"
+
+#: src/protocols/yahoo/yahoo.c:3185
+msgid "File transfer port"
+msgstr "Port za prenos datoteka"
+
 #: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -7642,19 +7663,19 @@
 msgid "Invitation Rejected"
 msgstr "Poziv odbijen"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
 msgstr "Neuspe邸no priklju�enje razgovoru"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr "Mo転da je soba popunjena?"
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: src/protocols/yahoo/yahoochat.c:558
 msgid "Failed to join buddy in chat"
 msgstr "Neuspe邸no priklju�ivanje drugara razgovoru"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
 msgstr "Mo転da ne razgovaraju?"
 
@@ -7698,16 +7719,16 @@
 msgstr "Zefir pretraga"
 
 #: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr "Razred:"
+msgid "_Class:"
+msgstr "_Razred:"
 
 #: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr "Instanca:"
+msgid "_Instance:"
+msgstr "_Primerak:"
 
 #: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
-msgstr "Primalac:"
+msgid "_Recipient:"
+msgstr "Pri_malac:"
 
 #. *< api_version
 #. *< type
@@ -7723,11 +7744,21 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Dodatak za Zefir protokol"
 
-#: src/proxy.c:1681
+#. Forbidden
+#: src/proxy.c:1002
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr "Pristup odbijen: posrednik odbija tunel na portu 80."
+
+#: src/proxy.c:1004
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Gre邸ka pri povezivanju posrednika %d"
+
+#: src/proxy.c:1721
 msgid "Invalid proxy settings"
 msgstr "Lo邸a pode邸avanja posrednika"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1721
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7812,54 +7843,215 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "貼alim, ali mene nema. Vrati�u se jednog dana, ne znam ni ja kad!"
 
-#: src/stock.c:84
+#: src/stock.c:83
 msgid "_Modify"
 msgstr "_Izmeni"
 
-#: src/stock.c:85
+#: src/stock.c:84
 msgid "_Open Mail"
 msgstr "_Otvori po邸tu"
 
-#: src/util.c:1590
+#: src/util.c:1893
 msgid "Calculating..."
 msgstr "Ra�unam..."
 
-#: src/util.c:1593
+#: src/util.c:1896
 msgid "Unknown."
 msgstr "Nepoznato."
 
-#: src/util.c:1624 src/util.c:1629 src/util.c:1634 src/util.c:1637
+#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
 msgstr[1] "dana"
 msgstr[2] "dana"
 
-#: src/util.c:1625 src/util.c:1629 src/util.c:1643 src/util.c:1645
+#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "�as"
 msgstr[1] "�asa"
 msgstr[2] "�asova"
 
-#: src/util.c:1625 src/util.c:1634 src/util.c:1643 src/util.c:1648
+#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuta"
 msgstr[2] "minuta"
 
-#: src/util.c:1980
+#: src/util.c:2283
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Gre邸ka pri otvaranju veze.\n"
 
-#: src/win32/win32dep.c:387
+# bug: s+..+...+
+#: src/win32/win32dep.c:271
+msgid "Moving Gaim Settings.."
+msgstr "Preme邸ta pode邸avanja Gaima..."
+
+#: src/win32/win32dep.c:274
+msgid "Moving Gaim user settings to: "
+msgstr "Preme邸ta pode邸avanja Gaima u: "
+
+#: src/win32/win32dep.c:276
 msgid "Notification"
 msgstr "Obave邸tenje"
 
-#: src/win32/win32dep.c:388
-msgid "Moving Gaim user settings directory to:"
-msgstr "Premesti direktorijum pode邸avanja Gaim korisnika u:"
+#~ msgid "Gnome Stock Ticker Properties"
+#~ msgstr "Postavke pra�enja berze"
+
+#~ msgid "Update Frequency in min"
+#~ msgstr "U�estalost osve転avanja u minutima"
+
+#~ msgid "Enter symbols delimited with \"+\" in the box below."
+#~ msgstr "Unesite simbole razdvojene pomo�u ��+�� u polje ispod."
+
+#~ msgid "Check this box to display only symbols and price:"
+#~ msgstr "Uklju�ite ovu opciju za prikaz samo simbola i cene:"
+
+#~ msgid "Check this box to scroll left to right:"
+#~ msgstr "Uklju�ite ovu opciju za pomeranje s leva na desno:"
+
+#~ msgid "(No"
+#~ msgstr "(Nema"
+
+#~ msgid "Change"
+#~ msgstr "izmene"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "Gaim �� Odsutan!"
+
+#~ msgid "Buddy Chat"
+#~ msgstr "Razgovor sa drugarom"
+
+#~ msgid "Join Chat As:"
+#~ msgstr "Priklju�i se razgovoru kao:"
+
+#~ msgid "Join"
+#~ msgstr "Priklju�i se"
+
+#~ msgid "New Message"
+#~ msgstr "Nova poruka"
+
+#~ msgid "Changing info for %s:"
+#~ msgstr "Menjam podatke za %s:"
+
+#~ msgid "Alias chat"
+#~ msgstr "Nadeni ime razgovoru"
+
+#~ msgid "Alias contact"
+#~ msgstr "Nadeni ime kontaktu"
+
+#~ msgid "_Screenname"
+#~ msgstr "_Ime:"
+
+#~ msgid "Alias buddy"
+#~ msgstr "Nadeni ime drugaru"
+
+#~ msgid ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+#~ msgstr ""
+#~ "Unesite ime koje 転elite da nadenete izabranoj osobi, ili preimenujte ovaj "
+#~ "kontakt u spisku drugara."
+
+#~ msgid "Couldn't write to %s."
+#~ msgstr "Ne mogu da pi邸em u %s."
+
+#~ msgid "Save Log File"
+#~ msgstr "Sa�uvaj datoteku dnevnika"
+
+#~ msgid "Couldn't remove file %s."
+#~ msgstr "Ne mogu da uklonim datoteku %s."
+
+#~ msgid ""
+#~ "You are about to remove the log file for %s.  Do you want to continue?"
+#~ msgstr "Uklanjate dnevnik razgovora za %s. Da li 転elite da nastavite?"
+
+#~ msgid "System Log"
+#~ msgstr "Sistemski dnevnik"
+
+#~ msgid "Remove Log"
+#~ msgstr "Ukloni dnevnik"
+
+#~ msgid "Couldn't open log file %s."
+#~ msgstr "Ne mogu da otvorim datoteku dnevnika %s."
+
+#~ msgid "Conversations with %s"
+#~ msgstr "Razgovori sa %s"
+
+#~ msgid "Log"
+#~ msgstr "Dnevnik rada"
+
+#~ msgid "Clear"
+#~ msgstr "O�isti"
+
+#~ msgid "Gaim - Information"
+#~ msgstr "Gaim �� podaci"
+
+#~ msgid "Add a new group"
+#~ msgstr "Dodaj novu grupu"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "Gaim �� ubaci sliku"
+
+#~ msgid ""
+#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
+#~ "</span>"
+#~ msgstr ""
+#~ "<span weight='bold' size='larger'>Unesite izraz za pretragu\n"
+#~ "</span>"
+
+#~ msgid "/Conversation/Search..."
+#~ msgstr "/Razgovor/Pretraga..."
+
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "/Razgovor/_Ubaci Internet adresu..."
+
+#~ msgid "/Conversation/Insert _Image..."
+#~ msgstr "/Razgovor/Ubaci s_liku..."
+
+#~ msgid "Normal font size"
+#~ msgstr "Obi�na slova"
+
+#~ msgid "_Host"
+#~ msgstr "_Ime servera"
+
+#~ msgid "Pa_ssword"
+#~ msgstr "_Lozinka"
+
+#~ msgid "System Logs"
+#~ msgstr "Sistemski dnevnik"
+
+#~ msgid "Log when buddies _sign on/sign off"
+#~ msgstr "Bele転i kada se drugari _prijavljuju/odjavljuju"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "Bele転i kada su drugari _neaktivni/aktivni"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "Bele転i kada su drugari _odsustni/prisutni"
+
+#~ msgid "Log your _own signons/idleness/awayness"
+#~ msgstr "Bele転i _li�ne prijave/neaktivnost/odsustva"
+
+#~ msgid "I_ndividual log file for each buddy's signons"
+#~ msgstr "Pojedina�na datoteka denvnika za _svakog drugara"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "Gaim �� Sa�uvaj ikonicu"
+
+#~ msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
+#~ msgstr "<font color=\"red\"><b>log->logger_data je NULL!</b></font>"
+
+#~ msgid "%s (Code %s)"
+#~ msgstr "%s (k担d %s)"
+
+#~ msgid "Join what group:"
+#~ msgstr "Priklju�i se grupi (kojoj?):"
+
+#~ msgid "Unknown error."
+#~ msgstr "Nepoznata gre邸ka."
 
 #~ msgid "Log Conversation"
 #~ msgstr "Dnevnik razgovora"