changeset 7185:780604587f46

[gaim-migrate @ 7753] several backlogged translation updates from when i was out. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 07 Oct 2003 15:50:29 +0000
parents 89dc8a119918
children 0da869011d8a
files ChangeLog po/da.po po/sv.po po/zh_CN.po
diffstat 4 files changed, 6568 insertions(+), 5544 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Oct 07 14:53:30 2003 +0000
+++ b/ChangeLog	Tue Oct 07 15:50:29 2003 +0000
@@ -28,7 +28,10 @@
 	* Some plugins must be updated due to code variable changes, 
 	  function name changes, and change of behavior for certain 
 	  functions.
+	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Danish translation updated (Morten Brix Pedersen (mbrix))
+	* Swedish translation updated (Tore Lundqvist (luntor))
 
 version 0.70 (09/28/2003):
 	* Implemented Yahoo's new authentication method (Cerulean Studios)
--- a/po/da.po	Tue Oct 07 14:53:30 2003 +0000
+++ b/po/da.po	Tue Oct 07 15:50:29 2003 +0000
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: gaim 0.69\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-15 17:47+0200\n"
+"POT-Creation-Date: 2003-10-03 13:21+0200\n"
 "PO-Revision-Date: 2003-04-28 22:28+0100\n"
 "Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -33,14 +33,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:105
 msgid "Auto-Reconnect"
 msgstr "Genetablr forbindelse automatisk"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:108 plugins/autorecon.c:110
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Nr du bliver smidt offline, opretter dette forbindelsen for dig igen."
 
@@ -76,12 +76,12 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Fravrende"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1654
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:472 src/gtkaccount.c:1667
 msgid "Auto-login"
 msgstr "Auto-logind"
 
 #: plugins/docklet/docklet.c:117
-msgid "New Message.."
+msgid "New Message..."
 msgstr "Ny besked..."
 
 #: plugins/docklet/docklet.c:118
@@ -92,12 +92,12 @@
 msgid "New..."
 msgstr "Ny..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1778 src/gtkpounce.c:461
-#: src/gtkprefs.c:1511 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3585 src/protocols/oscar/oscar.c:2840
-#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:5488
-#: src/protocols/oscar/oscar.c:5880
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1915 src/gtkpounce.c:461
+#: src/gtkprefs.c:1474 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:838 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:4522 src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:6057
 msgid "Away"
 msgstr "Fravrende"
 
@@ -114,11 +114,11 @@
 msgstr "Filoverfrsler"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1812 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1825 src/main.c:315
 msgid "Accounts"
 msgstr "Konti"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2365 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2338 src/main.c:325
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -130,11 +130,11 @@
 msgid "Quit"
 msgstr "Afslut"
 
-#: plugins/docklet/docklet.c:482
+#: plugins/docklet/docklet.c:478
 msgid "Tray Icon Configuration"
 msgstr "Statusikon opstning"
 
-#: plugins/docklet/docklet.c:486
+#: plugins/docklet/docklet.c:482
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Gem nye beskeder indtil der er klikket p statusikonet"
 
@@ -145,19 +145,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:506
 msgid "System Tray Icon"
 msgstr "Statusomrde ikon"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:513
+#: plugins/docklet/docklet.c:509
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Viser et Gaim-ikon i statusomrdet."
 
 #. *  description
-#: plugins/docklet/docklet.c:515
+#: plugins/docklet/docklet.c:511
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -406,6 +406,58 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Tillader dig at stte op manuelt hvor lang tid du har vret inaktiv i."
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ipc-test-client.c:84
+msgid "IPC Test Client"
+msgstr "IPC Test Klient"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ipc-test-client.c:87
+msgid "Test plugin IPC support, as a client."
+msgstr "Test modul IPC understttelse, som en klient."
+
+#. *  description
+#: plugins/ipc-test-client.c:89
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Test modul IPC understttelse, som en klient. Dette finder server modulet "
+"og kalder den registrerede kommando."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ipc-test-server.c:71
+msgid "IPC Test Server"
+msgstr "IPC Test Server"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ipc-test-server.c:74
+msgid "Test plugin IPC support, as a server."
+msgstr "Test modul IPC understttelse, som en server."
+
+#. *  description
+#: plugins/ipc-test-server.c:76
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"Test modul IPC understttelse, som en server. Dette registrerer IPC "
+"kommandoerne."
+
 #: plugins/mailchk.c:156
 msgid "Mail Checker"
 msgstr "Mail-tjekker"
@@ -415,60 +467,71 @@
 msgstr "Tjekker for lokal post."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:707
+#: plugins/notify.c:572
 msgid "Notify For"
 msgstr "Pmind for"
 
-#: plugins/notify.c:711
+#: plugins/notify.c:576
 msgid "_IM windows"
 msgstr "Besked-v_induer"
 
-#: plugins/notify.c:716
-msgid "_Chat windows"
-msgstr "_Chat-vinduer"
+#: plugins/notify.c:583
+msgid "C_hat windows"
+msgstr "C_hat-vinduer"
+
+#: plugins/notify.c:590
+msgid "_Focused windows"
+msgstr "_Fokuserede vinduer"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:722
+#: plugins/notify.c:598
 msgid "Notification Methods"
 msgstr "Pmindelse-metoder"
 
-#: plugins/notify.c:728
+#: plugins/notify.c:605
 msgid "Prepend _string into window title:"
 msgstr "Indst _streng i vinduets titel:"
 
-#: plugins/notify.c:739
-msgid "_Quote window title"
-msgstr "St citations-tegn om vinduets titel"
-
-#: plugins/notify.c:744
-msgid "Set Window Manager \"_URGENT\" Hint"
-msgstr "St vindueshndterings-vinket \"_URGENT\" (\"haster\")"
-
-#: plugins/notify.c:749
+#. Count method button
+#: plugins/notify.c:624
 msgid "Insert c_ount of new messages into window title"
 msgstr "Indst antal af nye beskeder ind i vinduets titel"
 
-#: plugins/notify.c:754
-msgid "_Notify even if conversation is in focus"
-msgstr "Pmi_nd selv om samtalen er i fokus"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:760
+#. Urgent method button
+#: plugins/notify.c:633
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "St vindueshndterings-vinket \"_URGENT\" (\"haster\")"
+
+#. ---------- "Notification Removals" ----------
+#: plugins/notify.c:640
 msgid "Notification Removal"
 msgstr "Fjernelse af pmindelse"
 
-#: plugins/notify.c:764
-msgid "Remove when conversation window gains _focus"
+#. Remove on focus button
+#: plugins/notify.c:646
+msgid "Remove when conversation window _gains focus"
 msgstr "Fjern nr samtale-vindue fr _fokus"
 
-#: plugins/notify.c:769
+#. Remove on click button
+#: plugins/notify.c:654
 msgid "Remove when conversation window _receives click"
 msgstr "Fjern nr samtale-vindue modtage_r klik"
 
-#: plugins/notify.c:774
+#. Remove on type button
+#: plugins/notify.c:662
 msgid "Remove when _typing in conversation window"
 msgstr "Fjern nr der bliver skreve_t i samtale-vindue"
 
+#. Remove on message send button
+#: plugins/notify.c:670
+msgid "Remove when a _message gets sent"
+msgstr "Fjern nr en _besked bliver sendt"
+
+#. Remove on conversation switch button
+#: plugins/notify.c:679
+msgid "Remove on conversation ta_b switch"
+msgstr "Fjern nr der skiftes fanebla_d i samtale-vinduet"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -476,14 +539,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:858
+#: plugins/notify.c:762
 msgid "Message Notification"
 msgstr "Pmindelse af beskeder"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:861 plugins/notify.c:863
+#: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Giver mulighed for at pminde dig om ulste beskeder p forskellige mder."
@@ -559,38 +622,92 @@
 msgid "Tests to see that most things are working."
 msgstr "Test for at se de fleste ting virker."
 
-#: plugins/spellchk.c:410
+#: plugins/spellchk.c:412
 msgid "Text Replacements"
 msgstr "Tekst erstatninger"
 
-#: plugins/spellchk.c:434
+#: plugins/spellchk.c:436
 msgid "You type"
 msgstr "Du skriver"
 
-#: plugins/spellchk.c:446
+#: plugins/spellchk.c:448
 msgid "You send"
 msgstr "Du sender"
 
-#: plugins/spellchk.c:472
+#: plugins/spellchk.c:474
 msgid "Add a new text replacement"
 msgstr "Tilfj en ny tekst erstatning"
 
-#: plugins/spellchk.c:479
+#: plugins/spellchk.c:481
 msgid "You _type:"
 msgstr "Du skriver:"
 
-#: plugins/spellchk.c:493
+#: plugins/spellchk.c:495
 msgid "You _send:"
 msgstr "Du _sender:"
 
-#: plugins/spellchk.c:533
+#: plugins/spellchk.c:535
 msgid "Text replacement"
 msgstr "Teksterstatning"
 
-#: plugins/spellchk.c:535 plugins/spellchk.c:536
+#: plugins/spellchk.c:537 plugins/spellchk.c:538
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstatter tekst i udgende beskeder udfra bruger-definerede regler."
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:190
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+msgid "Provides SSL support through GNUTLS."
+msgstr "Giver SSL-understttelse igennem GNUTLS"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:286
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-nss.c:289 plugins/ssl/ssl-nss.c:291
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Giver SSL-understttelse igennem Mozilla NSS."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:91
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
@@ -640,10 +757,6 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Giver understttelse af Tcl-udvidelsesmoduler."
 
-#: plugins/tcl/tcl_cmds.c:420
-msgid "gc"
-msgstr "gc"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -712,7 +825,7 @@
 msgstr "Vis rullebjlke i besked-vindue"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:848
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "Venneliste vindue"
 
@@ -759,8 +872,8 @@
 msgstr "_Start Gaim ved Windows opstart"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1619
-#: src/gtkprefs.c:2298
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1755
+#: src/gtkprefs.c:2271
 msgid "Buddy List"
 msgstr "Venneliste"
 
@@ -779,8 +892,8 @@
 msgstr "Hold venneliste vinduet i forgrunden"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:897
-#: src/gtkprefs.c:2299
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:895
+#: src/gtkprefs.c:2272
 msgid "Conversations"
 msgstr "Samtaler"
 
@@ -835,164 +948,164 @@
 msgid "win32 port"
 msgstr "win32 port"
 
-#: src/about.c:114 src/about.c:115
+#: src/about.c:114 src/about.c:115 src/about.c:116
 msgid "developer"
 msgstr "udvikler"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "support"
 msgstr "support"
 
-#: src/about.c:123
+#: src/about.c:124
 msgid "Crazy Patch Writers"
 msgstr "Vilde patch-skrivere"
 
-#: src/about.c:135
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "Tidligere udviklere"
 
-#: src/about.c:136
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "tidligere libfaim vedligeholder"
 
-#: src/about.c:137
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "tidligere hovedudvikler"
 
-#: src/about.c:140
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "tidligere vedligeholder"
 
-#: src/about.c:141
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "tidligere Jabber udvikler"
 
-#: src/about.c:142
+#: src/about.c:151
 msgid "original author"
 msgstr "Oprindelig forfatter"
 
-#: src/about.c:145
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/about.c:153
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "Nuvrende oversttere"
 
-#: src/about.c:154 src/about.c:181
+#: src/about.c:163 src/about.c:192
 msgid "Catalan"
-msgstr ""
-
-#: src/about.c:155 src/about.c:182
+msgstr "Katalansk"
+
+#: src/about.c:164 src/about.c:193
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: src/about.c:156
+#: src/about.c:165
 msgid "Danish"
 msgstr "Dansk"
 
-#: src/about.c:157 src/about.c:183
+#: src/about.c:166 src/about.c:194
 msgid "German"
 msgstr "Tysk"
 
-#: src/about.c:158 src/about.c:184
+#: src/about.c:167 src/about.c:195
 msgid "Spanish"
 msgstr "Spansk"
 
-#: src/about.c:159 src/about.c:185
+#: src/about.c:168 src/about.c:196
 msgid "French"
 msgstr "Fransk"
 
-#: src/about.c:160
+#: src/about.c:169
 msgid "Hindi"
 msgstr ""
 
-#: src/about.c:161
+#: src/about.c:170
 msgid "Hungarian"
-msgstr ""
-
-#: src/about.c:162 src/about.c:187
+msgstr "Ungarsk"
+
+#: src/about.c:171 src/about.c:198
 msgid "Italian"
 msgstr "Italiensk"
 
-#: src/about.c:163 src/about.c:189
+#: src/about.c:172 src/about.c:200
 msgid "Korean"
 msgstr "Koreansk"
 
-#: src/about.c:164
+#: src/about.c:173
 msgid "Dutch; Flemish"
-msgstr ""
-
-#: src/about.c:165
+msgstr "Hollandsk; Flamsk"
+
+#: src/about.c:174 src/about.c:202
+msgid "Polish"
+msgstr "Polsk"
+
+#: src/about.c:175
 msgid "Portuguese-Brazil"
-msgstr ""
-
-#: src/about.c:166
+msgstr "Portugisisk-Brasilien"
+
+#: src/about.c:176
 msgid "Portuguese-Portugal"
-msgstr ""
-
-#: src/about.c:167
+msgstr "Portugisisk-Portugal"
+
+#: src/about.c:177
 msgid "Romanian"
-msgstr ""
-
-#: src/about.c:168
+msgstr "Rumnsk"
+
+#: src/about.c:178 src/about.c:203
+msgid "Russian"
+msgstr "Russisk"
+
+#: src/about.c:179
 msgid "Serbian"
-msgstr ""
-
-#: src/about.c:169 src/about.c:194
+msgstr "Serbisk"
+
+#: src/about.c:180 src/about.c:205
 msgid "Swedish"
 msgstr "Svensk"
 
-#: src/about.c:170
+#: src/about.c:181
 msgid "Simplified Chinese"
-msgstr ""
-
-#: src/about.c:171
+msgstr "Simpelt kinesisk"
+
+#: src/about.c:182
 msgid "Traditional Chinese"
-msgstr ""
-
-#: src/about.c:178
+msgstr "Traditionelt kinesisk"
+
+#: src/about.c:189
 msgid "Past Translators"
 msgstr "Tidligere oversttere"
 
-#: src/about.c:179
+#: src/about.c:190
 msgid "Amharic"
 msgstr ""
 
-#: src/about.c:180
+#: src/about.c:191
 msgid "Bulgarian"
 msgstr ""
 
-#: src/about.c:186
+#: src/about.c:197
 msgid "Hebrew"
-msgstr ""
-
-#: src/about.c:188
+msgstr "Hebraisk"
+
+#: src/about.c:199
 msgid "Japanese"
 msgstr "Japansk"
 
-#: src/about.c:190
+#: src/about.c:201
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: src/about.c:191
-msgid "Polish"
-msgstr "Polsk"
-
-#: src/about.c:192
-msgid "Russian"
-msgstr "Russisk"
-
-#: src/about.c:193
+#: src/about.c:204
 msgid "Slovak"
 msgstr ""
 
-#: src/about.c:195
+#: src/about.c:206
 msgid "Chinese"
-msgstr ""
-
-#: src/about.c:208 src/dialogs.c:3508 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:241 src/server.c:1552
+msgstr "Kinesisk"
+
+#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:200
+#: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Luk"
 
@@ -1016,16 +1129,16 @@
 msgid "Set All Away"
 msgstr "St alle fravrende"
 
-#: src/blist.c:469 src/gtkprefs.c:2301
+#: src/blist.c:547 src/gtkprefs.c:2274
 msgid "Chats"
 msgstr "Chat-rum"
 
-#: src/blist.c:564 src/blist.c:729 src/dialogs.c:880
-#: src/protocols/jabber/jabber.c:1917 src/protocols/msn/notification.c:1127
+#: src/blist.c:642 src/blist.c:814 src/gtkblist.c:2527
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
 msgid "Buddies"
 msgstr "Venner"
 
-#: src/blist.c:991
+#: src/blist.c:1100
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1040,26 +1153,27 @@
 "%d venner fra gruppe %s blev ikke fjernet fordi deres konti ikke var logged "
 "ind. Disse venner, og gruppen blev ikke fjernet.\n"
 
-#: src/blist.c:1000
+#: src/blist.c:1109
 msgid "Group not removed"
 msgstr "Gruppe ikke fjernet"
 
-#: src/blist.c:1068 src/gtkaccount.c:140 src/gtkpounce.c:307
-#: src/gtkutils.c:843 src/protocols/jabber/jabber.c:1261
+#: src/blist.c:1160 src/gtkaccount.c:149 src/gtkpounce.c:307
+#: src/gtkutils.c:839 src/protocols/jabber/auth.c:93
+#: src/protocols/jabber/buddy.c:568
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/blist.c:1358
+#: src/blist.c:1481
 msgid "Invalid Groupname"
 msgstr "Ugyldigt gruppenavn"
 
-#: src/blist.c:2136
+#: src/blist.c:2261
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "En fejl opstod da din venneliste skulle indlses. Den er ikke blevet hentet."
 
-#: src/blist.c:2138
+#: src/blist.c:2263
 msgid "Buddy List Error"
 msgstr "venneliste fejl"
 
@@ -1070,20 +1184,27 @@
 msgstr ""
 "Kommunikation med browseren fejlede. Prv at luk alle vinduer og prv igen."
 
+#: src/browser.c:570 src/browser.c:590 src/browser.c:598
+msgid "Unable to open URL"
+msgstr "Kunne ikke bne URL"
+
 #: src/browser.c:571
 msgid ""
-"Unable to launch your browser because the 'Manual' browser command has been "
-"chosen, but no command has been set."
+"The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"Kunne ikke starte din browser, fordi 'Manuel' browser-kommandoen er blevet "
-"valgt, men ingen kommando er blevet sat."
-
-#: src/browser.c:591
-#, c-format
-msgid "There was an error launching your chosen browser: %s"
-msgstr "Der skete en fejl, da din browser skulle startes: %s"
-
-#: src/buddy_chat.c:316 src/dialogs.c:1326
+"'Manuel' browser-kommandoen er blevet valgt, men ingen kommando er blevet sat."
+
+#: src/browser.c:588
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr "Browseren \"%s\" er ugyldig."
+
+#: src/browser.c:595
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "Fejl ved krsel af \"kommando\": %s"
+
+#: src/buddy_chat.c:316 src/gtkblist.c:2930
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1109,23 +1230,23 @@
 msgstr "Deltag"
 
 #. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:484
-#: src/dialogs.c:496 src/dialogs.c:509 src/dialogs.c:530 src/dialogs.c:918
-#: src/dialogs.c:1610 src/dialogs.c:1725 src/dialogs.c:1791 src/dialogs.c:2044
-#: src/dialogs.c:2193 src/dialogs.c:2865 src/dialogs.c:3032 src/dialogs.c:3074
-#: src/dialogs.c:3211 src/dialogs.c:3555 src/gtkaccount.c:1543
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4200
-#: src/protocols/msn/msn.c:176 src/protocols/msn/msn.c:187
-#: src/protocols/msn/msn.c:198 src/protocols/msn/msn.c:209
-#: src/protocols/msn/msn.c:222 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:5758
-#: src/protocols/oscar/oscar.c:5973 src/protocols/oscar/oscar.c:6022
-#: src/protocols/oscar/oscar.c:6086 src/protocols/trepia/trepia.c:379
-#: src/protocols/yahoo/yahoo.c:1576 src/prpl.c:316 src/request.h:813
-#: src/request.h:823
+#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:466
+#: src/dialogs.c:478 src/dialogs.c:491 src/dialogs.c:512 src/dialogs.c:897
+#: src/dialogs.c:1646 src/dialogs.c:1813 src/dialogs.c:1856 src/dialogs.c:1993
+#: src/gtkaccount.c:1556 src/gtkaccount.c:1988 src/gtkblist.c:1139
+#: src/gtkblist.c:3037 src/gtkconn.c:147 src/gtkprivacy.c:568
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+#: src/gtkrequest.c:198 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:520 src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:934 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:2412 src/protocols/oscar/oscar.c:2449
+#: src/protocols/oscar/oscar.c:2484 src/protocols/oscar/oscar.c:2529
+#: src/protocols/oscar/oscar.c:5935 src/protocols/oscar/oscar.c:6150
+#: src/protocols/oscar/oscar.c:6199 src/protocols/oscar/oscar.c:6264
+#: src/protocols/oscar/oscar.c:6279 src/protocols/trepia/trepia.c:338
+#: src/protocols/yahoo/yahoo.c:2039 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "Annullr"
 
@@ -1147,87 +1268,88 @@
 msgid "Enter password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1721 src/dialogs.c:1860
-#: src/dialogs.c:2043 src/dialogs.c:2189 src/dialogs.c:3031 src/dialogs.c:3073
-#: src/dialogs.c:3204 src/dialogs.c:3554 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
-#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:5972 src/protocols/oscar/oscar.c:6021
-#: src/protocols/oscar/oscar.c:6085 src/protocols/yahoo/yahoo.c:1575
-#: src/request.h:813
+#. *
+#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#.
+#: src/connection.c:193 src/dialogs.c:1812 src/dialogs.c:1855
+#: src/dialogs.c:1986 src/gtkblist.c:1138 src/gtkrequest.c:197
+#: src/protocols/jabber/jabber.c:933 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:2448
+#: src/protocols/oscar/oscar.c:2528 src/protocols/oscar/oscar.c:6149
+#: src/protocols/oscar/oscar.c:6198 src/protocols/oscar/oscar.c:6278
+#: src/protocols/yahoo/yahoo.c:2038 src/request.h:852
 msgid "OK"
 msgstr "O.k."
 
-#: src/conversation.c:424
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "Kunne ikke sende besked: For lang."
 
-#: src/conversation.c:432
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "Kunne ikke sende besked."
 
-#: src/conversation.c:1955
+#: src/conversation.c:1888
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er nu i rummet."
 
-#: src/conversation.c:1958
+#: src/conversation.c:1891
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] trdte ind i rummet."
 
-#: src/conversation.c:2043
+#: src/conversation.c:1976
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s kalder sig nu for %s"
 
-#: src/conversation.c:2085
+#: src/conversation.c:2018
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlod rummet (%s)."
 
-#: src/conversation.c:2087
+#: src/conversation.c:2020
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlod rummet."
 
-#: src/conversation.c:2160
+#: src/conversation.c:2093
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d mere)"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2095
 #, c-format
 msgid " left the room (%s)."
 msgstr " forlod rummet (%s)."
 
-#: src/conversation.c:2444
+#: src/conversation.c:2377
 msgid "Last created window"
 msgstr "Sidst oprettede vindue"
 
-#: src/conversation.c:2446
+#: src/conversation.c:2379
 msgid "New window"
 msgstr "Nyt vindue"
 
-#: src/conversation.c:2448
+#: src/conversation.c:2381
 msgid "By group"
 msgstr "Efter gruppe"
 
-#: src/conversation.c:2450
+#: src/conversation.c:2383
 msgid "By account"
 msgstr "Efter konto"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr "Advar bruger"
 
-#: src/dialogs.c:338
+#: src/dialogs.c:317
 msgid "_Warn"
 msgstr "Advar"
 
-#: src/dialogs.c:354
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1240,36 +1362,36 @@
 "Dette vil forge %s's advarselsniveau og han eller hun vil vre berrt af en "
 "lavere grnse nr beskeder bliver sendt hurtigt.\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr "Advar _anonymt?"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyme advarsler er mindre grove.</b>"
 
-#: src/dialogs.c:480
+#: src/dialogs.c:462
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Du skal til at slette %s fra din venneliste. Vil du fortstte?"
 
-#: src/dialogs.c:482 src/dialogs.c:483
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr "Fjern ven"
 
-#: src/dialogs.c:492
+#: src/dialogs.c:474
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Du skal til at fjerne chatten %s fra din venneliste. Vil du fortstte?"
 
-#: src/dialogs.c:494 src/dialogs.c:495
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Chat"
 msgstr "Fjern chat"
 
-#: src/dialogs.c:504
+#: src/dialogs.c:486
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1278,11 +1400,11 @@
 "Du skal til at fjerne gruppen %s og alle den indeholder fra din venneliste. "
 "Vil du fortstte?"
 
-#: src/dialogs.c:507 src/dialogs.c:508
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:507
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1291,250 +1413,66 @@
 "Du skal til at fjerne kontakten indeholdende %s og %d andre venner fra din "
 "venneliste. Vil du fortstte?"
 
-#: src/dialogs.c:528 src/dialogs.c:529
+#: src/dialogs.c:510 src/dialogs.c:511
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
+#: src/dialogs.c:659
+msgid "New Message"
+msgstr "Ny besked"
+
 #: src/dialogs.c:677
-msgid "New Message"
-msgstr "Ny besked"
-
-#: src/dialogs.c:695
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Indtast brugernavnet p personen du vil snakke med.\n"
 
-#: src/dialogs.c:711 src/dialogs.c:788
+#: src/dialogs.c:693 src/dialogs.c:770
 msgid "_Screenname:"
 msgstr "Brugernavn:"
 
-#: src/dialogs.c:726 src/dialogs.c:804 src/gtkpounce.c:408
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "Konto:"
 
-#: src/dialogs.c:757
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr "Hent brugeroplysninger"
 
-#: src/dialogs.c:776
+#: src/dialogs.c:758
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr ""
 "Indtast brugernavnet p den person, hvis oplysninger du gerne vil se.\n"
 
-#: src/dialogs.c:914
-msgid "Add Group"
-msgstr "Tilfj gruppe"
-
-#: src/dialogs.c:914
-msgid "Add a new group"
-msgstr "Tilfj en ny gruppe"
-
-#: src/dialogs.c:915
-msgid "Please enter the name of the group to be added."
-msgstr "Indtast navnet p gruppen der skal tilfjes."
-
-#: src/dialogs.c:917 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2688 src/prpl.c:315
-msgid "Add"
-msgstr "Tilfj"
-
-#: src/dialogs.c:943 src/protocols/yahoo/yahoo.c:1509
-msgid "Add Buddy"
-msgstr "Tilfj ven"
-
-#: src/dialogs.c:962
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Indtast brugernavnet p den person du vil tilfje til din venneliste. Du kan "
-"ogs skrive et alias, eller et klenavn, for vennen. Dette vil blive brugt "
-"istedet for brugernavnet, nr det er muligt.\n"
-
-#: src/dialogs.c:981 src/gtkaccount.c:1620
-msgid "Screen Name"
-msgstr "Brugernavn:"
-
-#: src/dialogs.c:994
-msgid "Alias"
-msgstr "Alias"
-
-#: src/dialogs.c:1004
-msgid "Group"
-msgstr "Gruppe"
-
-#. Set up stuff for the account box
-#: src/dialogs.c:1013
-msgid "Add To"
-msgstr "Tilfj til"
-
-#: src/dialogs.c:1333
-msgid "Add Chat"
-msgstr "Tilfj chat"
-
-#: src/dialogs.c:1356
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Indtast et alias og den ndvendige information om den chat du vil tilfje "
-"til din venneliste.\n"
-
-#: src/dialogs.c:1365
-msgid "Account:"
-msgstr "Konto:"
-
-#: src/dialogs.c:1384 src/gtkaccount.c:450
-msgid "Alias:"
-msgstr "Alias:"
-
-#: src/dialogs.c:1395
-msgid "Group:"
-msgstr "Gruppe:"
-
-#: src/dialogs.c:1474
-msgid "Set Directory Info"
-msgstr "Ret Mappeinformation"
-
-#: src/dialogs.c:1482
-msgid "Directory Info"
-msgstr "Mappeinformation"
-
-#: src/dialogs.c:1492
-#, c-format
-msgid "Setting Dir Info for %s:"
-msgstr "Stter mappeoplysninger for %s:"
-
-#: src/dialogs.c:1505
-msgid "Allow Web Searches To Find Your Info"
-msgstr "Tillad netsgninger at finde information om dig"
-
-#. Line 1
-#: src/dialogs.c:1508 src/dialogs.c:2062 src/protocols/oscar/oscar.c:3957
-#: src/protocols/trepia/trepia.c:299
-msgid "First Name"
-msgstr "Fornavn"
-
-#. Line 2
-#: src/dialogs.c:1519 src/dialogs.c:2072
-msgid "Middle Name"
-msgstr "Mellemnavn"
-
-#. Line 3
-#: src/dialogs.c:1531 src/dialogs.c:2082 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3960 src/protocols/trepia/trepia.c:306
-msgid "Last Name"
-msgstr "Efternavn"
-
-#. Line 4
-#: src/dialogs.c:1542 src/dialogs.c:2092
-msgid "Maiden Name"
-msgstr "Dbsnavn"
-
-#. Line 5
-#: src/dialogs.c:1553 src/dialogs.c:2102 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4006 src/protocols/oscar/oscar.c:4022
-#: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
-msgid "City"
-msgstr "By"
-
-#. Line 6
-#: src/dialogs.c:1564 src/dialogs.c:2111 src/protocols/oscar/oscar.c:4009
-#: src/protocols/oscar/oscar.c:4025 src/protocols/trepia/trepia.c:367
-#: src/protocols/trepia/trepia.c:471
-msgid "State"
-msgstr "Landsdel"
-
-#. Line 7
-#: src/dialogs.c:1575 src/dialogs.c:2120 src/protocols/jabber/jabber.c:3729
-#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
-msgid "Country"
-msgstr "Land"
-
-#: src/dialogs.c:1606 src/dialogs.c:1787 src/dialogs.c:2853 src/dialogs.c:3517
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4199
-#: src/protocols/trepia/trepia.c:378
-msgid "Save"
-msgstr "Gem"
-
-#: src/dialogs.c:1629
-msgid "New passwords do not match."
-msgstr "Nye adgangskoder er ikke ens."
-
-#: src/dialogs.c:1635
-msgid "Fill out all fields completely."
-msgstr "Udfyld alle felter ordentligt."
-
-#: src/dialogs.c:1664 src/dialogs.c:1673 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4418 src/protocols/oscar/oscar.c:6153
-#: src/protocols/toc/toc.c:1514
-msgid "Change Password"
-msgstr "Skift adgangskode"
-
-#: src/dialogs.c:1680
-#, c-format
-msgid "Changing password for %s:"
-msgstr "ndrer adgangskode for %s:"
-
-#: src/dialogs.c:1688
-msgid "Original Password"
-msgstr "Oprindelig adgangskode"
-
-#: src/dialogs.c:1699
-msgid "New Password"
-msgstr "Ny adgangskode"
-
-#: src/dialogs.c:1710
-msgid "New Password (again)"
-msgstr "Ny adgangskode (igen)"
-
-#: src/dialogs.c:1750 src/protocols/jabber/jabber.c:4404
-#: src/protocols/oscar/oscar.c:6139 src/protocols/toc/toc.c:1502
+#: src/dialogs.c:852 src/protocols/jabber/jabber.c:944
+#: src/protocols/oscar/oscar.c:6347 src/protocols/toc/toc.c:1531
 msgid "Set User Info"
 msgstr "Ret brugeroplysninger"
 
-#: src/dialogs.c:1759
+#: src/dialogs.c:861
 #, c-format
 msgid "Changing info for %s:"
 msgstr "ndrer oplysninger for %s:"
 
-#: src/dialogs.c:1846
-msgid "Below are the results of your search: "
-msgstr "Her er resultatet af din sgning: "
-
-#: src/dialogs.c:1957
+#: src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
+#: src/gtkrequest.c:204 src/protocols/jabber/buddy.c:519
+#: src/protocols/trepia/trepia.c:337
+msgid "Save"
+msgstr "Gem"
+
+#: src/dialogs.c:963
 msgid "Log Conversation"
 msgstr "Log samtale"
 
-#: src/dialogs.c:2038 src/dialogs.c:2171
-msgid "Search for Buddy"
-msgstr "Sg efter ven"
-
-#: src/dialogs.c:2138
-msgid "Find Buddy By Info"
-msgstr "Find ven udfra information"
-
-#: src/dialogs.c:2165
-msgid "Find Buddy By Email"
-msgstr "Find ven udfra e-post adresse"
-
-#: src/dialogs.c:2178 src/protocols/jabber/jabber.c:3731
-#: src/protocols/yahoo/yahoo.c:1961
-msgid "Email"
-msgstr "E-post adresse"
-
-#: src/dialogs.c:2269
+#: src/dialogs.c:1059
 msgid "Insert Link"
 msgstr "Indst link"
 
-#: src/dialogs.c:2271
+#: src/dialogs.c:1061
 msgid "Insert"
 msgstr "Indst"
 
-#: src/dialogs.c:2290
+#: src/dialogs.c:1083
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -1542,91 +1480,92 @@
 "Indtast URL'en og beskrivelsen p det link du vil indstte. Beskrivelsen er "
 "ikke krvet.\n"
 
-#: src/dialogs.c:2314 src/protocols/jabber/jabber.c:3723
+#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/jabber.c:577
 msgid "URL"
 msgstr "Hjemmeside"
 
-#: src/dialogs.c:2324 src/gtkprefs.c:604 src/gtkprefs.c:1847
-#: src/protocols/jabber/jabber.c:3737
+#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1810
+#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:739
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/dialogs.c:2459 src/dialogs.c:2476
+#: src/dialogs.c:1247 src/dialogs.c:1264
 msgid "Select Text Color"
 msgstr "Vlg tekstfarve"
 
-#: src/dialogs.c:2511 src/dialogs.c:2528
+#: src/dialogs.c:1299 src/dialogs.c:1316
 msgid "Select Background Color"
 msgstr "Vlg baggrundsfarve"
 
-#: src/dialogs.c:2625 src/dialogs.c:2651
+#: src/dialogs.c:1401 src/dialogs.c:1427
 msgid "Select Font"
 msgstr "Vlg skrifttype"
 
-#: src/dialogs.c:2717
+#: src/dialogs.c:1493
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan ikke gemme en fravrsbesked uden en titel"
 
-#: src/dialogs.c:2719
+#: src/dialogs.c:1495
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Giv fravrsbeskeden en titel, eller vlg \"Brug\" for at bruge uden at gemme."
 
-#: src/dialogs.c:2729
+#: src/dialogs.c:1505
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lave en tom fravrsbesked"
 
-#: src/dialogs.c:2794 src/dialogs.c:2802
+#: src/dialogs.c:1570 src/dialogs.c:1578
 msgid "New away message"
 msgstr "Ny fravrsbesked"
 
-#: src/dialogs.c:2812
+#: src/dialogs.c:1588
 msgid "Away title: "
 msgstr "Titel: "
 
-#: src/dialogs.c:2857
+#: src/dialogs.c:1638
 msgid "Save & Use"
 msgstr "Gem og brug"
 
-#: src/dialogs.c:2861
+#: src/dialogs.c:1642
 msgid "Use"
 msgstr "Brug"
 
 #. show everything
-#: src/dialogs.c:3010
+#: src/dialogs.c:1791
 msgid "Smile!"
 msgstr "Smil!"
 
-#: src/dialogs.c:3028
+#: src/dialogs.c:1809
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: src/dialogs.c:3028
+#: src/dialogs.c:1809
 msgid "Alias chat"
 msgstr "Alias chat"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1810
 msgid "Please enter an aliased name for this chat."
 msgstr "Indtast et alias-navn for denne chat."
 
-#: src/dialogs.c:3060
+#: src/dialogs.c:1841
 msgid "_Screenname"
 msgstr "_Brugernavn"
 
-#: src/dialogs.c:3064 src/gtkblist.c:477 src/gtkblist.c:536
+#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:1850
 msgid "Alias Buddy"
 msgstr "Lav alias for ven"
 
-#: src/dialogs.c:3069
+#: src/dialogs.c:1851
 msgid "Alias buddy"
 msgstr "Lav alias for ven"
 
-#: src/dialogs.c:3070
+#: src/dialogs.c:1852
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
@@ -1634,66 +1573,54 @@
 "Indtast et alias for personen forneden, eller omdb denne kontakt i din "
 "venneliste."
 
-#: src/dialogs.c:3106 src/dialogs.c:3113
+#: src/dialogs.c:1888 src/dialogs.c:1895
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Kunne ikke skrive til %s."
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:1919
 msgid "Save Log File"
 msgstr "Gem logfil"
 
-#: src/dialogs.c:3167
+#: src/dialogs.c:1949
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Kunne ikke fjerne filen %s."
 
-#: src/dialogs.c:3186
+#: src/dialogs.c:1968
 msgid "Clear Log"
 msgstr "Ryd log"
 
-#: src/dialogs.c:3195
+#: src/dialogs.c:1977
 msgid "Really clear log?"
 msgstr "Er du sikker p at du vil slette loggen?"
 
-#: src/dialogs.c:3240 src/dialogs.c:3411
+#: src/dialogs.c:2022 src/dialogs.c:2193
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "Kunne ikke bne logfil %s."
 
-#: src/dialogs.c:3388
+#: src/dialogs.c:2170
 #, c-format
 msgid "Conversations with %s"
 msgstr "Samtaler med %s"
 
-#: src/dialogs.c:3390
+#: src/dialogs.c:2172
 msgid "System Log"
 msgstr "System-log"
 
-#: src/dialogs.c:3432
+#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:582
 msgid "Date"
 msgstr "Dato"
 
-#: src/dialogs.c:3489
+#: src/dialogs.c:2271
 msgid "Log"
 msgstr "Log"
 
-#: src/dialogs.c:3512
+#: src/dialogs.c:2294
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/dialogs.c:3551
-msgid "Rename Group"
-msgstr "Omdb gruppe"
-
-#: src/dialogs.c:3551
-msgid "New group name"
-msgstr "Nyt gruppenavn"
-
-#: src/dialogs.c:3552
-msgid "Please enter a new name for the selected group."
-msgstr "Indtast et nyt navn for den valgte gruppe."
-
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1808,15 +1735,15 @@
 msgid "boring default"
 msgstr "kedelig standard"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1579
+#: src/gaimrc.c:1267 src/gtkblist.c:1716
 msgid "Alphabetical"
 msgstr "Alfabetisk"
 
-#: src/gaimrc.c:1269
+#: src/gaimrc.c:1269 src/gtkblist.c:1717
 msgid "By status"
 msgstr "Status"
 
-#: src/gaimrc.c:1271
+#: src/gaimrc.c:1271 src/gtkblist.c:1718
 msgid "By log size"
 msgstr "Logstrrelse"
 
@@ -1825,7 +1752,7 @@
 msgid "Could not open config file %s."
 msgstr "Kunne ikke bne opstningsfilen %s."
 
-#: src/gtkaccount.c:268
+#: src/gtkaccount.c:277
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1836,316 +1763,364 @@
 "<b>Filstrrelse:</b> %s\n"
 "<b>Billedstrrelse:</b> %dx%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3085
+#: src/gtkaccount.c:308 src/protocols/oscar/oscar.c:3060
 msgid "Buddy Icon"
 msgstr "Venneikon"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:350
+#: src/gtkaccount.c:359
 msgid "Login Options"
 msgstr "Logind-indstillinger"
 
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:376
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:381
 msgid "Screenname:"
 msgstr "Brugernavn:"
 
-#: src/gtkaccount.c:445 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:454 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/gtkaccount.c:454
+#: src/gtkaccount.c:459 src/gtkblist.c:2988
+msgid "Alias:"
+msgstr "Alias:"
+
+#: src/gtkaccount.c:463
 msgid "Remember password"
 msgstr "Husk adgangskode"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:517
 msgid "User Options"
 msgstr "Brugerindstillinger"
 
-#: src/gtkaccount.c:521
-msgid "New mail notifications"
-msgstr "Pmindelse om ny post"
-
 #: src/gtkaccount.c:530
-msgid "Buddy icon file:"
-msgstr "Venneikon fil:"
+msgid "New mail notifications"
+msgstr "Pmindelse om ny post"
 
 #: src/gtkaccount.c:539
+msgid "Buddy icon file:"
+msgstr "Venneikon fil:"
+
+#: src/gtkaccount.c:548
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: src/gtkaccount.c:545
+#: src/gtkaccount.c:554
 msgid "_Reset"
 msgstr "_Nulstil"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:606
+#: src/gtkaccount.c:615
 #, c-format
 msgid "%s Options"
 msgstr "%s indstillinger"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:727
+#: src/gtkaccount.c:736
 msgid "Use Global Proxy Settings"
 msgstr "Brug globale mellemvrts indstillinger"
 
 #. No Proxy
-#: src/gtkaccount.c:734
+#: src/gtkaccount.c:743
 msgid "No Proxy"
 msgstr "Ingen mellemvrt"
 
 #. HTTP
-#: src/gtkaccount.c:741
+#: src/gtkaccount.c:750
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:748
+#: src/gtkaccount.c:757
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:755
+#: src/gtkaccount.c:764
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:762 src/gtkprefs.c:1111
+#: src/gtkaccount.c:771 src/gtkprefs.c:1113
 msgid "Use Environmental Settings"
 msgstr "Brug milj-indstillinger"
 
-#: src/gtkaccount.c:795
+#: src/gtkaccount.c:804
 msgid "you can see the butterflies mating"
 msgstr "du kan se sommerfuglene parre sig"
 
-#: src/gtkaccount.c:799
+#: src/gtkaccount.c:808
 msgid "If you look real closely"
 msgstr "Hvis du kigger meget tt p"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:824
 msgid "Proxy Options"
 msgstr "Mellemvrtindstillinger"
 
-#: src/gtkaccount.c:831 src/gtkprefs.c:1105
+#: src/gtkaccount.c:840 src/gtkprefs.c:1107
 msgid "Proxy _type:"
 msgstr "Mellemvrts_type:"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:849
 msgid "_Host:"
 msgstr "_Vrtsnavn:"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:853
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:852
+#: src/gtkaccount.c:861
 msgid "_Username:"
 msgstr "_Omdb:"
 
-#: src/gtkaccount.c:857
+#: src/gtkaccount.c:866
 msgid "Pa_ssword:"
 msgstr "Adgang_skode:"
 
-#: src/gtkaccount.c:1186
+#: src/gtkaccount.c:1199
 msgid "Add Account"
 msgstr "Tilfj konto"
 
-#: src/gtkaccount.c:1188
+#: src/gtkaccount.c:1201
 msgid "Modify Account"
 msgstr "Redigr konto"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1212
+#: src/gtkaccount.c:1225
 msgid "Show more options"
 msgstr "Vis flere indstillinger"
 
-#: src/gtkaccount.c:1213
+#: src/gtkaccount.c:1226
 msgid "Show fewer options"
 msgstr "Vis frre indstillinger"
 
 #. Register button
-#: src/gtkaccount.c:1240
+#: src/gtkaccount.c:1253 src/protocols/jabber/jabber.c:595
 msgid "Register"
 msgstr "Registrr"
 
-#: src/gtkaccount.c:1538
+#: src/gtkaccount.c:1551
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker p at du vil slette %s?"
 
-#: src/gtkaccount.c:1542 src/gtkrequest.c:192
+#: src/gtkaccount.c:1555 src/gtkrequest.c:201
 msgid "Delete"
 msgstr "Slet"
 
-#. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:3529
-#: src/protocols/jabber/jabber.c:3579 src/protocols/oscar/oscar.c:2846
-#: src/protocols/oscar/oscar.c:4580 src/protocols/oscar/oscar.c:5879
-#: src/protocols/yahoo/yahoo.c:1375 src/protocols/zephyr/zephyr.c:872
-#: src/protocols/zephyr/zephyr.c:882
+#: src/gtkaccount.c:1633 src/gtkblist.c:2666
+msgid "Screen Name"
+msgstr "Brugernavn:"
+
+#: src/gtkaccount.c:1656 src/protocols/jabber/jabber.c:836
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:6056 src/protocols/yahoo/yahoo.c:1838
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Logget ind"
 
-#: src/gtkaccount.c:1661
+#: src/gtkaccount.c:1674
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkblist.c:450
+#: src/gtkaccount.c:1963
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+msgstr "%s%s%s%s har gjort %s til sin ven%s%s%s"
+
+#: src/gtkaccount.c:1977
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"Vil du tilfje vedkommende til din venneliste?"
+
+#: src/gtkaccount.c:1981
+msgid "Gaim - Information"
+msgstr "Gaim - Information"
+
+#: src/gtkaccount.c:1985
+msgid "Add buddy to your list?"
+msgstr "Tilfj brugeren til din venneliste?"
+
+#: src/gtkaccount.c:1987 src/gtkblist.c:3036 src/gtkconv.c:1137
+#: src/gtkconv.c:2979 src/gtkconv.c:4154 src/gtkrequest.c:202
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+msgid "Add"
+msgstr "Tilfj"
+
+#: src/gtkblist.c:496
 msgid "_Get Info"
 msgstr "Hent bru_geroplysninger"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:499
 msgid "_IM"
 msgstr "Send _besked"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:501
 msgid "Add Buddy _Pounce"
 msgstr "_Tilfj handling"
 
-#: src/gtkblist.c:457
+#: src/gtkblist.c:503
 msgid "View _Log"
 msgstr "Vis _log"
 
-#: src/gtkblist.c:479 src/gtkblist.c:538 src/gtkblist.c:548
+#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/gtkblist.c:517
+#: src/gtkblist.c:597
 msgid "Add a _Buddy"
 msgstr "Tilfj en _ven"
 
-#: src/gtkblist.c:519
+#: src/gtkblist.c:599
 msgid "Add a C_hat"
 msgstr "Tilfj en _chat"
 
-#: src/gtkblist.c:521
+#: src/gtkblist.c:601
 msgid "_Delete Group"
 msgstr "_Slet gruppe"
 
-#: src/gtkblist.c:523
+#: src/gtkblist.c:603
 msgid "_Rename"
 msgstr "_Omdb"
 
-#: src/gtkblist.c:531
+#: src/gtkblist.c:611
 msgid "_Join"
 msgstr "_Deltag"
 
-#: src/gtkblist.c:533
+#: src/gtkblist.c:613
 msgid "Auto-Join"
 msgstr "Auto-Deltag"
 
-#: src/gtkblist.c:544 src/gtkblist.c:575
+#: src/gtkblist.c:622 src/gtkblist.c:653
 msgid "_Collapse"
 msgstr "_Fold sammen"
 
-#: src/gtkblist.c:580
+#: src/gtkblist.c:658
 msgid "_Expand"
 msgstr "_Udvid"
 
 #. Buddies menu
-#: src/gtkblist.c:989
+#: src/gtkblist.c:1088
 msgid "/_Buddies"
 msgstr "/_Venner"
 
-#: src/gtkblist.c:990
+#: src/gtkblist.c:1089
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Venner/Ny _besked..."
 
-#: src/gtkblist.c:991
+#: src/gtkblist.c:1090
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Venner/_Deltag i chat..."
 
-#: src/gtkblist.c:992
+#: src/gtkblist.c:1091
 msgid "/Buddies/Get _User Info..."
 msgstr "/Venner/_Hent brugeroplysninger..."
 
-#: src/gtkblist.c:994
+#: src/gtkblist.c:1093
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Venner/Vis _offline venner"
 
-#: src/gtkblist.c:995
+#: src/gtkblist.c:1094
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Venner/Vis _tomme grupper"
 
-#: src/gtkblist.c:996
+#: src/gtkblist.c:1095
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/Venner/Tilfj en _ven..."
 
-#: src/gtkblist.c:997
+#: src/gtkblist.c:1096
 msgid "/Buddies/Add a C_hat..."
 msgstr "/Venner/Tilfj en _chat..."
 
-#: src/gtkblist.c:998
+#: src/gtkblist.c:1097
 msgid "/Buddies/Add a _Group..."
 msgstr "/Venner/Tilfj en _gruppe..."
 
-#: src/gtkblist.c:1000
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr "/Venner/_Log af"
 
-#: src/gtkblist.c:1001
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr "/Venner/_Afslut"
 
 #. Tools
-#: src/gtkblist.c:1004
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "/Vrk_tjer"
 
-#: src/gtkblist.c:1005
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr "/Vrktjer/Fr_avrende"
 
-#: src/gtkblist.c:1006
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Vrktjer/_Handling"
 
-#: src/gtkblist.c:1007
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Vrktjer/P_rotokol handlinger"
 
-#: src/gtkblist.c:1009
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr "/Vrktjer/_Konti"
 
-#: src/gtkblist.c:1010
+#: src/gtkblist.c:1109
 msgid "/Tools/_File Transfers..."
 msgstr "/Vrktjer/_Filoverfrsler..."
 
-#: src/gtkblist.c:1011
+#: src/gtkblist.c:1110
 msgid "/Tools/Preferences"
 msgstr "/Vrktjer/Indstillinger"
 
-#: src/gtkblist.c:1012
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vrktjer/Pr_ivatliv"
 
-#: src/gtkblist.c:1014
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr "/Vrktjer/Vis system_log"
 
 #. Help
-#: src/gtkblist.c:1017
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "/_Hjlp"
 
-#: src/gtkblist.c:1018
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr "/Hjlp/Online _hjlp"
 
-#: src/gtkblist.c:1019
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr "/Hjlp/Vis _fejlsgningsvindue"
 
-#: src/gtkblist.c:1020
+#: src/gtkblist.c:1119
 msgid "/Help/_About"
 msgstr "/Hjlp/_Om"
 
-#: src/gtkblist.c:1050
+#: src/gtkblist.c:1135
+msgid "Rename Group"
+msgstr "Omdb gruppe"
+
+#: src/gtkblist.c:1135
+msgid "New group name"
+msgstr "Nyt gruppenavn"
+
+#: src/gtkblist.c:1136
+msgid "Please enter a new name for the selected group."
+msgstr "Indtast et nyt navn for den valgte gruppe."
+
+#: src/gtkblist.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -2154,16 +2129,16 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:1109 src/protocols/oscar/oscar.c:5468
+#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5437
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:1121
+#: src/gtkblist.c:1236
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1250
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2171,7 +2146,7 @@
 "\n"
 "<b>Konto:</b>"
 
-#: src/gtkblist.c:1136
+#: src/gtkblist.c:1251
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2179,7 +2154,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1252
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2187,7 +2162,7 @@
 "\n"
 "<b>Klenavn:</b>"
 
-#: src/gtkblist.c:1138
+#: src/gtkblist.c:1253
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2195,7 +2170,7 @@
 "\n"
 "<b>Inaktiv:</b>"
 
-#: src/gtkblist.c:1139
+#: src/gtkblist.c:1254
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2203,7 +2178,7 @@
 "\n"
 "<b>Advaret:</b>"
 
-#: src/gtkblist.c:1141
+#: src/gtkblist.c:1256
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2211,7 +2186,7 @@
 "\n"
 "<b>Beskrivelse:</b> Skrmmende"
 
-#: src/gtkblist.c:1142
+#: src/gtkblist.c:1257
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2219,7 +2194,7 @@
 "\n"
 "<b>Status</b>: Enestende"
 
-#: src/gtkblist.c:1143
+#: src/gtkblist.c:1258
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2227,81 +2202,140 @@
 "\n"
 "<b>Status</b>: Enestende"
 
-#: src/gtkblist.c:1397
+#: src/gtkblist.c:1513
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inaktiv (%dt%02dm)"
 
-#: src/gtkblist.c:1399
+#: src/gtkblist.c:1515
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inaktiv (%dm)"
 
-#: src/gtkblist.c:1403
+#: src/gtkblist.c:1519
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Advaret (%d%%)"
 
-#: src/gtkblist.c:1406
+#: src/gtkblist.c:1522
 msgid "Offline "
 msgstr "Offline "
 
-#: src/gtkblist.c:1578 src/gtkprefs.c:845 src/gtkprefs.c:1542
+#: src/gtkblist.c:1714 src/gtkprefs.c:842 src/gtkprefs.c:1502
 msgid "None"
 msgstr "Ingen"
 
-#: src/gtkblist.c:1643
+#: src/gtkblist.c:1779
 msgid "/Tools/Away"
 msgstr "/Vrktjer/Fravrende"
 
-#: src/gtkblist.c:1646
+#: src/gtkblist.c:1782
 msgid "/Tools/Buddy Pounce"
 msgstr "/Vrktjer/Handling"
 
-#: src/gtkblist.c:1649
+#: src/gtkblist.c:1785
 msgid "/Tools/Protocol Actions"
 msgstr "/Vrktjer/Protokol handlinger"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1732
+#: src/gtkblist.c:1869
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Venner/Vis _offline venner"
 
-#: src/gtkblist.c:1734
+#: src/gtkblist.c:1871
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Venner/Vis _tomme grupper"
 
-#: src/gtkblist.c:1752 src/gtkconv.c:1073
+#: src/gtkblist.c:1889 src/gtkconv.c:1096
 msgid "IM"
 msgstr "Besked"
 
-#: src/gtkblist.c:1758
+#: src/gtkblist.c:1895
 msgid "Send a message to the selected buddy"
 msgstr "Send en besked til den valgte ven"
 
-#: src/gtkblist.c:1761 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1898 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Hent info"
 
-#: src/gtkblist.c:1767
+#: src/gtkblist.c:1904
 msgid "Get information on the selected buddy"
 msgstr "Hent oplysninger om den valgte ven"
 
-#: src/gtkblist.c:1770 src/protocols/oscar/oscar.c:3094
+#: src/gtkblist.c:1907 src/protocols/oscar/oscar.c:3069
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gtkblist.c:1775
+#: src/gtkblist.c:1912
 msgid "Join a chat room"
 msgstr "Deltag i chatrum"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:1920
 msgid "Set an away message"
 msgstr "St en fravrsbesked"
 
-#: src/gtkblist.c:2827
+#: src/gtkblist.c:2621 src/protocols/yahoo/yahoo.c:1972
+msgid "Add Buddy"
+msgstr "Tilfj ven"
+
+#: src/gtkblist.c:2644
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Indtast brugernavnet p den person du vil tilfje til din venneliste. Du kan "
+"ogs skrive et alias, eller et klenavn, for vennen. Dette vil blive brugt "
+"istedet for brugernavnet, nr det er muligt.\n"
+
+#: src/gtkblist.c:2679
+msgid "Alias"
+msgstr "Alias"
+
+#: src/gtkblist.c:2692
+msgid "Group"
+msgstr "Gruppe"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:2701
+msgid "Add To"
+msgstr "Tilfj til"
+
+#: src/gtkblist.c:2937
+msgid "Add Chat"
+msgstr "Tilfj chat"
+
+#: src/gtkblist.c:2960
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Indtast et alias og den ndvendige information om den chat du vil tilfje "
+"til din venneliste.\n"
+
+#: src/gtkblist.c:2970
+msgid "Account:"
+msgstr "Konto:"
+
+#: src/gtkblist.c:2999
+msgid "Group:"
+msgstr "Gruppe:"
+
+#: src/gtkblist.c:3033
+msgid "Add Group"
+msgstr "Tilfj gruppe"
+
+#: src/gtkblist.c:3033
+msgid "Add a new group"
+msgstr "Tilfj en ny gruppe"
+
+#: src/gtkblist.c:3034
+msgid "Please enter the name of the group to be added."
+msgstr "Indtast navnet p gruppen der skal tilfjes."
+
+#: src/gtkblist.c:3546
 msgid "No actions available"
 msgstr "Ikke handlinger tilgngelige"
 
@@ -2330,24 +2364,29 @@
 msgid "Reason Unknown."
 msgstr "Ukendt rsag."
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:185
 msgid "That file already exists"
 msgstr "Den fil eksisterer allerede"
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "Vil du overskrive den?"
 
-#: src/gtkconv.c:280
+#: src/gtkconv.c:241
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Kunne ikke gemme billede: %s\n"
+
+#: src/gtkconv.c:303
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Indst billede"
 
-#: src/gtkconv.c:584
+#: src/gtkconv.c:607
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invitr ven med i chat-rum"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:635
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2355,324 +2394,324 @@
 "Indtast navnet p den bruger, du vil invitere, samt eventuelt en inviterings-"
 "besked."
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:656
 msgid "_Buddy:"
 msgstr "Ven:"
 
-#: src/gtkconv.c:653
+#: src/gtkconv.c:676
 msgid "_Message:"
 msgstr "Besked:"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1104
 msgid "Un-Ignore"
 msgstr "Ignorr ikke"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:777
+#: src/gtkconv.c:1106 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "Ignorr"
 
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2978
+#: src/gtkconv.c:1115 src/gtkconv.c:3002
 msgid "Info"
 msgstr "Information"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3491
+#: src/gtkconv.c:1124
 msgid "Get Away Msg"
 msgstr "Hent fravrsbesked"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2961 src/gtkconv.c:4123
-#: src/gtkrequest.c:194
+#: src/gtkconv.c:1135 src/gtkconv.c:2985 src/gtkconv.c:4139
+#: src/gtkrequest.c:203
 msgid "Remove"
 msgstr "Slet"
 
-#: src/gtkconv.c:2187
+#: src/gtkconv.c:2210
 msgid "User is typing..."
 msgstr "Bruger skriver..."
 
-#: src/gtkconv.c:2195
+#: src/gtkconv.c:2218
 msgid "User has typed something and paused"
 msgstr "Bruger har skrevet noget, og stoppet"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2297
+#: src/gtkconv.c:2321
 msgid "_Send As"
 msgstr "S_end som"
 
-#: src/gtkconv.c:2757
+#: src/gtkconv.c:2781
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Gem samtale"
 
 #. Conversation menu
-#: src/gtkconv.c:2774
+#: src/gtkconv.c:2798
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2800
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/Gem _som..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2802
 msgid "/Conversation/View _Log..."
 msgstr "/Samtale/Vis _log..."
 
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2806
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Tilfj handling..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2808
 msgid "/Conversation/A_lias..."
 msgstr "/Samtale/A_lias..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2810
 msgid "/Conversation/_Get Info..."
 msgstr "/Samtale/Hent _oplysninger..."
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:2812
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/In_vitr..."
 
-#: src/gtkconv.c:2793
+#: src/gtkconv.c:2817
 msgid "/Conversation/Insert _URL..."
 msgstr "/Samtale/Indst _URL..."
 
-#: src/gtkconv.c:2795
+#: src/gtkconv.c:2819
 msgid "/Conversation/Insert _Image..."
 msgstr "/Samtale/Indst b_illede..."
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2824
 msgid "/Conversation/_Warn..."
 msgstr "/Samtale/_Advar..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2826
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokr..."
 
-#: src/gtkconv.c:2804
+#: src/gtkconv.c:2828
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/_Tilfj..."
 
-#: src/gtkconv.c:2806
+#: src/gtkconv.c:2830
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/_Fjern..."
 
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2835
 msgid "/Conversation/_Close"
 msgstr "/Samtale/Luk"
 
 #. Options
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2839
 msgid "/_Options"
 msgstr "/_Valgmuligheder"
 
-#: src/gtkconv.c:2816
+#: src/gtkconv.c:2840
 msgid "/Options/Enable _Logging"
 msgstr "/Valgmuligheder/Aktiver _logning"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2841
 msgid "/Options/Enable _Sounds"
 msgstr "/Valgmuligheder/Brug lyde"
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2881
 msgid "/Conversation/View Log..."
 msgstr "/Samtale/Vis _log..."
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2886
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Tilfj handling..."
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2890
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Alias..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2894
 msgid "/Conversation/Get Info..."
 msgstr "/Samtale/Hent oplysninger..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2898
 msgid "/Conversation/Invite..."
 msgstr "/Samtale/Invitr..."
 
-#: src/gtkconv.c:2880
+#: src/gtkconv.c:2904
 msgid "/Conversation/Insert URL..."
 msgstr "/Samtale/Indst _URL..."
 
-#: src/gtkconv.c:2884
+#: src/gtkconv.c:2908
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Indst b_illede..."
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:2914
 msgid "/Conversation/Warn..."
 msgstr "/Samtale/Advar..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2918
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokr..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2922
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Tilfj..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2926
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern..."
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2932
 msgid "/Options/Enable Logging"
 msgstr "/Valgmuligheder/Aktiver _logning"
 
-#: src/gtkconv.c:2911
+#: src/gtkconv.c:2935
 msgid "/Options/Enable Sounds"
 msgstr "/Valgmuligheder/Brug lyde"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2935 src/gtkconv.c:2937 src/gtkconv.c:3035 src/gtkconv.c:3037
-#: src/gtkconv.c:5911
+#: src/gtkconv.c:2959 src/gtkconv.c:2961 src/gtkconv.c:3059 src/gtkconv.c:3061
+#: src/gtkconv.c:5925
 msgid "Send"
 msgstr "Send"
 
-#: src/gtkconv.c:2958 src/gtkconv.c:4141
+#: src/gtkconv.c:2982 src/gtkconv.c:4157
 msgid "Add the user to your buddy list"
 msgstr "Tilfj brugeren til din venneliste"
 
-#: src/gtkconv.c:2964 src/gtkconv.c:4126
+#: src/gtkconv.c:2988 src/gtkconv.c:4142
 msgid "Remove the user from your buddy list"
 msgstr "Fjern brugeren fra din venneliste"
 
 #. Warn button
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:2995
 msgid "Warn"
 msgstr "Advar"
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:2999
 msgid "Warn the user"
 msgstr "Advar brugeren"
 
-#: src/gtkconv.c:2982 src/gtkconv.c:3417
+#: src/gtkconv.c:3006 src/gtkconv.c:3441
 msgid "Get the user's information"
 msgstr "Hent brugerens oplysninger"
 
 #. Block button
-#: src/gtkconv.c:2985 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3009 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Ignorr"
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:3013
 msgid "Block the user"
 msgstr "Ignorr brugeren"
 
 #. Invite
-#: src/gtkconv.c:3047 src/gtkconv.c:5914
+#: src/gtkconv.c:3071 src/gtkconv.c:5928
 msgid "Invite"
 msgstr "Invitr"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3074
 msgid "Invite a user"
 msgstr "Invitr en bruger"
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3113
 msgid "Bold"
 msgstr "Fed"
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3124
 msgid "Italic"
 msgstr "Kursiv"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3135
 msgid "Underline"
 msgstr "Understregning"
 
-#: src/gtkconv.c:3127
-msgid "Larger font size"
-msgstr "Strre skriftstrrelse"
-
-#: src/gtkconv.c:3139
-msgid "Normal font size"
-msgstr "Normal skriftstrrelse"
-
 #: src/gtkconv.c:3151
+msgid "Larger font size"
+msgstr "Strre skriftstrrelse"
+
+#: src/gtkconv.c:3163
+msgid "Normal font size"
+msgstr "Normal skriftstrrelse"
+
+#: src/gtkconv.c:3175
 msgid "Smaller font size"
 msgstr "Mindre skriftstrrelse"
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3192
 msgid "Font Face"
 msgstr "Skrifttype"
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3204
 msgid "Foreground font color"
 msgstr "Forgrundsfarve"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3216
 msgid "Background color"
 msgstr "Baggrundsfarve"
 
-#: src/gtkconv.c:3207
+#: src/gtkconv.c:3231
 msgid "Insert image"
 msgstr "Indst billede"
 
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3242
 msgid "Insert link"
 msgstr "Indst link"
 
-#: src/gtkconv.c:3229
+#: src/gtkconv.c:3253
 msgid "Insert smiley"
 msgstr "Indst smiley"
 
-#: src/gtkconv.c:3286
+#: src/gtkconv.c:3310
 msgid "Topic:"
 msgstr "Emne:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3337
+#: src/gtkconv.c:3361
 msgid "0 people in room"
 msgstr "Ingen chattere i rummet"
 
-#: src/gtkconv.c:3394
+#: src/gtkconv.c:3418
 msgid "IM the user"
 msgstr "Send besked til bruger"
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3430
 msgid "Ignore the user"
 msgstr "Ignorr brugeren"
 
-#: src/gtkconv.c:3908 src/server.c:1378
+#: src/gtkconv.c:3924 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- Ny samtale @ %s ----</H3><BR>\n"
 
-#: src/gtkconv.c:3912 src/server.c:1381
+#: src/gtkconv.c:3928 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- Ny samtale @ %s ----\n"
 
-#: src/gtkconv.c:3945
+#: src/gtkconv.c:3961
 msgid "Close conversation"
 msgstr "Luk samtale"
 
-#: src/gtkconv.c:4619 src/gtkconv.c:4651 src/gtkconv.c:4772 src/gtkconv.c:4839
+#: src/gtkconv.c:4646 src/gtkconv.c:4678 src/gtkconv.c:4799 src/gtkconv.c:4866
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person i rummet."
 msgstr[1] "%d personer i rummet."
 
-#: src/gtkconv.c:5184
+#: src/gtkconv.c:5197
 msgid "Disable Animation"
 msgstr "Brug ikke animation"
 
-#: src/gtkconv.c:5193
+#: src/gtkconv.c:5206
 msgid "Enable Animation"
 msgstr "Brug animation"
 
-#: src/gtkconv.c:5200
+#: src/gtkconv.c:5213
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: src/gtkconv.c:5206
+#: src/gtkconv.c:5219
 msgid "Save Icon As..."
 msgstr "Gem ikon som..."
 
-#: src/gtkconv.c:5681 src/gtkconv.c:5684
+#: src/gtkconv.c:5695 src/gtkconv.c:5698
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Samtale/Luk"
 
@@ -2780,7 +2819,7 @@
 msgid "Gaim - Open..."
 msgstr "Gaim - bn..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2009
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
 msgid "Gaim - Save As..."
 msgstr "Gaim - Gem som..."
 
@@ -2797,7 +2836,7 @@
 msgid "_Open Link in Browser"
 msgstr "bn link i br_owser"
 
-#: src/gtkimhtml.c:1641
+#: src/gtkimhtml.c:1616
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2805,37 +2844,37 @@
 "Gaim var ikke istand til at gtte billedtypen p filnavnet der blev angivet. "
 "Bruger standardvrdien PNG."
 
-#: src/gtkimhtml.c:1649
+#: src/gtkimhtml.c:1624
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Fejl da billede skulle gemmes: %s"
 
-#: src/gtkimhtml.c:1658
+#: src/gtkimhtml.c:1633
 msgid "Save Image"
 msgstr "Gem billede"
 
-#: src/gtkimhtml.c:1680
+#: src/gtkimhtml.c:1656
 msgid "_Save Image..."
 msgstr "_Gem billede..."
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s har %d ny besked."
 msgstr[1] "%s har %d nye beskeder."
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Fra:</span> %s\n"
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Emne:</span> %s\n"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2846,7 +2885,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2900,8 +2939,8 @@
 msgid "Return from away"
 msgstr "Returner fra fravr"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1539 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1371
+#: src/gtkpounce.c:465 src/gtkprefs.c:1499 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:1834
 msgid "Idle"
 msgstr "Inaktiv"
 
@@ -2946,7 +2985,7 @@
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2125
+#: src/gtkpounce.c:518 src/gtkprefs.c:2088
 msgid "Test"
 msgstr "Test"
 
@@ -2998,15 +3037,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukendt handling. Venligst rapportr dette!"
 
-#: src/gtkprefs.c:381
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr "Grnseflade indstillinger"
 
-#: src/gtkprefs.c:383
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "V_is navne fra serveren hvis intet alias er sat"
 
-#: src/gtkprefs.c:564
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3014,365 +3053,358 @@
 "Vlg et smiley-tema som du gerne vil bruge fra listen forneden. Nye temaer "
 "kan installeres ved at trk-og-slippe dem ind i tema listen."
 
-#: src/gtkprefs.c:597
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "Stil"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "_Fed"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "_Kursiv"
 
-#: src/gtkprefs.c:676
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "_Understregning"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "_Gennemstreget"
 
+#: src/gtkprefs.c:678
+msgid "Face"
+msgstr "Skrifttype"
+
 #: src/gtkprefs.c:681
-msgid "Face"
-msgstr "Skrifttype"
-
-#: src/gtkprefs.c:684
 msgid "Use custo_m face"
 msgstr "Brugerdefineret skrifttype"
 
-#: src/gtkprefs.c:701
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "Brugerdefineret strrelse"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "Farve"
 
-#: src/gtkprefs.c:718
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "_Tekstfarve"
 
-#: src/gtkprefs.c:737
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "Baggrundsfarve"
 
-#: src/gtkprefs.c:765 src/gtkprefs.c:1002 src/gtkprefs.c:1055
+#: src/gtkprefs.c:762 src/gtkprefs.c:1004 src/gtkprefs.c:1057
 msgid "Display"
 msgstr "Visning"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "Vis grafiske humran_sigter"
 
-#: src/gtkprefs.c:768
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "Vis _tidsstempel i beskeder"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "Vis _URLer som henvisninger"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "Frem_hv forkert stavede ord"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "Ign_orr farver"
 
-#: src/gtkprefs.c:780
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "Ignorr skrifttyper"
 
-#: src/gtkprefs.c:782
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "Ignorr skriftstrrelser"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "Send besked"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "Enter _sender besked"
 
+#: src/gtkprefs.c:795
+msgid "C_ontrol-Enter sends message"
+msgstr "C_ontrol-Enter sender besked"
+
 #: src/gtkprefs.c:798
-msgid "C_ontrol-Enter sends message"
-msgstr "C_ontrol-Enter sender besked"
-
-#: src/gtkprefs.c:801
 msgid "Window Closing"
 msgstr "Vindue lukker"
 
+#: src/gtkprefs.c:799
+msgid "_Escape closes window"
+msgstr "_Escape lukker vindue"
+
 #: src/gtkprefs.c:802
-msgid "_Escape closes window"
-msgstr "_Escape lukker vindue"
-
-#: src/gtkprefs.c:805
 msgid "Insertions"
 msgstr "Indsttelser"
 
-#: src/gtkprefs.c:806
+#: src/gtkprefs.c:803
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Control-{B/I/U} indstter _HTML-koder"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(tal) _indstter humransigt"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "Venneliste sortering"
 
-#: src/gtkprefs.c:834
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "Sortering:"
 
-#: src/gtkprefs.c:839
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "Venneliste vrktjslinje"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:837 src/gtkprefs.c:974 src/gtkprefs.c:1030
 msgid "Show _buttons as:"
 msgstr "Vis knapper som:"
 
-#: src/gtkprefs.c:842 src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:839 src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "Pictures"
 msgstr "Billeder"
 
-#: src/gtkprefs.c:843 src/gtkprefs.c:975 src/gtkprefs.c:1031
+#: src/gtkprefs.c:840 src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gtkprefs.c:844 src/gtkprefs.c:976 src/gtkprefs.c:1032
+#: src/gtkprefs.c:841 src/gtkprefs.c:978 src/gtkprefs.c:1034
 msgid "Pictures and text"
 msgstr "Billeder og tekst"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:990 src/gtkprefs.c:1046
+#: src/gtkprefs.c:846 src/gtkprefs.c:992 src/gtkprefs.c:1048
 msgid "_Raise window on events"
 msgstr "Send vindue til fo_rgrunden ved aktivitet"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "Gruppevisning"
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr "Vis _tal i grupper"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr "Visning af venner"
 
-#: src/gtkprefs.c:858 src/gtkprefs.c:997
+#: src/gtkprefs.c:855 src/gtkprefs.c:999
 msgid "Show buddy _icons"
 msgstr "Vis venne_ikoner"
 
-#: src/gtkprefs.c:860
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr "Vis advarselsniveauer"
 
-#: src/gtkprefs.c:863
+#: src/gtkprefs.c:860
 msgid "Show idle _times"
 msgstr "Vis inaktiv _tid"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:874
 msgid "Dim i_dle buddies"
 msgstr "Vis inaktive venner me_d gr farve"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:899
 msgid "_Placement:"
 msgstr "_Placering:"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:906
 msgid "Send _URLs as Links"
 msgstr "Vis _URLer som henvisninger"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:909
 msgid "Tab Options"
 msgstr "Faneblad indstillinger"
 
+#: src/gtkprefs.c:911
+msgid "_Tab Placement:"
+msgstr "Placering af faneblade:"
+
+#: src/gtkprefs.c:913
+msgid "Top"
+msgstr "Top"
+
+#: src/gtkprefs.c:914
+msgid "Bottom"
+msgstr "Bund"
+
 #: src/gtkprefs.c:915
-msgid "_Tab Placement:"
-msgstr "Placering af faneblade:"
-
-#: src/gtkprefs.c:917
-msgid "Top"
-msgstr "Top"
-
-#: src/gtkprefs.c:918
-msgid "Bottom"
-msgstr "Bund"
-
-#: src/gtkprefs.c:919
 msgid "Left"
 msgstr "Venstre"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:916
 msgid "Right"
 msgstr "Hjre"
 
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:922
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Vis beskeder og chats i fanebladsvinduer"
 
-#. XXX: grey this out when the above is unchecked
-#: src/gtkprefs.c:930
+#: src/gtkprefs.c:925
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Vis beskeder og chats i _samme fanebladsvindue"
 
-#: src/gtkprefs.c:933
+#: src/gtkprefs.c:935
 msgid "Show _close button on tabs"
 msgstr "Vis luk knapper p faneblade."
 
-#: src/gtkprefs.c:944
+#: src/gtkprefs.c:946
 msgid "Show status _icons on tabs"
 msgstr "Vis status _ikoner p faneblade."
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "Window"
 msgstr "Vindue"
 
-#: src/gtkprefs.c:981 src/gtkprefs.c:1037
+#: src/gtkprefs.c:983 src/gtkprefs.c:1039
 msgid "New window _width:"
 msgstr "Vindue bredde:"
 
-#: src/gtkprefs.c:984 src/gtkprefs.c:1040
+#: src/gtkprefs.c:986 src/gtkprefs.c:1042
 msgid "New window _height:"
 msgstr "Vindue hjde:"
 
-#: src/gtkprefs.c:987 src/gtkprefs.c:1043
+#: src/gtkprefs.c:989 src/gtkprefs.c:1045
 msgid "_Entry field height:"
 msgstr "Skrivefelts hjde:"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:994
 msgid "Hide window on _send"
 msgstr "Luk vindue nr besked er _sendt"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:998
 msgid "Buddy Icons"
 msgstr "Venneikoner"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1001
 msgid "Enable buddy icon a_nimation"
 msgstr "Animr venneikoner"
 
-#: src/gtkprefs.c:1003
+#: src/gtkprefs.c:1005
 msgid "Show _logins in window"
 msgstr "Besked nr venner _logger ind/ud"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1007
 msgid "Show a_liases in tabs/titles"
 msgstr "Vis a_liaser i faneblade/titler"
 
-#: src/gtkprefs.c:1008
+#: src/gtkprefs.c:1010
 msgid "Typing Notification"
 msgstr "Skrive-pmindelse"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1011
 msgid "Notify buddies that you are _typing to them"
 msgstr "Vis venner at du er ved at skrive _til dem"
 
-#: src/gtkprefs.c:1049
+#: src/gtkprefs.c:1051
 msgid "Tab Completion"
 msgstr "Autofuldfrelse"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1052
 msgid "_Tab-complete nicks"
 msgstr "Autofuldfr navne ved tryk p _TAB"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1054
 msgid "_Old-style tab completion"
 msgstr "TAB som i gamle Gaim-versioner"
 
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1058
 msgid "_Show people joining in window"
 msgstr "Vi_s nr nogen logger ind i vinduet"
 
-#: src/gtkprefs.c:1058
+#: src/gtkprefs.c:1060
 msgid "_Show people leaving in window"
 msgstr "Vi_s nr nogen logger ud i vinduet"
 
-#: src/gtkprefs.c:1060
+#: src/gtkprefs.c:1062
 msgid "Co_lorize screennames"
 msgstr "Farvegr brugernavne"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1106
 msgid "Proxy Type"
 msgstr "Mellemvrtstype"
 
-#: src/gtkprefs.c:1107
+#: src/gtkprefs.c:1109
 msgid "No proxy"
 msgstr "Ingen mellemvrt"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1116
 msgid "Proxy Server"
 msgstr "Server"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1137
 msgid "_Host"
 msgstr "Vrtsnavn"
 
-#: src/gtkprefs.c:1152 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4528 src/protocols/msn/msn.c:1420
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
+#: src/gtkprefs.c:1154 src/protocols/irc/irc.c:516
+#: src/protocols/jabber/jabber.c:1057 src/protocols/msn/msn.c:1616
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
 msgid "Port"
 msgstr "Port"
 
-#: src/gtkprefs.c:1170
+#: src/gtkprefs.c:1172
 msgid "_User"
 msgstr "Br_uger"
 
-#: src/gtkprefs.c:1187
+#: src/gtkprefs.c:1189
 msgid "Pa_ssword"
 msgstr "Adgang_skode"
 
-#: src/gtkprefs.c:1243
-#, c-format
-msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-msgstr ""
-"Den indtastede manuelle browser '%s' er ikke gyldig. Links vil ikke virke."
-
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1226
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1227
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1265
+#: src/gtkprefs.c:1228
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1266
+#: src/gtkprefs.c:1229
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1267
+#: src/gtkprefs.c:1230
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1276
+#: src/gtkprefs.c:1239
 msgid "Manual"
 msgstr "Andet program"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1280
 msgid "Browser Selection"
 msgstr "Browservalg"
 
-#: src/gtkprefs.c:1321
+#: src/gtkprefs.c:1284
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1294
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3381,87 +3413,87 @@
 "_Manuelt:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1352
+#: src/gtkprefs.c:1315
 msgid "Browser Options"
 msgstr "Browserindstillinger"
 
-#: src/gtkprefs.c:1353
+#: src/gtkprefs.c:1316
 msgid "Open new _window by default"
 msgstr "bn nyt vindue som standard"
 
-#: src/gtkprefs.c:1368
+#: src/gtkprefs.c:1331
 msgid "Message Logs"
 msgstr "Besked-logning"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1332
 msgid "_Log all instant messages"
 msgstr "_Log alle samtaler"
 
-#: src/gtkprefs.c:1371
+#: src/gtkprefs.c:1334
 msgid "Log all c_hats"
 msgstr "Log alle c_hats"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1336
 msgid "Strip _HTML from logs"
 msgstr "Fjern _HTML-koder i logfiler"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1339
 msgid "System Logs"
 msgstr "System-logning"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1340
 msgid "Log when buddies _sign on/sign off"
 msgstr "Registrr nr venner logger ind/ud"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1342
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Registrr nr venner bliver aktive/inaktive"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1344
 msgid "Log when buddies go away/come _back"
 msgstr "Registrr venners fravr/genkomst"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1346
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Registrr eget logind/inaktivitet/fravr"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1348
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Seperat logfil for hver ven der logger p"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1391
 msgid "Sound Options"
 msgstr "Lydindstillinger"
 
-#: src/gtkprefs.c:1429
+#: src/gtkprefs.c:1392
 msgid "_No sounds when you log in"
 msgstr "I_ngen lyde nr du logger ind"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1394
 msgid "_Sounds while away"
 msgstr "Afspil lyde under fravr"
 
-#: src/gtkprefs.c:1435
+#: src/gtkprefs.c:1398
 msgid "Sound Method"
 msgstr "Lydmetode"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1399
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: src/gtkprefs.c:1438
+#: src/gtkprefs.c:1401
 msgid "Console beep"
 msgstr "Konsol-bip"
 
-#: src/gtkprefs.c:1440
+#: src/gtkprefs.c:1403
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1410
 msgid "Command"
 msgstr "Kommando"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1420
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3470,67 +3502,67 @@
 "Lyd k_ommando:\n"
 "(%s for filnavn)"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1475
 msgid "_Sending messages removes away status"
 msgstr "Beskedaf_sendelse ophver fravrsstatus"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1477
 msgid "_Queue new messages when away"
 msgstr "St nye beskeder i k under fravr"
 
-#: src/gtkprefs.c:1517
+#: src/gtkprefs.c:1480
 msgid "Auto-response"
 msgstr "Automatisk svar"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1483
 msgid "Seconds before _resending:"
 msgstr "Sekunde_r fr der skal sendes igen:"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1486
 msgid "_Send auto-response"
 msgstr "_Send automatisk svar"
 
-#: src/gtkprefs.c:1525
+#: src/gtkprefs.c:1488
 msgid "_Only send auto-response when idle"
 msgstr "Send kun automatisk svar, nr fravrende"
 
-#: src/gtkprefs.c:1527
+#: src/gtkprefs.c:1490
 msgid "Send auto-response in active conversations"
 msgstr "Send automatisk svar i aktive samtaler"
 
-#: src/gtkprefs.c:1540
+#: src/gtkprefs.c:1500
 msgid "Idle _time reporting:"
 msgstr "Mling af inaktiv _tid:"
 
-#: src/gtkprefs.c:1543
+#: src/gtkprefs.c:1503
 msgid "Gaim usage"
 msgstr "Brug af gaim"
 
-#: src/gtkprefs.c:1546
+#: src/gtkprefs.c:1506
 msgid "X usage"
 msgstr "Brug af X"
 
-#: src/gtkprefs.c:1548
+#: src/gtkprefs.c:1508
 msgid "Windows usage"
 msgstr "Brug af Windows"
 
-#: src/gtkprefs.c:1556
+#: src/gtkprefs.c:1516
 msgid "Auto-away"
 msgstr "Automatisk fravrende"
 
-#: src/gtkprefs.c:1557
+#: src/gtkprefs.c:1517
 msgid "Set away _when idle"
 msgstr "St som fravrende ved inaktivitet"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1519
 msgid "_Minutes before setting away:"
 msgstr "_Minutter fr du sttes fravrende:"
 
-#: src/gtkprefs.c:1566
+#: src/gtkprefs.c:1526
 msgid "Away m_essage:"
 msgstr "Fravrsb_esked:"
 
-#: src/gtkprefs.c:1628
+#: src/gtkprefs.c:1588
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3545,7 +3577,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">Filnavn:</span>\t%s"
 
-#: src/gtkprefs.c:1633
+#: src/gtkprefs.c:1593
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3560,97 +3592,97 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Filnavn:</span>  %s"
 
-#: src/gtkprefs.c:1811
+#: src/gtkprefs.c:1774
 msgid "Load"
 msgstr "Indls"
 
-#: src/gtkprefs.c:1818 src/protocols/msn/msn.c:1240
-#: src/protocols/trepia/trepia.c:433
+#: src/gtkprefs.c:1781 src/protocols/jabber/jabber.c:527
+#: src/protocols/msn/msn.c:1302 src/protocols/trepia/trepia.c:392
 msgid "Name"
 msgstr "Navn"
 
-#: src/gtkprefs.c:1865
+#: src/gtkprefs.c:1828
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/gtkprefs.c:1992
+#: src/gtkprefs.c:1955
 msgid "Sound Selection"
 msgstr "Lydvalg"
 
-#: src/gtkprefs.c:2099
+#: src/gtkprefs.c:2062
 msgid "Play"
 msgstr "Afspil"
 
-#: src/gtkprefs.c:2106
+#: src/gtkprefs.c:2069
 msgid "Event"
 msgstr "Begivenhed"
 
-#: src/gtkprefs.c:2129
+#: src/gtkprefs.c:2092
 msgid "Reset"
 msgstr "Nulstil"
 
-#: src/gtkprefs.c:2133
+#: src/gtkprefs.c:2096
 msgid "Choose..."
 msgstr "Vlg..."
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2230
 msgid "_Edit"
 msgstr "R_edigr"
 
-#: src/gtkprefs.c:2293
+#: src/gtkprefs.c:2266
 msgid "Interface"
 msgstr "Grnseflade"
 
-#: src/gtkprefs.c:2294
+#: src/gtkprefs.c:2267
 msgid "Smiley Themes"
 msgstr "Smiley-temaer"
 
-#: src/gtkprefs.c:2295
+#: src/gtkprefs.c:2268
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/gtkprefs.c:2296
+#: src/gtkprefs.c:2269
 msgid "Message Text"
 msgstr "Beskedtekst"
 
-#: src/gtkprefs.c:2297
+#: src/gtkprefs.c:2270
 msgid "Shortcuts"
 msgstr "Genveje"
 
-#: src/gtkprefs.c:2300
+#: src/gtkprefs.c:2273
 msgid "IMs"
 msgstr "Beskeder"
 
-#: src/gtkprefs.c:2302
+#: src/gtkprefs.c:2275
 msgid "Proxy"
 msgstr "Mellemvrt"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2305
+#: src/gtkprefs.c:2278
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2307
+#: src/gtkprefs.c:2280
 msgid "Logging"
 msgstr "Logning"
 
-#: src/gtkprefs.c:2308
+#: src/gtkprefs.c:2281
 msgid "Sounds"
 msgstr "Lydeffekter"
 
-#: src/gtkprefs.c:2309
+#: src/gtkprefs.c:2282
 msgid "Sound Events"
 msgstr "Lydhandlinger"
 
-#: src/gtkprefs.c:2310
+#: src/gtkprefs.c:2283
 msgid "Away / Idle"
 msgstr "Vk / inaktiv"
 
-#: src/gtkprefs.c:2311
+#: src/gtkprefs.c:2284
 msgid "Away Messages"
 msgstr "Fravrsbeskeder"
 
-#: src/gtkprefs.c:2314
+#: src/gtkprefs.c:2287
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
@@ -3738,15 +3770,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:195 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:196 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "Nej"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:199
 msgid "Apply"
 msgstr "Anvend"
 
@@ -3812,58 +3844,14 @@
 "Ikke i stand til at afspille lyd fordi den opsatte lyd kommando ikke kunne "
 "kres: %s"
 
-#: src/gtkutils.c:290
+#: src/gtkutils.c:286
 msgid "Can't save icon file to disk."
 msgstr "Kan ikke gemme ikonfil til disken."
 
-#: src/gtkutils.c:325
+#: src/gtkutils.c:321
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Gem ikon"
 
-#. full help text
-#: src/gtkutils.c:1038
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Brug: %s [TILVALG]...\n"
-"\n"
-"  -a, --acct          vis kontiredigerings vindue\n"
-"  -w, --away[=BESK]   vr fravrende nr du logger p (BESK kan bruges til\n"
-"                      at specificere en fravrsbesked)\n"
-"  -l, --login[=NAVN]  automatisk login (NAVN kan bruges til at bestemme\n"
-"                      hvilke konto der skal bruges, separeret af komma)\n"
-"  -n, --loginwin      log ikke automatisk ind; vis logind-vinduet\n"
-"  -u, --user=NAVN     brug konto NAVN\n"
-"  -f, --file=FIL      brug FIL som opstningsfil\n"
-"  -d, --debug         skriv fejlsgningsbeskeder til stdout\n"
-"  -v, --version       vis versionsoplysninger og afslut\n"
-"  -h, --help          vis denne hjlp og afslut\n"
-
-#. short message
-#: src/gtkutils.c:1053
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Prv `%s -h' for flere oplysninger.\n"
-
-#: src/html.c:345
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Fejl ved oprettelse af forbindelse\n"
-
 #: src/log.c:30
 msgid "Error in specifying buddy conversation."
 msgstr "Fejl ved angivelse af vennesamtale."
@@ -3998,7 +3986,47 @@
 msgid "Screen Name:"
 msgstr "Brugernavn:"
 
-#: src/plugin.c:258
+#. full help text
+#: src/main.c:565
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"Brug: %s [TILVALG]...\n"
+"\n"
+"  -a, --acct          vis kontiredigerings vindue\n"
+"  -w, --away[=BESK]   vr fravrende nr du logger p (BESK kan bruges til\n"
+"                      at specificere en fravrsbesked)\n"
+"  -l, --login[=NAVN]  automatisk login (NAVN kan bruges til at bestemme\n"
+"                      hvilke konto der skal bruges, separeret af komma)\n"
+"  -n, --loginwin      log ikke automatisk ind; vis logind-vinduet\n"
+"  -u, --user=NAVN     brug konto NAVN\n"
+"  -f, --file=FIL      brug FIL som opstningsfil\n"
+"  -d, --debug         skriv fejlsgningsbeskeder til stdout\n"
+"  -v, --version       vis versionsoplysninger og afslut\n"
+"  -h, --help          vis denne hjlp og afslut\n"
+
+#. short message
+#: src/main.c:580
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Prv `%s -h' for flere oplysninger.\n"
+
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4007,11 +4035,11 @@
 "Det krvede udvidelsesmodul %s blev ikke fundet. Installr modulet og prv "
 "igen."
 
-#: src/plugin.c:263 src/plugin.c:291
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim kunne ikke indlse dit modul."
 
-#: src/plugin.c:287
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Det krvede modul %s kunne ikke indlses."
@@ -4020,202 +4048,225 @@
 msgid "Slightly less boring default"
 msgstr "Lidt mindre kedelig standard"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1276
-#: src/protocols/msn/msn.c:338 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: 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:1647
-#: src/protocols/yahoo/yahoo.c:1742
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2211
 msgid "Available"
 msgstr "Tilgngelig"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "Kun tilgngelig for venner"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
 msgstr "Kun fravrende for venner"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3597 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4570 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:5885 src/protocols/yahoo/yahoo.c:1369
-#: src/protocols/yahoo/yahoo.c:1669 src/protocols/yahoo/yahoo.c:1752
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:841
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4510 src/protocols/oscar/oscar.c:4537
+#: src/protocols/oscar/oscar.c:6062 src/protocols/yahoo/yahoo.c:1832
+#: src/protocols/yahoo/yahoo.c:2130 src/protocols/yahoo/yahoo.c:2221
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "Kun usynlig for venner"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "Ikke tilgngelig"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:136
 msgid "Unable to resolve hostname."
 msgstr "Kunne ikke sl vrtsnavn op."
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:139
 msgid "Unable to connect to server."
 msgstr "Kunne ikke kontakte server."
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:142
 msgid "Invalid response from server."
 msgstr "Ugyldigt svar fra server."
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
 msgstr "Fejl under lsning fra netvrket."
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:148
 msgid "Error while writing to socket."
 msgstr "Fejl under skrivning til netvrket."
 
-#: src/protocols/gg/gg.c:154
+#: src/protocols/gg/gg.c:151
 msgid "Authentication failed."
 msgstr "Godkendelse fejlede."
 
-#: src/protocols/gg/gg.c:157
+#: src/protocols/gg/gg.c:154
 msgid "Unknown Error Code."
 msgstr "Ukendt fejlkode."
 
-#: src/protocols/gg/gg.c:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "Kunne ikke f kontakt"
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "Kan ikke lse fra netvrket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:208
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr "Kunne ikke f kontakt."
 
+#: src/protocols/gg/gg.c:415
+msgid "Reading data"
+msgstr "Lser data"
+
 #: src/protocols/gg/gg.c:418
-msgid "Reading data"
-msgstr "Lser data"
+msgid "Balancer handshake"
+msgstr "Finder ledig server"
 
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr "Finder ledig server"
+msgid "Reading server key"
+msgstr "Lser serverens ngle"
 
 #: src/protocols/gg/gg.c:424
-msgid "Reading server key"
-msgstr "Lser serverens ngle"
-
-#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "Udveksler ngler"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "Kritisk fejl i GG-bibliotek\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:184
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Forbindelse til %s fejlede"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "Kunne ikke kontakte server"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "Send som besked"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "Sger efter Gadu-Gadu server"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "Sger efter Gadu-Gadu server"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Ugyldigt Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Du prver vist at sende en besked til et ugyldigt Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "Kunne ikke hente sgeresultater"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu sgemaskine"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3952
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3885
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:671
+#: src/protocols/gg/gg.c:668
 msgid "First name"
 msgstr "Fornavn"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3954
+#. Last Name
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:547
+#: src/protocols/oscar/oscar.c:3893 src/protocols/trepia/trepia.c:265
+msgid "Last Name"
+msgstr "Efternavn"
+
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3887
 msgid "Nick"
 msgstr "Klenavn"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
 msgstr "Fdselsr"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "Kn"
 
-#: src/protocols/gg/gg.c:737
+#. City
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:557
+#: src/protocols/oscar/oscar.c:3939 src/protocols/oscar/oscar.c:3955
+#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+msgid "City"
+msgstr "By"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1240
+#: src/protocols/msn/msn.c:1482 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3179
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2407 src/protocols/yahoo/yahoo.c:2424
+#: src/protocols/yahoo/yahoo.c:2608 src/protocols/zephyr/zephyr.c:355
+msgid "Buddy Information"
+msgstr "Venneinformation"
+
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Der er ingen venneliste gemt p Gadu-Gadu serveren."
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kunne ikke importere venneliste fra server"
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Overfrsel af venneliste til Gadu-Gadu serveren er get godt"
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunne ikke overfre venneliste til Gadu-Gadu serveren"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Venneliste p Gadu-Gadu server slettet"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunne ikke slette venneliste p Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "Adgangskoden er ndret"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Adgangskoden blev ikke ndret"
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Fejl under kommunikation med Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4223,11 +4274,11 @@
 "Gaim var ikke i stand til at frdiggre din anmodning pga. et problem med "
 "kommunikationen til Gadu-Gadu HTTP serveren. Prv igen senere."
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Kunne ikke importere Gadu-Gadu venneliste"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4235,26 +4286,26 @@
 "Gaim var ikke i stand til at etablere forbindelse til Gadu-Gadu venneliste "
 "serveren. Prv igen senere."
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Kunne ikke eksportere venneliste"
 
-#: src/protocols/gg/gg.c:1068 src/protocols/gg/gg.c:1091
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim var ikke i stand til at etablere forbindelse til venneliste serveren."
 "Prv igen senere."
 
-#: src/protocols/gg/gg.c:1090
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Kunne ikke fjerne Gadu-Gadu vennelisten"
 
-#: src/protocols/gg/gg.c:1139
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "Kunne ikke tilg database"
 
-#: src/protocols/gg/gg.c:1140
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4262,11 +4313,11 @@
 "Gaim kunne ikke sge i databasen, fordi fordi den ikke kunne forbinde til "
 "database serveren. Prv igen senere."
 
-#: src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kunne ikke ndre Gadu-Gadu adgangskode"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4274,27 +4325,32 @@
 "Gaim kunne ikke ndre din adgangskode, fordi der skete en fejl da der skulle "
 "forbindes til Gadu-Gadu serveren. Prv igen senere."
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "Databasesgning"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:951
+#: src/protocols/oscar/oscar.c:6361 src/protocols/toc/toc.c:1545
+msgid "Change Password"
+msgstr "Skift adgangskode"
+
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "Importr venneliste fra server"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "Eksportr venneliste til server"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "Slet venneliste p server"
 
-#: src/protocols/gg/gg.c:1251
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "Kunne ikke tilg bruger profilen."
 
-#: src/protocols/gg/gg.c:1252
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4312,7 +4368,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1364 src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokol-modul"
 
@@ -4325,17 +4381,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Brugeren %s (%s%s%s%s%s) vil tilfje dig til sin venneliste"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1806
-#: src/protocols/msn/notification.c:918 src/protocols/msn/notification.c:1237
-#: src/protocols/msn/notification.c:1403 src/protocols/oscar/oscar.c:2616
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:179
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
+#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:5073
 msgid "Authorize"
 msgstr "Godkend"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1807
-#: src/protocols/msn/notification.c:919 src/protocols/msn/notification.c:1239
-#: src/protocols/msn/notification.c:1405 src/protocols/oscar/oscar.c:2618
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:180
+#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
+#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:5074
 msgid "Deny"
 msgstr "Ngt"
 
@@ -4395,8 +4451,8 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC navne m ikke indeholde mellemrum og lignende"
 
-#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:684
-#: src/protocols/toc/toc.c:236
+#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:679
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Tilsluttet: %s"
@@ -4423,9 +4479,8 @@
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC prokotolmodul"
 
-#. Splits
-#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4514 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1047 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Server"
 
@@ -4433,148 +4488,153 @@
 msgid "Encoding"
 msgstr "Tegnst"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "Ugyldig mode"
 
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "Du er blevet udvist fra %s."
 
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "Udvist"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr "<i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificeret)</i>"
 
-#: src/protocols/irc/msgs.c:193
+#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:517
 msgid "Username"
 msgstr "Brugernavn"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:1969
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2479
 msgid "Realname"
 msgstr "Rigtige navn"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr "P lige nu"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inaktiv:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "Online siden"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:219
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "Venneinformation for %s"
+
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s har ndret emnet til: %s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Emne for %s er: %s"
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Ukendt besked '%s'"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "Ukendt besked"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim har sendt en besked som IRC-serveren ikke forstod."
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "ingen kanal ved det navn"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "Bruger er ikke logget ind"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "Klenavn/kanal findes ikke"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "Kunne ikke sende"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Det krver en invitation for at deltage i %s."
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "Kun invitation"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du er blevet smidt ud af %s: (%s)"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Smidt ud af %s: (%s)"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) af %s"
 
-#: src/protocols/irc/msgs.c:658
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr "Kunne ikke ndre navn"
 
-#: src/protocols/irc/msgs.c:659
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr "Kan ikke ndre navn"
 
-#: src/protocols/irc/msgs.c:680
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har forladt kanalen%s%s"
 
-#: src/protocols/irc/msgs.c:718
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "Fejl: Ugyldigt PONG fra server"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING svar -- Lag: %lu sekunder"
 
-#: src/protocols/irc/msgs.c:790
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kan ikke deltage i %s:"
 
-#: src/protocols/irc/msgs.c:791
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr "Kan ikke deltage i kanalen"
 
-#: src/protocols/irc/msgs.c:821
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops fra %s"
@@ -4604,271 +4664,138 @@
 msgid "Disconnected"
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:574
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:601
-#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
-#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
-#: src/protocols/msn/buddyicon.c:523 src/protocols/msn/msn.c:76
-#: src/protocols/msn/msn.c:96 src/protocols/msn/msn.c:154
-#: src/protocols/msn/msn.c:254 src/protocols/msn/msn.c:507
-#: src/protocols/msn/msn.c:618 src/protocols/msn/msn.c:634
-#: src/protocols/msn/msn.c:682 src/protocols/msn/msn.c:705
-#: src/protocols/msn/msn.c:737 src/protocols/msn/msn.c:745
-#: src/protocols/msn/msn.c:778 src/protocols/msn/msn.c:786
-#: src/protocols/msn/msn.c:800 src/protocols/msn/msn.c:809
-#: src/protocols/msn/msn.c:823 src/protocols/msn/msn.c:847
-#: src/protocols/msn/msn.c:897 src/protocols/msn/msn.c:935
-#: src/protocols/msn/msn.c:1032 src/protocols/msn/msn.c:1060
-#: src/protocols/msn/msn.c:1080 src/protocols/msn/msn.c:1091
-#: src/protocols/msn/msn.c:1102 src/protocols/msn/msn.c:1126
-#: src/protocols/msn/msn.c:1138 src/protocols/msn/notification.c:173
-#: src/protocols/msn/notification.c:200 src/protocols/msn/notification.c:1629
-#: src/protocols/msn/notification.c:1649 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
-#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
-#: src/protocols/trepia/trepia.c:1263
-msgid "Write error"
-msgstr "Fejl ved skrivning"
-
-#: src/protocols/jabber/jabber.c:1069 src/protocols/jabber/jabber.c:1076
-msgid "Unable to change password."
-msgstr "Kunne ikke ndre adgangskoden."
-
-#: src/protocols/jabber/jabber.c:1070
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr ""
-"Adgangskoden du indtastede, er ikke korrekt. Adgangskoden er ikke blevet "
-"ndret."
-
-#: src/protocols/jabber/jabber.c:1077
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr ""
-"Den nye adgangskode du indtastede, er den samme som din nuvrende "
-"adgangskode. Din adgangskode er ikke blevet ndret."
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3530
-#: src/protocols/jabber/jabber.c:3581
-msgid "Chatty"
-msgstr "Vil gerne chatte"
-
-#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3532
-#: src/protocols/jabber/jabber.c:3589
-msgid "Extended Away"
-msgstr "Totalt fravrende"
-
-#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3593 src/protocols/oscar/oscar.c:2834
-#: src/protocols/oscar/oscar.c:4585 src/protocols/oscar/oscar.c:5881
-msgid "Do Not Disturb"
-msgstr "Vil ikke forstyrres"
-
-#: src/protocols/jabber/jabber.c:1513
-#, c-format
-msgid "Jabber Error %s"
-msgstr "Jabber Fejl %s"
-
-#: src/protocols/jabber/jabber.c:1618
-#, c-format
-msgid "Error %s: %s"
-msgstr "Fejl %s: %s"
-
-#: src/protocols/jabber/jabber.c:1621
-msgid "Unknown Error in presence"
-msgstr "Ukendt fejlkode i tilstedevrelse"
-
-#: src/protocols/jabber/jabber.c:1799
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "Brugeren %s vil tilfje dig til sin venneliste."
-
-#: src/protocols/jabber/jabber.c:1827
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr ""
-"Jabber brugeren %s, findes ikke, og blev derfor ikke tilfjet til din liste."
-
-#: src/protocols/jabber/jabber.c:1830
-msgid "No such user."
-msgstr "Ingen bruger fundet."
-
-#: src/protocols/jabber/jabber.c:1994
-msgid "Authenticating"
-msgstr "Godkender"
-
-#: src/protocols/jabber/jabber.c:2028
-msgid "Unknown login error"
-msgstr "Ukendt logind-fejl"
-
-#: src/protocols/jabber/jabber.c:2378
-msgid "Password successfully changed."
-msgstr "Adgangskoden er ndret."
-
-#: src/protocols/jabber/jabber.c:2423 src/protocols/jabber/jabber.c:4332
-msgid "Connection lost"
-msgstr "Forbindelse afbrudt"
-
-#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:2459
-#: src/protocols/jabber/jabber.c:4334 src/protocols/jabber/jabber.c:4383
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:461
-#: src/protocols/msn/notification.c:2086 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1248
-msgid "Unable to connect"
-msgstr "Kunne ikke tilslutte"
-
-#: src/protocols/jabber/jabber.c:2430
-msgid "Connected"
-msgstr "Tilsluttet"
-
-#: src/protocols/jabber/jabber.c:2433
-msgid "Requesting Authentication Method"
-msgstr "Anmoder godkendelsesmetode"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2453 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:452 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1271
-msgid "Connecting"
-msgstr "Tilslutter"
-
-#: src/protocols/jabber/jabber.c:2779
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "Brugeren %s er et ugyldigt Jabber ID og blev derfor ikke tilfjet."
-
-#: src/protocols/jabber/jabber.c:2781
-msgid "Unable to add buddy."
-msgstr "Kunne ikke tilfje ven."
-
-#: src/protocols/jabber/jabber.c:2782
-msgid "Jabber Error"
-msgstr "Jabber Fejl"
-
-#: src/protocols/jabber/jabber.c:3041 src/protocols/yahoo/yahoochat.c:833
-msgid "Room:"
-msgstr "Rum:"
-
-#: src/protocols/jabber/jabber.c:3046
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:3052
-msgid "Handle:"
-msgstr "Klenavn:"
-
-#: src/protocols/jabber/jabber.c:3082
-msgid "Unable to join chat"
-msgstr "Kunne ikke deltage i chat"
-
-#: src/protocols/jabber/jabber.c:3318 src/protocols/jabber/jabber.c:3369
-#: src/protocols/jabber/jabber.c:3791
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: src/protocols/jabber/jabber.c:3319
-msgid "Error"
-msgstr "Fejl"
-
-#: src/protocols/jabber/jabber.c:3370 src/protocols/jabber/jabber.c:3429
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3817
-msgid "Status"
-msgstr "Status"
-
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3462
-#: src/protocols/oscar/oscar.c:5496
+#: src/protocols/jabber/auth.c:54 src/protocols/jabber/auth.c:338
+#: src/protocols/jabber/auth.c:350
+msgid "Invalid response from server"
+msgstr "Ugyldigt svar fra server"
+
+#: src/protocols/jabber/auth.c:73 src/protocols/jabber/auth.c:120
+msgid "Server does not use any supported authentication method"
+msgstr "Serveren bruger ikke nogle understttede godkendelsesmetoder"
+
+#: src/protocols/jabber/auth.c:323
+msgid "Invalid challenge from server"
+msgstr "Ugyldigt svar fra server"
+
+#: src/protocols/jabber/auth.c:353
+msgid "Bad Protocol"
+msgstr "Ugyldig protokol"
+
+#: src/protocols/jabber/auth.c:356
+msgid "Encryption Required"
+msgstr "Kryptering krvet"
+
+#: src/protocols/jabber/auth.c:359
+msgid "Invalid authzid"
+msgstr "Ugyldigt authzid"
+
+#: src/protocols/jabber/auth.c:362
+msgid "Invalid Mechanism"
+msgstr "Ugyldigt brugernavn"
+
+#: src/protocols/jabber/auth.c:364
+#, fuzzy
+msgid "Invalid Realm"
+msgstr "Ugyldigt brugernavn"
+
+#: src/protocols/jabber/auth.c:367
+msgid "Mechanism Too Weak"
+msgstr "Mekanisme for svag"
+
+#: src/protocols/jabber/auth.c:370 src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:776 src/protocols/jabber/jabber.c:826
+#: src/protocols/oscar/oscar.c:5465
 msgid "Not Authorized"
 msgstr "Ikke godkendt"
 
-#: src/protocols/jabber/jabber.c:3479
-msgid "View Error Msg"
-msgstr "Vis fejl-besked"
-
-#: src/protocols/jabber/jabber.c:3498
-msgid "Un-hide From"
-msgstr "Skjul ikke lngere for"
-
-#: src/protocols/jabber/jabber.c:3501
-msgid "Temporarily Hide From"
-msgstr "Midlertidig skjul for"
-
-#: src/protocols/jabber/jabber.c:3508
-msgid "Cancel Presence Notification"
-msgstr "Annullr tilstedevrelse-pmindelse"
-
-#: src/protocols/jabber/jabber.c:3516 src/protocols/oscar/oscar.c:5942
-msgid "Re-request authorization"
-msgstr "Anmod om ny godkendelse"
-
-#: src/protocols/jabber/jabber.c:3719
+#: src/protocols/jabber/auth.c:373
+msgid "Temporary Authentication Failure"
+msgstr "Midlertig godkendelsesfejl"
+
+#: src/protocols/jabber/auth.c:375
+msgid "Authentication Failure"
+msgstr "Godkendelsesfejl"
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:598
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: src/protocols/jabber/jabber.c:3720
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:611
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: src/protocols/jabber/jabber.c:3721
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:615
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/jabber.c:3722 src/protocols/yahoo/yahoo.c:1965
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/jabber.c:537 src/protocols/yahoo/yahoo.c:2473
 msgid "Nickname"
 msgstr "Klenavn"
 
-#: src/protocols/jabber/jabber.c:3724
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:654
 msgid "Street Address"
 msgstr "Adresse 1"
 
-#: src/protocols/jabber/jabber.c:3725
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:650
 msgid "Extended Address"
 msgstr "Adresse 2"
 
-#: src/protocols/jabber/jabber.c:3726
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:658
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3727
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:662
 msgid "Region"
 msgstr "Omrde"
 
-#: src/protocols/jabber/jabber.c:3728
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:666
+#: src/protocols/jabber/jabber.c:567
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#: src/protocols/jabber/jabber.c:3730
+#. Country
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:671
+#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+msgid "Country"
+msgstr "Land"
+
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:682
+#: src/protocols/jabber/buddy.c:689
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3732
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:708 src/protocols/yahoo/yahoo.c:2467
+msgid "Email"
+msgstr "E-post adresse"
+
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:723
 msgid "Organization Name"
 msgstr "Organisationsnavn"
 
-#: src/protocols/jabber/jabber.c:3733
+#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:727
 msgid "Organization Unit"
 msgstr "Organisatorisk enhed"
 
-#: src/protocols/jabber/jabber.c:3734
+#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:733
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3735
+#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:736
 msgid "Role"
 msgstr "Rolle"
 
-#: src/protocols/jabber/jabber.c:3736 src/protocols/oscar/oscar.c:3986
+#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:629
+#: src/protocols/oscar/oscar.c:3919
 msgid "Birthday"
 msgstr "Fdselsdato"
 
-#: src/protocols/jabber/jabber.c:4194 src/protocols/jabber/jabber.c:4195
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
 msgid "Edit Jabber vCard"
 msgstr "Redigr Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4196
+#: src/protocols/jabber/buddy.c:516
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4876,18 +4803,334 @@
 "Alle oplysninger er valgfri. Skriv kun de ting, du nsker andre skal vide om "
 "dig."
 
-#: src/protocols/jabber/jabber.c:4269
-msgid "Server Registration successful!"
-msgstr "Du er nu registreret p serveren!"
-
-#: src/protocols/jabber/jabber.c:4285
-#, c-format
-msgid "Error %d: %s"
-msgstr "Fejl %d: %s"
-
-#: src/protocols/jabber/jabber.c:4290
-msgid "Unknown registration error"
-msgstr "Ukendt fejl under registrering"
+#: src/protocols/jabber/buddy.c:554
+msgid "Jabber ID"
+msgstr "Jabber ID"
+
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:813
+#: src/protocols/jabber/jabber.c:826
+msgid "Status"
+msgstr "Status"
+
+#: src/protocols/jabber/buddy.c:576 src/protocols/jabber/jabber.c:1050
+msgid "Resource"
+msgstr "Ressource"
+
+#: src/protocols/jabber/buddy.c:619
+msgid "Middle Name"
+msgstr "Mellemnavn"
+
+#: src/protocols/jabber/buddy.c:634 src/protocols/jabber/jabber.c:552
+#: src/protocols/oscar/oscar.c:3936 src/protocols/oscar/oscar.c:3952
+msgid "Address"
+msgstr "Adresse"
+
+#: src/protocols/jabber/buddy.c:646
+msgid "P.O. Box"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:752
+msgid "Photo"
+msgstr "Billede"
+
+#: src/protocols/jabber/buddy.c:752
+msgid "Logo"
+msgstr "Logo"
+
+#: src/protocols/jabber/buddy.c:766
+msgid "Jabber Profile"
+msgstr "Jabber profil"
+
+#: src/protocols/jabber/buddy.c:861
+msgid "Un-hide From"
+msgstr "Skjul ikke lngere for"
+
+#: src/protocols/jabber/buddy.c:864
+msgid "Temporarily Hide From"
+msgstr "Midlertidig skjul for"
+
+#: src/protocols/jabber/buddy.c:872
+msgid "Cancel Presence Notification"
+msgstr "Annullr tilstedevrelse-pmindelse"
+
+#: src/protocols/jabber/buddy.c:880
+msgid "Re-request authorization"
+msgstr "Anmod om ny godkendelse"
+
+#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:833
+msgid "Room:"
+msgstr "Rum:"
+
+#: src/protocols/jabber/chat.c:43
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/jabber/chat.c:49
+msgid "Handle:"
+msgstr "Klenavn:"
+
+#: src/protocols/jabber/jabber.c:80
+msgid "Error initializing session"
+msgstr "Fejl ved initialisering af session"
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Format"
+msgstr "Ugyldigt format"
+
+#: src/protocols/jabber/jabber.c:107
+msgid "Bad Namespace Prefix"
+msgstr "Ugyldigt navnerum-foransttelse"
+
+#: src/protocols/jabber/jabber.c:110
+msgid "Resource Conflict"
+msgstr "Ressurce konflikt"
+
+#: src/protocols/jabber/jabber.c:112
+#, fuzzy
+msgid "Connection Timeout"
+msgstr "Forbindelse afbrudt"
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Gone"
+msgstr "Vrt forsvundet"
+
+#: src/protocols/jabber/jabber.c:116
+msgid "Host Unknown"
+msgstr "Vrt ukendt"
+
+#: src/protocols/jabber/jabber.c:118
+#, fuzzy
+msgid "Improper Addressing"
+msgstr "Arbejds adresse"
+
+#: src/protocols/jabber/jabber.c:120
+msgid "Internal Server Error"
+msgstr "Intern server fejl"
+
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid ID"
+msgstr "Ugyldigt ID"
+
+#: src/protocols/jabber/jabber.c:124
+msgid "Invalid Namespace"
+msgstr "Ugyldigt navnerum"
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Invalid XML"
+msgstr "Ugyldigt XML"
+
+#: src/protocols/jabber/jabber.c:128
+msgid "Non-matching Hosts"
+msgstr "Ikke-matchende vrter"
+
+#: src/protocols/jabber/jabber.c:132
+msgid "Policy Violation"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:134
+msgid "Remote Connection Failed"
+msgstr "Fjernstyring fejlede"
+
+#: src/protocols/jabber/jabber.c:136
+#, fuzzy
+msgid "Resource Constraint"
+msgstr "Fjern kontakt"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Restricted XML"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:140
+msgid "See Other Host"
+msgstr "See andre vrter"
+
+#: src/protocols/jabber/jabber.c:142
+#, fuzzy
+msgid "System Shutdown"
+msgstr "System-log"
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Undefined Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Unsupported Version"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:152
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:154
+msgid "Stream Error"
+msgstr "Strm fejl"
+
+#: src/protocols/jabber/jabber.c:232 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:516
+#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
+#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
+#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
+#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
+#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1073
+#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1105
+#: src/protocols/msn/msn.c:1116 src/protocols/msn/msn.c:1140
+#: src/protocols/msn/msn.c:1152 src/protocols/msn/msn.c:1217
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
+#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
+#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+msgid "Write error"
+msgstr "Fejl ved skrivning"
+
+#: src/protocols/jabber/jabber.c:377 src/protocols/jabber/jabber.c:641
+#: src/protocols/trepia/trepia.c:1106
+msgid "Unable to create socket"
+msgstr "Kunne ikke oprette sokkel"
+
+#: src/protocols/jabber/jabber.c:402
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "Registreringen af %s@%s lykkedes"
+
+#: src/protocols/jabber/jabber.c:404 src/protocols/jabber/jabber.c:405
+msgid "Registration Successful"
+msgstr "Registering lykkedes"
+
+#: src/protocols/jabber/jabber.c:414
+msgid "Unknown Error"
+msgstr "Ukendt fejl"
+
+#: src/protocols/jabber/jabber.c:417
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "Registrering af %s@%s fejlede: %s"
+
+#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:420
+msgid "Registration Failed"
+msgstr "Registrering fejlede"
+
+#: src/protocols/jabber/jabber.c:507 src/protocols/jabber/jabber.c:508
+msgid "Already Registered"
+msgstr "Allerede registreret"
+
+#: src/protocols/jabber/jabber.c:521 src/protocols/jabber/jabber.c:921
+msgid "Password"
+msgstr "Adgangskode"
+
+#: src/protocols/jabber/jabber.c:532
+msgid "E-Mail"
+msgstr "E-post adresse"
+
+#. First Name
+#: src/protocols/jabber/jabber.c:542 src/protocols/oscar/oscar.c:3890
+#: src/protocols/trepia/trepia.c:258
+msgid "First Name"
+msgstr "Fornavn"
+
+#. State
+#: src/protocols/jabber/jabber.c:562 src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3958 src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:430
+msgid "State"
+msgstr "Landsdel"
+
+#: src/protocols/jabber/jabber.c:572
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/protocols/jabber/jabber.c:590
+msgid "Please fill out the information below to register your new account."
+msgstr "Udfyld oplysninger forneden for at registrere din nye konto."
+
+#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:594
+msgid "Register New Jabber Account"
+msgstr "Registrr ny Jabber konto"
+
+#: src/protocols/jabber/jabber.c:680 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1734
+msgid "Connecting"
+msgstr "Tilslutter"
+
+#: src/protocols/jabber/jabber.c:684
+msgid "Initializing Stream"
+msgstr "Initialiserer strm"
+
+#: src/protocols/jabber/jabber.c:690
+msgid "Authenticating"
+msgstr "Godkender"
+
+#: src/protocols/jabber/jabber.c:698
+msgid "Re-initializing Stream"
+msgstr "Initialiserer strm p ny"
+
+#: src/protocols/jabber/jabber.c:821 src/protocols/jabber/jabber.c:872
+#: src/protocols/jabber/presence.c:254
+msgid "Error"
+msgstr "Fejl"
+
+#: src/protocols/jabber/jabber.c:837 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
+msgid "Chatty"
+msgstr "Vil gerne chatte"
+
+#: src/protocols/jabber/jabber.c:839 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
+msgid "Extended Away"
+msgstr "Totalt fravrende"
+
+#: src/protocols/jabber/jabber.c:840 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4525 src/protocols/oscar/oscar.c:6058
+msgid "Do Not Disturb"
+msgstr "Vil ikke forstyrres"
+
+#: src/protocols/jabber/jabber.c:854
+msgid "Password Changed"
+msgstr "Adgangskode ndret"
+
+#: src/protocols/jabber/jabber.c:855
+msgid "Your password has been changed."
+msgstr "Din adgangskode blev ndret."
+
+#: src/protocols/jabber/jabber.c:865
+#, c-format
+msgid "Error changing password: %s"
+msgstr "Fejl ved ndring af adgangskode: %s"
+
+#: src/protocols/jabber/jabber.c:869
+msgid "Unknown error occurred changing password"
+msgstr "Ukendt fejl skete ved ndring af adgangskoden"
+
+#: src/protocols/jabber/jabber.c:888
+msgid "New passwords do not match."
+msgstr "Nye adgangskoder er ikke ens."
+
+#: src/protocols/jabber/jabber.c:926
+msgid "Password (again)"
+msgstr "Adgangskode (igen)"
+
+#: src/protocols/jabber/jabber.c:931 src/protocols/jabber/jabber.c:932
+msgid "Change Jabber Password"
+msgstr "Skift Jabber adgangskode"
+
+#: src/protocols/jabber/jabber.c:932
+msgid "Please enter your new password"
+msgstr "Indtast din nye adgangskode"
 
 #. *< api_version
 #. *< type
@@ -4899,36 +5142,68 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4493 src/protocols/jabber/jabber.c:4495
+#: src/protocols/jabber/jabber.c:1027 src/protocols/jabber/jabber.c:1029
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber protokolmodul"
 
-#: src/protocols/jabber/jabber.c:4517
-msgid "Resource"
-msgstr "Ressource"
-
-#: src/protocols/jabber/jabber.c:4523
-msgid "Use SSL"
-msgstr "Brug SSL"
-
-#: src/protocols/jabber/jabber.c:4532
+#: src/protocols/jabber/jabber.c:1053
+msgid "Force Old SSL"
+msgstr "Tving gammel SSL"
+
+#: src/protocols/jabber/jabber.c:1061
 msgid "Connect server"
 msgstr "Tilslut til server"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:271
-#: src/protocols/msn/notification.c:492
+#: src/protocols/jabber/message.c:125
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "Beskedlevering til %s fejlede: %s"
+
+#: src/protocols/jabber/message.c:128
+msgid "Jabber Message Error"
+msgstr "Jabber beskedfejl"
+
+#: src/protocols/jabber/message.c:191
+#, c-format
+msgid " (Code %s)"
+msgstr " (Kode %s)"
+
+#: src/protocols/jabber/parser.c:129
+msgid "XML Parse error"
+msgstr "XML lsningsfejl"
+
+#: src/protocols/jabber/presence.c:166
+#, c-format
+msgid "%s (Code %s)"
+msgstr "%s (Kode %s)"
+
+#: src/protocols/jabber/presence.c:170
+msgid "Unknown Error in presence"
+msgstr "Ukendt fejlkode i tilstedevrelse"
+
+#: src/protocols/jabber/presence.c:174
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "Brugeren %s vil tilfje dig til sin venneliste."
+
+#: src/protocols/jabber/presence.c:250
+msgid "Unable to join chat"
+msgstr "Kunne ikke deltage i chat"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:499
 msgid "Unable to request USR\n"
 msgstr "Kunne ikke anmode om USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:288
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "Kunne ikke logge ind ved hjlp af MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:297
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "Kunne ikke sende USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:302
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "Anmoder om at sende adgangskode"
 
@@ -4936,15 +5211,15 @@
 msgid "Protocol version not supported"
 msgstr "Protokol version ikke understttet"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:754
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
 msgid "Unable to request CVR\n"
 msgstr "Kunne ikke anmode om CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:763
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
 msgid "Unable to request INF\n"
 msgstr "Kunne ikke anmode om INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1863
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
 msgid "Got invalid XFR"
 msgstr "Fik en ugyldig XFR"
 
@@ -4956,16 +5231,22 @@
 msgid "Unable to parse message."
 msgstr "Kunne ikke fortolke beskeden."
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:859
-#: src/protocols/msn/notification.c:2108
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
+#: src/protocols/msn/notification.c:2102 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1711
+msgid "Unable to connect"
+msgstr "Kunne ikke tilslutte"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:2124
 msgid "Unable to write to server"
 msgstr "Kunne ikke skrive til server"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2115
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2131
 msgid "Syncing with server"
 msgstr "Synkroniserer med server"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2129
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2145
 msgid "Error reading from server"
 msgstr "Fejl under lsning fra server"
 
@@ -4986,7 +5267,7 @@
 msgstr "Fuldt kvalificeret vrtsnavn mangler"
 
 #: src/protocols/msn/error.c:47
-msgid "Already Login"
+msgid "Already Logged In"
 msgstr "Allerede logget ind"
 
 #: src/protocols/msn/error.c:50
@@ -5021,150 +5302,187 @@
 msgid "Already in opposite list"
 msgstr "Allerede i den modsatte liste"
 
-#: src/protocols/msn/error.c:75
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "Prvede at tilfje en ven til en gruppe der ikke eksisterer"
-
-#: src/protocols/msn/error.c:79
-msgid "Switchboard failed"
-msgstr "Switchboard fejlede"
-
-#: src/protocols/msn/error.c:82
-msgid "Notify Transfer failed"
-msgstr "Pmindelse om overfrsel fejlede"
+#: src/protocols/msn/error.c:74
+msgid "Too many groups"
+msgstr "For mange grupper"
+
+#: src/protocols/msn/error.c:77
+msgid "Invalid group"
+msgstr "Ugyldig gruppe"
+
+#: src/protocols/msn/error.c:80
+msgid "User not in group"
+msgstr "Bruger ikke i gruppe"
+
+#: src/protocols/msn/error.c:83
+msgid "Group name too long"
+msgstr "Gruppenavn for langt"
 
 #: src/protocols/msn/error.c:86
+msgid "Cannot remove group zero"
+msgstr "Kan ikke fjerne gruppe nul"
+
+#: src/protocols/msn/error.c:90
+msgid "Tried to add a contact to a group that doesn't exist"
+msgstr "Prvede at tilfje en ven til en gruppe der ikke eksisterer"
+
+#: src/protocols/msn/error.c:94
+msgid "Switchboard failed"
+msgstr "Switchboard fejlede"
+
+#: src/protocols/msn/error.c:97
+msgid "Notify Transfer failed"
+msgstr "Pmindelse om overfrsel fejlede"
+
+#: src/protocols/msn/error.c:101
 msgid "Required fields missing"
 msgstr "Krvede felter manglende"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
+#: src/protocols/msn/error.c:104
+msgid "Too many hits to a FND"
+msgstr ""
+
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
 msgid "Not logged in"
 msgstr "Ikke logget ind"
 
-#: src/protocols/msn/error.c:93
+#: src/protocols/msn/error.c:111
 msgid "Internal server error"
 msgstr "Intern server fejl"
 
-#: src/protocols/msn/error.c:96
+#: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "Database server fejl"
 
-#: src/protocols/msn/error.c:99
+#: src/protocols/msn/error.c:117
 msgid "File operation error"
 msgstr "Filhndterings fejl"
 
-#: src/protocols/msn/error.c:102
+#: src/protocols/msn/error.c:120
 msgid "Memory allocation error"
 msgstr "Hukommelses-allokerings fejl"
 
-#: src/protocols/msn/error.c:105
+#: src/protocols/msn/error.c:123
 msgid "Wrong CHL value sent to server"
 msgstr "Forkert CHL vrdi sendt til server"
 
-#: src/protocols/msn/error.c:109
+#: src/protocols/msn/error.c:127
 msgid "Server busy"
 msgstr "Server travl"
 
-#: src/protocols/msn/error.c:112
+#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:198
 msgid "Server unavailable"
 msgstr "Server ikke tilgngelig"
 
-#: src/protocols/msn/error.c:115
+#: src/protocols/msn/error.c:133
 msgid "Peer Notification server down"
 msgstr "\"Peer Notification\"-server nede"
 
-#: src/protocols/msn/error.c:118
+#: src/protocols/msn/error.c:136
 msgid "Database connect error"
 msgstr "Fejl ved forbindelse til database"
 
-#: src/protocols/msn/error.c:122
+#: src/protocols/msn/error.c:140
 msgid "Server is going down (abandon ship)"
 msgstr "Serveren er p vej ned"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:147
 msgid "Error creating connection"
 msgstr "Fejl ved oprettelse af forbindelse"
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:151
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametre er enten ukendte eller ikke tilladte"
 
-#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:606
-#: src/protocols/msn/notification.c:1250 src/protocols/msn/notification.c:1418
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
+#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
 msgid "Unable to write"
 msgstr "Kunne ikke skrive"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:157
 msgid "Session overload"
 msgstr "Overbelastet session"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:160
 msgid "User is too active"
 msgstr "Bruger er for aktiv"
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:163
 msgid "Too many sessions"
 msgstr "For mange sessioner"
 
-#: src/protocols/msn/error.c:145
+#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
 msgid "Not expected"
 msgstr "Ikke forventet"
 
-#: src/protocols/msn/error.c:148
+#: src/protocols/msn/error.c:169
 msgid "Bad friend file"
 msgstr "Fejl i vennefil"
 
-#: src/protocols/msn/error.c:152 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:666
+#: src/protocols/msn/error.c:177
+msgid "Friendly name changes too rapidly"
+msgstr "Synligt navn ndres for ofte"
+
+#: src/protocols/msn/error.c:186
+msgid "Server too busy"
+msgstr "Server for travlt"
+
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Godkendelse fejlede"
 
-#: src/protocols/msn/error.c:155
+#: src/protocols/msn/error.c:193
 msgid "Not allowed when offline"
 msgstr "Ikke tilladt nr du er offline"
 
-#: src/protocols/msn/error.c:158
+#: src/protocols/msn/error.c:201
 msgid "Not accepting new users"
 msgstr "Accepterer ikke nye brugere"
 
-#: src/protocols/msn/error.c:162
+#: src/protocols/msn/error.c:205
+msgid "Kids Passport without parental consent"
+msgstr "Brne-passport uden forldre godkendelse"
+
+#: src/protocols/msn/error.c:209
 msgid "Passport account not yet verified"
 msgstr "Passport konto endnu ikke godkendt"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:213
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Ukendt fejlkode %d"
 
-#: src/protocols/msn/msn.c:64
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "Dit nye MSN synlige navn er for langt."
 
-#: src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "St dit synlige navn."
 
-#: src/protocols/msn/msn.c:172
+#: src/protocols/msn/msn.c:178
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dette er navnet som dine andre MSN venner vil se dig som."
 
-#: src/protocols/msn/msn.c:184
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "St hjemmetelefon nummer."
 
-#: src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "St arbejdstelefon nummer."
 
-#: src/protocols/msn/msn.c:206
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "St mobiltelefon nummer."
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillad MSN mobiltelefon sider?"
 
-#: src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:222
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5172,94 +5490,94 @@
 "Vil du tillade eller ngte folk p din venneliste at sende dig MSN "
 "mobiltelefon sider til din mobiltelefon eller andre mobilenheder?"
 
-#: src/protocols/msn/msn.c:220
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "Tillad"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "Ngt"
 
-#: src/protocols/msn/msn.c:238
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "Send en mobilbesked."
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "Kald p bipper"
 
-#: src/protocols/msn/msn.c:326 src/protocols/yahoo/yahoo.c:1485
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:1948
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Vk fra computeren"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:596
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1351
-#: src/protocols/yahoo/yahoo.c:1651 src/protocols/yahoo/yahoo.c:1743
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2212
 msgid "Be Right Back"
 msgstr "Straks tilbage"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:598
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1353
-#: src/protocols/yahoo/yahoo.c:1653 src/protocols/yahoo/yahoo.c:1744
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1816
+#: src/protocols/yahoo/yahoo.c:2114 src/protocols/yahoo/yahoo.c:2213
 msgid "Busy"
 msgstr "Travlt"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:600
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1361
-#: src/protocols/yahoo/yahoo.c:1661 src/protocols/yahoo/yahoo.c:1748
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1824
+#: src/protocols/yahoo/yahoo.c:2122 src/protocols/yahoo/yahoo.c:2217
 msgid "On The Phone"
 msgstr "Snakker i telefon"
 
-#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:602
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1365
-#: src/protocols/yahoo/yahoo.c:1665 src/protocols/yahoo/yahoo.c:1750
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1828
+#: src/protocols/yahoo/yahoo.c:2126 src/protocols/yahoo/yahoo.c:2219
 msgid "Out To Lunch"
 msgstr "Ude til frokost"
 
-#: src/protocols/msn/msn.c:344 src/protocols/msn/msn.c:604
-#: src/protocols/zephyr/zephyr.c:869 src/protocols/zephyr/zephyr.c:884
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Skjult"
 
-#: src/protocols/msn/msn.c:356
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "St synligt navn"
 
-#: src/protocols/msn/msn.c:364
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "St hjemmetelefon nummer"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "St arbejdstelefon nummer"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "St mobiltelefon nummer"
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "Aktivr/Deaktivr mobiltelefoner"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Tillad/Ngt mobiltelefon sider"
 
-#: src/protocols/msn/msn.c:415
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "Send til mobiltelefon"
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "bn chat"
 
-#: src/protocols/msn/msn.c:718
+#: src/protocols/msn/msn.c:727
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5268,11 +5586,11 @@
 "Et MSN brugernavn skal vre i formatet \"bruger@server.com\". Mske mente du "
 "%s@hotmail.com. Ingen ndringer blev lavet til din tilladelse-liste."
 
-#: src/protocols/msn/msn.c:722 src/protocols/msn/msn.c:762
+#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
 msgid "Invalid MSN screenname"
 msgstr "Ugyldigt MSN brugernavn"
 
-#: src/protocols/msn/msn.c:758
+#: src/protocols/msn/msn.c:767
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5281,67 +5599,76 @@
 "Et MSN brugernavn skal vre i formatet \"bruger@server.com\". Mske mente du "
 "%s@hotmail.com. Ingen ndringer blev lavet til din blokerings-liste."
 
-#: src/protocols/msn/msn.c:1196 src/protocols/yahoo/yahoo.c:1895
+#: src/protocols/msn/msn.c:1241 src/protocols/yahoo/yahoo.c:2388
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Fejl ved hentning af profil</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1244 src/protocols/oscar/oscar.c:3991
-#: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:1977
+#: src/protocols/msn/msn.c:1309 src/protocols/oscar/oscar.c:3924
+#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:2491
 msgid "Age"
 msgstr "Alder"
 
 #. Gender
-#: src/protocols/msn/msn.c:1248 src/protocols/oscar/oscar.c:3977
-#: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:1985
+#: src/protocols/msn/msn.c:1316 src/protocols/oscar/oscar.c:3910
+#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
+#: src/protocols/yahoo/yahoo.c:2503
 msgid "Gender"
 msgstr "Kn"
 
-#: src/protocols/msn/msn.c:1252 src/protocols/yahoo/yahoo.c:1981
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo.c:2497
 msgid "Marital Status"
 msgstr "gteskabelig stilling"
 
-#: src/protocols/msn/msn.c:1256 src/protocols/yahoo/yahoo.c:1973
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2485
 msgid "Location"
 msgstr "Beliggenhed"
 
-#: src/protocols/msn/msn.c:1260 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo.c:2509
 msgid "Occupation"
 msgstr "Beskftigelse"
 
-#: src/protocols/msn/msn.c:1270 src/protocols/msn/msn.c:1272
-#: src/protocols/msn/msn.c:1274 src/protocols/msn/msn.c:1276
-#: src/protocols/msn/msn.c:1278
+#: src/protocols/msn/msn.c:1356 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1376
+#: src/protocols/msn/msn.c:1383
 msgid "A Little About Me"
 msgstr "Lidt om mig"
 
-#: src/protocols/msn/msn.c:1282 src/protocols/msn/msn.c:1286
-#: src/protocols/msn/msn.c:1288
+#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1412
 msgid "Favorite Things"
 msgstr "Yndlings ting"
 
-#: src/protocols/msn/msn.c:1292 src/protocols/msn/msn.c:1294
-#: src/protocols/msn/msn.c:1296
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "Hobbies and Interests"
 msgstr "Hobbyer og interesser"
 
-#: src/protocols/msn/msn.c:1300 src/protocols/msn/msn.c:1302
-#: src/protocols/yahoo/yahoo.c:2009
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1449
+#: src/protocols/yahoo/yahoo.c:2553
 msgid "Favorite Quote"
 msgstr "Yndlings citat"
 
-#: src/protocols/msn/msn.c:1306 src/protocols/yahoo/yahoo.c:2038
+#: src/protocols/msn/msn.c:1457 src/protocols/yahoo/yahoo.c:2597
 msgid "Last Updated"
 msgstr "Sidst opdateret"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:321
-#: src/protocols/trepia/trepia.c:489
+#: src/protocols/msn/msn.c:1468 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr "Hjemmeside"
 
+#: src/protocols/msn/msn.c:1490 src/protocols/yahoo/yahoo.c:2615
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "Bruger oplysninger for %s er ikke tilgngelige"
+
+#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2617
+msgid "The user's profile is empty."
+msgstr "Brugerens profil er tom."
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5352,84 +5679,84 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1396 src/protocols/msn/msn.c:1398
+#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1592
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolmodul"
 
-#: src/protocols/msn/msn.c:1415 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1611 src/protocols/trepia/trepia.c:1330
 msgid "Login server"
 msgstr "Indlogningsserver"
 
-#: src/protocols/msn/notification.c:240
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Fejl: %s\n"
 
-#: src/protocols/msn/notification.c:356 src/protocols/msn/notification.c:517
+#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
 msgid "Unable to write to MSN Nexus server."
 msgstr "Kunne ikke skrive til MSN Nexus server."
 
-#: src/protocols/msn/notification.c:365 src/protocols/msn/notification.c:532
+#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
 msgid "Unable to read from MSN Nexus server."
 msgstr "Kunne ikke lse fra MSN Nexus server."
 
-#: src/protocols/msn/notification.c:385
+#: src/protocols/msn/notification.c:392
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus server svarede ugyldig omdirigerings oplysninger."
 
-#: src/protocols/msn/notification.c:431
+#: src/protocols/msn/notification.c:438
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "En ukendt fejl skete i forsget p at snakke med MSN login serveren."
 
-#: src/protocols/msn/notification.c:543
+#: src/protocols/msn/notification.c:550
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN Nexus server returnerede ugyldige oplysninger."
 
-#: src/protocols/msn/notification.c:611 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr "Modtager venneliste"
 
-#: src/protocols/msn/notification.c:673
+#: src/protocols/msn/notification.c:680
 msgid "Unable to connect to passport server"
 msgstr "Kunne ikke forbinde til passport server"
 
-#: src/protocols/msn/notification.c:678 src/protocols/msn/notification.c:710
+#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
 msgid "Password sent"
 msgstr "Adgangskode sendt"
 
-#: src/protocols/msn/notification.c:705
+#: src/protocols/msn/notification.c:712
 msgid "Unable to send password"
 msgstr "Kunne ikke sende adgangskode"
 
-#: src/protocols/msn/notification.c:741
+#: src/protocols/msn/notification.c:748
 msgid "Protocol not supported"
 msgstr "Protokol ikke understttet"
 
-#: src/protocols/msn/notification.c:783
+#: src/protocols/msn/notification.c:790
 msgid "You have been disconnected. You have signed on from another location."
 msgstr ""
 "Du er blevet koblet af serveren, da du er logget ind fra en anden maskine "
 "ogs."
 
-#: src/protocols/msn/notification.c:788
+#: src/protocols/msn/notification.c:795
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Du er blevet koblet af serveren. MSN serverne lukkes midlertidigt."
 
-#: src/protocols/msn/notification.c:914
+#: src/protocols/msn/notification.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Brugeren %s (%s) vil tilfje %s til sin venneliste."
 
-#: src/protocols/msn/notification.c:1231 src/protocols/msn/notification.c:1397
+#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Brugeren %s (%s) vil tilfje dig til sin venneliste"
 
-#: src/protocols/msn/notification.c:1905
+#: src/protocols/msn/notification.c:1921
 msgid "Unable to transfer to notification server"
 msgstr "Kunne ikke overfre til \"notification\"-server"
 
-#: src/protocols/msn/notification.c:2049
+#: src/protocols/msn/notification.c:2065
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5458,50 +5785,50 @@
 "\n"
 "Efter vedligeholdelsen er blevet gennemfrt, kan du logge ind igen."
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:147
 msgid "The conversation has become inactive and timed out."
 msgstr "Samtalen er blevet inaktiv og har overskredet tidsgrnsen."
 
-#: src/protocols/msn/switchboard.c:157
+#: src/protocols/msn/switchboard.c:154
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s har lukket samtale-vinduet."
 
-#: src/protocols/msn/switchboard.c:280
+#: src/protocols/msn/switchboard.c:277
 msgid "An MSN message may not have been received."
 msgstr "En MSN besked er mske ikke blevet modtaget"
 
-#: src/protocols/napster/napster.c:232
+#: src/protocols/napster/napster.c:228
 msgid "Unable to read header from server"
 msgstr "Kunne ikke hente hoved fra server"
 
-#: src/protocols/napster/napster.c:246
-#, c-format
-msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
+#: src/protocols/napster/napster.c:242
+#, c-format
+msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr "Kunne ikke lse besked fra server. Kommando er %hd, lngde er %hd."
 
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:303
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "brugere: %s, filer: %s, strrelse: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:314
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Kunne ikke tilfje \"%s\" til din Napster hotlist"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:322
 msgid "You were disconnected from the server."
 msgstr "Din forbindelse til serveren blev afbrudt."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:382
+#: src/protocols/napster/napster.c:378
 #, c-format
 msgid "%s requested your information"
 msgstr "%s anmodede om dine oplysninger"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:410
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -5509,13 +5836,13 @@
 "Du er blevet koblet af serveren, da du er logget ind fra en anden maskine."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:416
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s anmodede om PING"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5205
-#: src/protocols/toc/toc.c:1241
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5144
+#: src/protocols/toc/toc.c:1258
 msgid "Join what group:"
 msgstr "Hvilken gruppe:"
 
@@ -5529,178 +5856,178 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER protokolmodul"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid error"
 msgstr "Ugyldig fejl"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:176
 msgid "Invalid SNAC"
 msgstr "Ugyldig SNAC"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to host"
 msgstr "Grnse til vrt"
 
+#: src/protocols/oscar/oscar.c:178
+msgid "Rate to client"
+msgstr "Grnse til klient"
+
+#: src/protocols/oscar/oscar.c:180
+msgid "Service unavailable"
+msgstr "Service ikke tilgngelig"
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Service not defined"
+msgstr "Tjeneste ikke defineret"
+
 #: src/protocols/oscar/oscar.c:182
-msgid "Rate to client"
-msgstr "Grnse til klient"
+msgid "Obsolete SNAC"
+msgstr "Forldet SNAC"
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by host"
+msgstr "Ikke understttet af vrt"
 
 #: src/protocols/oscar/oscar.c:184
-msgid "Service unavailable"
-msgstr "Service ikke tilgngelig"
+msgid "Not supported by client"
+msgstr "Ikke understttet af klient"
 
 #: src/protocols/oscar/oscar.c:185
-msgid "Service not defined"
-msgstr "Tjeneste ikke defineret"
+msgid "Refused by client"
+msgstr "Ngtet af klient"
 
 #: src/protocols/oscar/oscar.c:186
-msgid "Obsolete SNAC"
-msgstr "Forldet SNAC"
+msgid "Reply too big"
+msgstr "Svar for stort"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Not supported by host"
-msgstr "Ikke understttet af vrt"
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Not supported by client"
-msgstr "Ikke understttet af klient"
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Refused by client"
-msgstr "Ngtet af klient"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Reply too big"
-msgstr "Svar for stort"
-
-#: src/protocols/oscar/oscar.c:191
 msgid "Responses lost"
 msgstr "Svar tabt"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:188
 msgid "Request denied"
 msgstr "Anmodning ngtet"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:189
 msgid "Busted SNAC payload"
 msgstr "delagt SNAC payload"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:190
 msgid "Insufficient rights"
 msgstr "Ikke nok rettigheder"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:191
 msgid "In local permit/deny"
 msgstr "I den lokale tillad/ngt"
 
+#: src/protocols/oscar/oscar.c:192
+msgid "Too evil (sender)"
+msgstr "For ond (afsender)"
+
+#: src/protocols/oscar/oscar.c:193
+msgid "Too evil (receiver)"
+msgstr "For ond (modtager)"
+
+#: src/protocols/oscar/oscar.c:194
+msgid "User temporarily unavailable"
+msgstr "Bruger midlertidigt utilgngelig"
+
+#: src/protocols/oscar/oscar.c:195
+msgid "No match"
+msgstr "Ingen fundne"
+
 #: src/protocols/oscar/oscar.c:196
-msgid "Too evil (sender)"
-msgstr "For ond (afsender)"
+msgid "List overflow"
+msgstr "Liste overlb"
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Too evil (receiver)"
-msgstr "For ond (modtager)"
+msgid "Request ambiguous"
+msgstr "Anmodning flertydig"
 
 #: src/protocols/oscar/oscar.c:198
-msgid "User temporarily unavailable"
-msgstr "Bruger midlertidigt utilgngelig"
+msgid "Queue full"
+msgstr "K fuld"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "No match"
-msgstr "Ingen fundne"
-
-#: src/protocols/oscar/oscar.c:200
-msgid "List overflow"
-msgstr "Liste overlb"
-
-#: src/protocols/oscar/oscar.c:201
-msgid "Request ambiguous"
-msgstr "Anmodning flertydig"
-
-#: src/protocols/oscar/oscar.c:202
-msgid "Queue full"
-msgstr "K fuld"
-
-#: src/protocols/oscar/oscar.c:203
 msgid "Not while on AOL"
 msgstr "Ikke samtidig med AOL"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte forbindelse til %s lukket"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte forbindelse til %s fejlede"
 
-#: src/protocols/oscar/oscar.c:536 src/protocols/toc/toc.c:226
-#: src/protocols/toc/toc.c:632 src/protocols/toc/toc.c:648
-#: src/protocols/toc/toc.c:716
+#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/oscar/oscar.c:548 src/protocols/toc/toc.c:892
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Forbindelse til chat-rum %s afbrudt."
 
-#: src/protocols/oscar/oscar.c:564
+#: src/protocols/oscar/oscar.c:559
 msgid "Chat is currently unavailable"
 msgstr "Chat er ikke tilgngelig nu"
 
-#: src/protocols/oscar/oscar.c:638 src/protocols/oscar/oscar.c:695
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke kontakte vrt"
 
-#: src/protocols/oscar/oscar.c:680
+#: src/protocols/oscar/oscar.c:675
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge p AIM"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
 msgid "Could Not Connect"
 msgstr "Forbindelse fejlede"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:785
 msgid "Connection established, cookie sent"
 msgstr "Forbindelse oprettet, infokage sendt"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
+#: src/protocols/oscar/oscar.c:870
 msgid "File Transfer Aborted"
 msgstr "Filoverfrsel afbrudt"
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:853
 msgid "Unable to establish listener socket."
 msgstr "Kan ikke etablere lytte sokkel."
 
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:866
 msgid "Unable to establish file descriptor."
 msgstr "Kunne ikke etablere fildeskriptor."
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to create new connection."
 msgstr "Ikke ikke etablere ny forbindelse."
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:578
+#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Forkert navn eller adgangskode."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "Din konto er ikke aktiv for jeblikket."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger tjenesten er midlertidigt utilgngelig."
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1065
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -5708,17 +6035,17 @@
 "Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
 "minutter og prv s igen, for ellers skal du bare vente endnu lngere."
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1070
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Din klient er for gammel. Hent en opgradering p %s"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1102
 msgid "Internal Error"
 msgstr "Intern fejl"
 
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
+#: src/protocols/oscar/oscar.c:1322
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5727,29 +6054,29 @@
 "Du vil mske blive frakoblet snart. Du kan bruge TOC i ndtil dette er "
 "ordnet. Tjek %s for opdateringer."
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim var ikke i stand til at f gyldig AIM logindata."
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1325
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim var ikke i stand til at f gyldig logindata."
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5596
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5565
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte forbindelse til %s oprettet"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
 msgid "(There was an error receiving this message)"
 msgstr "(Der var en fejl da denne besked blev modtaget)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2403
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s har lige spurgt om at forbinde direkte til %s"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2406
 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 "
@@ -5759,23 +6086,23 @@
 "for billeder. Fordi din IP-adresse vil blive afslret, kan det anses som en "
 "privatlivs risiko."
 
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:5757
+#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5934
 msgid "Connect"
 msgstr "Tilslut"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2438
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Venligst godkend mig, s jeg kan tilfje dig til min venneliste."
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2446
 msgid "Authorization Request Message:"
 msgstr "Besked til anmodning om godkendelse:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2447
 msgid "Please authorize me!"
 msgstr "Venligst godkend mig!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -5784,23 +6111,23 @@
 "Brugeren %s krver godkendelse for at blive tilfjet til en venneliste.Vil "
 "du sende en anmodning om godkendelse?"
 
-#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
 msgid "Request Authorization"
 msgstr "Anmod om godkendelse"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2606
-#: src/protocols/oscar/oscar.c:2626 src/protocols/oscar/oscar.c:3001
-#: src/protocols/oscar/oscar.c:3053 src/protocols/oscar/oscar.c:5126
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
+#: src/protocols/oscar/oscar.c:3027 src/protocols/oscar/oscar.c:5065
+#: src/protocols/oscar/oscar.c:5111
 msgid "No reason given."
 msgstr "Ingen grund givet."
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2526
 msgid "Authorization Denied Message:"
 msgstr "Besked for ngtelse af godkendelses anmodning:"
 
-#: src/protocols/oscar/oscar.c:2606
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5809,14 +6136,14 @@
 "Brugeren %u vil tilfje dig til sin venneliste af flgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5071
 msgid "Authorization Request"
 msgstr "Godkendelse Anmodning"
 
-#: src/protocols/oscar/oscar.c:2626
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
@@ -5824,17 +6151,17 @@
 "af den flgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2620
 msgid "ICQ authorization denied."
 msgstr "ICQ godkendelse ngtet."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2634
-#, c-format
-msgid "The user %u has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:2627
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Brugeren %u har givet dig lov til at tilfje sig til din venneliste."
 
-#: src/protocols/oscar/oscar.c:2642
+#: src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -5847,7 +6174,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2650
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5860,7 +6187,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2658
+#: src/protocols/oscar/oscar.c:2651
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5873,34 +6200,34 @@
 "Beskeden er:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2679
-#, c-format
-msgid "ICQ user %u has sent you a contact: %s (%s)"
-msgstr "ICQ bruger %u har sendt dig en kontakt: %s (%s)"
-
-#: src/protocols/oscar/oscar.c:2685
-msgid "Do you want to add this contact to your Buddy List?"
+#: src/protocols/oscar/oscar.c:2672
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ bruger %u har sendt dig en ven: %s (%s)"
+
+#: src/protocols/oscar/oscar.c:2678
+msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vil du tilfje denne ven til din venneliste?"
 
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:2682
 msgid "Decline"
 msgstr "Ngt"
 
-#: src/protocols/oscar/oscar.c:2771
+#: src/protocols/oscar/oscar.c:2764
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Du har ikke modtaget %hu besked fra %s, fordi den var for ugyldig."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s, fordi de var ugyldige."
 
-#: src/protocols/oscar/oscar.c:2780
+#: src/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Du har ikke modtaget %hu besked fra %s, fordi den var for store."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s, fordi de var for store."
 
-#: src/protocols/oscar/oscar.c:2789
+#: src/protocols/oscar/oscar.c:2782
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -5911,7 +6238,7 @@
 msgstr[1] ""
 "Du har ikke modtaget %hu beskeder fra %s, fordi de blev sendt for hurtigt."
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:2791
 #, 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."
@@ -5919,194 +6246,175 @@
 msgstr[1] ""
 "Du har ikke modtaget %hu beskeder fra %s, fordi han/hun var for ond."
 
-#: src/protocols/oscar/oscar.c:2807
+#: src/protocols/oscar/oscar.c:2800
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Du har ikke modtaget %hu besked fra %s, fordi du er for ond."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s, fordi du er for ond."
 
-#: src/protocols/oscar/oscar.c:2816
+#: src/protocols/oscar/oscar.c:2809
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du har ikke modtaget %hu besked fra %s pga. en ukendt rsag."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s pga. en ukendt rsag."
 
-#: src/protocols/oscar/oscar.c:2832 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:5884
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4534
+#: src/protocols/oscar/oscar.c:6061
 msgid "Free For Chat"
 msgstr "Fri til chat"
 
-#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4588
-#: src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4528
+#: src/protocols/oscar/oscar.c:6059
 msgid "Not Available"
 msgstr "Ikke tilgngelig"
 
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4591
-#: src/protocols/oscar/oscar.c:5883
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4531
+#: src/protocols/oscar/oscar.c:6060
 msgid "Occupied"
 msgstr "Optaget"
 
-#: src/protocols/oscar/oscar.c:2842
+#: src/protocols/oscar/oscar.c:2835
 msgid "Web Aware"
 msgstr "Web-opmrksom"
 
-#: src/protocols/oscar/oscar.c:2902
+#: src/protocols/oscar/oscar.c:2878
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2904
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>Status:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2963
+#: src/protocols/oscar/oscar.c:2937
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fejlen: %s\n"
 
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2938
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2999
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Din besked til %s blev ikke sendt:"
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3025
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Oplysninger om %s ikke tilgngelige:"
 
-#: src/protocols/oscar/oscar.c:3088
+#: src/protocols/oscar/oscar.c:3063
 msgid "Voice"
 msgstr "Tale"
 
-#: src/protocols/oscar/oscar.c:3091 src/protocols/oscar/oscar.c:5913
+#: src/protocols/oscar/oscar.c:3066 src/protocols/oscar/oscar.c:6090
 msgid "Direct IM"
 msgstr "Direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3097 src/protocols/oscar/oscar.c:5929
+#: src/protocols/oscar/oscar.c:3072 src/protocols/oscar/oscar.c:6106
 msgid "Get File"
 msgstr "Modtag fil"
 
-#: src/protocols/oscar/oscar.c:3100 src/protocols/oscar/oscar.c:5921
+#: src/protocols/oscar/oscar.c:3075 src/protocols/oscar/oscar.c:6098
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3079
 msgid "Games"
 msgstr "Spil"
 
-#: src/protocols/oscar/oscar.c:3107
+#: src/protocols/oscar/oscar.c:3082
 msgid "Add-Ins"
 msgstr "Udvidelser"
 
-#: src/protocols/oscar/oscar.c:3110
+#: src/protocols/oscar/oscar.c:3085
 msgid "Send Buddy List"
 msgstr "Send venneliste"
 
-#: src/protocols/oscar/oscar.c:3113
+#: src/protocols/oscar/oscar.c:3088
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy fejl"
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3091
 msgid "AP User"
 msgstr "AP Bruger"
 
-#: src/protocols/oscar/oscar.c:3119
+#: src/protocols/oscar/oscar.c:3094
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3122
+#: src/protocols/oscar/oscar.c:3097
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3125
+#: src/protocols/oscar/oscar.c:3100
 msgid "ICQ Server Relay"
 msgstr "ICQ Send gennem server"
 
-#: src/protocols/oscar/oscar.c:3128
-msgid "ICQ Unknown"
-msgstr "ICQ Ukendt"
-
-#: src/protocols/oscar/oscar.c:3131
+#: src/protocols/oscar/oscar.c:3103
+msgid "Old ICQ UTF8"
+msgstr "Gammel ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3106
 msgid "Trillian Encryption"
 msgstr "Trillian kryptering"
 
-#: src/protocols/oscar/oscar.c:3134
+#: src/protocols/oscar/oscar.c:3109
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3137
+#: src/protocols/oscar/oscar.c:3112
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3177
-msgid ""
-"<i>Unable to display information because it was sent in an unknown encoding."
-"</i>"
-msgstr ""
-"<i>Kunne ikke vise informationerne, fordi det er sendt i et ukendt tegnst.</"
-"i>"
-
-#: src/protocols/oscar/oscar.c:3184
-#, c-format
-msgid "Online Since : <b>%s</b><br>\n"
-msgstr "Online siden : <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3189
-#, c-format
-msgid "Member Since : <b>%s</b><br>\n"
-msgstr "Medlem siden : <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3195
-#, c-format
-msgid "Idle : <b>%s</b>"
-msgstr "Inaktiv : <b>%s</b>"
-
-#: src/protocols/oscar/oscar.c:3198
+#: src/protocols/oscar/oscar.c:3115
+msgid "Secure IM"
+msgstr "Sikker besked"
+
+#: src/protocols/oscar/oscar.c:3143
+#, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "Brugernavn: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3144
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr "Advarselsniveau: <b>%d%%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3147
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
+msgstr "Online siden: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3151
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
+msgstr "Medlem siden: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3156
+#, c-format
+msgid "Idle: <b>%s</b>"
+msgstr "Inaktiv: <b>%s</b>"
+
+#: src/protocols/oscar/oscar.c:3159
 msgid "Idle: <b>Active</b>"
 msgstr "Inaktiv: <b>Aktiv</b>"
 
-#: src/protocols/oscar/oscar.c:3200
-#, c-format
-msgid ""
-"Username : <b>%s</b>  %s <br>\n"
-"Warning Level : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-msgstr ""
-"Brugernavn : <b>%s</b>  %s <br>\n"
-"Advarselsniveau : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-
-#: src/protocols/oscar/oscar.c:3232
-msgid "<i>User has no away message</i>"
-msgstr "<i>Brugeren har ingen fravrsbesked</i>"
-
-#: src/protocols/oscar/oscar.c:3243
-msgid "Client Capabilities: "
-msgstr "Klient understtter: "
-
-#: src/protocols/oscar/oscar.c:3249
-msgid "<i>No Information Provided</i>"
-msgstr "<i>Ingen information tilgngelig</i>"
-
-#: src/protocols/oscar/oscar.c:3273
+#: src/protocols/oscar/oscar.c:3164 src/protocols/oscar/oscar.c:3172
+#, c-format
+msgid "<hr>%s"
+msgstr "<hr>%s"
+
+#: src/protocols/oscar/oscar.c:3199
 msgid "Your AIM connection may be lost."
 msgstr "Din AIM forbindelse kan vre afbrudt."
 
-#: src/protocols/oscar/oscar.c:3660
+#: src/protocols/oscar/oscar.c:3587
 msgid "Rate limiting error."
 msgstr "Grnse fejl."
 
-#: src/protocols/oscar/oscar.c:3661
+#: src/protocols/oscar/oscar.c:3588
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6114,7 +6422,7 @@
 "Den sidste handling blev ikke udfrt, fordi du er over grnsen. Vent i 10 "
 "sekunder og prv igen."
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3649
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6122,96 +6430,105 @@
 "Du er blevet koblet af serveren, da du ogs er logget ind fra en anden "
 "maskine."
 
-#: src/protocols/oscar/oscar.c:3724
+#: src/protocols/oscar/oscar.c:3651
 msgid "You have been signed off for an unknown reason."
 msgstr "Du er blevet logget af pga. en ukendt rsag."
 
-#: src/protocols/oscar/oscar.c:3963 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:3896 src/protocols/oscar/oscar.c:3902
 msgid "Email Address"
 msgstr "E-post adresse"
 
-#: src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:3907
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:313
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3910 src/protocols/trepia/trepia.c:272
+#: src/protocols/trepia/trepia.c:413
 msgid "Female"
 msgstr "Kvinde"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:312
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3910 src/protocols/trepia/trepia.c:271
+#: src/protocols/trepia/trepia.c:413
 msgid "Male"
 msgstr "Mand"
 
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:3927
 msgid "Personal Web Page"
 msgstr "Personlig hjemmeside"
 
-#: src/protocols/oscar/oscar.c:3997
+#: src/protocols/oscar/oscar.c:3930
 msgid "Additional Information"
 msgstr "Yderligere information"
 
-#: src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:3934
 msgid "Home Address"
 msgstr "Hjemme adresse"
 
-#: src/protocols/oscar/oscar.c:4003 src/protocols/oscar/oscar.c:4019
-msgid "Address"
-msgstr "Adresse"
-
-#: src/protocols/oscar/oscar.c:4012 src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3961
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:3950
 msgid "Work Address"
 msgstr "Arbejds adresse"
 
-#: src/protocols/oscar/oscar.c:4033
+#: src/protocols/oscar/oscar.c:3966
 msgid "Work Information"
 msgstr "Arbejds information"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:3968
 msgid "Company"
 msgstr "Firma"
 
-#: src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:3971
 msgid "Division"
 msgstr "Afdeling"
 
-#: src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:3974
 msgid "Position"
 msgstr "Stilling"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:3977
 msgid "Web Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/oscar/oscar.c:4112
-#, c-format
-msgid "<B>%s has the following screen names:</B><BR>"
-msgstr "<B>%s har de flgende brugernavne:</B><BR>"
-
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:3983
+#, c-format
+msgid "ICQ Info for %s"
+msgstr "ICQ oplysninger for %s"
+
+#: src/protocols/oscar/oscar.c:4033
+msgid "Pop-Up Message"
+msgstr "Pop-Up besked"
+
+#: src/protocols/oscar/oscar.c:4054
+#, c-format
+msgid "The following screennames are associated with %s"
+msgstr "Flgende brugernavne er associeret med %s"
+
+#: src/protocols/oscar/oscar.c:4058
+msgid "Search Results"
+msgstr "Sgeresultater"
+
+#: src/protocols/oscar/oscar.c:4075
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ingen resultater fundet for post-adressen %s"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4096
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Du br modtage en email for at acceptere %s."
 
-#: src/protocols/oscar/oscar.c:4153
+#: src/protocols/oscar/oscar.c:4098
 msgid "Account Confirmation Requested"
 msgstr "Der er anmodet om konto bekrftelse"
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4126
 msgid "Error Changing Account Info"
 msgstr "Fejl ved ndring af konto oplysninger"
 
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/oscar/oscar.c:4129
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6220,7 +6537,7 @@
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "er forskelligt fra det oprindelige."
 
-#: src/protocols/oscar/oscar.c:4187
+#: src/protocols/oscar/oscar.c:4132
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6229,7 +6546,7 @@
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "ender p et mellemrum."
 
-#: src/protocols/oscar/oscar.c:4190
+#: src/protocols/oscar/oscar.c:4135
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6238,7 +6555,7 @@
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "er for langt."
 
-#: src/protocols/oscar/oscar.c:4193
+#: src/protocols/oscar/oscar.c:4138
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6247,7 +6564,7 @@
 "Fejl 0x%04x: UDe i stand til at ndre e-post adresse, fordi der allerede er "
 "en anmodning ventende for dette brugernavn."
 
-#: src/protocols/oscar/oscar.c:4196
+#: src/protocols/oscar/oscar.c:4141
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6256,7 +6573,7 @@
 "Fejl 0x%04x: Ikke i stand til at ndre e-post adresse, fordi den angivne "
 "adresse har for mange brugernavne tilknyttet til sig."
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4144
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6265,12 +6582,12 @@
 "Fejl 0x%04x: Ikke i stand til at ndre e-post adresse, fordi den angivne "
 "adresse er ugyldig."
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fejl 0x%04x: Ukendt fejl."
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4157
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6279,20 +6596,20 @@
 "Dit brugernavn er formatter sledes p nuvrende tidspunkt:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4213 src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4158 src/protocols/oscar/oscar.c:4165
 msgid "Account Info"
 msgstr "Konto Oplysninger"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4163
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s's post-adresse er %s"
 
-#: src/protocols/oscar/oscar.c:4453
+#: src/protocols/oscar/oscar.c:4393
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke ndre AIM profil."
 
-#: src/protocols/oscar/oscar.c:4454
+#: src/protocols/oscar/oscar.c:4394
 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 "
@@ -6302,7 +6619,7 @@
 "frdig. Din profil er ikke sat; prv at stte den igen nr du er frdig med "
 "at forbinde til serveren."
 
-#: src/protocols/oscar/oscar.c:4484
+#: src/protocols/oscar/oscar.c:4424
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6317,15 +6634,15 @@
 "Profil-lngdens maskimal strrelse p %d bogstaver er blevet overskredet. "
 "Gaim har forkortet den."
 
-#: src/protocols/oscar/oscar.c:4489
+#: src/protocols/oscar/oscar.c:4429
 msgid "Profile too long."
 msgstr "Profil for lang."
 
-#: src/protocols/oscar/oscar.c:4508
+#: src/protocols/oscar/oscar.c:4448
 msgid "Unable to set AIM away message."
 msgstr "Kunne ikke stte AIM fravrsbesked."
 
-#: src/protocols/oscar/oscar.c:4509
+#: src/protocols/oscar/oscar.c:4449
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6335,7 +6652,7 @@
 "blevet frdig. Du er stadig i en \"tilgngelig\" fravrsstatus; prv at "
 "stte det igen nr du er frdig med at forbinde til serveren."
 
-#: src/protocols/oscar/oscar.c:4549
+#: src/protocols/oscar/oscar.c:4489
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6350,15 +6667,15 @@
 "Fravrsbesked-lngden p %d bogstaver er blevet overskredet. Gaim har "
 "forkortet den for dig."
 
-#: src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:4494
 msgid "Away message too long."
 msgstr "Fravrsbesked for lang."
 
-#: src/protocols/oscar/oscar.c:4774
+#: src/protocols/oscar/oscar.c:4714
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunne ikke hente vennelisten"
 
-#: src/protocols/oscar/oscar.c:4775
+#: src/protocols/oscar/oscar.c:4715
 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 "
@@ -6368,12 +6685,12 @@
 "serverne. Din venneliste er ikke tabt, og vil sikkert blive tilgngelig "
 "indenfor et par timer."
 
-#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4867
-#: src/protocols/oscar/oscar.c:4872
+#: src/protocols/oscar/oscar.c:4806 src/protocols/oscar/oscar.c:4807
+#: src/protocols/oscar/oscar.c:4812
 msgid "Orphans"
 msgstr "Tabte"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:4978
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6382,15 +6699,15 @@
 "Kunne ikke tilfje vennen %s fordi du har for mange venner i din venneliste."
 "Fjern en, og prv igen."
 
-#: src/protocols/oscar/oscar.c:5039 src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:4978 src/protocols/oscar/oscar.c:4991
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#: src/protocols/oscar/oscar.c:5040 src/protocols/oscar/oscar.c:5053
+#: src/protocols/oscar/oscar.c:4979 src/protocols/oscar/oscar.c:4992
 msgid "Unable To Add"
 msgstr "Ikke i stand til at tilfje"
 
-#: src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:4991
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6400,7 +6717,7 @@
 "Kunne ikke tilfje vennen %s pga. en ukendt rsag. Den normale grund for "
 "dette er at du har det maskimale antal tilladte venner i din venneliste."
 
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5026
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6409,11 +6726,11 @@
 "Brugeren %s har givet dig lov til at tilfje dig til din venneliste. Vil du "
 "tilfje brugeren?"
 
-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5032
 msgid "Authorization Given"
 msgstr "Godkendelse Givet"
 
-#: src/protocols/oscar/oscar.c:5126
+#: src/protocols/oscar/oscar.c:5065
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6423,22 +6740,22 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5168
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:5107
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Brugeren %s har givet lov til din anmodning om at tilfje dem til din "
 "venneliste."
 
-#: src/protocols/oscar/oscar.c:5169
+#: src/protocols/oscar/oscar.c:5108
 msgid "Authorization Granted"
 msgstr "Godkendelse Givet"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:5111
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
@@ -6446,48 +6763,56 @@
 "flgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5173
+#: src/protocols/oscar/oscar.c:5112
 msgid "Authorization Denied"
 msgstr "Godkendelse Ngtet"
 
-#: src/protocols/oscar/oscar.c:5210 src/protocols/toc/toc.c:1246
+#: src/protocols/oscar/oscar.c:5149 src/protocols/toc/toc.c:1263
 msgid "Exchange:"
 msgstr "Deltagere:"
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:5372
 msgid "<b>Status:</b> "
 msgstr "<b>Status:</b> "
 
-#: src/protocols/oscar/oscar.c:5441
+#: src/protocols/oscar/oscar.c:5381
 msgid "<b>Logged In:</b> "
 msgstr "<b>Logget ind:</b> "
 
-#: src/protocols/oscar/oscar.c:5448
+#: src/protocols/oscar/oscar.c:5393
+msgid "<b>IP Address:</b> "
+msgstr "<b>IP-adresse:</b> "
+
+#: src/protocols/oscar/oscar.c:5401
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Klient understtter:</b> "
 
-#: src/protocols/oscar/oscar.c:5455
+#: src/protocols/oscar/oscar.c:5408
 msgid "<b>Available:</b> "
 msgstr "<b>Tilgngelig:</b> "
 
-#: src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:5423
+msgid "<b>Away Message:</b> "
+msgstr "<b>Fravrsbesked:</b> "
+
+#: src/protocols/oscar/oscar.c:5433
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Status:</b> Ikke godkendt"
 
-#: src/protocols/oscar/oscar.c:5498 src/protocols/yahoo/yahoo.c:1373
+#: src/protocols/oscar/oscar.c:5467 src/protocols/yahoo/yahoo.c:1836
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/oscar/oscar.c:5737
+#: src/protocols/oscar/oscar.c:5914
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke oprette direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:5750
+#: src/protocols/oscar/oscar.c:5927
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Du har valgt at bne en direkte besked-forbindelse med %s."
 
-#: src/protocols/oscar/oscar.c:5753
+#: src/protocols/oscar/oscar.c:5930
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6495,80 +6820,102 @@
 "Fordi dette afslrer din IP-adresse, ses det som en privatlivs-risiko. Vil "
 "du fortstte?"
 
-#: src/protocols/oscar/oscar.c:5898
+#: src/protocols/oscar/oscar.c:6075
 msgid "Get Status Msg"
 msgstr "Hent statusbesked"
 
-#: src/protocols/oscar/oscar.c:5963
+#: src/protocols/oscar/oscar.c:6119
+msgid "Re-request Authorization"
+msgstr "Anmod om ny godkendelse"
+
+#: src/protocols/oscar/oscar.c:6140
 msgid "The new formatting is invalid."
 msgstr "Den nye formattering er ugyldig."
 
-#: src/protocols/oscar/oscar.c:5964
+#: src/protocols/oscar/oscar.c:6141
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "Brugernavn formatering kan kun ndre store/sm bogstaver og mellemrum."
 
-#: src/protocols/oscar/oscar.c:5970
+#: src/protocols/oscar/oscar.c:6147
 msgid "New screenname formatting:"
 msgstr "Ny brugernavn formatering:"
 
-#: src/protocols/oscar/oscar.c:6019
+#: src/protocols/oscar/oscar.c:6196
 msgid "Change Address To:"
 msgstr "Skift adresse til:"
 
-#: src/protocols/oscar/oscar.c:6033
-msgid "You are awaiting authorization from the following buddies:<BR>"
-msgstr "Du afventer godkendelse fra flgende venner:<BR>"
-
-#: src/protocols/oscar/oscar.c:6062
+#: src/protocols/oscar/oscar.c:6240
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du venter ikke p godkendelse</i>"
 
-#: src/protocols/oscar/oscar.c:6067
-#, c-format
+#: src/protocols/oscar/oscar.c:6243
+msgid "You are awaiting authorization from the following buddies"
+msgstr "Du afventer godkendelse fra flgende venner"
+
+#: src/protocols/oscar/oscar.c:6244
+#, fuzzy
 msgid ""
-"%s<BR><BR>You can re-request authorization from these buddies by right-"
-"clicking on them and clicking \"Re-request authorization.\""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
 msgstr ""
 "%s<BR><BR>Du kan anmode om ny godkendelse fra disse venner ved at "
 "hjreklikke p dem og vlge \"Anmod om ny godkendelse\"."
 
-#: src/protocols/oscar/oscar.c:6083
+#: src/protocols/oscar/oscar.c:6258
+#, fuzzy
+msgid "Find Buddy by E-mail"
+msgstr "Find ven udfra e-post adresse"
+
+#: src/protocols/oscar/oscar.c:6259
+#, fuzzy
+msgid "Search for a buddy by e-mail address"
+msgstr "Sg efter ven udfra e-post adresse"
+
+#: src/protocols/oscar/oscar.c:6260
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "Indtast e-mail adressen p vennen du sger efter."
+
+#: src/protocols/oscar/oscar.c:6263
+msgid "Search"
+msgstr "Sg"
+
+#: src/protocols/oscar/oscar.c:6276
 msgid "Available Message:"
 msgstr "Tilgngelig besked:"
 
-#: src/protocols/oscar/oscar.c:6084
-msgid "Please talk to me, I'm lonely! (and single)"
-msgstr "Snak til mig, jeg er ensom! (og single)"
-
-#: src/protocols/oscar/oscar.c:6146
+#: src/protocols/oscar/oscar.c:6354
 msgid "Set Available Message"
 msgstr "St tilgngelig-besked"
 
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6368
 msgid "Change Password (URL)"
 msgstr "Skift adgangskode (URL)"
 
-#: src/protocols/oscar/oscar.c:6171
+#: src/protocols/oscar/oscar.c:6376
+msgid "Configure IM Forwarding (URL)"
+msgstr "Konfigurr besked-videresendelse (URL)"
+
+#: src/protocols/oscar/oscar.c:6387
 msgid "Format Screenname"
 msgstr "Formatr brugernavn"
 
-#: src/protocols/oscar/oscar.c:6177
+#: src/protocols/oscar/oscar.c:6393
 msgid "Confirm Account"
 msgstr "Bekrft Konto"
 
-#: src/protocols/oscar/oscar.c:6183
+#: src/protocols/oscar/oscar.c:6399
 msgid "Display Current Registered Address"
 msgstr "Vis nuvrende registeret adresse"
 
-#: src/protocols/oscar/oscar.c:6189
+#: src/protocols/oscar/oscar.c:6405
 msgid "Change Current Registered Address"
 msgstr "Skift nuvrende registreret adresse"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6414
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis venner der afventer godkendelse"
 
-#: src/protocols/oscar/oscar.c:6206
+#: src/protocols/oscar/oscar.c:6422
 msgid "Search for Buddy by Email"
 msgstr "Sg efter ven udfra e-post adresse"
 
@@ -6582,123 +6929,123 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6327 src/protocols/oscar/oscar.c:6329
+#: src/protocols/oscar/oscar.c:6543 src/protocols/oscar/oscar.c:6545
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ protokolmodul"
 
-#: src/protocols/oscar/oscar.c:6346
+#: src/protocols/oscar/oscar.c:6562
 msgid "Auth host"
 msgstr "Godkendelses server"
 
-#: src/protocols/oscar/oscar.c:6351
+#: src/protocols/oscar/oscar.c:6567
 msgid "Auth port"
 msgstr "Godkendelses port"
 
-#: src/protocols/toc/toc.c:175
+#: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
 msgstr "Slr %s op"
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:510
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kunne ikke skrive til filen %s."
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kunne ikke lse filen %s."
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Beskeden var for lang - de sidste %s bytes blev slettet."
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s er ikke logget p lige nu."
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Du kan ikke advare %s."
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "En besked blev ikke sendt - du var hurtigere end serveren."
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat i %s er ikke muligt."
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Du sender beskeder for hurtigt til %s."
 
-#: src/protocols/toc/toc.c:541
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Du har ikke modtaget en besked fra %s, fordi den var for lang."
 
-#: src/protocols/toc/toc.c:544
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Du har ikke modtaget en besked fra %s, fordi den blev sendt for hurtigt."
 
-#: src/protocols/toc/toc.c:547
+#: src/protocols/toc/toc.c:540
 msgid "Failure."
 msgstr "Fejl."
 
-#: src/protocols/toc/toc.c:550
+#: src/protocols/toc/toc.c:543
 msgid "Too many matches."
 msgstr "For mange resultater."
 
-#: src/protocols/toc/toc.c:553
+#: src/protocols/toc/toc.c:546
 msgid "Need more qualifiers."
 msgstr "Angiv flere sgeord."
 
-#: src/protocols/toc/toc.c:556
+#: src/protocols/toc/toc.c:549
 msgid "Dir service temporarily unavailable."
 msgstr "Sgetjeneste midlertidigt utilgngelig."
 
-#: src/protocols/toc/toc.c:559
+#: src/protocols/toc/toc.c:552
 msgid "Email lookup restricted."
 msgstr "E-post sgning er begrnset."
 
-#: src/protocols/toc/toc.c:562
+#: src/protocols/toc/toc.c:555
 msgid "Keyword ignored."
 msgstr "Ngleord ignoreret."
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:558
 msgid "No keywords."
 msgstr "Ingen ngleord."
 
+#: src/protocols/toc/toc.c:561
+msgid "User has no directory information."
+msgstr "Ingen oplysninger om brugeren fundet."
+
+#: src/protocols/toc/toc.c:565
+msgid "Country not supported."
+msgstr "Land ikke understttet."
+
 #: src/protocols/toc/toc.c:568
-msgid "User has no directory information."
-msgstr "Ingen oplysninger om brugeren fundet."
-
-#: src/protocols/toc/toc.c:572
-msgid "Country not supported."
-msgstr "Land ikke understttet."
-
-#: src/protocols/toc/toc.c:575
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Ukendt fejl: %s"
 
-#: src/protocols/toc/toc.c:581
+#: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
 msgstr "Tjenesten er midlertidigt utilgngelig."
 
-#: src/protocols/toc/toc.c:584
+#: src/protocols/toc/toc.c:577
 msgid "Your warning level is currently too high to log in."
 msgstr "Du har for mange advarsler i jeblikket til at kunne logge ind."
 
-#: src/protocols/toc/toc.c:587
+#: src/protocols/toc/toc.c:580
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -6706,37 +7053,37 @@
 "Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
 "minutter og prv s igen, for ellers skal du bare vente endnu lngere."
 
-#: src/protocols/toc/toc.c:589
+#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Der opstod en ukendt fejl under logind: %s."
 
-#: src/protocols/toc/toc.c:592
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "En ukendt fejl, %d, er opstet. Info: %s"
 
-#: src/protocols/toc/toc.c:612
+#: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
 msgstr "Forbindelse lukket"
 
-#: src/protocols/toc/toc.c:652
+#: src/protocols/toc/toc.c:645
 msgid "Waiting for reply..."
 msgstr "Venter p svar..."
 
-#: src/protocols/toc/toc.c:722
+#: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC er blevet tilgngelig. Du kan nu sende beskeder igen."
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
 msgstr "Adgangskode skiftet"
 
-#: src/protocols/toc/toc.c:914
+#: src/protocols/toc/toc.c:907
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC har sendt en PAUSE kommando."
 
-#: src/protocols/toc/toc.c:915
+#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -6746,44 +7093,44 @@
 "at blive logget af, hvis du forsger at sende en besked. Gaim vil derfor "
 "tilbageholde alle beskeder. Dette er kun midlertidigt, s hav tlmodighed."
 
-#: src/protocols/toc/toc.c:1384
+#: src/protocols/toc/toc.c:1401
 msgid "Get Dir Info"
 msgstr "Hent mappeoplysninger"
 
-#: src/protocols/toc/toc.c:1508
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "Ret mappeoplysninger"
 
-#: src/protocols/toc/toc.c:1631
+#: src/protocols/toc/toc.c:1663
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kunne ikke bne %s til skrivning!"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1699
 msgid "File transfer failed; other side probably canceled."
 msgstr "Filoverfrsel fejlede - den anden side har sikkert afbrudt."
 
-#: src/protocols/toc/toc.c:1712 src/protocols/toc/toc.c:1752
-#: src/protocols/toc/toc.c:1964
+#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1996
 msgid "Could not connect for transfer."
 msgstr "Kunne ikke oprette forbindelse til overfrsel."
 
-#: src/protocols/toc/toc.c:1876
+#: src/protocols/toc/toc.c:1908
 msgid "Could not connect for transfer!"
 msgstr "Kunne ikke oprette forbindelse til overfrsel!"
 
-#: src/protocols/toc/toc.c:1909
+#: src/protocols/toc/toc.c:1941
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Kunne ikke skrive fil-hoved. Filen vil ikke blive overfrt."
 
-#: src/protocols/toc/toc.c:2043
+#: src/protocols/toc/toc.c:2075
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/toc/toc.c:2050
+#: src/protocols/toc/toc.c:2082
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s beder dig om at sende en fil"
@@ -6798,95 +7145,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2125 src/protocols/toc/toc.c:2127
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolmodul"
 
-#: src/protocols/toc/toc.c:2144
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "TOC Vrt"
 
-#: src/protocols/toc/toc.c:2148
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "TOC Port"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:295
+#: src/protocols/trepia/trepia.c:254
 msgid "Basic Profile"
 msgstr "Basis profil"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:285
 msgid "E-Mail Address"
 msgstr "E-post adresse"
 
-#: src/protocols/trepia/trepia.c:332
+#: src/protocols/trepia/trepia.c:291
 msgid "Profile Information"
 msgstr "Profil information"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:338
+#: src/protocols/trepia/trepia.c:297
 msgid "Instant Messagers"
 msgstr "Beskedprotokoller"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:342
+#: src/protocols/trepia/trepia.c:301
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:346
+#: src/protocols/trepia/trepia.c:305
 msgid "ICQ UIN"
 msgstr "ICQ UIN"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:350
+#: src/protocols/trepia/trepia.c:309
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:354
+#: src/protocols/trepia/trepia.c:313
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:359
+#: src/protocols/trepia/trepia.c:318
 msgid "I'm From"
 msgstr "Jeg er fra"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:376
+#: src/protocols/trepia/trepia.c:335
 msgid "Set your Trepia profile data."
 msgstr "St dine Trepia profil data."
 
-#: src/protocols/trepia/trepia.c:500
+#: src/protocols/trepia/trepia.c:459
 msgid "Profile"
 msgstr "Profil"
 
-#: src/protocols/trepia/trepia.c:522
+#: src/protocols/trepia/trepia.c:481
 msgid "Set Profile"
 msgstr "St profil"
 
-#: src/protocols/trepia/trepia.c:558
+#: src/protocols/trepia/trepia.c:517
 msgid "Visit Homepage"
 msgstr "Besg hjemmeside"
 
-#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
+#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
 msgid "Local Users"
 msgstr "Lokale brugere"
 
-#: src/protocols/trepia/trepia.c:1003
+#: src/protocols/trepia/trepia.c:962
 msgid "Read error"
 msgstr "Lsefejl"
 
-#: src/protocols/trepia/trepia.c:1104
+#: src/protocols/trepia/trepia.c:1063
 msgid "Logging in"
 msgstr "Logger ind"
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "Kunne ikke oprette sokkel"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6897,22 +7240,22 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
+#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protokol modul"
 
-#: src/protocols/yahoo/yahoo.c:689
+#: src/protocols/yahoo/yahoo.c:696
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo! besked blev ikke sendt."
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:754
 #, fuzzy, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Brugeren %s har givet lov til din anmodning om at tilfje dem til din "
 "venneliste."
 
-#: src/protocols/yahoo/yahoo.c:749
+#: src/protocols/yahoo/yahoo.c:756
 #, fuzzy, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -6922,7 +7265,27 @@
 "flgende grund:\n"
 "%s"
 
-#: src/protocols/yahoo/yahoo.c:1041
+#: src/protocols/yahoo/yahoo.c:757
+#, fuzzy
+msgid "Add buddy rejected"
+msgstr "_Tilfj handling"
+
+#: src/protocols/yahoo/yahoo.c:1377
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be ableto successfully sign on "
+"to Yahoo.  Check %s for updates."
+msgstr ""
+"Denne Yahho server har anmodet om brug af en ukendt godkendelsesmetode. "
+"Denne version af Gaim vil hjst sandsynligt ikke kunne logge p Yahoo. "
+"Tjek %s for opdateringer."
+
+#: src/protocols/yahoo/yahoo.c:1380
+msgid "Failed Yahoo! Authentication"
+msgstr "Fejlede Yahoo! godkendelse"
+
+#: src/protocols/yahoo/yahoo.c:1453
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -6931,77 +7294,86 @@
 "Du har prvet at ignorere %s, men brugeren er p din venneliste. Hvis du "
 "klikker p \"Ja\" vil det fjerne og ignorere vennen."
 
-#: src/protocols/yahoo/yahoo.c:1044
+#: src/protocols/yahoo/yahoo.c:1456
 msgid "Ignore buddy?"
 msgstr "Ignorr ven?"
 
-#: src/protocols/yahoo/yahoo.c:1073
+#: src/protocols/yahoo/yahoo.c:1485
 msgid "Invalid username."
 msgstr "Ugyldigt brugernavn."
 
-#: src/protocols/yahoo/yahoo.c:1076
+#: src/protocols/yahoo/yahoo.c:1488
 msgid "Incorrect password."
 msgstr "Forkert adgangskode."
 
-#: src/protocols/yahoo/yahoo.c:1079
+#: src/protocols/yahoo/yahoo.c:1491
 msgid "Unknown error."
 msgstr "Ukendt fejl."
 
-#: src/protocols/yahoo/yahoo.c:1180
+#: src/protocols/yahoo/yahoo.c:1539
+#, c-format
+msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgstr "Kunne ikke tilfje ven %s til gruppe %s til serverlisten p konto %s."
+
+#: src/protocols/yahoo/yahoo.c:1541
+msgid "Could not add buddy to server list"
+msgstr "Kunne ikke tilfje ven til serverliste"
+
+#: src/protocols/yahoo/yahoo.c:1643
 msgid "Unable to read"
 msgstr "Kunne ikke lse"
 
-#: src/protocols/yahoo/yahoo.c:1281
+#: src/protocols/yahoo/yahoo.c:1744
 msgid "Connection problem"
 msgstr "Forbindelsesfejl"
 
-#: src/protocols/yahoo/yahoo.c:1355 src/protocols/yahoo/yahoo.c:1655
-#: src/protocols/yahoo/yahoo.c:1745
+#: src/protocols/yahoo/yahoo.c:1818 src/protocols/yahoo/yahoo.c:2116
+#: src/protocols/yahoo/yahoo.c:2214
 msgid "Not At Home"
 msgstr "Ikke hjemme"
 
-#: src/protocols/yahoo/yahoo.c:1357 src/protocols/yahoo/yahoo.c:1657
-#: src/protocols/yahoo/yahoo.c:1746
+#: src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/yahoo/yahoo.c:2215
 msgid "Not At Desk"
 msgstr "Ikke ved skrivebordet"
 
-#: src/protocols/yahoo/yahoo.c:1359 src/protocols/yahoo/yahoo.c:1659
-#: src/protocols/yahoo/yahoo.c:1747
+#: src/protocols/yahoo/yahoo.c:1822 src/protocols/yahoo/yahoo.c:2120
+#: src/protocols/yahoo/yahoo.c:2216
 msgid "Not In Office"
 msgstr "Ikke p kontoret"
 
-#: src/protocols/yahoo/yahoo.c:1363 src/protocols/yahoo/yahoo.c:1663
-#: src/protocols/yahoo/yahoo.c:1749
+#: src/protocols/yahoo/yahoo.c:1826 src/protocols/yahoo/yahoo.c:2124
+#: src/protocols/yahoo/yahoo.c:2218
 msgid "On Vacation"
 msgstr "P ferie"
 
-#: src/protocols/yahoo/yahoo.c:1367 src/protocols/yahoo/yahoo.c:1667
-#: src/protocols/yahoo/yahoo.c:1751
+#: src/protocols/yahoo/yahoo.c:1830 src/protocols/yahoo/yahoo.c:2128
+#: src/protocols/yahoo/yahoo.c:2220
 msgid "Stepped Out"
 msgstr "Trdt udenfor"
 
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/yahoo/yahoo.c:1465
+#: src/protocols/yahoo/yahoo.c:1894 src/protocols/yahoo/yahoo.c:1928
 msgid "Not on server list"
 msgstr "Ikke p server liste"
 
-#: src/protocols/yahoo/yahoo.c:1521
+#: src/protocols/yahoo/yahoo.c:1984
 msgid "Join in Chat"
 msgstr "Deltag i chat"
 
-#: src/protocols/yahoo/yahoo.c:1527
+#: src/protocols/yahoo/yahoo.c:1990
 #, fuzzy
 msgid "Initiate Conference"
 msgstr "bn chat"
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:2036
 msgid "Active which ID?"
 msgstr "Aktivr hvilket ID?"
 
-#: src/protocols/yahoo/yahoo.c:1584
+#: src/protocols/yahoo/yahoo.c:2047
 msgid "Activate ID"
 msgstr "Aktivr ID"
 
-#: src/protocols/yahoo/yahoo.c:1907
+#: src/protocols/yahoo/yahoo.c:2403
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7009,49 +7381,50 @@
 "<b>Desvrre, profiler der er markeret som indeholdende indhold der ikke er "
 "for brn, er ikke understttet.<b/><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:1909 src/protocols/yahoo/yahoo.c:1925
+#: src/protocols/yahoo/yahoo.c:2404 src/protocols/yahoo/yahoo.c:2421
+#, fuzzy
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
+"web browser<br>"
 msgstr ""
 "Vis du vil vise denne profil, skal du besge dette link i din webbrowser"
 
-#: src/protocols/yahoo/yahoo.c:1923
+#: src/protocols/yahoo/yahoo.c:2420
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 "<b>Desvrre, ikke-engelske profiler er ikke understttet.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:1957
+#: src/protocols/yahoo/yahoo.c:2462
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:1999 src/protocols/yahoo/yahoo.c:2001
-#: src/protocols/yahoo/yahoo.c:2003
+#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2526
+#: src/protocols/yahoo/yahoo.c:2530
 msgid "Hobbies"
 msgstr "Hobbyer"
 
-#: src/protocols/yahoo/yahoo.c:2005 src/protocols/yahoo/yahoo.c:2007
+#: src/protocols/yahoo/yahoo.c:2541 src/protocols/yahoo/yahoo.c:2545
 msgid "Latest News"
 msgstr "Seneste nyt"
 
-#: src/protocols/yahoo/yahoo.c:2016
+#: src/protocols/yahoo/yahoo.c:2563
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/yahoo/yahoo.c:2026
+#: src/protocols/yahoo/yahoo.c:2577
 msgid "Cool Link 1"
 msgstr "Sejt link 1"
 
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:2582
 msgid "Cool Link 2"
 msgstr "Sejt link 1"
 
-#: src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Cool Link 3"
 msgstr "Sejt link 3"
 
-#: src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/yahoo/yahoo.c:2591
 msgid "Member Since"
 msgstr "Medlem siden"
 
@@ -7065,22 +7438,22 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2170 src/protocols/yahoo/yahoo.c:2172
+#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2755
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolmodul"
 
-#: src/protocols/yahoo/yahoo.c:2189
+#: src/protocols/yahoo/yahoo.c:2772
 msgid "Pager host"
 msgstr "Bipper vrt"
 
-#: src/protocols/yahoo/yahoo.c:2194
+#: src/protocols/yahoo/yahoo.c:2777
 msgid "Pager port"
 msgstr "Bipper port"
 
 #: src/protocols/yahoo/yahoochat.c:191
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
+msgstr "%s sagde nej til din konference-invitiation til rum \"%s\" pga. \"%s\"."
 
 #: src/protocols/yahoo/yahoochat.c:193
 msgid "Invitation Rejected"
@@ -7102,34 +7475,34 @@
 msgid "Maybe they're not in a chat?"
 msgstr "Mske er de ikke i en chat?"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Bruger:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Skjult eller ikke logget ind"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>%s siden %s"
 
-#: src/protocols/zephyr/zephyr.c:575 src/protocols/zephyr/zephyr.c:576
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "Allerede logget ind med Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:601
+#: src/protocols/zephyr/zephyr.c:610
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7137,19 +7510,19 @@
 "Fordi Zephyr bruger dit systems brugernavn, kan du ikke have flere konti nr "
 "du er logget p som den samme bruger."
 
-#: src/protocols/zephyr/zephyr.c:854
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:894
+#: src/protocols/zephyr/zephyr.c:908
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:899
+#: src/protocols/zephyr/zephyr.c:913
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:904
+#: src/protocols/zephyr/zephyr.c:918
 msgid "Recipient:"
 msgstr "Modtager:"
 
@@ -7163,82 +7536,59 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1036 src/protocols/zephyr/zephyr.c:1038
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolmodul"
 
-#: src/proxy.c:1680
+#: src/proxy.c:1681
 msgid "Invalid proxy settings"
 msgstr "Ugyldige mellemvrts indstillinger"
 
-#: src/proxy.c:1680
+#: src/proxy.c:1681
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 "Enten vrtsnavnet eller porten der er angivet for din mellemvrt er ugyldig."
 
-#: src/prpl.c:295
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s har gjort %s til sin ven%s%s%s"
-
-#: src/prpl.c:307
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Vil du tilfje vedkommende til din venneliste?"
-
-#: src/prpl.c:310
-msgid "Gaim - Information"
-msgstr "Gaim - Information"
-
-#: src/prpl.c:313
-msgid "Add buddy to your list?"
-msgstr "Tilfj brugeren til din venneliste?"
-
 #. * Custom away message.
-#: src/prpl.h:186
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "Brugerdefineret"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:862
 msgid "Accept"
 msgstr "Acceptr"
 
-#: src/server.c:57
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Indtast din adgangskode"
 
-#: src/server.c:942
+#: src/server.c:949
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d besked)"
 msgstr[1] "(%d beskeder)"
 
-#: src/server.c:955
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "(1 besked)"
 
-#: src/server.c:1147 src/server.c:1157
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggede ind."
 
-#: src/server.c:1176 src/server.c:1184
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggede ud."
 
-#: src/server.c:1233
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7247,11 +7597,11 @@
 "%s er blevet advaret af %s.\n"
 "Dit nye advarselsniveau er %d%%"
 
-#: src/server.c:1236
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "en anonym person"
 
-#: src/server.c:1331
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7260,23 +7610,15 @@
 "Bruger '%s' inviterer %s til venneliste chat rum: '%s'\n"
 "%s"
 
-#: src/server.c:1335
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Brugeren '%s' inviterer %s til venne-chat rummet: '%s'\n"
 
-#: src/server.c:1341
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "Accepter chat invitation?"
 
-#: src/server.c:1530
-msgid "Gaim - Popup"
-msgstr "Gaim - Pop op"
-
-#: src/server.c:1557
-msgid "More Info"
-msgstr "Flere oplysninger"
-
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
@@ -7292,38 +7634,40 @@
 msgid "_Open Mail"
 msgstr "bn post"
 
-#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+#: src/util.c:1527
+msgid "Calculating..."
+msgstr "Udregner..."
+
+#: src/util.c:1530
+msgid "Unknown."
+msgstr "Ukendt."
+
+#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dage"
 
-#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutter"
 
-#: src/util.c:934
-msgid "Calculating..."
-msgstr "Udregner..."
-
-#: src/util.c:937
-msgid "Unknown."
-msgstr "Ukendt."
-
-#~ msgid ""
-#~ "Gaim is converting your old buddy lists to a new format, which will now "
-#~ "be located at %s"
-#~ msgstr ""
-#~ "Gaim konverterer din gamle venneliste til et nyt format, som nu vil vre "
-#~ "placeret i %s"
-
-#~ msgid "Converting Buddy List"
-#~ msgstr "Konverterer venneliste"
+#: src/util.c:1917
+msgid "g003: Error opening connection.\n"
+msgstr "g003: Fejl ved oprettelse af forbindelse\n"
+
+#: src/win32/win32dep.c:474
+msgid "Notification"
+msgstr "Pmindelse"
+
+#: src/win32/win32dep.c:475
+msgid "Moving Gaim user settings directory to:"
+msgstr "Flytter Gaim brugerindstillings-mappen til:"
--- a/po/sv.po	Tue Oct 07 14:53:30 2003 +0000
+++ b/po/sv.po	Tue Oct 07 15:50:29 2003 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-09-03 00:09+0200\n"
-"PO-Revision-Date: 2003-09-02 00:20+0200\n"
+"POT-Creation-Date: 2003-09-30 19:51+0200\n"
+"PO-Revision-Date: 2003-10-02 23:50+0200\n"
 "Last-Translator: Tore Lundqvist <tlt@mima.x.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -66,13 +66,13 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Frånvarande"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:441 src/gtkaccount.c:1612
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:472 src/gtkaccount.c:1667
 msgid "Auto-login"
 msgstr "Logga in automatiskt"
 
 #: plugins/docklet/docklet.c:117
-msgid "New Message.."
-msgstr "Nytt meddelande"
+msgid "New Message..."
+msgstr "Nytt meddelande..."
 
 #: plugins/docklet/docklet.c:118
 msgid "Join A Chat..."
@@ -82,17 +82,17 @@
 msgid "New..."
 msgstr "Ny"
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1607 src/gtkpounce.c:461
-#: src/gtkprefs.c:1507 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3439
-#: src/protocols/jabber/jabber.c:3493 src/protocols/oscar/oscar.c:2840
-#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:5483
-#: src/protocols/oscar/oscar.c:5875
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1900 src/gtkpounce.c:461
+#: src/gtkprefs.c:1468 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:562 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4524 src/protocols/oscar/oscar.c:5458
+#: src/protocols/oscar/oscar.c:6059
 msgid "Away"
 msgstr "Frånvarande"
 
 # src/menus.c:327
-#: plugins/docklet/docklet.c:159 src/away.c:513
+#: plugins/docklet/docklet.c:159 src/away.c:515
 msgid "Back"
 msgstr "Tillbaka"
 
@@ -105,11 +105,11 @@
 msgstr "Filöverföringar"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1765 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1825 src/main.c:315
 msgid "Accounts"
 msgstr "Konton"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2361 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2335 src/main.c:325
 msgid "Preferences"
 msgstr "Inställningar"
 
@@ -121,11 +121,11 @@
 msgid "Quit"
 msgstr "Avsluta"
 
-#: plugins/docklet/docklet.c:482
+#: plugins/docklet/docklet.c:478
 msgid "Tray Icon Configuration"
 msgstr "konfiguration av panelikon"
 
-#: plugins/docklet/docklet.c:486
+#: plugins/docklet/docklet.c:482
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Göm nya meddelanden tills man klickar på panelikonen"
 
@@ -136,19 +136,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:506
 msgid "System Tray Icon"
 msgstr "Systempanelikon"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:513
+#: plugins/docklet/docklet.c:509
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Visa en Gaim-ikon i systempanelen."
 
 #. *  description
-#: plugins/docklet/docklet.c:515
+#: plugins/docklet/docklet.c:511
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -270,7 +270,7 @@
 #. "Visual gesture display" checkbox
 #: plugins/gestures/gestures.c:244
 msgid "_Visual gesture display"
-msgstr ""
+msgstr "_Visuell gestvisning"
 
 #. *< api_version
 #. *< type
@@ -281,14 +281,14 @@
 #. *< id
 #: plugins/gestures/gestures.c:271
 msgid "Mouse Gestures"
-msgstr ""
+msgstr "Musgester"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/gestures/gestures.c:274
 msgid "Provides support for mouse gestures"
-msgstr ""
+msgstr "Ger stöd för musgester"
 
 #. *  description
 #: plugins/gestures/gestures.c:276
@@ -300,6 +300,12 @@
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
+"Ger stöd för musgester i konversationsfönster.\n"
+"Dra musen med mittersta knappen nedtryckt för att ge olika kommandon.:\n"
+"\n"
+"Dra ner och sedan till höger för att stänga konversationen.\n"
+"Dra upp och sedan till vänster för att byta till föregående konversation.\n"
+"Dra upp och sedan till höger för att byta till nästa konversation."
 
 #: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
@@ -330,15 +336,15 @@
 msgid "Change"
 msgstr "Ändra"
 
-#: plugins/history.c:90
+#: plugins/history.c:98
 msgid "History"
 msgstr "Historik"
 
-#: plugins/history.c:92
+#: plugins/history.c:100
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Visa de nyligen loggade konversationerna i en ny konversation."
 
-#: plugins/history.c:93
+#: plugins/history.c:101
 msgid ""
 "When a new conversation is opened this plugin will insert the last XXX of "
 "the last conversation into the current conversation."
@@ -395,6 +401,54 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Tillåter dig att manuellt ställa hur länge du varit inaktiv"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ipc-test-client.c:84
+msgid "IPC Test Client"
+msgstr "IPC-testklient"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ipc-test-client.c:87
+msgid "Test plugin IPC support, as a client."
+msgstr ""
+
+#. *  description
+#: plugins/ipc-test-client.c:89
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ipc-test-server.c:71
+msgid "IPC Test Server"
+msgstr "IPC-testserver"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ipc-test-server.c:74
+msgid "Test plugin IPC support, as a server."
+msgstr ""
+
+#. *  description
+#: plugins/ipc-test-server.c:76
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+
 #: plugins/mailchk.c:156
 msgid "Mail Checker"
 msgstr "Kolla e-post"
@@ -404,60 +458,71 @@
 msgstr "Kolla efter ny lokal e-post."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:707
+#: plugins/notify.c:572
 msgid "Notify For"
 msgstr "Notifiera vid"
 
-#: plugins/notify.c:711
+#: plugins/notify.c:576
 msgid "_IM windows"
 msgstr "Snabbmeddelandefönster"
 
-#: plugins/notify.c:716
-msgid "_Chat windows"
+#: plugins/notify.c:583
+msgid "C_hat windows"
 msgstr "_Chattfönster"
 
+#: plugins/notify.c:590
+msgid "_Focused windows"
+msgstr "_Fokuserat fönster"
+
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:722
+#: plugins/notify.c:598
 msgid "Notification Methods"
 msgstr "Notifieringsmetod"
 
-#: plugins/notify.c:728
+#: plugins/notify.c:605
 msgid "Prepend _string into window title:"
-msgstr ""
-
-#: plugins/notify.c:739
-msgid "_Quote window title"
-msgstr "_Citera fönstertittel"
-
-#: plugins/notify.c:744
-msgid "Set Window Manager \"_URGENT\" Hint"
-msgstr "Ställ in fönsterhanterare \"_URGENT\" ledtråd"
-
-#: plugins/notify.c:749
+msgstr "Lägg till _sträng till fönstertittel:"
+
+#. Count method button
+#: plugins/notify.c:624
 msgid "Insert c_ount of new messages into window title"
 msgstr "Lägg till en _räknare för nya meddelanden i fönstrens tittel"
 
-#: plugins/notify.c:754
-msgid "_Notify even if conversation is in focus"
-msgstr "_Notifiera även om konversationen är i fokus"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:760
+#. Urgent method button
+#: plugins/notify.c:633
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Ställ in fönsterhanterare \"_URGENT\" ledtråd"
+
+#. ---------- "Notification Removals" ----------
+#: plugins/notify.c:640
 msgid "Notification Removal"
 msgstr "Ta bort notifiering"
 
-#: plugins/notify.c:764
-msgid "Remove when conversation window gains _focus"
+#. Remove on focus button
+#: plugins/notify.c:646
+msgid "Remove when conversation window _gains focus"
 msgstr "Ta bort när konversationsfönstret får _fokus"
 
-#: plugins/notify.c:769
+#. Remove on click button
+#: plugins/notify.c:654
 msgid "Remove when conversation window _receives click"
 msgstr "Ta bort när konversationsfönstret blir _klickat"
 
-#: plugins/notify.c:774
+#. Remove on type button
+#: plugins/notify.c:662
 msgid "Remove when _typing in conversation window"
 msgstr "Ta bort när man _skriver i konversationsfönstret"
 
+#. Remove on message send button
+#: plugins/notify.c:670
+msgid "Remove when a _message gets sent"
+msgstr "Ta bort när ett _meddelande skickas"
+
+#. Remove on conversation switch button
+#: plugins/notify.c:679
+msgid "Remove on conversation ta_b switch"
+msgstr "Ta bort vid flikbyte av konversationsfönster"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -465,14 +530,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:858
+#: plugins/notify.c:762
 msgid "Message Notification"
 msgstr "Meddelandenotifiering"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:861 plugins/notify.c:863
+#: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ger flera olika möjligheter att notifiera dig om olästa meddelanden."
 
@@ -493,15 +558,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Ger möjlighet att ladda perl-insticksmoduler"
 
-#: plugins/raw.c:151
+#: plugins/raw.c:154
 msgid "Raw"
 msgstr "Rå"
 
-#: plugins/raw.c:153
+#: plugins/raw.c:156
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Ger dig möjlighet att sända rå indata till textbaserade protokoll."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:157
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -535,49 +600,103 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:30
+#: plugins/simple.c:31
 msgid "Simple Plugin"
 msgstr "Enken insticksmodul"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/simple.c:33 plugins/simple.c:35
+#: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "Testa för att se att det mästa fungerar."
 
-#: plugins/spellchk.c:402
+#: plugins/spellchk.c:412
 msgid "Text Replacements"
 msgstr "Textersättningar"
 
-#: plugins/spellchk.c:426
+#: plugins/spellchk.c:436
 msgid "You type"
 msgstr "Du skriver"
 
-#: plugins/spellchk.c:438
+#: plugins/spellchk.c:448
 msgid "You send"
 msgstr "du skickar"
 
-#: plugins/spellchk.c:464
+#: plugins/spellchk.c:474
 msgid "Add a new text replacement"
 msgstr "Lägg till ny textersättning"
 
-#: plugins/spellchk.c:471
+#: plugins/spellchk.c:481
 msgid "You _type:"
 msgstr "Du _skriver:"
 
-#: plugins/spellchk.c:485
+#: plugins/spellchk.c:495
 msgid "You _send:"
 msgstr "Du _skickar:"
 
-#: plugins/spellchk.c:525
+#: plugins/spellchk.c:535
 msgid "Text replacement"
 msgstr "Textersättning"
 
-#: plugins/spellchk.c:527 plugins/spellchk.c:528
+#: plugins/spellchk.c:537 plugins/spellchk.c:538
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Ersätter text i åtgående meddelanden enligt dina regler. "
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:190
+msgid "GNUTLS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:286
+msgid "NSS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-nss.c:289 plugins/ssl/ssl-nss.c:291
+msgid "Provides SSL support through Mozilla NSS."
+msgstr ""
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:91
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
@@ -620,6 +739,14 @@
 "Notifierar i ett konversationsfönster när en kompis blir frånvarande/inaktiv "
 "eller kommer tillbaka."
 
+#: plugins/tcl/tcl.c:344
+msgid "Tcl Plugin Loader"
+msgstr "Tcl-insticksmodulladdare"
+
+#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+msgid "Provides support for loading Tcl plugins"
+msgstr "Ger möjlighet att ladda Tcl-insticksmoduler"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -627,14 +754,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
 msgid "Buddy Ticker"
 msgstr "Kompistickare"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "En horisontellt rullande version av kompislistan."
 
@@ -688,7 +815,7 @@
 msgstr "_Visa \"slider bar\" i snabbmeddelandefönster"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:848
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
 msgid "Buddy List Window"
 msgstr "Kompislistefönster"
 
@@ -733,11 +860,11 @@
 
 #: plugins/win32/winprefs/winprefs.c:357
 msgid "_Start Gaim on Windows startup"
-msgstr "_Starta Gain när Windows startar"
+msgstr "_Starta Gaim när Windows startar"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1448
-#: src/gtkprefs.c:2294
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1740
+#: src/gtkprefs.c:2268
 msgid "Buddy List"
 msgstr "Kompislista"
 
@@ -756,8 +883,8 @@
 msgstr "_Håll kompislistefönstret överst"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:897
-#: src/gtkprefs.c:2295
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
+#: src/gtkprefs.c:2269
 msgid "Conversations"
 msgstr "Konversationer"
 
@@ -812,195 +939,197 @@
 msgid "win32 port"
 msgstr "win32-portering"
 
-#: src/about.c:114 src/about.c:115
+#: src/about.c:114 src/about.c:115 src/about.c:116
 msgid "developer"
 msgstr "utvecklare"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "support"
 msgstr "support"
 
-#: src/about.c:123
+#: src/about.c:124
 msgid "Crazy Patch Writers"
 msgstr "Programerare av galna patchar"
 
-#: src/about.c:135
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "Före detta utvecklare"
 
-#: src/about.c:136
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "Före detta libfaim-maintainer "
 
-#: src/about.c:137
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "Före detta utvecklingsledare"
 
-#: src/about.c:140
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "Före detta maintainer"
 
-#: src/about.c:141
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "Före detta Jabber-utvecklare"
 
-#: src/about.c:142
+#: src/about.c:151
 msgid "original author"
 msgstr "Orginalupphovsman"
 
-#: src/about.c:145
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker och fyllechaffis [lazy bum]"
 
-#: src/about.c:153
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "Nuvarande översättare"
 
-#: src/about.c:154 src/about.c:180
+#: src/about.c:163 src/about.c:192
 msgid "Catalan"
 msgstr "Katalanska"
 
-#: src/about.c:155 src/about.c:181
+#: src/about.c:164 src/about.c:193
 msgid "Czech"
 msgstr ""
 
-#: src/about.c:156
+#: src/about.c:165
 msgid "Danish"
 msgstr "Danska"
 
-#: src/about.c:157 src/about.c:182
+#: src/about.c:166 src/about.c:194
 msgid "German"
 msgstr "Tyska"
 
-#: src/about.c:158 src/about.c:183
+#: src/about.c:167 src/about.c:195
 msgid "Spanish"
 msgstr "Spanska"
 
-#: src/about.c:159 src/about.c:184
+#: src/about.c:168 src/about.c:196
 msgid "French"
 msgstr "Franska"
 
-#: src/about.c:160
+#: src/about.c:169
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:161
+#: src/about.c:170
 msgid "Hungarian"
 msgstr "Ungerska"
 
-#: src/about.c:162 src/about.c:186
+#: src/about.c:171 src/about.c:198
 msgid "Italian"
 msgstr "Italienska"
 
-#: src/about.c:163 src/about.c:188
+#: src/about.c:172 src/about.c:200
 msgid "Korean"
 msgstr "Koreanska"
 
-#: src/about.c:164
+#: src/about.c:173
 msgid "Dutch; Flemish"
 msgstr "Holländska, flamländska"
 
-#: src/about.c:165
+#: src/about.c:174 src/about.c:202
+msgid "Polish"
+msgstr "Polska"
+
+#: src/about.c:175
 msgid "Portuguese-Brazil"
 msgstr "Portugisiska (brasiliansk)"
 
-#: src/about.c:166
+#: src/about.c:176
+msgid "Portuguese-Portugal"
+msgstr "Portugisiska-Portugal"
+
+#: src/about.c:177
 msgid "Romanian"
 msgstr "Rumänska"
 
-#: src/about.c:167
-msgid "Serbian"
-msgstr "Serbiska"
-
-#: src/about.c:168 src/about.c:193
-msgid "Swedish"
-msgstr "Svenska"
-
-#: src/about.c:169
-msgid "Simplified Chinese"
-msgstr "Förenklad kinesiska"
-
-#: src/about.c:170
-msgid "Traditional Chinese"
-msgstr "Traditionell kinesiska"
-
-#: src/about.c:177
-msgid "Past Translators"
-msgstr "Före detta översättare"
-
-#: src/about.c:178
-msgid "Amharic"
-msgstr ""
-
-#: src/about.c:179
-msgid "Bulgarian"
-msgstr "Bulgariska"
-
-#: src/about.c:185
-msgid "Hebrew"
-msgstr "Hebreiska"
-
-#: src/about.c:187
-msgid "Japanese"
-msgstr "Japanska"
-
-#: src/about.c:189
-msgid "Norwegian"
-msgstr "Norska"
-
-#: src/about.c:190
-msgid "Polish"
-msgstr "Polska"
-
-#: src/about.c:191
+#: src/about.c:178 src/about.c:203
 msgid "Russian"
 msgstr "Ryska"
 
-#: src/about.c:192
+#: src/about.c:179
+msgid "Serbian"
+msgstr "Serbiska"
+
+#: src/about.c:180 src/about.c:205
+msgid "Swedish"
+msgstr "Svenska"
+
+#: src/about.c:181
+msgid "Simplified Chinese"
+msgstr "Förenklad kinesiska"
+
+#: src/about.c:182
+msgid "Traditional Chinese"
+msgstr "Traditionell kinesiska"
+
+#: src/about.c:189
+msgid "Past Translators"
+msgstr "Före detta översättare"
+
+#: src/about.c:190
+msgid "Amharic"
+msgstr ""
+
+#: src/about.c:191
+msgid "Bulgarian"
+msgstr "Bulgariska"
+
+#: src/about.c:197
+msgid "Hebrew"
+msgstr "Hebreiska"
+
+#: src/about.c:199
+msgid "Japanese"
+msgstr "Japanska"
+
+#: src/about.c:201
+msgid "Norwegian"
+msgstr "Norska"
+
+#: src/about.c:204
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: src/about.c:194
+#: src/about.c:206
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: src/about.c:207 src/dialogs.c:3455 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:238 src/server.c:1544
+#: src/about.c:219 src/dialogs.c:2703 src/gtkrequest.c:197
+#: src/protocols/msn/msn.c:240
 msgid "Close"
 msgstr "Stäng"
 
-#: src/away.c:207
+#: src/away.c:208
 msgid "Gaim - Away!"
 msgstr "Gaim - Frånvarande!"
 
-#: src/away.c:268
+#: src/away.c:269
 msgid "I'm Back!"
 msgstr "Jag är tillbaka!"
 
-#: src/away.c:366
+#: src/away.c:368
 msgid "New Away Message"
 msgstr "Nytt meddelande"
 
-#: src/away.c:386
+#: src/away.c:388
 msgid "Remove Away Message"
 msgstr "Ta bort meddelande"
 
-#: src/away.c:581
+#: src/away.c:583
 msgid "Set All Away"
 msgstr "Meddelande för alla"
 
-#: src/blist.c:440 src/gtkprefs.c:2297
+#: src/blist.c:547 src/gtkprefs.c:2271
 msgid "Chats"
 msgstr "Chattar"
 
-#. Should never happen.
-#: src/blist.c:515 src/dialogs.c:827 src/protocols/jabber/jabber.c:1833
-#: src/protocols/msn/notification.c:87 src/protocols/msn/notification.c:88
-#: src/protocols/msn/notification.c:641
+#: src/blist.c:642 src/blist.c:814 src/gtkblist.c:2516
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
 msgid "Buddies"
 msgstr "Kompisar"
 
-#: src/blist.c:764
+#: src/blist.c:1100
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1015,44 +1144,30 @@
 "%d kompisar från gruppen %s togs inte bort eftersom deras konton inte var "
 "inloggade. Den här kompisarna och gruppen togs inte bort.\n"
 
-#: src/blist.c:773
+#: src/blist.c:1109
 msgid "Group not removed"
 msgstr "Gruppen togs inte bort"
 
-#: src/blist.c:811 src/gtkaccount.c:140 src/gtkpounce.c:307 src/gtkutils.c:843
-#: src/protocols/jabber/jabber.c:1171
+#: src/blist.c:1160 src/gtkaccount.c:149 src/gtkpounce.c:307
+#: src/gtkutils.c:838 src/protocols/jabber/auth.c:93
+#: src/protocols/jabber/buddy.c:545
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/blist.c:1037
+#: src/blist.c:1481
 msgid "Invalid Groupname"
 msgstr "Ogiltigt gruppnamn"
 
-#: src/blist.c:1794
+#: src/blist.c:2261
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "Ett fel upptäcktes när din kompislista lästes in, den har inte laddats."
 
-#: src/blist.c:1796
+#: src/blist.c:2263
 msgid "Buddy List Error"
 msgstr "Kompislistefel"
 
-#. rob wants to inform the user that their buddy lists are
-#. * being converted
-#: src/blist.c:1805
-#, c-format
-msgid ""
-"Gaim is converting your old buddy lists to a new format, which will now be "
-"located at %s"
-msgstr ""
-"Gaim konverterar din gamla kompislista till ett nytt format, som nu kommer "
-"finns i %s"
-
-#: src/blist.c:1808
-msgid "Converting Buddy List"
-msgstr "Konverterar kompislista"
-
 #: src/browser.c:407 src/browser.c:435
 msgid ""
 "Communication with the browser failed. Please close all windows and try "
@@ -1061,20 +1176,26 @@
 "Kommunikationen med webbläsaren misslyckades, stäng alla fönster och försök "
 "igen."
 
+#: src/browser.c:570 src/browser.c:590 src/browser.c:598
+msgid "Unable to open URL"
+msgstr "Kan inte öppna URL"
+
 #: src/browser.c:571
 msgid ""
-"Unable to launch your browser because the 'Manual' browser command has been "
-"chosen, but no command has been set."
-msgstr ""
-"Kunde inte starta din webbläsare eftersom manuellt webbläsarkommando valts, "
-"men inget kommando angivits."
-
-#: src/browser.c:591
-#, c-format
-msgid "There was an error launching your chosen browser: %s"
-msgstr "Det blev ett fel när den webbläsare du valt (%s) skulle startas."
-
-#: src/buddy_chat.c:316 src/dialogs.c:1273
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Manuellt webbläsarkommando har valts, men inget kommando angivits."
+
+#: src/browser.c:588
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr ""
+
+#: src/browser.c:595
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "Fel vid körning av \"kommando\": %s"
+
+#: src/buddy_chat.c:316 src/gtkblist.c:2919
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1100,22 +1221,22 @@
 msgstr "Anslut"
 
 #. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:453
-#: src/dialogs.c:465 src/dialogs.c:478 src/dialogs.c:865 src/dialogs.c:1557
-#: src/dialogs.c:1672 src/dialogs.c:1738 src/dialogs.c:1991 src/dialogs.c:2140
-#: src/dialogs.c:2812 src/dialogs.c:2979 src/dialogs.c:3021 src/dialogs.c:3158
-#: src/dialogs.c:3502 src/gtkaccount.c:1501 src/gtkconn.c:147
-#: src/gtkprivacy.c:568 src/gtkprivacy.c:581 src/gtkprivacy.c:606
-#: src/gtkprivacy.c:617 src/gtkrequest.c:189 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/jabber.c:4108 src/protocols/msn/msn.c:173
-#: src/protocols/msn/msn.c:184 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:219
-#: 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:5753 src/protocols/oscar/oscar.c:5968
-#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6077
-#: src/protocols/trepia/trepia.c:379 src/protocols/yahoo/yahoo.c:1184
-#: src/prpl.c:314 src/request.h:813 src/request.h:823
+#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:466
+#: src/dialogs.c:478 src/dialogs.c:491 src/dialogs.c:512 src/dialogs.c:1008
+#: src/dialogs.c:1080 src/dialogs.c:1233 src/dialogs.c:1382 src/dialogs.c:2059
+#: src/dialogs.c:2226 src/dialogs.c:2269 src/dialogs.c:2406 src/dialogs.c:2750
+#: src/gtkaccount.c:1556 src/gtkaccount.c:1988 src/gtkblist.c:3026
+#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:195
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:499
+#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
+#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
+#: src/protocols/msn/msn.c:221 src/protocols/oscar/oscar.c:2416
+#: src/protocols/oscar/oscar.c:2453 src/protocols/oscar/oscar.c:2488
+#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:5937
+#: src/protocols/oscar/oscar.c:6152 src/protocols/oscar/oscar.c:6201
+#: src/protocols/oscar/oscar.c:6265 src/protocols/trepia/trepia.c:379
+#: src/protocols/yahoo/yahoo.c:2060 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1138,86 +1259,85 @@
 msgstr "Ange lösenord för %s"
 
 #. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1668 src/dialogs.c:1807
-#: src/dialogs.c:1990 src/dialogs.c:2136 src/dialogs.c:2978 src/dialogs.c:3020
-#: src/dialogs.c:3151 src/dialogs.c:3501 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:172 src/protocols/msn/msn.c:183
-#: src/protocols/msn/msn.c:194 src/protocols/msn/msn.c:205
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:5967 src/protocols/oscar/oscar.c:6016
-#: src/protocols/oscar/oscar.c:6076 src/protocols/yahoo/yahoo.c:1183
-#: src/request.h:813
+#: src/connection.c:193 src/dialogs.c:1232 src/dialogs.c:1378
+#: src/dialogs.c:2225 src/dialogs.c:2268 src/dialogs.c:2399 src/dialogs.c:2749
+#: src/gtkrequest.c:194 src/protocols/msn/msn.c:174
+#: src/protocols/msn/msn.c:185 src/protocols/msn/msn.c:196
+#: src/protocols/msn/msn.c:207 src/protocols/oscar/oscar.c:2452
+#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:6151
+#: src/protocols/oscar/oscar.c:6200 src/protocols/oscar/oscar.c:6264
+#: src/protocols/yahoo/yahoo.c:2059 src/request.h:852
 msgid "OK"
 msgstr "OK"
 
-#: src/conversation.c:424
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "Kan inte skicka meddelandet, det är för stort."
 
-#: src/conversation.c:432
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "Kan inte skicka meddelandet."
 
-#: src/conversation.c:1955
+#: src/conversation.c:1887
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom in i rummet."
 
-#: src/conversation.c:1958
+#: src/conversation.c:1890
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] kom in i rummet. "
 
-#: src/conversation.c:2043
+#: src/conversation.c:1975
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: src/conversation.c:2085
+#: src/conversation.c:2017
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s lämnade rummet (%s)."
 
-#: src/conversation.c:2087
+#: src/conversation.c:2019
 #, c-format
 msgid "%s left the room."
 msgstr "%s lämnade rummet."
 
-#: src/conversation.c:2160
+#: src/conversation.c:2092
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d fler)"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2094
 #, c-format
 msgid " left the room (%s)."
 msgstr " lämnade rummet (%s)."
 
-#: src/conversation.c:2444
+#: src/conversation.c:2376
 msgid "Last created window"
 msgstr "Senast skapade fönster"
 
-#: src/conversation.c:2446
+#: src/conversation.c:2378
 msgid "New window"
 msgstr "Nytt fönster"
 
-#: src/conversation.c:2448
+#: src/conversation.c:2380
 msgid "By group"
 msgstr "Grupp"
 
-#: src/conversation.c:2450
+#: src/conversation.c:2382
 msgid "By account"
 msgstr "Konto"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr "Varna användaren"
 
-#: src/dialogs.c:338
+#: src/dialogs.c:317
 msgid "_Warn"
 msgstr "_Varna"
 
-#: src/dialogs.c:354
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1230,25 +1350,25 @@
 "Detta kommer att öka %ss varningsnivå och hon/han kommer få en hårdare "
 "bandbreddsbegränsning.\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr "Varna _anonymt?"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyma varningar är mindre allvarliga.</b>"
 
-#: src/dialogs.c:449
+#: src/dialogs.c:462
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Du håller på att ta bort %s från din kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:451 src/dialogs.c:452
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr "Ta bort kompis"
 
-#: src/dialogs.c:461
+#: src/dialogs.c:474
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1256,11 +1376,11 @@
 msgstr ""
 "Du håller på att ta bort chatten %s från din kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:463 src/dialogs.c:464
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Chat"
 msgstr "Ta bort chatt"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:486
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1269,249 +1389,157 @@
 "Du håller på att ta bort gruppen %s och alla dess medlemmar från din "
 "kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:476 src/dialogs.c:477
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: src/dialogs.c:624
+#: src/dialogs.c:507
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr ""
+"Du håller på att ta bort kontakten som innehåller %s och %d andra kompisar "
+"från din kompislista. Vill du fortsätta?"
+
+#: src/dialogs.c:510 src/dialogs.c:511
+msgid "Remove Contact"
+msgstr "Ta bort kontakt"
+
+#: src/dialogs.c:659
 msgid "New Message"
 msgstr "Nytt meddelande"
 
-#: src/dialogs.c:642
+#: src/dialogs.c:677
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Ange användar-ID på den person du vill skicka snabbmeddelande till.\n"
 
-#: src/dialogs.c:658 src/dialogs.c:735
+#: src/dialogs.c:693 src/dialogs.c:770
 msgid "_Screenname:"
 msgstr "_Användar-ID:"
 
-#: src/dialogs.c:673 src/dialogs.c:751 src/gtkpounce.c:408
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr "Hämta användarinformation"
 
-#: src/dialogs.c:723
+#: src/dialogs.c:758
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "Ange användar-ID på den person som du vill ha information om.\n"
 
-#: src/dialogs.c:861
-msgid "Add Group"
-msgstr "Lägg till grupp"
-
-#: src/dialogs.c:861
-msgid "Add a new group"
-msgstr "Lägg till en ny grupp"
-
-#: src/dialogs.c:862
-msgid "Please enter the name of the group to be added."
-msgstr "Ange namnet på den grupp du vill lägga till."
-
-#: src/dialogs.c:864 src/gtkconv.c:1114 src/gtkconv.c:2951 src/gtkconv.c:4120
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2688 src/prpl.c:313
-msgid "Add"
-msgstr "Lägg till"
+#: src/dialogs.c:872
+msgid "Set Directory Info"
+msgstr "Ställ in kataloginformation"
+
+#: src/dialogs.c:880
+msgid "Directory Info"
+msgstr "Kataloginformation"
 
 #: src/dialogs.c:890
-msgid "Add Buddy"
-msgstr "Lägg till kompis"
-
-#: src/dialogs.c:909
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Ange användar-ID på den kompis du vill lägga till i din kompislista. Du kan "
-"alternativt ange ett alias eller ett nick. Alias kommer att visas i ställer "
-"för användar-ID när det är möjligt.\n"
-
-#: src/dialogs.c:928 src/gtkaccount.c:1578
-msgid "Screen Name"
-msgstr "Användar-ID"
-
-#: src/dialogs.c:941
-msgid "Alias"
-msgstr "Alias"
-
-#: src/dialogs.c:951
-msgid "Group"
-msgstr "Grupp"
-
-#. Set up stuff for the account box
-#: src/dialogs.c:960
-msgid "Add To"
-msgstr "Lägg till i"
-
-#: src/dialogs.c:1280
-msgid "Add Chat"
-msgstr "Lägg till chatt"
-
-#: src/dialogs.c:1303
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Ange ett alias och information om chatten som du villtill din kompislista.\n"
-
-#: src/dialogs.c:1312
-msgid "Account:"
-msgstr "Konto:"
-
-#: src/dialogs.c:1331 src/gtkaccount.c:428
-msgid "Alias:"
-msgstr "Alias:"
-
-#: src/dialogs.c:1342
-msgid "Group:"
-msgstr "Grupp:"
-
-#: src/dialogs.c:1421
-msgid "Set Directory Info"
-msgstr "Ställ in kataloginformation"
-
-#: src/dialogs.c:1429
-msgid "Directory Info"
-msgstr "Kataloginformation"
-
-#: src/dialogs.c:1439
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "Ställer in kataloginformation för %s:"
 
-#: src/dialogs.c:1452
+#: src/dialogs.c:903
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillåt webbtjänster att hitta din information"
 
 #. Line 1
-#: src/dialogs.c:1455 src/dialogs.c:2009 src/protocols/oscar/oscar.c:3957
+#: src/dialogs.c:906 src/dialogs.c:1251 src/protocols/oscar/oscar.c:3892
 #: src/protocols/trepia/trepia.c:299
 msgid "First Name"
 msgstr "Förnamn"
 
 #. Line 2
-#: src/dialogs.c:1466 src/dialogs.c:2019
+#: src/dialogs.c:917 src/dialogs.c:1261 src/protocols/jabber/buddy.c:596
 msgid "Middle Name"
 msgstr "Andranamn"
 
 #. Line 3
-#: src/dialogs.c:1478 src/dialogs.c:2029 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3960 src/protocols/trepia/trepia.c:306
+#: src/dialogs.c:929 src/dialogs.c:1271 src/protocols/gg/gg.c:673
+#: src/protocols/oscar/oscar.c:3895 src/protocols/trepia/trepia.c:306
 msgid "Last Name"
 msgstr "Efternamn"
 
 #. Line 4
-#: src/dialogs.c:1489 src/dialogs.c:2039
+#: src/dialogs.c:940 src/dialogs.c:1281
 msgid "Maiden Name"
 msgstr "Flicknamn"
 
 #. Line 5
-#: src/dialogs.c:1500 src/dialogs.c:2049 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4006 src/protocols/oscar/oscar.c:4022
+#: src/dialogs.c:951 src/dialogs.c:1291 src/protocols/gg/gg.c:701
+#: src/protocols/oscar/oscar.c:3941 src/protocols/oscar/oscar.c:3957
 #: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
 msgid "City"
 msgstr "Ort"
 
 #. Line 6
-#: src/dialogs.c:1511 src/dialogs.c:2058 src/protocols/oscar/oscar.c:4009
-#: src/protocols/oscar/oscar.c:4025 src/protocols/trepia/trepia.c:367
+#: src/dialogs.c:962 src/dialogs.c:1300 src/protocols/oscar/oscar.c:3944
+#: src/protocols/oscar/oscar.c:3960 src/protocols/trepia/trepia.c:367
 #: src/protocols/trepia/trepia.c:471
 msgid "State"
 msgstr "Delstat"
 
 #. Line 7
-#: src/dialogs.c:1522 src/dialogs.c:2067 src/protocols/jabber/jabber.c:3637
-#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
+#: src/dialogs.c:973 src/dialogs.c:1309 src/protocols/jabber/buddy.c:242
+#: src/protocols/jabber/buddy.c:648 src/protocols/trepia/trepia.c:371
+#: src/protocols/trepia/trepia.c:480
 msgid "Country"
 msgstr "Land"
 
 # src/menus.c:280
-#: src/dialogs.c:1553 src/dialogs.c:1734 src/dialogs.c:2800 src/dialogs.c:3464
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4107
+#: src/dialogs.c:1004 src/dialogs.c:1076 src/dialogs.c:2047 src/dialogs.c:2712
+#: src/gtkrequest.c:201 src/protocols/jabber/buddy.c:498
 #: src/protocols/trepia/trepia.c:378
 msgid "Save"
 msgstr "Spara"
 
-#: src/dialogs.c:1576
-msgid "New passwords do not match."
-msgstr "De nya lösenorden stämmer inte överens."
-
-#: src/dialogs.c:1582
-msgid "Fill out all fields completely."
-msgstr "Fyll i alla fält helt."
-
-#: src/dialogs.c:1611 src/dialogs.c:1620 src/protocols/gg/gg.c:1194
-#: src/protocols/jabber/jabber.c:4326 src/protocols/oscar/oscar.c:6144
-#: src/protocols/toc/toc.c:1509
-msgid "Change Password"
-msgstr "Byt lösenord"
-
-#: src/dialogs.c:1627
-#, c-format
-msgid "Changing password for %s:"
-msgstr "Byter lösenord för %s:"
-
-#: src/dialogs.c:1635
-msgid "Original Password"
-msgstr "Gammalt lösenord"
-
-#: src/dialogs.c:1646
-msgid "New Password"
-msgstr "Nytt lösenord"
-
-#: src/dialogs.c:1657
-msgid "New Password (again)"
-msgstr "Nytt lösenord (igen)"
-
-#: src/dialogs.c:1697 src/protocols/jabber/jabber.c:4312
-#: src/protocols/oscar/oscar.c:6130 src/protocols/toc/toc.c:1497
+#: src/dialogs.c:1035 src/protocols/jabber/jabber.c:577
+#: src/protocols/oscar/oscar.c:6333 src/protocols/toc/toc.c:1535
 msgid "Set User Info"
 msgstr "Ställ in användarinformation"
 
-#: src/dialogs.c:1706
+#: src/dialogs.c:1044
 #, c-format
 msgid "Changing info for %s:"
 msgstr "Ändrar information om %s:"
 
-#: src/dialogs.c:1793
-msgid "Below are the results of your search: "
-msgstr "Nedan är resultaten från din sökning: "
-
-#: src/dialogs.c:1904
+#: src/dialogs.c:1146
 msgid "Log Conversation"
 msgstr "Logga konversation"
 
-#: src/dialogs.c:1985 src/dialogs.c:2118
+#: src/dialogs.c:1227 src/dialogs.c:1360
 msgid "Search for Buddy"
 msgstr "Sök efter kompis"
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:1327
 msgid "Find Buddy By Info"
 msgstr "Sök efter kompis på \"information\""
 
-#: src/dialogs.c:2112
+#: src/dialogs.c:1354
 msgid "Find Buddy By Email"
 msgstr "Sök efter kompis på e-post"
 
-#: src/dialogs.c:2125 src/protocols/jabber/jabber.c:3639
-#: src/protocols/yahoo/yahoo.c:1474
+#: src/dialogs.c:1367 src/protocols/jabber/buddy.c:244
+#: src/protocols/jabber/buddy.c:677 src/protocols/jabber/buddy.c:685
+#: src/protocols/yahoo/yahoo.c:2473
 msgid "Email"
 msgstr "E-post"
 
-#: src/dialogs.c:2216
+#: src/dialogs.c:1460
 msgid "Insert Link"
 msgstr "Infoga länk"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:1462
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:1484
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -1519,92 +1547,92 @@
 "Ange en URL för länken du vill infoga, om du vill kan du även ange en "
 "beskrivning av länken.\n"
 
-#: src/dialogs.c:2261 src/protocols/jabber/jabber.c:3631
+#: src/dialogs.c:1502 src/protocols/jabber/buddy.c:236
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2271 src/gtkprefs.c:604 src/gtkprefs.c:1843
-#: src/protocols/jabber/jabber.c:3645
+#: src/dialogs.c:1512 src/gtkprefs.c:600 src/gtkprefs.c:1807
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:716
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/dialogs.c:2406 src/dialogs.c:2423
+#: src/dialogs.c:1648 src/dialogs.c:1665
 msgid "Select Text Color"
 msgstr "Välj textfärg"
 
-#: src/dialogs.c:2458 src/dialogs.c:2475
+#: src/dialogs.c:1700 src/dialogs.c:1717
 msgid "Select Background Color"
 msgstr "Välj bakgrundsfärg"
 
-#: src/dialogs.c:2572 src/dialogs.c:2598
+#: src/dialogs.c:1814 src/dialogs.c:1840
 msgid "Select Font"
 msgstr "Välj typsnitt"
 
-#: src/dialogs.c:2664
+#: src/dialogs.c:1906
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan inte skapa ett frånvaromeddelande med en tom titel"
 
-#: src/dialogs.c:2666
+#: src/dialogs.c:1908
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Ange en titel på meddelandet eller välj \"Använd\" för att använda utan att "
 "spara."
 
-#: src/dialogs.c:2676
+#: src/dialogs.c:1918
 msgid "You cannot create an empty away message"
 msgstr "Kunde inte skapa ett tomt frånvaromeddelande"
 
-#: src/dialogs.c:2741 src/dialogs.c:2749
+#: src/dialogs.c:1983 src/dialogs.c:1991
 msgid "New away message"
 msgstr "Nytt frånvaromeddelande"
 
-#: src/dialogs.c:2759
+#: src/dialogs.c:2001
 msgid "Away title: "
 msgstr "Frånvarotitel: "
 
-#: src/dialogs.c:2804
+#: src/dialogs.c:2051
 msgid "Save & Use"
 msgstr "Spara och använd"
 
-#: src/dialogs.c:2808
+#: src/dialogs.c:2055
 msgid "Use"
 msgstr "Använd"
 
 #. show everything
-#: src/dialogs.c:2957
+#: src/dialogs.c:2204
 msgid "Smile!"
 msgstr "Le!"
 
-#: src/dialogs.c:2975
+#: src/dialogs.c:2222
 msgid "Alias Chat"
 msgstr "Aliaschatt"
 
-#: src/dialogs.c:2975
+#: src/dialogs.c:2222
 msgid "Alias chat"
 msgstr "Aliaschatt"
 
-#: src/dialogs.c:2976
+#: src/dialogs.c:2223
 msgid "Please enter an aliased name for this chat."
 msgstr "Ange ett aliasnamn för denna chatt."
 
-#: src/dialogs.c:3007
+#: src/dialogs.c:2254
 msgid "_Screenname"
 msgstr "_Användar-ID"
 
-#: src/dialogs.c:3011 src/gtkblist.c:432 src/gtkblist.c:479
+#: src/dialogs.c:2259 src/gtkblist.c:521 src/gtkblist.c:614
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/dialogs.c:3015
+#: src/dialogs.c:2263
 msgid "Alias Buddy"
 msgstr "Aliaskompis"
 
-#: src/dialogs.c:3016
+#: src/dialogs.c:2264
 msgid "Alias buddy"
 msgstr "Aliaskompis"
 
-#: src/dialogs.c:3017
+#: src/dialogs.c:2265
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
@@ -1612,63 +1640,63 @@
 "Ange ett alias för personen nedan eller byt namn på kontakten i din "
 "kompislista."
 
-#: src/dialogs.c:3053 src/dialogs.c:3060
+#: src/dialogs.c:2301 src/dialogs.c:2308
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Kunde inte skriva till %s."
 
-#: src/dialogs.c:3084
+#: src/dialogs.c:2332
 msgid "Save Log File"
 msgstr "Spara loggfil"
 
-#: src/dialogs.c:3114
+#: src/dialogs.c:2362
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Kunde inte ta bort filen %s."
 
-#: src/dialogs.c:3133
+#: src/dialogs.c:2381
 msgid "Clear Log"
 msgstr "Töm logg"
 
-#: src/dialogs.c:3142
+#: src/dialogs.c:2390
 msgid "Really clear log?"
 msgstr "Vill du verkligen tömma loggen?"
 
-#: src/dialogs.c:3187 src/dialogs.c:3358
+#: src/dialogs.c:2435 src/dialogs.c:2606
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "Kunde inte öppna logfil %s."
 
-#: src/dialogs.c:3335
+#: src/dialogs.c:2583
 #, c-format
 msgid "Conversations with %s"
 msgstr "Konversationer med %s"
 
-#: src/dialogs.c:3337
+#: src/dialogs.c:2585
 msgid "System Log"
 msgstr "Systemlogg"
 
-#: src/dialogs.c:3379
+#: src/dialogs.c:2627
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3436
+#: src/dialogs.c:2684
 msgid "Log"
 msgstr "Logg"
 
-#: src/dialogs.c:3459
+#: src/dialogs.c:2707
 msgid "Clear"
 msgstr "Töm"
 
-#: src/dialogs.c:3498
+#: src/dialogs.c:2746
 msgid "Rename Group"
 msgstr "Byt namn på gruppen"
 
-#: src/dialogs.c:3498
+#: src/dialogs.c:2746
 msgid "New group name"
 msgstr "Nytt gruppnamn"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:2747
 msgid "Please enter a new name for the selected group."
 msgstr "Ange ett nytt namn på den markerade gruppen."
 
@@ -1761,28 +1789,28 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Är inte vid datorn just nu, kommer tillbaka senare."
 
-#: src/gaimrc.c:369 src/gaimrc.c:1458
+#: src/gaimrc.c:369 src/gaimrc.c:1460
 msgid "boring default"
 msgstr "Tråkigt standardmeddelande"
 
-#: src/gaimrc.c:1265 src/gtkblist.c:1410
+#: src/gaimrc.c:1267 src/gtkblist.c:1701
 msgid "Alphabetical"
 msgstr "Alfabetisk"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1411
+#: src/gaimrc.c:1269 src/gtkblist.c:1702
 msgid "By status"
 msgstr "Efter status"
 
-#: src/gaimrc.c:1269 src/gtkblist.c:1412
+#: src/gaimrc.c:1271 src/gtkblist.c:1703
 msgid "By log size"
 msgstr "Efter loggstorlek"
 
-#: src/gaimrc.c:1556
+#: src/gaimrc.c:1558
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunde inte öppna konfigurationsfilen %s."
 
-#: src/gtkaccount.c:253
+#: src/gtkaccount.c:277
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1793,309 +1821,353 @@
 "<b>Filstorlek:</b> %s\n"
 "<b>Bildstorlek:</b> %dx%d"
 
-#: src/gtkaccount.c:278 src/protocols/oscar/oscar.c:3085
+#: src/gtkaccount.c:308 src/protocols/oscar/oscar.c:3064
 msgid "Buddy Icon"
 msgstr "Kompisikon"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:328
+#: src/gtkaccount.c:359
 msgid "Login Options"
 msgstr "Inloggningsalternativ"
 
-#: src/gtkaccount.c:345
+#: src/gtkaccount.c:376
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/gtkaccount.c:350
+#: src/gtkaccount.c:381
 msgid "Screenname:"
 msgstr "Användar-ID:"
 
-#: src/gtkaccount.c:423 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:454 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/protocols/jabber/chat.c:54
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/gtkaccount.c:432
+#: src/gtkaccount.c:459 src/gtkblist.c:2977
+msgid "Alias:"
+msgstr "Alias:"
+
+#: src/gtkaccount.c:463
 msgid "Remember password"
 msgstr "Kom ihåg lösenord"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:486
+#: src/gtkaccount.c:517
 msgid "User Options"
 msgstr "Användaralternativ"
 
-#: src/gtkaccount.c:499
+#: src/gtkaccount.c:530
 msgid "New mail notifications"
 msgstr "Notifiering vid ny e-post"
 
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:539
 msgid "Buddy icon file:"
 msgstr "Fil med kompisikon:"
 
-#: src/gtkaccount.c:517
+#: src/gtkaccount.c:548
 msgid "_Browse"
 msgstr "Webb_läsare"
 
-#: src/gtkaccount.c:523
+#: src/gtkaccount.c:554
 msgid "_Reset"
 msgstr "_Återställ"
 
 # src/menus.c:311
 #. Build the protocol options frame.
-#: src/gtkaccount.c:584
+#: src/gtkaccount.c:615
 #, c-format
 msgid "%s Options"
 msgstr "%s Alternativ"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:705
+#: src/gtkaccount.c:736
 msgid "Use Global Proxy Settings"
 msgstr "Använd globala proxyinställningar"
 
 #. No Proxy
-#: src/gtkaccount.c:712
+#: src/gtkaccount.c:743
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
 #. HTTP
-#: src/gtkaccount.c:719
+#: src/gtkaccount.c:750
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:726
+#: src/gtkaccount.c:757
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:733
+#: src/gtkaccount.c:764
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:740 src/gtkprefs.c:1107
+#: src/gtkaccount.c:771 src/gtkprefs.c:1107
 msgid "Use Environmental Settings"
 msgstr "Använd miljöinställningar"
 
-#: src/gtkaccount.c:773
+#: src/gtkaccount.c:804
 msgid "you can see the butterflies mating"
 msgstr "kan du se fjärilarna para sig"
 
-#: src/gtkaccount.c:777
+#: src/gtkaccount.c:808
 msgid "If you look real closely"
 msgstr "Om du tittar riktigt nära"
 
-#: src/gtkaccount.c:793
+#: src/gtkaccount.c:824
 msgid "Proxy Options"
 msgstr "Proxyalternativ"
 
-#: src/gtkaccount.c:809 src/gtkprefs.c:1101
+#: src/gtkaccount.c:840 src/gtkprefs.c:1101
 msgid "Proxy _type:"
 msgstr "Proxy_typ:"
 
-#: src/gtkaccount.c:818
+#: src/gtkaccount.c:849
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: src/gtkaccount.c:822
+#: src/gtkaccount.c:853
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:830
+#: src/gtkaccount.c:861
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:866
 msgid "Pa_ssword:"
 msgstr "_Lösenord:"
 
-#: src/gtkaccount.c:1164
+#: src/gtkaccount.c:1199
 msgid "Add Account"
 msgstr "Lägg till konto"
 
-#: src/gtkaccount.c:1166
+#: src/gtkaccount.c:1201
 msgid "Modify Account"
 msgstr "Ändra konto"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1225
 msgid "Show more options"
 msgstr "Visa fler alternativ"
 
-#: src/gtkaccount.c:1191
+#: src/gtkaccount.c:1226
 msgid "Show fewer options"
 msgstr "Visa färre alternativ"
 
 #. Register button
-#: src/gtkaccount.c:1218
+#: src/gtkaccount.c:1253
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gtkaccount.c:1496
+#: src/gtkaccount.c:1551
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Är du säker på att du vill ta bort %s?"
 
-#: src/gtkaccount.c:1500 src/gtkrequest.c:192
+#: src/gtkaccount.c:1555 src/gtkrequest.c:198
 msgid "Delete"
 msgstr "Ta bort"
 
-#. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1601 src/protocols/jabber/jabber.c:3437
-#: src/protocols/jabber/jabber.c:3487 src/protocols/oscar/oscar.c:2846
-#: src/protocols/oscar/oscar.c:4580 src/protocols/oscar/oscar.c:5874
-#: src/protocols/yahoo/yahoo.c:1071 src/protocols/zephyr/zephyr.c:864
-#: src/protocols/zephyr/zephyr.c:874
+#: src/gtkaccount.c:1633 src/gtkblist.c:2655
+msgid "Screen Name"
+msgstr "Användar-ID"
+
+#: src/gtkaccount.c:1656 src/protocols/jabber/jabber.c:560
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4522
+#: src/protocols/oscar/oscar.c:6058 src/protocols/yahoo/yahoo.c:1859
+#: src/protocols/zephyr/zephyr.c:884 src/protocols/zephyr/zephyr.c:894
 msgid "Online"
 msgstr "Ansluten"
 
-#: src/gtkaccount.c:1619
+#: src/gtkaccount.c:1674
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/gtkblist.c:413
-msgid "Add a _Buddy"
-msgstr "_Lägg till kompis"
-
-#: src/gtkblist.c:415
-msgid "Add a C_hat"
-msgstr "Lägg till c_hatt"
-
-#: src/gtkblist.c:417
-msgid "_Delete Group"
-msgstr "_Ta bort grupp"
-
-#: src/gtkblist.c:419
-msgid "_Rename"
-msgstr "Byt _namn"
-
-#: src/gtkblist.c:427
-msgid "_Join"
-msgstr "_Anslut"
-
-#: src/gtkblist.c:429
-msgid "Auto-Join"
-msgstr "Anslut automatiskt"
-
-#: src/gtkblist.c:434 src/gtkblist.c:481
-msgid "_Remove"
-msgstr "_Ta bort"
-
-#: src/gtkblist.c:452
+#: src/gtkaccount.c:1963
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+msgstr "%s%s%s%s har gjort %s till sin kompis%s%s%s"
+
+#: src/gtkaccount.c:1977
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"Vill du lägga till honom eller henne till din kompislista?"
+
+#: src/gtkaccount.c:1981
+msgid "Gaim - Information"
+msgstr "Gaim - information"
+
+#: src/gtkaccount.c:1985
+msgid "Add buddy to your list?"
+msgstr "Lägg till kompisen i din kompislista?"
+
+#: src/gtkaccount.c:1987 src/gtkblist.c:3025 src/gtkconv.c:1138
+#: src/gtkconv.c:2979 src/gtkconv.c:4156 src/gtkrequest.c:199
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2685
+msgid "Add"
+msgstr "Lägg till"
+
+#: src/gtkblist.c:494
 msgid "_Get Info"
 msgstr "Hämta _information"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:497
 msgid "_IM"
 msgstr "_Snabbmeddelande"
 
-#: src/gtkblist.c:457
+#: src/gtkblist.c:499
 msgid "Add Buddy _Pounce"
 msgstr "Lägg till _övervakning"
 
-#: src/gtkblist.c:459
+#: src/gtkblist.c:501
 msgid "View _Log"
 msgstr "Visa _logg"
 
+#: src/gtkblist.c:523 src/gtkblist.c:616 src/gtkblist.c:626
+msgid "_Remove"
+msgstr "_Ta bort"
+
+#: src/gtkblist.c:595
+msgid "Add a _Buddy"
+msgstr "_Lägg till kompis"
+
+#: src/gtkblist.c:597
+msgid "Add a C_hat"
+msgstr "Lägg till c_hatt"
+
+#: src/gtkblist.c:599
+msgid "_Delete Group"
+msgstr "_Ta bort grupp"
+
+#: src/gtkblist.c:601
+msgid "_Rename"
+msgstr "Byt _namn"
+
+#: src/gtkblist.c:609
+msgid "_Join"
+msgstr "_Anslut"
+
+#: src/gtkblist.c:611
+msgid "Auto-Join"
+msgstr "Anslut automatiskt"
+
+#: src/gtkblist.c:622 src/gtkblist.c:653
+msgid "_Collapse"
+msgstr "_Kollaps"
+
+#: src/gtkblist.c:658
+msgid "_Expand"
+msgstr "_Expandera"
+
 #. Buddies menu
-#: src/gtkblist.c:785
+#: src/gtkblist.c:1088
 msgid "/_Buddies"
 msgstr "/_Kompisar"
 
-#: src/gtkblist.c:786
+#: src/gtkblist.c:1089
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Kompisar/Nytt _snabbmeddelande..."
 
-#: src/gtkblist.c:787
+#: src/gtkblist.c:1090
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kompisar/Anslut till _chatt..."
 
-#: src/gtkblist.c:788
+#: src/gtkblist.c:1091
 msgid "/Buddies/Get _User Info..."
 msgstr "/Kompisar/Hämta användar_information..."
 
-#: src/gtkblist.c:790
+#: src/gtkblist.c:1093
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Kompisar/Visa _inaktiva kompisar"
 
-#: src/gtkblist.c:791
+#: src/gtkblist.c:1094
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kompisar/Visa _tomma grupper"
 
-#: src/gtkblist.c:792
+#: src/gtkblist.c:1095
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/Kompisar/Lägg till _kompis..."
 
-#: src/gtkblist.c:793
+#: src/gtkblist.c:1096
 msgid "/Buddies/Add a C_hat..."
 msgstr "/Kompisar/Lägg till _chatt..."
 
-#: src/gtkblist.c:794
+#: src/gtkblist.c:1097
 msgid "/Buddies/Add a _Group..."
 msgstr "/Kompisar/Lägg till _grupp..."
 
-#: src/gtkblist.c:796
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr "/Kompisar/_Logga ut"
 
-#: src/gtkblist.c:797
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr "/Kompisar/_Avsluta"
 
 #. Tools
-#: src/gtkblist.c:800
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "/_Verktyg"
 
-#: src/gtkblist.c:801
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr "/Verktyg/_Meddelande vid frånvaro"
 
-#: src/gtkblist.c:802
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Verktyg/_Övervaka kompis"
 
-#: src/gtkblist.c:803
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Verktyg/_Protokollåtgärder"
 
-#: src/gtkblist.c:805
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr "/Verktyg/_Konton"
 
-#: src/gtkblist.c:806
+#: src/gtkblist.c:1109
 msgid "/Tools/_File Transfers..."
 msgstr "/Verktyg/_Filöverföringar..."
 
-#: src/gtkblist.c:807
+#: src/gtkblist.c:1110
 msgid "/Tools/Preferences"
 msgstr "/Verktyg/_Inställningar"
 
-#: src/gtkblist.c:808
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
-#: src/gtkblist.c:810
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr "/Verktyg/Visa system_logg"
 
 #. Help
-#: src/gtkblist.c:813
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/gtkblist.c:814
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr "/Hjälp/Online_hjälp"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr "/Hjälp/_Felsökningsfönster"
 
-#: src/gtkblist.c:816
+#: src/gtkblist.c:1119
 msgid "/Help/_About"
 msgstr "/Hjälp/_Om Gaim"
 
-#: src/gtkblist.c:850
+#: src/gtkblist.c:1149
 #, c-format
 msgid ""
 "\n"
@@ -2104,16 +2176,16 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:900 src/protocols/oscar/oscar.c:5463
+#: src/gtkblist.c:1208 src/protocols/oscar/oscar.c:5438
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Ej ansluten"
 
-#: src/gtkblist.c:912
+#: src/gtkblist.c:1220
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:926
+#: src/gtkblist.c:1234
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2121,7 +2193,7 @@
 "\n"
 "<b>Konto:</b>"
 
-#: src/gtkblist.c:927
+#: src/gtkblist.c:1235
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2129,7 +2201,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:928
+#: src/gtkblist.c:1236
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2137,7 +2209,7 @@
 "\n"
 "<b>Nick:</b>"
 
-#: src/gtkblist.c:929
+#: src/gtkblist.c:1237
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2145,7 +2217,7 @@
 "\n"
 "<b>Inaktiv:</b>"
 
-#: src/gtkblist.c:930
+#: src/gtkblist.c:1238
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2153,7 +2225,7 @@
 "\n"
 "<b>Varnad:</b>"
 
-#: src/gtkblist.c:932
+#: src/gtkblist.c:1240
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2161,7 +2233,7 @@
 "\n"
 "<b>Beskrivning:</b> Kusligt"
 
-#: src/gtkblist.c:933
+#: src/gtkblist.c:1241
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2169,7 +2241,7 @@
 "\n"
 "<b>Status</b>: Toppen"
 
-#: src/gtkblist.c:934
+#: src/gtkblist.c:1242
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2177,81 +2249,139 @@
 "\n"
 "<b>Status</b>: Rockar"
 
-#: src/gtkblist.c:1232
+#: src/gtkblist.c:1498
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inaktiv (%dh%02dm) "
 
-#: src/gtkblist.c:1234
+#: src/gtkblist.c:1500
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inaktiv (%dm) "
 
-#: src/gtkblist.c:1238
+#: src/gtkblist.c:1504
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varnad (%d%%) "
 
-#: src/gtkblist.c:1241
+#: src/gtkblist.c:1507
 msgid "Offline "
 msgstr "Ej ansluten"
 
-#: src/gtkblist.c:1409 src/gtkprefs.c:845 src/gtkprefs.c:1538
+#: src/gtkblist.c:1699 src/gtkprefs.c:841 src/gtkprefs.c:1499
 msgid "None"
 msgstr "Inget"
 
-#: src/gtkblist.c:1472
+#: src/gtkblist.c:1764
 msgid "/Tools/Away"
 msgstr "/Verktyg/Meddelande vid frånvaro"
 
-#: src/gtkblist.c:1475
+#: src/gtkblist.c:1767
 msgid "/Tools/Buddy Pounce"
 msgstr "/Verktyg/Övervaka kompis"
 
-#: src/gtkblist.c:1478
+#: src/gtkblist.c:1770
 msgid "/Tools/Protocol Actions"
 msgstr "/Verktyg/Protokollåtgärder"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1561
+#: src/gtkblist.c:1854
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Kompisar/Visa inaktiva kompisar"
 
-#: src/gtkblist.c:1563
+#: src/gtkblist.c:1856
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Kompisar/Visa tomma grupper"
 
-#: src/gtkblist.c:1581 src/gtkconv.c:1073
+#: src/gtkblist.c:1874 src/gtkconv.c:1097
 msgid "IM"
 msgstr "Snabbmeddelande"
 
-#: src/gtkblist.c:1587
+#: src/gtkblist.c:1880
 msgid "Send a message to the selected buddy"
 msgstr "Skicka ett meddelande till den markerade kompisen"
 
-#: src/gtkblist.c:1590 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1883 src/protocols/napster/napster.c:533
 msgid "Get Info"
 msgstr "Hämta information"
 
-#: src/gtkblist.c:1596
+#: src/gtkblist.c:1889
 msgid "Get information on the selected buddy"
 msgstr "Hämta information om den markerade kompisen"
 
-#: src/gtkblist.c:1599 src/protocols/oscar/oscar.c:3094
+#: src/gtkblist.c:1892 src/protocols/oscar/oscar.c:3073
 msgid "Chat"
 msgstr "Chatta"
 
-#: src/gtkblist.c:1604
+#: src/gtkblist.c:1897
 msgid "Join a chat room"
 msgstr "Anslut till ett chattrum"
 
-#: src/gtkblist.c:1612
+#: src/gtkblist.c:1905
 msgid "Set an away message"
 msgstr "Aktivera meddelande vid frånvaro"
 
-#: src/gtkblist.c:2606
+#: src/gtkblist.c:2610 src/protocols/yahoo/yahoo.c:1993
+msgid "Add Buddy"
+msgstr "Lägg till kompis"
+
+#: src/gtkblist.c:2633
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Ange användar-ID på den kompis du vill lägga till i din kompislista. Du kan "
+"alternativt ange ett alias eller ett nick. Alias kommer att visas i ställer "
+"för användar-ID när det är möjligt.\n"
+
+#: src/gtkblist.c:2668
+msgid "Alias"
+msgstr "Alias"
+
+#: src/gtkblist.c:2681
+msgid "Group"
+msgstr "Grupp"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:2690
+msgid "Add To"
+msgstr "Lägg till i"
+
+#: src/gtkblist.c:2926
+msgid "Add Chat"
+msgstr "Lägg till chatt"
+
+#: src/gtkblist.c:2949
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Ange ett alias och information om chatten som du villtill din kompislista.\n"
+
+#: src/gtkblist.c:2959
+msgid "Account:"
+msgstr "Konto:"
+
+#: src/gtkblist.c:2988
+msgid "Group:"
+msgstr "Grupp:"
+
+#: src/gtkblist.c:3022
+msgid "Add Group"
+msgstr "Lägg till grupp"
+
+#: src/gtkblist.c:3022
+msgid "Add a new group"
+msgstr "Lägg till en ny grupp"
+
+#: src/gtkblist.c:3023
+msgid "Please enter the name of the group to be added."
+msgstr "Ange namnet på den grupp du vill lägga till."
+
+#: src/gtkblist.c:3538
 msgid "No actions available"
 msgstr "Det går inte att göra något"
 
@@ -2261,11 +2391,11 @@
 
 #: src/gtkconn.c:136
 msgid "Signon: "
-msgstr "Logga in:"
+msgstr "Loggar in:"
 
 #: src/gtkconn.c:194
 msgid "Signon"
-msgstr "Logga in"
+msgstr "Loggar in"
 
 #: src/gtkconn.c:207
 msgid "Cancel All"
@@ -2280,24 +2410,29 @@
 msgid "Reason Unknown."
 msgstr "Okänd orsak."
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:186
 msgid "That file already exists"
 msgstr "Filen finns redan."
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:187 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "Vill du skriva över den?"
 
-#: src/gtkconv.c:280
+#: src/gtkconv.c:242
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Kunde inte spara bilden: %s\n"
+
+#: src/gtkconv.c:304
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Infoga bild"
 
-#: src/gtkconv.c:584
+#: src/gtkconv.c:608
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Bjud in kompis till chattrum"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:636
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2305,326 +2440,326 @@
 "Ange namnet på den användare du vill bjuda in, samt ett "
 "inbjudningsmeddelande om du vill"
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:657
 msgid "_Buddy:"
 msgstr "_Kompisi:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:653
+#: src/gtkconv.c:677
 msgid "_Message:"
 msgstr "_Meddelande:"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1105
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:777
+#: src/gtkconv.c:1107 src/gtkprefs.c:773
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2974
+#: src/gtkconv.c:1116 src/gtkconv.c:3002
 msgid "Info"
 msgstr "Information"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3399
+#: src/gtkconv.c:1125
 msgid "Get Away Msg"
 msgstr "Frånvaromeddelande"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2957 src/gtkconv.c:4105
-#: src/gtkrequest.c:194
+#: src/gtkconv.c:1136 src/gtkconv.c:2985 src/gtkconv.c:4141
+#: src/gtkrequest.c:200
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/gtkconv.c:2188
+#: src/gtkconv.c:2211
 msgid "User is typing..."
 msgstr "Användaren skriver..."
 
-#: src/gtkconv.c:2196
+#: src/gtkconv.c:2219
 msgid "User has typed something and paused"
 msgstr "Användaren har skrivit något och tagit en paus"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2298
+#: src/gtkconv.c:2321
 msgid "_Send As"
 msgstr "_Skicka som"
 
-#: src/gtkconv.c:2753
+#: src/gtkconv.c:2781
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Spara konversation"
 
 #. Conversation menu
-#: src/gtkconv.c:2770
+#: src/gtkconv.c:2798
 msgid "/_Conversation"
 msgstr "/_Konversation"
 
-#: src/gtkconv.c:2772
+#: src/gtkconv.c:2800
 msgid "/Conversation/_Save As..."
 msgstr "/Konversation/_Spara som..."
 
-#: src/gtkconv.c:2774
+#: src/gtkconv.c:2802
 msgid "/Conversation/View _Log..."
 msgstr "/Konversation/Visa _Logg..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2806
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversation/Lägg till _övervakning..."
 
-#: src/gtkconv.c:2780
+#: src/gtkconv.c:2808
 msgid "/Conversation/A_lias..."
 msgstr "/Konversation/_Alias..."
 
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2810
 msgid "/Conversation/_Get Info..."
 msgstr "/Konversation/_Hämta information..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2812
 msgid "/Conversation/In_vite..."
 msgstr "/Konversation/_Bjud in..."
 
-#: src/gtkconv.c:2789
+#: src/gtkconv.c:2817
 msgid "/Conversation/Insert _URL..."
 msgstr "/Konversationer/Infoga _URL..."
 
-#: src/gtkconv.c:2791
+#: src/gtkconv.c:2819
 msgid "/Conversation/Insert _Image..."
 msgstr "/Konversationer/Infoga _bild..."
 
-#: src/gtkconv.c:2796
+#: src/gtkconv.c:2824
 msgid "/Conversation/_Warn..."
 msgstr "/Konversation/_Varna..."
 
-#: src/gtkconv.c:2798
+#: src/gtkconv.c:2826
 msgid "/Conversation/_Block..."
 msgstr "/Konversatione/_Blockera"
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2828
 msgid "/Conversation/_Add..."
 msgstr "/Konversation/_Lägg till..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2830
 msgid "/Conversation/_Remove..."
 msgstr "/Konversation/_Ta bort..."
 
-#: src/gtkconv.c:2807
+#: src/gtkconv.c:2835
 msgid "/Conversation/_Close"
 msgstr "/Konversatione/_Stäng"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2839
 msgid "/_Options"
 msgstr "_Alternativ"
 
-#: src/gtkconv.c:2812
+#: src/gtkconv.c:2840
 msgid "/Options/Enable _Logging"
 msgstr "/Alternativ/Aktivera _loggning"
 
-#: src/gtkconv.c:2813
+#: src/gtkconv.c:2841
 msgid "/Options/Enable _Sounds"
 msgstr "/Alternativ/_Aktivera ljud"
 
-#: src/gtkconv.c:2853
+#: src/gtkconv.c:2881
 msgid "/Conversation/View Log..."
 msgstr "/Konversation/Visa logg..."
 
-#: src/gtkconv.c:2858
+#: src/gtkconv.c:2886
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversation/Lägg till övervakning"
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2890
 msgid "/Conversation/Alias..."
 msgstr "/Konversation/Alias..."
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2894
 msgid "/Conversation/Get Info..."
 msgstr "/Konversation/Hämta information..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2898
 msgid "/Conversation/Invite..."
 msgstr "/Konversation/Bjud in..."
 
-#: src/gtkconv.c:2876
+#: src/gtkconv.c:2904
 msgid "/Conversation/Insert URL..."
 msgstr "/Konversation/Infoga URL..."
 
-#: src/gtkconv.c:2880
+#: src/gtkconv.c:2908
 msgid "/Conversation/Insert Image..."
 msgstr "/Konversation/Infoga bild..."
 
-#: src/gtkconv.c:2886
+#: src/gtkconv.c:2914
 msgid "/Conversation/Warn..."
 msgstr "/Konversation/Varna..."
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:2918
 msgid "/Conversation/Block..."
 msgstr "/Konversation/Blockera..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2922
 msgid "/Conversation/Add..."
 msgstr "/Konversation/Lägg till..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2926
 msgid "/Conversation/Remove..."
 msgstr "/Konversation/Ta bort..."
 
-#: src/gtkconv.c:2904
+#: src/gtkconv.c:2932
 msgid "/Options/Enable Logging"
 msgstr "/Alternativ/Aktivera loggning"
 
-#: src/gtkconv.c:2907
+#: src/gtkconv.c:2935
 msgid "/Options/Enable Sounds"
 msgstr "/Alternativ/Aktivera ljud"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2931 src/gtkconv.c:2933 src/gtkconv.c:3031 src/gtkconv.c:3033
-#: src/gtkconv.c:5882
+#: src/gtkconv.c:2959 src/gtkconv.c:2961 src/gtkconv.c:3059 src/gtkconv.c:3061
+#: src/gtkconv.c:5987
 msgid "Send"
 msgstr "Skicka"
 
-#: src/gtkconv.c:2954 src/gtkconv.c:4123
+#: src/gtkconv.c:2982 src/gtkconv.c:4159
 msgid "Add the user to your buddy list"
 msgstr "Lägg till användaren till din kompislista"
 
-#: src/gtkconv.c:2960 src/gtkconv.c:4108
+#: src/gtkconv.c:2988 src/gtkconv.c:4144
 msgid "Remove the user from your buddy list"
 msgstr "Ta bort användaren från din kompislista"
 
 #. Warn button
-#: src/gtkconv.c:2967
+#: src/gtkconv.c:2995
 msgid "Warn"
 msgstr "Varna"
 
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:2999
 msgid "Warn the user"
 msgstr "Varna användaren"
 
-#: src/gtkconv.c:2978 src/gtkconv.c:3413
+#: src/gtkconv.c:3006 src/gtkconv.c:3441
 msgid "Get the user's information"
 msgstr "Hämta information om användaren"
 
 #. Block button
-#: src/gtkconv.c:2981 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3009 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "Blockera"
 
-#: src/gtkconv.c:2985
+#: src/gtkconv.c:3013
 msgid "Block the user"
 msgstr "Blockera användaren"
 
 #. Invite
-#: src/gtkconv.c:3043 src/gtkconv.c:5885
+#: src/gtkconv.c:3071 src/gtkconv.c:5990
 msgid "Invite"
 msgstr "Bjud in"
 
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3074
 msgid "Invite a user"
 msgstr "Bjud in en användare"
 
-#: src/gtkconv.c:3085
+#: src/gtkconv.c:3113
 msgid "Bold"
 msgstr "Fet"
 
-#: src/gtkconv.c:3096
+#: src/gtkconv.c:3124
 msgid "Italic"
 msgstr "Kursiv"
 
-#: src/gtkconv.c:3107
+#: src/gtkconv.c:3135
 msgid "Underline"
 msgstr "Understruken"
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3151
 msgid "Larger font size"
 msgstr "Större typsnittsstorlek"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3163
 msgid "Normal font size"
 msgstr "Normal typsnittsstorlek"
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3175
 msgid "Smaller font size"
 msgstr "Mindre typsnittsstorlek"
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3192
 msgid "Font Face"
 msgstr "Typsnitt"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3204
 msgid "Foreground font color"
 msgstr "Textfärg"
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3216
 msgid "Background color"
 msgstr "Bakgrundsfärg"
 
-#: src/gtkconv.c:3203
+#: src/gtkconv.c:3231
 msgid "Insert image"
 msgstr "Infoga bild"
 
-#: src/gtkconv.c:3214
+#: src/gtkconv.c:3242
 msgid "Insert link"
 msgstr "Infoga länk"
 
-#: src/gtkconv.c:3225
+#: src/gtkconv.c:3253
 msgid "Insert smiley"
 msgstr "Infoga smiley"
 
-#: src/gtkconv.c:3282
+#: src/gtkconv.c:3310
 msgid "Topic:"
 msgstr "Ämne:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3361
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3418
 msgid "IM the user"
 msgstr "Skicka snabbmeddelade till användaren"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3430
 msgid "Ignore the user"
 msgstr "Ignorera användaren"
 
-#: src/gtkconv.c:3899 src/server.c:1370
+#: src/gtkconv.c:3926 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- Ny konversation @ %s ----</H3><BR>\n"
 
-#: src/gtkconv.c:3903 src/server.c:1373
+#: src/gtkconv.c:3930 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- Ny Konversation @ %s ----\n"
 
-#: src/gtkconv.c:3935
+#: src/gtkconv.c:3963
 msgid "Close conversation"
 msgstr "Stäng konversationen"
 
-#: src/gtkconv.c:4601 src/gtkconv.c:4633 src/gtkconv.c:4754 src/gtkconv.c:4821
+#: src/gtkconv.c:4706 src/gtkconv.c:4738 src/gtkconv.c:4859 src/gtkconv.c:4926
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person är i rummet"
 msgstr[1] "%d personer är i rummet"
 
-#: src/gtkconv.c:5158
+#: src/gtkconv.c:5257
 msgid "Disable Animation"
 msgstr "Tillåt ej animering"
 
-#: src/gtkconv.c:5167
+#: src/gtkconv.c:5266
 msgid "Enable Animation"
 msgstr "Tillåt animering"
 
-#: src/gtkconv.c:5174
+#: src/gtkconv.c:5273
 msgid "Hide Icon"
 msgstr "Dölj ikon"
 
-#: src/gtkconv.c:5180
+#: src/gtkconv.c:5279
 msgid "Save Icon As..."
 msgstr "Spara ikon som..."
 
-#: src/gtkconv.c:5655 src/gtkconv.c:5658
+#: src/gtkconv.c:5757 src/gtkconv.c:5760
 msgid "<main>/Conversation/Close"
 msgstr "/Konversatione/Stäng"
 
@@ -2732,7 +2867,7 @@
 msgid "Gaim - Open..."
 msgstr "Gaim - Öppna..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2004
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2043
 msgid "Gaim - Save As..."
 msgstr "Gaim - Spara som..."
 
@@ -2749,44 +2884,44 @@
 msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: src/gtkimhtml.c:1632
+#: src/gtkimhtml.c:1616
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 "Kunde inte gissa bildens format på filnamnsslutet. Förvalt Format är PNG."
 
-#: src/gtkimhtml.c:1640
+#: src/gtkimhtml.c:1624
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Fel vid sparning av bild: %s"
 
-#: src/gtkimhtml.c:1649
+#: src/gtkimhtml.c:1633
 msgid "Save Image"
 msgstr "Spara bild"
 
-#: src/gtkimhtml.c:1671
+#: src/gtkimhtml.c:1656
 msgid "_Save Image..."
 msgstr "_Spara bild..."
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s har %d nytt meddelande."
 msgstr[1] "%s har %d nya meddelanden."
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Från:</span> %s\n"
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Ämne:</span> %s\n"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2797,7 +2932,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2851,8 +2986,8 @@
 msgid "Return from away"
 msgstr "Återkommer från frånvaro"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1535 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1069
+#: src/gtkpounce.c:465 src/gtkprefs.c:1496 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:1855
 msgid "Idle"
 msgstr "Inaktiv"
 
@@ -2897,7 +3032,7 @@
 msgid "Browse"
 msgstr "Bläddra"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2121
+#: src/gtkpounce.c:518 src/gtkprefs.c:2085
 msgid "Test"
 msgstr "Test"
 
@@ -2950,15 +3085,15 @@
 msgstr ""
 "Okänd övervakningshändelse (pounce event), var snäll och rapportera detta!"
 
-#: src/gtkprefs.c:381
+#: src/gtkprefs.c:377
 msgid "Interface Options"
 msgstr "Gränssnittsalternativ"
 
-#: src/gtkprefs.c:383
+#: src/gtkprefs.c:379
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Visa nick om inget alias är inställt"
 
-#: src/gtkprefs.c:564
+#: src/gtkprefs.c:560
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -2966,215 +3101,220 @@
 "Välj det smileytema som du vill använda från listan nedanför. Nya teman kan "
 "installeras genom att dra och släppa dem på temalistan."
 
-#: src/gtkprefs.c:597
+#: src/gtkprefs.c:593
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:667
 msgid "Style"
 msgstr "Stil"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:668
 msgid "_Bold"
 msgstr "_Fet"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:670
 msgid "_Italics"
 msgstr "_Kursiv"
 
-#: src/gtkprefs.c:676
+#: src/gtkprefs.c:672
 msgid "_Underline"
 msgstr "_Understruken"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:674
 msgid "_Strikethrough"
 msgstr "_Överstruken"
 
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:677
 msgid "Face"
 msgstr "Typsnitt"
 
-#: src/gtkprefs.c:684
+#: src/gtkprefs.c:680
 msgid "Use custo_m face"
 msgstr "Ändra _typsnitt"
 
-#: src/gtkprefs.c:701
+#: src/gtkprefs.c:697
 msgid "Use custom si_ze"
 msgstr "Ändra _storlek"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:710
 msgid "Color"
 msgstr "Färg"
 
-#: src/gtkprefs.c:718
+#: src/gtkprefs.c:714
 msgid "_Text color"
 msgstr "Textf_ärg"
 
-#: src/gtkprefs.c:737
+#: src/gtkprefs.c:733
 msgid "Bac_kground color"
 msgstr "_Bakgrundsfärg"
 
-#: src/gtkprefs.c:765 src/gtkprefs.c:998 src/gtkprefs.c:1051
+#: src/gtkprefs.c:761 src/gtkprefs.c:998 src/gtkprefs.c:1051
 msgid "Display"
 msgstr "Visa"
 
+#: src/gtkprefs.c:762
+msgid "Show graphical _smileys"
+msgstr "Visa grafiska _smileys"
+
+#: src/gtkprefs.c:764
+msgid "Show _timestamp on messages"
+msgstr "Visa _tidsstämplar på meddelanden"
+
 #: src/gtkprefs.c:766
-msgid "Show graphical _smileys"
-msgstr "Visa grafiska _smileys"
-
-#: src/gtkprefs.c:768
-msgid "Show _timestamp on messages"
-msgstr "Visa _tidsstämplar på meddelanden"
+msgid "Show _URLs as links"
+msgstr "Visa _URL:er som länkar"
 
 #: src/gtkprefs.c:770
-msgid "Show _URLs as links"
-msgstr "Visa _URL:er som länkar"
+msgid "_Highlight misspelled words"
+msgstr "_Markera felstavade ord"
 
 #: src/gtkprefs.c:774
-msgid "_Highlight misspelled words"
-msgstr "_Markera felstavade ord"
-
-#: src/gtkprefs.c:778
 msgid "Ignore c_olors"
 msgstr "_Ignorera färger"
 
-#: src/gtkprefs.c:780
+#: src/gtkprefs.c:776
 msgid "Ignore font _faces"
 msgstr "Ignorera t_ypsnittsvarianter"
 
-#: src/gtkprefs.c:782
+#: src/gtkprefs.c:778
 msgid "Ignore font si_zes"
 msgstr "Ignorera typsnittsstor_lekar"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:791
 msgid "Send Message"
 msgstr "Skicka meddelanden"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:792
 msgid "Enter _sends message"
 msgstr "Enter _skickar meddelanden"
 
+#: src/gtkprefs.c:794
+msgid "C_ontrol-Enter sends message"
+msgstr "C_ontrol-Retur skickar meddelanden"
+
+#: src/gtkprefs.c:797
+msgid "Window Closing"
+msgstr "Stäng fönster"
+
 #: src/gtkprefs.c:798
-msgid "C_ontrol-Enter sends message"
-msgstr "C_ontrol-Retur skickar meddelanden"
+msgid "_Escape closes window"
+msgstr "_Escape stänger fönster"
 
 #: src/gtkprefs.c:801
-msgid "Window Closing"
-msgstr "Stäng fönster"
+msgid "Insertions"
+msgstr "Infogningar"
 
 #: src/gtkprefs.c:802
-msgid "_Escape closes window"
-msgstr "_Escape stänger fönster"
-
-#: src/gtkprefs.c:805
-msgid "Insertions"
-msgstr "Infogningar"
-
-#: src/gtkprefs.c:806
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Control-{B/I/U} infogar _HTML-taggar"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:804
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(nummer) infogar _smileys"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:821
 msgid "Buddy List Sorting"
 msgstr "Sortering av kompislista"
 
-#: src/gtkprefs.c:834
+#: src/gtkprefs.c:830
 msgid "Sorting:"
 msgstr "Sorterar:"
 
-#: src/gtkprefs.c:839
+#: src/gtkprefs.c:835
 msgid "Buddy List Toolbar"
 msgstr "Kompislista"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:836 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Show _buttons as:"
 msgstr "Visa _knappar som:"
 
-#: src/gtkprefs.c:842 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:838 src/gtkprefs.c:970 src/gtkprefs.c:1026
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/gtkprefs.c:843 src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:839 src/gtkprefs.c:971 src/gtkprefs.c:1027
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:844 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
 msgid "Pictures and text"
 msgstr "Bilder och text"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:986 src/gtkprefs.c:1042
+#: src/gtkprefs.c:845 src/gtkprefs.c:986 src/gtkprefs.c:1042
 msgid "_Raise window on events"
 msgstr "_Visa upp fönster vid händelser"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:848
 msgid "Group Display"
 msgstr "Gruppvy"
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:850
 msgid "Show _numbers in groups"
 msgstr "Visa _nummer i grupper"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:853
 msgid "Buddy Display"
 msgstr "Kompisvy"
 
-#: src/gtkprefs.c:858 src/gtkprefs.c:993
+#: src/gtkprefs.c:854 src/gtkprefs.c:993
 msgid "Show buddy _icons"
 msgstr "Visa kompis_ikoner"
 
-#: src/gtkprefs.c:860
+#: src/gtkprefs.c:856
 msgid "Show _warning levels"
 msgstr "Visa v_arningsnivåer"
 
-#: src/gtkprefs.c:863
+#: src/gtkprefs.c:859
 msgid "Show idle _times"
 msgstr "Visa _inaktivitetstider"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:873
 msgid "Dim i_dle buddies"
 msgstr "_Gråa ut inaktiva kompisar"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:897
 msgid "_Placement:"
 msgstr "_Placering:"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:906
 msgid "Send _URLs as Links"
 msgstr "Skicka _URL:er som länkar"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:909
 msgid "Tab Options"
 msgstr "Flikalternativ"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:911
 msgid "_Tab Placement:"
 msgstr "_Flikplacering:"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:913
 msgid "Top"
 msgstr "Överst"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:914
 msgid "Bottom"
 msgstr "Nederst"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:915
 msgid "Left"
 msgstr "Vänster"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:916
 msgid "Right"
 msgstr "Höger"
 
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:922
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Visa snabbmeddelanden och chattar i _flikfönster."
 
+#. XXX: grey this out when the above is unchecked
+#: src/gtkprefs.c:926
+msgid "Show IMs and chats in _same tabbed window"
+msgstr "Visa snabbmeddelanden och chattar i _samma flikfönster"
+
 #: src/gtkprefs.c:929
 msgid "Show _close button on tabs"
 msgstr "Visa stängningsknapp på fliken"
@@ -3267,10 +3407,9 @@
 msgid "_Host"
 msgstr "_Värd"
 
-#. Account Options
-#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:508
-#: src/protocols/jabber/jabber.c:4429 src/protocols/msn/msn.c:1395
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
+#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
+#: src/protocols/jabber/jabber.c:686 src/protocols/msn/msn.c:1536
+#: src/protocols/napster/napster.c:646 src/protocols/trepia/trepia.c:1376
 msgid "Port"
 msgstr "Port"
 
@@ -3282,46 +3421,39 @@
 msgid "Pa_ssword"
 msgstr "_Lösenord"
 
-#: src/gtkprefs.c:1239
-#, c-format
-msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-msgstr ""
-"Den manuellt angivna webbläsaren '%s' är inte giltig, Hyperlänkar kommer "
-"inte att fungera."
-
-#: src/gtkprefs.c:1259
+#: src/gtkprefs.c:1220
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1260
+#: src/gtkprefs.c:1221
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1261
+#: src/gtkprefs.c:1222
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1262
+#: src/gtkprefs.c:1223
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1224
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1233
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/gtkprefs.c:1313
+#: src/gtkprefs.c:1274
 msgid "Browser Selection"
 msgstr "Val av webbläsare"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1278
 msgid "_Browser:"
 msgstr "Webb_läsare:"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1288
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3330,87 +3462,87 @@
 "_Manuell:\n"
 "(%s för URL)"
 
-#: src/gtkprefs.c:1348
+#: src/gtkprefs.c:1309
 msgid "Browser Options"
 msgstr "Inställningar för webbläsaren"
 
-#: src/gtkprefs.c:1349
+#: src/gtkprefs.c:1310
 msgid "Open new _window by default"
 msgstr "Öppna alltid nytt _fönster"
 
-#: src/gtkprefs.c:1364
+#: src/gtkprefs.c:1325
 msgid "Message Logs"
 msgstr "Meddelandeloggar"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1326
 msgid "_Log all instant messages"
 msgstr "_Logga alla snabbmeddelanden"
 
-#: src/gtkprefs.c:1367
+#: src/gtkprefs.c:1328
 msgid "Log all c_hats"
 msgstr "Logga alla _chattar"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1330
 msgid "Strip _HTML from logs"
 msgstr "Ta bort _HTML från loggar"
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1333
 msgid "System Logs"
 msgstr "Systemloggar"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1334
 msgid "Log when buddies _sign on/sign off"
 msgstr "Logga då kompisar l_oggar in/ut"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1336
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Logga då kompisar blir _inaktiva/aktiva igen"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1338
 msgid "Log when buddies go away/come _back"
 msgstr "Logga då kompisar blir frånvarande/kommer _tillbaka"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1340
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Logga din _egen inloggning/inaktivitet/frånvaro"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1342
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "Individuella logg_filer för varje kompis inloggning"
 
-#: src/gtkprefs.c:1424
+#: src/gtkprefs.c:1385
 msgid "Sound Options"
 msgstr "Ljudalternativ"
 
-#: src/gtkprefs.c:1425
+#: src/gtkprefs.c:1386
 msgid "_No sounds when you log in"
 msgstr "_Inga ljud när du loggar in"
 
-#: src/gtkprefs.c:1427
+#: src/gtkprefs.c:1388
 msgid "_Sounds while away"
 msgstr "Ljud medan du är _frånvarande"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1392
 msgid "Sound Method"
 msgstr "Ljudmetod"
 
-#: src/gtkprefs.c:1432
+#: src/gtkprefs.c:1393
 msgid "_Method:"
 msgstr "_Metod:"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1395
 msgid "Console beep"
 msgstr "Konsolpip"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1397
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/gtkprefs.c:1443
+#: src/gtkprefs.c:1404
 msgid "Command"
 msgstr "Kommando"
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1414
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3419,67 +3551,67 @@
 "Ljud_kommando:\n"
 "(%s för filnamn)"
 
-#: src/gtkprefs.c:1508
+#: src/gtkprefs.c:1469
 msgid "_Sending messages removes away status"
 msgstr "Att _skicka meddelanden tar bort frånvarostatus"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1471
 msgid "_Queue new messages when away"
 msgstr "_Kölägg nya meddelanden vid frånvaro"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1474
 msgid "Auto-response"
 msgstr "Automatiskt svar"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1477
 msgid "Seconds before _resending:"
 msgstr "Sekunder innan sändnings_upprepning:"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1480
 msgid "_Send auto-response"
 msgstr "Skicka _automatiskt svar"
 
-#: src/gtkprefs.c:1521
+#: src/gtkprefs.c:1482
 msgid "_Only send auto-response when idle"
 msgstr "Skicka _endast automatiskt svar vid inaktivitet"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1484
 msgid "Send auto-response in active conversations"
 msgstr "Skicka automatiskt svar i aktiva _konversationer"
 
-#: src/gtkprefs.c:1536
+#: src/gtkprefs.c:1497
 msgid "Idle _time reporting:"
 msgstr "Frånvaro_tidskälla:"
 
-#: src/gtkprefs.c:1539
+#: src/gtkprefs.c:1500
 msgid "Gaim usage"
 msgstr "Gaim-användning"
 
-#: src/gtkprefs.c:1542
+#: src/gtkprefs.c:1503
 msgid "X usage"
 msgstr "X-användning"
 
-#: src/gtkprefs.c:1544
+#: src/gtkprefs.c:1505
 msgid "Windows usage"
 msgstr "Windows användning"
 
-#: src/gtkprefs.c:1552
+#: src/gtkprefs.c:1513
 msgid "Auto-away"
 msgstr "Autofrånvaro"
 
-#: src/gtkprefs.c:1553
+#: src/gtkprefs.c:1514
 msgid "Set away _when idle"
 msgstr "Ange _frånvaro vid inaktivitet"
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1516
 msgid "_Minutes before setting away:"
 msgstr "_Minuter innan frånvaro anges:"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1523
 msgid "Away m_essage:"
 msgstr "Frånvarome_ddelanden:"
 
-#: src/gtkprefs.c:1624
+#: src/gtkprefs.c:1585
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3494,7 +3626,7 @@
 "<span weight=\"bold\">Webbsajt:</span>\t\t%s\n"
 "<span weight=\"bold\">Filnamn:</span>\t%s"
 
-#: src/gtkprefs.c:1629
+#: src/gtkprefs.c:1590
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3509,97 +3641,97 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Filnamn:</span>  %s"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1771
 msgid "Load"
 msgstr "Läs in"
 
-#: src/gtkprefs.c:1814 src/protocols/msn/msn.c:1214
+#: src/gtkprefs.c:1778 src/protocols/msn/msn.c:1285
 #: src/protocols/trepia/trepia.c:433
 msgid "Name"
 msgstr "Namn"
 
-#: src/gtkprefs.c:1861
+#: src/gtkprefs.c:1825
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/gtkprefs.c:1988
+#: src/gtkprefs.c:1952
 msgid "Sound Selection"
 msgstr "Ljudalternativ"
 
-#: src/gtkprefs.c:2095
+#: src/gtkprefs.c:2059
 msgid "Play"
 msgstr "Spela upp"
 
-#: src/gtkprefs.c:2102
+#: src/gtkprefs.c:2066
 msgid "Event"
 msgstr "Händelse"
 
-#: src/gtkprefs.c:2125
+#: src/gtkprefs.c:2089
 msgid "Reset"
 msgstr "Återställ"
 
-#: src/gtkprefs.c:2129
+#: src/gtkprefs.c:2093
 msgid "Choose..."
 msgstr "Välj..."
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2227
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: src/gtkprefs.c:2289
+#: src/gtkprefs.c:2263
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/gtkprefs.c:2290
+#: src/gtkprefs.c:2264
 msgid "Smiley Themes"
 msgstr "Smileyteman"
 
-#: src/gtkprefs.c:2291
+#: src/gtkprefs.c:2265
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/gtkprefs.c:2292
+#: src/gtkprefs.c:2266
 msgid "Message Text"
 msgstr "Meddelandetext"
 
-#: src/gtkprefs.c:2293
+#: src/gtkprefs.c:2267
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: src/gtkprefs.c:2296
+#: src/gtkprefs.c:2270
 msgid "IMs"
 msgstr "Snabbmeddelanden"
 
-#: src/gtkprefs.c:2298
+#: src/gtkprefs.c:2272
 msgid "Proxy"
 msgstr "Proxyserver"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2301
+#: src/gtkprefs.c:2275
 msgid "Browser"
 msgstr "Webbläsare"
 
-#: src/gtkprefs.c:2303
+#: src/gtkprefs.c:2277
 msgid "Logging"
 msgstr "Loggning"
 
-#: src/gtkprefs.c:2304
+#: src/gtkprefs.c:2278
 msgid "Sounds"
 msgstr "Ljud"
 
-#: src/gtkprefs.c:2305
+#: src/gtkprefs.c:2279
 msgid "Sound Events"
 msgstr "Ljudhändelser"
 
-#: src/gtkprefs.c:2306
+#: src/gtkprefs.c:2280
 msgid "Away / Idle"
 msgstr "Frånvarande / Inaktiv"
 
-#: src/gtkprefs.c:2307
+#: src/gtkprefs.c:2281
 msgid "Away Messages"
 msgstr "Frånvaromeddelanden"
 
-#: src/gtkprefs.c:2310
+#: src/gtkprefs.c:2284
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
@@ -3687,15 +3819,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:192 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:193 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "Nej"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:196
 msgid "Apply"
 msgstr "Verkställ"
 
@@ -3760,16 +3892,16 @@
 msgstr ""
 "Kunde inte spela upp ljudet eftersom det valda kommandot inte kunde köras: %s"
 
-#: src/gtkutils.c:290
+#: src/gtkutils.c:285
 msgid "Can't save icon file to disk."
 msgstr "Kan inte spara ikonfil på disken."
 
-#: src/gtkutils.c:325
+#: src/gtkutils.c:320
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Spara ikon"
 
 #. full help text
-#: src/gtkutils.c:1038
+#: src/gtkutils.c:1033
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3789,7 +3921,7 @@
 msgstr ""
 
 #. short message
-#: src/gtkutils.c:1053
+#: src/gtkutils.c:1048
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr ""
@@ -3834,57 +3966,57 @@
 #: src/log.c:280
 #, c-format
 msgid "+++ %s (%s) changed away state @ %s"
-msgstr ""
+msgstr "+++ %s (%s) ändrade frånvarostatus @ %s"
 
 #: src/log.c:285
 #, c-format
 msgid "+++ %s (%s) came back @ %s"
-msgstr ""
+msgstr "+++ %s (%s) kom tillbaka @ %s"
 
 #: src/log.c:290
 #, c-format
 msgid "+++ %s (%s) became idle @ %s"
-msgstr ""
+msgstr "+++ %s (%s) blev inaktiv @ %s"
 
 #: src/log.c:295
 #, c-format
 msgid "+++ %s (%s) returned from idle @ %s"
-msgstr ""
+msgstr "+++ %s (%s) blev aktiv igen @ %s"
 
 #: src/log.c:300
 #, c-format
 msgid "+++ Program exit @ %s"
-msgstr ""
+msgstr "+++ Programmet avslutades @ %s"
 
 #: src/log.c:307
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr ""
+msgstr "%s (%s) rapporterade att %s (%s) loggade på @ %s"
 
 #: src/log.c:312
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr ""
+msgstr "%s (%s) rapporterade att %s (%s) loggade ut @ %s"
 
 #: src/log.c:317
 #, c-format
 msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr ""
+msgstr "%s (%s) rapporterade att %s (%s) gick iväg @ %s"
 
 #: src/log.c:322
 #, c-format
 msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr ""
+msgstr "%s (%s) rapporterade att %s (%s) kom tillbaka @ %s"
 
 #: src/log.c:327
 #, c-format
 msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr ""
+msgstr "%s (%s) rapporterar att %s (%s) blev inaktiv @ %s"
 
 #: src/log.c:333
 #, c-format
 msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr ""
+msgstr "%s (%s) rapporterar att %s (%s) blev aktiv igen @ %s"
 
 #: src/log.c:345
 #, c-format
@@ -3932,223 +4064,233 @@
 msgid "Screen Name:"
 msgstr "Användar-ID:"
 
-#: src/plugin.c:257
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:262 src/plugin.c:290
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim kunde inte ladda din insticksmodul."
 
-#: src/plugin.c:286
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Den begärda insticksmodulen %s kunde inte laddas."
 
-#: src/prefs.c:113 src/status.c:270
+#: src/prefs.c:111 src/status.c:270
 msgid "Slightly less boring default"
 msgstr ""
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1186
-#: src/protocols/msn/msn.c:338 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: src/protocols/msn/msn.c:337 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:1255
-#: src/protocols/yahoo/yahoo.c:1334
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2131
+#: src/protocols/yahoo/yahoo.c:2232
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "Tillgänglig endast för vänner"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
 msgstr "Frånvarande endast för vänner"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3442
-#: src/protocols/jabber/jabber.c:3505 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4570 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:5880 src/protocols/yahoo/yahoo.c:1067
-#: src/protocols/yahoo/yahoo.c:1277 src/protocols/yahoo/yahoo.c:1344
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:565
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2841
+#: src/protocols/oscar/oscar.c:4512 src/protocols/oscar/oscar.c:4539
+#: src/protocols/oscar/oscar.c:6064 src/protocols/yahoo/yahoo.c:1853
+#: src/protocols/yahoo/yahoo.c:2151 src/protocols/yahoo/yahoo.c:2242
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "Osynlig endast för vänner"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "Otillgänglig"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:136
 msgid "Unable to resolve hostname."
 msgstr "Kan inte slå upp värdnamnet."
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:139
 msgid "Unable to connect to server."
 msgstr "Kan inte ansluta till servern."
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:142
 msgid "Invalid response from server."
 msgstr "Ogiltigt svar från servern."
 
+#: src/protocols/gg/gg.c:145
+msgid "Error while reading from socket."
+msgstr "Fel vid läsning från uttag (socket)."
+
 #: src/protocols/gg/gg.c:148
-msgid "Error while reading from socket."
-msgstr "Fel vid läsning från uttag (socket)."
+msgid "Error while writing to socket."
+msgstr "Fel vid skrivande till uttag (socket)."
 
 #: src/protocols/gg/gg.c:151
-msgid "Error while writing to socket."
-msgstr "Fel vid skrivande till uttag (socket)."
+msgid "Authentication failed."
+msgstr "Autentisering misslyckades."
 
 #: src/protocols/gg/gg.c:154
-msgid "Authentication failed."
-msgstr "Autentisering misslyckades."
-
-#: src/protocols/gg/gg.c:157
 msgid "Unknown Error Code."
 msgstr "Okänd felkod."
 
-#: src/protocols/gg/gg.c:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "Kunde inte ansluta"
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "Kan inte läsa från uttag"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:208
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:204
 msgid "Unable to connect."
 msgstr "Kan inte ansluta."
 
+#: src/protocols/gg/gg.c:415
+msgid "Reading data"
+msgstr "Läser data"
+
 #: src/protocols/gg/gg.c:418
-msgid "Reading data"
-msgstr "Läser data"
+msgid "Balancer handshake"
+msgstr "Balanserarhandskakning"
 
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr "Balanserarhandskakning"
+msgid "Reading server key"
+msgstr "Läser servernyckel"
 
 #: src/protocols/gg/gg.c:424
-msgid "Reading server key"
-msgstr "Läser servernyckel"
-
-#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "Byter ut nyckelhash"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "Kritiskt fel i GG-bibliotek\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:184
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/toc/toc.c:180
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "Kan inte pinga server"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "Skicka som meddelande"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "Slår upp GG-server"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "Slår upp GG-server"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Ogiltigt Gadu-Gadu-UIN angivet"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Du försöker skicka ett meddelande till ett ogiltigt Gadu-Gadu-UIN."
 
 # src/message.c:76
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "Kunde inte få tag i sökresultat"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-sökmotor"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3952
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3887
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:671
+#: src/protocols/gg/gg.c:668
 msgid "First name"
 msgstr "Förnamn"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1379
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3954
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3889
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
 msgstr "Födelseår"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "Kön"
 
-#: src/protocols/gg/gg.c:737
+#. res[0] == username
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1228
+#: src/protocols/msn/msn.c:1426 src/protocols/napster/napster.c:391
+#: src/protocols/oscar/oscar.c:2883 src/protocols/oscar/oscar.c:3181
+#: src/protocols/toc/toc.c:502 src/protocols/yahoo/yahoo.c:2402
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/yahoo/yahoo.c:2557 src/protocols/zephyr/zephyr.c:357
+msgid "Buddy Information"
+msgstr "Information om kompis"
+
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Det finns ingen kompislista lagrad på servern. Ledsen!"
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kunde inte importera kompislista från servern"
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Kompislistan skickades utan problem till servern"
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunde inte överföra kompislista till servern"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Kompislistan togs utan problem bort från Gadu-Gadu-servern"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunde inte ta bort kompislistan från servern"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "Lösenordet ändrades utan problem"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Lösenordet kunde inte ändras"
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Fel vid kommunikation med servern"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4156,35 +4298,35 @@
 "Gaim kunde inte genomföra din begäran på grund av ett kommunikationsproblem "
 "med Gadu-Gadu-HTTPservern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Kunde inte importera Gadu-Gadu-kompislistan"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 "Gaim kunde inte ansluta till Gadu-Gadu-kompislistservern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1063
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Kunde inte exportera kompislista"
 
-#: src/protocols/gg/gg.c:1064 src/protocols/gg/gg.c:1087
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim kunde inte ansluta till kompislistservern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1086
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Kunde inte radera Gadu-Gadu-kompislista"
 
-#: src/protocols/gg/gg.c:1135
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "Kan inte komma åt katalogen"
 
-#: src/protocols/gg/gg.c:1136
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4192,11 +4334,11 @@
 "Gaim kunde inte söka i katalogen eftersom det inte gick att ansluta till "
 "katalogservern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1169
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kan inte ändra Gadu-Gadu lösenord"
 
-#: src/protocols/gg/gg.c:1170
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4204,27 +4346,32 @@
 "Gaim kunde inte byta ditt lösenord på grund av ett fel vid anslutningen till "
 "Gadu-Gadu-servern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1186
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "Katalogsökning"
 
-#: src/protocols/gg/gg.c:1202
+#: src/protocols/gg/gg.c:1204 src/protocols/oscar/oscar.c:6347
+#: src/protocols/toc/toc.c:1547
+msgid "Change Password"
+msgstr "Byt lösenord"
+
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "Importera kompislista från servern"
 
-#: src/protocols/gg/gg.c:1208
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "Exportera kompislista till servern"
 
-#: src/protocols/gg/gg.c:1214
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "Ta bort kompislista från server"
 
-#: src/protocols/gg/gg.c:1247
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "Kan inte komma åt användarprofil."
 
-#: src/protocols/gg/gg.c:1248
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4242,7 +4389,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1360 src/protocols/gg/gg.c:1362
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Insticksmodul för Gadu-Gadu-protokoll"
 
@@ -4255,15 +4402,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Användaren %s (%s%s%s%s%s) vill bli auktoriserad av dig."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
-#: src/protocols/msn/notification.c:463 src/protocols/msn/notification.c:744
-#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5129
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:179
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
+#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2613
+#: src/protocols/oscar/oscar.c:5076
 msgid "Authorize"
 msgstr "Auktorisera"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/notification.c:464 src/protocols/msn/notification.c:746
-#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5130
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:180
+#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
+#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2615
+#: src/protocols/oscar/oscar.c:5077
 msgid "Deny"
 msgstr "Neka"
 
@@ -4319,13 +4468,17 @@
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/protocols/irc/irc.c:159 src/protocols/oscar/oscar.c:684
-#: src/protocols/toc/toc.c:236
+#: src/protocols/irc/irc.c:145
+msgid "IRC nicks may not contain whitespace"
+msgstr ""
+
+#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:684
+#: src/protocols/toc/toc.c:232
 #, c-format
 msgid "Signon: %s"
 msgstr "Inloggning: %s"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:173
 msgid "Couldn't create socket"
 msgstr "Kunde inte skapa socket"
 
@@ -4338,155 +4491,176 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:487
+#: src/protocols/irc/irc.c:495
 msgid "IRC Protocol Plugin"
 msgstr "Insticksmodul för IRC-protokoll"
 
 #. *  summary
-#: src/protocols/irc/irc.c:488
+#: src/protocols/irc/irc.c:496
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Insticksmodulen för IRC-protokollet som inte suger lika mycket"
 
-#. Splits
-#: src/protocols/irc/irc.c:505 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4422 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:674 src/protocols/napster/napster.c:641
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:511
+#: src/protocols/irc/irc.c:519
 msgid "Encoding"
 msgstr "Kodar"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "Felaktigt läge"
 
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "Du har är bannlyst i %s."
 
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "Bannlyst"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifierad)</i>"
 
-#: src/protocols/irc/msgs.c:193
+#: src/protocols/irc/msgs.c:191
 msgid "Username"
 msgstr "Användarnamn"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:1482
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2481
 msgid "Realname"
 msgstr "För- och efternamn"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr "För närvarande på"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inaktiv i:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "Ansluten sedan"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:219
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "Information om kompis för %s"
+
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s har bytt ämne till: %s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Ämnet för %s är: %s"
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Okänt meddelande '%s'"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "Okänt meddelande"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim har skickat ett meddelande som IRC-servern inte förstod."
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "Ingen sådan kanal"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "Användaren är inte inloggad"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "Inget sådant nick eller kanal"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "Kunde inte skicka"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Det krävs en inbjudan för att anknyta till %s."
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "Endast inbjudna"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du har sparkats ut av %s: (%s)"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Utsparkad av %s (%s)"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "läge (%s %s) av %s"
 
-#: src/protocols/irc/msgs.c:667
+#: src/protocols/irc/msgs.c:660
+msgid "Could not change nick"
+msgstr "Kunde inte byta nick"
+
+#: src/protocols/irc/msgs.c:661
+msgid "Cannot change nick"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har delat kanalen%s%s"
 
-#: src/protocols/irc/msgs.c:705
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "Fel: Ogiltig PONG från server"
 
-#: src/protocols/irc/msgs.c:707
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- Fördröjning: %lu sekunder"
 
-#: src/protocols/irc/msgs.c:795
+#: src/protocols/irc/msgs.c:792
+#, c-format
+msgid "Cannot join %s:"
+msgstr "Kan inte ansluta till %s:"
+
+#: src/protocols/irc/msgs.c:793
+msgid "Cannot join channel"
+msgstr "Kan inte ansluta till kanalen"
+
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:158
+#: src/protocols/irc/parse.c:160
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4494,287 +4668,142 @@
 "(Det blev ett fel vid konverteringen av detta meddelande. Kontrollera "
 "\"Kodning\" inställningen för kontot."
 
-#: src/protocols/irc/parse.c:273
+#: src/protocols/irc/parse.c:291
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svarstid från %s: %lu sekunder"
 
-#: src/protocols/irc/parse.c:274
+#: src/protocols/irc/parse.c:292
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:274
+#: src/protocols/irc/parse.c:292
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: src/protocols/irc/parse.c:373
+#: src/protocols/irc/parse.c:391
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jabber.c:580
-#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
-#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
-#: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:73
-#: src/protocols/msn/msn.c:93 src/protocols/msn/msn.c:151
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:507
-#: src/protocols/msn/msn.c:618 src/protocols/msn/msn.c:634
-#: src/protocols/msn/msn.c:669 src/protocols/msn/msn.c:685
-#: src/protocols/msn/msn.c:717 src/protocols/msn/msn.c:725
-#: src/protocols/msn/msn.c:758 src/protocols/msn/msn.c:766
-#: src/protocols/msn/msn.c:780 src/protocols/msn/msn.c:789
-#: src/protocols/msn/msn.c:803 src/protocols/msn/msn.c:827
-#: src/protocols/msn/msn.c:877 src/protocols/msn/msn.c:915
-#: src/protocols/msn/msn.c:1012 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1054 src/protocols/msn/msn.c:1065
-#: src/protocols/msn/msn.c:1076 src/protocols/msn/msn.c:1100
-#: src/protocols/msn/msn.c:1112 src/protocols/msn/notification.c:127
-#: src/protocols/msn/notification.c:154 src/protocols/msn/notification.c:946
-#: src/protocols/msn/notification.c:966 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
-#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
-#: src/protocols/trepia/trepia.c:1263
-msgid "Write error"
-msgstr "Skrivfel"
-
-#: src/protocols/jabber/jabber.c:979 src/protocols/jabber/jabber.c:986
-msgid "Unable to change password."
-msgstr "Kan inte ändra lösenord."
-
-#: src/protocols/jabber/jabber.c:980
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr ""
-"Det nuvarande lösenordet du anget är felaktigt, ditt lösenord har inte "
-"ändrats."
-
-#: src/protocols/jabber/jabber.c:987
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr ""
-"Det nya lösenord du anget är det samma som det tidigare, ditt lösenord har "
-"inte ändrats."
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1180 src/protocols/jabber/jabber.c:3438
-#: src/protocols/jabber/jabber.c:3489
-msgid "Chatty"
-msgstr "Pratig"
-
-#: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3440
-#: src/protocols/jabber/jabber.c:3497
-msgid "Extended Away"
-msgstr "Utökad frånvaro"
-
-#: src/protocols/jabber/jabber.c:1184 src/protocols/jabber/jabber.c:3441
-#: src/protocols/jabber/jabber.c:3501 src/protocols/oscar/oscar.c:2834
-#: src/protocols/oscar/oscar.c:4585 src/protocols/oscar/oscar.c:5876
-msgid "Do Not Disturb"
-msgstr "Stör inte"
-
-#: src/protocols/jabber/jabber.c:1423
-#, c-format
-msgid "Jabber Error %s"
-msgstr "Jabber-fel %s"
-
-#: src/protocols/jabber/jabber.c:1530
-#, c-format
-msgid "Error %s: %s"
-msgstr "Fel %s: %s"
-
-#: src/protocols/jabber/jabber.c:1533
-msgid "Unknown Error in presence"
-msgstr "Okänt fel i närvaro"
-
-#: src/protocols/jabber/jabber.c:1711
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "Användaren %s vill lägga till dig i dennes kompislista."
-
-#: src/protocols/jabber/jabber.c:1739
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr ""
-"Jabber-användaren %s finns inte och lades därför inte till i din lista."
-
-#: src/protocols/jabber/jabber.c:1742
-msgid "No such user."
-msgstr "Ingen sådan användare."
-
-#: src/protocols/jabber/jabber.c:1906
-msgid "Authenticating"
-msgstr "Autentiserar"
-
-#: src/protocols/jabber/jabber.c:1940
-msgid "Unknown login error"
-msgstr "Okänt inloggningsfel"
-
-#: src/protocols/jabber/jabber.c:2290
-msgid "Password successfully changed."
-msgstr "Ändring av lösenord lyckades."
-
-#: src/protocols/jabber/jabber.c:2335 src/protocols/jabber/jabber.c:4240
-msgid "Connection lost"
-msgstr "Anslutningen tappades"
-
-#: src/protocols/jabber/jabber.c:2337 src/protocols/jabber/jabber.c:2371
-#: src/protocols/jabber/jabber.c:4242 src/protocols/jabber/jabber.c:4291
-#: src/protocols/msn/dispatch.c:160 src/protocols/msn/msn.c:461
-#: src/protocols/msn/notification.c:1380 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:959
-msgid "Unable to connect"
-msgstr "Kan inte ansluta"
-
-#: src/protocols/jabber/jabber.c:2342
-msgid "Connected"
-msgstr "Ansluten"
-
-#: src/protocols/jabber/jabber.c:2345
-msgid "Requesting Authentication Method"
-msgstr "Begär autentiseringsmetod"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2365 src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:452 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:982
-msgid "Connecting"
-msgstr "Ansluter"
-
-#: src/protocols/jabber/jabber.c:2691
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "%s är ett ogiltig Jabber-ID och lades därför inte till."
-
-#: src/protocols/jabber/jabber.c:2693
-msgid "Unable to add buddy."
-msgstr "Kan inte lägga till kompis."
-
-#: src/protocols/jabber/jabber.c:2694
-msgid "Jabber Error"
-msgstr "Jabber-fel"
-
-#: src/protocols/jabber/jabber.c:2953
-msgid "Room:"
-msgstr "Rum:"
-
-#: src/protocols/jabber/jabber.c:2958
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/jabber.c:2964
-msgid "Handle:"
-msgstr "Handtag:"
-
-#: src/protocols/jabber/jabber.c:2994
-msgid "Unable to join chat"
-msgstr "Kan inte ansluta till chatt"
-
-#: src/protocols/jabber/jabber.c:3230 src/protocols/jabber/jabber.c:3281
-#: src/protocols/jabber/jabber.c:3699
-msgid "Jabber ID"
-msgstr "Jabber-ID"
-
-#: src/protocols/jabber/jabber.c:3231
-msgid "Error"
-msgstr "Fel"
-
-#: src/protocols/jabber/jabber.c:3282 src/protocols/jabber/jabber.c:3341
-#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3725
-msgid "Status"
-msgstr "Status"
-
-#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3374
-#: src/protocols/oscar/oscar.c:5491
+#: src/protocols/jabber/auth.c:54 src/protocols/jabber/auth.c:338
+#: src/protocols/jabber/auth.c:350
+msgid "Invalid response from server"
+msgstr "Ogiltigt svar från servern"
+
+#: src/protocols/jabber/auth.c:73 src/protocols/jabber/auth.c:120
+msgid "Server does not use any supported authentication method"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:323
+msgid "Invalid challenge from server"
+msgstr "Ogiltigt utmaning från servern"
+
+#: src/protocols/jabber/auth.c:353
+msgid "Bad Protocol"
+msgstr "Fel i protokollet"
+
+#: src/protocols/jabber/auth.c:356
+msgid "Encryption Required"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:359
+msgid "Invalid authzid"
+msgstr "Ogiltigt \"authzid\""
+
+#: src/protocols/jabber/auth.c:362
+msgid "Invalid Mechanism"
+msgstr "Ogiltigt mekanism"
+
+#: src/protocols/jabber/auth.c:364
+msgid "Invalid Realm"
+msgstr "Ogiltigt Gräns"
+
+#: src/protocols/jabber/auth.c:367
+msgid "Mechanism Too Weak"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:370 src/protocols/jabber/jabber.c:128
+#: src/protocols/jabber/jabber.c:502 src/protocols/jabber/jabber.c:550
+#: src/protocols/oscar/oscar.c:5466
 msgid "Not Authorized"
 msgstr "Inte auktoriserad"
 
-#: src/protocols/jabber/jabber.c:3387
-msgid "View Error Msg"
-msgstr "Visa felmeddelanden"
-
-#: src/protocols/jabber/jabber.c:3406
-msgid "Un-hide From"
-msgstr "Göm inte \"Från\""
-
-#: src/protocols/jabber/jabber.c:3409
-msgid "Temporarily Hide From"
-msgstr "Göm temporärt \"Från\""
-
-#: src/protocols/jabber/jabber.c:3416
-msgid "Cancel Presence Notification"
-msgstr "Avbryt närvaronotifiering"
-
-#: src/protocols/jabber/jabber.c:3424 src/protocols/oscar/oscar.c:5937
-msgid "Re-request authorization"
-msgstr "Begär autentiserings igen"
-
-#: src/protocols/jabber/jabber.c:3627
+#: src/protocols/jabber/auth.c:373
+msgid "Temporary Authentication Failure"
+msgstr "Tillfälligt Autentiserings fel"
+
+#: src/protocols/jabber/auth.c:375
+msgid "Authentication Failure"
+msgstr "Autentiseringen misslyckades"
+
+#: src/protocols/jabber/buddy.c:232 src/protocols/jabber/buddy.c:575
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: src/protocols/jabber/jabber.c:3628
+#: src/protocols/jabber/buddy.c:233 src/protocols/jabber/buddy.c:588
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/buddy.c:234 src/protocols/jabber/buddy.c:592
 msgid "Given Name"
 msgstr "Förnamn"
 
-#: src/protocols/jabber/jabber.c:3630 src/protocols/yahoo/yahoo.c:1478
+#: src/protocols/jabber/buddy.c:235 src/protocols/jabber/buddy.c:603
+#: src/protocols/yahoo/yahoo.c:2477
 msgid "Nickname"
 msgstr "Nick"
 
-#: src/protocols/jabber/jabber.c:3632
+#: src/protocols/jabber/buddy.c:237 src/protocols/jabber/buddy.c:631
 msgid "Street Address"
 msgstr "Gatuadress"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/buddy.c:238 src/protocols/jabber/buddy.c:627
 msgid "Extended Address"
 msgstr "Utökad adress"
 
-#: src/protocols/jabber/jabber.c:3634
+#: src/protocols/jabber/buddy.c:239 src/protocols/jabber/buddy.c:635
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3635
+#: src/protocols/jabber/buddy.c:240 src/protocols/jabber/buddy.c:639
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/buddy.c:241 src/protocols/jabber/buddy.c:643
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#: src/protocols/jabber/jabber.c:3638
+#: src/protocols/jabber/buddy.c:243 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:666
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3640
+#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:700
 msgid "Organization Name"
 msgstr "Organisationsnamn"
 
-#: src/protocols/jabber/jabber.c:3641
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:704
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
-#: src/protocols/jabber/jabber.c:3642
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:710
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:713
 msgid "Role"
 msgstr "Roll"
 
-#: src/protocols/jabber/jabber.c:3644 src/protocols/oscar/oscar.c:3986
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:606
+#: src/protocols/oscar/oscar.c:3921
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: src/protocols/jabber/jabber.c:4102 src/protocols/jabber/jabber.c:4103
+#: src/protocols/jabber/buddy.c:493 src/protocols/jabber/buddy.c:494
 msgid "Edit Jabber vCard"
 msgstr "Redigera Jabber-vCard"
 
-#: src/protocols/jabber/jabber.c:4104
+#: src/protocols/jabber/buddy.c:495
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4782,18 +4811,224 @@
 "Alla poster nedan är valfria. Ange endast den information som du vill lämna "
 "ut."
 
-#: src/protocols/jabber/jabber.c:4177
-msgid "Server Registration successful!"
-msgstr "Serverregistrering lyckades!"
-
-#: src/protocols/jabber/jabber.c:4193
-#, c-format
-msgid "Error %d: %s"
-msgstr "Fel %d: %s"
-
-#: src/protocols/jabber/jabber.c:4198
-msgid "Unknown registration error"
-msgstr "Okänt registreringsfel"
+#: src/protocols/jabber/buddy.c:531
+msgid "Jabber ID"
+msgstr "Jabber-ID"
+
+#: src/protocols/jabber/buddy.c:539 src/protocols/jabber/buddy.c:545
+#: src/protocols/jabber/buddy.c:555 src/protocols/jabber/jabber.c:537
+#: src/protocols/jabber/jabber.c:550
+msgid "Status"
+msgstr "Status"
+
+#: src/protocols/jabber/buddy.c:553 src/protocols/jabber/jabber.c:677
+msgid "Resource"
+msgstr "Tillgång"
+
+#: src/protocols/jabber/buddy.c:611 src/protocols/oscar/oscar.c:3938
+#: src/protocols/oscar/oscar.c:3954
+msgid "Address"
+msgstr "Adress"
+
+#: src/protocols/jabber/buddy.c:623
+msgid "P.O. Box"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:724
+msgid "Jabber Profile"
+msgstr "Jabber-profil"
+
+#: src/protocols/jabber/buddy.c:819
+msgid "Un-hide From"
+msgstr "Göm inte \"Från\""
+
+#: src/protocols/jabber/buddy.c:822
+msgid "Temporarily Hide From"
+msgstr "Göm temporärt \"Från\""
+
+#: src/protocols/jabber/buddy.c:830
+msgid "Cancel Presence Notification"
+msgstr "Avbryt närvaronotifiering"
+
+#: src/protocols/jabber/buddy.c:838
+msgid "Re-request authorization"
+msgstr "Begär autentiserings igen"
+
+#: src/protocols/jabber/chat.c:35 src/protocols/yahoo/yahoochat.c:833
+msgid "Room:"
+msgstr "Rum:"
+
+#: src/protocols/jabber/chat.c:42
+msgid "Server:"
+msgstr "Server:"
+
+#: src/protocols/jabber/chat.c:48
+msgid "Handle:"
+msgstr "Handtag:"
+
+#: src/protocols/jabber/jabber.c:78
+msgid "Error initializing session"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:103
+msgid "Bad Format"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Namespace Prefix"
+msgstr "Felaktigt namnrymdsprefix"
+
+#: src/protocols/jabber/jabber.c:108
+msgid "Resource Conflict"
+msgstr "Resurskonflikt"
+
+#: src/protocols/jabber/jabber.c:110
+msgid "Connection Timeout"
+msgstr "Anslutningen överskred en tidsgräns och tappades"
+
+#: src/protocols/jabber/jabber.c:112
+msgid "Host Gone"
+msgstr "Värden försvann"
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Unknown"
+msgstr "Värd okänd"
+
+#: src/protocols/jabber/jabber.c:116
+msgid "Improper Addressing"
+msgstr "Olämplig adressering"
+
+#: src/protocols/jabber/jabber.c:118
+msgid "Internal Server Error"
+msgstr "Internt serverfel"
+
+#: src/protocols/jabber/jabber.c:120
+msgid "Invalid ID"
+msgstr "Ogiltigt ID"
+
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid Namespace"
+msgstr "Ogiltig namnrymd"
+
+#: src/protocols/jabber/jabber.c:124
+msgid "Invalid XML"
+msgstr "Ogiltig XML"
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Non-matching Hosts"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:130
+msgid "Policy Violation"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:132
+msgid "Remote Connection Failed"
+msgstr "Fjärranslutning misslyckades"
+
+#: src/protocols/jabber/jabber.c:134
+msgid "Resource Constraint"
+msgstr "Resursbegränsning"
+
+#: src/protocols/jabber/jabber.c:136
+msgid "Restricted XML"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:138
+msgid "See Other Host"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:140
+msgid "System Shutdown"
+msgstr "Systemet stängs av"
+
+#: src/protocols/jabber/jabber.c:142
+msgid "Undefined Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Unsupported Condition"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Version"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:150
+msgid "XML Not Well Formed"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:152
+msgid "Stream Error"
+msgstr "strömningsfel"
+
+#: src/protocols/jabber/jabber.c:230 src/protocols/msn/msn.c:75
+#: src/protocols/msn/msn.c:95 src/protocols/msn/msn.c:153
+#: src/protocols/msn/msn.c:253 src/protocols/msn/msn.c:509
+#: src/protocols/msn/msn.c:620 src/protocols/msn/msn.c:636
+#: src/protocols/msn/msn.c:684 src/protocols/msn/msn.c:707
+#: src/protocols/msn/msn.c:739 src/protocols/msn/msn.c:747
+#: src/protocols/msn/msn.c:780 src/protocols/msn/msn.c:788
+#: src/protocols/msn/msn.c:802 src/protocols/msn/msn.c:811
+#: src/protocols/msn/msn.c:825 src/protocols/msn/msn.c:849
+#: src/protocols/msn/msn.c:899 src/protocols/msn/msn.c:937
+#: src/protocols/msn/msn.c:1034 src/protocols/msn/msn.c:1066
+#: src/protocols/msn/msn.c:1087 src/protocols/msn/msn.c:1098
+#: src/protocols/msn/msn.c:1109 src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1145 src/protocols/msn/msn.c:1210
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:781
+#: src/protocols/trepia/trepia.c:1064 src/protocols/trepia/trepia.c:1108
+#: src/protocols/trepia/trepia.c:1207 src/protocols/trepia/trepia.c:1263
+msgid "Write error"
+msgstr "Skrivfel"
+
+#: src/protocols/jabber/jabber.c:375 src/protocols/trepia/trepia.c:1147
+msgid "Unable to create socket"
+msgstr "Kan inte skapa socket"
+
+#: src/protocols/jabber/jabber.c:408 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:491
+#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1755
+msgid "Connecting"
+msgstr "Ansluter"
+
+#: src/protocols/jabber/jabber.c:412
+msgid "Initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:418
+msgid "Authenticating"
+msgstr "Autentiserar"
+
+#: src/protocols/jabber/jabber.c:424
+msgid "Re-initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:545 src/protocols/jabber/presence.c:254
+msgid "Error"
+msgstr "Fel"
+
+#: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
+msgid "Chatty"
+msgstr "Pratig"
+
+#: src/protocols/jabber/jabber.c:563 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
+msgid "Extended Away"
+msgstr "Utökad frånvaro"
+
+#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2831
+#: src/protocols/oscar/oscar.c:4527 src/protocols/oscar/oscar.c:6060
+msgid "Do Not Disturb"
+msgstr "Stör inte"
 
 #. *< api_version
 #. *< type
@@ -4805,60 +5040,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4401 src/protocols/jabber/jabber.c:4403
+#: src/protocols/jabber/jabber.c:654 src/protocols/jabber/jabber.c:656
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-insticksmodul"
 
-#: src/protocols/jabber/jabber.c:4425
-msgid "Resource"
-msgstr "Tillgång"
-
-#: src/protocols/jabber/jabber.c:4433
+#: src/protocols/jabber/jabber.c:681
+msgid "Force Old SSL"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:690
 msgid "Connect server"
 msgstr "Anslut server"
 
-#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:226
-msgid "Protocol not supported"
-msgstr "Protokollet stöds inte"
-
-#: src/protocols/msn/dispatch.c:51 src/protocols/msn/notification.c:232
-msgid "Unable to request INF"
-msgstr "Kan inte begära INF"
-
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:249
+#: src/protocols/jabber/message.c:125
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr ""
+
+#: src/protocols/jabber/message.c:128
+msgid "Jabber Message Error"
+msgstr "Jabber-meddelandefel"
+
+#: src/protocols/jabber/message.c:191
+#, c-format
+msgid " (Code %s)"
+msgstr ""
+
+#: src/protocols/jabber/parser.c:128
+msgid "XML Parse error"
+msgstr "XML tolkningsfel"
+
+#: src/protocols/jabber/presence.c:166
+#, c-format
+msgid "%s (Code %s)"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:170
+msgid "Unknown Error in presence"
+msgstr "Okänt fel i närvaro"
+
+#: src/protocols/jabber/presence.c:174
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "Användaren %s vill lägga till dig i dennes kompislista."
+
+#: src/protocols/jabber/presence.c:250
+msgid "Unable to join chat"
+msgstr "Kan inte ansluta till chatt"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:499
+msgid "Unable to request USR\n"
+msgstr "Kan inte begära USR\n"
+
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "Kan inte loggain med MD5"
 
-#: src/protocols/msn/dispatch.c:77 src/protocols/msn/notification.c:258
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "Kan inte skicka USR"
 
-#: src/protocols/msn/dispatch.c:82 src/protocols/msn/notification.c:263
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "Begär att få skicka lösenord"
 
-#: src/protocols/msn/dispatch.c:99 src/protocols/msn/notification.c:1165
+#: src/protocols/msn/dispatch.c:104
+msgid "Protocol version not supported"
+msgstr "Protokollversionen stöds inte"
+
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
+msgid "Unable to request CVR\n"
+msgstr "Kan inte begära CVR\n"
+
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
+msgid "Unable to request INF\n"
+msgstr "Kan inte begära INF\n"
+
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
 msgid "Got invalid XFR"
 msgstr "Har felaktig XFR"
 
-#: src/protocols/msn/dispatch.c:126
+#: src/protocols/msn/dispatch.c:178
 msgid "Unable to transfer"
 msgstr "Kan inte överföra"
 
-#: src/protocols/msn/dispatch.c:147
+#: src/protocols/msn/dispatch.c:199
 msgid "Unable to parse message."
 msgstr "Kan inte avkoda meddelandet."
 
-#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:404
-#: src/protocols/msn/notification.c:1389
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
+#: src/protocols/msn/notification.c:2102 src/protocols/napster/napster.c:467
+#: src/protocols/napster/napster.c:498 src/protocols/yahoo/yahoo.c:1732
+msgid "Unable to connect"
+msgstr "Kan inte ansluta"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:2124
 msgid "Unable to write to server"
 msgstr "Kan inte skriva till servern"
 
-#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1396
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2131
 msgid "Syncing with server"
 msgstr "Synkroniserar med server"
 
-#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1410
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2145
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
@@ -4914,150 +5200,187 @@
 msgid "Already in opposite list"
 msgstr "Finns redan i motpartens lista"
 
-#: src/protocols/msn/error.c:75
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "Försökte lägga till en kontakt till en grupp som inte finns."
-
-#: src/protocols/msn/error.c:79
-msgid "Switchboard failed"
-msgstr "Växeln misslyckades"
-
-#: src/protocols/msn/error.c:82
-msgid "Notify Transfer failed"
-msgstr "Notifieringsöverföring misslyckad"
+#: src/protocols/msn/error.c:74
+msgid "Too many groups"
+msgstr "För många grupper"
+
+#: src/protocols/msn/error.c:77
+msgid "Invalid group"
+msgstr "Ogiltig grupp"
+
+#: src/protocols/msn/error.c:80
+msgid "User not in group"
+msgstr ""
+
+#: src/protocols/msn/error.c:83
+msgid "Group name too long"
+msgstr "Gruppnamnet är för långt"
 
 #: src/protocols/msn/error.c:86
+msgid "Cannot remove group zero"
+msgstr ""
+
+#: src/protocols/msn/error.c:90
+msgid "Tried to add a contact to a group that doesn't exist"
+msgstr "Försökte lägga till en kontakt till en grupp som inte finns."
+
+#: src/protocols/msn/error.c:94
+msgid "Switchboard failed"
+msgstr "Växeln misslyckades"
+
+#: src/protocols/msn/error.c:97
+msgid "Notify Transfer failed"
+msgstr "Notifieringsöverföring misslyckad"
+
+#: src/protocols/msn/error.c:101
 msgid "Required fields missing"
 msgstr "Nödvändiga fält saknas"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
+#: src/protocols/msn/error.c:104
+msgid "Too many hits to a FND"
+msgstr ""
+
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:184
 msgid "Not logged in"
 msgstr "Inte inloggad"
 
-#: src/protocols/msn/error.c:93
+#: src/protocols/msn/error.c:111
 msgid "Internal server error"
 msgstr "Internt serverfel"
 
-#: src/protocols/msn/error.c:96
+#: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "Databasserverfel"
 
-#: src/protocols/msn/error.c:99
+#: src/protocols/msn/error.c:117
 msgid "File operation error"
 msgstr "Filoperationsfel"
 
-#: src/protocols/msn/error.c:102
+#: src/protocols/msn/error.c:120
 msgid "Memory allocation error"
 msgstr "Minnesallokeringsfel"
 
-#: src/protocols/msn/error.c:105
+#: src/protocols/msn/error.c:123
 msgid "Wrong CHL value sent to server"
 msgstr "Fel CHL-värde skickat till servern"
 
-#: src/protocols/msn/error.c:109
+#: src/protocols/msn/error.c:127
 msgid "Server busy"
 msgstr "Servern upptagen"
 
-#: src/protocols/msn/error.c:112
+#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:198
 msgid "Server unavailable"
 msgstr "Servern är otillgänglig"
 
-#: src/protocols/msn/error.c:115
+#: src/protocols/msn/error.c:133
 msgid "Peer Notification server down"
 msgstr "Motpartsnotifieringsserver nere"
 
-#: src/protocols/msn/error.c:118
+#: src/protocols/msn/error.c:136
 msgid "Database connect error"
 msgstr "Databasanslutningsfel"
 
-#: src/protocols/msn/error.c:122
+#: src/protocols/msn/error.c:140
 msgid "Server is going down (abandon ship)"
 msgstr "Servern är påväg ner (överge skeppet)"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:147
 msgid "Error creating connection"
 msgstr "Fel vid skapandet av anslutning"
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:151
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrar är antingen okända eller inte tillåtna"
 
-#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:289
-#: src/protocols/msn/notification.c:757
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
+#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
 msgid "Unable to write"
 msgstr "Kan inte skriva"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:157
 msgid "Session overload"
 msgstr "Sessionsöverlast"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:160
 msgid "User is too active"
 msgstr "Användaren är för aktiv"
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:163
 msgid "Too many sessions"
 msgstr "För många sessioner"
 
-#: src/protocols/msn/error.c:145
+#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
 msgid "Not expected"
 msgstr "Ej väntat"
 
-#: src/protocols/msn/error.c:148
+#: src/protocols/msn/error.c:169
 msgid "Bad friend file"
 msgstr "Fel på friend-fil"
 
-#: src/protocols/msn/error.c:152 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:661
+#: src/protocols/msn/error.c:177
+msgid "Friendly name changes too rapidly"
+msgstr ""
+
+#: src/protocols/msn/error.c:186
+msgid "Server too busy"
+msgstr "Servern är för upptagen"
+
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1079
+#: src/protocols/toc/toc.c:663
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: src/protocols/msn/error.c:155
+#: src/protocols/msn/error.c:193
 msgid "Not allowed when offline"
 msgstr "Inte tillåtet vid ej ansluten"
 
-#: src/protocols/msn/error.c:158
+#: src/protocols/msn/error.c:201
 msgid "Not accepting new users"
 msgstr "Accepterar inte nya användare"
 
-#: src/protocols/msn/error.c:162
+#: src/protocols/msn/error.c:205
+msgid "Kids Passport without parental consent"
+msgstr ""
+
+#: src/protocols/msn/error.c:209
 msgid "Passport account not yet verified"
 msgstr "Passkonto ännu inte verifierat"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:213
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Okänd felkod %d"
 
-#: src/protocols/msn/msn.c:61
+#: src/protocols/msn/msn.c:63
 msgid "Your new MSN friendly name is too long."
 msgstr "Ditt nya MSN-alias är för långt."
 
-#: src/protocols/msn/msn.c:168
+#: src/protocols/msn/msn.c:170
 msgid "Set your friendly name."
 msgstr "Ställ in alias."
 
-#: src/protocols/msn/msn.c:169
+#: src/protocols/msn/msn.c:171
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Detta är det namn som andra MSN-användare kommer att se."
 
-#: src/protocols/msn/msn.c:181
+#: src/protocols/msn/msn.c:183
 msgid "Set your home phone number."
 msgstr "Ange ditt hemtelefonnummer."
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:194
 msgid "Set your work phone number."
 msgstr "Ange ditt jobbtelefonnummer."
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:205
 msgid "Set your mobile phone number."
 msgstr "Ange ditt mobiltelefonnummer."
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:214
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillåt MSN-mobilsökning?"
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:215
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5065,94 +5388,94 @@
 "Vill du tillåta kompisar i din kompislista att skicka MSN-mobilsökningar "
 "till din mobiltelefon eller annan mobil enhet?"
 
-#: src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:219
 msgid "Allow"
 msgstr "Tillåt"
 
-#: src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:220
 msgid "Disallow"
 msgstr "Tillåt ej"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:237
 msgid "Send a mobile message."
 msgstr "Skicka ett mobilmeddelande."
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:239
 msgid "Page"
 msgstr "Sök"
 
-#: src/protocols/msn/msn.c:326 src/protocols/yahoo/yahoo.c:1122
+#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1969
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:596
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Borta från Datorn"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:596
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1049
-#: src/protocols/yahoo/yahoo.c:1259 src/protocols/yahoo/yahoo.c:1335
+#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:598
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1835
+#: src/protocols/yahoo/yahoo.c:2133 src/protocols/yahoo/yahoo.c:2233
 msgid "Be Right Back"
 msgstr "Strax tillbaka"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:598
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1051
-#: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1336
+#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:600
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1837
+#: src/protocols/yahoo/yahoo.c:2135 src/protocols/yahoo/yahoo.c:2234
 msgid "Busy"
 msgstr "Upptagen"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:600
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1059
-#: src/protocols/yahoo/yahoo.c:1269 src/protocols/yahoo/yahoo.c:1340
+#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:602
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1845
+#: src/protocols/yahoo/yahoo.c:2143 src/protocols/yahoo/yahoo.c:2238
 msgid "On The Phone"
 msgstr "Pratar i telefon"
 
-#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:602
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1063
-#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1342
+#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:604
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1849
+#: src/protocols/yahoo/yahoo.c:2147 src/protocols/yahoo/yahoo.c:2240
 msgid "Out To Lunch"
 msgstr "På lunch"
 
-#: src/protocols/msn/msn.c:344 src/protocols/msn/msn.c:604
-#: src/protocols/zephyr/zephyr.c:861 src/protocols/zephyr/zephyr.c:876
+#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
+#: src/protocols/zephyr/zephyr.c:881 src/protocols/zephyr/zephyr.c:896
 msgid "Hidden"
 msgstr "Dold"
 
-#: src/protocols/msn/msn.c:356
+#: src/protocols/msn/msn.c:355
 msgid "Set Friendly Name"
 msgstr "Ange alias"
 
-#: src/protocols/msn/msn.c:364
+#: src/protocols/msn/msn.c:363
 msgid "Set Home Phone Number"
 msgstr "Ange hemtelefonnummer"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:369
 msgid "Set Work Phone Number"
 msgstr "Ange jobbtelefonnummer"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:375
 msgid "Set Mobile Phone Number"
 msgstr "Ställ in mobilnummer"
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:384
 msgid "Enable/Disable Mobile Devices"
 msgstr "Tillåt mobila enheter"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:391
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Tillåt mobilsökningar"
 
-#: src/protocols/msn/msn.c:415
+#: src/protocols/msn/msn.c:417
 msgid "Send to Mobile"
 msgstr "Skicka till mobil"
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:426
 msgid "Initiate Chat"
 msgstr "Starta chatt"
 
-#: src/protocols/msn/msn.c:698
+#: src/protocols/msn/msn.c:720
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5161,11 +5484,11 @@
 "Ett MSN användar-ID måste ha formatet \"användare@server.com\". Du kanske "
 "menade %s@hotmail.com. Ingen förändring gjordes i din godkännlista."
 
-#: src/protocols/msn/msn.c:702 src/protocols/msn/msn.c:742
+#: src/protocols/msn/msn.c:724 src/protocols/msn/msn.c:764
 msgid "Invalid MSN screenname"
 msgstr "Ogiltigt MSN användar-ID"
 
-#: src/protocols/msn/msn.c:738
+#: src/protocols/msn/msn.c:760
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5174,63 +5497,63 @@
 "Ett MSN användar-ID måste ha formatet \"användare@server.com\". Du kanske "
 "menade %s@hotmail.com. Ingen förändring gjordes i din blockeringslista."
 
-#: src/protocols/msn/msn.c:1170 src/protocols/yahoo/yahoo.c:1408
+#: src/protocols/msn/msn.c:1229 src/protocols/yahoo/yahoo.c:2403
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1218 src/protocols/oscar/oscar.c:3991
+#: src/protocols/msn/msn.c:1289 src/protocols/oscar/oscar.c:3926
 #: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:1490
+#: src/protocols/yahoo/yahoo.c:2489
 msgid "Age"
 msgstr "Ålder"
 
 #. Gender
-#: src/protocols/msn/msn.c:1222 src/protocols/oscar/oscar.c:3977
+#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:3912
 #: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:1498
+#: src/protocols/yahoo/yahoo.c:2497
 msgid "Gender"
 msgstr "Kön"
 
-#: src/protocols/msn/msn.c:1226 src/protocols/yahoo/yahoo.c:1494
+#: src/protocols/msn/msn.c:1297 src/protocols/yahoo/yahoo.c:2493
 msgid "Marital Status"
 msgstr "Civilstånd"
 
-#: src/protocols/msn/msn.c:1230 src/protocols/yahoo/yahoo.c:1486
+#: src/protocols/msn/msn.c:1301 src/protocols/yahoo/yahoo.c:2485
 msgid "Location"
 msgstr "Plats"
 
-#: src/protocols/msn/msn.c:1234 src/protocols/yahoo/yahoo.c:1502
+#: src/protocols/msn/msn.c:1305 src/protocols/yahoo/yahoo.c:2501
 msgid "Occupation"
 msgstr "Sysselsättning"
 
-#: src/protocols/msn/msn.c:1244 src/protocols/msn/msn.c:1246
-#: src/protocols/msn/msn.c:1248 src/protocols/msn/msn.c:1250
-#: src/protocols/msn/msn.c:1252
+#: src/protocols/msn/msn.c:1318 src/protocols/msn/msn.c:1325
+#: src/protocols/msn/msn.c:1333 src/protocols/msn/msn.c:1341
+#: src/protocols/msn/msn.c:1348
 msgid "A Little About Me"
 msgstr "Lite om mig"
 
-#: src/protocols/msn/msn.c:1256 src/protocols/msn/msn.c:1260
-#: src/protocols/msn/msn.c:1262
+#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1367
+#: src/protocols/msn/msn.c:1374
 msgid "Favorite Things"
 msgstr "Favoritsaker"
 
-#: src/protocols/msn/msn.c:1266 src/protocols/msn/msn.c:1268
-#: src/protocols/msn/msn.c:1270
+#: src/protocols/msn/msn.c:1380 src/protocols/msn/msn.c:1387
+#: src/protocols/msn/msn.c:1394
 msgid "Hobbies and Interests"
 msgstr "Hobbies och intressen"
 
-#: src/protocols/msn/msn.c:1274 src/protocols/msn/msn.c:1276
-#: src/protocols/yahoo/yahoo.c:1522
+#: src/protocols/msn/msn.c:1400 src/protocols/msn/msn.c:1406
+#: src/protocols/yahoo/yahoo.c:2521
 msgid "Favorite Quote"
 msgstr "Favoritcitat"
 
-#: src/protocols/msn/msn.c:1280 src/protocols/yahoo/yahoo.c:1551
+#: src/protocols/msn/msn.c:1411 src/protocols/yahoo/yahoo.c:2550
 msgid "Last Updated"
 msgstr "Senast uppdaterad"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1285 src/protocols/trepia/trepia.c:321
+#: src/protocols/msn/msn.c:1418 src/protocols/trepia/trepia.c:321
 #: src/protocols/trepia/trepia.c:489
 msgid "Homepage"
 msgstr "Hemsida"
@@ -5245,54 +5568,82 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1371 src/protocols/msn/msn.c:1373
+#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1512
 msgid "MSN Protocol Plugin"
 msgstr "insticksmodul för MSN-Protokollet"
 
-#: src/protocols/msn/msn.c:1390 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1531 src/protocols/trepia/trepia.c:1371
 msgid "Login server"
 msgstr "Inloggningsserver"
 
-#: src/protocols/msn/notification.c:194
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-fel: %s\n"
 
-#: src/protocols/msn/notification.c:294 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
+msgid "Unable to write to MSN Nexus server."
+msgstr "Kan inte skriva till MSN Nexus-server."
+
+#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
+msgid "Unable to read from MSN Nexus server."
+msgstr "Kan inte läsa huvud från MSN Nexus-server."
+
+#: src/protocols/msn/notification.c:392
+msgid "MSN Nexus server returned invalid redirect information."
+msgstr ""
+
+#: src/protocols/msn/notification.c:438
+msgid "Unknown error when attempting to authorize with MSN login server."
+msgstr ""
+
+#: src/protocols/msn/notification.c:550
+msgid "MSN Nexus server returned invalid information."
+msgstr ""
+
+#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:718
 msgid "Retrieving buddy list"
 msgstr "Tar emot kompislista"
 
-#: src/protocols/msn/notification.c:320
-msgid "Unable to send password"
-msgstr "Kan inte skicka lösenord"
-
-#: src/protocols/msn/notification.c:325
+#: src/protocols/msn/notification.c:680
+msgid "Unable to connect to passport server"
+msgstr "Kan inte ansluta till passport-servern."
+
+#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
 msgid "Password sent"
 msgstr "Lösenord skickat"
 
-#: src/protocols/msn/notification.c:343
+#: src/protocols/msn/notification.c:712
+msgid "Unable to send password"
+msgstr "Kan inte skicka lösenord"
+
+#: src/protocols/msn/notification.c:748
+msgid "Protocol not supported"
+msgstr "Protokollet stöds inte"
+
+#: src/protocols/msn/notification.c:790
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Du har blivit frånkopplad. Du har loggat in från en annan plats."
 
-#: src/protocols/msn/notification.c:348
+#: src/protocols/msn/notification.c:795
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Du har blivit frånkopplad. MSN-servrarna tas tillfälligt ner."
 
-#: src/protocols/msn/notification.c:459
+#: src/protocols/msn/notification.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Användaren %s (%s) vill lägga till %s i sin kompislista."
 
-#: src/protocols/msn/notification.c:738
+#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Användaren %s (%s) vill lägga till dig i sin kompislista."
 
-#: src/protocols/msn/notification.c:1207
+#: src/protocols/msn/notification.c:1921
 msgid "Unable to transfer to notification server"
 msgstr "Kan inte skicka till notifieringsserver"
 
-#: src/protocols/msn/notification.c:1345
+#: src/protocols/msn/notification.c:2065
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5317,16 +5668,16 @@
 "automatiskt att loggas ut. Passa på att avsluta dina konversationer innan "
 "tiden löper ut."
 
-#: src/protocols/msn/switchboard.c:122
+#: src/protocols/msn/switchboard.c:147
 msgid "The conversation has become inactive and timed out."
 msgstr "Konversationen har blivit inaktiv och väntetiden har tagit slut."
 
-#: src/protocols/msn/switchboard.c:129
+#: src/protocols/msn/switchboard.c:154
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s har stängt konversationsfönstret."
 
-#: src/protocols/msn/switchboard.c:251
+#: src/protocols/msn/switchboard.c:277
 msgid "An MSN message may not have been received."
 msgstr "Ett MSN-meddelande kanske inte blev mottaget."
 
@@ -5336,9 +5687,8 @@
 
 #: src/protocols/napster/napster.c:246
 #, c-format
-msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
-msgstr ""
-"Kan inte läsa meddelande från server. Kommandot är %hd, längden är %hd."
+msgid "Unable to read message from server.  Command is %hd, length is %hd."
+msgstr "Kan inte läsa meddelande från server. Kommandot är %hd, längden är %hd."
 
 #: src/protocols/napster/napster.c:307
 #, c-format
@@ -5361,7 +5711,7 @@
 msgid "%s requested your information"
 msgstr "%s begärde din information"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:414
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -5370,13 +5720,13 @@
 "plats."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s begärde en PING"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5200
-#: src/protocols/toc/toc.c:1236
+#: src/protocols/napster/napster.c:547 src/protocols/oscar/oscar.c:5147
+#: src/protocols/toc/toc.c:1262
 msgid "Join what group:"
 msgstr "Anslut till grupp:"
 
@@ -5390,103 +5740,103 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+#: src/protocols/napster/napster.c:623 src/protocols/napster/napster.c:625
 msgid "NAPSTER Protocol Plugin"
 msgstr "Insticksmodul för Napster-protokoll"
 
-#: src/protocols/oscar/oscar.c:179
-msgid "Invalid error"
-msgstr "Ogiltigt fel"
-
 #: src/protocols/oscar/oscar.c:180
-msgid "Invalid SNAC"
-msgstr "Ogiltig SNAC"
+msgid "Invalid error"
+msgstr "Ogiltigt fel"
 
 #: src/protocols/oscar/oscar.c:181
+msgid "Invalid SNAC"
+msgstr "Ogiltig SNAC"
+
+#: src/protocols/oscar/oscar.c:182
 msgid "Rate to host"
 msgstr "Hastighet till värd"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:183
 msgid "Rate to client"
 msgstr "Hastighet till klient"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:185
 msgid "Service unavailable"
 msgstr "Tjänsten är otillgänglig"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:186
 msgid "Service not defined"
 msgstr "Tjänst ej definierad"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:187
 msgid "Obsolete SNAC"
 msgstr "Obsolet SNAC"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:188
 msgid "Not supported by host"
 msgstr "Ej stödd av värd"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:189
 msgid "Not supported by client"
 msgstr "Ej stödd av klient"
 
-#: src/protocols/oscar/oscar.c:189
-msgid "Refused by client"
-msgstr "Vägrad av klient"
-
 #: src/protocols/oscar/oscar.c:190
-msgid "Reply too big"
-msgstr "Svar förstort"
+msgid "Refused by client"
+msgstr "Vägrad av klient"
 
 #: src/protocols/oscar/oscar.c:191
+msgid "Reply too big"
+msgstr "Svar förstort"
+
+#: src/protocols/oscar/oscar.c:192
 msgid "Responses lost"
 msgstr "Svar förlorade"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:193
 msgid "Request denied"
 msgstr "Begäran nekad"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:194
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:195
 msgid "Insufficient rights"
 msgstr "Otillräckliga rättigheter"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:196
 msgid "In local permit/deny"
 msgstr "I lokal tillåt/neka"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:197
 msgid "Too evil (sender)"
 msgstr "För onskefull (avsändare)"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:198
 msgid "Too evil (receiver)"
 msgstr "För onskefull (mottagare)"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:199
 msgid "User temporarily unavailable"
 msgstr "Användare är tillfälligt oåtkommlig"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:200
 msgid "No match"
 msgstr "Ingen träff"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:201
 msgid "List overflow"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:201
-msgid "Request ambiguous"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:202
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:203
 msgid "Queue full"
 msgstr "Kö full"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:204
 msgid "Not while on AOL"
 msgstr "Inte på AOL"
 
@@ -5500,13 +5850,13 @@
 msgid "Direct IM with %s failed"
 msgstr "Direktmeddelande med %s misslyckades"
 
-#: src/protocols/oscar/oscar.c:536 src/protocols/toc/toc.c:226
-#: src/protocols/toc/toc.c:627 src/protocols/toc/toc.c:643
-#: src/protocols/toc/toc.c:711
+#: src/protocols/oscar/oscar.c:536 src/protocols/toc/toc.c:222
+#: src/protocols/toc/toc.c:629 src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:713
 msgid "Disconnected."
 msgstr "Frånkopplad."
 
-#: src/protocols/oscar/oscar.c:548 src/protocols/toc/toc.c:887
+#: src/protocols/oscar/oscar.c:548 src/protocols/toc/toc.c:889
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frånkopplad från chattrummet %s."
@@ -5523,45 +5873,45 @@
 msgid "Unable to login to AIM"
 msgstr "Kan inte logga in till AIM"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1170
 msgid "Could Not Connect"
 msgstr "Kunde inte ansluta"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:790
 msgid "Connection established, cookie sent"
 msgstr "Anslutning etablerad, kaka skickad"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:857 src/protocols/oscar/oscar.c:870
+#: src/protocols/oscar/oscar.c:875
 msgid "File Transfer Aborted"
 msgstr "Filöverföring avbruten"
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:858
 msgid "Unable to establish listener socket."
 msgstr "Kan inte etablera lyssnar socket."
 
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to establish file descriptor."
 msgstr "Kan inte inte etablera filbeskrivning."
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to create new connection."
 msgstr "Kan inte skapa ny anslutning."
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:573
+#: src/protocols/oscar/oscar.c:1056 src/protocols/toc/toc.c:575
 msgid "Incorrect nickname or password."
 msgstr "Felaktigt nick eller lösenord."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1061
 msgid "Your account is currently suspended."
 msgstr "Ditt konto är avstängt för tillfället."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1065
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1070
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -5569,17 +5919,17 @@
 "Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
 "prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1075
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versionen av klienten du använder är för gammal. Uppgradera på %s"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1107
 msgid "Internal Error"
 msgstr "Internt fel"
 
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
+#: src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5588,29 +5938,29 @@
 "Du kanske snart blir frånkopplad, du kanske ska använda TOC tills detta är "
 "fixat. Kolla på %s efter uppdateringar."
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1212 src/protocols/oscar/oscar.c:1242
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim kunde inte hämta en giltig AIM-loginhash."
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1330
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim kunde inte hämta en giltig loginhash."
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5591
+#: src/protocols/oscar/oscar.c:1909 src/protocols/oscar/oscar.c:5566
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direktmeddelande med %s etablerat"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2238 src/protocols/oscar/oscar.c:2260
 msgid "(There was an error receiving this message)"
 msgstr "(Det uppstod ett fel när detta meddelande hämtades)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2407
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s har just frågat om att koppla sig direkt till %s"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2410
 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 "
@@ -5620,23 +5970,23 @@
 "IM-bilder ska fungera. Eftersom din IP-adress kommer att avslöjas kan detta "
 "betraktas som en säkerhetsrisk."
 
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:5752
+#: src/protocols/oscar/oscar.c:2415 src/protocols/oscar/oscar.c:5936
 msgid "Connect"
 msgstr "Anslut"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2442
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Användaren vill lägga till dig i dennes kompislista."
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2450
 msgid "Authorization Request Message:"
 msgstr "Meddelande om auktoriseringsbegäran:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2451
 msgid "Please authorize me!"
 msgstr "Snälla auktorisera mig!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2479
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -5645,23 +5995,23 @@
 "Användaren %s kräver auktorisering innan hon/han kan läggas till i din "
 "kompislista. Vill du skicka en auktoriseringsförfrågan?"
 
-#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2484 src/protocols/oscar/oscar.c:2486
 msgid "Request Authorization"
 msgstr "Begär auktorisering"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2606
-#: src/protocols/oscar/oscar.c:2626 src/protocols/oscar/oscar.c:3001
-#: src/protocols/oscar/oscar.c:3053 src/protocols/oscar/oscar.c:5121
-#: src/protocols/oscar/oscar.c:5167
+#: src/protocols/oscar/oscar.c:2522 src/protocols/oscar/oscar.c:2524
+#: src/protocols/oscar/oscar.c:2531 src/protocols/oscar/oscar.c:2603
+#: src/protocols/oscar/oscar.c:2623 src/protocols/oscar/oscar.c:2979
+#: src/protocols/oscar/oscar.c:3031 src/protocols/oscar/oscar.c:5068
+#: src/protocols/oscar/oscar.c:5114
 msgid "No reason given."
 msgstr "Ingen motivering angiven."
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2530
 msgid "Authorization Denied Message:"
 msgstr "Meddelande om auktorisering nekad:"
 
-#: src/protocols/oscar/oscar.c:2606
+#: src/protocols/oscar/oscar.c:2603
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5670,33 +6020,31 @@
 "Användaren %u vill lägga till dig i sin kompislista av följande anledning:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5127
+#: src/protocols/oscar/oscar.c:2611 src/protocols/oscar/oscar.c:5074
 msgid "Authorization Request"
 msgstr "Auktoriseringsbegäran"
 
-#: src/protocols/oscar/oscar.c:2626
+#: src/protocols/oscar/oscar.c:2623
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Användaren %u har nekat dig att lägga till honom/henne i din kompislista av "
-"följande orsak:\n"
+"Användaren %u har nekat dig att lägga till honom/henne i din kompislista av följande orsak:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2624
 msgid "ICQ authorization denied."
 msgstr "ICQ-auktorisering nekades."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2634
-#, c-format
-msgid "The user %u has granted your request to add them to your contact list."
-msgstr ""
-"Användaren %u har tillåtit dig att lägga till honom/henne i din kompislista."
-
-#: src/protocols/oscar/oscar.c:2642
+#: src/protocols/oscar/oscar.c:2631
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "Användaren %u har tillåtit dig att lägga till honom/henne i din kompislista."
+
+#: src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -5709,7 +6057,7 @@
 "Från: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2650
+#: src/protocols/oscar/oscar.c:2647
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5722,7 +6070,7 @@
 "Från: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2658
+#: src/protocols/oscar/oscar.c:2655
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5735,34 +6083,34 @@
 "Meddelandet är:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2679
-#, c-format
-msgid "ICQ user %u has sent you a contact: %s (%s)"
-msgstr "ICQ-användaren %u har skickat dig en kontakt:  %s (%s)"
-
-#: src/protocols/oscar/oscar.c:2685
-msgid "Do you want to add this contact to your Buddy List?"
-msgstr "Vill du lägga till den här kontakten till din kompislista?"
-
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:2676
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ-användaren %u har skickat dig en kompis:  %s (%s)"
+
+#: src/protocols/oscar/oscar.c:2682
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "Vill du lägga till den här kompisen till din kompislista?"
+
+#: src/protocols/oscar/oscar.c:2686
 msgid "Decline"
 msgstr "Understrykning"
 
-#: src/protocols/oscar/oscar.c:2771
+#: src/protocols/oscar/oscar.c:2768
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Du har missat %hu meddelande från %s eftersom det var ogiltigt."
 msgstr[1] "Du har missat %hu meddelanden från %s eftersom det var ogiltigt."
 
-#: src/protocols/oscar/oscar.c:2780
+#: src/protocols/oscar/oscar.c:2777
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Du missade %hu meddelande från %s eftersom det var för stort."
 msgstr[1] "Du missade %hu meddelanden från %s eftersom det var för stort."
 
-#: src/protocols/oscar/oscar.c:2789
+#: src/protocols/oscar/oscar.c:2786
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -5773,7 +6121,7 @@
 msgstr[1] ""
 "Du missade %hu meddelanden från %s eftersom frekvensgränsen har överskridits."
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:2795
 #, 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."
@@ -5782,193 +6130,175 @@
 msgstr[1] ""
 "Du missade %hu meddelanden från %s eftersom hon/han var för onskefull."
 
-#: src/protocols/oscar/oscar.c:2807
+#: src/protocols/oscar/oscar.c:2804
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Du missade %hu meddelande från %s eftersom du är för onskefull."
 msgstr[1] "Du missade %hu meddelanden från %s eftersom du är för onskefull."
 
-#: src/protocols/oscar/oscar.c:2816
+#: src/protocols/oscar/oscar.c:2813
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du missade %hu meddelande från %s av okända orsaker."
 msgstr[1] "Du missade %hu meddelanden från %s av okända orsaker."
 
-#: src/protocols/oscar/oscar.c:2832 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:5879
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4536
+#: src/protocols/oscar/oscar.c:6063
 msgid "Free For Chat"
 msgstr "Fri för chatt"
 
-#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4588
-#: src/protocols/oscar/oscar.c:5877
+#: src/protocols/oscar/oscar.c:2833 src/protocols/oscar/oscar.c:4530
+#: src/protocols/oscar/oscar.c:6061
 msgid "Not Available"
 msgstr "Ej tillgänglig"
 
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4591
-#: src/protocols/oscar/oscar.c:5878
+#: src/protocols/oscar/oscar.c:2835 src/protocols/oscar/oscar.c:4533
+#: src/protocols/oscar/oscar.c:6062
 msgid "Occupied"
 msgstr "Upptagen"
 
-#: src/protocols/oscar/oscar.c:2842
+#: src/protocols/oscar/oscar.c:2839
 msgid "Web Aware"
 msgstr "Webbmedveten"
 
-#: src/protocols/oscar/oscar.c:2902
+#: src/protocols/oscar/oscar.c:2882
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2904
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>Status:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2963
+#: src/protocols/oscar/oscar.c:2941
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fel: %s\n"
 
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2942
 msgid "Unknown error"
 msgstr "Okänt fel"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2999
+#: src/protocols/oscar/oscar.c:2977
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Ditt meddelande till %s skickades inte: "
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3029
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Användarinformation för %s är inte tillgänglig:"
 
-#: src/protocols/oscar/oscar.c:3088
+#: src/protocols/oscar/oscar.c:3067
 msgid "Voice"
 msgstr "Röst"
 
-#: src/protocols/oscar/oscar.c:3091 src/protocols/oscar/oscar.c:5908
+#: src/protocols/oscar/oscar.c:3070 src/protocols/oscar/oscar.c:6092
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3097 src/protocols/oscar/oscar.c:5924
+#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:6108
 msgid "Get File"
 msgstr "Hämta fil"
 
-#: src/protocols/oscar/oscar.c:3100 src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6100
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3083
 msgid "Games"
 msgstr "Spel"
 
-#: src/protocols/oscar/oscar.c:3107
+#: src/protocols/oscar/oscar.c:3086
 msgid "Add-Ins"
 msgstr "Lägg till"
 
-#: src/protocols/oscar/oscar.c:3110
+#: src/protocols/oscar/oscar.c:3089
 msgid "Send Buddy List"
 msgstr "Skicka kompislista"
 
+#: src/protocols/oscar/oscar.c:3092
+msgid "EveryBuddy Bug"
+msgstr "EveryBuddy-fel"
+
+#: src/protocols/oscar/oscar.c:3095
+msgid "AP User"
+msgstr "AP-användare"
+
+#: src/protocols/oscar/oscar.c:3098
+msgid "ICQ RTF"
+msgstr "ICQ-RTF"
+
+#: src/protocols/oscar/oscar.c:3101
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:3104
+msgid "ICQ Server Relay"
+msgstr "ICQ-serverrelay"
+
+#: src/protocols/oscar/oscar.c:3107
+msgid "Old ICQ UTF8"
+msgstr "Gamla ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3110
+msgid "Trillian Encryption"
+msgstr "Trillansk kryptering"
+
 #: src/protocols/oscar/oscar.c:3113
-msgid "EveryBuddy Bug"
-msgstr "EveryBuddy-fel"
-
-#: src/protocols/oscar/oscar.c:3116
-msgid "AP User"
-msgstr "AP-användare"
-
-#: src/protocols/oscar/oscar.c:3119
-msgid "ICQ RTF"
-msgstr "ICQ-RTF"
-
-#: src/protocols/oscar/oscar.c:3122
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:3125
-msgid "ICQ Server Relay"
-msgstr "ICQ-serverrelay"
-
-#: src/protocols/oscar/oscar.c:3128
-msgid "ICQ Unknown"
-msgstr "ICQ-okänd"
-
-#: src/protocols/oscar/oscar.c:3131
-msgid "Trillian Encryption"
-msgstr "Trillansk kryptering"
-
-#: src/protocols/oscar/oscar.c:3134
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3137
+#: src/protocols/oscar/oscar.c:3116
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3177
-msgid ""
-"<i>Unable to display information because it was sent in an unknown encoding."
-"</i>"
-msgstr ""
-"<i>Kan inte visa information eftersom den var skickad i en okänd kodning.</i>"
-
-#: src/protocols/oscar/oscar.c:3184
-#, c-format
-msgid "Online Since : <b>%s</b><br>\n"
-msgstr "Ansluten sedan : <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3189
-#, c-format
-msgid "Member Since : <b>%s</b><br>\n"
-msgstr "Medlem sedan : <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3195
-#, c-format
-msgid "Idle : <b>%s</b>"
-msgstr "Inaktiv : <b>%s</b>"
-
-#: src/protocols/oscar/oscar.c:3198
+#: src/protocols/oscar/oscar.c:3119
+msgid "Secure IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3147
+#, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "Användarnamn: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3148
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr "Varningsnivå: <b>%d%%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3151
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
+msgstr "Ansluten sedan: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3155
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
+msgstr "Medlem sedan: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3160
+#, c-format
+msgid "Idle: <b>%s</b>"
+msgstr "Inaktiv: <b>%s</b>"
+
+#: src/protocols/oscar/oscar.c:3163
 msgid "Idle: <b>Active</b>"
-msgstr "Inaktiv : <b>Aktiv</b>"
-
-#: src/protocols/oscar/oscar.c:3200
-#, c-format
-msgid ""
-"Username : <b>%s</b>  %s <br>\n"
-"Warning Level : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-msgstr ""
-"Användarnamn : <b>%s</b>  %s <br>\n"
-"Varningsnivå : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-
-#: src/protocols/oscar/oscar.c:3232
-msgid "<i>User has no away message</i>"
-msgstr "<i>Användaren har inget frånvaromeddelande</i>"
-
-#: src/protocols/oscar/oscar.c:3243
-msgid "Client Capabilities: "
-msgstr "Klientkapabiliteter: "
-
-#: src/protocols/oscar/oscar.c:3249
-msgid "<i>No Information Provided</i>"
-msgstr "<i>Ingen information tillhandahållen</i>"
-
-#: src/protocols/oscar/oscar.c:3273
+msgstr "Inaktiv: <b>Aktiv</b>"
+
+#: src/protocols/oscar/oscar.c:3168 src/protocols/oscar/oscar.c:3176
+#, c-format
+msgid "<hr>%s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3201
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
-#: src/protocols/oscar/oscar.c:3660
+#: src/protocols/oscar/oscar.c:3589
 msgid "Rate limiting error."
 msgstr "Frekvensgränsfel."
 
-#: src/protocols/oscar/oscar.c:3661
+#: src/protocols/oscar/oscar.c:3590
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -5976,176 +6306,185 @@
 "Det senaste meddelandet skickades inte eftersom du är över frekvensgränsen. "
 "Vänta 10 sekunder och försök igen."
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3651
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "Du har blivit frånkopplad. Du har loggat in från en annan plats."
 
-#: src/protocols/oscar/oscar.c:3724
+#: src/protocols/oscar/oscar.c:3653
 msgid "You have been signed off for an unknown reason."
 msgstr "Du har blivit utloggad av okänd anledning."
 
-#: src/protocols/oscar/oscar.c:3963 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:3898 src/protocols/oscar/oscar.c:3904
 msgid "Email Address"
 msgstr "e-postadress"
 
-#: src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:3909
 msgid "Mobile Phone"
 msgstr "Mobilnummer"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3912 src/protocols/trepia/trepia.c:313
 #: src/protocols/trepia/trepia.c:454
 msgid "Female"
 msgstr "Kvinna"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:312
+#: src/protocols/oscar/oscar.c:3912 src/protocols/trepia/trepia.c:312
 #: src/protocols/trepia/trepia.c:454
 msgid "Male"
 msgstr "Man"
 
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:3929
 msgid "Personal Web Page"
 msgstr "Personlig webbsida"
 
-#: src/protocols/oscar/oscar.c:3997
+#: src/protocols/oscar/oscar.c:3932
 msgid "Additional Information"
 msgstr "Extra information"
 
-#: src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:3936
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: src/protocols/oscar/oscar.c:4003 src/protocols/oscar/oscar.c:4019
-msgid "Address"
-msgstr "Adress"
-
-#: src/protocols/oscar/oscar.c:4012 src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:3947 src/protocols/oscar/oscar.c:3963
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:3952
 msgid "Work Address"
 msgstr "Jobbadress"
 
-#: src/protocols/oscar/oscar.c:4033
+#: src/protocols/oscar/oscar.c:3968
 msgid "Work Information"
 msgstr "Information om arbete"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:3970
 msgid "Company"
 msgstr "Företag"
 
-#: src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:3973
 msgid "Division"
 msgstr "Avdelning"
 
-#: src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:3976
 msgid "Position"
-msgstr "Beffatning"
-
-#: src/protocols/oscar/oscar.c:4044
+msgstr "Befattning"
+
+#: src/protocols/oscar/oscar.c:3979
 msgid "Web Page"
 msgstr "Webbsida"
 
-#: src/protocols/oscar/oscar.c:4112
-#, c-format
-msgid "<B>%s has the following screen names:</B><BR>"
-msgstr "<B>%s har följande användar-ID:</B><BR>"
-
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:3985
+#, c-format
+msgid "ICQ Info for %s"
+msgstr "ICQ-information från %s"
+
+#: src/protocols/oscar/oscar.c:4035
+msgid "Pop-Up Message"
+msgstr "Popup-meddelande"
+
+#: src/protocols/oscar/oscar.c:4056
+#, c-format
+msgid "The following screennames are associated with %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4060
+msgid "Search Results"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:4077
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Inget resultat funnet för e-postadress %s"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4098
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Du borde få ett e-postmeddelande som ber dig bekräfta %s."
 
-#: src/protocols/oscar/oscar.c:4153
+#: src/protocols/oscar/oscar.c:4100
 msgid "Account Confirmation Requested"
 msgstr "Kontobekräftelsebegäran"
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4128
 msgid "Error Changing Account Info"
 msgstr "Fel vid ändring av kontoinformation"
 
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/oscar/oscar.c:4131
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4187
+#: src/protocols/oscar/oscar.c:4134
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4190
+#: src/protocols/oscar/oscar.c:4137
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4193
+#: src/protocols/oscar/oscar.c:4140
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4196
+#: src/protocols/oscar/oscar.c:4143
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4146
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4149
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4159
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4213 src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4160 src/protocols/oscar/oscar.c:4167
 msgid "Account Info"
 msgstr "Kontoinformation"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4165
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "E-postaderssen för %s är %s"
 
-#: src/protocols/oscar/oscar.c:4453
+#: src/protocols/oscar/oscar.c:4395
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4454
+#: src/protocols/oscar/oscar.c:4396
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4484
+#: src/protocols/oscar/oscar.c:4426
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6160,22 +6499,22 @@
 "Den maximala profillängden på %d byte har överskridits. Gaim har trunkerat "
 "profilen åt dig."
 
-#: src/protocols/oscar/oscar.c:4489
+#: src/protocols/oscar/oscar.c:4431
 msgid "Profile too long."
 msgstr "Profilen är för lång."
 
-#: src/protocols/oscar/oscar.c:4508
+#: src/protocols/oscar/oscar.c:4450
 msgid "Unable to set AIM away message."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4509
+#: src/protocols/oscar/oscar.c:4451
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4549
+#: src/protocols/oscar/oscar.c:4491
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6190,42 +6529,42 @@
 "Den maximala längden på meddelande vid frånvaro som är %d byte har "
 "överskridits. Gaim har trunkerat meddelandet åt dig."
 
-#: src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:4496
 msgid "Away message too long."
 msgstr "Frånvaromeddelandet är för långt."
 
-#: src/protocols/oscar/oscar.c:4774
+#: src/protocols/oscar/oscar.c:4716
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunde inte hämta kompislista"
 
-#: src/protocols/oscar/oscar.c:4775
+#: src/protocols/oscar/oscar.c:4717
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4867
-#: src/protocols/oscar/oscar.c:4872
+#: src/protocols/oscar/oscar.c:4808 src/protocols/oscar/oscar.c:4809
+#: src/protocols/oscar/oscar.c:4814
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5034
+#: src/protocols/oscar/oscar.c:4981
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5034 src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:4981 src/protocols/oscar/oscar.c:4994
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: src/protocols/oscar/oscar.c:5035 src/protocols/oscar/oscar.c:5048
+#: src/protocols/oscar/oscar.c:4982 src/protocols/oscar/oscar.c:4995
 msgid "Unable To Add"
 msgstr "Kan inte Lägga till"
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:4994
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6233,7 +6572,7 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5082
+#: src/protocols/oscar/oscar.c:5029
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6242,11 +6581,11 @@
 "Användaren %s har givit dig tillåtelse att lägga till den till din "
 "kompislista, vill du göra det?"
 
-#: src/protocols/oscar/oscar.c:5088
+#: src/protocols/oscar/oscar.c:5035
 msgid "Authorization Given"
 msgstr "Auktorisering given"
 
-#: src/protocols/oscar/oscar.c:5121
+#: src/protocols/oscar/oscar.c:5068
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6256,148 +6595,156 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5163
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
-msgstr ""
-"Användaren %s har beviljat din begäran att lägga till denne till din "
-"kontaktlista."
-
-#: src/protocols/oscar/oscar.c:5164
+#: src/protocols/oscar/oscar.c:5110
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr "Användaren %s har tillåtit dig att lägga till henne/honom till din kompislista."
+
+#: src/protocols/oscar/oscar.c:5111
 msgid "Authorization Granted"
 msgstr "Auktorisering beviljades"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5167
+#: src/protocols/oscar/oscar.c:5114
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Användaren %s har nekat din begäran att lägga till denne till din "
-"kontaktlista med följande motivering:\n"
+"Användaren %s tillåter inte att du lägga till henne/honom till din kompislista av följande orsak:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5168
+#: src/protocols/oscar/oscar.c:5115
 msgid "Authorization Denied"
 msgstr "Auktorisering nekades"
 
-#: src/protocols/oscar/oscar.c:5205 src/protocols/toc/toc.c:1241
+#: src/protocols/oscar/oscar.c:5152 src/protocols/toc/toc.c:1267
 msgid "Exchange:"
 msgstr "Växel:"
 
-#: src/protocols/oscar/oscar.c:5427
+#: src/protocols/oscar/oscar.c:5375
 msgid "<b>Status:</b> "
 msgstr "<b>Status:</b> "
 
-#: src/protocols/oscar/oscar.c:5436
+#: src/protocols/oscar/oscar.c:5384
 msgid "<b>Logged In:</b> "
 msgstr "<b>Inloggad:</b> "
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5396
+msgid "<b>IP Address:</b> "
+msgstr "<b>IP-adress:</b>"
+
+#: src/protocols/oscar/oscar.c:5404
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Kapabiliteter:</b> "
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5411
 msgid "<b>Available:</b> "
 msgstr "<b>Tillgänglig:</b> "
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5424
+msgid "<b>Away Message:</b> "
+msgstr "<b>Frånvaromeddelanden:</b>"
+
+#: src/protocols/oscar/oscar.c:5434
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Status:</b> Ej auktoriserad"
 
-#: src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:5468 src/protocols/yahoo/yahoo.c:1857
 msgid "Offline"
 msgstr "Ej ansluten"
 
-#: src/protocols/oscar/oscar.c:5732
+#: src/protocols/oscar/oscar.c:5916
 msgid "Unable to open Direct IM"
 msgstr "Kan inte öppna direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:5745
+#: src/protocols/oscar/oscar.c:5929
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5748
+#: src/protocols/oscar/oscar.c:5932
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5893
+#: src/protocols/oscar/oscar.c:6077
 msgid "Get Status Msg"
 msgstr "Hämta statusmeddelande"
 
-#: src/protocols/oscar/oscar.c:5958
+#: src/protocols/oscar/oscar.c:6121
+msgid "Re-request Authorization"
+msgstr "Begär autentiserings igen"
+
+#: src/protocols/oscar/oscar.c:6142
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5959
+#: src/protocols/oscar/oscar.c:6143
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5965
+#: src/protocols/oscar/oscar.c:6149
 msgid "New screenname formatting:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6014
+#: src/protocols/oscar/oscar.c:6198
 msgid "Change Address To:"
 msgstr "Ändra adress till:"
 
-#: src/protocols/oscar/oscar.c:6028
-msgid "You are awaiting authorization from the following buddies:<BR>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6242
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6058
-#, c-format
+#: src/protocols/oscar/oscar.c:6245
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6246
 msgid ""
-"%s<BR><BR>You can re-request authorization from these buddies by right-"
-"clicking on them and clicking \"Re-request authorization.\""
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6074
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6262
 msgid "Available Message:"
 msgstr "Tillgängligt meddelande:"
 
-#: src/protocols/oscar/oscar.c:6075
-msgid "Please talk to me, I'm lonely! (and single)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6137
+#: src/protocols/oscar/oscar.c:6340
 msgid "Set Available Message"
 msgstr "Ställ in tillgängligt meddelande"
 
-#: src/protocols/oscar/oscar.c:6151
+#: src/protocols/oscar/oscar.c:6354
 msgid "Change Password (URL)"
 msgstr "Byt lösenord (URL)"
 
-#: src/protocols/oscar/oscar.c:6162
+#: src/protocols/oscar/oscar.c:6362
+msgid "Configure IM Forwarding (URL)"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:6373
 msgid "Format Screenname"
 msgstr "Användar-ID"
 
-#: src/protocols/oscar/oscar.c:6168
+#: src/protocols/oscar/oscar.c:6379
 msgid "Confirm Account"
 msgstr "Bekräffta konto"
 
-#: src/protocols/oscar/oscar.c:6174
+#: src/protocols/oscar/oscar.c:6385
 msgid "Display Current Registered Address"
 msgstr "Visa aktuell registrerad adress"
 
-#: src/protocols/oscar/oscar.c:6180
+#: src/protocols/oscar/oscar.c:6391
 msgid "Change Current Registered Address"
 msgstr "Ändra aktuell registrerad adress"
 
-#: src/protocols/oscar/oscar.c:6189
+#: src/protocols/oscar/oscar.c:6400
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Visa kompisar som väntar på auktorisering"
 
-#: src/protocols/oscar/oscar.c:6197
+#: src/protocols/oscar/oscar.c:6408
 msgid "Search for Buddy by Email"
 msgstr "Sök efter kompis med e-post"
 
@@ -6411,123 +6758,123 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6318 src/protocols/oscar/oscar.c:6320
+#: src/protocols/oscar/oscar.c:6529 src/protocols/oscar/oscar.c:6531
 msgid "AIM/ICQ Protocol Plugin"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6337
+#: src/protocols/oscar/oscar.c:6548
 msgid "Auth host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6342
+#: src/protocols/oscar/oscar.c:6553
 msgid "Auth port"
 msgstr "Auktoriseringsport"
 
-#: src/protocols/toc/toc.c:175
+#: src/protocols/toc/toc.c:171
 #, c-format
 msgid "Looking up %s"
 msgstr "Slå upp %s"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:514
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kan inte skriva filen %s."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:517
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kan inte läsa filen %s."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:520
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Meddelandet är för långt, de sista %s byten klipptes bort."
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:523
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s är inte inloggad för tillfället."
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:526
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Varning för %s är inte tillåten."
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:529
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ett meddelande har kastats, du överskrider serverns hastighetsgräns."
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:532
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chatt i %s är inte tillgänglig."
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:535
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Du skickar meddelanden för snabbt till %s."
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Du missade ett snabbmeddelande från %s eftersom det var för stort."
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:541
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Du missade ett snabbmeddelande från %s eftersom det skickades för snabbt."
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:544
 msgid "Failure."
 msgstr "Misslyckande."
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:547
 msgid "Too many matches."
 msgstr "För många träffar."
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:550
 msgid "Need more qualifiers."
 msgstr "Behöver fler kvalificerare."
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:553
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtjänsten är tillfälligt onåbar."
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:556
 msgid "Email lookup restricted."
 msgstr "E-postuppslagning är begränsad."
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:559
 msgid "Keyword ignored."
 msgstr "Nyckelordet ignorerades."
 
-#: src/protocols/toc/toc.c:560
+#: src/protocols/toc/toc.c:562
 msgid "No keywords."
 msgstr "Inga nyckelord."
 
-#: src/protocols/toc/toc.c:563
+#: src/protocols/toc/toc.c:565
 msgid "User has no directory information."
 msgstr "Användaren har ingen kataloginformation."
 
-#: src/protocols/toc/toc.c:567
+#: src/protocols/toc/toc.c:569
 msgid "Country not supported."
 msgstr "Landet stöds inte."
 
-#: src/protocols/toc/toc.c:570
+#: src/protocols/toc/toc.c:572
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Okänt misslyckande: %s."
 
-#: src/protocols/toc/toc.c:576
+#: src/protocols/toc/toc.c:578
 msgid "The service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
-#: src/protocols/toc/toc.c:579
+#: src/protocols/toc/toc.c:581
 msgid "Your warning level is currently too high to log in."
 msgstr "Din varningsnivå är för tillfället för hög för att logga in."
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:584
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -6535,38 +6882,38 @@
 "Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
 "prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
-#: src/protocols/toc/toc.c:584
+#: src/protocols/toc/toc.c:586
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ett okänt inloggningsfel har inträffat: %s."
 
-#: src/protocols/toc/toc.c:587
+#: src/protocols/toc/toc.c:589
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Ett okänt fel, %d, har inträffat. Information: %s"
 
-#: src/protocols/toc/toc.c:607
+#: src/protocols/toc/toc.c:609
 msgid "Connection Closed"
 msgstr "Anslutningen stängd"
 
-#: src/protocols/toc/toc.c:647
+#: src/protocols/toc/toc.c:649
 msgid "Waiting for reply..."
 msgstr "Väntar på svar..."
 
-#: src/protocols/toc/toc.c:717
+#: src/protocols/toc/toc.c:719
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC har kommit tillbaka från dess paus. Du kan nu skicka meddelanden igen."
 
-#: src/protocols/toc/toc.c:905
+#: src/protocols/toc/toc.c:907
 msgid "Password Change Successful"
 msgstr "Lösenordsändring lyckades"
 
-#: src/protocols/toc/toc.c:909
+#: src/protocols/toc/toc.c:911
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC har skickat en PAUS-kommando."
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:912
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -6576,44 +6923,44 @@
 "kan sparak ut dig om du skickar ett meddelande. Gaim kommer att förhindra "
 "att något kommer igenom. Detta är endast tillfälligt, håll ut."
 
-#: src/protocols/toc/toc.c:1379
+#: src/protocols/toc/toc.c:1405
 msgid "Get Dir Info"
 msgstr "Hämta kataloginformation"
 
-#: src/protocols/toc/toc.c:1503
+#: src/protocols/toc/toc.c:1541
 msgid "Set Dir Info"
 msgstr "Ställ in kataloginformation"
 
-#: src/protocols/toc/toc.c:1626
+#: src/protocols/toc/toc.c:1665
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kunde inte öppna %s för läsning!"
 
-#: src/protocols/toc/toc.c:1662
+#: src/protocols/toc/toc.c:1701
 msgid "File transfer failed; other side probably canceled."
 msgstr "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt."
 
-#: src/protocols/toc/toc.c:1707 src/protocols/toc/toc.c:1747
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:1746 src/protocols/toc/toc.c:1786
+#: src/protocols/toc/toc.c:1998
 msgid "Could not connect for transfer."
 msgstr "Kunde inte ansluta för överföring."
 
-#: src/protocols/toc/toc.c:1871
+#: src/protocols/toc/toc.c:1910
 msgid "Could not connect for transfer!"
 msgstr "Kunde inte ansluta för överföring!"
 
-#: src/protocols/toc/toc.c:1904
+#: src/protocols/toc/toc.c:1943
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Kunde inte skriva filhuvud, filen kommer inte att skickas."
 
-#: src/protocols/toc/toc.c:2038
+#: src/protocols/toc/toc.c:2077
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s ber %s att acceptera %d fil: %s (%.2f %s)%s%s"
 msgstr[1] "%s ber %s att acceptera %d filer: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2045
+#: src/protocols/toc/toc.c:2084
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ber att du ska skicka denne en fil"
@@ -6628,15 +6975,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2120 src/protocols/toc/toc.c:2122
+#: src/protocols/toc/toc.c:2160 src/protocols/toc/toc.c:2162
 msgid "TOC Protocol Plugin"
 msgstr "Insticksmodul för TOC-protokoll"
 
-#: src/protocols/toc/toc.c:2139
+#: src/protocols/toc/toc.c:2179
 msgid "TOC host"
 msgstr "TOC-värd"
 
-#: src/protocols/toc/toc.c:2143
+#: src/protocols/toc/toc.c:2183
 msgid "TOC port"
 msgstr "TOC-port"
 
@@ -6713,10 +7060,6 @@
 msgid "Logging in"
 msgstr "Loggar in"
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "Kan inte skapa socket"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6731,98 +7074,174 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Insticksmodul för Trepia-protokoll"
 
-#: src/protocols/yahoo/yahoo.c:586
+#: src/protocols/yahoo/yahoo.c:695
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ditt Yahoo!-meddelande skickades inte."
 
-#: src/protocols/yahoo/yahoo.c:891
+#: src/protocols/yahoo/yahoo.c:753
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"%s har (retroaktivt) nekat din att lägga till henne/honom till din "
+"kontaktlista."
+
+#: src/protocols/yahoo/yahoo.c:755
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s har (retroaktivt) nekat din att lägga till henne/honom till din "
+"kontaktlista med följande motivering: %s."
+
+#: src/protocols/yahoo/yahoo.c:756
+msgid "Add buddy rejected"
+msgstr "Lägg till kompisavvisning"
+
+#: src/protocols/yahoo/yahoo.c:1398
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be ableto successfully sign on "
+"to Yahoo.  Check %s for updates."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1401
+msgid "Failed Yahoo! Authentication"
+msgstr "Misslyckad Yahoo!-autentisering"
+
+#: src/protocols/yahoo/yahoo.c:1474
+#, c-format
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1477
+msgid "Ignore buddy?"
+msgstr "Ignorera kompis?"
+
+#: src/protocols/yahoo/yahoo.c:1506
+msgid "Invalid username."
+msgstr "Ogiltigt användarnamn."
+
+#: src/protocols/yahoo/yahoo.c:1509
+msgid "Incorrect password."
+msgstr "Felaktigt lösenord."
+
+#: src/protocols/yahoo/yahoo.c:1512
+msgid "Unknown error."
+msgstr "Okänt fel."
+
+#: src/protocols/yahoo/yahoo.c:1560
+#, c-format
+msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1562
+msgid "Could not add buddy to server list"
+msgstr "Kunde inte lägga till kompis i listan på servern"
+
+#: src/protocols/yahoo/yahoo.c:1664
 msgid "Unable to read"
 msgstr "Kan inte läsa"
 
-#: src/protocols/yahoo/yahoo.c:991
+#: src/protocols/yahoo/yahoo.c:1765
 msgid "Connection problem"
 msgstr "Problem med anslutning"
 
-#: src/protocols/yahoo/yahoo.c:1053 src/protocols/yahoo/yahoo.c:1263
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:1839 src/protocols/yahoo/yahoo.c:2137
+#: src/protocols/yahoo/yahoo.c:2235
 msgid "Not At Home"
 msgstr "Inte hemma"
 
-#: src/protocols/yahoo/yahoo.c:1055 src/protocols/yahoo/yahoo.c:1265
-#: src/protocols/yahoo/yahoo.c:1338
+#: src/protocols/yahoo/yahoo.c:1841 src/protocols/yahoo/yahoo.c:2139
+#: src/protocols/yahoo/yahoo.c:2236
 msgid "Not At Desk"
 msgstr "Inte vid skrivbordet"
 
-#: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1267
-#: src/protocols/yahoo/yahoo.c:1339
+#: src/protocols/yahoo/yahoo.c:1843 src/protocols/yahoo/yahoo.c:2141
+#: src/protocols/yahoo/yahoo.c:2237
 msgid "Not In Office"
 msgstr "Inte på kontoret"
 
-#: src/protocols/yahoo/yahoo.c:1061 src/protocols/yahoo/yahoo.c:1271
-#: src/protocols/yahoo/yahoo.c:1341
+#: src/protocols/yahoo/yahoo.c:1847 src/protocols/yahoo/yahoo.c:2145
+#: src/protocols/yahoo/yahoo.c:2239
 msgid "On Vacation"
 msgstr "På semester"
 
-#: src/protocols/yahoo/yahoo.c:1065 src/protocols/yahoo/yahoo.c:1275
-#: src/protocols/yahoo/yahoo.c:1343
+#: src/protocols/yahoo/yahoo.c:1851 src/protocols/yahoo/yahoo.c:2149
+#: src/protocols/yahoo/yahoo.c:2241
 msgid "Stepped Out"
 msgstr "Gått ut"
 
-#: src/protocols/yahoo/yahoo.c:1181
+#: src/protocols/yahoo/yahoo.c:1915 src/protocols/yahoo/yahoo.c:1949
+msgid "Not on server list"
+msgstr "Finns inte i listan på servern"
+
+#: src/protocols/yahoo/yahoo.c:2005
+msgid "Join in Chat"
+msgstr "Anslut till chatt"
+
+#: src/protocols/yahoo/yahoo.c:2011
+msgid "Initiate Conference"
+msgstr "Starta konferens"
+
+#: src/protocols/yahoo/yahoo.c:2057
 msgid "Active which ID?"
 msgstr "Vilket ID ska aktiveras?"
 
-#: src/protocols/yahoo/yahoo.c:1192
+#: src/protocols/yahoo/yahoo.c:2068
 msgid "Activate ID"
 msgstr "Aktivera ID"
 
-#: src/protocols/yahoo/yahoo.c:1420
+#: src/protocols/yahoo/yahoo.c:2417
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1422 src/protocols/yahoo/yahoo.c:1438
+#: src/protocols/yahoo/yahoo.c:2419 src/protocols/yahoo/yahoo.c:2436
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1436
+#: src/protocols/yahoo/yahoo.c:2434
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1470
+#: src/protocols/yahoo/yahoo.c:2469
 msgid "Yahoo! ID"
 msgstr "Yahoo!-ID"
 
-#: src/protocols/yahoo/yahoo.c:1512 src/protocols/yahoo/yahoo.c:1514
-#: src/protocols/yahoo/yahoo.c:1516
+#: src/protocols/yahoo/yahoo.c:2511 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/yahoo/yahoo.c:2515
 msgid "Hobbies"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1518 src/protocols/yahoo/yahoo.c:1520
+#: src/protocols/yahoo/yahoo.c:2517 src/protocols/yahoo/yahoo.c:2519
 msgid "Latest News"
 msgstr "Senaste nytt"
 
-#: src/protocols/yahoo/yahoo.c:1529
+#: src/protocols/yahoo/yahoo.c:2528
 msgid "Home Page"
 msgstr "Hemsida"
 
-#: src/protocols/yahoo/yahoo.c:1539
+#: src/protocols/yahoo/yahoo.c:2538
 msgid "Cool Link 1"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/yahoo/yahoo.c:2540
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1543
+#: src/protocols/yahoo/yahoo.c:2542
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1547
+#: src/protocols/yahoo/yahoo.c:2546
 msgid "Member Since"
 msgstr "Medlem sedan"
 
@@ -6836,64 +7255,89 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1638 src/protocols/yahoo/yahoo.c:1640
+#: src/protocols/yahoo/yahoo.c:2683 src/protocols/yahoo/yahoo.c:2685
 msgid "Yahoo Protocol Plugin"
 msgstr "Insticksmodul för Yahoo-protokoll"
 
-#: src/protocols/yahoo/yahoo.c:1657
+#: src/protocols/yahoo/yahoo.c:2702
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1662
+#: src/protocols/yahoo/yahoo.c:2707
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/yahoo/yahoochat.c:191
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:193
+msgid "Invitation Rejected"
+msgstr "Inbjudan avvisad"
+
+#: src/protocols/yahoo/yahoochat.c:317
+msgid "Failed to join chat"
+msgstr "Kunde inte ansluta till chatt"
+
+#: src/protocols/yahoo/yahoochat.c:317
+msgid "Maybe the room is full?"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:509
+msgid "Failed to join buddy in chat"
+msgstr "Kunde inte ansluta kompis till chatt"
+
+#: src/protocols/yahoo/yahoochat.c:510
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Användare:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:348
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:350
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Gömd eller inte inloggad"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:354
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>%s sedan %s"
 
-#: src/protocols/zephyr/zephyr.c:571 src/protocols/zephyr/zephyr.c:572
+#: src/protocols/zephyr/zephyr.c:586 src/protocols/zephyr/zephyr.c:587
 msgid "Anyone"
 msgstr "Någon"
 
-#: src/protocols/zephyr/zephyr.c:596
+#: src/protocols/zephyr/zephyr.c:611
 msgid "Already logged in with Zephyr"
 msgstr "Redan inloggad med Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:597
+#: src/protocols/zephyr/zephyr.c:612
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:846
+#: src/protocols/zephyr/zephyr.c:866
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:886
+#: src/protocols/zephyr/zephyr.c:906
 msgid "Class:"
 msgstr "Klass:"
 
-#: src/protocols/zephyr/zephyr.c:891
+#: src/protocols/zephyr/zephyr.c:911
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:896
+#: src/protocols/zephyr/zephyr.c:916
 msgid "Recipient:"
 msgstr "Mottagare:"
 
@@ -6907,121 +7351,90 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1028 src/protocols/zephyr/zephyr.c:1030
+#: src/protocols/zephyr/zephyr.c:1048 src/protocols/zephyr/zephyr.c:1050
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: src/proxy.c:1680
+#: src/proxy.c:1681
 msgid "Invalid proxy settings"
 msgstr "Felaktiga proxyinställningar"
 
-#: src/proxy.c:1680
+#: src/proxy.c:1681
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
-#: src/prpl.c:293
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s har gjort %s till sin kompis%s%s%s"
-
-#: src/prpl.c:305
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Vill du lägga till honom eller henne till din kompislista?"
-
-#: src/prpl.c:308
-msgid "Gaim - Information"
-msgstr "Gaim - information"
-
-#: src/prpl.c:311
-msgid "Add buddy to your list?"
-msgstr "Lägg till kompisen i din kompislista?"
-
 #. * Custom away message.
-#: src/prpl.h:185
+#: src/prpl.h:187
 msgid "Custom"
 msgstr ""
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:862
 msgid "Accept"
 msgstr "Acceptera"
 
-#: src/server.c:57
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Ange ditt lösenord"
 
-#: src/server.c:934
+#: src/server.c:949
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d meddelande)"
 msgstr[1] "(%d meddelanden)"
 
-#: src/server.c:947
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "(1 meddelande)"
 
-#: src/server.c:1139 src/server.c:1149
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggade in."
 
-#: src/server.c:1168 src/server.c:1176
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggade ut."
 
-#: src/server.c:1225
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1228
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "en anonym person"
 
-#: src/server.c:1323
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
 
-#: src/server.c:1327
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr ""
 
-#: src/server.c:1333
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr ""
 
-#: src/server.c:1522
-msgid "Gaim - Popup"
-msgstr "Gaim - Popup"
-
-#: src/server.c:1549
-msgid "More Info"
-msgstr "Mer information"
-
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
 #: src/status.c:35
 msgid "Sorry, I ran out for a bit!"
-msgstr ""
+msgstr "Gick ut ett tag, strax tillbaka!"
 
 #: src/stock.c:84
 msgid "_Modify"
@@ -7049,10 +7462,18 @@
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: src/util.c:934
+#: src/util.c:982
 msgid "Calculating..."
 msgstr "Kalkylerar..."
 
-#: src/util.c:937
+#: src/util.c:985
 msgid "Unknown."
 msgstr "Okänd."
+
+#: src/win32/win32dep.c:474
+msgid "Notification"
+msgstr "Notifiering"
+
+#: src/win32/win32dep.c:475
+msgid "Moving Gaim user settings directory to:"
+msgstr ""
--- a/po/zh_CN.po	Tue Oct 07 14:53:30 2003 +0000
+++ b/po/zh_CN.po	Tue Oct 07 15:50:29 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-09-24 04:00-0700\n"
-"PO-Revision-Date: 2003-09-21 00:42+0800\n"
+"POT-Creation-Date: 2003-10-05 23:30-0700\n"
+"PO-Revision-Date: 2003-10-06 14:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -22,14 +22,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:105
 msgid "Auto-Reconnect"
 msgstr "自动重连"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:108 plugins/autorecon.c:110
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
@@ -65,12 +65,12 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1658
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:470 src/gtkaccount.c:1665
 msgid "Auto-login"
 msgstr "自动登录"
 
 #: plugins/docklet/docklet.c:117
-msgid "New Message.."
+msgid "New Message..."
 msgstr "新消息..."
 
 #: plugins/docklet/docklet.c:118
@@ -81,12 +81,12 @@
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1794 src/gtkpounce.c:461
-#: src/gtkprefs.c:1468 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3585 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:5518
-#: src/protocols/oscar/oscar.c:5912
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
+#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:6064
 msgid "Away"
 msgstr "离开"
 
@@ -103,11 +103,11 @@
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1816 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1823 src/main.c:326
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2325 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:336
 msgid "Preferences"
 msgstr "首选项"
 
@@ -446,60 +446,71 @@
 msgstr "检查新的本地邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:707
+#: plugins/notify.c:572
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:711
+#: plugins/notify.c:576
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:716
-msgid "_Chat windows"
-msgstr "聊天窗口(_C)"
+#: plugins/notify.c:583
+msgid "C_hat windows"
+msgstr "聊天窗口(_H)"
+
+#: plugins/notify.c:590
+msgid "_Focused windows"
+msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:722
+#: plugins/notify.c:598
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:728
+#: plugins/notify.c:605
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
-#: plugins/notify.c:739
-msgid "_Quote window title"
-msgstr "引用窗口标题(_Q)"
-
-#: plugins/notify.c:744
-msgid "Set Window Manager \"_URGENT\" Hint"
-msgstr "设置窗口管理器“紧急”提示(_U)"
-
-#: plugins/notify.c:749
+#. Count method button
+#: plugins/notify.c:624
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
-#: plugins/notify.c:754
-msgid "_Notify even if conversation is in focus"
-msgstr "即使正处于对话中也通知(_N)"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:760
+#. Urgent method button
+#: plugins/notify.c:633
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "设置窗口管理器“紧急”提示(_U)"
+
+#. ---------- "Notification Removals" ----------
+#: plugins/notify.c:640
 msgid "Notification Removal"
 msgstr "通知删除"
 
-#: plugins/notify.c:764
-msgid "Remove when conversation window gains _focus"
-msgstr "对话窗口获得焦点后即删除(_F)"
-
-#: plugins/notify.c:769
+#. Remove on focus button
+#: plugins/notify.c:646
+msgid "Remove when conversation window _gains focus"
+msgstr "对话窗口获得焦点后即删除(_G)"
+
+#. Remove on click button
+#: plugins/notify.c:654
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
-#: plugins/notify.c:774
+#. Remove on type button
+#: plugins/notify.c:662
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
+#. Remove on message send button
+#: plugins/notify.c:670
+msgid "Remove when a _message gets sent"
+msgstr "消息送出后即删除(_M)"
+
+#. Remove on conversation switch button
+#: plugins/notify.c:679
+msgid "Remove on conversation ta_b switch"
+msgstr "切换对话标签后即删除(_B)"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -507,14 +518,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:858
+#: plugins/notify.c:762
 msgid "Message Notification"
 msgstr "邮件通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:861 plugins/notify.c:863
+#: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读邮件。"
 
@@ -619,6 +630,60 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:190
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+msgid "Provides SSL support through GNUTLS."
+msgstr "提供通过 GNUTLS 的 SSL 支持。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:287
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:91
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "提供 SSL 支持库。"
+
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
@@ -735,7 +800,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -782,8 +847,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1635
-#: src/gtkprefs.c:2258
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
+#: src/gtkprefs.c:2270
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -802,8 +867,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
-#: src/gtkprefs.c:2259
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
+#: src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr "对话"
 
@@ -870,167 +935,232 @@
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/about.c:136
-msgid "), "
-msgstr "), "
-
-#: src/about.c:136
-msgid "  Rachel Shelton (Vampire & Dark Lord)<BR>"
-msgstr "  Rachel Shelton (Vampire & Dark Lord)<BR>"
-
-#: src/about.c:143
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/about.c:147
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.fre"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.fre 上的 #gaim"
-
-#: src/about.c:148
-msgid "  Eric Warmenhoven ("
-msgstr "  Eric Warmenhoven ("
-
-#: src/about.c:150
+#: src/about.c:145
+msgid "former libfaim maintainer"
+msgstr "先前 libfaim 维护者"
+
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "先前领导开发者"
 
-#: src/about.c:153
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "先前维护者"
 
-#: src/about.c:154
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "先前 Jabber 开发者"
 
-#: src/about.c:155
+#: src/about.c:151
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:158
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/about.c:166
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/about.c:167 src/about.c:196
+#: src/about.c:163 src/about.c:192
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/about.c:168 src/about.c:197
+#: src/about.c:164 src/about.c:193
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/about.c:169
+#: src/about.c:165
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/about.c:170 src/about.c:198
+#: src/about.c:166 src/about.c:194
 msgid "German"
 msgstr "德语"
 
-#: src/about.c:171 src/about.c:199
+#: src/about.c:167 src/about.c:195
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/about.c:172 src/about.c:200
+#: src/about.c:168 src/about.c:196
 msgid "French"
 msgstr "法语"
 
-#: src/about.c:173
+#: src/about.c:169
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/about.c:174
+#: src/about.c:170
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/about.c:175 src/about.c:202
+#: src/about.c:171 src/about.c:198
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/about.c:176 src/about.c:204
+#: src/about.c:172 src/about.c:200
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: src/about.c:177
+#: src/about.c:173
 msgid "Dutch; Flemish"
 msgstr "荷兰语"
 
-#: src/about.c:178 src/about.c:206
+#: src/about.c:174 src/about.c:202
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/about.c:179
+#: src/about.c:175
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/about.c:180
+#: src/about.c:176
 msgid "Portuguese-Portugal"
 msgstr "葡萄牙语"
 
-#: src/about.c:181
+#: src/about.c:177
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/about.c:182 src/about.c:207
+#: src/about.c:178 src/about.c:203
 msgid "Russian"
 msgstr "俄语"
 
-#: src/about.c:183
+#: src/about.c:179
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/about.c:184 src/about.c:209
+#: src/about.c:180 src/about.c:205
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/about.c:185
+#: src/about.c:181
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/about.c:186
+#: src/about.c:182
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/about.c:193
+#: src/about.c:189
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/about.c:194
+#: src/about.c:190
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/about.c:195
+#: src/about.c:191
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/about.c:201
+#: src/about.c:197
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/about.c:203
+#: src/about.c:199
 msgid "Japanese"
 msgstr "日语"
 
-#: src/about.c:205
+#: src/about.c:201
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/about.c:208
+#: src/about.c:204
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/about.c:210
+#: src/about.c:206
 msgid "Chinese"
 msgstr "中文"
 
-#: src/about.c:223 src/dialogs.c:3509 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:240 src/server.c:1567
+#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
+#: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "关闭"
 
+#: src/account.c:265 src/protocols/jabber/jabber.c:914
+msgid "New passwords do not match."
+msgstr "新密码不相同。"
+
+#: src/account.c:273
+msgid "Fill out all fields completely."
+msgstr "完全填入所有字段。"
+
+#: src/account.c:298
+msgid "Original password"
+msgstr "旧密码"
+
+#: src/account.c:304
+msgid "New password"
+msgstr "新密码"
+
+#: src/account.c:310
+msgid "New password (again)"
+msgstr "再次输入新密码"
+
+#: src/account.c:315
+#, c-format
+msgid "Change password for %s"
+msgstr "更改 %s 的密码"
+
+#: src/account.c:321
+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:324 src/connection.c:193 src/dialogs.c:1812
+#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
+#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:959
+#: 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:2448 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
+#: src/protocols/yahoo/yahoo.c:2234 src/request.h:852
+msgid "OK"
+msgstr "确定"
+
+#. Cancel button.
+#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
+#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
+#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
+#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1554
+#: src/gtkaccount.c:1986 src/gtkblist.c:1139 src/gtkblist.c:3038
+#: src/gtkconn.c:147 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:520
+#: src/protocols/jabber/jabber.c:609 src/protocols/jabber/jabber.c:960
+#: 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:2412
+#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
+#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
+#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
+#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
+#: src/protocols/yahoo/yahoo.c:2235 src/request.h:852 src/request.h:862
+msgid "Cancel"
+msgstr "取消"
+
+#: src/account.c:351
+#, c-format
+msgid "Change user information for %s"
+msgstr "更改 %s 的用户信息"
+
+#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
+#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
+#: src/protocols/trepia/trepia.c:337
+msgid "Save"
+msgstr "保存"
+
 #: src/away.c:208
 msgid "Gaim - Away!"
 msgstr "Gaim - 离开!"
@@ -1051,16 +1181,16 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:542 src/gtkprefs.c:2261
+#: src/blist.c:548 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:637 src/blist.c:803 src/dialogs.c:872
-#: src/protocols/jabber/jabber.c:1917 src/protocols/msn/notification.c:1135
+#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
 msgid "Buddies"
 msgstr "好友"
 
-#: src/blist.c:1069
+#: src/blist.c:1103
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1072,54 +1202,30 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1078
+#: src/blist.c:1112
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:1129 src/gtkaccount.c:140 src/gtkpounce.c:307
-#: src/gtkutils.c:842 src/protocols/jabber/jabber.c:1261
+#: src/blist.c:1163 src/gtkaccount.c:147 src/gtkpounce.c:307
+#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
+#: src/protocols/jabber/buddy.c:571
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1439
+#: src/blist.c:1491
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:2219
+#: src/blist.c:2135
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:2221
+#: src/blist.c:2137
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
-#: src/browser.c:407 src/browser.c:435
-msgid ""
-"Communication with the browser failed. Please close all windows and try "
-"again."
-msgstr "与浏览器通讯出现问题。请关闭所有窗口,稍后再试一次。"
-
-#: src/browser.c:570 src/browser.c:590 src/browser.c:598
-msgid "Unable to open URL"
-msgstr "无法打开 URL"
-
-#: src/browser.c:571
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "选择了“手动”浏览器命令,但未设置命令。"
-
-#: src/browser.c:588
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "浏览器“%s”无效。"
-
-#: src/browser.c:595
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr "调用“命令”出错:%s"
-
-#: src/buddy_chat.c:316 src/dialogs.c:1318
+#: src/buddy_chat.c:316 src/gtkblist.c:2931
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1142,27 +1248,6 @@
 msgid "Join"
 msgstr "加入"
 
-#. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:487
-#: src/dialogs.c:499 src/dialogs.c:512 src/dialogs.c:533 src/dialogs.c:910
-#: src/dialogs.c:1602 src/dialogs.c:1717 src/dialogs.c:1783 src/dialogs.c:2045
-#: src/dialogs.c:2194 src/dialogs.c:2866 src/dialogs.c:3033 src/dialogs.c:3075
-#: src/dialogs.c:3212 src/dialogs.c:3556 src/gtkaccount.c:1547
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4200
-#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
-#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
-#: src/protocols/msn/msn.c:221 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:5790
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
-#: src/protocols/oscar/oscar.c:6118 src/protocols/trepia/trepia.c:379
-#: src/protocols/yahoo/yahoo.c:1632 src/prpl.c:164 src/request.h:813
-#: src/request.h:823
-msgid "Cancel"
-msgstr "取消"
-
 #: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
@@ -1181,87 +1266,74 @@
 msgid "Enter password for %s"
 msgstr "输入 %s 的密码"
 
-#. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1713 src/dialogs.c:1853
-#: src/dialogs.c:2044 src/dialogs.c:2190 src/dialogs.c:3032 src/dialogs.c:3074
-#: src/dialogs.c:3205 src/dialogs.c:3555 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:185
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6004 src/protocols/oscar/oscar.c:6053
-#: src/protocols/oscar/oscar.c:6117 src/protocols/yahoo/yahoo.c:1631
-#: src/request.h:813
-msgid "OK"
-msgstr "确定"
-
-#: src/conversation.c:424
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:432
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1983
+#: src/conversation.c:1888
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1986
+#: src/conversation.c:1891
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2071
+#: src/conversation.c:1976
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2113
+#: src/conversation.c:2018
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2020
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2188
+#: src/conversation.c:2093
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2190
+#: src/conversation.c:2095
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2377
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2474
+#: src/conversation.c:2379
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2476
+#: src/conversation.c:2381
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2478
+#: src/conversation.c:2383
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:338
+#: src/dialogs.c:317
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:354
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1273,47 +1345,47 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:483
+#: src/dialogs.c:462
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:485 src/dialogs.c:486
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:474
 #, 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:497 src/dialogs.c:498
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:486
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:528
+#: src/dialogs.c:507
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1322,400 +1394,202 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/dialogs.c:531 src/dialogs.c:532
+#: src/dialogs.c:510 src/dialogs.c:511
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/dialogs.c:680
+#: src/dialogs.c:659
 msgid "New Message"
 msgstr "新消息"
 
-#: src/dialogs.c:698
+#: src/dialogs.c:677
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "您想要跟谁聊?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:714 src/dialogs.c:791
+#: src/dialogs.c:693 src/dialogs.c:770
 msgid "_Screenname:"
 msgstr "用户名(_S):"
 
-#: src/dialogs.c:729 src/dialogs.c:807 src/gtkpounce.c:408
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/dialogs.c:760
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:779
+#: src/dialogs.c:758
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "您想要查看谁的信息?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:906
-msgid "Add Group"
-msgstr "添加组"
-
-#: src/dialogs.c:906
-msgid "Add a new group"
-msgstr "添加新组"
-
-#: src/dialogs.c:907
-msgid "Please enter the name of the group to be added."
-msgstr "请输入要添加的组名称。"
-
-#: src/dialogs.c:909 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2689 src/prpl.c:163
-msgid "Add"
-msgstr "添加"
-
-#: src/dialogs.c:935 src/protocols/yahoo/yahoo.c:1565
-msgid "Add Buddy"
-msgstr "添加好友"
-
-#: src/dialogs.c:954
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
-"的话,别名将会替代用户名显示。\n"
-
-#: src/dialogs.c:973 src/gtkaccount.c:1624
-msgid "Screen Name"
-msgstr "用户名"
-
-#: src/dialogs.c:986
-msgid "Alias"
-msgstr "别名"
-
-#: src/dialogs.c:996
-msgid "Group"
-msgstr "组"
-
-#. Set up stuff for the account box
-#: src/dialogs.c:1005
-msgid "Add To"
-msgstr "添加到"
-
-#: src/dialogs.c:1325
-msgid "Add Chat"
-msgstr "添加聊天"
-
-#: src/dialogs.c:1348
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
-
-#: src/dialogs.c:1357
-msgid "Account:"
-msgstr "账户:"
-
-#: src/dialogs.c:1376 src/gtkaccount.c:450
-msgid "Alias:"
-msgstr "别名:"
-
-#: src/dialogs.c:1387
-msgid "Group:"
-msgstr "组:"
-
-#: src/dialogs.c:1466
-msgid "Set Directory Info"
-msgstr "设置目录信息"
-
-#: src/dialogs.c:1474
-msgid "Directory Info"
-msgstr "目录信息"
-
-#: src/dialogs.c:1484
-#, c-format
-msgid "Setting Dir Info for %s:"
-msgstr "设置 %s 的目录信息:"
-
-#: src/dialogs.c:1497
-msgid "Allow Web Searches To Find Your Info"
-msgstr "允许搜索引擎查找您的信息"
-
-#. Line 1
-#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3968
-#: src/protocols/trepia/trepia.c:299
-msgid "First Name"
-msgstr "名"
-
-#. Line 2
-#: src/dialogs.c:1511 src/dialogs.c:2073
-msgid "Middle Name"
-msgstr "中名"
-
-#. Line 3
-#: src/dialogs.c:1523 src/dialogs.c:2083 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3971 src/protocols/trepia/trepia.c:306
-msgid "Last Name"
-msgstr "姓"
-
-#. Line 4
-#: src/dialogs.c:1534 src/dialogs.c:2093
-msgid "Maiden Name"
-msgstr "娘家名"
-
-#. Line 5
-#: src/dialogs.c:1545 src/dialogs.c:2103 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
-#: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
-msgid "City"
-msgstr "城市"
-
-#. Line 6
-#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4020
-#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:367
-#: src/protocols/trepia/trepia.c:471
-msgid "State"
-msgstr "州/省"
-
-#. Line 7
-#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3729
-#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
-msgid "Country"
-msgstr "国家"
-
-#: src/dialogs.c:1598 src/dialogs.c:1779 src/dialogs.c:2854 src/dialogs.c:3518
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4199
-#: src/protocols/trepia/trepia.c:378
-msgid "Save"
-msgstr "保存"
-
-#: src/dialogs.c:1621
-msgid "New passwords do not match."
-msgstr "新密码不相同。"
-
-#: src/dialogs.c:1627
-msgid "Fill out all fields completely."
-msgstr "完全填入所有字段。"
-
-#: src/dialogs.c:1656 src/dialogs.c:1665 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4418 src/protocols/oscar/oscar.c:6185
-#: src/protocols/toc/toc.c:1534
-msgid "Change Password"
-msgstr "更改密码"
-
-#: src/dialogs.c:1672
-#, c-format
-msgid "Changing password for %s:"
-msgstr "更改 %s 的密码:"
-
-#: src/dialogs.c:1680
-msgid "Original Password"
-msgstr "旧密码"
-
-#: src/dialogs.c:1691
-msgid "New Password"
-msgstr "新密码"
-
-#: src/dialogs.c:1702
-msgid "New Password (again)"
-msgstr "再次输入新密码"
-
-#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4404
-#: src/protocols/oscar/oscar.c:6171 src/protocols/toc/toc.c:1522
+#: src/dialogs.c:852 src/protocols/jabber/jabber.c:970
+#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/dialogs.c:1751
+#: src/dialogs.c:861
 #, c-format
 msgid "Changing info for %s:"
 msgstr "更改 %s 的信息:"
 
-#: src/dialogs.c:1839
-msgid "Below are the results of your search: "
-msgstr "下面是您搜索的结果:"
-
-#: src/dialogs.c:1958
+#: src/dialogs.c:963
 msgid "Log Conversation"
 msgstr "对话记录"
 
-#: src/dialogs.c:2039 src/dialogs.c:2172
-msgid "Search for Buddy"
-msgstr "搜索好友"
-
-#: src/dialogs.c:2139
-msgid "Find Buddy By Info"
-msgstr "按信息查找好友"
-
-#: src/dialogs.c:2166
-msgid "Find Buddy By Email"
-msgstr "按电子邮件查找好友"
-
-#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3731
-#: src/protocols/yahoo/yahoo.c:2041
-msgid "Email"
-msgstr "电子邮件"
-
-#: src/dialogs.c:2270
+#: src/dialogs.c:1059
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/dialogs.c:2272
+#: src/dialogs.c:1061
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2291
+#: src/dialogs.c:1083
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。\n"
 
-#: src/dialogs.c:2315 src/protocols/jabber/jabber.c:3723
+#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/jabber.c:590
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1807
-#: src/protocols/jabber/jabber.c:3737
+#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
+#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
 msgid "Description"
 msgstr "描述"
 
-#: src/dialogs.c:2460 src/dialogs.c:2477
+#: src/dialogs.c:1247 src/dialogs.c:1264
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:2512 src/dialogs.c:2529
+#: src/dialogs.c:1299 src/dialogs.c:1316
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:2626 src/dialogs.c:2652
+#: src/dialogs.c:1401 src/dialogs.c:1427
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:1493
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:1495
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:2730
+#: src/dialogs.c:1505
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:2795 src/dialogs.c:2803
+#: src/dialogs.c:1570 src/dialogs.c:1578
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:2813
+#: src/dialogs.c:1588
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:2858
+#: src/dialogs.c:1638
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:1642
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3011
+#: src/dialogs.c:1791
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias chat"
 msgstr "给聊天起名"
 
-#: src/dialogs.c:3030
+#: src/dialogs.c:1810
 msgid "Please enter an aliased name for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:1841
 msgid "_Screenname"
 msgstr "用户名(_S)"
 
-#: src/dialogs.c:3065 src/gtkblist.c:477 src/gtkblist.c:536
+#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/dialogs.c:3069
+#: src/dialogs.c:1850
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/dialogs.c:3070
+#: src/dialogs.c:1851
 msgid "Alias buddy"
 msgstr "好友别名"
 
-#: src/dialogs.c:3071
+#: src/dialogs.c:1852
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
 msgstr "请为以下好友输入别名,或者在好友列表中给该联系人改名。"
 
-#: src/dialogs.c:3107 src/dialogs.c:3114
+#: src/dialogs.c:1888 src/dialogs.c:1895
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "无法写入 %s。"
 
-#: src/dialogs.c:3138
+#: src/dialogs.c:1919
 msgid "Save Log File"
 msgstr "保存日志文件"
 
-#: src/dialogs.c:3168
+#: src/dialogs.c:1949
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "无法删除文件 %s。"
 
-#: src/dialogs.c:3187
+#: src/dialogs.c:1968
 msgid "Clear Log"
 msgstr "清除日志"
 
-#: src/dialogs.c:3196
+#: src/dialogs.c:1977
 msgid "Really clear log?"
 msgstr "真的要清除日志吗?"
 
-#: src/dialogs.c:3241 src/dialogs.c:3412
+#: src/dialogs.c:2022 src/dialogs.c:2193
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "无法打开日志文件 %s。"
 
-#: src/dialogs.c:3389
+#: src/dialogs.c:2170
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/dialogs.c:3391
+#: src/dialogs.c:2172
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/dialogs.c:3433
+#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:595
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:3490
+#: src/dialogs.c:2271
 msgid "Log"
 msgstr "日志"
 
-#: src/dialogs.c:3513
+#: src/dialogs.c:2294
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:3552
-msgid "Rename Group"
-msgstr "重命名组"
-
-#: src/dialogs.c:3552
-msgid "New group name"
-msgstr "新组名称"
-
-#: src/dialogs.c:3553
-msgid "Please enter a new name for the selected group."
-msgstr "请输入选中组的新名字。"
-
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1826,15 +1700,15 @@
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1595
+#: src/gaimrc.c:1267 src/gtkblist.c:1717
 msgid "Alphabetical"
 msgstr "字母序"
 
-#: src/gaimrc.c:1269
+#: src/gaimrc.c:1269 src/gtkblist.c:1718
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1271
+#: src/gaimrc.c:1271 src/gtkblist.c:1719
 msgid "By log size"
 msgstr "按日志大小"
 
@@ -1843,7 +1717,7 @@
 msgid "Could not open config file %s."
 msgstr "无法打开配置文件 %s。"
 
-#: src/gtkaccount.c:268
+#: src/gtkaccount.c:275
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1854,316 +1728,364 @@
 "<b>文件大小:</b> %s\n"
 "<b>图像大小:</b> %dx%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3086
+#: src/gtkaccount.c:306 src/protocols/oscar/oscar.c:3067
 msgid "Buddy Icon"
 msgstr "好友图标"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:350
+#: src/gtkaccount.c:357
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:374
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:379
 msgid "Screenname:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:445 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:452 src/main.c:310 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:454
+#: src/gtkaccount.c:457 src/gtkblist.c:2989
+msgid "Alias:"
+msgstr "别名:"
+
+#: src/gtkaccount.c:461
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:515
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:521
+#: src/gtkaccount.c:528
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:537
 msgid "Buddy icon file:"
 msgstr "好友图标文件:"
 
-#: src/gtkaccount.c:539
+#: src/gtkaccount.c:546
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: src/gtkaccount.c:545
+#: src/gtkaccount.c:552
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:606
+#: src/gtkaccount.c:613
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:727
+#: src/gtkaccount.c:734
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:734
+#: src/gtkaccount.c:741
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:741
+#: src/gtkaccount.c:748
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:748
+#: src/gtkaccount.c:755
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:755
+#: src/gtkaccount.c:762
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:762 src/gtkprefs.c:1107
+#: src/gtkaccount.c:769 src/gtkprefs.c:1112
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:795
+#: src/gtkaccount.c:802
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:799
+#: src/gtkaccount.c:806
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:822
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:831 src/gtkprefs.c:1101
+#: src/gtkaccount.c:838 src/gtkprefs.c:1106
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:847
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:851
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:852
+#: src/gtkaccount.c:859
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:857
+#: src/gtkaccount.c:864
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1196
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1192
+#: src/gtkaccount.c:1198
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1216
+#: src/gtkaccount.c:1222
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1223
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1250 src/protocols/jabber/jabber.c:608
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1542
+#: src/gtkaccount.c:1549
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1546 src/gtkrequest.c:192
+#: src/gtkaccount.c:1553 src/gtkrequest.c:206
 msgid "Delete"
 msgstr "删除"
 
-#. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3529
-#: src/protocols/jabber/jabber.c:3579 src/protocols/oscar/oscar.c:2847
-#: src/protocols/oscar/oscar.c:4598 src/protocols/oscar/oscar.c:5911
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:873
-#: src/protocols/zephyr/zephyr.c:883
+#: src/gtkaccount.c:1631 src/gtkblist.c:2667
+msgid "Screen Name"
+msgstr "用户名"
+
+#: src/gtkaccount.c:1654 src/protocols/jabber/jabber.c:862
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "在线"
 
-#: src/gtkaccount.c:1665
+#: src/gtkaccount.c:1672
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkblist.c:450
+#: src/gtkaccount.c:1961
+#, 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:1975
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"您是否想要将他/她添加为您的好友?"
+
+#: src/gtkaccount.c:1979
+msgid "Gaim - Information"
+msgstr "Gaim - 信息"
+
+#: src/gtkaccount.c:1983
+msgid "Add buddy to your list?"
+msgstr "将用户加为好友吗?"
+
+#: src/gtkaccount.c:1985 src/gtkblist.c:3037 src/gtkconv.c:1137
+#: src/gtkconv.c:3016 src/gtkconv.c:4190 src/gtkrequest.c:207
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+msgid "Add"
+msgstr "添加"
+
+#: src/gtkblist.c:496
 msgid "_Get Info"
 msgstr "获取信息(_G)"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:499
 msgid "_IM"
 msgstr "开聊(_I)"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:501
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:457
+#: src/gtkblist.c:503
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:479 src/gtkblist.c:538 src/gtkblist.c:548
+#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:517
+#: src/gtkblist.c:597
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:519
+#: src/gtkblist.c:599
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:521
+#: src/gtkblist.c:601
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:523
+#: src/gtkblist.c:603
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:531
+#: src/gtkblist.c:611
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:533
+#: src/gtkblist.c:613
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:544 src/gtkblist.c:575
+#: src/gtkblist.c:622 src/gtkblist.c:653
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:580
+#: src/gtkblist.c:658
 msgid "_Expand"
 msgstr "展开(_E)"
 
 #. Buddies menu
-#: src/gtkblist.c:1005
+#: src/gtkblist.c:1088
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:1006
+#: src/gtkblist.c:1089
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友(B)/新即时消息(_I)..."
 
-#: src/gtkblist.c:1007
+#: src/gtkblist.c:1090
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:1008
+#: src/gtkblist.c:1091
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友(B)/获取用户信息(_U)..."
 
-#: src/gtkblist.c:1010
+#: src/gtkblist.c:1093
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:1011
+#: src/gtkblist.c:1094
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:1012
+#: src/gtkblist.c:1095
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:1013
+#: src/gtkblist.c:1096
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:1014
+#: src/gtkblist.c:1097
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:1016
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:1017
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1020
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:1021
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:1022
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:1023
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/协议操作(_R)"
 
-#: src/gtkblist.c:1025
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:1026
+#: src/gtkblist.c:1109
 msgid "/Tools/_File Transfers..."
 msgstr "/工具(T)/文件传送(_F)..."
 
-#: src/gtkblist.c:1027
+#: src/gtkblist.c:1110
 msgid "/Tools/Preferences"
 msgstr "/工具(T)/首选项"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:1033
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:1035
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:1036
+#: src/gtkblist.c:1119
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:1066
+#: src/gtkblist.c:1135
+msgid "Rename Group"
+msgstr "重命名组"
+
+#: src/gtkblist.c:1135
+msgid "New group name"
+msgstr "新组名称"
+
+#: src/gtkblist.c:1136
+msgid "Please enter a new name for the selected group."
+msgstr "请输入选中组的新名字。"
+
+#: src/gtkblist.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -2172,16 +2094,16 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:1125 src/protocols/oscar/oscar.c:5498
+#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1236
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1151
+#: src/gtkblist.c:1250
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2189,7 +2111,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:1152
+#: src/gtkblist.c:1251
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2197,7 +2119,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:1153
+#: src/gtkblist.c:1252
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2205,7 +2127,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:1154
+#: src/gtkblist.c:1253
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2213,7 +2135,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:1155
+#: src/gtkblist.c:1254
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2221,7 +2143,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:1157
+#: src/gtkblist.c:1256
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2229,7 +2151,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:1158
+#: src/gtkblist.c:1257
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2237,7 +2159,7 @@
 "\n"
 "<b>状态</b>:可怕"
 
-#: src/gtkblist.c:1159
+#: src/gtkblist.c:1258
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2245,81 +2167,137 @@
 "\n"
 "<b>状态</b>:混乱"
 
-#: src/gtkblist.c:1413
+#: src/gtkblist.c:1514
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:1415
+#: src/gtkblist.c:1516
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:1419
+#: src/gtkblist.c:1520
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:1422
+#: src/gtkblist.c:1523
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:1594 src/gtkprefs.c:841 src/gtkprefs.c:1499
+#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
 msgid "None"
 msgstr "无"
 
-#: src/gtkblist.c:1659
+#: src/gtkblist.c:1780
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:1662
+#: src/gtkblist.c:1783
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:1665
+#: src/gtkblist.c:1786
 msgid "/Tools/Protocol Actions"
 msgstr "/工具(T)/协议操作(R)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1748
+#: src/gtkblist.c:1870
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:1750
+#: src/gtkblist.c:1872
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:1768 src/gtkconv.c:1073
+#: src/gtkblist.c:1890 src/gtkconv.c:1096
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkblist.c:1774
+#: src/gtkblist.c:1896
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:1777 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "信息"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:1905
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:1786 src/protocols/oscar/oscar.c:3095
+#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gtkblist.c:1791
+#: src/gtkblist.c:1913
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:1799
+#: src/gtkblist.c:1921
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkblist.c:2846
+#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2168
+msgid "Add Buddy"
+msgstr "添加好友"
+
+#: src/gtkblist.c:2645
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
+"的话,别名将会替代用户名显示。\n"
+
+#: src/gtkblist.c:2680
+msgid "Alias"
+msgstr "别名"
+
+#: src/gtkblist.c:2693
+msgid "Group"
+msgstr "组"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:2702
+msgid "Add To"
+msgstr "添加到"
+
+#: src/gtkblist.c:2938
+msgid "Add Chat"
+msgstr "添加聊天"
+
+#: src/gtkblist.c:2961
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
+
+#: src/gtkblist.c:2971
+msgid "Account:"
+msgstr "账户:"
+
+#: src/gtkblist.c:3000
+msgid "Group:"
+msgstr "组:"
+
+#: src/gtkblist.c:3034
+msgid "Add Group"
+msgstr "添加组"
+
+#: src/gtkblist.c:3034
+msgid "Add a new group"
+msgstr "添加新组"
+
+#: src/gtkblist.c:3035
+msgid "Please enter the name of the group to be added."
+msgstr "请输入要添加的组名称。"
+
+#: src/gtkblist.c:3547
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -2348,346 +2326,351 @@
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:185
 msgid "That file already exists"
 msgstr "该文件不存在"
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:280
+#: src/gtkconv.c:241
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "存储图像失败: %s\n"
+
+#: src/gtkconv.c:303
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入图像"
 
-#: src/gtkconv.c:584
+#: src/gtkconv.c:607
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:635
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:656
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:653
+#: src/gtkconv.c:676
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1104
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:773
+#: src/gtkconv.c:1106 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2978
+#: src/gtkconv.c:1115 src/gtkconv.c:3039
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3491
+#: src/gtkconv.c:1124
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2961 src/gtkconv.c:4123
-#: src/gtkrequest.c:194
+#: src/gtkconv.c:1135 src/gtkconv.c:3022 src/gtkconv.c:4175
+#: src/gtkrequest.c:208
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2187
+#: src/gtkconv.c:2247
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2195
+#: src/gtkconv.c:2255
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2297
+#: src/gtkconv.c:2358
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:2757
+#: src/gtkconv.c:2818
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:2774
+#: src/gtkconv.c:2835
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2837
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2839
 msgid "/Conversation/View _Log..."
 msgstr "/对话(C)/查看日志(_L)..."
 
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2845
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2847
 msgid "/Conversation/_Get Info..."
 msgstr "/对话(C)/获取信息(_G)..."
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:2849
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:2793
+#: src/gtkconv.c:2854
 msgid "/Conversation/Insert _URL..."
 msgstr "/对话(C)/插入 URL(_U)..."
 
-#: src/gtkconv.c:2795
+#: src/gtkconv.c:2856
 msgid "/Conversation/Insert _Image..."
 msgstr "/对话(C)/插入图像(_I)..."
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2861
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2863
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:2804
+#: src/gtkconv.c:2865
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:2806
+#: src/gtkconv.c:2867
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2872
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2876
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2816
+#: src/gtkconv.c:2877
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2878
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2918
 msgid "/Conversation/View Log..."
 msgstr "/对话(C)/查看日志(L)..."
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2923
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2927
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2931
 msgid "/Conversation/Get Info..."
 msgstr "/对话(C)/获取信息(G)..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2935
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:2880
+#: src/gtkconv.c:2941
 msgid "/Conversation/Insert URL..."
 msgstr "/对话(C)/插入 URL(U)..."
 
-#: src/gtkconv.c:2884
+#: src/gtkconv.c:2945
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:2951
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2955
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2959
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2963
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2969
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:2911
+#: src/gtkconv.c:2972
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2935 src/gtkconv.c:2937 src/gtkconv.c:3035 src/gtkconv.c:3037
-#: src/gtkconv.c:5918
+#: src/gtkconv.c:2996 src/gtkconv.c:2998 src/gtkconv.c:3096 src/gtkconv.c:3098
+#: src/gtkconv.c:5957
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:2958 src/gtkconv.c:4141
+#: src/gtkconv.c:3019 src/gtkconv.c:4193
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:2964 src/gtkconv.c:4126
+#: src/gtkconv.c:3025 src/gtkconv.c:4178
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
 #. Warn button
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:3032
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:3036
 msgid "Warn the user"
 msgstr "警告用户"
 
-#: src/gtkconv.c:2982 src/gtkconv.c:3417
+#: src/gtkconv.c:3043 src/gtkconv.c:3478
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Block button
-#: src/gtkconv.c:2985 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3046 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:3050
 msgid "Block the user"
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:3047 src/gtkconv.c:5921
+#: src/gtkconv.c:3108 src/gtkconv.c:5960
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3111
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3150
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3161
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3172
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3188
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3200
 msgid "Normal font size"
 msgstr "标准字体"
 
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3212
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3229
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3241
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3253
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:3207
+#: src/gtkconv.c:3268
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3279
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:3229
+#: src/gtkconv.c:3290
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:3286
+#: src/gtkconv.c:3347
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3337
+#: src/gtkconv.c:3398
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3394
+#: src/gtkconv.c:3455
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3467
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3908 src/server.c:1393
+#: src/gtkconv.c:3961 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- 新对话 @ %s ----</H3><BR>\n"
 
-#: src/gtkconv.c:3912 src/server.c:1396
+#: src/gtkconv.c:3965 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- 新对话 @ %s ----\n"
 
-#: src/gtkconv.c:3945
+#: src/gtkconv.c:3998
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4619 src/gtkconv.c:4651 src/gtkconv.c:4772 src/gtkconv.c:4839
+#: src/gtkconv.c:4682 src/gtkconv.c:4714 src/gtkconv.c:4835 src/gtkconv.c:4902
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5188
+#: src/gtkconv.c:5224
 msgid "Disable Animation"
 msgstr "禁用动画"
 
-#: src/gtkconv.c:5197
+#: src/gtkconv.c:5233
 msgid "Enable Animation"
 msgstr "启用动画"
 
-#: src/gtkconv.c:5204
+#: src/gtkconv.c:5240
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:5210
+#: src/gtkconv.c:5246
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:5688 src/gtkconv.c:5691
+#: src/gtkconv.c:5727 src/gtkconv.c:5730
 msgid "<main>/Conversation/Close"
 msgstr "<main>/对话(C)/关闭(C)"
 
@@ -2795,7 +2778,7 @@
 msgid "Gaim - Open..."
 msgstr "Gaim - 打开..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2030
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
@@ -2804,50 +2787,54 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/gtkimhtml.c:529
+#: src/gtkimhtml.c:535
+msgid "_Copy E-Mail Address"
+msgstr "电子邮件地址(_C)"
+
+#: src/gtkimhtml.c:547
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:557
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1652
+#: src/gtkimhtml.c:1639
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:1660
+#: src/gtkimhtml.c:1647
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:1669
+#: src/gtkimhtml.c:1656
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:1691
+#: src/gtkimhtml.c:1679
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2858,7 +2845,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2869,6 +2856,25 @@
 "\n"
 "%s"
 
+#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
+msgid "Unable to open URL"
+msgstr "无法打开 URL"
+
+#: src/gtknotify.c:413
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "选择了“手动”浏览器命令,但未设置命令。"
+
+#: src/gtknotify.c:430
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr "浏览器“%s”无效。"
+
+#: src/gtknotify.c:437
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "调用“命令”出错:%s"
+
 #: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "选择文件"
@@ -2900,7 +2906,7 @@
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:457 src/main.c:331
+#: src/gtkpounce.c:457 src/main.c:342
 msgid "Sign on"
 msgstr "登入"
 
@@ -2912,8 +2918,8 @@
 msgid "Return from away"
 msgstr "回来"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1496 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1427
+#: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2030
 msgid "Idle"
 msgstr "瞌睡"
 
@@ -2958,7 +2964,7 @@
 msgid "Browse"
 msgstr "浏览"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2085
+#: src/gtkpounce.c:518 src/gtkprefs.c:2087
 msgid "Test"
 msgstr "测试"
 
@@ -3010,169 +3016,168 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:377
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:379
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:560
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr "请从下面选择您要使用的笑脸主题。将主题拖曳到主题列表即可安装新主题。"
 
-#: src/gtkprefs.c:593
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "样式"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "粗体(_B)"
 
-#: src/gtkprefs.c:670
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "斜体(_I)"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "下划线(_U)"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "删除线(_S)"
 
-#: src/gtkprefs.c:677
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "字体"
 
-#: src/gtkprefs.c:680
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "使用自定义字体(_M)"
 
-#: src/gtkprefs.c:697
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "使用自定义大小(_Z)"
 
-#: src/gtkprefs.c:710
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "颜色"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "文字颜色(_T)"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/gtkprefs.c:761 src/gtkprefs.c:998 src/gtkprefs.c:1051
+#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:762
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "显示图形化笑脸(_S)"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "将 URLs 显示为链接(_U)"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "忽略字体名称(_F)"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "忽略字体大小(_Z)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:798
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:799
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:803
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U} 插入 HTML 标签(_H)"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "排序:"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:986 src/gtkprefs.c:1042
+#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "分组显示"
 
-#. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
 #: src/gtkprefs.c:850
 msgid "Show _numbers in groups"
 msgstr "在分组旁显示数字(_N)"
@@ -3181,7 +3186,7 @@
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:993
+#: src/gtkprefs.c:854 src/gtkprefs.c:998
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
@@ -3197,186 +3202,185 @@
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:905
 msgid "Send _URLs as Links"
 msgstr "将 URLs 发送为链接(_U)"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:908
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:910
 msgid "_Tab Placement:"
 msgstr "标签位置(_T):"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:912
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:913
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:914
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:916
+#: src/gtkprefs.c:915
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:921
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#. XXX: grey this out when the above is unchecked
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:924
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:934
 msgid "Show _close button on tabs"
 msgstr "在标签上显示关闭按钮(_C)"
 
-#: src/gtkprefs.c:940
+#: src/gtkprefs.c:945
 msgid "Show status _icons on tabs"
 msgstr "在标签上显示状态图标(_I)"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1023
+#: src/gtkprefs.c:972 src/gtkprefs.c:1028
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:985 src/gtkprefs.c:1041
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/gtkprefs.c:983 src/gtkprefs.c:1039
+#: src/gtkprefs.c:988 src/gtkprefs.c:1044
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:993
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:997
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:1000
 msgid "Enable buddy icon a_nimation"
 msgstr "启用好友图标动画(_N)"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1004
 msgid "Show _logins in window"
 msgstr "在窗口中显示登录(_L)"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1006
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1009
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1010
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1050
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1051
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1053
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1057
 msgid "_Show people joining in window"
 msgstr "在窗口中显示加入的人(_S)"
 
-#: src/gtkprefs.c:1054
+#: src/gtkprefs.c:1059
 msgid "_Show people leaving in window"
 msgstr "在窗口中显示离开的人(_S)"
 
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1061
 msgid "Co_lorize screennames"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1100
+#: src/gtkprefs.c:1105
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1103
+#: src/gtkprefs.c:1108
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1115
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1136
 msgid "_Host"
 msgstr "主机(_H)"
 
-#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4528 src/protocols/msn/msn.c:1529
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
+#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
+#: src/protocols/jabber/jabber.c:1083 src/protocols/msn/msn.c:1616
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
 msgid "Port"
 msgstr "端口"
 
-#: src/gtkprefs.c:1166
+#: src/gtkprefs.c:1171
 msgid "_User"
 msgstr "用户名(_U)"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1188
 msgid "Pa_ssword"
 msgstr "密码(_S)"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1225
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1226
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1227
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1223
+#: src/gtkprefs.c:1228
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1229
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1233
+#: src/gtkprefs.c:1238
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1274
+#: src/gtkprefs.c:1279
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1283
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1293
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3385,87 +3389,87 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1314
 msgid "Browser Options"
 msgstr "浏览器选项"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1315
 msgid "Open new _window by default"
 msgstr "默认打开新窗口(_W)"
 
-#: src/gtkprefs.c:1325
+#: src/gtkprefs.c:1330
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1326
+#: src/gtkprefs.c:1331
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1328
+#: src/gtkprefs.c:1333
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1335
 msgid "Strip _HTML from logs"
 msgstr "从日志中去掉 HTML(_H)"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1338
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1339
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1341
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡(_I)"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1343
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1340
+#: src/gtkprefs.c:1345
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1347
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "为每个好友登入创建单独的日志文件(_N)"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1390
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1391
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1393
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1397
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1398
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1400
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1402
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1404
+#: src/gtkprefs.c:1409
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1419
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3474,67 +3478,67 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1474
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1476
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1479
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1477
+#: src/gtkprefs.c:1482
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/gtkprefs.c:1480
+#: src/gtkprefs.c:1485
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1487
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1484
-msgid "Send auto-response in active conversations"
-msgstr "在当前对话中发送自动回复"
-
-#: src/gtkprefs.c:1497
+#: src/gtkprefs.c:1489
+msgid "Send auto-response in _active conversations"
+msgstr "在当前对话中发送自动回复(_A)"
+
+#: src/gtkprefs.c:1499
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1502
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1505
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1507
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1515
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1516
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1518
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1525
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1587
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3549,7 +3553,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1592
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3564,97 +3568,97 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1771
+#: src/gtkprefs.c:1773
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:1778 src/protocols/msn/msn.c:1284
-#: src/protocols/trepia/trepia.c:433
+#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:540
+#: src/protocols/msn/msn.c:1302 src/protocols/trepia/trepia.c:392
 msgid "Name"
 msgstr "名称"
 
-#: src/gtkprefs.c:1825
+#: src/gtkprefs.c:1827
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:1952
+#: src/gtkprefs.c:1954
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2059
+#: src/gtkprefs.c:2061
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2066
+#: src/gtkprefs.c:2068
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2091
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2093
+#: src/gtkprefs.c:2095
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2255
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "字体"
 
-#: src/gtkprefs.c:2256
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2279
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2280
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2274
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "插件"
 
@@ -3742,15 +3746,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:204
 msgid "Apply"
 msgstr "应用"
 
@@ -3812,56 +3816,14 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令:%s"
 
-#: src/gtkutils.c:289
+#: src/gtkutils.c:286
 msgid "Can't save icon file to disk."
 msgstr "无法保存 0 字节的图标文件。"
 
-#: src/gtkutils.c:324
+#: src/gtkutils.c:321
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 保存图标"
 
-#. full help text
-#: src/gtkutils.c:1037
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Gaim %s\n"
-"用法:%s [选项]...\n"
-"\n"
-"  -a, --acct          显示账户编辑窗口\n"
-"  -w, --away[=消息]   登入后设为离开(“消息”指定要使用的离开消息名称)\n"
-"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
-"  -n, --loginwin      不自动登入;显示登录窗口\n"
-"  -u, --user=名称     使用指定账户\n"
-"  -f, --file=文件     使用指定文件的配置\n"
-"  -d, --debug         将调试信息打印到标准输出\n"
-"  -v, --version       显示当前版本并退出\n"
-"  -h, --help          显示帮助并退出\n"
-
-#. short message
-#: src/gtkutils.c:1052
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
-
-#: src/html.c:345
-msgid "g003: Error opening connection.\n"
-msgstr "g003:打开连接出错。\n"
-
 #: src/log.c:30
 msgid "Error in specifying buddy conversation."
 msgstr "指定好友对话出错。"
@@ -3980,34 +3942,72 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) 报告 %s 睡醒了 @ %s"
 
-#: src/main.c:140
+#: src/main.c:151
 msgid "Please enter your login."
 msgstr "请输入您的登录名。"
 
-#: src/main.c:223
+#: src/main.c:234
 msgid "<New User>"
 msgstr "<新用户>"
 
-#: src/main.c:265
+#: src/main.c:276
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:281
+#: src/main.c:292
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/plugin.c:258
+#. full help text
+#: src/main.c:553
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"用法:%s [选项]...\n"
+"\n"
+"  -a, --acct          显示账户编辑窗口\n"
+"  -w, --away[=消息]   登入后设为离开(“消息”指定要使用的离开消息名称)\n"
+"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
+"  -n, --loginwin      不自动登入;显示登录窗口\n"
+"  -u, --user=名称     使用指定账户\n"
+"  -f, --file=文件     使用指定文件的配置\n"
+"  -d, --debug         将调试信息打印到标准输出\n"
+"  -v, --version       显示当前版本并退出\n"
+"  -h, --help          显示帮助并退出\n"
+
+#. short message
+#: src/main.c:568
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
+
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:263 src/plugin.c:291
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:287
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
@@ -4016,202 +4016,225 @@
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1276
-#: src/protocols/msn/msn.c:337 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: 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:1703
-#: src/protocols/yahoo/yahoo.c:1804
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2306
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Available"
 msgstr "可用"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "只对好友可用"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3597 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4615
-#: src/protocols/oscar/oscar.c:5917 src/protocols/yahoo/yahoo.c:1425
-#: src/protocols/yahoo/yahoo.c:1723 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:867
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
+#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:2326 src/protocols/yahoo/yahoo.c:2417
 msgid "Invisible"
 msgstr "隐身"
 
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "只对好友隐身"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "不可用"
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:136
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:139
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:142
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
 msgstr "从套接字读取时出错。"
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:148
 msgid "Error while writing to socket."
 msgstr "向套接字写入时出错。"
 
-#: src/protocols/gg/gg.c:154
+#: src/protocols/gg/gg.c:151
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: src/protocols/gg/gg.c:157
+#: src/protocols/gg/gg.c:154
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:204
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr "无法连接。"
 
+#: src/protocols/gg/gg.c:415
+msgid "Reading data"
+msgstr "正在读取数据"
+
 #: src/protocols/gg/gg.c:418
-msgid "Reading data"
-msgstr "正在读取数据"
+msgid "Balancer handshake"
+msgstr "平衡器握手"
 
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr "平衡器握手"
+msgid "Reading server key"
+msgstr "正在读取服务器密钥"
 
 #: src/protocols/gg/gg.c:424
-msgid "Reading server key"
-msgstr "正在读取服务器密钥"
-
-#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "正在交换密钥"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:180
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "发送为消息"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "正在查阅 GG 服务器"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "正在查阅 GG 服务器"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3963
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3892
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:671
+#: src/protocols/gg/gg.c:668
 msgid "First name"
 msgstr "名"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3965
+#. Last Name
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:560
+#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
+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:3894
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "性别"
 
-#: src/protocols/gg/gg.c:737
+#. City
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:570
+#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
+#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+msgid "City"
+msgstr "城市"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1240
+#: src/protocols/msn/msn.c:1482 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2583
+#: src/protocols/yahoo/yahoo.c:2605 src/protocols/yahoo/yahoo.c:2625
+#: src/protocols/yahoo/yahoo.c:2812 src/protocols/zephyr/zephyr.c:355
+msgid "Buddy Information"
+msgstr "好友信息"
+
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4219,71 +4242,76 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1068 src/protocols/gg/gg.c:1091
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1090
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1139
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1140
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:977
+#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
+msgid "Change Password"
+msgstr "更改密码"
+
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1251
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1252
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4300,7 +4328,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1364 src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -4313,17 +4341,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1806
-#: src/protocols/msn/notification.c:924 src/protocols/msn/notification.c:1245
-#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2617
-#: src/protocols/oscar/oscar.c:5152
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:179
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
+#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:5080
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1807
-#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1247
-#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2619
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:180
+#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
+#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:5081
 msgid "Deny"
 msgstr "拒绝"
 
@@ -4375,21 +4403,42 @@
 msgid "No topic is set"
 msgstr "未设定话题"
 
-#: src/protocols/irc/irc.c:121
+#: src/protocols/irc/irc.c:64
+msgid "Error displaying MOTD"
+msgstr "显示 MOTD 出错"
+
+#: src/protocols/irc/irc.c:64
+msgid "No MOTD available"
+msgstr "没有可用的 MOTD"
+
+#: src/protocols/irc/irc.c:65
+msgid "There is no MOTD associated with this connection."
+msgstr "没有与此连接关联的 MOTD"
+
+#: src/protocols/irc/irc.c:68
+#, c-format
+msgid "MOTD for %s"
+msgstr "%s 的 MOTD"
+
+#: src/protocols/irc/irc.c:137
+msgid "View MOTD"
+msgstr "查看 MOTD"
+
+#: src/protocols/irc/irc.c:156
 msgid "Channel:"
 msgstr "频道:"
 
-#: src/protocols/irc/irc.c:145
+#: src/protocols/irc/irc.c:180
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:686
-#: src/protocols/toc/toc.c:232
+#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:173
+#: src/protocols/irc/irc.c:208
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
@@ -4402,167 +4451,171 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:495
+#: src/protocols/irc/irc.c:530
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:496
+#: src/protocols/irc/irc.c:531
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#. Splits
-#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4514 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1073 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:519
+#: src/protocols/irc/irc.c:554
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "无效模式"
 
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被 %s 屏蔽了。"
 
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "屏蔽"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:193
+#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:530
 msgid "Username"
 msgstr "用户名"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:2049
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2683
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr "目前位于"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>瞌睡了:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "上线时间"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>定义形容词:</b>显赫<br>"
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:219
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "%s 的好友信息"
+
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为:%s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为:%s"
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s:%s 踢出了"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "%3$s 模式(%1$s %2%s)"
 
-#: src/protocols/irc/msgs.c:658
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:659
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:680
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:718
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "错误:服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后:%lu 秒"
 
-#: src/protocols/irc/msgs.c:790
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:791
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:821
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
@@ -4590,281 +4643,466 @@
 msgid "Disconnected"
 msgstr "已断开"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:574
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:601
-#: src/protocols/msn/msn.c:75 src/protocols/msn/msn.c:95
-#: src/protocols/msn/msn.c:153 src/protocols/msn/msn.c:253
-#: src/protocols/msn/msn.c:509 src/protocols/msn/msn.c:620
-#: src/protocols/msn/msn.c:636 src/protocols/msn/msn.c:684
-#: src/protocols/msn/msn.c:707 src/protocols/msn/msn.c:739
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:780
-#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:802
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:849 src/protocols/msn/msn.c:899
-#: src/protocols/msn/msn.c:937 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1087
-#: src/protocols/msn/msn.c:1098 src/protocols/msn/msn.c:1109
-#: src/protocols/msn/msn.c:1133 src/protocols/msn/msn.c:1145
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/notification.c:179
-#: src/protocols/msn/notification.c:206 src/protocols/msn/notification.c:1643
-#: src/protocols/msn/notification.c:1663 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
-#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
-#: src/protocols/trepia/trepia.c:1263
-msgid "Write error"
-msgstr "写错误"
-
-#: src/protocols/jabber/jabber.c:1069 src/protocols/jabber/jabber.c:1076
-msgid "Unable to change password."
-msgstr "无法更改密码。"
-
-#: src/protocols/jabber/jabber.c:1070
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr "您输入的旧密码不正确。您的密码未被更改。"
-
-#: src/protocols/jabber/jabber.c:1077
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr "您输入的新密码与您目前的密码相同。您的密码仍然保持原样。"
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3530
-#: src/protocols/jabber/jabber.c:3581
-msgid "Chatty"
-msgstr "唠叨"
-
-#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3532
-#: src/protocols/jabber/jabber.c:3589
-msgid "Extended Away"
-msgstr "远远离开"
-
-#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3593 src/protocols/oscar/oscar.c:2835
-#: src/protocols/oscar/oscar.c:4603 src/protocols/oscar/oscar.c:5913
-msgid "Do Not Disturb"
-msgstr "请勿打扰"
-
-#: src/protocols/jabber/jabber.c:1513
-#, c-format
-msgid "Jabber Error %s"
-msgstr "Jabber 错误 %s"
-
-#: src/protocols/jabber/jabber.c:1618
-#, c-format
-msgid "Error %s: %s"
-msgstr "错误 %s:%s"
-
-#: src/protocols/jabber/jabber.c:1621
-msgid "Unknown Error in presence"
-msgstr "出现未知错误"
-
-#: src/protocols/jabber/jabber.c:1799
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "用户 %s 想要将您添加为好友。"
-
-#: src/protocols/jabber/jabber.c:1827
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr "Jabber 用户 %s 不存在,因此没有添加到您的人名单中。"
-
-#: src/protocols/jabber/jabber.c:1830
-msgid "No such user."
-msgstr "没有这样的用户。"
-
-#: src/protocols/jabber/jabber.c:1994
-msgid "Authenticating"
-msgstr "正在认证"
-
-#: src/protocols/jabber/jabber.c:2028
-msgid "Unknown login error"
-msgstr "未知的登录错误"
-
-#: src/protocols/jabber/jabber.c:2378
-msgid "Password successfully changed."
-msgstr "密码更改成功。"
-
-#: src/protocols/jabber/jabber.c:2423 src/protocols/jabber/jabber.c:4332
-msgid "Connection lost"
-msgstr "连接已丢失"
-
-#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:2459
-#: src/protocols/jabber/jabber.c:4334 src/protocols/jabber/jabber.c:4383
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
-#: src/protocols/msn/notification.c:2100 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1304
-msgid "Unable to connect"
-msgstr "无法连接"
-
-#: src/protocols/jabber/jabber.c:2430
-msgid "Connected"
-msgstr "已连接"
-
-#: src/protocols/jabber/jabber.c:2433
-msgid "Requesting Authentication Method"
-msgstr "正在请求认证方法"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2453 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1327
-msgid "Connecting"
-msgstr "正在连接"
-
-#: src/protocols/jabber/jabber.c:2779
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "用户 %s 的 Jabber ID 无效,因此没有添加。"
-
-#: src/protocols/jabber/jabber.c:2781
-msgid "Unable to add buddy."
-msgstr "无法添加好友。"
-
-#: src/protocols/jabber/jabber.c:2782
-msgid "Jabber Error"
-msgstr "Jabber 错误"
-
-#: src/protocols/jabber/jabber.c:3041 src/protocols/yahoo/yahoochat.c:833
-msgid "Room:"
-msgstr "房间:"
-
-#: src/protocols/jabber/jabber.c:3046
-msgid "Server:"
-msgstr "服务器:"
-
-#: src/protocols/jabber/jabber.c:3052
-msgid "Handle:"
-msgstr "门把手:"
-
-#: src/protocols/jabber/jabber.c:3082
-msgid "Unable to join chat"
-msgstr "无法加入聊天"
-
-#: src/protocols/jabber/jabber.c:3318 src/protocols/jabber/jabber.c:3369
-#: src/protocols/jabber/jabber.c:3791
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: src/protocols/jabber/jabber.c:3319
-msgid "Error"
-msgstr "出错"
-
-#: src/protocols/jabber/jabber.c:3370 src/protocols/jabber/jabber.c:3429
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3817
-msgid "Status"
-msgstr "状态"
-
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3462
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/jabber/auth.c:50
+msgid "Server requires SSL for login"
+msgstr "服务器需要 SSL 才能登录"
+
+#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
+#: src/protocols/jabber/auth.c:354
+msgid "Invalid response from server"
+msgstr "服务器的响应无效"
+
+#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
+msgid "Server does not use any supported authentication method"
+msgstr "服务器未使用任何支持的身份验证方法"
+
+#: src/protocols/jabber/auth.c:327
+msgid "Invalid challenge from server"
+msgstr "服务器的挑战无效"
+
+#: src/protocols/jabber/auth.c:357
+msgid "Bad Protocol"
+msgstr "无效的协议"
+
+#: src/protocols/jabber/auth.c:360
+msgid "Encryption Required"
+msgstr "需要加密"
+
+#: src/protocols/jabber/auth.c:363
+msgid "Invalid authzid"
+msgstr "无效的认证"
+
+#: src/protocols/jabber/auth.c:366
+msgid "Invalid Mechanism"
+msgstr "用户名算法"
+
+#: src/protocols/jabber/auth.c:368
+msgid "Invalid Realm"
+msgstr "用户名域"
+
+#: src/protocols/jabber/auth.c:371
+msgid "Mechanism Too Weak"
+msgstr "算法太弱"
+
+#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:802 src/protocols/jabber/jabber.c:852
+#: src/protocols/oscar/oscar.c:5472
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:3479
-msgid "View Error Msg"
-msgstr "查看错误消息"
-
-#: src/protocols/jabber/jabber.c:3498
-msgid "Un-hide From"
-msgstr "取消隐身"
-
-#: src/protocols/jabber/jabber.c:3501
-msgid "Temporarily Hide From"
-msgstr "临时隐身"
-
-#: src/protocols/jabber/jabber.c:3508
-msgid "Cancel Presence Notification"
-msgstr "取消目前的通知"
-
-#: src/protocols/jabber/jabber.c:3516
-msgid "Re-request authorization"
-msgstr "重新请求认证"
-
-#: src/protocols/jabber/jabber.c:3719
+#: src/protocols/jabber/auth.c:377
+msgid "Temporary Authentication Failure"
+msgstr "临时认证失败"
+
+#: src/protocols/jabber/auth.c:379
+msgid "Authentication Failure"
+msgstr "认证失败"
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3720
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3721
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3722 src/protocols/yahoo/yahoo.c:2045
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:631
+#: src/protocols/jabber/jabber.c:550 src/protocols/yahoo/yahoo.c:2677
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/jabber.c:3724
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3725
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/jabber.c:3726
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/jabber.c:3727
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/jabber.c:3728
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/jabber.c:580
 msgid "Postal Code"
 msgstr "邮政编码"
 
-#: src/protocols/jabber/jabber.c:3730
+#. Country
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
+#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+msgid "Country"
+msgstr "国家"
+
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:687
+#: src/protocols/jabber/buddy.c:694
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/jabber.c:3732
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:705
+#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2671
+msgid "Email"
+msgstr "电子邮件"
+
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/jabber.c:3733
+#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/jabber.c:3734
+#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/jabber.c:3735
+#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/jabber.c:3736 src/protocols/oscar/oscar.c:3997
+#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
+#: src/protocols/oscar/oscar.c:3926
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:4194 src/protocols/jabber/jabber.c:4195
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
 msgid "Edit Jabber vCard"
 msgstr "编辑 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4196
+#: src/protocols/jabber/buddy.c:516
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/jabber.c:4269
-msgid "Server Registration successful!"
-msgstr "服务器注册成功!"
-
-#: src/protocols/jabber/jabber.c:4285
-#, c-format
-msgid "Error %d: %s"
-msgstr "错误 %d:%s"
-
-#: src/protocols/jabber/jabber.c:4290
-msgid "Unknown registration error"
-msgstr "未知的注册错误"
+#: src/protocols/jabber/buddy.c:554
+msgid "Jabber ID"
+msgstr "Jabber ID"
+
+#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
+#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:839
+#: src/protocols/jabber/jabber.c:852
+msgid "Status"
+msgstr "状态"
+
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1076
+msgid "Resource"
+msgstr "资源"
+
+#: src/protocols/jabber/buddy.c:624
+msgid "Middle Name"
+msgstr "中名"
+
+#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:565
+#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
+msgid "Address"
+msgstr "地址"
+
+#: src/protocols/jabber/buddy.c:651
+msgid "P.O. Box"
+msgstr "邮政信箱"
+
+#: src/protocols/jabber/buddy.c:757
+msgid "Photo"
+msgstr "相片"
+
+#: src/protocols/jabber/buddy.c:757
+msgid "Logo"
+msgstr "图符"
+
+#: src/protocols/jabber/buddy.c:771
+msgid "Jabber Profile"
+msgstr "Jabber 资料"
+
+#: src/protocols/jabber/buddy.c:866
+msgid "Un-hide From"
+msgstr "取消隐身"
+
+#: src/protocols/jabber/buddy.c:869
+msgid "Temporarily Hide From"
+msgstr "临时隐身"
+
+#: src/protocols/jabber/buddy.c:877
+msgid "Cancel Presence Notification"
+msgstr "取消目前的通知"
+
+#: src/protocols/jabber/buddy.c:885
+msgid "Re-request authorization"
+msgstr "重新请求认证"
+
+#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:833
+msgid "Room:"
+msgstr "房间:"
+
+#: src/protocols/jabber/chat.c:43
+msgid "Server:"
+msgstr "服务器:"
+
+#: src/protocols/jabber/chat.c:49
+msgid "Handle:"
+msgstr "门把手:"
+
+#: src/protocols/jabber/jabber.c:80
+msgid "Error initializing session"
+msgstr "初始化会话出错"
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Format"
+msgstr "格式无效"
+
+#: src/protocols/jabber/jabber.c:107
+msgid "Bad Namespace Prefix"
+msgstr "无效的命名空间前缀"
+
+#: src/protocols/jabber/jabber.c:110
+msgid "Resource Conflict"
+msgstr "资源冲突"
+
+#: src/protocols/jabber/jabber.c:112
+msgid "Connection Timeout"
+msgstr "连接超时"
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Gone"
+msgstr "主机宕机"
+
+#: src/protocols/jabber/jabber.c:116
+msgid "Host Unknown"
+msgstr "主机未知"
+
+#: src/protocols/jabber/jabber.c:118
+msgid "Improper Addressing"
+msgstr "寻址不恰当"
+
+#: src/protocols/jabber/jabber.c:120
+msgid "Internal Server Error"
+msgstr "内部服务器错误"
+
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid ID"
+msgstr "无效 ID"
+
+#: src/protocols/jabber/jabber.c:124
+msgid "Invalid Namespace"
+msgstr "无效的命名空间"
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Invalid XML"
+msgstr "无效的 XML"
+
+#: src/protocols/jabber/jabber.c:128
+msgid "Non-matching Hosts"
+msgstr "不匹配的主机"
+
+#: src/protocols/jabber/jabber.c:132
+msgid "Policy Violation"
+msgstr "违背策略"
+
+#: src/protocols/jabber/jabber.c:134
+msgid "Remote Connection Failed"
+msgstr "远程连接失败"
+
+#: src/protocols/jabber/jabber.c:136
+msgid "Resource Constraint"
+msgstr "资源约束"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Restricted XML"
+msgstr "限制的 XML"
+
+#: src/protocols/jabber/jabber.c:140
+msgid "See Other Host"
+msgstr "查看其它主机"
+
+#: src/protocols/jabber/jabber.c:142
+msgid "System Shutdown"
+msgstr "系统关机"
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Undefined Condition"
+msgstr "未定义的条件"
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Condition"
+msgstr "不支持的条件"
+
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Stanza Type"
+msgstr "不支持的节类型"
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Unsupported Version"
+msgstr "不支持的版本"
+
+#: src/protocols/jabber/jabber.c:152
+msgid "XML Not Well Formed"
+msgstr "XML 格式有错"
+
+#: src/protocols/jabber/jabber.c:154
+msgid "Stream Error"
+msgstr "流错误"
+
+#: src/protocols/jabber/jabber.c:232 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:516
+#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
+#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
+#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
+#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
+#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1073
+#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1105
+#: src/protocols/msn/msn.c:1116 src/protocols/msn/msn.c:1140
+#: src/protocols/msn/msn.c:1152 src/protocols/msn/msn.c:1217
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
+#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
+#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+msgid "Write error"
+msgstr "写错误"
+
+#: src/protocols/jabber/jabber.c:390 src/protocols/jabber/jabber.c:667
+#: src/protocols/trepia/trepia.c:1106
+msgid "Unable to create socket"
+msgstr "无法创建套接字"
+
+#: src/protocols/jabber/jabber.c:415
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "%s@%s 注册成功"
+
+#: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:418
+msgid "Registration Successful"
+msgstr "注册成功"
+
+#: src/protocols/jabber/jabber.c:427
+msgid "Unknown Error"
+msgstr "未知错误"
+
+#: src/protocols/jabber/jabber.c:430
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "注册 %s@%s 失败:%s"
+
+#: src/protocols/jabber/jabber.c:432 src/protocols/jabber/jabber.c:433
+msgid "Registration Failed"
+msgstr "注册失败"
+
+#: src/protocols/jabber/jabber.c:520 src/protocols/jabber/jabber.c:521
+msgid "Already Registered"
+msgstr "已注册"
+
+#: src/protocols/jabber/jabber.c:534 src/protocols/jabber/jabber.c:947
+msgid "Password"
+msgstr "密码"
+
+#: src/protocols/jabber/jabber.c:545
+msgid "E-Mail"
+msgstr "电子邮件"
+
+#. First Name
+#: src/protocols/jabber/jabber.c:555 src/protocols/oscar/oscar.c:3897
+#: src/protocols/trepia/trepia.c:258
+msgid "First Name"
+msgstr "名"
+
+#. State
+#: src/protocols/jabber/jabber.c:575 src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:430
+msgid "State"
+msgstr "州/省"
+
+#: src/protocols/jabber/jabber.c:585
+msgid "Phone"
+msgstr "电话"
+
+#: src/protocols/jabber/jabber.c:603
+msgid "Please fill out the information below to register your new account."
+msgstr "请在下面填入信息以注册您新的账户。"
+
+#: src/protocols/jabber/jabber.c:606 src/protocols/jabber/jabber.c:607
+msgid "Register New Jabber Account"
+msgstr "注册新的 Jabber 账户"
+
+#: src/protocols/jabber/jabber.c:706 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1925
+msgid "Connecting"
+msgstr "正在连接"
+
+#: src/protocols/jabber/jabber.c:710
+msgid "Initializing Stream"
+msgstr "初始化流"
+
+#: src/protocols/jabber/jabber.c:716
+msgid "Authenticating"
+msgstr "正在认证"
+
+#: src/protocols/jabber/jabber.c:724
+msgid "Re-initializing Stream"
+msgstr "重新初始化流"
+
+#: src/protocols/jabber/jabber.c:847 src/protocols/jabber/jabber.c:898
+#: src/protocols/jabber/presence.c:255
+msgid "Error"
+msgstr "出错"
+
+#: src/protocols/jabber/jabber.c:863 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
+msgid "Chatty"
+msgstr "唠叨"
+
+#: src/protocols/jabber/jabber.c:865 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
+msgid "Extended Away"
+msgstr "远远离开"
+
+#: src/protocols/jabber/jabber.c:866 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
+msgid "Do Not Disturb"
+msgstr "请勿打扰"
+
+#: src/protocols/jabber/jabber.c:880
+msgid "Password Changed"
+msgstr "密码已更改"
+
+#: src/protocols/jabber/jabber.c:881
+msgid "Your password has been changed."
+msgstr "您的密码已更改。"
+
+#: src/protocols/jabber/jabber.c:891
+#, c-format
+msgid "Error changing password: %s"
+msgstr "更改密码出错: %s"
+
+#: src/protocols/jabber/jabber.c:895
+msgid "Unknown error occurred changing password"
+msgstr "更改密码时发生了未知错误"
+
+#: src/protocols/jabber/jabber.c:952
+msgid "Password (again)"
+msgstr "再次输入新密码"
+
+#: src/protocols/jabber/jabber.c:957 src/protocols/jabber/jabber.c:958
+msgid "Change Jabber Password"
+msgstr "更改 Jabber 密码"
+
+#: src/protocols/jabber/jabber.c:958
+msgid "Please enter your new password"
+msgstr "请输入您的新密码"
 
 #. *< api_version
 #. *< type
@@ -4876,36 +5114,73 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4493 src/protocols/jabber/jabber.c:4495
+#: src/protocols/jabber/jabber.c:1053 src/protocols/jabber/jabber.c:1055
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:4517
-msgid "Resource"
-msgstr "资源"
-
-#: src/protocols/jabber/jabber.c:4523
-msgid "Use SSL"
-msgstr "使用 SSL"
-
-#: src/protocols/jabber/jabber.c:4532
+#: src/protocols/jabber/jabber.c:1079
+msgid "Force Old SSL"
+msgstr "强制旧 SSL"
+
+#: src/protocols/jabber/jabber.c:1087
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:277
-#: src/protocols/msn/notification.c:498
+#: src/protocols/jabber/message.c:95
+#, c-format
+msgid "Message from %s"
+msgstr "来自 %s 的消息"
+
+#: src/protocols/jabber/message.c:176
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "投递到 %s 的消息失败:%s"
+
+#: src/protocols/jabber/message.c:179
+msgid "Jabber Message Error"
+msgstr "Jabber 消息错误"
+
+#: src/protocols/jabber/message.c:242
+#, c-format
+msgid " (Code %s)"
+msgstr " (代码 %s)"
+
+#: src/protocols/jabber/parser.c:129
+msgid "XML Parse error"
+msgstr "XML 分析错误"
+
+#: src/protocols/jabber/presence.c:166
+#, c-format
+msgid "%s (Code %s)"
+msgstr "%s (代码 %s)"
+
+#: src/protocols/jabber/presence.c:170
+msgid "Unknown Error in presence"
+msgstr "出现未知错误"
+
+#: src/protocols/jabber/presence.c:174
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "用户 %s 想要将您添加为好友。"
+
+#: src/protocols/jabber/presence.c:251
+msgid "Unable to join chat"
+msgstr "无法加入聊天"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:499
 msgid "Unable to request USR\n"
 msgstr "无法请求 USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:294
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "无法使用 MD5 登入"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:303
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "无法发送 USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:308
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "正在请求发送密码"
 
@@ -4913,15 +5188,15 @@
 msgid "Protocol version not supported"
 msgstr "协议版本不支持"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:760
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
 msgid "Unable to request CVR\n"
 msgstr "无法请求 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:769
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
 msgid "Unable to request INF\n"
 msgstr "无法请求 INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1877
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
 msgid "Got invalid XFR"
 msgstr "得到无效的 XFR"
 
@@ -4933,16 +5208,23 @@
 msgid "Unable to parse message."
 msgstr "无法处理消息。"
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:865
-#: src/protocols/msn/notification.c:2122
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
+#: src/protocols/msn/notification.c:2102 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1748 src/protocols/yahoo/yahoo.c:1813
+msgid "Unable to connect"
+msgstr "无法连接"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:2124
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2129
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2131
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2143
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2145
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
@@ -4963,7 +5245,7 @@
 msgstr "缺少全称域名"
 
 #: src/protocols/msn/error.c:47
-msgid "Already Login"
+msgid "Already Logged In"
 msgstr "已登入"
 
 #: src/protocols/msn/error.c:50
@@ -5038,7 +5320,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -5091,8 +5373,8 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:612
-#: src/protocols/msn/notification.c:1258 src/protocols/msn/notification.c:1426
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
+#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
 msgid "Unable to write"
 msgstr "无法写入"
 
@@ -5124,8 +5406,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:662
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -5150,35 +5432,35 @@
 msgid "Unknown Error Code %d"
 msgstr "未知的错误代码 %d"
 
-#: src/protocols/msn/msn.c:63
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:170
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:178
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:222
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5186,94 +5468,94 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:219
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:220
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2144
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:598
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1407
-#: src/protocols/yahoo/yahoo.c:1705 src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2010
+#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2408
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:600
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1409
-#: src/protocols/yahoo/yahoo.c:1707 src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2012
+#: src/protocols/yahoo/yahoo.c:2310 src/protocols/yahoo/yahoo.c:2409
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:602
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1417
-#: src/protocols/yahoo/yahoo.c:1715 src/protocols/yahoo/yahoo.c:1810
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:2318 src/protocols/yahoo/yahoo.c:2413
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:604
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1421
-#: src/protocols/yahoo/yahoo.c:1719 src/protocols/yahoo/yahoo.c:1812
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2024
+#: src/protocols/yahoo/yahoo.c:2322 src/protocols/yahoo/yahoo.c:2415
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
-#: src/protocols/zephyr/zephyr.c:870 src/protocols/zephyr/zephyr.c:885
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:355
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:369
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:375
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:384
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:417
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:426
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "进入聊天室"
 
-#: src/protocols/msn/msn.c:720
+#: src/protocols/msn/msn.c:727
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5282,11 +5564,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:724 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
 msgid "Invalid MSN screenname"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:760
+#: src/protocols/msn/msn.c:767
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5295,67 +5577,76 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "屏蔽列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:1228 src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/msn/msn.c:1241 src/protocols/yahoo/yahoo.c:2584
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>获取个人资料出错</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1288 src/protocols/oscar/oscar.c:4002
-#: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:2057
+#: src/protocols/msn/msn.c:1309 src/protocols/oscar/oscar.c:3931
+#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:2695
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1292 src/protocols/oscar/oscar.c:3988
-#: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:2065
+#: src/protocols/msn/msn.c:1316 src/protocols/oscar/oscar.c:3917
+#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
+#: src/protocols/yahoo/yahoo.c:2707
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1296 src/protocols/yahoo/yahoo.c:2061
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo.c:2701
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1300 src/protocols/yahoo/yahoo.c:2053
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2689
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2069
+#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo.c:2713
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1324
-#: src/protocols/msn/msn.c:1332 src/protocols/msn/msn.c:1340
-#: src/protocols/msn/msn.c:1347
+#: src/protocols/msn/msn.c:1356 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1376
+#: src/protocols/msn/msn.c:1383
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1353 src/protocols/msn/msn.c:1366
-#: src/protocols/msn/msn.c:1373
+#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1412
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1386
-#: src/protocols/msn/msn.c:1393
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1399 src/protocols/msn/msn.c:1405
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1449
+#: src/protocols/yahoo/yahoo.c:2757
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1410 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/msn/msn.c:1457 src/protocols/yahoo/yahoo.c:2801
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1417 src/protocols/trepia/trepia.c:321
-#: src/protocols/trepia/trepia.c:489
+#: src/protocols/msn/msn.c:1468 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr "主页"
 
+#: src/protocols/msn/msn.c:1490 src/protocols/yahoo/yahoo.c:2819
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "%s 的用户信息不可用"
+
+#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2821
+msgid "The user's profile is empty."
+msgstr "用户的配置文件为空。"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5366,82 +5657,82 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1505 src/protocols/msn/msn.c:1507
+#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1592
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1611 src/protocols/trepia/trepia.c:1330
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/notification.c:246
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误:%s\n"
 
-#: src/protocols/msn/notification.c:362 src/protocols/msn/notification.c:523
+#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
 msgid "Unable to write to MSN Nexus server."
 msgstr "无法写入 MSN Nexus 服务器。"
 
-#: src/protocols/msn/notification.c:371 src/protocols/msn/notification.c:538
+#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
 msgid "Unable to read from MSN Nexus server."
 msgstr "无法从 MSN Nexus 服务器读取。"
 
-#: src/protocols/msn/notification.c:391
+#: src/protocols/msn/notification.c:392
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus 服务器返回了无效的重定向信息。"
 
-#: src/protocols/msn/notification.c:437
+#: src/protocols/msn/notification.c:438
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
 
-#: src/protocols/msn/notification.c:549
+#: src/protocols/msn/notification.c:550
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN Nexus 服务器返回了无效的信息。"
 
-#: src/protocols/msn/notification.c:617 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
-#: src/protocols/msn/notification.c:679
+#: src/protocols/msn/notification.c:680
 msgid "Unable to connect to passport server"
 msgstr "无法连接到 Passport 服务器"
 
-#: src/protocols/msn/notification.c:684 src/protocols/msn/notification.c:716
+#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:711
+#: src/protocols/msn/notification.c:712
 msgid "Unable to send password"
 msgstr "无法发送密码"
 
-#: src/protocols/msn/notification.c:747
+#: src/protocols/msn/notification.c:748
 msgid "Protocol not supported"
 msgstr "协议不支持"
 
-#: src/protocols/msn/notification.c:789
+#: src/protocols/msn/notification.c:790
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/notification.c:794
+#: src/protocols/msn/notification.c:795
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已经被断开。MSN 服务器目前维护中。"
 
-#: src/protocols/msn/notification.c:920
+#: src/protocols/msn/notification.c:921
 #, 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:1239 src/protocols/msn/notification.c:1405
+#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "用户 %s(%s) 想要将您添加为好友。"
 
-#: src/protocols/msn/notification.c:1919
+#: src/protocols/msn/notification.c:1921
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:2063
+#: src/protocols/msn/notification.c:2065
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5476,50 +5767,50 @@
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
-#: src/protocols/napster/napster.c:232
+#: src/protocols/napster/napster.c:228
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
-#: src/protocols/napster/napster.c:246
-#, c-format
-msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
+#: src/protocols/napster/napster.c:242
+#, c-format
+msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr "无法从服务器读取信息。命令为 %hd,长度为 %hd。"
 
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:303
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "用户数:%s,文件数:%s,大小:%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:314
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:322
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:382
+#: src/protocols/napster/napster.c:378
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:410
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:416
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5223
-#: src/protocols/toc/toc.c:1261
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
+#: src/protocols/toc/toc.c:1258
 msgid "Join what group:"
 msgstr "加入组:"
 
@@ -5533,178 +5824,178 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:176
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to host"
 msgstr "主机等级"
 
+#: src/protocols/oscar/oscar.c:178
+msgid "Rate to client"
+msgstr "客户等级"
+
+#: src/protocols/oscar/oscar.c:180
+msgid "Service unavailable"
+msgstr "服务不可用"
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Service not defined"
+msgstr "服务未定义"
+
+#: src/protocols/oscar/oscar.c:182
+msgid "Obsolete SNAC"
+msgstr "废旧 SNAC"
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by host"
+msgstr "主机不支持"
+
 #: src/protocols/oscar/oscar.c:184
-msgid "Rate to client"
-msgstr "客户等级"
+msgid "Not supported by client"
+msgstr "客户不支持"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Refused by client"
+msgstr "客户拒绝"
 
 #: src/protocols/oscar/oscar.c:186
-msgid "Service unavailable"
-msgstr "服务不可用"
+msgid "Reply too big"
+msgstr "回复太大"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Service not defined"
-msgstr "服务未定义"
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Obsolete SNAC"
-msgstr "废旧 SNAC"
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Not supported by host"
-msgstr "主机不支持"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by client"
-msgstr "客户不支持"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Refused by client"
-msgstr "客户拒绝"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr "回复太大"
-
-#: src/protocols/oscar/oscar.c:193
 msgid "Responses lost"
 msgstr "响应丢失"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:188
 msgid "Request denied"
 msgstr "请求被禁止"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:189
 msgid "Busted SNAC payload"
 msgstr "SNAC 有效负载激增"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:190
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:191
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:192
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:193
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:194
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:195
 msgid "No match"
 msgstr "无匹配"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:196
 msgid "List overflow"
 msgstr "列表溢出"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:197
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:198
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:199
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:222
-#: src/protocols/toc/toc.c:628 src/protocols/toc/toc.c:644
-#: src/protocols/toc/toc.c:712
+#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/toc/toc.c:888
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:559
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:697
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:675
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:785
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
+#: src/protocols/oscar/oscar.c:870
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:853
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:866
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:574
+#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1065
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -5712,17 +6003,17 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1070
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1102
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
+#: src/protocols/oscar/oscar.c:1322
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5730,29 +6021,29 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1325
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5626
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2403
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2414
+#: src/protocols/oscar/oscar.c:2406
 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 "
@@ -5761,46 +6052,45 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5941
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2438
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2446
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2447
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2483
+#: src/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "用户 %s 在被加为您的好友之前需要认证。您是否想要发送认证请求?"
 
-#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2607
-#: src/protocols/oscar/oscar.c:2627 src/protocols/oscar/oscar.c:3002
-#: src/protocols/oscar/oscar.c:3054 src/protocols/oscar/oscar.c:5144
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
+#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2534
+#: src/protocols/oscar/oscar.c:2526
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5809,32 +6099,32 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2615 src/protocols/oscar/oscar.c:5150
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2620
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2627
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "用户 %u 同意您将他/她加为好友。"
+
 #: src/protocols/oscar/oscar.c:2635
 #, c-format
-msgid "The user %u has granted your request to add them to your contact list."
-msgstr "用户 %u 同意您将他/她加为好友。"
-
-#: src/protocols/oscar/oscar.c:2643
-#, c-format
 msgid ""
 "You have received a special message\n"
 "\n"
@@ -5846,7 +6136,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5859,7 +6149,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2659
+#: src/protocols/oscar/oscar.c:2651
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5872,32 +6162,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2680
-#, c-format
-msgid "ICQ user %u has sent you a contact: %s (%s)"
-msgstr "ICQ 用户 %u 给您发送了一个联系人:%s (%s)"
-
-#: src/protocols/oscar/oscar.c:2686
-msgid "Do you want to add this contact to your Buddy List?"
-msgstr "您是否想要将此联系人加为好友?"
-
-#: src/protocols/oscar/oscar.c:2690
+#: src/protocols/oscar/oscar.c:2672
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
+
+#: src/protocols/oscar/oscar.c:2678
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "您是否想要将此人加为好友?"
+
+#: src/protocols/oscar/oscar.c:2682
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2772
+#: src/protocols/oscar/oscar.c:2764
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
 
-#: src/protocols/oscar/oscar.c:2781
+#: src/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
 
-#: src/protocols/oscar/oscar.c:2790
+#: src/protocols/oscar/oscar.c:2782
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -5905,200 +6195,169 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:2799
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
 
-#: src/protocols/oscar/oscar.c:2808
+#: src/protocols/oscar/oscar.c:2800
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
 
-#: src/protocols/oscar/oscar.c:2817
+#: src/protocols/oscar/oscar.c:2809
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
-#: src/protocols/oscar/oscar.c:2833 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
+#: src/protocols/oscar/oscar.c:6068
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:5914
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
+#: src/protocols/oscar/oscar.c:6066
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:5915
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
+#: src/protocols/oscar/oscar.c:6067
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:2835
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2903
+#: src/protocols/oscar/oscar.c:2878
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2905
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>状态:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2937
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2938
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3052
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "%s 的用户信息可用:"
-
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3070
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:5945
-msgid "Direct IM"
-msgstr "二人世界"
-
-#: src/protocols/oscar/oscar.c:3098 src/protocols/oscar/oscar.c:5961
+#: src/protocols/oscar/oscar.c:3073
+msgid "AIM Direct IM"
+msgstr "AIM 二人世界"
+
+#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:3101 src/protocols/oscar/oscar.c:5953
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3086
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3089
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3092
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:3114
-msgid "EveryBuddy Bug"
-msgstr "每个好友的 Bug"
-
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3095
+msgid "ICQ Direct Connect"
+msgstr "ICQ 直接连接"
+
+#: src/protocols/oscar/oscar.c:3098
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3101
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3104
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3107
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3110
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3113
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3116
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3119
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3122
 msgid "Secure IM"
 msgstr "安全 IM"
 
-#: src/protocols/oscar/oscar.c:3181
-msgid ""
-"<i>Unable to display information because it was sent in an unknown encoding."
-"</i>"
-msgstr "<i>无法显示信息,原因是其发送编码未知。</i>"
-
-#: src/protocols/oscar/oscar.c:3188
-#, c-format
-msgid "Online Since : <b>%s</b><br>\n"
-msgstr "上线时间:<b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3193
-#, c-format
-msgid "Member Since : <b>%s</b><br>\n"
-msgstr "成员时间:<b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3199
-#, c-format
-msgid "Idle : <b>%s</b>"
-msgstr "瞌睡:<b>%s</b>"
-
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3151
+#, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "用户名: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3152
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr "警告级别: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3155
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
+msgstr "上线时间: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3159
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
+msgstr "成员时间: <b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3164
+#, c-format
+msgid "Idle: <b>%s</b>"
+msgstr "瞌睡: <b>%s</b>"
+
+#: src/protocols/oscar/oscar.c:3167
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3204
-#, c-format
-msgid ""
-"Username : <b>%s</b>  %s <br>\n"
-"Warning Level : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-msgstr ""
-"用户名:<b>%s</b> %s <br>\n"
-"警告级别:<b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-
-#: src/protocols/oscar/oscar.c:3236
-msgid "<i>User has no away message</i>"
-msgstr "<i>用户无离开消息</i>"
-
-#: src/protocols/oscar/oscar.c:3247
-msgid "Client Capabilities: "
-msgstr "客户能力:"
-
-#: src/protocols/oscar/oscar.c:3253
-msgid "<i>No Information Provided</i>"
-msgstr "<i>没有提供信息</i>"
-
-#: src/protocols/oscar/oscar.c:3277
+#: src/protocols/oscar/oscar.c:3206
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3665
+#: src/protocols/oscar/oscar.c:3594
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3666
+#: src/protocols/oscar/oscar.c:3595
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6106,158 +6365,158 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:3727
+#: src/protocols/oscar/oscar.c:3656
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3729
+#: src/protocols/oscar/oscar.c:3658
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3974 src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:3914
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:313
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
+#: src/protocols/trepia/trepia.c:413
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:312
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
+#: src/protocols/trepia/trepia.c:413
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:3934
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:4008
+#: src/protocols/oscar/oscar.c:3937
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:3941
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
-msgid "Address"
-msgstr "地址"
-
-#: src/protocols/oscar/oscar.c:4023 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:3957
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:3973
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:3975
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:3978
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:3981
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:3984
 msgid "Web Page"
 msgstr "网页"
 
+#: src/protocols/oscar/oscar.c:3990
+#, c-format
+msgid "ICQ Info for %s"
+msgstr "%s 的 ICQ 信息"
+
+#: src/protocols/oscar/oscar.c:4040
+msgid "Pop-Up Message"
+msgstr "弹出消息"
+
 #: src/protocols/oscar/oscar.c:4061
 #, c-format
-msgid "ICQ Info for %s"
-msgstr "%s ICQ 信息"
-
-#: src/protocols/oscar/oscar.c:4127
-#, c-format
 msgid "The following screennames are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:4131
+#: src/protocols/oscar/oscar.c:4065
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4082
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4169
+#: src/protocols/oscar/oscar.c:4103
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4105
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4133
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4136
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名与原始用户名不符。"
 
-#: src/protocols/oscar/oscar.c:4205
+#: src/protocols/oscar/oscar.c:4139
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名以空格结尾。"
 
-#: src/protocols/oscar/oscar.c:4208
+#: src/protocols/oscar/oscar.c:4142
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名太长。"
 
-#: src/protocols/oscar/oscar.c:4211
+#: src/protocols/oscar/oscar.c:4145
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#: src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: src/protocols/oscar/oscar.c:4217
+#: src/protocols/oscar/oscar.c:4151
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址无效。"
 
-#: src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4154
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4230
+#: src/protocols/oscar/oscar.c:4164
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6266,20 +6525,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4231 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4236
+#: src/protocols/oscar/oscar.c:4170
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4400
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4401
 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 "
@@ -6288,7 +6547,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4502
+#: src/protocols/oscar/oscar.c:4431
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6298,15 +6557,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4507
+#: src/protocols/oscar/oscar.c:4436
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4526
+#: src/protocols/oscar/oscar.c:4455
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:4456
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6315,7 +6574,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4567
+#: src/protocols/oscar/oscar.c:4496
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6327,15 +6586,15 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4572
+#: src/protocols/oscar/oscar.c:4501
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4721
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4793
+#: src/protocols/oscar/oscar.c:4722
 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 "
@@ -6344,12 +6603,12 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4890
+#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
+#: src/protocols/oscar/oscar.c:4819
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:4985
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6357,15 +6616,15 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5057 src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4985 src/protocols/oscar/oscar.c:4998
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4998
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6375,18 +6634,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5105
+#: src/protocols/oscar/oscar.c:5033
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加?"
 
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5039
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5144
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6396,111 +6655,127 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5186
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:5114
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5187
+#: src/protocols/oscar/oscar.c:5115
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:5118
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"用户 %s 拒绝了您将其加入联系人列表的请求,原因如下:\n"
+"用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5119
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5228 src/protocols/toc/toc.c:1266
+#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5379
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5388
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入:</b>"
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5400
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 地址:</b> "
 
-#: src/protocols/oscar/oscar.c:5478
+#: src/protocols/oscar/oscar.c:5408
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5415
 msgid "<b>Available:</b> "
 msgstr "<b>可用:</b>"
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5431
+msgid "<b>Away Message:</b> "
+msgstr "<b>离开消息:</b>"
+
+#: src/protocols/oscar/oscar.c:5440
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/protocols/oscar/oscar.c:5528 src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2032
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:5769
+#: src/protocols/oscar/oscar.c:5921
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:5782
+#: src/protocols/oscar/oscar.c:5934
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:5785
+#: src/protocols/oscar/oscar.c:5937
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:6112
+msgid "Buddy Comment:"
+msgstr "好友注释:"
+
+#: src/protocols/oscar/oscar.c:6128
+msgid "Edit Buddy Comment"
+msgstr "编辑好友注释"
+
+#: src/protocols/oscar/oscar.c:6136
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:5974
+#: src/protocols/oscar/oscar.c:6151
+msgid "Direct IM"
+msgstr "二人世界"
+
+#: src/protocols/oscar/oscar.c:6180
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6201
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:6202
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:6002
+#: src/protocols/oscar/oscar.c:6208
 msgid "New screenname formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6257
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:6095
+#: src/protocols/oscar/oscar.c:6301
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6304
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:6099
+#: src/protocols/oscar/oscar.c:6305
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -6508,43 +6783,59 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:6115
+#: src/protocols/oscar/oscar.c:6319
+msgid "Find Buddy by E-mail"
+msgstr "按电子邮件查找好友"
+
+#: src/protocols/oscar/oscar.c:6320
+msgid "Search for a buddy by e-mail address"
+msgstr "按电子邮件地址搜索好友"
+
+#: src/protocols/oscar/oscar.c:6321
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "输入您想要搜索的好友的电子邮件地址。"
+
+#: src/protocols/oscar/oscar.c:6324
+msgid "Search"
+msgstr "搜索"
+
+#: src/protocols/oscar/oscar.c:6337
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6116
-msgid "Please talk to me, I'm lonely! (and single)"
-msgstr "孤独的人是可耻的,跟我聊聊吧!"
-
-#: src/protocols/oscar/oscar.c:6178
+#: src/protocols/oscar/oscar.c:6415
 msgid "Set Available Message"
 msgstr "设置可用消息"
 
-#: src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6429
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6203
+#: src/protocols/oscar/oscar.c:6437
+msgid "Configure IM Forwarding (URL)"
+msgstr "配置 IM 转发(URL)"
+
+#: src/protocols/oscar/oscar.c:6448
 msgid "Format Screenname"
 msgstr "格式化用户名"
 
-#: src/protocols/oscar/oscar.c:6209
+#: src/protocols/oscar/oscar.c:6454
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6460
 msgid "Display Current Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6221
+#: src/protocols/oscar/oscar.c:6466
 msgid "Change Current Registered Address"
 msgstr "更改当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:6475
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:6483
 msgid "Search for Buddy by Email"
 msgstr "按电子邮件搜索好友"
 
@@ -6558,122 +6849,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6359 src/protocols/oscar/oscar.c:6361
+#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6378
+#: src/protocols/oscar/oscar.c:6623
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6628
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/toc/toc.c:171
+#: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:510
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:540
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:543
 msgid "Too many matches."
 msgstr "匹配太多。"
 
+#: src/protocols/toc/toc.c:546
+msgid "Need more qualifiers."
+msgstr "需要更多条件。"
+
 #: src/protocols/toc/toc.c:549
-msgid "Need more qualifiers."
-msgstr "需要更多条件。"
+msgid "Dir service temporarily unavailable."
+msgstr "目录服务暂时不可用。"
 
 #: src/protocols/toc/toc.c:552
-msgid "Dir service temporarily unavailable."
-msgstr "目录服务暂时不可用。"
-
-#: src/protocols/toc/toc.c:555
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:555
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:558
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:561
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
+#: src/protocols/toc/toc.c:565
+msgid "Country not supported."
+msgstr "国家不被支持。"
+
 #: src/protocols/toc/toc.c:568
-msgid "Country not supported."
-msgstr "国家不被支持。"
-
-#: src/protocols/toc/toc.c:571
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败:%s。"
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
+#: src/protocols/toc/toc.c:577
+msgid "Your warning level is currently too high to log in."
+msgstr "您的警告级别太高,无法登入。"
+
 #: src/protocols/toc/toc.c:580
-msgid "Your warning level is currently too high to log in."
-msgstr "您的警告级别太高,无法登入。"
-
-#: src/protocols/toc/toc.c:583
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -6681,37 +6972,37 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误:%s。"
 
-#: src/protocols/toc/toc.c:588
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息:%s"
 
-#: src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:648
+#: src/protocols/toc/toc.c:645
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:718
+#: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:907
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:911
+#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -6721,43 +7012,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1404
+#: src/protocols/toc/toc.c:1401
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1528
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1652
+#: src/protocols/toc/toc.c:1663
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1699
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1733 src/protocols/toc/toc.c:1773
-#: src/protocols/toc/toc.c:1985
+#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1996
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1897
+#: src/protocols/toc/toc.c:1908
 msgid "Could not connect for transfer!"
 msgstr "无法连接进行传送!"
 
-#: src/protocols/toc/toc.c:1930
+#: src/protocols/toc/toc.c:1941
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2064
+#: src/protocols/toc/toc.c:2075
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 请求 %s 接受 %d 个文件:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2071
+#: src/protocols/toc/toc.c:2082
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -6772,95 +7063,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2147 src/protocols/toc/toc.c:2149
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2166
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "TOC 端口"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:295
+#: src/protocols/trepia/trepia.c:254
 msgid "Basic Profile"
 msgstr "基本信息"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:285
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/trepia/trepia.c:332
+#: src/protocols/trepia/trepia.c:291
 msgid "Profile Information"
 msgstr "个人信息"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:338
+#: src/protocols/trepia/trepia.c:297
 msgid "Instant Messagers"
 msgstr "即时通讯程序"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:342
+#: src/protocols/trepia/trepia.c:301
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:346
+#: src/protocols/trepia/trepia.c:305
 msgid "ICQ UIN"
 msgstr "ICQ UIN"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:350
+#: src/protocols/trepia/trepia.c:309
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:354
+#: src/protocols/trepia/trepia.c:313
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:359
+#: src/protocols/trepia/trepia.c:318
 msgid "I'm From"
 msgstr "来自"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:376
+#: src/protocols/trepia/trepia.c:335
 msgid "Set your Trepia profile data."
 msgstr "设置您的 Trepia 资料。"
 
-#: src/protocols/trepia/trepia.c:500
+#: src/protocols/trepia/trepia.c:459
 msgid "Profile"
 msgstr "资料"
 
-#: src/protocols/trepia/trepia.c:522
+#: src/protocols/trepia/trepia.c:481
 msgid "Set Profile"
 msgstr "设置资料"
 
-#: src/protocols/trepia/trepia.c:558
+#: src/protocols/trepia/trepia.c:517
 msgid "Visit Homepage"
 msgstr "浏览主页"
 
-#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
+#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
 msgid "Local Users"
 msgstr "本地用户"
 
-#: src/protocols/trepia/trepia.c:1003
+#: src/protocols/trepia/trepia.c:962
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/trepia/trepia.c:1104
+#: src/protocols/trepia/trepia.c:1063
 msgid "Logging in"
 msgstr "登入"
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "无法创建套接字"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6871,31 +7158,45 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
+#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:702
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:752
+#: src/protocols/yahoo/yahoo.c:760
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:754
+#: src/protocols/yahoo/yahoo.c:762
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:755
+#: src/protocols/yahoo/yahoo.c:763
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1046
+#: src/protocols/yahoo/yahoo.c:1383
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr ""
+"Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
+"请检查 %s 上的更新。"
+
+#: src/protocols/yahoo/yahoo.c:1386
+msgid "Failed Yahoo! Authentication"
+msgstr "Yahoo! 认证失败"
+
+#: src/protocols/yahoo/yahoo.c:1459
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -6903,131 +7204,132 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1049
+#: src/protocols/yahoo/yahoo.c:1462
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:1491
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1081
+#: src/protocols/yahoo/yahoo.c:1494
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1084
+#: src/protocols/yahoo/yahoo.c:1497
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: src/protocols/yahoo/yahoo.c:1132
+#: src/protocols/yahoo/yahoo.c:1544
 #, 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:1134
+#: src/protocols/yahoo/yahoo.c:1546
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1236
+#: src/protocols/yahoo/yahoo.c:1648 src/protocols/yahoo/yahoo.c:1778
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:1803 src/protocols/yahoo/yahoo.c:1912
+#: src/protocols/yahoo/yahoo.c:1936
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:1411 src/protocols/yahoo/yahoo.c:1709
-#: src/protocols/yahoo/yahoo.c:1807
+#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
+#: src/protocols/yahoo/yahoo.c:2410
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1413 src/protocols/yahoo/yahoo.c:1711
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
+#: src/protocols/yahoo/yahoo.c:2411
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:1415 src/protocols/yahoo/yahoo.c:1713
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:2018 src/protocols/yahoo/yahoo.c:2316
+#: src/protocols/yahoo/yahoo.c:2412
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:1419 src/protocols/yahoo/yahoo.c:1717
-#: src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/yahoo/yahoo.c:2022 src/protocols/yahoo/yahoo.c:2320
+#: src/protocols/yahoo/yahoo.c:2414
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:1423 src/protocols/yahoo/yahoo.c:1721
-#: src/protocols/yahoo/yahoo.c:1813
+#: src/protocols/yahoo/yahoo.c:2026 src/protocols/yahoo/yahoo.c:2324
+#: src/protocols/yahoo/yahoo.c:2416
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:1487 src/protocols/yahoo/yahoo.c:1521
+#: src/protocols/yahoo/yahoo.c:2090 src/protocols/yahoo/yahoo.c:2124
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:1577
+#: src/protocols/yahoo/yahoo.c:2180
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:1583
+#: src/protocols/yahoo/yahoo.c:2186
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:1629
+#: src/protocols/yahoo/yahoo.c:2232
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:1640
+#: src/protocols/yahoo/yahoo.c:2243
 msgid "Activate ID"
 msgstr "激活 ID"
 
-#: src/protocols/yahoo/yahoo.c:1987
+#: src/protocols/yahoo/yahoo.c:2601
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>抱歉,标为含有成人内容的个人资料目前不被支持。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:1989 src/protocols/yahoo/yahoo.c:2005
+#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:2622
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接"
-
-#: src/protocols/yahoo/yahoo.c:2003
+"web browser<br>"
+msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接<br>"
+
+#: src/protocols/yahoo/yahoo.c:2621
 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:2037
+#: src/protocols/yahoo/yahoo.c:2666
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2079 src/protocols/yahoo/yahoo.c:2081
-#: src/protocols/yahoo/yahoo.c:2083
+#: src/protocols/yahoo/yahoo.c:2726 src/protocols/yahoo/yahoo.c:2730
+#: src/protocols/yahoo/yahoo.c:2734
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2085 src/protocols/yahoo/yahoo.c:2087
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2749
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo.c:2096
+#: src/protocols/yahoo/yahoo.c:2767
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo.c:2106
+#: src/protocols/yahoo/yahoo.c:2781
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo.c:2108
+#: src/protocols/yahoo/yahoo.c:2786
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2789
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: src/protocols/yahoo/yahoo.c:2114
+#: src/protocols/yahoo/yahoo.c:2795
 msgid "Member Since"
 msgstr "注册时间"
 
@@ -7041,15 +7343,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2250 src/protocols/yahoo/yahoo.c:2252
+#: src/protocols/yahoo/yahoo.c:2960 src/protocols/yahoo/yahoo.c:2962
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:2269
+#: src/protocols/yahoo/yahoo.c:2979
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:2274
+#: src/protocols/yahoo/yahoo.c:2984
 msgid "Pager port"
 msgstr "寻呼端口"
 
@@ -7078,34 +7380,34 @@
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:575 src/protocols/zephyr/zephyr.c:576
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "已经登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:601
+#: src/protocols/zephyr/zephyr.c:610
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7113,21 +7415,21 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:855
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:895
+#: src/protocols/zephyr/zephyr.c:908
 msgid "Class:"
 msgstr "类:"
 
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:913
 msgid "Instance:"
 msgstr "实例:"
 
-#: src/protocols/zephyr/zephyr.c:905
+#: src/protocols/zephyr/zephyr.c:918
 msgid "Recipient:"
-msgstr "接受者:"
+msgstr "接收者:"
 
 #. *< api_version
 #. *< type
@@ -7139,7 +7441,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1037 src/protocols/zephyr/zephyr.c:1039
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
@@ -7153,38 +7455,15 @@
 "invalid."
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
-#: src/prpl.c:143
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
-
-#: src/prpl.c:155
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"您是否想要将他/她添加为您的好友?"
-
-#: src/prpl.c:158
-msgid "Gaim - Information"
-msgstr "Gaim - 信息"
-
-#: src/prpl.c:161
-msgid "Add buddy to your list?"
-msgstr "将用户加为好友吗?"
-
 #. * Custom away message.
-#: src/prpl.h:186
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "自定义"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:862
 msgid "Accept"
 msgstr "接受"
 
@@ -7192,27 +7471,27 @@
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:956
+#: src/server.c:949
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:969
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1156 src/server.c:1166
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1184 src/server.c:1192
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1240
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7221,11 +7500,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1243
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1346
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7234,23 +7513,15 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1350
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1356
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
-#: src/server.c:1545
-msgid "Gaim - Popup"
-msgstr "Gaim - 弹出窗口"
-
-#: src/server.c:1572
-msgid "More Info"
-msgstr "更多信息"
-
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
@@ -7266,28 +7537,32 @@
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+#: src/util.c:1527
+msgid "Calculating..."
+msgstr "正在计算..."
+
+#: src/util.c:1530
+msgid "Unknown."
+msgstr "未知。"
+
+#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:950
-msgid "Calculating..."
-msgstr "正在计算..."
-
-#: src/util.c:953
-msgid "Unknown."
-msgstr "未知。"
+#: src/util.c:1917
+msgid "g003: Error opening connection.\n"
+msgstr "g003:打开连接出错。\n"
 
 #: src/win32/win32dep.c:474
 msgid "Notification"
@@ -7296,22 +7571,3 @@
 #: src/win32/win32dep.c:475
 msgid "Moving Gaim user settings directory to:"
 msgstr "正在将 Gaim 用户设置目录移动到:"
-
-#~ msgid "former libfaim maintainer"
-#~ msgstr "先前 libfaim 维护者"
-
-#~ msgid "There was an error launching your chosen browser: %s"
-#~ msgstr "调用您选择的浏览器 %s 出错"
-
-#~ msgid ""
-#~ "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-#~ msgstr "手动输入的浏览器“%s”无效。超级链接无法工作。"
-
-#~ msgid "ICQ Unknown"
-#~ msgstr "ICQ 未知"
-
-#~ msgid "<B>%s has the following screen names:</B><BR>"
-#~ msgstr "<B>%s 拥有下列用户名:</B><BR>"
-
-#~ msgid "gc"
-#~ msgstr "gc"