# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1053481376 0
# Node ID 3c8caf2a9d9d41c837fcbaddff5f76e33d039db8
# Parent  decfda57d218fe81ba45fc7127181daa08b45d13
[gaim-migrate @ 5857]
Ambrose LI (acli) updated traditional Chinese
Morten Brix Pedersen (mbrix) updated Danish

committer: Tailor Script <tailor@pidgin.im>

diff -r decfda57d218 -r 3c8caf2a9d9d po/da.po
--- a/po/da.po	Tue May 20 21:29:22 2003 +0000
+++ b/po/da.po	Wed May 21 01:42:56 2003 +0000
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.61\n"
-"POT-Creation-Date: 2003-05-11 17:16+0200\n"
+"POT-Creation-Date: 2003-05-19 20:36+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"
@@ -23,7 +23,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/docklet/docklet.c:94 src/multi.c:284 src/win32/systray.c:296
+#: plugins/docklet/docklet.c:94 src/multi.c:285 src/win32/systray.c:359
 msgid "Auto-login"
 msgstr "Auto-logind"
 
@@ -40,11 +40,11 @@
 msgstr "Ny..."
 
 #: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:71
-#: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1179
-#: src/protocols/jabber/jabber.c:3487 src/protocols/jabber/jabber.c:3541
-#: src/protocols/oscar/oscar.c:2790 src/protocols/oscar/oscar.c:4466
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5689
-#: src/gtkblist.c:1488 src/gtkpounce.c:564 src/prefs.c:1072
+#: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:3439 src/protocols/jabber/jabber.c:3493
+#: src/protocols/oscar/oscar.c:2791 src/protocols/oscar/oscar.c:4476
+#: src/protocols/oscar/oscar.c:5354 src/protocols/oscar/oscar.c:5676
+#: src/gtkblist.c:1511 src/gtkpounce.c:566
 msgid "Away"
 msgstr "Frav�rende"
 
@@ -68,7 +68,7 @@
 msgid "Preferences..."
 msgstr "Indstillinger..."
 
-#: plugins/docklet/docklet.c:163 src/win32/systray.c:119
+#: plugins/docklet/docklet.c:163 src/win32/systray.c:159
 msgid "Signoff"
 msgstr "Log af"
 
@@ -331,69 +331,69 @@
 msgid "Checks for new local mail."
 msgstr "Tjekker for lokal post."
 
-#: plugins/notify.c:439
+#: plugins/notify.c:442
 msgid "Unable to write to config file"
 msgstr "Kunne ikke skrive til ops�tningsfilen %s"
 
-#: plugins/notify.c:439
+#: plugins/notify.c:443
 msgid "Notify plugin"
 msgstr "P�mindelse-udvidelse"
 
-#: plugins/notify.c:569
+#: plugins/notify.c:573
 msgid "Notify For"
 msgstr "P�mind for"
 
-#: plugins/notify.c:570
+#: plugins/notify.c:574
 msgid "_IM windows"
 msgstr "Besked-v_induer"
 
-#: plugins/notify.c:575
+#: plugins/notify.c:579
 msgid "_Chat windows"
 msgstr "_Chat-vinduer"
 
 #. --------------
-#: plugins/notify.c:581
+#: plugins/notify.c:585
 msgid "Notification Methods"
 msgstr "P�mindelse-metoder"
 
-#: plugins/notify.c:584
+#: plugins/notify.c:588
 msgid "Prepend _string into window title (hit enter to save):"
 msgstr "Inds�t _streng i starten af vinduets titel (tryk enter for at gemme):"
 
-#: plugins/notify.c:595
+#: plugins/notify.c:599
 msgid "_Quote window title"
 msgstr "S�t citations-tegn om vinduets titel"
 
-#: plugins/notify.c:600
+#: plugins/notify.c:604
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "S�t vinduesh�ndterings-vinket \"_URGENT\" (\"haster\")"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:609
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inds�t antal af nye beskeder ind i vinduets titel"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:614
 msgid "_Notify even if conversation is in focus"
 msgstr "P�mi_nd selv om samtalen er i fokus"
 
 #. --------------
-#: plugins/notify.c:616
+#: plugins/notify.c:620
 msgid "Notification Removal"
 msgstr "Fjernelse af p�mindelse"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:621
 msgid "Remove when conversation window gains _focus"
 msgstr "Fjern n�r samtale-vindue f�r _fokus"
 
-#: plugins/notify.c:622
+#: plugins/notify.c:626
 msgid "Remove when conversation window _receives click"
 msgstr "Fjern n�r samtale-vindue modtage_r klik"
 
-#: plugins/notify.c:627
+#: plugins/notify.c:631
 msgid "Remove when _typing in conversation window"
 msgstr "Fjern n�r der bliver skreve_t i samtale-vindue"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:636
 msgid "Appl_y"
 msgstr "Anvend"
 
@@ -404,14 +404,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:695
+#: plugins/notify.c:699
 msgid "Message Notification"
 msgstr "P�mindelse af beskeder"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:698 plugins/notify.c:700
+#: plugins/notify.c:702 plugins/notify.c:704
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Giver mulighed for at p�minde dig om ul�ste beskeder p� forskellige m�der."
@@ -431,8 +431,8 @@
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "Giver dig mulighed for at sende r� inddata til text-baserede protokoller "
-"(Jabber, MSN, IRC, TOC. Tryk 'Enter' i tekstfeltet for at sende. Hold �je med"
-" fejls�gningsvinduet."
+"(Jabber, MSN, IRC, TOC. Tryk 'Enter' i tekstfeltet for at sende. Hold �je "
+"med fejls�gningsvinduet."
 
 #. *< api_version
 #. *< type
@@ -605,7 +605,7 @@
 msgstr "Vis rullebj�lke i besked-vindue"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:429 src/prefs.c:586
+#: plugins/win32/transparency/win2ktrans.c:429
 msgid "Buddy List Window"
 msgstr "Venneliste vindue"
 
@@ -659,7 +659,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Indstilinger specifikke for Windows Gaim."
 
-#: plugins/perl/perl.c:395
+#: plugins/perl/perl.c:396
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr ""
 "GAIM::register ikke kaldt med de rigtige argumenter. Konsulter PERL-HOWTO."
@@ -671,13 +671,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1376
+#: plugins/perl/perl.c:1378
 msgid "Perl Plugin Loader"
 msgstr "Perl-udvidelsesmodul indl�ser"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1378 plugins/perl/perl.c:1379
+#: plugins/perl/perl.c:1380 plugins/perl/perl.c:1381
 msgid "Provides support for loading perl plugins."
 msgstr "Giver underst�ttelse af Perl-udvidelsesmoduler."
 
@@ -702,11 +702,11 @@
 msgstr ""
 "Fort�ller i en samtale n�r en ven bliver frav�rende eller kommer tilbage."
 
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1187
-#: src/protocols/msn/away.c:27 src/protocols/msn/away.c:28
-#: src/protocols/msn/away.c:35 src/protocols/msn/away.c:36
-#: src/protocols/msn/msn.c:124 src/protocols/yahoo/yahoo.c:1269
-#: src/protocols/yahoo/yahoo.c:1348
+#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1190
+#: src/protocols/msn/msn.c:314 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:1270
+#: src/protocols/yahoo/yahoo.c:1349
 msgid "Available"
 msgstr "Tilg�ngelig"
 
@@ -718,11 +718,11 @@
 msgid "Away for friends only"
 msgstr "Kun frav�rende for venner"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3490
-#: src/protocols/jabber/jabber.c:3553 src/protocols/oscar/oscar.c:2794
-#: src/protocols/oscar/oscar.c:4454 src/protocols/oscar/oscar.c:4481
-#: src/protocols/oscar/oscar.c:5694 src/protocols/yahoo/yahoo.c:1086
-#: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1358
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3442
+#: src/protocols/jabber/jabber.c:3505 src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:4464 src/protocols/oscar/oscar.c:4491
+#: src/protocols/oscar/oscar.c:5681 src/protocols/yahoo/yahoo.c:1087
+#: src/protocols/yahoo/yahoo.c:1292 src/protocols/yahoo/yahoo.c:1359
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -820,97 +820,97 @@
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Ugyldigt Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:591
+#: src/protocols/gg/gg.c:592
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Du pr�ver vist at sende en besked til et ugyldigt Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:654
+#: src/protocols/gg/gg.c:655
 msgid "Couldn't get search results"
 msgstr "Kunne ikke hente s�geresultater"
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:660
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu s�gemaskine"
 
-#: src/protocols/gg/gg.c:684
+#: src/protocols/gg/gg.c:685
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4990 src/gtkft.c:1031
+#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4976 src/gtkft.c:1033
 msgid "Yes"
 msgstr "Ja"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4990 src/gtkft.c:1032
+#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4976 src/gtkft.c:1034
 msgid "No"
 msgstr "Nej"
 
-#: src/protocols/gg/gg.c:689
+#: src/protocols/gg/gg.c:690
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:693
+#: src/protocols/gg/gg.c:694
 msgid "First name"
 msgstr "Fornavn"
 
-#: src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:699
 msgid "Second Name"
 msgstr "Efternavn"
 
-#: src/protocols/gg/gg.c:702
+#: src/protocols/gg/gg.c:703
 msgid "Nick"
 msgstr "K�lenavn"
 
-#: src/protocols/gg/gg.c:709 src/protocols/gg/gg.c:712
+#: src/protocols/gg/gg.c:710 src/protocols/gg/gg.c:713
 msgid "Birth year"
 msgstr "F�dsels�r"
 
-#: src/protocols/gg/gg.c:718 src/protocols/gg/gg.c:720
-#: src/protocols/gg/gg.c:722
+#: src/protocols/gg/gg.c:719 src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:723
 msgid "Sex"
 msgstr "K�n"
 
 #. Line 5
-#: src/protocols/gg/gg.c:726 src/dialogs.c:2087 src/dialogs.c:2724
+#: src/protocols/gg/gg.c:727 src/dialogs.c:2028 src/dialogs.c:2667
 msgid "City"
 msgstr "By"
 
-#: src/protocols/gg/gg.c:758
+#: src/protocols/gg/gg.c:760
 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:764
+#: src/protocols/gg/gg.c:768
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kunne ikke importere venneliste fra server"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:829
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Overf�rsel af venneliste til Gadu-Gadu serveren er g�et godt"
 
-#: src/protocols/gg/gg.c:829
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunne ikke overf�re venneliste til Gadu-Gadu serveren"
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:844
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Venneliste p� Gadu-Gadu server slettet"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:851
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunne ikke slette venneliste p� Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:846
+#: src/protocols/gg/gg.c:859
 msgid "Password changed successfully"
 msgstr "Adgangskoden er �ndret"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:865
 msgid "Password couldn't be changed"
 msgstr "Adgangskoden blev ikke �ndret"
 
-#: src/protocols/gg/gg.c:962
+#: src/protocols/gg/gg.c:977
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Fejl under kommunikation med Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:963
+#: src/protocols/gg/gg.c:978
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -918,11 +918,11 @@
 "Gaim var ikke i stand til at f�rdigg�re din anmodning pga. et problem med "
 "kommunikationen til Gadu-Gadu HTTP serveren. Pr�v igen senere."
 
-#: src/protocols/gg/gg.c:990
+#: src/protocols/gg/gg.c:1006
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Kunne ikke importere Gadu-Gadu venneliste"
 
-#: src/protocols/gg/gg.c:991
+#: src/protocols/gg/gg.c:1007
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -930,26 +930,26 @@
 "Gaim var ikke i stand til at etablere forbindelse til Gadu-Gadu venneliste "
 "serveren. Pr�v igen senere."
 
-#: src/protocols/gg/gg.c:1059
+#: src/protocols/gg/gg.c:1076
 msgid "Couldn't export buddy list"
 msgstr "Kunne ikke eksportere venneliste"
 
-#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1082
+#: src/protocols/gg/gg.c:1077 src/protocols/gg/gg.c:1100
 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."
 "Pr�v igen senere."
 
-#: src/protocols/gg/gg.c:1081
+#: src/protocols/gg/gg.c:1099
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Kunne ikke fjerne Gadu-Gadu vennelisten"
 
-#: src/protocols/gg/gg.c:1129
+#: src/protocols/gg/gg.c:1148
 msgid "Unable to access directory"
 msgstr "Kunne ikke tilg� database"
 
-#: src/protocols/gg/gg.c:1130
+#: src/protocols/gg/gg.c:1149
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -957,11 +957,11 @@
 "Gaim kunne ikke s�ge i databasen, fordi fordi den ikke kunne forbinde til "
 "database serveren. Pr�v igen senere."
 
-#: src/protocols/gg/gg.c:1162
+#: src/protocols/gg/gg.c:1182
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kunne ikke �ndre Gadu-Gadu adgangskode"
 
-#: src/protocols/gg/gg.c:1163
+#: src/protocols/gg/gg.c:1183
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -969,33 +969,33 @@
 "Gaim kunne ikke �ndre din adgangskode, fordi der skete en fejl da der skulle "
 "forbindes til Gadu-Gadu serveren. Pr�v igen senere."
 
-#: src/protocols/gg/gg.c:1177
+#: src/protocols/gg/gg.c:1199
 msgid "Directory Search"
 msgstr "Databases�gning"
 
-#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4376
-#: src/protocols/oscar/oscar.c:5880 src/protocols/toc/toc.c:1449
-#: src/dialogs.c:2194 src/dialogs.c:2203
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:4328
+#: src/protocols/oscar/oscar.c:5867 src/protocols/toc/toc.c:1453
+#: src/dialogs.c:2137 src/dialogs.c:2146
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
-#: src/protocols/gg/gg.c:1193
+#: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
 msgstr "Import�r venneliste fra server"
 
-#: src/protocols/gg/gg.c:1199
+#: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
 msgstr "Eksport�r venneliste til server"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
 msgstr "Slet venneliste p� server"
 
-#: src/protocols/gg/gg.c:1237
+#: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
 msgstr "Kunne ikke tilg� bruger profilen."
 
-#: src/protocols/gg/gg.c:1238
+#: src/protocols/gg/gg.c:1261
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -1013,7 +1013,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1349 src/protocols/gg/gg.c:1351
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokol-modul"
 
@@ -1021,21 +1021,21 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "En fejl opstod da Gaim skulle kommunikere med ICQ serveren."
 
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2629
-#: src/dialogs.c:2491 src/gtkconv.c:806 src/gtkconv.c:2645 src/gtkconv.c:3790
-#: src/prpl.c:706
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2640
+#: src/dialogs.c:2434 src/gtkconv.c:807 src/gtkconv.c:2646 src/gtkconv.c:3789
+#: src/prpl.c:710
 msgid "Add"
 msgstr "Tilf�j"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1432
-#: src/protocols/oscar/oscar.c:2387 src/protocols/oscar/oscar.c:2450
-#: src/protocols/oscar/oscar.c:5569 src/protocols/toc/toc.c:1979
-#: src/buddy_chat.c:307 src/dialogs.c:467 src/dialogs.c:474 src/dialogs.c:482
-#: src/dialogs.c:2144 src/dialogs.c:2255 src/dialogs.c:2315 src/dialogs.c:2480
-#: src/dialogs.c:2666 src/dialogs.c:2815 src/dialogs.c:3460 src/dialogs.c:3952
-#: src/dialogs.c:4431 src/dialogs.c:5004 src/gtkft.c:1110 src/multi.c:1506
-#: src/multi.c:1870 src/prpl.c:250 src/prpl.c:706 src/server.c:1237
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1436
+#: src/protocols/oscar/oscar.c:2396 src/protocols/oscar/oscar.c:2459
+#: src/protocols/oscar/oscar.c:5555 src/protocols/toc/toc.c:1991
+#: src/buddy_chat.c:309 src/dialogs.c:468 src/dialogs.c:475 src/dialogs.c:483
+#: src/dialogs.c:2085 src/dialogs.c:2198 src/dialogs.c:2258 src/dialogs.c:2423
+#: src/dialogs.c:2609 src/dialogs.c:2758 src/dialogs.c:3406 src/dialogs.c:3898
+#: src/dialogs.c:4376 src/dialogs.c:4949 src/gtkft.c:1112 src/multi.c:1547
+#: src/multi.c:1911 src/prpl.c:251 src/prpl.c:710 src/server.c:1239
 msgid "Cancel"
 msgstr "Annull�r"
 
@@ -1044,16 +1044,16 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Brugeren %s (%s%s%s%s%s) vil tilf�je dig til sin venneliste"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1765
-#: src/protocols/msn/notification.c:374 src/protocols/msn/notification.c:602
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
+#: src/protocols/msn/notification.c:374 src/protocols/msn/notification.c:649
+#: src/protocols/oscar/oscar.c:2576 src/protocols/oscar/oscar.c:5011
 msgid "Authorize"
 msgstr "Godkend"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1765
-#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:603
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
-#: src/dialogs.c:2479
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
+#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:650
+#: src/protocols/oscar/oscar.c:2576 src/protocols/oscar/oscar.c:5011
+#: src/dialogs.c:2422
 msgid "Deny"
 msgstr "N�gt"
 
@@ -1061,10 +1061,11 @@
 msgid "Send message through server"
 msgstr "Send besked gennem server"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2385
-#: src/protocols/jabber/jabber.c:2420 src/protocols/jabber/jabber.c:4293
-#: src/protocols/jabber/jabber.c:4340 src/protocols/msn/dispatch.c:165
-#: src/protocols/msn/msn.c:187 src/protocols/msn/notification.c:1142
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2336
+#: src/protocols/jabber/jabber.c:2371 src/protocols/jabber/jabber.c:4245
+#: src/protocols/jabber/jabber.c:4292 src/protocols/msn/dispatch.c:165
+#: src/protocols/msn/msn.c:429 src/protocols/msn/notification.c:1237
+#: src/protocols/napster/napster.c:515
 msgid "Unable to connect"
 msgstr "Kunne ikke tilslutte"
 
@@ -1072,7 +1073,7 @@
 msgid "Connecting..."
 msgstr "Tilslutter..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3867
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3873
 msgid "Nick:"
 msgstr "K�lenavn:"
 
@@ -1088,12 +1089,12 @@
 "(Der opstod en fejl, da denne besked skulle konverteres. Tjek 'Tegns�t'-"
 "indstillingen i Konto-redigeringen)"
 
-#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2617
+#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2619
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "DCC Chat med %s afsluttet"
 
-#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2626
+#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2628
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "DCC Chat med %s etableret"
@@ -1102,7 +1103,7 @@
 msgid "No topic is set"
 msgstr "Inet emne er sat"
 
-#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1754
+#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1758
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s har �ndret emnet til: %s</B>"
@@ -1121,7 +1122,7 @@
 msgstr "Server"
 
 #: src/protocols/irc/irc.c:942 src/protocols/irc/irc.c:1096
-#: src/protocols/irc/irc.c:1646
+#: src/protocols/irc/irc.c:1650
 msgid "IRC Operator"
 msgstr "IRC Operator"
 
@@ -1150,8 +1151,8 @@
 msgstr "K�lenavn/kanal findes ikke"
 
 #: src/protocols/irc/irc.c:1099 src/protocols/irc/irc.c:1102
-#: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1110
-#: src/protocols/irc/irc.c:1461 src/protocols/irc/irc.c:1604
+#: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1111
+#: src/protocols/irc/irc.c:1465 src/protocols/irc/irc.c:1608
 msgid "IRC Error"
 msgstr "IRC Fejl"
 
@@ -1172,21 +1173,21 @@
 msgid "You're not an IRC operator!"
 msgstr "Du er ikke en IRC operator!"
 
-#: src/protocols/irc/irc.c:1113
+#: src/protocols/irc/irc.c:1114
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "Nicket er allerede i brug. Indtast et nyt nick"
 
-#: src/protocols/irc/irc.c:1395 src/protocols/irc/irc.c:1401
-#: src/protocols/irc/irc.c:1407 src/protocols/irc/irc.c:1421
+#: src/protocols/irc/irc.c:1399 src/protocols/irc/irc.c:1405
+#: src/protocols/irc/irc.c:1411 src/protocols/irc/irc.c:1425
 msgid "IRC CTCP info"
 msgstr "IRC CTCP info"
 
-#: src/protocols/irc/irc.c:1431
+#: src/protocols/irc/irc.c:1435
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s vil gerne etablere en DCC chat"
 
-#: src/protocols/irc/irc.c:1432
+#: src/protocols/irc/irc.c:1436
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
@@ -1194,76 +1195,76 @@
 "Dette kr�ver at en direkte forbindelse kan etableres imellem de to "
 "computere. Beskeder vil ikke blive sendt igennem IRC serveren"
 
-#: src/protocols/irc/irc.c:1432 src/protocols/oscar/oscar.c:2387
-#: src/protocols/oscar/oscar.c:5569
+#: src/protocols/irc/irc.c:1436 src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:5555
 msgid "Connect"
 msgstr "Tilslut"
 
-#: src/protocols/irc/irc.c:1458
+#: src/protocols/irc/irc.c:1462
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "Modtog en ugyldig filoverf�rsel fra %s"
 
-#: src/protocols/irc/irc.c:1539 src/protocols/msn/error.c:132
-#: src/protocols/msn/notification.c:216 src/protocols/msn/notification.c:612
+#: src/protocols/irc/irc.c:1543 src/protocols/msn/error.c:133
+#: src/protocols/msn/notification.c:216 src/protocols/msn/notification.c:659
 msgid "Unable to write"
 msgstr "Kunne ikke skrive"
 
-#: src/protocols/irc/irc.c:1602
+#: src/protocols/irc/irc.c:1606
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "Du er blevet smidt ud af %s: %s"
 
-#: src/protocols/irc/irc.c:1607
+#: src/protocols/irc/irc.c:1611
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "Smidt ud af %s: %s"
 
-#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2927
+#: src/protocols/irc/irc.c:1667 src/protocols/irc/irc.c:2929
 msgid "CTCP ClientInfo"
 msgstr "CTCP ClientInfo"
 
-#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2933
+#: src/protocols/irc/irc.c:1673 src/protocols/irc/irc.c:2935
 msgid "CTCP UserInfo"
 msgstr "CTCP Brugeroplysninger"
 
-#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2939
+#: src/protocols/irc/irc.c:1679 src/protocols/irc/irc.c:2941
 msgid "CTCP Version"
 msgstr "CTCP Version"
 
-#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2945
+#: src/protocols/irc/irc.c:1707 src/protocols/irc/irc.c:2947
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1958 src/protocols/oscar/oscar.c:692
+#: src/protocols/irc/irc.c:1960 src/protocols/oscar/oscar.c:695
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
 msgstr "Tilsluttet: %s"
 
-#: src/protocols/irc/irc.c:2214
+#: src/protocols/irc/irc.c:2216
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "Emne for %s er %s"
 
-#: src/protocols/irc/irc.c:2310
+#: src/protocols/irc/irc.c:2312
 #, c-format
 msgid "You have left %s"
 msgstr "Du har forladt %s"
 
-#: src/protocols/irc/irc.c:2311
+#: src/protocols/irc/irc.c:2313
 msgid "IRC Part"
 msgstr "IRC Forladt"
 
-#: src/protocols/irc/irc.c:2366
+#: src/protocols/irc/irc.c:2368
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>Anmoder om DCC CHAT</I>"
 
-#: src/protocols/irc/irc.c:2383
+#: src/protocols/irc/irc.c:2385
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>Operator kommandoer:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2388
+#: src/protocols/irc/irc.c:2390
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1271,11 +1272,11 @@
 "<B>CTCP kommandoer:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
 
-#: src/protocols/irc/irc.c:2396
+#: src/protocols/irc/irc.c:2398
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>DCC kommandoer:<BR>CHAT <nick></B>"
 
-#: src/protocols/irc/irc.c:2401
+#: src/protocols/irc/irc.c:2403
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
@@ -1287,19 +1288,19 @@
 "WHOWAS<BR>Skriv /HELP OPER for operator kommandoer<BR>Skriv /HELP CTCP for "
 "CTCP kommandoer<BR>Type /HELP DCC for DCC kommandoer"
 
-#: src/protocols/irc/irc.c:2424
+#: src/protocols/irc/irc.c:2426
 msgid "<B>Unknown command</B>"
 msgstr "<B>Ukendt kommando</B>"
 
-#: src/protocols/irc/irc.c:2484
+#: src/protocols/irc/irc.c:2486
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/protocols/irc/irc.c:2489 src/main.c:346 src/multi.c:773
+#: src/protocols/irc/irc.c:2491 src/main.c:349 src/multi.c:809
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/protocols/irc/irc.c:2914
+#: src/protocols/irc/irc.c:2916
 msgid "DCC Chat"
 msgstr "DCC Chat"
 
@@ -1313,30 +1314,30 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3020 src/protocols/irc/irc.c:3022
+#: src/protocols/irc/irc.c:3022 src/protocols/irc/irc.c:3024
 msgid "IRC Protocol Plugin"
 msgstr "IRC prokotolmodul"
 
-#: src/protocols/irc/irc.c:3042 src/protocols/jabber/jabber.c:3006
-#: src/protocols/jabber/jabber.c:4473 src/protocols/napster/napster.c:609
+#: src/protocols/irc/irc.c:3044 src/protocols/jabber/jabber.c:2958
+#: src/protocols/jabber/jabber.c:4425 src/protocols/napster/napster.c:660
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/irc/irc.c:3047 src/protocols/jabber/jabber.c:4484
-#: src/protocols/msn/msn.c:964 src/protocols/napster/napster.c:615
-#: src/multi.c:1099
+#: src/protocols/irc/irc.c:3049 src/protocols/jabber/jabber.c:4436
+#: src/protocols/msn/msn.c:1208 src/protocols/napster/napster.c:666
+#: src/multi.c:1135
 msgid "Port:"
 msgstr "Port:"
 
-#: src/protocols/irc/irc.c:3053
+#: src/protocols/irc/irc.c:3055
 msgid "Encoding:"
 msgstr "Tegns�t:"
 
-#: src/protocols/jabber/jabber.c:989
+#: src/protocols/jabber/jabber.c:990
 msgid "Unable to change password."
 msgstr "Kunne ikke �ndre adgangskoden."
 
-#: src/protocols/jabber/jabber.c:990
+#: src/protocols/jabber/jabber.c:991
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
@@ -1344,11 +1345,11 @@
 "Adgangskoden du indtastede, er ikke korrekt. Adgangskoden er ikke blevet "
 "�ndret."
 
-#: src/protocols/jabber/jabber.c:995
+#: src/protocols/jabber/jabber.c:997
 msgid "Unable to change password"
 msgstr "Kunne ikke �ndre adgangskoden"
 
-#: src/protocols/jabber/jabber.c:996
+#: src/protocols/jabber/jabber.c:998
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
@@ -1356,245 +1357,249 @@
 "Den nye adgangskode du indtastede, er den samme som din nuv�rende "
 "adgangskode. Din adgangskode er ikke blevet �ndret."
 
-#: src/protocols/jabber/jabber.c:1172 src/blist.c:708 src/gtkpounce.c:296
+#: src/protocols/jabber/jabber.c:1175 src/blist.c:714 src/gtkpounce.c:298
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1181 src/protocols/jabber/jabber.c:3486
-#: src/protocols/jabber/jabber.c:3537
+#: src/protocols/jabber/jabber.c:1184 src/protocols/jabber/jabber.c:3438
+#: src/protocols/jabber/jabber.c:3489
 msgid "Chatty"
 msgstr "Vil gerne chatte"
 
-#: src/protocols/jabber/jabber.c:1183 src/protocols/jabber/jabber.c:3488
-#: src/protocols/jabber/jabber.c:3545
+#: src/protocols/jabber/jabber.c:1186 src/protocols/jabber/jabber.c:3440
+#: src/protocols/jabber/jabber.c:3497
 msgid "Extended Away"
 msgstr "Totalt frav�rende"
 
-#: src/protocols/jabber/jabber.c:1185 src/protocols/jabber/jabber.c:3489
-#: src/protocols/jabber/jabber.c:3549 src/protocols/oscar/oscar.c:2784
-#: src/protocols/oscar/oscar.c:4469 src/protocols/oscar/oscar.c:5690
+#: src/protocols/jabber/jabber.c:1188 src/protocols/jabber/jabber.c:3441
+#: src/protocols/jabber/jabber.c:3501 src/protocols/oscar/oscar.c:2785
+#: src/protocols/oscar/oscar.c:4479 src/protocols/oscar/oscar.c:5677
 msgid "Do Not Disturb"
 msgstr "Vil ikke forstyrres"
 
-#: src/protocols/jabber/jabber.c:1391
+#: src/protocols/jabber/jabber.c:1427
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber Fejl %s"
 
-#: src/protocols/jabber/jabber.c:1556
+#: src/protocols/jabber/jabber.c:1534
 #, c-format
 msgid "Error %s: %s"
 msgstr "Fejl %s: %s"
 
-#: src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/jabber.c:1537
 msgid "Unknown Error in presence"
 msgstr "Ukendt fejlkode i tilstedev�relse"
 
-#: src/protocols/jabber/jabber.c:1760
+#: src/protocols/jabber/jabber.c:1713
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Brugeren %s vil tilf�je dig til sin venneliste."
 
-#: src/protocols/jabber/jabber.c:1785
+#: src/protocols/jabber/jabber.c:1738
 #, 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 tilf�jet til din liste."
 
-#: src/protocols/jabber/jabber.c:1788
+#: src/protocols/jabber/jabber.c:1741
 msgid "No such user."
 msgstr "Ingen bruger fundet."
 
-#: src/protocols/jabber/jabber.c:1879 src/protocols/msn/notification.c:505
-#: src/protocols/msn/notification.c:658 src/protocols/msn/notification.c:659
-#: src/blist.c:437 src/dialogs.c:960
+#: src/protocols/jabber/jabber.c:1832 src/protocols/msn/notification.c:549
+#: src/protocols/msn/notification.c:705 src/protocols/msn/notification.c:706
+#: src/blist.c:438 src/dialogs.c:901
 msgid "Buddies"
 msgstr "Venner"
 
-#: src/protocols/jabber/jabber.c:1952
+#: src/protocols/jabber/jabber.c:1905
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/protocols/jabber/jabber.c:1986
+#: src/protocols/jabber/jabber.c:1939
 msgid "Unknown login error"
 msgstr "Ukendt logind-fejl"
 
-#: src/protocols/jabber/jabber.c:2338
+#: src/protocols/jabber/jabber.c:2289
 msgid "Password successfully changed."
 msgstr "Adgangskoden er �ndret."
 
-#: src/protocols/jabber/jabber.c:2383 src/protocols/jabber/jabber.c:4291
+#: src/protocols/jabber/jabber.c:2334 src/protocols/jabber/jabber.c:4243
 msgid "Connection lost"
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/jabber/jabber.c:2391
+#: src/protocols/jabber/jabber.c:2342
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: src/protocols/jabber/jabber.c:2394
+#: src/protocols/jabber/jabber.c:2345
 msgid "Requesting Authentication Method"
 msgstr "Anmoder godkendelsesmetode"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2414 src/protocols/msn/dispatch.c:170
-#: src/protocols/msn/msn.c:181 src/protocols/yahoo/yahoo.c:987
+#: src/protocols/jabber/jabber.c:2365 src/protocols/msn/dispatch.c:170
+#: src/protocols/msn/msn.c:423 src/protocols/napster/napster.c:507
+#: src/protocols/yahoo/yahoo.c:988
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: src/protocols/jabber/jabber.c:2740
+#: src/protocols/jabber/jabber.c:2691
 #, 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 tilf�jet."
 
-#: src/protocols/jabber/jabber.c:2742
+#: src/protocols/jabber/jabber.c:2693
+msgid "Unable to add buddy."
+msgstr "Kunne ikke tilf�je ven."
+
+#: src/protocols/jabber/jabber.c:2694
 msgid "Jabber Error"
 msgstr "Jabber Fejl"
 
-#: src/protocols/jabber/jabber.c:3001
+#: src/protocols/jabber/jabber.c:2953
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:3012
+#: src/protocols/jabber/jabber.c:2964
 msgid "Handle:"
 msgstr "K�lenavn:"
 
-#: src/protocols/jabber/jabber.c:3042
+#: src/protocols/jabber/jabber.c:2994
 msgid "Unable to join chat"
 msgstr "Kunne ikke deltage i chat"
 
-#: src/protocols/jabber/jabber.c:3278 src/protocols/jabber/jabber.c:3329
-#: src/protocols/jabber/jabber.c:3754
+#: src/protocols/jabber/jabber.c:3230 src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3706
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/jabber.c:3279
+#: src/protocols/jabber/jabber.c:3231
 msgid "Error"
 msgstr "Fejl"
 
-#: src/protocols/jabber/jabber.c:3330 src/protocols/jabber/jabber.c:3389
-#: src/protocols/jabber/jabber.c:3400 src/protocols/jabber/jabber.c:3780
+#: src/protocols/jabber/jabber.c:3282 src/protocols/jabber/jabber.c:3341
+#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3732
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/jabber.c:3400 src/protocols/jabber/jabber.c:3422
-#: src/protocols/oscar/oscar.c:5372
+#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3374
+#: src/protocols/oscar/oscar.c:5358
 msgid "Not Authorized"
 msgstr "Ikke godkendt"
 
-#: src/protocols/jabber/jabber.c:3435
+#: src/protocols/jabber/jabber.c:3387
 msgid "View Error Msg"
 msgstr "Vis fejl-besked"
 
-#: src/protocols/jabber/jabber.c:3447 src/gtkconv.c:793
+#: src/protocols/jabber/jabber.c:3399 src/gtkconv.c:794
 msgid "Get Away Msg"
 msgstr "Hent frav�rsbesked"
 
-#: src/protocols/jabber/jabber.c:3454
+#: src/protocols/jabber/jabber.c:3406
 msgid "Un-hide From"
 msgstr "Skjul ikke l�ngere for"
 
-#: src/protocols/jabber/jabber.c:3457
+#: src/protocols/jabber/jabber.c:3409
 msgid "Temporarily Hide From"
 msgstr "Midlertidig skjul for"
 
-#: src/protocols/jabber/jabber.c:3464
+#: src/protocols/jabber/jabber.c:3416
 msgid "Cancel Presence Notification"
 msgstr "Annull�r tilstedev�relse-p�mindelse"
 
-#: src/protocols/jabber/jabber.c:3472
+#: src/protocols/jabber/jabber.c:3424
 msgid "Re-request authorization"
 msgstr "Anmod om ny godkendelse"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3485 src/protocols/jabber/jabber.c:3535
-#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:4464
-#: src/protocols/oscar/oscar.c:5688 src/protocols/yahoo/yahoo.c:1090
-#: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:872
-#: src/multi.c:274
+#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3487
+#: src/protocols/oscar/oscar.c:2797 src/protocols/oscar/oscar.c:4474
+#: src/protocols/oscar/oscar.c:5675 src/protocols/yahoo/yahoo.c:1091
+#: src/protocols/zephyr/zephyr.c:865 src/protocols/zephyr/zephyr.c:875
+#: src/multi.c:275
 msgid "Online"
 msgstr "Logget ind"
 
-#: src/protocols/jabber/jabber.c:3675
+#: src/protocols/jabber/jabber.c:3627
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:3628
 msgid "Family Name"
 msgstr "Efternavn"
 
-#: src/protocols/jabber/jabber.c:3677
+#: src/protocols/jabber/jabber.c:3629
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/jabber.c:3678
+#: src/protocols/jabber/jabber.c:3630
 msgid "Nickname"
 msgstr "K�lenavn"
 
-#: src/protocols/jabber/jabber.c:3679 src/dialogs.c:2936
+#: src/protocols/jabber/jabber.c:3631 src/dialogs.c:2879
 msgid "URL"
 msgstr "Hjemmeside"
 
-#: src/protocols/jabber/jabber.c:3680
+#: src/protocols/jabber/jabber.c:3632
 msgid "Street Address"
 msgstr "Adresse 1"
 
-#: src/protocols/jabber/jabber.c:3681
+#: src/protocols/jabber/jabber.c:3633
 msgid "Extended Address"
 msgstr "Adresse 2"
 
-#: src/protocols/jabber/jabber.c:3682
+#: src/protocols/jabber/jabber.c:3634
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/jabber.c:3683
+#: src/protocols/jabber/jabber.c:3635
 msgid "Region"
 msgstr "Omr�de"
 
-#: src/protocols/jabber/jabber.c:3684
+#: src/protocols/jabber/jabber.c:3636
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3685 src/dialogs.c:2109 src/dialogs.c:2742
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2050 src/dialogs.c:2685
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/jabber.c:3686
+#: src/protocols/jabber/jabber.c:3638
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:3687 src/dialogs.c:2800
+#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2743
 msgid "Email"
 msgstr "E-post adresse"
 
-#: src/protocols/jabber/jabber.c:3688
+#: src/protocols/jabber/jabber.c:3640
 msgid "Organization Name"
 msgstr "Organisationsnavn"
 
-#: src/protocols/jabber/jabber.c:3689
+#: src/protocols/jabber/jabber.c:3641
 msgid "Organization Unit"
 msgstr "Organisatorisk enhed"
 
-#: src/protocols/jabber/jabber.c:3690
+#: src/protocols/jabber/jabber.c:3642
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/jabber.c:3691
+#: src/protocols/jabber/jabber.c:3643
 msgid "Role"
 msgstr "Rolle"
 
-#: src/protocols/jabber/jabber.c:3692
+#: src/protocols/jabber/jabber.c:3644
 msgid "Birthday"
 msgstr "F�dselsdato"
 
-#: src/protocols/jabber/jabber.c:3693 src/dialogs.c:2946 src/prefs.c:428
-#: src/prefs.c:1381
+#: src/protocols/jabber/jabber.c:3645 src/dialogs.c:2889
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/protocols/jabber/jabber.c:3718
+#: src/protocols/jabber/jabber.c:3670
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
@@ -1602,24 +1607,24 @@
 "Alle oplysninger er valgfri. Skriv kun de ting, du �nsker andre skal vide om "
 "dig"
 
-#: src/protocols/jabber/jabber.c:3719
+#: src/protocols/jabber/jabber.c:3671
 msgid "User Identity"
 msgstr "Brugeroplysninger"
 
-#: src/protocols/jabber/jabber.c:4145
+#: src/protocols/jabber/jabber.c:4097
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - Redig�r Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4220
+#: src/protocols/jabber/jabber.c:4172
 msgid "Server Registration successful!"
 msgstr "Du er nu registreret p� serveren!"
 
-#: src/protocols/jabber/jabber.c:4247
+#: src/protocols/jabber/jabber.c:4199
 msgid "Unknown registration error"
 msgstr "Ukendt fejl under registrering"
 
-#: src/protocols/jabber/jabber.c:4362 src/protocols/oscar/oscar.c:5874
-#: src/protocols/toc/toc.c:1437 src/dialogs.c:2279
+#: src/protocols/jabber/jabber.c:4314 src/protocols/oscar/oscar.c:5861
+#: src/protocols/toc/toc.c:1441 src/dialogs.c:2222
 msgid "Set User Info"
 msgstr "Ret brugeroplysninger"
 
@@ -1633,52 +1638,18 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4451 src/protocols/jabber/jabber.c:4453
+#: src/protocols/jabber/jabber.c:4403 src/protocols/jabber/jabber.c:4405
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber protokolmodul"
 
-#: src/protocols/jabber/jabber.c:4479
+#: src/protocols/jabber/jabber.c:4431
 msgid "Resource:"
 msgstr "Ressource:"
 
-#: src/protocols/jabber/jabber.c:4490
+#: src/protocols/jabber/jabber.c:4442
 msgid "Connect Server:"
 msgstr "Tilslut til server:"
 
-#: src/protocols/msn/away.c:29 src/protocols/msn/msn.c:127
-#: src/protocols/msn/msn.c:320 src/protocols/yahoo/yahoo.c:1070
-#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1350
-msgid "Busy"
-msgstr "Travlt"
-
-#: src/protocols/msn/away.c:30 src/protocols/yahoo/yahoo.c:1088
-#: src/gtkpounce.c:568 src/prefs.c:1088
-msgid "Idle"
-msgstr "Inaktiv"
-
-#: src/protocols/msn/away.c:31 src/protocols/msn/msn.c:126
-#: src/protocols/msn/msn.c:318 src/protocols/yahoo/yahoo.c:1068
-#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1349
-msgid "Be Right Back"
-msgstr "Straks tilbage"
-
-#: src/protocols/msn/away.c:32 src/protocols/msn/msn.c:125
-#: src/protocols/msn/msn.c:316
-msgid "Away From Computer"
-msgstr "V�k fra computeren"
-
-#: src/protocols/msn/away.c:33 src/protocols/msn/msn.c:128
-#: src/protocols/msn/msn.c:322 src/protocols/yahoo/yahoo.c:1078
-#: src/protocols/yahoo/yahoo.c:1283 src/protocols/yahoo/yahoo.c:1354
-msgid "On The Phone"
-msgstr "Snakker i telefon"
-
-#: src/protocols/msn/away.c:34 src/protocols/msn/msn.c:129
-#: src/protocols/msn/msn.c:324 src/protocols/yahoo/yahoo.c:1082
-#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1356
-msgid "Out To Lunch"
-msgstr "Ude til frokost"
-
 #: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:159
 msgid "Protocol not supported"
 msgstr "Protokol ikke underst�ttet"
@@ -1712,217 +1683,323 @@
 msgstr "Kunne ikke fortolke beskeden."
 
 #: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:330
-#: src/protocols/msn/notification.c:1152
+#: src/protocols/msn/notification.c:1247
 msgid "Unable to write to server"
 msgstr "Kunne ikke skrive til server"
 
-#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1157
+#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1254
 msgid "Syncing with server"
 msgstr "Synkroniserer med server"
 
-#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1170
+#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1267
 msgid "Error reading from server"
 msgstr "Fejl under l�sning fra server"
 
-#: src/protocols/msn/error.c:32
+#: src/protocols/msn/error.c:33
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaks fejl (sikkert en Gaim fejl)"
 
-#: src/protocols/msn/error.c:36
+#: src/protocols/msn/error.c:37
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "Ugyldig parameter (sikkert en Gaim fejl)"
 
-#: src/protocols/msn/error.c:39
+#: src/protocols/msn/error.c:40
 msgid "Invalid User"
 msgstr "Ugyldig bruger"
 
-#: src/protocols/msn/error.c:43
+#: src/protocols/msn/error.c:44
 msgid "Fully Qualified Domain Name missing"
 msgstr "Fuldt kvalificeret v�rtsnavn mangler"
 
-#: src/protocols/msn/error.c:46
+#: src/protocols/msn/error.c:47
 msgid "Already Login"
 msgstr "Allerede logget ind"
 
-#: src/protocols/msn/error.c:49
+#: src/protocols/msn/error.c:50
 msgid "Invalid Username"
 msgstr "Ugyldigt brugernavn"
 
-#: src/protocols/msn/error.c:52
+#: src/protocols/msn/error.c:53
 msgid "Invalid Friendly Name"
 msgstr "Ugyldigt synligt navn"
 
-#: src/protocols/msn/error.c:55
+#: src/protocols/msn/error.c:56
 msgid "List Full"
 msgstr "Liste fuld"
 
-#: src/protocols/msn/error.c:58
+#: src/protocols/msn/error.c:59
 msgid "Already there"
 msgstr "Allerede der"
 
-#: src/protocols/msn/error.c:61
+#: src/protocols/msn/error.c:62
 msgid "Not on list"
 msgstr "Ikke p� liste"
 
-#: src/protocols/msn/error.c:64
+#: src/protocols/msn/error.c:65
 msgid "User is offline"
 msgstr "Bruger er offline"
 
-#: src/protocols/msn/error.c:67
+#: src/protocols/msn/error.c:68
 msgid "Already in the mode"
 msgstr "Allerede i den mode"
 
-#: src/protocols/msn/error.c:70
+#: src/protocols/msn/error.c:71
 msgid "Already in opposite list"
 msgstr "Allerede i den modsatte liste"
 
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:75
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "Pr�vede at tilf�je en ven til en gruppe der ikke eksisterer"
 
-#: src/protocols/msn/error.c:78
+#: src/protocols/msn/error.c:79
 msgid "Switchboard failed"
 msgstr "Switchboard fejlede"
 
-#: src/protocols/msn/error.c:81
+#: src/protocols/msn/error.c:82
 msgid "Notify Transfer failed"
 msgstr "P�mindelse om overf�rsel fejlede"
 
-#: src/protocols/msn/error.c:85
+#: src/protocols/msn/error.c:86
 msgid "Required fields missing"
 msgstr "Kr�vede felter manglende"
 
-#: src/protocols/msn/error.c:88 src/protocols/oscar/oscar.c:194
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:194
 msgid "Not logged in"
 msgstr "Ikke logget ind"
 
-#: src/protocols/msn/error.c:92
+#: src/protocols/msn/error.c:93
 msgid "Internal server error"
 msgstr "Intern server fejl"
 
-#: src/protocols/msn/error.c:95
+#: src/protocols/msn/error.c:96
 msgid "Database server error"
 msgstr "Database server fejl"
 
-#: src/protocols/msn/error.c:98
+#: src/protocols/msn/error.c:99
 msgid "File operation error"
 msgstr "Filh�ndterings fejl"
 
-#: src/protocols/msn/error.c:101
+#: src/protocols/msn/error.c:102
 msgid "Memory allocation error"
 msgstr "Hukommelses-allokerings fejl"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:105
 msgid "Wrong CHL value sent to server"
 msgstr "Forkert CHL v�rdi sendt til server"
 
-#: src/protocols/msn/error.c:108
+#: src/protocols/msn/error.c:109
 msgid "Server busy"
 msgstr "Server travl"
 
-#: src/protocols/msn/error.c:111
+#: src/protocols/msn/error.c:112
 msgid "Server unavailable"
 msgstr "Server ikke tilg�ngelig"
 
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:115
 msgid "Peer Notification server down"
 msgstr "\"Peer Notification\"-server nede"
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:118
 msgid "Database connect error"
 msgstr "Fejl ved forbindelse til database"
 
-#: src/protocols/msn/error.c:121
+#: src/protocols/msn/error.c:122
 msgid "Server is going down (abandon ship)"
 msgstr "Serveren er p� vej ned"
 
-#: src/protocols/msn/error.c:125
+#: src/protocols/msn/error.c:126
 msgid "Error creating connection"
 msgstr "Fejl ved oprettelse af forbindelse"
 
-#: src/protocols/msn/error.c:129
+#: src/protocols/msn/error.c:130
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametre er enten ukendte eller ikke tilladte"
 
-#: src/protocols/msn/error.c:135
+#: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr "Overbelastet session"
 
-#: src/protocols/msn/error.c:138
+#: src/protocols/msn/error.c:139
 msgid "User is too active"
 msgstr "Bruger er for aktiv"
 
-#: src/protocols/msn/error.c:141
+#: src/protocols/msn/error.c:142
 msgid "Too many sessions"
 msgstr "For mange sessioner"
 
-#: src/protocols/msn/error.c:144
+#: src/protocols/msn/error.c:145
 msgid "Not expected"
 msgstr "Ikke forventet"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:148
 msgid "Bad friend file"
 msgstr "Fejl i vennefil"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:152
 msgid "Authentication failed"
 msgstr "Godkendelse fejlede"
 
-#: src/protocols/msn/error.c:154
+#: src/protocols/msn/error.c:155
 msgid "Not allowed when offline"
 msgstr "Ikke tilladt n�r du er offline"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:158
 msgid "Not accepting new users"
 msgstr "Accepterer ikke nye brugere"
 
-#: src/protocols/msn/error.c:161
+#: src/protocols/msn/error.c:162
 msgid "Passport account not yet verified"
 msgstr "Passport konto endnu ikke godkendt"
 
-#: src/protocols/msn/error.c:165
+#: src/protocols/msn/error.c:166
+#, c-format
 msgid "Unknown Error Code %d"
 msgstr "Ukendt fejlkode %d"
 
-#: src/protocols/msn/msn.c:51
+#: src/protocols/msn/msn.c:60
 msgid "Your new MSN friendly name is too long."
 msgstr "Dit nye MSN synlige navn er for langt."
 
-#: src/protocols/msn/msn.c:64 src/protocols/msn/msn.c:231
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:356
-#: src/protocols/msn/msn.c:391 src/protocols/msn/msn.c:407
-#: src/protocols/msn/msn.c:439 src/protocols/msn/msn.c:448
-#: src/protocols/msn/msn.c:481 src/protocols/msn/msn.c:490
-#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:515
-#: src/protocols/msn/msn.c:530 src/protocols/msn/msn.c:540
-#: src/protocols/msn/msn.c:562 src/protocols/msn/msn.c:613
-#: src/protocols/msn/msn.c:652 src/protocols/msn/msn.c:744
-#: src/protocols/msn/msn.c:767 src/protocols/msn/msn.c:782
-#: src/protocols/msn/msn.c:794 src/protocols/msn/msn.c:816
-#: src/protocols/msn/msn.c:826 src/protocols/msn/notification.c:55
-#: src/protocols/msn/notification.c:85 src/protocols/msn/notification.c:787
+#: src/protocols/msn/msn.c:72 src/protocols/msn/msn.c:92
+#: src/protocols/msn/msn.c:150 src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:582 src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:633 src/protocols/msn/msn.c:649
+#: src/protocols/msn/msn.c:681 src/protocols/msn/msn.c:690
+#: src/protocols/msn/msn.c:723 src/protocols/msn/msn.c:732
+#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:757
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:782
+#: src/protocols/msn/msn.c:804 src/protocols/msn/msn.c:855
+#: src/protocols/msn/msn.c:894 src/protocols/msn/msn.c:986
+#: src/protocols/msn/msn.c:1009 src/protocols/msn/msn.c:1024
+#: src/protocols/msn/msn.c:1036 src/protocols/msn/msn.c:1058
+#: src/protocols/msn/msn.c:1068 src/protocols/msn/notification.c:55
+#: src/protocols/msn/notification.c:85 src/protocols/msn/notification.c:858
 msgid "Write error"
 msgstr "Fejl ved skrivning"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:162
 msgid "Set Friendly Name:"
 msgstr "S�t synligt navn:"
 
-#: src/protocols/msn/msn.c:112 src/protocols/yahoo/yahoo.c:1141
+#: src/protocols/msn/msn.c:171
+msgid "Set Home Phone Number:"
+msgstr "S�t hjemmetelefon nr:"
+
+#: src/protocols/msn/msn.c:181
+msgid "Set Work Phone Number:"
+msgstr "S�t hjemmetelefon nummer:"
+
+#: src/protocols/msn/msn.c:191
+msgid "Set Mobile Phone Number:"
+msgstr "S�t mobiltelefon nummer:"
+
+#: src/protocols/msn/msn.c:202
+msgid "MSN Mobile Support"
+msgstr "MSN mobiltelefon-underst�ttelse"
+
+#: src/protocols/msn/msn.c:203
+msgid "Do you want to enable or disable MSN Mobile device support?"
+msgstr "Vil du sl� MSN mobiltelefon underst�ttelse til?"
+
+#: src/protocols/msn/msn.c:206
+msgid "Enable"
+msgstr "Aktiv�r"
+
+#: src/protocols/msn/msn.c:207
+msgid "Disable"
+msgstr "Deaktiv�r"
+
+#: src/protocols/msn/msn.c:217
+msgid "MSN Mobile Pages"
+msgstr "MSN mobiltelefon sider"
+
+#: src/protocols/msn/msn.c:218
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you "
+"mobile pages?"
+msgstr ""
+"Vil du tillade folk p� din venneliste at sende dig mobiltelefon sider?"
+
+#: src/protocols/msn/msn.c:221
+msgid "Allow"
+msgstr "Tillad"
+
+#: src/protocols/msn/msn.c:222
+msgid "Disallow"
+msgstr "N�gt"
+
+#: src/protocols/msn/msn.c:239
+msgid "Send message:"
+msgstr "Send en besked:"
+
+#: src/protocols/msn/msn.c:302 src/protocols/yahoo/yahoo.c:1142
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: src/protocols/msn/msn.c:130 src/protocols/msn/msn.c:326
-#: src/protocols/zephyr/zephyr.c:859 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:558
+#: src/protocols/msn/state.c:32
+msgid "Away From Computer"
+msgstr "V�k fra computeren"
+
+#: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:560
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1069
+#: src/protocols/yahoo/yahoo.c:1274 src/protocols/yahoo/yahoo.c:1350
+msgid "Be Right Back"
+msgstr "Straks tilbage"
+
+#: src/protocols/msn/msn.c:317 src/protocols/msn/msn.c:562
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/yahoo/yahoo.c:1276 src/protocols/yahoo/yahoo.c:1351
+msgid "Busy"
+msgstr "Travlt"
+
+#: src/protocols/msn/msn.c:318 src/protocols/msn/msn.c:564
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1079
+#: src/protocols/yahoo/yahoo.c:1284 src/protocols/yahoo/yahoo.c:1355
+msgid "On The Phone"
+msgstr "Snakker i telefon"
+
+#: src/protocols/msn/msn.c:319 src/protocols/msn/msn.c:566
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1083
+#: src/protocols/yahoo/yahoo.c:1288 src/protocols/yahoo/yahoo.c:1357
+msgid "Out To Lunch"
+msgstr "Ude til frokost"
+
+#: src/protocols/msn/msn.c:320 src/protocols/msn/msn.c:568
+#: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:877
 msgid "Hidden"
 msgstr "Skjult"
 
-#: src/protocols/msn/msn.c:142
+#: src/protocols/msn/msn.c:332
 msgid "Set Friendly Name"
 msgstr "S�t synligt navn"
 
-#: src/protocols/msn/msn.c:420
+#: src/protocols/msn/msn.c:340
+msgid "Set Home Phone Number"
+msgstr "S�t hjemmetelefon nummer"
+
+#: src/protocols/msn/msn.c:346
+msgid "Set Work Phone Number"
+msgstr "S�t arbejdstelefon nummer"
+
+#: src/protocols/msn/msn.c:352
+msgid "Set Mobile Phone Number"
+msgstr "S�t mobiltelefon nummer"
+
+#: src/protocols/msn/msn.c:361
+msgid "Enable/Disable Mobile Devices"
+msgstr "Aktiv�r/Deaktiv�r mobiltelefoner"
+
+#: src/protocols/msn/msn.c:368
+msgid "Allow/Disallow Mobile Pages"
+msgstr "Tillad/N�gt mobiltelefon sider"
+
+#: src/protocols/msn/msn.c:390
+msgid "Send to Mobile"
+msgstr "Send til mobiltelefon"
+
+#: src/protocols/msn/msn.c:662
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -1931,11 +2008,11 @@
 "Et MSN brugernavn skal v�re i formatet \"bruger@server.com\". M�ske mente du "
 "%s@hotmail.com. Ingen �ndringer blev lavet til din tilladelse-liste."
 
-#: src/protocols/msn/msn.c:424 src/protocols/msn/msn.c:465
+#: src/protocols/msn/msn.c:666 src/protocols/msn/msn.c:707
 msgid "Invalid MSN screenname"
 msgstr "Ugyldigt MSN brugernavn"
 
-#: src/protocols/msn/msn.c:461
+#: src/protocols/msn/msn.c:703
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -1954,11 +2031,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:938 src/protocols/msn/msn.c:940
+#: src/protocols/msn/msn.c:1182 src/protocols/msn/msn.c:1184
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolmodul"
 
-#: src/protocols/msn/msn.c:958
+#: src/protocols/msn/msn.c:1202
 msgid "Login Server:"
 msgstr "Logind server:"
 
@@ -1997,16 +2074,20 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Brugeren %s (%s) vil tilf�je %s til sin venneliste."
 
-#: src/protocols/msn/notification.c:596
+#: src/protocols/msn/notification.c:643
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Brugeren %s (%s) vil tilf�je dig til sin venneliste"
 
-#: src/protocols/msn/notification.c:969
+#: src/protocols/msn/notification.c:1040
 msgid "Got invalid XFR"
 msgstr "Fik en ugyldig XFR"
 
-#: src/protocols/msn/notification.c:1113
+#: src/protocols/msn/notification.c:1083
+msgid "Unable to transfer to notification server"
+msgstr "Kunne ikke overf�re til \"notification\"-server"
+
+#: src/protocols/msn/notification.c:1209
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute(s). You will "
@@ -2016,12 +2097,17 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr ""
-"MSN serverne vil blive lukket ned for vedligeholdelse om %d minut(ter). "
-"Du vil automatisk blive logget af p� det tidspunkt. F�rdigg�r alle "
-"igangv�rende samtaler.\n"
+"MSN serverne vil blive lukket ned for vedligeholdelse om %d minut(ter). Du "
+"vil automatisk blive logget af p� det tidspunkt. F�rdigg�r alle igangv�rende "
+"samtaler.\n"
 "\n"
 "Efter vedligeholdelsen er blevet gennemf�rt, kan du logge ind igen."
 
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1089
+#: src/gtkpounce.c:570
+msgid "Idle"
+msgstr "Inaktiv"
+
 #: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "Samtalen er blevet inaktiv og har overskredet tidsgr�nsen."
@@ -2031,16 +2117,54 @@
 msgid "%s has closed the conversation window."
 msgstr "%s har lukket samtale-vinduet."
 
-#.
-#. * TODO: Investigate this, as it seems to occur frequently with
-#. *       the old prpl.
-#.
-#: src/protocols/msn/switchboard.c:224
+#: src/protocols/msn/switchboard.c:225
 msgid "An MSN message may not have been received."
 msgstr "En MSN besked er m�ske ikke blevet modtaget"
 
-#: src/protocols/napster/napster.c:460 src/protocols/oscar/oscar.c:5095
-#: src/protocols/toc/toc.c:1191
+#: src/protocols/napster/napster.c:249
+msgid "Unable to read header from server"
+msgstr "Kunne ikke hente hoved fra server"
+
+#: src/protocols/napster/napster.c:326
+#, c-format
+msgid "users: %s, files: %s, size: %sGB"
+msgstr "brugere: %s, filer: %s, st�rrelse: %sGB"
+
+#. MSG_SERVER_HOTLIST_ERROR
+#: src/protocols/napster/napster.c:337
+#, c-format
+msgid "Unable to add \"%s\" to your Napster hotlist"
+msgstr "Kunne ikke tilf�je \"%s\" til din Napster hotlist"
+
+#: src/protocols/napster/napster.c:345
+msgid "You were disconnected from the server."
+msgstr "Din forbindelse til serveren blev afbrudt."
+
+#. MSG_CLIENT_WHOIS
+#: src/protocols/napster/napster.c:401
+#, c-format
+msgid "%s requested your information"
+msgstr "%s anmodede om dine oplysninger"
+
+#: src/protocols/napster/napster.c:431
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr ""
+"Du er blevet koblet af serveren, da du er logget ind fra en anden maskine."
+
+#. MSG_CLIENT_PING
+#: src/protocols/napster/napster.c:437
+#, c-format
+msgid "%s requested a PING"
+msgstr "%s anmodede om PING"
+
+#: src/protocols/napster/napster.c:551 src/gtkblist.c:1494
+msgid "Get Info"
+msgstr "Hent info"
+
+#: src/protocols/napster/napster.c:565 src/protocols/oscar/oscar.c:5081
+#: src/protocols/toc/toc.c:1195
 msgid "Join what group:"
 msgstr "Hvilken gruppe:"
 
@@ -2054,7 +2178,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:700 src/protocols/napster/napster.c:702
+#: src/protocols/napster/napster.c:641 src/protocols/napster/napster.c:643
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER protokolmodul"
 
@@ -2169,65 +2293,65 @@
 msgid "Disconnected."
 msgstr "Forbindelse afbrudt"
 
-#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:854
+#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:855
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Forbindelse til chat-rum %s afbrudt."
 
-#: src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:572
 msgid "Chat is currently unavailable"
 msgstr "Chat er ikke tilg�ngelig nu"
 
-#: src/protocols/oscar/oscar.c:643 src/protocols/oscar/oscar.c:705
+#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:708
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke kontakte v�rt"
 
-#: src/protocols/oscar/oscar.c:687
+#: src/protocols/oscar/oscar.c:690
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge p� AIM"
 
-#: src/protocols/oscar/oscar.c:798 src/protocols/oscar/oscar.c:1181
+#: src/protocols/oscar/oscar.c:801 src/protocols/oscar/oscar.c:1187
 msgid "Could Not Connect"
 msgstr "Forbindelse fejlede"
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:808
 msgid "Connection established, cookie sent"
 msgstr "Forbindelse oprettet, infokage sendt"
 
-#: src/protocols/oscar/oscar.c:872 src/protocols/oscar/oscar.c:883
-#: src/protocols/oscar/oscar.c:887
+#: src/protocols/oscar/oscar.c:875 src/protocols/oscar/oscar.c:887
+#: src/protocols/oscar/oscar.c:892
 msgid "File Transfer Aborted"
 msgstr "Filoverf�rsel afbrudt"
 
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to establish listener socket."
 msgstr "Kan ikke etablere lytte sokkel."
 
-#: src/protocols/oscar/oscar.c:883
+#: src/protocols/oscar/oscar.c:888
 msgid "Unable to establish file descriptor."
 msgstr "Kunne ikke etablere fildeskriptor."
 
-#: src/protocols/oscar/oscar.c:887
+#: src/protocols/oscar/oscar.c:893
 msgid "Unable to create new connection."
 msgstr "Ikke ikke etablere ny forbindelse."
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1071 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1077 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "Forkert navn eller adgangskode."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1075
+#: src/protocols/oscar/oscar.c:1081
 msgid "Your account is currently suspended."
 msgstr "Din konto er ikke aktiv for �jeblikket."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1079
+#: src/protocols/oscar/oscar.c:1085
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger tjenesten er midlertidigt utilg�ngelig."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1083
+#: src/protocols/oscar/oscar.c:1089
 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."
@@ -2236,21 +2360,21 @@
 "minutter og pr�v s� igen, for ellers skal du bare vente endnu l�ngere."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1087
+#: src/protocols/oscar/oscar.c:1093
 #, 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:1091 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1097 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "Godkendelse fejlede."
 
-#: src/protocols/oscar/oscar.c:1119
+#: src/protocols/oscar/oscar.c:1125
 msgid "Internal Error"
 msgstr "Intern fejl"
 
-#: src/protocols/oscar/oscar.c:1220 src/protocols/oscar/oscar.c:1250
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1226 src/protocols/oscar/oscar.c:1256
+#: src/protocols/oscar/oscar.c:1344
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2259,29 +2383,29 @@
 "Du vil m�ske blive frakoblet snart. Du kan bruge TOC i ndtil dette er "
 "ordnet. Tjek %s for opdateringer."
 
-#: src/protocols/oscar/oscar.c:1222 src/protocols/oscar/oscar.c:1252
+#: src/protocols/oscar/oscar.c:1229 src/protocols/oscar/oscar.c:1259
 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:1338
+#: src/protocols/oscar/oscar.c:1347
 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:1892 src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:1901 src/protocols/oscar/oscar.c:5399
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte forbindelse til %s oprettet"
 
-#: src/protocols/oscar/oscar.c:2219 src/protocols/oscar/oscar.c:2241
+#: src/protocols/oscar/oscar.c:2228 src/protocols/oscar/oscar.c:2250
 msgid "(There was an error receiving this message)"
 msgstr "(Der var en fejl da denne besked blev modtaget)"
 
-#: src/protocols/oscar/oscar.c:2386
+#: src/protocols/oscar/oscar.c:2395
 #, 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:2387
+#: src/protocols/oscar/oscar.c:2396
 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 "
@@ -2291,19 +2415,19 @@
 "for billeder. Fordi din IP-adresse vil blive afsl�ret, kan det anses som en "
 "privatlivs risiko."
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2422
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Venligst godkend mig, s� jeg kan tilf�je dig til min venneliste."
 
-#: src/protocols/oscar/oscar.c:2421
+#: src/protocols/oscar/oscar.c:2430
 msgid "Authorization Request Message:"
 msgstr "Besked til anmodning om godkendelse:"
 
-#: src/protocols/oscar/oscar.c:2421
+#: src/protocols/oscar/oscar.c:2430
 msgid "Please authorize me!"
 msgstr "Venligst godkend mig!"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2455
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -2312,23 +2436,23 @@
 "Brugeren %s kr�ver godkendelse for at blive tilf�jet til en venneliste.Vil "
 "du sende en anmodning om godkendelse?"
 
-#: src/protocols/oscar/oscar.c:2450
+#: src/protocols/oscar/oscar.c:2459
 msgid "Request Authorization"
 msgstr "Anmod om godkendelse"
 
-#: src/protocols/oscar/oscar.c:2484 src/protocols/oscar/oscar.c:2486
-#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2560
-#: src/protocols/oscar/oscar.c:2574 src/protocols/oscar/oscar.c:2950
-#: src/protocols/oscar/oscar.c:3001 src/protocols/oscar/oscar.c:5020
-#: src/protocols/oscar/oscar.c:5062
+#: src/protocols/oscar/oscar.c:2493 src/protocols/oscar/oscar.c:2495
+#: src/protocols/oscar/oscar.c:2501 src/protocols/oscar/oscar.c:2569
+#: src/protocols/oscar/oscar.c:2583 src/protocols/oscar/oscar.c:2952
+#: src/protocols/oscar/oscar.c:3004 src/protocols/oscar/oscar.c:5006
+#: src/protocols/oscar/oscar.c:5048
 msgid "No reason given."
 msgstr "Ingen grund givet."
 
-#: src/protocols/oscar/oscar.c:2492
+#: src/protocols/oscar/oscar.c:2501
 msgid "Authorization Denied Message:"
 msgstr "Besked for n�gtelse af godkendelses anmodning:"
 
-#: src/protocols/oscar/oscar.c:2560
+#: src/protocols/oscar/oscar.c:2569
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason:\n"
@@ -2337,11 +2461,11 @@
 "Brugeren %lu vil tilf�je dig til sin venneliste af f�lgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
+#: src/protocols/oscar/oscar.c:2576 src/protocols/oscar/oscar.c:5011
 msgid "Authorization Request"
 msgstr "Godkendelse Anmodning"
 
-#: src/protocols/oscar/oscar.c:2574
+#: src/protocols/oscar/oscar.c:2583
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -2352,17 +2476,17 @@
 "af den f�lgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2575
+#: src/protocols/oscar/oscar.c:2584
 msgid "ICQ authorization denied."
 msgstr "ICQ godkendelse n�gtet."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2581
+#: src/protocols/oscar/oscar.c:2591
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "Brugeren %lu har givet dig lov til at tilf�je sig til din venneliste."
 
-#: src/protocols/oscar/oscar.c:2588
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2375,7 +2499,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2596
+#: src/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2388,7 +2512,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2604
+#: src/protocols/oscar/oscar.c:2615
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2401,34 +2525,34 @@
 "Beskeden er:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2625
+#: src/protocols/oscar/oscar.c:2636
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "ICQ bruger %lu har sendt dig en kontakt: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2640
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "Vil du tilf�je denne ven til din venneliste?"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2640
 msgid "Decline"
 msgstr "N�gt"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:2722
 #, 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:2724
+#: src/protocols/oscar/oscar.c:2731
 #, 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:2735
+#: src/protocols/oscar/oscar.c:2740
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2439,7 +2563,7 @@
 msgstr[1] ""
 "Du har ikke modtaget %hu beskeder fra %s, fordi de blev sendt for hurtigt."
 
-#: src/protocols/oscar/oscar.c:2746
+#: src/protocols/oscar/oscar.c:2749
 #, 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."
@@ -2447,7 +2571,7 @@
 msgstr[1] ""
 "Du har ikke modtaget %hu beskeder fra %s, fordi han/hun var for ond."
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:2758
 #, 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."
@@ -2461,124 +2585,124 @@
 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:2782 src/protocols/oscar/oscar.c:4478
-#: src/protocols/oscar/oscar.c:5693
+#: src/protocols/oscar/oscar.c:2783 src/protocols/oscar/oscar.c:4488
+#: src/protocols/oscar/oscar.c:5680
 msgid "Free For Chat"
 msgstr "Fri til chat"
 
-#: src/protocols/oscar/oscar.c:2786 src/protocols/oscar/oscar.c:4472
-#: src/protocols/oscar/oscar.c:5691
+#: src/protocols/oscar/oscar.c:2787 src/protocols/oscar/oscar.c:4482
+#: src/protocols/oscar/oscar.c:5678
 msgid "Not Available"
 msgstr "Ikke tilg�ngelig"
 
-#: src/protocols/oscar/oscar.c:2788 src/protocols/oscar/oscar.c:4475
-#: src/protocols/oscar/oscar.c:5692
+#: src/protocols/oscar/oscar.c:2789 src/protocols/oscar/oscar.c:4485
+#: src/protocols/oscar/oscar.c:5679
 msgid "Occupied"
 msgstr "Optaget"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:2793
 msgid "Web Aware"
 msgstr "Web-opm�rksom"
 
-#: src/protocols/oscar/oscar.c:2852
+#: src/protocols/oscar/oscar.c:2853
 #, 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:2854
+#: src/protocols/oscar/oscar.c:2855
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2913
+#: src/protocols/oscar/oscar.c:2914
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fejlen: %s\n"
 
-#: src/protocols/oscar/oscar.c:2914
+#: src/protocols/oscar/oscar.c:2915
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:2950
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Din besked til %s blev ikke sendt:"
 
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:3002
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Oplysninger om %s ikke tilg�ngelige:"
 
-#: src/protocols/oscar/oscar.c:3032
+#: src/protocols/oscar/oscar.c:3036
 msgid "Buddy Icon"
 msgstr "Venneikon"
 
-#: src/protocols/oscar/oscar.c:3035
+#: src/protocols/oscar/oscar.c:3039
 msgid "Voice"
 msgstr "Tale"
 
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5717
+#: src/protocols/oscar/oscar.c:3042 src/protocols/oscar/oscar.c:5704
 msgid "Direct IM"
 msgstr "Direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:3041 src/gtkblist.c:1480
+#: src/protocols/oscar/oscar.c:3045 src/gtkblist.c:1503
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5729
+#: src/protocols/oscar/oscar.c:3048 src/protocols/oscar/oscar.c:5716
 msgid "Get File"
 msgstr "Modtag fil"
 
-#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5723
+#: src/protocols/oscar/oscar.c:3051 src/protocols/oscar/oscar.c:5710
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3055
 msgid "Games"
 msgstr "Spil"
 
-#: src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3058
 msgid "Add-Ins"
 msgstr "Udvidelser"
 
-#: src/protocols/oscar/oscar.c:3057
+#: src/protocols/oscar/oscar.c:3061
 msgid "Send Buddy List"
 msgstr "Send venneliste"
 
-#: src/protocols/oscar/oscar.c:3060
+#: src/protocols/oscar/oscar.c:3064
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy fejl"
 
-#: src/protocols/oscar/oscar.c:3063
+#: src/protocols/oscar/oscar.c:3067
 msgid "AP User"
 msgstr "AP Bruger"
 
-#: src/protocols/oscar/oscar.c:3066
+#: src/protocols/oscar/oscar.c:3070
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3069
+#: src/protocols/oscar/oscar.c:3073
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3072
+#: src/protocols/oscar/oscar.c:3076
 msgid "ICQ Server Relay"
 msgstr "ICQ Send gennem server"
 
-#: src/protocols/oscar/oscar.c:3075
+#: src/protocols/oscar/oscar.c:3079
 msgid "ICQ Unknown"
 msgstr "ICQ Ukendt"
 
-#: src/protocols/oscar/oscar.c:3078
+#: src/protocols/oscar/oscar.c:3082
 msgid "Trillian Encryption"
 msgstr "Trillian kryptering"
 
-#: src/protocols/oscar/oscar.c:3081
+#: src/protocols/oscar/oscar.c:3085
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3124
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
@@ -2586,26 +2710,26 @@
 "<i>Kunne ikke vise informationerne, fordi det er sendt i et ukendt tegns�t.</"
 "i>"
 
-#: src/protocols/oscar/oscar.c:3127
+#: src/protocols/oscar/oscar.c:3131
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "Online siden : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3136
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "Medlem siden : <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3142
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "Inaktiv : <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3145
 msgid "Idle: <b>Active</b>"
 msgstr "Inaktiv: <b>Aktiv</b>"
 
-#: src/protocols/oscar/oscar.c:3144
+#: src/protocols/oscar/oscar.c:3147
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2618,27 +2742,27 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3176
+#: src/protocols/oscar/oscar.c:3179
 msgid "<i>User has no away message</i>"
 msgstr "<i>Brugeren har ingen frav�rsbesked</i>"
 
-#: src/protocols/oscar/oscar.c:3187
+#: src/protocols/oscar/oscar.c:3190
 msgid "Client Capabilities: "
 msgstr "Klient underst�tter: "
 
-#: src/protocols/oscar/oscar.c:3193
+#: src/protocols/oscar/oscar.c:3196
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ingen information tilg�ngelig</i>"
 
-#: src/protocols/oscar/oscar.c:3215
+#: src/protocols/oscar/oscar.c:3220
 msgid "Your AIM connection may be lost."
 msgstr "Din AIM forbindelse kan v�re afbrudt."
 
-#: src/protocols/oscar/oscar.c:3576
+#: src/protocols/oscar/oscar.c:3581
 msgid "Rate limiting error."
 msgstr "Gr�nse fejl."
 
-#: src/protocols/oscar/oscar.c:3577
+#: src/protocols/oscar/oscar.c:3582
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -2646,7 +2770,7 @@
 "Den sidste besked blev ikke sendt, fordi du er over gr�nsen. Vent venligst i "
 "10 sekunder og pr�v igen."
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:3642
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -2654,126 +2778,126 @@
 "Du er blevet koblet af serveren, da du ogs� er logget ind fra en anden "
 "maskine."
 
-#: src/protocols/oscar/oscar.c:3638
+#: src/protocols/oscar/oscar.c:3644
 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:3865
+#: src/protocols/oscar/oscar.c:3871
 msgid "UIN:"
 msgstr "UIN:"
 
-#: src/protocols/oscar/oscar.c:3870
+#: src/protocols/oscar/oscar.c:3876
 msgid "First Name:"
 msgstr "Fornavn:"
 
-#: src/protocols/oscar/oscar.c:3873
+#: src/protocols/oscar/oscar.c:3879
 msgid "Last Name:"
 msgstr "Efternavn:"
 
-#: src/protocols/oscar/oscar.c:3876 src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3882 src/protocols/oscar/oscar.c:3888
 msgid "Email Address:"
 msgstr "E-post adresse:"
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3893
 msgid "Mobile Phone:"
 msgstr "Mobiltelefon:"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:3896
 msgid "Gender:"
 msgstr "K�n:"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:3896
 msgid "Female"
 msgstr "Kvinde"
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:3896
 msgid "Male"
 msgstr "Mand"
 
-#: src/protocols/oscar/oscar.c:3899
+#: src/protocols/oscar/oscar.c:3905
 msgid "Birthday:"
 msgstr "F�dselsdato:"
 
-#: src/protocols/oscar/oscar.c:3904
-msgid "Age:"
-msgstr "Alder:"
-
-#: src/protocols/oscar/oscar.c:3907
-msgid "Personal Web Page:"
-msgstr "Personlig hjemmeside:"
-
 #: src/protocols/oscar/oscar.c:3910
+msgid "Age:"
+msgstr "Alder:"
+
+#: src/protocols/oscar/oscar.c:3913
+msgid "Personal Web Page:"
+msgstr "Personlig hjemmeside:"
+
+#: src/protocols/oscar/oscar.c:3916
 msgid "Additional Information:"
 msgstr "Yderligere information:"
 
-#: src/protocols/oscar/oscar.c:3914
+#: src/protocols/oscar/oscar.c:3920
 msgid "Home Address:"
 msgstr "Hjemme adresse:"
 
-#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
+#: src/protocols/oscar/oscar.c:3922 src/protocols/oscar/oscar.c:3938
 msgid "Address:"
 msgstr "Adresse:"
 
-#: src/protocols/oscar/oscar.c:3919 src/protocols/oscar/oscar.c:3935
+#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:3941
 msgid "City:"
 msgstr "By:"
 
-#: src/protocols/oscar/oscar.c:3922 src/protocols/oscar/oscar.c:3938
+#: src/protocols/oscar/oscar.c:3928 src/protocols/oscar/oscar.c:3944
 msgid "State:"
 msgstr "Landsdel:"
 
-#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:3941
+#: src/protocols/oscar/oscar.c:3931 src/protocols/oscar/oscar.c:3947
 msgid "Zip Code:"
 msgstr "Postnummer:"
 
-#: src/protocols/oscar/oscar.c:3930
+#: src/protocols/oscar/oscar.c:3936
 msgid "Work Address:"
 msgstr "Arbejds adresse:"
 
-#: src/protocols/oscar/oscar.c:3946
+#: src/protocols/oscar/oscar.c:3952
 msgid "Work Information:"
 msgstr "Arbejds information:"
 
-#: src/protocols/oscar/oscar.c:3948
+#: src/protocols/oscar/oscar.c:3954
 msgid "Company:"
 msgstr "Firma:"
 
-#: src/protocols/oscar/oscar.c:3951
+#: src/protocols/oscar/oscar.c:3957
 msgid "Division:"
 msgstr "Afdeling:"
 
-#: src/protocols/oscar/oscar.c:3954
+#: src/protocols/oscar/oscar.c:3960
 msgid "Position:"
 msgstr "Stilling:"
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:3963
 msgid "Web Page:"
 msgstr "Hjemmeside:"
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4031
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s har de f�lgende brugernavne:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4049
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ingen resultater fundet for post-adressen %s"
 
-#: src/protocols/oscar/oscar.c:4065
+#: src/protocols/oscar/oscar.c:4070
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Du b�r modtage en email for at acceptere %s."
 
-#: src/protocols/oscar/oscar.c:4067
+#: src/protocols/oscar/oscar.c:4072
 msgid "Account Confirmation Requested"
 msgstr "Der er anmodet om konto bekr�ftelse"
 
-#: src/protocols/oscar/oscar.c:4095
+#: src/protocols/oscar/oscar.c:4100
 msgid "Error Changing Account Info"
 msgstr "Fejl ved �ndring af konto oplysninger"
 
-#: src/protocols/oscar/oscar.c:4098
+#: src/protocols/oscar/oscar.c:4103
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2782,7 +2906,7 @@
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "er forskelligt fra det oprindelige."
 
-#: src/protocols/oscar/oscar.c:4101
+#: src/protocols/oscar/oscar.c:4106
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2791,7 +2915,7 @@
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "ender p� et mellemrum."
 
-#: src/protocols/oscar/oscar.c:4104
+#: src/protocols/oscar/oscar.c:4109
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -2800,7 +2924,7 @@
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "er for langt."
 
-#: src/protocols/oscar/oscar.c:4107
+#: src/protocols/oscar/oscar.c:4112
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -2809,7 +2933,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:4110
+#: src/protocols/oscar/oscar.c:4115
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -2818,7 +2942,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:4113
+#: src/protocols/oscar/oscar.c:4118
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -2827,12 +2951,12 @@
 "Fejl 0x%04x: Ikke i stand til at �ndre e-post adresse, fordi den angivne "
 "adresse er ugyldig."
 
-#: src/protocols/oscar/oscar.c:4116
+#: src/protocols/oscar/oscar.c:4121
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fejl 0x%04x: Ukendt fejl."
 
-#: src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4131
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2841,20 +2965,20 @@
 "Dit brugernavn er formatter s�ledes p� nuv�rende tidspunkt:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4127 src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4132 src/protocols/oscar/oscar.c:4138
 msgid "Account Info"
 msgstr "Konto Oplysninger"
 
-#: src/protocols/oscar/oscar.c:4132
+#: src/protocols/oscar/oscar.c:4137
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s's post-adresse er %s"
 
-#: src/protocols/oscar/oscar.c:4354
+#: src/protocols/oscar/oscar.c:4359
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke �ndre AIM profil."
 
-#: src/protocols/oscar/oscar.c:4355
+#: src/protocols/oscar/oscar.c:4360
 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 "
@@ -2864,7 +2988,7 @@
 "f�rdig. Din profil er ikke sat; pr�v at s�tte den igen n�r du er f�rdig med "
 "at forbinde til serveren."
 
-#: src/protocols/oscar/oscar.c:4382
+#: src/protocols/oscar/oscar.c:4389
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
@@ -2873,15 +2997,15 @@
 "Profil-l�ngdens maskimal st�rrelse p� %d bogstaver er blevet overskredet. "
 "Gaim har forkortet den."
 
-#: src/protocols/oscar/oscar.c:4384
+#: src/protocols/oscar/oscar.c:4391
 msgid "Profile too long."
 msgstr "Profil for lang."
 
-#: src/protocols/oscar/oscar.c:4400
+#: src/protocols/oscar/oscar.c:4407
 msgid "Unable to set AIM away message."
 msgstr "Kunne ikke s�tte AIM frav�rsbesked."
 
-#: src/protocols/oscar/oscar.c:4401
+#: src/protocols/oscar/oscar.c:4408
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2891,7 +3015,7 @@
 "blevet f�rdig. Du er stadig i en \"tilg�ngelig\" frav�rsstatus; pr�v at "
 "s�tte det igen n�r du er f�rdig med at forbinde til serveren."
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:4447
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
@@ -2900,15 +3024,15 @@
 "Frav�rsbesked-l�ngden p� %d bogstaver er blevet overskredet. Gaim har "
 "forkortet den og sat dig som frav�rende."
 
-#: src/protocols/oscar/oscar.c:4439
+#: src/protocols/oscar/oscar.c:4449
 msgid "Away message too long."
 msgstr "Frav�rsbesked for lang."
 
-#: src/protocols/oscar/oscar.c:4652
+#: src/protocols/oscar/oscar.c:4662
 msgid "Unable To Retrive Buddy List"
 msgstr "Kunne ikke hente vennelisten"
 
-#: src/protocols/oscar/oscar.c:4652
+#: src/protocols/oscar/oscar.c:4663
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -2918,25 +3042,12 @@
 "serverne. Din venneliste er ikke tabt, og vil sikkert blive tilg�ngelig "
 "indenfor et par timer."
 
-#: src/protocols/oscar/oscar.c:4742 src/protocols/oscar/oscar.c:4743
-#: src/protocols/oscar/oscar.c:4748
+#: src/protocols/oscar/oscar.c:4753 src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:4759
 msgid "Orphans"
 msgstr "Tabte"
 
-#: src/protocols/oscar/oscar.c:4893
-#, c-format
-msgid ""
-"The maximum number of buddies allowed in your buddy list is %d, and you have "
-"%d.  Until you are below the limit, some buddies will not show up as online."
-msgstr ""
-"Det maksimale tilladte antal af venner i din venneliste er %d, og du har %d."
-"Indtil du er under denne gr�nse, vil nogen venner ikke vise sig som online."
-
-#: src/protocols/oscar/oscar.c:4896
-msgid "Maximum buddy list length exceeded."
-msgstr "Maksimal venneliste st�rrelse overskredet"
-
-#: src/protocols/oscar/oscar.c:4936
+#: src/protocols/oscar/oscar.c:4923
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -2945,20 +3056,25 @@
 "Kunne ikke tilf�je vennen %s fordi du har for mange venner i din venneliste."
 "Fjern en, og pr�v igen."
 
-#: src/protocols/oscar/oscar.c:4936 src/protocols/oscar/oscar.c:4950
+#: src/protocols/oscar/oscar.c:4923 src/protocols/oscar/oscar.c:4936
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#: src/protocols/oscar/oscar.c:4937 src/protocols/oscar/oscar.c:4951
+#: src/protocols/oscar/oscar.c:4924 src/protocols/oscar/oscar.c:4937
 msgid "Unable To Add"
 msgstr "Ikke i stand til at tilf�je"
 
-#: src/protocols/oscar/oscar.c:4950
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "Kunne ikke tilf�je vennen %s pga. en ukendt �rsag."
-
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:4936
+#, c-format
+msgid ""
+"Could not add the buddy %s for an unknown reason.  The most common reason "
+"for this is that you have the maximum number of allowed buddies in your "
+"buddy list."
+msgstr ""
+"Kunne ikke tilf�je 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:4971
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -2967,11 +3083,11 @@
 "Brugeren %s har givet dig lov til at tilf�je dig til din venneliste. Vil du "
 "tilf�je brugeren?"
 
-#: src/protocols/oscar/oscar.c:4990
+#: src/protocols/oscar/oscar.c:4976
 msgid "Authorization Given"
 msgstr "Godkendelse Givet"
 
-#: src/protocols/oscar/oscar.c:5020
+#: src/protocols/oscar/oscar.c:5006
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -2981,19 +3097,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5044
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr ""
 "Brugeren %s har givet lov til din anmodning om at tilf�je dem til din "
 "venneliste."
 
-#: src/protocols/oscar/oscar.c:5059
+#: src/protocols/oscar/oscar.c:5045
 msgid "Authorization Granted"
 msgstr "Godkendelse Givet"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5062
+#: src/protocols/oscar/oscar.c:5048
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3004,48 +3120,48 @@
 "f�lgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5049
 msgid "Authorization Denied"
 msgstr "Godkendelse N�gtet"
 
-#: src/protocols/oscar/oscar.c:5100 src/protocols/toc/toc.c:1196
+#: src/protocols/oscar/oscar.c:5086 src/protocols/toc/toc.c:1200
 msgid "Exchange:"
 msgstr "Deltagere:"
 
-#: src/protocols/oscar/oscar.c:5320
+#: src/protocols/oscar/oscar.c:5306
 msgid "<b>Status:</b> "
 msgstr "<b>Status:</b> "
 
-#: src/protocols/oscar/oscar.c:5329
+#: src/protocols/oscar/oscar.c:5315
 msgid "<b>Logged In:</b> "
 msgstr "<b>Logget ind:</b> "
 
-#: src/protocols/oscar/oscar.c:5336
+#: src/protocols/oscar/oscar.c:5322
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Klient underst�tter:</b> "
 
-#: src/protocols/oscar/oscar.c:5344
+#: src/protocols/oscar/oscar.c:5330
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Status:</b> Ikke godkendt"
 
-#: src/protocols/oscar/oscar.c:5348 src/gtkblist.c:845
+#: src/protocols/oscar/oscar.c:5334 src/gtkblist.c:855
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Offline"
 
-#: src/protocols/oscar/oscar.c:5374
+#: src/protocols/oscar/oscar.c:5360
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/oscar/oscar.c:5555
+#: src/protocols/oscar/oscar.c:5541
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke oprette direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:5568
+#: src/protocols/oscar/oscar.c:5554
 #, 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:5569
+#: src/protocols/oscar/oscar.c:5555
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -3053,39 +3169,39 @@
 "Fordi dette afsl�rer din IP-adresse, ses det som en privatlivs-risiko. Vil "
 "du forts�tte?"
 
-#: src/protocols/oscar/oscar.c:5707
+#: src/protocols/oscar/oscar.c:5694
 msgid "Get Status Msg"
 msgstr "Hent statusbesked"
 
-#: src/protocols/oscar/oscar.c:5741
+#: src/protocols/oscar/oscar.c:5728
 msgid "Re-request Authorization"
 msgstr "Anmod om ny godkendelse"
 
-#: src/protocols/oscar/oscar.c:5762
+#: src/protocols/oscar/oscar.c:5749
 msgid "The new formatting is invalid."
 msgstr "Den nye formattering er ugyldig."
 
-#: src/protocols/oscar/oscar.c:5763
+#: src/protocols/oscar/oscar.c:5750
 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:5769
+#: src/protocols/oscar/oscar.c:5756
 msgid "New screenname formatting:"
 msgstr "Ny brugernavn formatering:"
 
-#: src/protocols/oscar/oscar.c:5814
+#: src/protocols/oscar/oscar.c:5801
 msgid "Change Address To: "
 msgstr "Skift adresse til: "
 
-#: src/protocols/oscar/oscar.c:5824
+#: src/protocols/oscar/oscar.c:5811
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "Du afventer godkendelse fra f�lgende venner:<BR>"
 
-#: src/protocols/oscar/oscar.c:5849
+#: src/protocols/oscar/oscar.c:5836
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du venter ikke p� godkendelse</i>"
 
-#: src/protocols/oscar/oscar.c:5854
+#: src/protocols/oscar/oscar.c:5841
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3094,31 +3210,31 @@
 "%s<BR><BR>Du kan anmode om ny godkendelse fra disse venner ved at "
 "h�jreklikke p� dem og v�lge \"Anmod om ny godkendelse\"."
 
-#: src/protocols/oscar/oscar.c:5887
+#: src/protocols/oscar/oscar.c:5874
 msgid "Change Password (URL)"
 msgstr "Skift adgangskode (URL)"
 
-#: src/protocols/oscar/oscar.c:5898
+#: src/protocols/oscar/oscar.c:5885
 msgid "Format Screenname"
 msgstr "Format�r brugernavn"
 
-#: src/protocols/oscar/oscar.c:5904
+#: src/protocols/oscar/oscar.c:5891
 msgid "Confirm Account"
 msgstr "Bekr�ft Konto"
 
-#: src/protocols/oscar/oscar.c:5910
+#: src/protocols/oscar/oscar.c:5897
 msgid "Display Current Registered Address"
 msgstr "Vis nuv�rende registeret adresse"
 
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:5903
 msgid "Change Current Registered Address"
 msgstr "Skift nuv�rende registreret adresse"
 
-#: src/protocols/oscar/oscar.c:5925
+#: src/protocols/oscar/oscar.c:5912
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis venner der afventer godkendelse"
 
-#: src/protocols/oscar/oscar.c:5933
+#: src/protocols/oscar/oscar.c:5920
 msgid "Search for Buddy by Email"
 msgstr "S�g efter ven udfra e-post adresse"
 
@@ -3132,10 +3248,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6053 src/protocols/oscar/oscar.c:6055
+#: src/protocols/oscar/oscar.c:6040 src/protocols/oscar/oscar.c:6042
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ protokolmodul"
 
+#: src/protocols/oscar/oscar.c:6060
+#, fuzzy
+msgid "Auth Host:"
+msgstr "TOC V�rt:"
+
+#: src/protocols/oscar/oscar.c:6066
+#, fuzzy
+msgid "Auth Port:"
+msgstr "Port:"
+
 #: src/protocols/toc/toc.c:190
 #, c-format
 msgid "Looking up %s"
@@ -3266,19 +3392,19 @@
 msgid "Waiting for reply..."
 msgstr "Venter p� svar..."
 
-#: src/protocols/toc/toc.c:684
+#: src/protocols/toc/toc.c:685
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC er blevet tilg�ngelig. Du kan nu sende beskeder igen."
 
-#: src/protocols/toc/toc.c:873
+#: src/protocols/toc/toc.c:874
 msgid "Password Change Successful"
 msgstr "Adgangskode skiftet"
 
-#: src/protocols/toc/toc.c:876
+#: src/protocols/toc/toc.c:878
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC har sendt en PAUSE kommando."
 
-#: src/protocols/toc/toc.c:876
+#: src/protocols/toc/toc.c:879
 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 "
@@ -3288,49 +3414,53 @@
 "at blive logget af, hvis du fors�ger at sende en besked. Gaim vil derfor "
 "tilbageholde alle beskeder. Dette er kun midlertidigt, s� hav t�lmodighed."
 
-#: src/protocols/toc/toc.c:1319
+#: src/protocols/toc/toc.c:1323
 msgid "Get Dir Info"
 msgstr "Hent mappeoplysninger"
 
-#: src/protocols/toc/toc.c:1443
+#: src/protocols/toc/toc.c:1447
 msgid "Set Dir Info"
 msgstr "Ret mappeoplysninger"
 
-#: src/protocols/toc/toc.c:1566
+#: src/protocols/toc/toc.c:1570
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kunne ikke �bne %s til skrivning!"
 
-#: src/protocols/toc/toc.c:1644 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1891
+#: src/protocols/toc/toc.c:1606
+msgid "File transfer failed; other side probably canceled."
+msgstr "Filoverf�rsel fejlede - den anden side har sikkert afbrudt."
+
+#: src/protocols/toc/toc.c:1651 src/protocols/toc/toc.c:1691
+#: src/protocols/toc/toc.c:1903
 msgid "Could not connect for transfer."
 msgstr "Kunne ikke oprette forbindelse til overf�rsel."
 
-#: src/protocols/toc/toc.c:1806
+#: src/protocols/toc/toc.c:1815
 msgid "Could not connect for transfer!"
 msgstr "Kunne ikke oprette forbindelse til overf�rsel!"
 
-#: src/protocols/toc/toc.c:1838
+#: src/protocols/toc/toc.c:1848
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Kunne ikke skrive fil-hoved. Filen vil ikke blive overf�rt."
 
-#: src/protocols/toc/toc.c:1936 src/gtkft.c:1056
+#: src/protocols/toc/toc.c:1948 src/gtkft.c:1058
 msgid "Gaim - Save As..."
 msgstr "Gaim - Gem som..."
 
-#: src/protocols/toc/toc.c:1970
+#: src/protocols/toc/toc.c:1982
 #, 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:1977
+#: src/protocols/toc/toc.c:1989
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s beder dig om at sende en fil"
 
-#: src/protocols/toc/toc.c:1979 src/gtkft.c:1109 src/server.c:1237
+#: src/protocols/toc/toc.c:1991 src/gtkft.c:1111 src/server.c:1239
 msgid "Accept"
 msgstr "Accept�r"
 
@@ -3344,56 +3474,56 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2049 src/protocols/toc/toc.c:2051
+#: src/protocols/toc/toc.c:2061 src/protocols/toc/toc.c:2063
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolmodul"
 
-#: src/protocols/toc/toc.c:2069
+#: src/protocols/toc/toc.c:2081
 msgid "TOC Host:"
 msgstr "TOC V�rt:"
 
-#: src/protocols/toc/toc.c:2075
+#: src/protocols/toc/toc.c:2087
 msgid "TOC Port:"
 msgstr "TOC Port:"
 
-#: src/protocols/yahoo/yahoo.c:604
+#: src/protocols/yahoo/yahoo.c:605
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo! besked blev ikke sendt."
 
-#: src/protocols/yahoo/yahoo.c:1072 src/protocols/yahoo/yahoo.c:1277
-#: src/protocols/yahoo/yahoo.c:1351
+#: src/protocols/yahoo/yahoo.c:1073 src/protocols/yahoo/yahoo.c:1278
+#: src/protocols/yahoo/yahoo.c:1352
 msgid "Not At Home"
 msgstr "Ikke hjemme"
 
-#: src/protocols/yahoo/yahoo.c:1074 src/protocols/yahoo/yahoo.c:1279
-#: src/protocols/yahoo/yahoo.c:1352
+#: src/protocols/yahoo/yahoo.c:1075 src/protocols/yahoo/yahoo.c:1280
+#: src/protocols/yahoo/yahoo.c:1353
 msgid "Not At Desk"
 msgstr "Ikke ved skrivebordet"
 
-#: src/protocols/yahoo/yahoo.c:1076 src/protocols/yahoo/yahoo.c:1281
-#: src/protocols/yahoo/yahoo.c:1353
+#: src/protocols/yahoo/yahoo.c:1077 src/protocols/yahoo/yahoo.c:1282
+#: src/protocols/yahoo/yahoo.c:1354
 msgid "Not In Office"
 msgstr "Ikke p� kontoret"
 
-#: src/protocols/yahoo/yahoo.c:1080 src/protocols/yahoo/yahoo.c:1285
-#: src/protocols/yahoo/yahoo.c:1355
+#: src/protocols/yahoo/yahoo.c:1081 src/protocols/yahoo/yahoo.c:1286
+#: src/protocols/yahoo/yahoo.c:1356
 msgid "On Vacation"
 msgstr "P� ferie"
 
-#: src/protocols/yahoo/yahoo.c:1084 src/protocols/yahoo/yahoo.c:1289
-#: src/protocols/yahoo/yahoo.c:1357
+#: src/protocols/yahoo/yahoo.c:1085 src/protocols/yahoo/yahoo.c:1290
+#: src/protocols/yahoo/yahoo.c:1358
 msgid "Stepped Out"
 msgstr "Tr�dt udenfor"
 
-#: src/protocols/yahoo/yahoo.c:1209
+#: src/protocols/yahoo/yahoo.c:1210
 msgid "Activate ID"
 msgstr "Aktiver ID"
 
-#: src/protocols/yahoo/yahoo.c:1434
+#: src/protocols/yahoo/yahoo.c:1435
 msgid "Pager Host:"
 msgstr "Bipper v�rt:"
 
-#: src/protocols/yahoo/yahoo.c:1440
+#: src/protocols/yahoo/yahoo.c:1441
 msgid "Pager Port:"
 msgstr "Bipper port:"
 
@@ -3407,7 +3537,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1526 src/protocols/yahoo/yahoo.c:1528
+#: src/protocols/yahoo/yahoo.c:1527 src/protocols/yahoo/yahoo.c:1529
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolmodul"
 
@@ -3434,11 +3564,11 @@
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: src/protocols/zephyr/zephyr.c:597
+#: src/protocols/zephyr/zephyr.c:598
 msgid "Already logged in with Zephyr"
 msgstr "Allerede logget ind med Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:597
+#: src/protocols/zephyr/zephyr.c:599
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -3446,19 +3576,19 @@
 "Fordi Zephyr bruger dit systems brugernavn, kan du ikke have flere konti n�r "
 "du er logget p� som den samme bruger."
 
-#: src/protocols/zephyr/zephyr.c:844
+#: src/protocols/zephyr/zephyr.c:847
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:884
+#: src/protocols/zephyr/zephyr.c:887
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:889
+#: src/protocols/zephyr/zephyr.c:892
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:894
+#: src/protocols/zephyr/zephyr.c:897
 msgid "Recipient:"
 msgstr "Modtager:"
 
@@ -3472,7 +3602,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1026 src/protocols/zephyr/zephyr.c:1028
+#: src/protocols/zephyr/zephyr.c:1029 src/protocols/zephyr/zephyr.c:1031
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolmodul"
 
@@ -3542,8 +3672,8 @@
 "forfatter) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</"
 "A>&gt;<BR>  Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 
-#: src/about.c:169 src/dialogs.c:4239 src/prpl.c:500 src/prpl.c:806
-#: src/server.c:1428
+#: src/about.c:169 src/dialogs.c:4185 src/prpl.c:501 src/prpl.c:810
+#: src/server.c:1430
 msgid "Close"
 msgstr "Luk"
 
@@ -3567,11 +3697,11 @@
 msgid "Set All Away"
 msgstr "S�t alle frav�rende"
 
-#: src/blist.c:365 src/prefs.c:1790
+#: src/blist.c:366
 msgid "Chats"
 msgstr "Chat-rum"
 
-#: src/blist.c:673
+#: src/blist.c:678
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
@@ -3580,27 +3710,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:677
-msgid "Group Not Removed"
+#: src/blist.c:683
+msgid "Group not removed"
 msgstr "Gruppe ikke fjernet"
 
-#: src/blist.c:844
+#: src/blist.c:850
 msgid "Invalid Groupname"
 msgstr "Ugyldigt gruppenavn"
 
-#: src/blist.c:1566
+#: src/blist.c:1572
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "En fejl opstod da din venneliste skulle indl�ses. Den er ikke blevet hentet."
 
-#: src/blist.c:1568
+#: src/blist.c:1574
 msgid "Buddy List Error"
 msgstr "venneliste fejl"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1574
+#: src/blist.c:1580
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
@@ -3609,18 +3739,18 @@
 "Gaim konverterer din gamle venneliste til et nyt format, som nu vil v�re "
 "placeret i %s"
 
-#: src/blist.c:1577
+#: src/blist.c:1583
 msgid "Converting Buddy List"
 msgstr "Konverterer venneliste"
 
-#: src/browser.c:426 src/browser.c:453
+#: src/browser.c:429 src/browser.c:457
 msgid ""
-"Communication with the browser failed.  Please close all windows and try "
+"Communication with the browser failed. Please close all windows and try "
 "again."
 msgstr ""
 "Kommunikation med browseren fejlede. Pr�v at luk alle vinduer og pr�v igen."
 
-#: src/browser.c:586
+#: src/browser.c:591
 msgid ""
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
@@ -3628,94 +3758,94 @@
 "Kunne ikke starte din browser, fordi 'Manuel' browser-kommandoen er blevet "
 "valgt, men ingen kommando er blevet sat."
 
-#: src/browser.c:601
+#: src/browser.c:609
 #, 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:249 src/dialogs.c:1405
+#: src/buddy_chat.c:250
 msgid ""
-"You are not currently signed on with any protocols that have the ability to "
+"You are not currently signed on wit any protocols that have the ability to "
 "chat."
 msgstr ""
 "Du er p� nuv�rende tidspunkt ikke logget p� nogen protokoller som har evnen "
 "til at chatte."
 
-#: src/buddy_chat.c:262
+#: src/buddy_chat.c:264
 msgid "Join Chat"
 msgstr "Deltag i chat"
 
-#: src/buddy_chat.c:268
+#: src/buddy_chat.c:270
 msgid "Buddy Chat"
 msgstr "Venne-chat"
 
-#: src/buddy_chat.c:278
+#: src/buddy_chat.c:280
 msgid "Join Chat As:"
 msgstr "Deltag i chat som:"
 
 #. Join button.
-#: src/buddy_chat.c:301
+#: src/buddy_chat.c:303
 msgid "Join"
 msgstr "Deltag"
 
-#: src/conversation.c:402
+#: src/conversation.c:404
 msgid "Unable to send message. The message is too large."
 msgstr "Kunne ikke sende besked: For lang."
 
-#: src/conversation.c:411
+#: src/conversation.c:412
 msgid "Unable to send message."
 msgstr "Kunne ikke sende besked."
 
-#: src/conversation.c:1972
+#: src/conversation.c:1973
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er nu i rummet."
 
-#: src/conversation.c:1975
+#: src/conversation.c:1976
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] tr�dte ind i rummet."
 
-#: src/conversation.c:2024
+#: src/conversation.c:2025
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s kalder sig nu for %s"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2068
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlod rummet (%s)."
 
-#: src/conversation.c:2069
+#: src/conversation.c:2070
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlod rummet."
 
-#: src/conversation.c:2253
+#: src/conversation.c:2254
 msgid "Last created window"
 msgstr "Sidst oprettede vindue"
 
-#: src/conversation.c:2255
+#: src/conversation.c:2256
 msgid "New window"
 msgstr "Nyt vindue"
 
-#: src/conversation.c:2257
+#: src/conversation.c:2258
 msgid "By group"
 msgstr "Efter gruppe"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2260
 msgid "By account"
 msgstr "Efter konto"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:364
 msgid "Warn User"
 msgstr "Advar bruger"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:364
 msgid "_Warn"
 msgstr "Advar"
 
-#: src/dialogs.c:379
+#: src/dialogs.c:380
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3728,36 +3858,36 @@
 "Dette vil for�ge %s's advarselsniveau og han eller hun vil v�re ber�rt af en "
 "lavere gr�nse n�r beskeder bliver sendt hurtigt.\n"
 
-#: src/dialogs.c:388
+#: src/dialogs.c:389
 msgid "Warn _anonymously?"
 msgstr "Advar _anonymt?"
 
-#: src/dialogs.c:395
+#: src/dialogs.c:396
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyme advarsler er mindre grove.</b>"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:467
 #, 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 forts�tte?"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:468
 msgid "Remove Buddy"
 msgstr "Fjern ven"
 
-#: src/dialogs.c:473
+#: 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 forts�tte?"
 
-#: src/dialogs.c:474
+#: src/dialogs.c:475
 msgid "Remove Chat"
 msgstr "Fjern chat"
 
-#: src/dialogs.c:480
+#: src/dialogs.c:481
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3766,54 +3896,54 @@
 "Du skal til at fjerne gruppen %s og alle den indeholder fra din venneliste. "
 "Vil du forts�tte?"
 
-#: src/dialogs.c:482
+#: src/dialogs.c:483
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: src/dialogs.c:692
+#: src/dialogs.c:633
 msgid "New Message"
 msgstr "Ny besked"
 
-#: src/dialogs.c:710
+#: src/dialogs.c:651
 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:726 src/dialogs.c:827 src/dialogs.c:3779
+#: src/dialogs.c:667 src/dialogs.c:768 src/dialogs.c:3725
 msgid "_Screenname:"
 msgstr "Brugernavn:"
 
-#: src/dialogs.c:741 src/dialogs.c:843 src/gtkpounce.c:518
+#: src/dialogs.c:682 src/dialogs.c:784 src/gtkpounce.c:520
 msgid "_Account:"
 msgstr "Konto:"
 
-#: src/dialogs.c:796
+#: src/dialogs.c:737
 msgid "Get User Info"
 msgstr "Hent brugeroplysninger"
 
-#: src/dialogs.c:815
+#: src/dialogs.c:756
 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:994
+#: src/dialogs.c:935
 msgid "Add Group"
 msgstr "Tilf�j gruppe"
 
-#: src/dialogs.c:1011
+#: src/dialogs.c:952
 msgid "Please enter the name of the group to be added.\n"
 msgstr "Indtast navnet p� gruppen der skal tilf�jes.\n"
 
-#: src/dialogs.c:1020 src/dialogs.c:4328
+#: src/dialogs.c:961 src/dialogs.c:4273
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: src/dialogs.c:1102
+#: src/dialogs.c:1043
 msgid "Add Buddy"
 msgstr "Tilf�j ven"
 
-#: src/dialogs.c:1121
+#: src/dialogs.c:1062
 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. "
@@ -3823,28 +3953,36 @@
 "ogs� skrive et alias, eller et k�lenavn, for vennen. Dette vil blive brugt "
 "istedet for brugernavnet, n�r det er muligt.\n"
 
-#: src/dialogs.c:1140
+#: src/dialogs.c:1081
 msgid "Screen Name"
 msgstr "Brugernavn:"
 
-#: src/dialogs.c:1153
+#: src/dialogs.c:1094
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:1163
+#: src/dialogs.c:1104
 msgid "Group"
 msgstr "Gruppe"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1172
+#: src/dialogs.c:1113
 msgid "Add To"
 msgstr "Tilf�j til"
 
-#: src/dialogs.c:1412
+#: src/dialogs.c:1346
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Du er p� nuv�rende tidspunkt ikke logget p� nogen protokoller som har evnen "
+"til at chatte."
+
+#: src/dialogs.c:1353
 msgid "Add Chat"
 msgstr "Tilf�j chat"
 
-#: src/dialogs.c:1435
+#: src/dialogs.c:1376
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -3852,174 +3990,174 @@
 "Indtast et alias og den n�dvendige information om den chat du vil tilf�je "
 "til din venneliste.\n"
 
-#: src/dialogs.c:1444
+#: src/dialogs.c:1385
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/dialogs.c:1463 src/multi.c:785
+#: src/dialogs.c:1404 src/multi.c:821
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/dialogs.c:1474
+#: src/dialogs.c:1415
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: src/dialogs.c:1807
+#: src/dialogs.c:1748
 msgid "Privacy"
 msgstr "Privatliv"
 
-#: src/dialogs.c:1818
+#: src/dialogs.c:1759
 msgid "Changes to privacy settings take effect immediately."
 msgstr "�ndringer til privatlivs indstillinger g�r i kraft straks."
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1768
 msgid "Set privacy for:"
 msgstr "Indstil for:"
 
-#: src/dialogs.c:1844
+#: src/dialogs.c:1785
 msgid "Allow all users to contact me"
 msgstr "Tillad alle brugere at kontakte mig"
 
-#: src/dialogs.c:1848
+#: src/dialogs.c:1789
 msgid "Allow only users on my buddy list"
 msgstr "Tillad kun brugere p� min venneliste"
 
-#: src/dialogs.c:1852
+#: src/dialogs.c:1793
 msgid "Allow only the users below"
 msgstr "Tillad kun nedenst�ende brugere"
 
-#: src/dialogs.c:1890
+#: src/dialogs.c:1831
 msgid "Deny all users"
 msgstr "Ignor�r alle brugere"
 
-#: src/dialogs.c:1894
+#: src/dialogs.c:1835
 msgid "Block the users below"
 msgstr "Ignor�r kun nedenst�ende brugere"
 
-#: src/dialogs.c:2009
+#: src/dialogs.c:1950
 msgid "Set Directory Info"
 msgstr "Ret Mappeinformation"
 
-#: src/dialogs.c:2017
+#: src/dialogs.c:1958
 msgid "Directory Info"
 msgstr "Mappeinformation"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:1968
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "S�tter mappeoplysninger for %s:"
 
-#: src/dialogs.c:2039
+#: src/dialogs.c:1980
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillad nets�gninger at finde information om dig"
 
 #. Line 1
-#: src/dialogs.c:2042 src/dialogs.c:2684
+#: src/dialogs.c:1983 src/dialogs.c:2627
 msgid "First Name"
 msgstr "Fornavn"
 
 #. Line 2
-#: src/dialogs.c:2053 src/dialogs.c:2694
+#: src/dialogs.c:1994 src/dialogs.c:2637
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
 #. Line 3
-#: src/dialogs.c:2065 src/dialogs.c:2704
+#: src/dialogs.c:2006 src/dialogs.c:2647
 msgid "Last Name"
 msgstr "Efternavn"
 
 #. Line 4
-#: src/dialogs.c:2076 src/dialogs.c:2714
+#: src/dialogs.c:2017 src/dialogs.c:2657
 msgid "Maiden Name"
 msgstr "D�bsnavn"
 
 #. Line 6
-#: src/dialogs.c:2098 src/dialogs.c:2733
+#: src/dialogs.c:2039 src/dialogs.c:2676
 msgid "State"
 msgstr "Landsdel"
 
-#: src/dialogs.c:2140 src/dialogs.c:2311 src/dialogs.c:3448 src/dialogs.c:4248
-#: src/dialogs.c:4999
+#: src/dialogs.c:2081 src/dialogs.c:2254 src/dialogs.c:3394 src/dialogs.c:4194
+#: src/dialogs.c:4944
 msgid "Save"
 msgstr "Gem"
 
-#: src/dialogs.c:2162
-msgid "New Passwords Do Not Match"
-msgstr "Adgangskoder er ikke ens"
-
-#: src/dialogs.c:2167
-msgid "Fill out all fields completely"
-msgstr "Udfyld alle felter ordentligt"
-
-#: src/dialogs.c:2210
+#: src/dialogs.c:2104
+msgid "New passwords do not match."
+msgstr "Nye adgangskoder er ikke ens."
+
+#: src/dialogs.c:2110
+msgid "Fill out all fields completely."
+msgstr "Udfyld alle felter ordentligt."
+
+#: src/dialogs.c:2153
 #, c-format
 msgid "Changing password for %s:"
 msgstr "�ndrer adgangskode for %s:"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2161
 msgid "Original Password"
 msgstr "Oprindelig adgangskode"
 
-#: src/dialogs.c:2229
+#: src/dialogs.c:2172
 msgid "New Password"
 msgstr "Ny adgangskode"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2183
 msgid "New Password (again)"
 msgstr "Ny adgangskode (igen)"
 
 #. Build OK Button
-#: src/dialogs.c:2251 src/dialogs.c:2383 src/dialogs.c:2665 src/dialogs.c:2811
-#: src/dialogs.c:3945 src/dialogs.c:4425 src/prpl.c:245
+#: src/dialogs.c:2194 src/dialogs.c:2326 src/dialogs.c:2608 src/dialogs.c:2754
+#: src/dialogs.c:3891 src/dialogs.c:4370 src/prpl.c:246
 msgid "OK"
 msgstr "O.k."
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2231
 #, c-format
 msgid "Changing info for %s:"
 msgstr "�ndrer oplysninger for %s:"
 
-#: src/dialogs.c:2369
+#: src/dialogs.c:2312
 msgid "Below are the results of your search: "
 msgstr "Her er resultatet af din s�gning: "
 
-#: src/dialogs.c:2477
+#: src/dialogs.c:2420
 msgid "Permit"
 msgstr "Tillad"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2452
 msgid "Add Permit"
 msgstr "Tilf�j tilladelse"
 
-#: src/dialogs.c:2511
+#: src/dialogs.c:2454
 msgid "Add Deny"
 msgstr "Tilf�j n�gtelse"
 
-#: src/dialogs.c:2579
+#: src/dialogs.c:2522
 msgid "Log Conversation"
 msgstr "Log samtale"
 
-#: src/dialogs.c:2660 src/dialogs.c:2793
+#: src/dialogs.c:2603 src/dialogs.c:2736
 msgid "Search for Buddy"
 msgstr "S�g efter ven"
 
-#: src/dialogs.c:2760
+#: src/dialogs.c:2703
 msgid "Find Buddy By Info"
 msgstr "Find ven udfra information"
 
-#: src/dialogs.c:2787
+#: src/dialogs.c:2730
 msgid "Find Buddy By Email"
 msgstr "Find ven udfra e-post adresse"
 
-#: src/dialogs.c:2891
+#: src/dialogs.c:2834
 msgid "Insert Link"
 msgstr "Inds�t link"
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:2836
 msgid "Insert"
 msgstr "Inds�t"
 
-#: src/dialogs.c:2912
+#: src/dialogs.c:2855
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -4027,70 +4165,68 @@
 "Indtast URL'en og beskrivelsen p� det link du vil inds�tte. Beskrivelsen er "
 "ikke kr�vet.\n"
 
-#: src/dialogs.c:3077 src/dialogs.c:3094
+#: src/dialogs.c:3020 src/dialogs.c:3037
 msgid "Select Text Color"
 msgstr "V�lg tekstfarve"
 
-#: src/dialogs.c:3125 src/dialogs.c:3142
+#: src/dialogs.c:3068 src/dialogs.c:3085
 msgid "Select Background Color"
 msgstr "V�lg baggrundsfarve"
 
-#: src/dialogs.c:3226 src/dialogs.c:3249
+#: src/dialogs.c:3169 src/dialogs.c:3192
 msgid "Select Font"
 msgstr "V�lg skrifttype"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3314
+#: src/dialogs.c:3258
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan ikke gemme en frav�rsbesked uden en titel"
 
-#: src/dialogs.c:3315
+#: src/dialogs.c:3260
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Giv frav�rsbeskeden en titel, eller v�lg \"Brug\" for at bruge uden at gemme."
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3324
+#: src/dialogs.c:3270
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lave en tom frav�rsbesked"
 
-#: src/dialogs.c:3389 src/dialogs.c:3397
+#: src/dialogs.c:3335 src/dialogs.c:3343
 msgid "New away message"
 msgstr "Ny frav�rsbesked"
 
-#: src/dialogs.c:3407
+#: src/dialogs.c:3353
 msgid "Away title: "
 msgstr "Titel: "
 
-#: src/dialogs.c:3452
+#: src/dialogs.c:3398
 msgid "Save & Use"
 msgstr "Gem og brug"
 
-#: src/dialogs.c:3456
+#: src/dialogs.c:3402
 msgid "Use"
 msgstr "Brug"
 
 #. show everything
-#: src/dialogs.c:3604
+#: src/dialogs.c:3550
 msgid "Smile!"
 msgstr "Smil!"
 
-#: src/dialogs.c:3650 src/dialogs.c:3728
+#: src/dialogs.c:3596 src/dialogs.c:3674
 msgid "Alias Buddy"
 msgstr "Lav alias for ven"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3679
+#: src/dialogs.c:3625
 msgid "Please enter an aliased name for this chat.\n"
 msgstr "Indtast et alias-navn for denne chat.\n"
 
-#: src/dialogs.c:3691 src/dialogs.c:3793
+#: src/dialogs.c:3637 src/dialogs.c:3739
 msgid "_Alias:"
 msgstr "_Alias:"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3758
+#: src/dialogs.c:3704
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
@@ -4098,91 +4234,91 @@
 "Indtast et alias for personen forneden, eller omd�b denne kontakt i din "
 "venneliste.\n"
 
-#: src/dialogs.c:3847 src/dialogs.c:3854
+#: src/dialogs.c:3793 src/dialogs.c:3800
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "Kunne ikke skrive til %s."
 
-#: src/dialogs.c:3878
+#: src/dialogs.c:3824
 msgid "Save Log File"
 msgstr "Gem logfil"
 
-#: src/dialogs.c:3908
+#: src/dialogs.c:3854
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "Kunne ikke fjerne filen %s."
 
-#: src/dialogs.c:3927
+#: src/dialogs.c:3873
 msgid "Clear Log"
 msgstr "Ryd log"
 
-#: src/dialogs.c:3936
+#: src/dialogs.c:3882
 msgid "Really clear log?"
 msgstr "Er du sikker p� at du vil slette loggen?"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:3927
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "Kunne ikke �bne logfil %s."
 
-#: src/dialogs.c:4120
+#: src/dialogs.c:4066
 #, c-format
 msgid "Conversations with %s"
 msgstr "Samtaler med %s"
 
-#: src/dialogs.c:4122
+#: src/dialogs.c:4068
 msgid "System Log"
 msgstr "System-log"
 
-#: src/dialogs.c:4143
+#: src/dialogs.c:4089
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "Kunne ikke �bne logfil %s."
 
-#: src/dialogs.c:4164
+#: src/dialogs.c:4110
 msgid "Date"
 msgstr "Dato"
 
-#: src/dialogs.c:4221
-msgid "Conversation"
-msgstr "Samtale"
-
-#: src/dialogs.c:4243
+#: src/dialogs.c:4167
+msgid "Log"
+msgstr "Log"
+
+#: src/dialogs.c:4189
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/dialogs.c:4302
+#: src/dialogs.c:4247
 msgid "Rename Group"
 msgstr "Omd�b gruppe"
 
-#: src/dialogs.c:4319
+#: src/dialogs.c:4264
 msgid "Please enter a new name for the selected group.\n"
 msgstr "Indtast et nyt navn for den valgte gruppe.\n"
 
-#: src/dialogs.c:4395 src/dialogs.c:4404
+#: src/dialogs.c:4340 src/dialogs.c:4349
 msgid "Rename Buddy"
 msgstr "Omd�b ven"
 
-#: src/dialogs.c:4411
+#: src/dialogs.c:4356
 msgid "New name:"
 msgstr "Nyt navn:"
 
-#: src/ft.c:130
+#: src/ft.c:131
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s er ikke et gyldigt filnavn.\n"
 
-#: src/ft.c:144
+#: src/ft.c:145
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s blev ikke fundet.\n"
 
-#: src/ft.c:738
+#: src/ft.c:739
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Filoverf�rsel til %s afbrudt.\n"
 
-#: src/ft.c:740
+#: src/ft.c:741
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Filoverf�rsel fra %s afbrudt.\n"
@@ -4273,175 +4409,175 @@
 "Afslut k�rende Gaim\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:50
+#: src/gaimrc.c:52
 msgid "sorry, i ran out for a while. bbl"
 msgstr "desv�rre, jeg er g�et ud et �jeblik, tilbage senere"
 
-#: src/gaimrc.c:292 src/gaimrc.c:325 src/gaimrc.c:1448
+#: src/gaimrc.c:294 src/gaimrc.c:327 src/gaimrc.c:1453
 msgid "boring default"
 msgstr "kedelig standard"
 
-#: src/gaimrc.c:1546
+#: src/gaimrc.c:1551
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunne ikke �bne ops�tningsfilen %s."
 
-#: src/gaimrc.c:1603
+#: src/gaimrc.c:1609
 msgid "Unable to Save Preferences"
 msgstr "Kunne ikke gemme indstillinger"
 
-#: src/gaimrc.c:1603
+#: src/gaimrc.c:1610
 msgid ""
-"Gaim was unable to save your preferences.  Please verify that you have "
-"enough free space."
+"Gaim was unable to save your preferences. Please verify that you have enough "
+"free space."
 msgstr ""
-"Gaim kunne ikke gemme dine indstillinger. S�rg for at, at der er nok fri "
+"Gaim kunne ikke gemme dine indstillinger. S�rg for at der er nok fri "
 "diskplads."
 
-#: src/gtkblist.c:382
-msgid "_Add a Buddy"
+#: src/gtkblist.c:392
+msgid "Add a _Buddy"
 msgstr "Tilf�j en _ven"
 
-#: src/gtkblist.c:383
+#: src/gtkblist.c:393
 msgid "Add a C_hat"
 msgstr "Tilf�j en _chat"
 
-#: src/gtkblist.c:384
+#: src/gtkblist.c:394
 msgid "_Delete Group"
 msgstr "_Slet gruppe"
 
-#: src/gtkblist.c:385
+#: src/gtkblist.c:395
 msgid "_Rename"
 msgstr "_Omd�b"
 
-#: src/gtkblist.c:387
+#: src/gtkblist.c:397
 msgid "_Join"
 msgstr "_Deltag"
 
-#: src/gtkblist.c:388 src/gtkblist.c:419
+#: src/gtkblist.c:398 src/gtkblist.c:429
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/gtkblist.c:389 src/gtkblist.c:420
+#: src/gtkblist.c:399 src/gtkblist.c:430
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/gtkblist.c:398
+#: src/gtkblist.c:408
 msgid "_Get Info"
 msgstr "Hent bru_geroplysninger"
 
-#: src/gtkblist.c:400
+#: src/gtkblist.c:410
 msgid "_IM"
 msgstr "Send _besked"
 
-#: src/gtkblist.c:401
+#: src/gtkblist.c:411
 msgid "Add Buddy _Pounce"
 msgstr "_Tilf�j handling"
 
-#: src/gtkblist.c:402
+#: src/gtkblist.c:412
 msgid "View _Log"
 msgstr "Vis _log"
 
 #. Buddies menu
-#: src/gtkblist.c:733
+#: src/gtkblist.c:743
 msgid "/_Buddies"
 msgstr "/_Venner"
 
-#: src/gtkblist.c:734
+#: src/gtkblist.c:744
 msgid "/Buddies/New _Instant Message..."
 msgstr "/Venner/Ny _besked..."
 
-#: src/gtkblist.c:735
+#: src/gtkblist.c:745
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Venner/_Deltag i chat..."
 
-#: src/gtkblist.c:736
+#: src/gtkblist.c:746
 msgid "/Buddies/Get _User Info..."
 msgstr "/Venner/_Hent brugeroplysninger..."
 
-#: src/gtkblist.c:738
-msgid "/Buddies/_Show Offline Buddies"
+#: src/gtkblist.c:748
+msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Venner/Vis _offline venner"
 
-#: src/gtkblist.c:739
+#: src/gtkblist.c:749
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Venner/Vis _tomme grupper"
 
-#: src/gtkblist.c:740
+#: src/gtkblist.c:750
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/Venner/Tilf�j en _ven..."
 
-#: src/gtkblist.c:741
+#: src/gtkblist.c:751
 msgid "/Buddies/Add a C_hat..."
 msgstr "/Venner/Tilf�j en _chat..."
 
-#: src/gtkblist.c:742
+#: src/gtkblist.c:752
 msgid "/Buddies/Add a _Group..."
 msgstr "/Venner/Tilf�j en _gruppe..."
 
-#: src/gtkblist.c:744
+#: src/gtkblist.c:754
 msgid "/Buddies/_Signoff"
 msgstr "/Venner/_Log af"
 
-#: src/gtkblist.c:745
+#: src/gtkblist.c:755
 msgid "/Buddies/_Quit"
 msgstr "/Venner/_Afslut"
 
 #. Tools
-#: src/gtkblist.c:748
+#: src/gtkblist.c:758
 msgid "/_Tools"
 msgstr "/V�rk_t�jer"
 
-#: src/gtkblist.c:749
+#: src/gtkblist.c:759
 msgid "/Tools/_Away"
 msgstr "/V�rkt�jer/Fr_av�rende"
 
-#: src/gtkblist.c:750
+#: src/gtkblist.c:760
 msgid "/Tools/Buddy _Pounce"
 msgstr "/V�rkt�jer/_Handling"
 
-#: src/gtkblist.c:751
+#: src/gtkblist.c:761
 msgid "/Tools/P_rotocol Actions"
 msgstr "/V�rkt�jer/P_rotokol handlinger"
 
-#: src/gtkblist.c:753
+#: src/gtkblist.c:763
 msgid "/Tools/A_ccounts..."
 msgstr "/V�rkt�jer/_Konti..."
 
-#: src/gtkblist.c:754
+#: src/gtkblist.c:764
 msgid "/Tools/_File Transfers..."
 msgstr "/V�rkt�jer/_Filoverf�rsler..."
 
-#: src/gtkblist.c:755
+#: src/gtkblist.c:765
 msgid "/Tools/Preferences..."
 msgstr "/V�rkt�jer/Indstillinger..."
 
-#: src/gtkblist.c:756
+#: src/gtkblist.c:766
 msgid "/Tools/Pr_ivacy..."
 msgstr "/V�rkt�jer/Pr_ivatliv..."
 
-#: src/gtkblist.c:758
+#: src/gtkblist.c:768
 msgid "/Tools/View System _Log..."
 msgstr "/V�rkt�jer/Vis system_log..."
 
 #. Help
-#: src/gtkblist.c:761
+#: src/gtkblist.c:771
 msgid "/_Help"
 msgstr "/_Hj�lp"
 
-#: src/gtkblist.c:762
+#: src/gtkblist.c:772
 msgid "/Help/Online _Help"
 msgstr "/Hj�lp/Online _hj�lp"
 
-#: src/gtkblist.c:763
+#: src/gtkblist.c:773
 msgid "/Help/_Debug Window..."
 msgstr "/Hj�lp/Vis _fejls�gningsvindue..."
 
-#: src/gtkblist.c:764
+#: src/gtkblist.c:774
 msgid "/Help/_About..."
 msgstr "/Hj�lp/_Om..."
 
-#: src/gtkblist.c:798
+#: src/gtkblist.c:808
 #, c-format
 msgid ""
 "\n"
@@ -4450,12 +4586,12 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:857
+#: src/gtkblist.c:867
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:871
+#: src/gtkblist.c:881
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4463,7 +4599,7 @@
 "\n"
 "<b>Konto:</b>"
 
-#: src/gtkblist.c:872
+#: src/gtkblist.c:882
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4471,7 +4607,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:873
+#: src/gtkblist.c:883
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4479,7 +4615,7 @@
 "\n"
 "<b>K�lenavn:</b>"
 
-#: src/gtkblist.c:874
+#: src/gtkblist.c:884
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4487,7 +4623,7 @@
 "\n"
 "<b>Inaktiv:</b>"
 
-#: src/gtkblist.c:875
+#: src/gtkblist.c:885
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4495,7 +4631,7 @@
 "\n"
 "<b>Advaret:</b>"
 
-#: src/gtkblist.c:877
+#: src/gtkblist.c:887
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -4503,99 +4639,119 @@
 "\n"
 "<b>Beskrivelse:</b> Skr�mmende"
 
-#: src/gtkblist.c:1169
+#: src/gtkblist.c:888
+msgid ""
+"\n"
+"<b>Status</b>: Awesome"
+msgstr ""
+"\n"
+"<b>Status</b>: Enest�ende"
+
+#: src/gtkblist.c:1180
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inaktiv (%dt%02dm)"
 
-#: src/gtkblist.c:1171
+#: src/gtkblist.c:1182
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inaktiv (%dm)"
 
-#: src/gtkblist.c:1175
+#: src/gtkblist.c:1186
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Advaret (%d%%)"
 
-#: src/gtkblist.c:1332 src/prefs.c:1787
+#: src/gtkblist.c:1323 src/gtkblist.c:1327
+msgid "None"
+msgstr "Ingen"
+
+#: src/gtkblist.c:1324
+msgid "Alphabetical"
+msgstr "Alfabetisk"
+
+#: src/gtkblist.c:1325
+msgid "By status"
+msgstr "Status"
+
+#: src/gtkblist.c:1326
+msgid "By log size"
+msgstr "Logst�rrelse"
+
+#: src/gtkblist.c:1352
 msgid "Buddy List"
 msgstr "Venneliste"
 
-#: src/gtkblist.c:1356
+#: src/gtkblist.c:1376
 msgid "/Tools/Away"
 msgstr "/V�rkt�jer/Frav�rende"
 
-#: src/gtkblist.c:1359
+#: src/gtkblist.c:1379
 msgid "/Tools/Buddy Pounce"
 msgstr "/V�rkt�jer/Handling"
 
-#: src/gtkblist.c:1362
+#: src/gtkblist.c:1382
 msgid "/Tools/Protocol Actions"
 msgstr "/V�rkt�jer/Protokol handlinger"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1442
+#: src/gtkblist.c:1465
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Venner/Vis _offline venner"
 
-#: src/gtkblist.c:1444
+#: src/gtkblist.c:1467
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Venner/Vis _tomme grupper"
 
-#: src/gtkblist.c:1462 src/gtkconv.c:765
+#: src/gtkblist.c:1485 src/gtkconv.c:766
 msgid "IM"
 msgstr "Besked"
 
-#: src/gtkblist.c:1468
+#: src/gtkblist.c:1491
 msgid "Send a message to the selected buddy"
 msgstr "Send en besked til den valgte ven"
 
-#: src/gtkblist.c:1471
-msgid "Get Info"
-msgstr "Hent info"
-
-#: src/gtkblist.c:1477
+#: src/gtkblist.c:1500
 msgid "Get information on the selected buddy"
 msgstr "Hent oplysninger om den valgte ven"
 
-#: src/gtkblist.c:1485
+#: src/gtkblist.c:1508
 msgid "Join a chat room"
 msgstr "Deltag i chatrum"
 
-#: src/gtkblist.c:1493
+#: src/gtkblist.c:1516
 msgid "Set an away message"
 msgstr "S�t en frav�rsbesked"
 
-#: src/gtkconv.c:218
+#: src/gtkconv.c:219
 msgid "Gaim - Insert Image"
 msgstr "Gaim - Inds�t billede"
 
-#: src/gtkconv.c:773
+#: src/gtkconv.c:774
 msgid "Un-Ignore"
 msgstr "Ignor�r ikke"
 
-#: src/gtkconv.c:775 src/prefs.c:541
+#: src/gtkconv.c:776
 msgid "Ignore"
 msgstr "Ignor�r"
 
 #. Info button
-#: src/gtkconv.c:784 src/gtkconv.c:2668
+#: src/gtkconv.c:785 src/gtkconv.c:2669
 msgid "Info"
 msgstr "Information"
 
-#: src/gtkconv.c:804 src/gtkconv.c:2651 src/gtkconv.c:3781
+#: src/gtkconv.c:805 src/gtkconv.c:2652 src/gtkconv.c:3780
 msgid "Remove"
 msgstr "Slet"
 
-#: src/gtkconv.c:878
+#: src/gtkconv.c:879
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Invit�r ven med i chat-rum"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:906
+#: src/gtkconv.c:907
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -4603,328 +4759,328 @@
 "Indtast navnet p� den bruger, du vil invitere, samt eventuelt en inviterings-"
 "besked."
 
-#: src/gtkconv.c:927
+#: src/gtkconv.c:928
 msgid "_Buddy:"
 msgstr "Ven:"
 
-#: src/gtkconv.c:947
+#: src/gtkconv.c:948
 msgid "_Message:"
 msgstr "Besked:"
 
-#: src/gtkconv.c:1976
+#: src/gtkconv.c:1977
 msgid "User is typing..."
 msgstr "Bruger skriver..."
 
-#: src/gtkconv.c:1984
+#: src/gtkconv.c:1985
 msgid "User has typed something and paused"
 msgstr "Bruger har skrevet noget, og stoppet"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2091
+#: src/gtkconv.c:2092
 msgid "_Send As"
 msgstr "S_end som"
 
 #. Conversation menu
-#: src/gtkconv.c:2541
+#: src/gtkconv.c:2542
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: src/gtkconv.c:2542
+#: src/gtkconv.c:2543
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/Gem _som..."
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2545
 msgid "/Conversation/View _Log..."
 msgstr "/Samtale/Vis _log..."
 
-#: src/gtkconv.c:2546
+#: src/gtkconv.c:2547
 msgid "/Conversation/Insert _URL..."
 msgstr "/Samtale/Inds�t _URL..."
 
-#: src/gtkconv.c:2548
+#: src/gtkconv.c:2549
 msgid "/Conversation/Insert _Image..."
 msgstr "/Samtale/Inds�t b_illede..."
 
-#: src/gtkconv.c:2551
+#: src/gtkconv.c:2552
 msgid "/Conversation/_Close"
 msgstr "/Samtale/Luk"
 
 #. Options
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2556
 msgid "/_Options"
 msgstr "/_Valgmuligheder"
 
-#: src/gtkconv.c:2556
+#: src/gtkconv.c:2557
 msgid "/Options/Enable _Logging"
 msgstr "/Valgmuligheder/Aktiver _logning"
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2558
 msgid "/Options/Enable _Sounds"
 msgstr "/Valgmuligheder/Brug lyde"
 
-#: src/gtkconv.c:2593
+#: src/gtkconv.c:2594
 msgid "/Conversation/View Log..."
 msgstr "/Samtale/Vis _log..."
 
-#: src/gtkconv.c:2595
+#: src/gtkconv.c:2596
 msgid "/Conversation/Insert URL..."
 msgstr "/Samtale/Inds�t _URL..."
 
-#: src/gtkconv.c:2597
+#: src/gtkconv.c:2598
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Inds�t b_illede..."
 
-#: src/gtkconv.c:2599
+#: src/gtkconv.c:2600
 msgid "/Options/Enable Logging"
 msgstr "/Valgmuligheder/Aktiver _logning"
 
-#: src/gtkconv.c:2601
+#: src/gtkconv.c:2602
 msgid "/Options/Enable Sounds"
 msgstr "/Valgmuligheder/Brug lyde"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2625 src/gtkconv.c:2627 src/gtkconv.c:2725 src/gtkconv.c:2727
-#: src/gtkconv.c:5019
+#: src/gtkconv.c:2626 src/gtkconv.c:2628 src/gtkconv.c:2726 src/gtkconv.c:2728
+#: src/gtkconv.c:5020
 msgid "Send"
 msgstr "Send"
 
-#: src/gtkconv.c:2648 src/gtkconv.c:3793
+#: src/gtkconv.c:2649 src/gtkconv.c:3792
 msgid "Add the user to your buddy list"
 msgstr "Tilf�j brugeren til din venneliste"
 
-#: src/gtkconv.c:2654 src/gtkconv.c:3784
+#: src/gtkconv.c:2655 src/gtkconv.c:3783
 msgid "Remove the user from your buddy list"
 msgstr "Fjern brugeren fra din venneliste"
 
 #. Warn button
-#: src/gtkconv.c:2661
+#: src/gtkconv.c:2662
 msgid "Warn"
 msgstr "Advar"
 
-#: src/gtkconv.c:2665
+#: src/gtkconv.c:2666
 msgid "Warn the user"
 msgstr "Advar brugeren"
 
-#: src/gtkconv.c:2672 src/gtkconv.c:3103
+#: src/gtkconv.c:2673 src/gtkconv.c:3104
 msgid "Get the user's information"
 msgstr "Hent brugerens oplysninger"
 
 #. Block button
-#: src/gtkconv.c:2675
+#: src/gtkconv.c:2676
 msgid "Block"
 msgstr "Ignor�r"
 
-#: src/gtkconv.c:2679
+#: src/gtkconv.c:2680
 msgid "Block the user"
 msgstr "Ignor�r brugeren"
 
 #. Invite
-#: src/gtkconv.c:2737 src/gtkconv.c:5022
+#: src/gtkconv.c:2738 src/gtkconv.c:5023
 msgid "Invite"
 msgstr "Invit�r"
 
-#: src/gtkconv.c:2740
+#: src/gtkconv.c:2741
 msgid "Invite a user"
 msgstr "Invit�r en bruger"
 
-#: src/gtkconv.c:2779
+#: src/gtkconv.c:2780
 msgid "Bold"
 msgstr "Fed"
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:2791
 msgid "Italic"
 msgstr "Kursiv"
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:2802
 msgid "Underline"
 msgstr "Understregning"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2818
 msgid "Larger font size"
 msgstr "St�rre skriftst�rrelse"
 
-#: src/gtkconv.c:2829
+#: src/gtkconv.c:2830
 msgid "Normal font size"
 msgstr "Normal skriftst�rrelse"
 
-#: src/gtkconv.c:2841
+#: src/gtkconv.c:2842
 msgid "Smaller font size"
 msgstr "Mindre skriftst�rrelse"
 
-#: src/gtkconv.c:2858
+#: src/gtkconv.c:2859
 msgid "Font Face"
 msgstr "Skrifttype"
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2871
 msgid "Foreground font color"
 msgstr "Forgrundsfarve"
 
-#: src/gtkconv.c:2882
+#: src/gtkconv.c:2883
 msgid "Background color"
 msgstr "Baggrundsfarve"
 
-#: src/gtkconv.c:2897
+#: src/gtkconv.c:2898
 msgid "Insert image"
 msgstr "Inds�t billede"
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2909
 msgid "Insert link"
 msgstr "Inds�t link"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2920
 msgid "Insert smiley"
 msgstr "Inds�t smiley"
 
-#: src/gtkconv.c:2976
+#: src/gtkconv.c:2977
 msgid "Topic:"
 msgstr "Emne:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3023
+#: src/gtkconv.c:3024
 msgid "0 people in room"
 msgstr "Ingen chattere i rummet"
 
-#: src/gtkconv.c:3080
+#: src/gtkconv.c:3081
 msgid "IM the user"
 msgstr "Send besked til bruger"
 
-#: src/gtkconv.c:3092
+#: src/gtkconv.c:3093
 msgid "Ignore the user"
 msgstr "Ignor�r brugeren"
 
-#: src/gtkconv.c:3623
+#: src/gtkconv.c:3621
 msgid "Close conversation"
 msgstr "Luk samtale"
 
-#: src/gtkconv.c:4225 src/gtkconv.c:4347
+#: src/gtkconv.c:4226 src/gtkconv.c:4348
 #, 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:4707
+#: src/gtkconv.c:4708
 msgid "Disable Animation"
 msgstr "Brug ikke animation"
 
-#: src/gtkconv.c:4716
+#: src/gtkconv.c:4717
 msgid "Enable Animation"
 msgstr "Brug animation"
 
-#: src/gtkconv.c:4723
+#: src/gtkconv.c:4724
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: src/gtkconv.c:4729
+#: src/gtkconv.c:4730
 msgid "Save Icon As..."
 msgstr "Gem ikon som..."
 
-#: src/gtkft.c:103
+#: src/gtkft.c:104
 msgid "Calculating..."
 msgstr "Udregner..."
 
-#: src/gtkft.c:106
+#: src/gtkft.c:107
 msgid "Unknown."
 msgstr "Ukendt."
 
-#: src/gtkft.c:143
+#: src/gtkft.c:144
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:218
+#: src/gtkft.c:219
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Modtager fra:</b>"
 
-#: src/gtkft.c:221
+#: src/gtkft.c:222
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sender til:</b>"
 
-#: src/gtkft.c:445
+#: src/gtkft.c:446
 msgid "Progress"
 msgstr "Fremgang"
 
-#: src/gtkft.c:452
+#: src/gtkft.c:453
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/gtkft.c:459
+#: src/gtkft.c:460
 msgid "Size"
 msgstr "St�rrelse"
 
-#: src/gtkft.c:466
+#: src/gtkft.c:467
 msgid "Remaining"
 msgstr "Tilbage"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:497
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: src/gtkft.c:497
+#: src/gtkft.c:498
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:498
+#: src/gtkft.c:499
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: src/gtkft.c:499
-msgid "Time Elapsed:"
-msgstr "Tid g�et:"
-
 #: src/gtkft.c:500
+msgid "Time Elapsed:"
+msgstr "Tid g�et:"
+
+#: src/gtkft.c:501
 msgid "Time Remaining:"
 msgstr "Tid tilbage:"
 
-#: src/gtkft.c:566
+#: src/gtkft.c:567
 msgid "File Transfers"
 msgstr "Filoverf�rsler"
 
-#: src/gtkft.c:595
+#: src/gtkft.c:596
 msgid "_Keep the dialog open"
 msgstr "Hold vinduet �bent"
 
-#: src/gtkft.c:605
+#: src/gtkft.c:606
 msgid "_Clear finished transfers"
 msgstr "Ryd afsluttede overf�rsler"
 
 #. "Download Details" arrow
-#: src/gtkft.c:614
+#: src/gtkft.c:615
 msgid "Show download details"
 msgstr "Vis download detaljer"
 
-#: src/gtkft.c:615
+#: src/gtkft.c:616
 msgid "Hide download details"
 msgstr "Skjul download detaljer"
 
 #. Pause button
-#: src/gtkft.c:657
+#: src/gtkft.c:658
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:667
+#: src/gtkft.c:668
 msgid "_Resume"
 msgstr "Genoptag"
 
-#: src/gtkft.c:1009
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr "Den fil eksisterer ikke."
 
-#: src/gtkft.c:1016
-msgid "Can not send a file of 0 bytes."
+#: src/gtkft.c:1018
+msgid "Cannot send a file of 0 bytes."
 msgstr "Kan ikke sende en tom fil."
 
-#: src/gtkft.c:1028
+#: src/gtkft.c:1030
 msgid "That file already exists. Would you like to overwrite it?"
 msgstr "Den fil eksisterer allerede. Vil du overskrive den?"
 
-#: src/gtkft.c:1054
+#: src/gtkft.c:1056
 msgid "Gaim - Open..."
 msgstr "Gaim - �bn..."
 
-#: src/gtkft.c:1103
+#: src/gtkft.c:1105
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vil sende dig %s (%s)"
@@ -4958,148 +5114,152 @@
 msgid "_Save Image..."
 msgstr "_Gem billede..."
 
-#: src/gtkpounce.c:121
+#: src/gtkpounce.c:122
 msgid "Select a file"
 msgstr "V�lg en fil"
 
-#: src/gtkpounce.c:170
+#: src/gtkpounce.c:172
 msgid "Please enter a buddy to pounce."
 msgstr "Indtast en ven."
 
-#: src/gtkpounce.c:342
+#: src/gtkpounce.c:344
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s er begyndt at skrive til dig"
 
-#: src/gtkpounce.c:343
+#: src/gtkpounce.c:345
 #, c-format
 msgid "%s has signed on"
 msgstr "%s er logget ind"
 
-#: src/gtkpounce.c:344
+#: src/gtkpounce.c:346
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s returnerede fra inaktivitet"
 
-#: src/gtkpounce.c:345
+#: src/gtkpounce.c:347
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s returnerede fra frav�r"
 
-#: src/gtkpounce.c:346
+#: src/gtkpounce.c:348
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s er stoppet med at skrive til dig"
 
-#: src/gtkpounce.c:347
+#: src/gtkpounce.c:349
 #, c-format
 msgid "%s has signed off"
 msgstr "%s er logget ud"
 
-#: src/gtkpounce.c:348
+#: src/gtkpounce.c:350
 #, c-format
 msgid "%s has become idle"
 msgstr "%s blev inaktiv"
 
-#: src/gtkpounce.c:349
+#: src/gtkpounce.c:351
 #, c-format
 msgid "%s has gone away."
 msgstr "%s er nu frav�rende."
 
-#: src/gtkpounce.c:350
+#: src/gtkpounce.c:352
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukendt handling. Venligst rapport�r dette!"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:493 src/gtkpounce.c:883
+#: src/gtkpounce.c:495 src/gtkpounce.c:885
 msgid "New Buddy Pounce"
 msgstr "Tilf�j handling"
 
-#: src/gtkpounce.c:493
+#: src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "_Redig�r handling"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:513
 msgid "Pounce Who"
 msgstr "Hvem"
 
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:535
 msgid "_Buddy Name:"
 msgstr "_Ven:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:554
 msgid "Pounce When"
 msgstr "Hvorn�r"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:562
 msgid "Sign on"
 msgstr "Log p�"
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:564
 msgid "Sign off"
 msgstr "Log af"
 
-#: src/gtkpounce.c:566
+#: src/gtkpounce.c:568
 msgid "Return from away"
 msgstr "Returner fra frav�r"
 
-#: src/gtkpounce.c:570
+#: src/gtkpounce.c:572
 msgid "Return from idle"
 msgstr "Returner fra inaktivitet"
 
-#: src/gtkpounce.c:572
+#: src/gtkpounce.c:574
 msgid "Buddy starts typing"
 msgstr "Ven starter med at skrive"
 
-#: src/gtkpounce.c:574
+#: src/gtkpounce.c:576
 msgid "Buddy stops typing"
 msgstr "Ven stopper med at skrive"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:603
+#: src/gtkpounce.c:605
 msgid "Pounce Action"
 msgstr "Handling"
 
-#: src/gtkpounce.c:610
+#: src/gtkpounce.c:612
 msgid "Open an IM window"
 msgstr "�bn i besked-vindue"
 
-#: src/gtkpounce.c:611
-msgid "Popup notification"
-msgstr "Popup-p�mindelse"
-
-#: src/gtkpounce.c:612
-msgid "Send a message"
-msgstr "Send en besked"
-
 #: src/gtkpounce.c:613
+msgid "Popup notification"
+msgstr "Popup-p�mindelse"
+
+#: src/gtkpounce.c:614
+msgid "Send a message"
+msgstr "Send en besked"
+
+#: src/gtkpounce.c:615
 msgid "Execute a command"
 msgstr "K�r en kommando"
 
-#: src/gtkpounce.c:614
+#: src/gtkpounce.c:616
 msgid "Play a sound"
 msgstr "Afspil en lyd"
 
-#: src/gtkpounce.c:618 src/gtkpounce.c:620 src/multi.c:678
+#: src/gtkpounce.c:620 src/gtkpounce.c:622 src/multi.c:714
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/gtkpounce.c:621 src/prefs.c:1614
+#: src/gtkpounce.c:623
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkpounce.c:704
+#: src/gtkpounce.c:706
 msgid "_Save this pounce after activation"
 msgstr "Gem denne handling efter aktivering"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:890
+#: src/gtkpounce.c:892
 msgid "Remove Buddy Pounce"
 msgstr "Fjern handling"
 
-#: src/gtkutils.c:318
+#: src/gtkutils.c:284
+msgid "Can't save icon file to disk."
+msgstr "Kan ikke gemme ikonfil til disken."
+
+#: src/gtkutils.c:319
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Gem ikon"
 
@@ -5107,251 +5267,251 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fejl ved oprettelse af forbindelse\n"
 
-#: src/log.c:118
+#: src/log.c:119
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Gem samtale"
 
-#: src/log.c:159 src/log.c:180 src/log.c:193
+#: src/log.c:160 src/log.c:181 src/log.c:194
 #, c-format
 msgid "Unable to make directory %s for logging"
 msgstr "Kunne ikke oprette mappe %s til logning"
 
-#: src/log.c:247 src/log.c:263
+#: src/log.c:248 src/log.c:264
 #, c-format
 msgid "IM Sessions with %s\n"
 msgstr "Besked-sessioner med %s\n"
 
-#: src/log.c:250 src/log.c:266
+#: src/log.c:251 src/log.c:267
 #, c-format
 msgid "IM Sessions with %s"
 msgstr "Besked-sessioner med %s"
 
-#: src/log.c:297
+#: src/log.c:298
 #, c-format
 msgid "+++ %s (%s) signed on @ %s"
 msgstr "+++ %s (%s) loggede p� @ %s"
 
-#: src/log.c:302
+#: src/log.c:303
 #, c-format
 msgid "+++ %s (%s) signed off @ %s"
 msgstr "+++ %s (%s) loggede af @ %s"
 
-#: src/log.c:307
+#: src/log.c:308
 #, c-format
 msgid "+++ %s (%s) changed away state @ %s"
 msgstr "+++ %s (%s) �ndrede frav�rsstatus @ %s"
 
-#: src/log.c:312
+#: src/log.c:313
 #, c-format
 msgid "+++ %s (%s) came back @ %s"
 msgstr "+++ %s (%s) kom tilbage @ %s"
 
-#: src/log.c:317
+#: src/log.c:318
 #, c-format
 msgid "+++ %s (%s) became idle @ %s"
 msgstr "+++ %s (%s) blev inaktiv @ %s"
 
-#: src/log.c:322
+#: src/log.c:323
 #, c-format
 msgid "+++ %s (%s) returned from idle @ %s"
 msgstr "+++ %s (%s) returnerede fra inaktivitet @ %s"
 
-#: src/log.c:327
+#: src/log.c:328
 #, c-format
 msgid "+++ Program exit @ %s"
 msgstr "+++ Program afslutning @ %s"
 
-#: src/log.c:334
+#: src/log.c:335
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed on @ %s"
 msgstr "%s (%s) rapporterede at %s (%s) loggede p� @ %s"
 
-#: src/log.c:339
+#: src/log.c:340
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed off @ %s"
 msgstr "%s (%s) rapporterede at %s (%s) loggede af @ %s"
 
-#: src/log.c:344
+#: src/log.c:345
 #, c-format
 msgid "%s (%s) reported that %s (%s) went away @ %s"
 msgstr "%s (%s) rapporterede at %s (%s) blev frav�rende @ %s"
 
-#: src/log.c:349
+#: src/log.c:350
 #, c-format
 msgid "%s (%s) reported that %s (%s) came back @ %s"
 msgstr "%s (%s) rapporterede at %s (%s) kom tilbage @ %s"
 
-#: src/log.c:354
+#: src/log.c:355
 #, c-format
 msgid "%s (%s) reported that %s (%s) became idle @ %s"
 msgstr "%s (%s) rapporterede at %s (%s) blev inaktiv @ %s"
 
-#: src/log.c:360
+#: src/log.c:361
 #, c-format
 msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
 msgstr "%s (%s) rapporterede at %s (%s) returnede fra inaktivitet @ %s"
 
-#: src/log.c:372
+#: src/log.c:373
 #, c-format
 msgid "%s (%s) reported that %s signed on @ %s"
 msgstr "%s (%s) rapporterede at %s loggede p� @ %s"
 
-#: src/log.c:377
+#: src/log.c:378
 #, c-format
 msgid "%s (%s) reported that %s signed off @ %s"
 msgstr "%s (%s) rapporterede at %s loggede af @ %s"
 
-#: src/log.c:382
+#: src/log.c:383
 #, c-format
 msgid "%s (%s) reported that %s went away @ %s"
 msgstr "%s (%s) rapporterede at %s blev frav�rende @ %s"
 
-#: src/log.c:387
+#: src/log.c:388
 #, c-format
 msgid "%s (%s) reported that %s came back @ %s"
 msgstr "%s (%s) rapporterede at %s kom tilbage @ %s"
 
-#: src/log.c:392
+#: src/log.c:393
 #, c-format
 msgid "%s (%s) reported that %s became idle @ %s"
 msgstr "%s (%s) rapporterede at %s blev inaktiv @ %s"
 
-#: src/log.c:398
+#: src/log.c:399
 #, c-format
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) rapporterede at %s returnerede fra inaktivitet @ %s"
 
-#: src/main.c:181
+#: src/main.c:184
 msgid "Please enter your login."
 msgstr "Indtast dit brugernavn."
 
-#: src/main.c:270
+#: src/main.c:273
 msgid "<New User>"
 msgstr "<Ny bruger>"
 
-#: src/main.c:312
+#: src/main.c:315
 msgid "Login"
-msgstr "Logind"
-
-#: src/main.c:328
+msgstr "Log ind"
+
+#: src/main.c:331
 msgid "Screen Name:"
 msgstr "Brugernavn:"
 
 #. And now for the buttons
-#: src/main.c:362
+#: src/main.c:365
 msgid "Accounts"
 msgstr "Konti"
 
-#: src/main.c:372 src/prefs.c:1854 src/win32/systray.c:294
+#: src/main.c:375 src/win32/systray.c:355
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: src/main.c:378 src/win32/systray.c:146
+#: src/main.c:381 src/win32/systray.c:191
 msgid "Sign On"
 msgstr "Log p�"
 
-#: src/multi.c:264
+#: src/multi.c:265
 msgid "Screenname"
 msgstr "Brugernavn"
 
-#: src/multi.c:292
+#: src/multi.c:293
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/multi.c:621
+#: src/multi.c:657
 msgid "Load Buddy Icon"
 msgstr "Hent venneikon"
 
-#: src/multi.c:665
+#: src/multi.c:701
 msgid "Buddy Icon File:"
 msgstr "Ikonfil:"
 
-#: src/multi.c:684 src/prefs.c:1618
+#: src/multi.c:720
 msgid "Reset"
 msgstr "Nulstil"
 
-#: src/multi.c:711
+#: src/multi.c:747
 msgid "Login Options"
 msgstr "Logind-indstillinger"
 
-#: src/multi.c:723
+#: src/multi.c:759
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/multi.c:738
+#: src/multi.c:774
 msgid "Screenname:"
 msgstr "Brugernavn:"
 
-#: src/multi.c:793
+#: src/multi.c:829
 msgid "Remember Password"
 msgstr "Husk adgangskode"
 
-#: src/multi.c:794
+#: src/multi.c:830
 msgid "Auto-Login"
 msgstr "Auto-logind"
 
-#: src/multi.c:851
+#: src/multi.c:887
 msgid "User Options"
 msgstr "Bruger indstillinger"
 
-#: src/multi.c:861
+#: src/multi.c:897
 msgid "New Mail Notifications"
 msgstr "P�mindelser om ny post"
 
-#: src/multi.c:922
+#: src/multi.c:958
 #, c-format
 msgid "%s Options"
 msgstr "%s valgmuligheder"
 
-#: src/multi.c:966
+#: src/multi.c:1002
 msgid "Register with server"
 msgstr "Registr�r p� server"
 
-#: src/multi.c:999
+#: src/multi.c:1035
 msgid "Proxy Options"
 msgstr "Mellemv�rt indstillinger"
 
-#: src/multi.c:1013
+#: src/multi.c:1049
 msgid "Proxy _Type"
 msgstr "Mellemv�rts_type"
 
-#: src/multi.c:1022
+#: src/multi.c:1058
 msgid "Use Global Proxy Settings"
 msgstr "Brug globale mellemv�rt indstillinger"
 
-#: src/multi.c:1031
+#: src/multi.c:1067
 msgid "No Proxy"
 msgstr "Ingen mellemv�rt"
 
-#: src/multi.c:1083
-msgid "_Host:"
-msgstr "V�rtsnavn:"
-
 #: src/multi.c:1119
+msgid "_Host:"
+msgstr "V�rtsnavn:"
+
+#: src/multi.c:1155
 msgid "_User:"
 msgstr "Br_uger:"
 
-#: src/multi.c:1135
+#: src/multi.c:1171
 msgid "Pa_ssword:"
 msgstr "Adgang_skode:"
 
-#: src/multi.c:1208
+#: src/multi.c:1245
 msgid "Modify Account"
 msgstr "Ret konto"
 
-#: src/multi.c:1227
+#: src/multi.c:1264
 msgid "Show more options"
 msgstr "Vis flere indstillinger"
 
-#: src/multi.c:1227
+#: src/multi.c:1264
 msgid "Show fewer options"
 msgstr "Vis f�rre indstillinger"
 
-#: src/multi.c:1338
+#: src/multi.c:1375
 msgid "_Login"
 msgstr "_Logind"
 
-#: src/multi.c:1356
+#: src/multi.c:1393
 #, c-format
 msgid ""
 "Please enter your password for %s.\n"
@@ -5360,30 +5520,30 @@
 "Indtast din adgangskode for %s.\n"
 "\n"
 
-#: src/multi.c:1367
+#: src/multi.c:1404
 msgid "_Password"
 msgstr "Adgang_skode"
 
-#: src/multi.c:1418
+#: src/multi.c:1456
 msgid "TOC not found."
 msgstr "TOC ikke fundet."
 
-#: src/multi.c:1419
+#: src/multi.c:1457
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
-"default.  To login, edit this account to use OSCAR or load the TOC plugin."
+"default. To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
-"DU har fors�gt at logge p� en konto ved hj�lp af TOC protokollen. Fordi "
+"Du har fors�gt at logge p� en konto ved hj�lp af TOC protokollen. Fordi "
 "denne protokol er inferi�r til OSCAR, er det nu kompileret som et "
 "udvidelsesmodul som standard. For at logge ind, s� redig�r denne konto til "
 "at bruge OSCAR eller indl�s TOC udvidelsesmodulet."
 
-#: src/multi.c:1425
+#: src/multi.c:1465
 msgid "Protocol not found."
 msgstr "Protokol ikke fundet."
 
-#: src/multi.c:1426
+#: src/multi.c:1466
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -5391,40 +5551,40 @@
 "Du kan ikke logge ind med denne konto, da du ikke har indl�st den protokol, "
 "der skal bruges eller ogs� har denne protokol ingen logind-funktion."
 
-#: src/multi.c:1505
+#: src/multi.c:1546
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker p� at du vil slette %s?"
 
-#: src/multi.c:1506
+#: src/multi.c:1547
 msgid "Delete"
 msgstr "Slet"
 
-#: src/multi.c:1535
+#: src/multi.c:1576
 msgid "Account Editor"
 msgstr "Ret konto"
 
-#: src/multi.c:1574
+#: src/multi.c:1615
 msgid "_Modify"
 msgstr "Ret"
 
-#: src/multi.c:1624
+#: src/multi.c:1665
 msgid "Done."
 msgstr "F�rdig."
 
-#: src/multi.c:1860
+#: src/multi.c:1901
 msgid "Signon: "
 msgstr "Tilsluttet: "
 
-#: src/multi.c:1919
+#: src/multi.c:1960
 msgid "Signon"
 msgstr "Tilslut"
 
-#: src/multi.c:1931
+#: src/multi.c:1972
 msgid "Cancel All"
 msgstr "Annull�r alle"
 
-#: src/multi.c:1986
+#: src/multi.c:2027
 #, c-format
 msgid ""
 "%s\n"
@@ -5433,733 +5593,71 @@
 "%s\n"
 "%s: %s"
 
-#: src/multi.c:2008
+#: src/multi.c:2048
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s kunne ikke logge ind"
 
-#: src/multi.c:2009
+#: src/multi.c:2049
 msgid "Signon Error"
 msgstr "Logind-fejl"
 
-#: src/multi.c:2020
+#: src/multi.c:2060
 msgid "Notice"
 msgstr "Bem�rk!"
 
-#: src/multi.c:2032
+#: src/multi.c:2072
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s er logget ud"
 
-#: src/multi.c:2033
+#: src/multi.c:2073
 msgid "Connection Error"
 msgstr "Forbindelsesfejl"
 
-#: src/prefs.c:205
-msgid "Interface Options"
-msgstr "Gr�nseflade indstillinger"
-
-#: src/prefs.c:207
-msgid "D_isplay remote nicknames if no alias is set"
-msgstr "V_is navne fra serveren hvis intet alias er sat"
-
-#: src/prefs.c:388
-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 ""
-"V�lg et smiley-tema som du gerne vil bruge fra listen forneden. Nye temaer "
-"kan installeres ved at tr�k-og-slippe dem ind i tema listen."
-
-#: src/prefs.c:421
-msgid "Icon"
-msgstr "Ikon"
-
-#: src/prefs.c:455
-msgid "Style"
-msgstr "Stil"
-
-#: src/prefs.c:456
-msgid "_Bold"
-msgstr "Fed"
-
-#: src/prefs.c:457
-msgid "_Italics"
-msgstr "Kurs_iv"
-
-#: src/prefs.c:458
-msgid "_Underline"
-msgstr "_Understregning"
-
-#: src/prefs.c:459
-msgid "_Strikethrough"
-msgstr "Gennem_streget tekst"
-
-#: src/prefs.c:461
-msgid "Face"
-msgstr "Skrifttype"
-
-#: src/prefs.c:464
-msgid "Use custo_m face"
-msgstr "Brugerdefineret skrifttype"
-
-#: src/prefs.c:478
-msgid "Use custom si_ze"
-msgstr "Brugerdefineret st�rrelse"
-
-#: src/prefs.c:486
-msgid "Color"
-msgstr "Farve"
-
-#: src/prefs.c:491
-msgid "_Text color"
-msgstr "_Tekstfarve"
-
-#: src/prefs.c:508
-msgid "Bac_kground color"
-msgstr "Baggrundsfarve"
-
-#: src/prefs.c:534 src/prefs.c:676 src/prefs.c:717
-msgid "Display"
-msgstr "Visning"
-
-#: src/prefs.c:535
-msgid "Show graphical _smileys"
-msgstr "Vis grafiske hum�ran_sigter"
-
-#: src/prefs.c:536
-msgid "Show _timestamp on messages"
-msgstr "Vis tidsstempel i beskeder"
-
-#: src/prefs.c:537
-msgid "Show _URLs as links"
-msgstr "Vis _URLer som henvisninger"
-
-#: src/prefs.c:539
-msgid "_Highlight misspelled words"
-msgstr "Frem_h�v forkert stavede ord"
-
-#: src/prefs.c:542
-msgid "Ignore c_olors"
-msgstr "Ign_or�r farver"
-
-#: src/prefs.c:543
-msgid "Ignore font _faces"
-msgstr "Ignor�r skrifttyper"
-
-#: src/prefs.c:544
-msgid "Ignore font si_zes"
-msgstr "Ignor�r skriftst�rrelser"
-
-#: src/prefs.c:556
-msgid "Send Message"
-msgstr "Send besked"
-
-#: src/prefs.c:557
-msgid "_Enter sends message"
-msgstr "_Enter sender besked"
-
-#: src/prefs.c:558
-msgid "C_ontrol-Enter sends message"
-msgstr "C_ontrol-Enter sender besked"
-
-#: src/prefs.c:560
-msgid "Window Closing"
-msgstr "Vindue lukker"
-
-#: src/prefs.c:561
-msgid "E_scape closes window"
-msgstr "E_scape lukker vindue"
-
-#: src/prefs.c:562
-msgid "Control-_W closes window"
-msgstr "Control-_W lukker vindue"
-
-#: src/prefs.c:565
-msgid "Control-{B/I/U/S} inserts _HTML tags"
-msgstr "Control-{B/I/U/S} inds�tter HTML-koder"
-
-#: src/prefs.c:566
-msgid "Control-(number) inserts _smileys"
-msgstr "Control-(tal) inds�tter hum�ran_sigt"
-
-#: src/prefs.c:579
-msgid "Buddy List Toolbar"
-msgstr "Venneliste v�rkt�jslinje"
-
-#: src/prefs.c:580 src/prefs.c:659 src/prefs.c:702
-msgid "Show _buttons as:"
-msgstr "Vis knapper som:"
-
-#: src/prefs.c:581 src/prefs.c:660 src/prefs.c:703
-msgid "Pictures"
-msgstr "Billeder"
-
-#: src/prefs.c:582 src/prefs.c:661 src/prefs.c:704
-msgid "Text"
-msgstr "Tekst"
-
-#: src/prefs.c:583 src/prefs.c:662 src/prefs.c:705
-msgid "Pictures and text"
-msgstr "Billeder og tekst"
-
-#: src/prefs.c:584 src/prefs.c:1090
-msgid "None"
-msgstr "Ingen"
-
-#: src/prefs.c:587
-msgid "_Raise window on events"
-msgstr "Send vindue til fo_rgrunden ved aktivitet"
-
-#: src/prefs.c:589
-msgid "Group Display"
-msgstr "Gruppevisning"
-
-#. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#: src/prefs.c:591
-msgid "Show _numbers in groups"
-msgstr "Vis _tal i grupper"
-
-#: src/prefs.c:593
-msgid "Buddy Display"
-msgstr "Visning af venner"
-
-#: src/prefs.c:594
-msgid "Show buddy _icons"
-msgstr "Vis venne _ikoner"
-
-#: src/prefs.c:595
-msgid "Show _warning levels"
-msgstr "Vis advarselsniveauer"
-
-#: src/prefs.c:600
-msgid "Show idle _times"
-msgstr "Vis inaktiv _tid"
-
-#: src/prefs.c:605
-msgid "Dim i_dle buddies"
-msgstr "Vis inaktive venner me_d gr� farve"
-
-#: src/prefs.c:623 src/prefs.c:1788
-msgid "Conversations"
-msgstr "Samtaler"
-
-#: src/prefs.c:631
-msgid "_Placement:"
-msgstr "_Placering:"
-
-#: src/prefs.c:639
-msgid "Show IMs and chats in _same tabbed window."
-msgstr "Vis beskeder og chats i samme faneblads-vindue."
-
-#: src/prefs.c:658 src/prefs.c:701
-msgid "Window"
-msgstr "Vindue"
-
-#: src/prefs.c:665 src/prefs.c:708
-msgid "New window _width:"
-msgstr "Bredde i punkter:"
-
-#: src/prefs.c:666 src/prefs.c:709
-msgid "New window _height:"
-msgstr "H�jde i punkter:"
-
-#: src/prefs.c:667 src/prefs.c:710
-msgid "_Entry field height:"
-msgstr "H�jd_e p� skrivefeltet:"
-
-#: src/prefs.c:668 src/prefs.c:711
-msgid "_Raise windows on events"
-msgstr "Send vindue til forgrunden ved aktivitet"
-
-#: src/prefs.c:669
-msgid "Hide window on _send"
-msgstr "Luk vindue n�r besked er _sendt"
-
-#: src/prefs.c:672
-msgid "Buddy Icons"
-msgstr "Ikoner/knapper"
-
-#: src/prefs.c:673
-msgid "Hide buddy _icons"
-msgstr "Skjul venne_ikoner"
-
-#: src/prefs.c:674
-msgid "Disable buddy icon a_nimation"
-msgstr "A_nim�r ikke venneikoner"
-
-#: src/prefs.c:677
-msgid "Show _logins in window"
-msgstr "Besked n�r venner _logger ind/ud"
-
-#: src/prefs.c:678
-msgid "Show a_liases in tabs/titles"
-msgstr "Vis a_liaser i faneblade/titler"
-
-#: src/prefs.c:680
-msgid "Typing Notification"
-msgstr "Skrive-p�mindelse"
-
-#: src/prefs.c:681
-msgid "Notify buddies that you are _typing to them"
-msgstr "Vis venner at du er ved at skrive _til dem"
-
-#: src/prefs.c:713
-msgid "Tab Completion"
-msgstr "Autofuldf�relse"
-
-#: src/prefs.c:714
-msgid "_Tab-complete nicks"
-msgstr "Autofuldf�r navne ved tryk p� _TAB"
-
-#: src/prefs.c:715
-msgid "_Old-style tab completion"
-msgstr "TAB som i gamle Gaim-versioner"
-
-#: src/prefs.c:718
-msgid "_Show people joining/leaving in window"
-msgstr "Vis n�r nogen logger ind eller ud "
-
-#: src/prefs.c:719
-msgid "Co_lorize screennames"
-msgstr "Farveg�r brugernavne"
-
-#: src/prefs.c:736
-msgid "IM Tabs"
-msgstr "Besked faneblade"
-
-#: src/prefs.c:737 src/prefs.c:747
-msgid "Tab _placement:"
-msgstr "_Placering af faneblade:"
-
-#: src/prefs.c:738 src/prefs.c:748
-msgid "Top"
-msgstr "I toppen"
-
-#: src/prefs.c:739 src/prefs.c:749
-msgid "Bottom"
-msgstr "I bunden"
-
-#: src/prefs.c:740 src/prefs.c:750
-msgid "Left"
-msgstr "Til venstre"
-
-#: src/prefs.c:741 src/prefs.c:751
-msgid "Right"
-msgstr "Til h�jre"
-
-#: src/prefs.c:743
-msgid ""
-"Show all _instant messages in one tabbed\n"
-"window"
-msgstr ""
-"Vis alle beskeder i et faneblads\n"
-"-vindue"
-
-#: src/prefs.c:746
-msgid "Chat Tabs"
-msgstr "Chat faneblade"
-
-#: src/prefs.c:753
-msgid "Show all c_hats in one tabbed window"
-msgstr "Vis hver c_hat som faneblad i et vindue"
-
-#: src/prefs.c:756
-msgid "Tab Options"
-msgstr "Faneblad indstillinger"
-
-#: src/prefs.c:757
-msgid "Show _close button on tabs."
-msgstr "Vis luk knapper p� faneblade."
-
-#: src/prefs.c:777
-msgid "Proxy Type"
-msgstr "Mellemv�rtstype"
-
-#: src/prefs.c:778
-msgid "Proxy _type:"
-msgstr "Mellemv�rts_type:"
-
-#: src/prefs.c:779
-msgid "No proxy"
-msgstr "Ingen mellemv�rt"
-
-#: src/prefs.c:784
-msgid "Proxy Server"
-msgstr "Mellemv�rt"
-
-#: src/prefs.c:797
-msgid "_Host"
-msgstr "V�rtsnavn"
-
-#: src/prefs.c:811
-msgid "Port"
-msgstr "Port"
-
-#: src/prefs.c:827
-msgid "_User"
-msgstr "Br_uger"
-
-#: src/prefs.c:841
-msgid "Pa_ssword"
-msgstr "Adgang_skode"
-
-#: src/prefs.c:862
-#, c-format
-msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-msgstr "Den indtastede browser '%s' er ikke gyldig. Links vil ikke virke."
-
-#: src/prefs.c:883
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/prefs.c:884
-msgid "Opera"
-msgstr "Opera"
-
-#: src/prefs.c:885
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/prefs.c:886
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:887
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/prefs.c:895
-msgid "Manual"
-msgstr "Andet program"
-
-#: src/prefs.c:919
-msgid "Browser Selection"
-msgstr "Browservalg"
-
-#: src/prefs.c:923
-msgid "_Browser"
-msgstr "_Browser"
-
-#: src/prefs.c:931
-msgid "_Manual: "
-msgstr "_Manuelt: "
-
-#: src/prefs.c:946
-msgid "Browser Options"
-msgstr "Browserindstillinger"
-
-#: src/prefs.c:947
-msgid "Open new _window by default"
-msgstr "�bn nyt vindue som standard"
-
-#: src/prefs.c:961
-msgid "Message Logs"
-msgstr "Besked-logning"
-
-#: src/prefs.c:962
-msgid "_Log all instant messages"
-msgstr "_Log alle samtaler"
-
-#: src/prefs.c:963
-msgid "Log all c_hats"
-msgstr "Gem alle samtaler"
-
-#: src/prefs.c:964
-msgid "Strip _HTML from logs"
-msgstr "Fjern _HTML-koder i logfilen"
-
-#: src/prefs.c:966
-msgid "System Logs"
-msgstr "System-logning"
-
-#: src/prefs.c:967
-msgid "Log when buddies _sign on/sign off"
-msgstr "Registr�r at venner logger ind/ud"
-
-#: src/prefs.c:969
-msgid "Log when buddies become _idle/un-idle"
-msgstr "Registr�r at venner bliver aktive/inaktive"
-
-#: src/prefs.c:971
-msgid "Log when buddies go away/come _back"
-msgstr "Registr�r venners frav�r/genkomst"
-
-#: src/prefs.c:972
-msgid "Log your _own signons/idleness/awayness"
-msgstr "Registr�r eget logind/inaktivitet/frav�r"
-
-#: src/prefs.c:974
-msgid "I_ndividual log file for each buddy's signons"
-msgstr "Separat logfil for hver ven der logger p�"
-
-#: src/prefs.c:1007
-msgid "Sound Options"
-msgstr "Lydindstillinger"
-
-#: src/prefs.c:1008
-msgid "_No sounds when you log in"
-msgstr "I_ngen lyde, n�r du logger ind"
-
-#: src/prefs.c:1009
-msgid "_Sounds while away"
-msgstr "Afspil lyde under frav�r"
-
-#: src/prefs.c:1012
-msgid "Sound Method"
-msgstr "Lyd metode"
-
-#: src/prefs.c:1013
-msgid "_Method"
-msgstr "_Metode"
-
-#: src/prefs.c:1016
-msgid "Console beep"
-msgstr "Konsolbip"
-
-#: src/prefs.c:1018
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: src/prefs.c:1025
-msgid "Command"
-msgstr "Kommando"
-
-#: src/prefs.c:1034
-#, c-format
-msgid ""
-"Sound c_ommand\n"
-"(%s for filename)"
-msgstr ""
-"Lyd k_ommando\n"
-"(%s for filnavn)"
-
-#: src/prefs.c:1073
-msgid "_Sending messages removes away status"
-msgstr "Beskedaf_sendelse oph�ver frav�rsstatus"
-
-#: src/prefs.c:1074
-msgid "_Queue new messages when away"
-msgstr "S�t nye beskeder i k� under frav�r"
-
-#: src/prefs.c:1076
-msgid "Auto-response"
-msgstr "Automatisk svar"
-
-#: src/prefs.c:1079
-msgid "Seconds before _resending:"
-msgstr "Sekunde_r f�r der skal sendes igen:"
-
-#: src/prefs.c:1081
-msgid "_Don't send auto-response"
-msgstr "Send ikke automatisk svar"
-
-#: src/prefs.c:1082
-msgid "_Only send auto-response when idle"
-msgstr "Send kun automatisk svar, n�r frav�rende"
-
-#: src/prefs.c:1083
-msgid "Do_n't send auto-response in active conversations"
-msgstr "Send ikke automatisk svar i aktive samtaler"
-
-#: src/prefs.c:1089
-msgid "Idle _time reporting:"
-msgstr "M�ling af inaktiv _tid:"
-
-#: src/prefs.c:1091
-msgid "Gaim usage"
-msgstr "Brug af Gaim"
-
-#: src/prefs.c:1094
-msgid "X usage"
-msgstr "Brug af X"
-
-#: src/prefs.c:1096
-msgid "Windows usage"
-msgstr "Vindue brug"
-
-#: src/prefs.c:1103
-msgid "Auto-away"
-msgstr "Automatisk frav�rende"
-
-#: src/prefs.c:1104
-msgid "Set away _when idle"
-msgstr "S�t som frav�rende ved inaktivitet"
-
-#: src/prefs.c:1105
-msgid "_Minutes before setting away:"
-msgstr "_Minutter f�r du s�ttes frav�rende:"
-
-#: src/prefs.c:1111
-msgid "Away m_essage:"
-msgstr "Frav�rsb_esked:"
-
-#: src/prefs.c:1166
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Skrevet af:</span>\t%s\n"
-"<span weight=\"bold\">Webside:</span>\t%s\n"
-"<span weight=\"bold\">Filnavn:</span>\t%s"
-
-#: src/prefs.c:1171
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">File name:</span>  %s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Skrevet af:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">Filnavn:</span>  %s"
-
-#: src/prefs.c:1345
-msgid "Load"
-msgstr "Indl�s"
-
-#: src/prefs.c:1352
-msgid "Name"
-msgstr "Navn"
-
-#: src/prefs.c:1399
-msgid "Details"
-msgstr "Detaljer"
-
-#: src/prefs.c:1498
-msgid "Sound Selection"
-msgstr "Lydvalg"
-
-#: src/prefs.c:1591
-msgid "Play"
-msgstr "Afspil"
-
-#: src/prefs.c:1598
-msgid "Event"
-msgstr "Begivenhed"
-
-#: src/prefs.c:1622
-msgid "Choose..."
-msgstr "V�lg..."
-
-#: src/prefs.c:1746
-msgid "_Edit"
-msgstr "Ret"
-
-#: src/prefs.c:1782
-msgid "Interface"
-msgstr "Gr�nseflade"
-
-#: src/prefs.c:1783
-msgid "Smiley Themes"
-msgstr "Smiley-temaer"
-
-#: src/prefs.c:1784
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: src/prefs.c:1785
-msgid "Message Text"
-msgstr "Beskedtekst"
-
-#: src/prefs.c:1786
-msgid "Shortcuts"
-msgstr "Genveje"
-
-#: src/prefs.c:1789
-msgid "IMs"
-msgstr "Beskeder"
-
-#: src/prefs.c:1791
-msgid "Tabs"
-msgstr "Faneblade"
-
-#: src/prefs.c:1792
-msgid "Proxy"
-msgstr "Mellemv�rt"
-
-#. We use the registered default browser in windows
-#: src/prefs.c:1795
-msgid "Browser"
-msgstr "Browser"
-
-#: src/prefs.c:1797
-msgid "Logging"
-msgstr "Logger"
-
-#: src/prefs.c:1798
-msgid "Sounds"
-msgstr "Lydeffekter"
-
-#: src/prefs.c:1799
-msgid "Sound Events"
-msgstr "Lydhandlinger"
-
-#: src/prefs.c:1800
-msgid "Away / Idle"
-msgstr "V�k / Inaktiv"
-
-#: src/prefs.c:1801
-msgid "Away Messages"
-msgstr "Frav�rsbeskeder"
-
-#: src/prefs.c:1804
-msgid "Plugins"
-msgstr "Udvidelsesmoduler"
-
-#: src/prpl.c:219
+#: src/prpl.c:220
 msgid "Gaim - Prompt"
 msgstr "Gaim - Sp�rgsm�l"
 
-#: src/prpl.c:302
+#: src/prpl.c:303
 msgid "No actions available"
 msgstr "Ikke handlinger tilg�ngelige"
 
-#: src/prpl.c:452
+#: src/prpl.c:453
 #, c-format
 msgid "%s has mail from %s: %s"
 msgstr "%s har post fra %s: %s"
 
-#: src/prpl.c:452
+#: src/prpl.c:453
 msgid "No Subject"
 msgstr "Intet emne"
 
-#: src/prpl.c:454
+#: src/prpl.c:455
 #, c-format
 msgid "%s has new mail."
 msgstr "%s har ny post."
 
-#: src/prpl.c:457
+#: src/prpl.c:458
 #, 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/prpl.c:473
+#: src/prpl.c:474
 msgid "Gaim - New Mail"
 msgstr "Gaim - Ny post"
 
-#: src/prpl.c:492
+#: src/prpl.c:493
 msgid "Open Mail"
 msgstr "�bn post"
 
-#: src/prpl.c:694
+#: src/prpl.c:695
 #, 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:702
+#: src/prpl.c:703
 msgid ""
 "\n"
 "\n"
@@ -6169,15 +5667,15 @@
 "\n"
 "Vil du tilf�je vedkommende til din venneliste?"
 
-#: src/prpl.c:704
+#: src/prpl.c:706
 msgid "Gaim - Information"
 msgstr "Gaim - Information"
 
-#: src/prpl.c:706
+#: src/prpl.c:709
 msgid "Gaim - Confirm"
 msgstr "Gaim - Bekr�ft"
 
-#: src/prpl.c:747
+#: src/prpl.c:751
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
@@ -6185,42 +5683,42 @@
 "Du har ikke nogen protokoller indl�st, som underst�tter oprettelsen af nye "
 "konti."
 
-#: src/prpl.c:784
+#: src/prpl.c:788
 msgid "Gaim - Registration"
 msgstr "Gaim - Registrering"
 
-#: src/prpl.c:797
+#: src/prpl.c:801
 msgid "Registration Information"
 msgstr "Registreringsinformation"
 
-#: src/prpl.c:811
+#: src/prpl.c:815
 msgid "Register"
 msgstr "Registr�r"
 
-#: src/server.c:54
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Indtast din adgangskode"
 
-#: src/server.c:880
+#: src/server.c:882
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d beskeder)"
 
-#: src/server.c:892
+#: src/server.c:894
 msgid "(1 message)"
 msgstr "(1 besked)"
 
-#: src/server.c:1072 src/server.c:1079
+#: src/server.c:1074 src/server.c:1081
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggede ind."
 
-#: src/server.c:1095 src/server.c:1102
+#: src/server.c:1097 src/server.c:1104
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggede ud."
 
-#: src/server.c:1136
+#: src/server.c:1138
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6229,11 +5727,11 @@
 "%s er blevet advaret af %s.\n"
 "Dit nye advarselsniveau er %d%%"
 
-#: src/server.c:1139
+#: src/server.c:1141
 msgid "an anonymous person"
 msgstr "en anonym person"
 
-#: src/server.c:1227
+#: src/server.c:1229
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6242,65 +5740,69 @@
 "Bruger '%s' inviterer %s til venneliste chat rum: '%s'\n"
 "%s"
 
-#: src/server.c:1231
+#: src/server.c:1233
 #, 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:1237
+#: src/server.c:1239
 msgid "Buddy Chat Invite"
 msgstr "Venne-chat invitering"
 
-#: src/server.c:1433
+#: src/server.c:1408
+msgid "Gaim - Popup"
+msgstr "Gaim - Pop op"
+
+#: src/server.c:1435
 msgid "More Info"
 msgstr "Flere oplysninger"
 
-#: src/sound.c:78
+#: src/sound.c:79
 msgid "Buddy logs in"
 msgstr "Ven logger ind"
 
-#: src/sound.c:79
+#: src/sound.c:80
 msgid "Buddy logs out"
 msgstr "Ven logger ud"
 
-#: src/sound.c:80
+#: src/sound.c:81
 msgid "Message received"
 msgstr "Besked modtaget"
 
-#: src/sound.c:81
-msgid "Message received begins conversation"
-msgstr "Besked modtaget begynder samtale"
-
 #: src/sound.c:82
-msgid "Message sent"
-msgstr "Besked sendt"
+msgid "Message received begins conversation"
+msgstr "Besked modtaget begynder samtale"
 
 #: src/sound.c:83
+msgid "Message sent"
+msgstr "Besked sendt"
+
+#: src/sound.c:84
 msgid "Person enters chat"
 msgstr "Person tr�der ind i chatten"
 
-#: src/sound.c:84
-msgid "Person leaves chat"
-msgstr "Person forlader chatten"
-
 #: src/sound.c:85
+msgid "Person leaves chat"
+msgstr "Person forlader chatten"
+
+#: src/sound.c:86
 msgid "You talk in chat"
 msgstr "Du taler i chatten"
 
-#: src/sound.c:86
+#: src/sound.c:87
 msgid "Others talk in chat"
 msgstr "Andre snakker i chatten"
 
-#: src/sound.c:89
+#: src/sound.c:90
 msgid "Someone says your name in chat"
 msgstr "Nogen n�vner dit navn i chatten"
 
-#: src/sound.c:183
+#: src/sound.c:184
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Kunne ikke afspille lyd fordi den valgte fil (%s) ikke eksisterer."
 
-#: src/sound.c:195
+#: src/sound.c:197
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -6308,7 +5810,7 @@
 "Kunne ikke afspille lyden, fordi 'Kommando'-lydmetoden er valgt, men ingen "
 "kommando er blevet sat."
 
-#: src/sound.c:202
+#: src/sound.c:206
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -6336,7 +5838,7 @@
 msgstr[1] "minutter"
 
 #. full help text
-#: src/util.c:717
+#: src/util.c:710
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6370,72 +5872,80 @@
 "  -h, --help          vis denne hj�lp og afslut\n"
 
 #. short message
-#: src/util.c:732
+#: src/util.c:725
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Pr�v `%s -h' for flere oplysninger.\n"
 
-#: src/util.c:1020
+#: src/util.c:1013
 msgid "Not connected to AIM"
 msgstr "Ikke forbundet til AIM"
 
-#: src/util.c:1029 src/util.c:1068
+#: src/util.c:1022 src/util.c:1061
 msgid "No screenname given."
 msgstr "Intet brugernavn angivet."
 
-#: src/util.c:1105
+#: src/util.c:1098
 msgid "No roomname given."
 msgstr "Intet rumnavn angivet."
 
-#: src/util.c:1124
+#: src/util.c:1117
 msgid "Invalid AIM URI"
 msgstr "Ugyldig AIM URI"
 
-#. 
+#.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
-#: src/win32/systray.c:20
+#: src/win32/systray.c:36
 msgid "Gaim Instant Messenger"
 msgstr "Gaim"
 
-#: src/win32/systray.c:21
+#: src/win32/systray.c:37
 msgid "Gaim Instant Messenger - Signed off"
 msgstr "Gaim - Logget af"
 
-#: src/win32/systray.c:22
+#: src/win32/systray.c:38
 msgid "Gaim Instant Messenger - Away"
 msgstr "Gaim - Frav�rende"
 
-#: src/win32/systray.c:104
+#: src/win32/systray.c:134
 msgid "New"
 msgstr "Ny"
 
-#: src/win32/systray.c:128
+#: src/win32/systray.c:167
 msgid "Set Away Message"
 msgstr "S�t frav�rsbesked"
 
-#: src/win32/systray.c:135
+#: src/win32/systray.c:176
 msgid "I'm Back"
 msgstr "Jeg er tilbage"
 
-#: src/win32/systray.c:300
+#: src/win32/systray.c:365
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/plugin.c:227
+#: src/plugin.c:231
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
 msgstr "Modulet %s returnede ikke nogen gyldig modul information"
 
-#: src/plugin.c:231
+#: src/plugin.c:236
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim kunne ikke indl�se dit modul."
 
 #. * Custom away message.
-#: src/prpl.h:165
+#: src/prpl.h:172
 msgid "Custom"
 msgstr "Brugerdefineret"
 
-#: src/gtkdebug.c:71
+#: src/gtkdebug.c:94
 msgid "Debug Window"
 msgstr "Fejls�gningsvindue"
+
+#: src/gtkdebug.c:130
+msgid "Pause"
+msgstr "Pause"
+
+#: src/gtkdebug.c:136
+msgid "Timestamps"
+msgstr "Tidsstempler"
diff -r decfda57d218 -r 3c8caf2a9d9d po/zh_TW.po
--- a/po/zh_TW.po	Tue May 20 21:29:22 2003 +0000
+++ b/po/zh_TW.po	Wed May 21 01:42:56 2003 +0000
@@ -1,15 +1,16 @@
 # Traditional Chinese translation for Gaim.
 # Copyright (C) 2000-2003 Free Software Foundation, Inc.
 #
-# Based on simplified Chinese translation by Hashao <hashao@china.com>, 2000.
+# Forked from simplified Chinese translation by Hashao <hashao@china.com>, 2000.
 # Updated by Rocky S. Lee <rocky@gnuchina.org>, Jan 2002
 # Updated by Paladin Liu <paladin@ms1.hinet.net>, (Jul 2002?)
+# Updated by Ambrose Li <acli@ada.dhs.org>, May 2003
 # 
 # 请随便修正，添加，更新，领功。我没有毅力长期维护。多谢
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2003-05-17 00:49-0400\n"
+"POT-Creation-Date: 2003-05-19 01:16-0400\n"
 "PO-Revision-Date: 2002-07-09 17:02+0800\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -32,14 +33,14 @@
 
 #: plugins/docklet/docklet.c:129
 msgid "New..."
-msgstr ""
+msgstr "新..."
 
 #: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:71
 #: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1179
 #: src/protocols/jabber/jabber.c:3402 src/protocols/jabber/jabber.c:3456
-#: src/protocols/oscar/oscar.c:2790 src/protocols/oscar/oscar.c:4466
-#: src/protocols/oscar/oscar.c:5343 src/protocols/oscar/oscar.c:5664
-#: src/gtkblist.c:1488 src/gtkpounce.c:564 src/prefs.c:1072
+#: src/protocols/oscar/oscar.c:2780 src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:5333 src/protocols/oscar/oscar.c:5655
+#: src/gtkblist.c:1511 src/gtkpounce.c:564 src/prefs.c:1091
 msgid "Away"
 msgstr "離開"
 
@@ -53,11 +54,11 @@
 
 #: plugins/docklet/docklet.c:152
 msgid "File Transfers..."
-msgstr "檔案傳輸..."
+msgstr "檔案傳輸"
 
 #: plugins/docklet/docklet.c:153
 msgid "Accounts..."
-msgstr "帳號..."
+msgstr "帳戶一覽"
 
 #: plugins/docklet/docklet.c:154
 msgid "Preferences..."
@@ -81,7 +82,7 @@
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
 #: plugins/docklet/docklet.c:460
 msgid "_Hide new messages until tray icon is clicked"
-msgstr ""
+msgstr "直至按一下系統匣之前，新收到的訊息都要暫時隱藏起來(_H)"
 
 #. *< api_version
 #. *< type
@@ -99,7 +100,7 @@
 #. *  summary
 #: plugins/docklet/docklet.c:487
 msgid "Displays an icon for Gaim in the system tray."
-msgstr ""
+msgstr "在系統匣內為 Gaim 提供一個圖示。"
 
 #. *  description
 #: plugins/docklet/docklet.c:489
@@ -126,16 +127,16 @@
 #. *  summary
 #: plugins/autorecon.c:88 plugins/autorecon.c:90
 msgid "When you are kicked offline, this reconnects you."
-msgstr "斷線後，這個插件幫您自動的重新連線。"
+msgstr "被逼拆接後，這個插件會幫您自動的重新連接。"
 
 #: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
 msgid "Mail Server"
-msgstr "伺服器："
+msgstr "郵件伺服器："
 
 #: plugins/chkmail.c:131
 #, c-format
 msgid "%s (%d new/%d total)"
-msgstr ""
+msgstr "%s（新郵件%d件╱總%d件）"
 
 #: plugins/chkmail.c:203
 msgid "Check Mail"
@@ -143,7 +144,7 @@
 
 #: plugins/chkmail.c:207
 msgid "Check email every X seconds.\n"
-msgstr ""
+msgstr "每隔Ｘ秒鐘，就替您檢查有沒有新郵件。\n"
 
 #. *< api_version
 #. *< type
@@ -161,7 +162,7 @@
 #. *  summary
 #: plugins/events.c:228 plugins/events.c:230
 msgid "Test to see that all events are working properly."
-msgstr ""
+msgstr "檢查各種「事件」是否都正常運作。"
 
 #. *< api_version
 #. *< type
@@ -179,7 +180,7 @@
 #. *  summary
 #: plugins/filectl.c:206 plugins/filectl.c:208
 msgid "Allows you to control Gaim by entering commands in a file."
-msgstr ""
+msgstr "讓您可以為 Gaim 編寫命令稿。"
 
 #. *< api_version
 #. *< type
@@ -197,7 +198,7 @@
 #. *  summary
 #: plugins/gaiminc.c:75
 msgid "An example plugin that does stuff - see the description."
-msgstr ""
+msgstr "這是個搞事的插件──請看說明。"
 
 #. *  description
 #: plugins/gaiminc.c:77
@@ -207,6 +208,10 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
+"這是個非常「酷」的插件，搞作很多東東：\n"
+"• 當您登入時，告訴您是誰寫了這套軟件的\n"
+"• 任何接收到的訊息都反轉過來顯示\n"
+"• 當好友登入後，隨即向好友發出一個訊息"
 
 #: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
@@ -267,13 +272,14 @@
 #. *  summary
 #: plugins/iconaway.c:78 plugins/iconaway.c:80
 msgid "Iconifies the away box and the buddy list when you go away."
-msgstr ""
+msgstr "當您離開時，隨即把好友清單及顯示離開訊息的視窗圖示化。"
 
 #: plugins/idle.c:78 src/protocols/irc/irc.c:951
 msgid "Idle Time"
-msgstr "自訂閒置時間"
-
-##: plugins/idle.c:86
+msgstr "閒置時間"
+
+# #: plugins/idle.c:86
+#: plugins/idle.c:86
 msgid "Set"
 msgstr "設"
 
@@ -295,7 +301,7 @@
 
 #: plugins/idle.c:129 plugins/idle.c:130
 msgid "Allows you to hand-configure how long you've been idle for"
-msgstr ""
+msgstr "讓您自訂您「閒置」了多久"
 
 #. *< api_version
 #. *< type
@@ -313,7 +319,7 @@
 #. *  summary
 #: plugins/mailchk.c:152 plugins/mailchk.c:154
 msgid "Checks for new local mail."
-msgstr ""
+msgstr "替您檢查您的電腦上有沒有新郵件。"
 
 #: plugins/notify.c:439
 msgid "Unable to write to config file"
@@ -329,59 +335,57 @@
 
 #: plugins/notify.c:570
 msgid "_IM windows"
-msgstr "即時訊息視窗"
+msgstr "即時訊息視窗(_I)"
 
 #: plugins/notify.c:575
 msgid "_Chat windows"
-msgstr "群組聊天視窗"
+msgstr "群組聊天視窗(_C)"
 
 #. --------------
 #: plugins/notify.c:581
-#, fuzzy
 msgid "Notification Methods"
-msgstr "跳出通知"
+msgstr "通知方法"
 
 #: plugins/notify.c:584
 msgid "Prepend _string into window title (hit enter to save):"
-msgstr ""
+msgstr "在視窗標題前加上下列文字(_S)（請按 Enter 鍵儲存）："
 
 #: plugins/notify.c:595
 msgid "_Quote window title"
-msgstr ""
+msgstr "在視窗標題加上引號(_Q)"
 
 #: plugins/notify.c:600
 msgid "Set Window Manager \"_URGENT\" Hint"
-msgstr ""
+msgstr "設定視窗管理程式用的「_URGENT」提示"
 
 #: plugins/notify.c:605
 msgid "Insert c_ount of new messages into window title"
-msgstr ""
+msgstr "替視窗標題加上新訊息的數量(_O)"
 
 #: plugins/notify.c:610
 msgid "_Notify even if conversation is in focus"
-msgstr ""
+msgstr "即使交談是在個已對準焦點(i_n focus)的視窗中，依舊發出通知"
 
 #. --------------
 #: plugins/notify.c:616
-#, fuzzy
 msgid "Notification Removal"
-msgstr "移除跳出通知"
+msgstr "何時移除通知"
 
 #: plugins/notify.c:617
 msgid "Remove when conversation window gains _focus"
-msgstr ""
+msgstr "當交談的視窗被您對準了焦點(_focus)"
 
 #: plugins/notify.c:622
 msgid "Remove when conversation window _receives click"
-msgstr ""
+msgstr "當交談的視窗被您按了一下(_R)"
 
 #: plugins/notify.c:627
 msgid "Remove when _typing in conversation window"
-msgstr ""
+msgstr "當您在交談的視窗開始打字(_T)"
 
 #: plugins/notify.c:632
 msgid "Appl_y"
-msgstr ""
+msgstr "立即使用(_Y)"
 
 #. *< api_version
 #. *< type
@@ -391,16 +395,15 @@
 #. *< priority
 #. *< id
 #: plugins/notify.c:695
-#, fuzzy
 msgid "Message Notification"
-msgstr "跳出通知"
+msgstr "通知收到訊息"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/notify.c:698 plugins/notify.c:700
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
+msgstr "給您幾個不同的方法，通知您有未曾閱讀的即時訊息。"
 
 #: plugins/raw.c:152
 msgid "Raw"
@@ -432,7 +435,7 @@
 #. *  summary
 #: plugins/simple.c:33 plugins/simple.c:35
 msgid "Tests to see that most things are working."
-msgstr ""
+msgstr "測試 Gaim 是否大體上正常"
 
 #: plugins/spellchk.c:411
 msgid "Text Replacements"
@@ -440,23 +443,23 @@
 
 #: plugins/spellchk.c:435
 msgid "You type"
-msgstr ""
+msgstr "您打的文字是"
 
 #: plugins/spellchk.c:447
 msgid "You send"
-msgstr ""
+msgstr "但實際上送出"
 
 #: plugins/spellchk.c:473
 msgid "Add a new text replacement"
-msgstr ""
+msgstr "新訂一個文子替換規則"
 
 #: plugins/spellchk.c:480
 msgid "You _type:"
-msgstr ""
+msgstr "你打的文字是(_T)："
 
 #: plugins/spellchk.c:494
 msgid "You _send:"
-msgstr ""
+msgstr "但實際上送出(_S)："
 
 #: plugins/spellchk.c:534
 msgid "Text replacement"
@@ -464,7 +467,7 @@
 
 #: plugins/spellchk.c:536 plugins/spellchk.c:537
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
+msgstr "讓你自訂送出訊息前，怎樣更改您打出的訊息。"
 
 #: plugins/timestamp.c:72
 msgid "iChat Timestamp"
@@ -472,11 +475,11 @@
 
 #: plugins/timestamp.c:79
 msgid "Delay"
-msgstr ""
+msgstr "每隔多少分鐘"
 
 #: plugins/timestamp.c:92
 msgid "_Apply"
-msgstr ""
+msgstr "立即使用(_A)"
 
 #. *< api_version
 #. *< type
@@ -494,7 +497,7 @@
 #. *  summary
 #: plugins/timestamp.c:148 plugins/timestamp.c:150
 msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr ""
+msgstr "每隔Ｎ分鐘，給交談加上 iChat 式的時間戳記。"
 
 #. Configuration frame
 #: plugins/gestures/gestures.c:210
@@ -565,7 +568,7 @@
 #: plugins/win32/transparency/win2ktrans.c:412
 #: plugins/win32/transparency/win2ktrans.c:446
 msgid "Opacity:"
-msgstr ""
+msgstr "暗度："
 
 #. IM Convo trans options
 #: plugins/win32/transparency/win2ktrans.c:393
@@ -574,24 +577,25 @@
 
 #: plugins/win32/transparency/win2ktrans.c:394
 msgid "_IM window transparency"
-msgstr "即時訊息視窗之透明度"
-
+msgstr "即時訊息視窗之透明度(_I)"
+
+# XXX don't know how to translate "slider"
 #: plugins/win32/transparency/win2ktrans.c:404
 msgid "_Show slider bar in IM window"
 msgstr ""
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:429 src/prefs.c:586
+#: plugins/win32/transparency/win2ktrans.c:429 src/prefs.c:605
 msgid "Buddy List Window"
-msgstr "好友名單視窗"
+msgstr "好友清單視窗"
 
 #: plugins/win32/transparency/win2ktrans.c:430
 msgid "_Keep Buddy List window on top"
-msgstr ""
+msgstr "好友清單永遠在其他視窗之上(_K)"
 
 #: plugins/win32/transparency/win2ktrans.c:433
 msgid "_Buddy List window transparency"
-msgstr "好友名單視窗之透明度"
+msgstr "好友清單視窗之透明度(_B)"
 
 #. *< api_version
 #. *< type
@@ -614,6 +618,9 @@
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
+"這套插件讓顯示交談的視窗可以有可變的透明度。\n"
+"\n"
+"※註：這套插件要視窗2000或XP方可運作。"
 
 #. IM Convo trans options
 #: plugins/win32/winprefs/winprefs.c:141
@@ -622,7 +629,7 @@
 
 #: plugins/win32/winprefs/winprefs.c:142
 msgid "_Start Gaim on Windows startup"
-msgstr "啟動 Windows 時自動啟動 Gaim"
+msgstr "啟動 Window_s 時自動啟動 Gaim"
 
 #: plugins/win32/winprefs/winprefs.c:170
 msgid "WinGaim Options"
@@ -634,7 +641,7 @@
 
 #: plugins/perl/perl.c:395
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
-msgstr ""
+msgstr "GAIM::register 收到了無效的參數；請讀 PERL-HOWTO 的說明。"
 
 #. *< api_version
 #. *< type
@@ -651,7 +658,7 @@
 #. *< version
 #: plugins/perl/perl.c:1379 plugins/perl/perl.c:1380
 msgid "Provides support for loading perl plugins."
-msgstr ""
+msgstr "給您支援載入用 Perl 寫的插件。"
 
 #. *< api_version
 #. *< type
@@ -671,7 +678,7 @@
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr ""
+msgstr "在顯示交談內容的視窗中同時顯示好友的登出、離開及閒置。"
 
 #: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1187
 #: src/protocols/msn/msn.c:314 src/protocols/msn/state.c:27
@@ -679,7 +686,7 @@
 #: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1269
 #: src/protocols/yahoo/yahoo.c:1348
 msgid "Available"
-msgstr "在線"
+msgstr "有空"
 
 #: src/protocols/gg/gg.c:70
 msgid "Available for friends only"
@@ -687,23 +694,23 @@
 
 #: src/protocols/gg/gg.c:72
 msgid "Away for friends only"
-msgstr "離開（只有好友可以看到我）"
+msgstr "離開了（只有好友可以看到我）"
 
 #: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3405
-#: src/protocols/jabber/jabber.c:3468 src/protocols/oscar/oscar.c:2794
-#: src/protocols/oscar/oscar.c:4454 src/protocols/oscar/oscar.c:4481
-#: src/protocols/oscar/oscar.c:5669 src/protocols/yahoo/yahoo.c:1086
+#: src/protocols/jabber/jabber.c:3468 src/protocols/oscar/oscar.c:2784
+#: src/protocols/oscar/oscar.c:4444 src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:5660 src/protocols/yahoo/yahoo.c:1086
 #: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1358
 msgid "Invisible"
-msgstr "隱身"
+msgstr "隱了身"
 
 #: src/protocols/gg/gg.c:74
 msgid "Invisible for friends only"
-msgstr "隱身（只好好友可以看到我）"
+msgstr "隱了身（只好好友可以看到我）"
 
 #: src/protocols/gg/gg.c:75
 msgid "Unavailable"
-msgstr ""
+msgstr "沒空"
 
 #: src/protocols/gg/gg.c:157
 msgid "Unable to resolve hostname."
@@ -711,7 +718,7 @@
 
 #: src/protocols/gg/gg.c:160
 msgid "Unable to connect to server."
-msgstr "無法連線到伺服器。"
+msgstr "無法連接到伺服器。"
 
 #: src/protocols/gg/gg.c:163
 msgid "Invalid response from server."
@@ -740,7 +747,7 @@
 
 #: src/protocols/gg/gg.c:301
 msgid "Could not connect"
-msgstr "無法連結"
+msgstr "無法連接"
 
 #: src/protocols/gg/gg.c:308
 msgid "Unable to read socket"
@@ -748,7 +755,7 @@
 
 #: src/protocols/gg/gg.c:418
 msgid "Unable to connect."
-msgstr "無法連結。"
+msgstr "無法連接。"
 
 #: src/protocols/gg/gg.c:434
 msgid "Reading data"
@@ -756,11 +763,11 @@
 
 #: src/protocols/gg/gg.c:437
 msgid "Balancer handshake"
-msgstr ""
+msgstr "和負載平衡器交談中"
 
 #: src/protocols/gg/gg.c:440
 msgid "Reading server key"
-msgstr "讀取 Server Key 中"
+msgstr "讀取伺服器的公鑰中"
 
 #: src/protocols/gg/gg.c:443
 msgid "Exchanging key hash"
@@ -773,7 +780,7 @@
 #: src/protocols/gg/gg.c:471 src/protocols/gg/gg.c:567
 #, c-format
 msgid "Connect to %s failed"
-msgstr "連結到 %s 失敗"
+msgstr "連接到 %s 失敗"
 
 #: src/protocols/gg/gg.c:520
 msgid "Unable to ping server"
@@ -781,7 +788,7 @@
 
 #: src/protocols/gg/gg.c:532
 msgid "Send as message"
-msgstr "以訊息送出"
+msgstr "以訊息的形式送出"
 
 #: src/protocols/gg/gg.c:540
 msgid "Looking up GG server"
@@ -789,7 +796,7 @@
 
 #: src/protocols/gg/gg.c:543
 msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "無效的 Gadu-Gadu UIN 定義"
+msgstr "您給予了一個無效的 Gadu-Gadu UIN"
 
 #: src/protocols/gg/gg.c:591
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
@@ -807,14 +814,14 @@
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4965 src/gtkft.c:1031
+# XXX the gtkft.c usage is not very good (in the source), ditto for "No" below
+#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4955 src/gtkft.c:1031
 msgid "Yes"
-msgstr ""
-# XXX the gtkft.c usage is not very good (in the source), ditto for "No" below
-
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4965 src/gtkft.c:1032
+msgstr "是"
+
+#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4955 src/gtkft.c:1032
 msgid "No"
-msgstr ""
+msgstr "否"
 
 #: src/protocols/gg/gg.c:689
 msgid "UIN"
@@ -824,9 +831,10 @@
 msgid "First name"
 msgstr "名"
 
+# XXX blank out "Second Name" for now
 #: src/protocols/gg/gg.c:698
 msgid "Second Name"
-msgstr ""
+msgstr " "
 
 #: src/protocols/gg/gg.c:702
 msgid "Nick"
@@ -848,27 +856,27 @@
 
 #: src/protocols/gg/gg.c:758
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
-msgstr "對不起，Gadu-Gadu 伺服器上並沒有儲存任何的好友名單！"
+msgstr "對不起，Gadu-Gadu 伺服器上並沒有儲存任何的好友清單！"
 
 #: src/protocols/gg/gg.c:764
 msgid "Couldn't Import Buddy List from Server"
-msgstr "無法自伺服器上取得好友名單"
+msgstr "無法自伺服器處匯入好友清單"
 
 #: src/protocols/gg/gg.c:824
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
-msgstr "成功的將好朋名單傳送到 Gadu-Gadu 伺服器上"
+msgstr "成功的將好友清單傳送到 Gadu-Gadu 伺服器上"
 
 #: src/protocols/gg/gg.c:829
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-msgstr "無法傳送好友名單到 Gadu-Gadu 伺服器上"
+msgstr "無法傳送好友清單到 Gadu-Gadu 伺服器上"
 
 #: src/protocols/gg/gg.c:835
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
-msgstr "成功的將好友名單自 Gadu-Gadu 伺服器上刪除"
+msgstr "成功的將好友清單自 Gadu-Gadu 伺服器上刪除"
 
 #: src/protocols/gg/gg.c:840
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-msgstr "無法刪除在 Gadu-Gadu 伺服器上的好友名單"
+msgstr "無法刪除在 Gadu-Gadu 的伺服器上的好友清單"
 
 #: src/protocols/gg/gg.c:846
 msgid "Password changed successfully"
@@ -880,36 +888,38 @@
 
 #: src/protocols/gg/gg.c:962
 msgid "Error communicating with Gadu-Gadu server"
-msgstr ""
+msgstr "跟 Gadu-Gadu 的伺服器通訊時發生了錯誤。"
 
 #: src/protocols/gg/gg.c:963
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
+"因為與 Gadu-Gadu 的 HTTP 伺服器通訊時出現了問題，您作的請求無法完成。請等一會"
+"後再重試。"
 
 #: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
-msgstr ""
+msgstr "無法匯入 Gadu-Gadu 好友清單"
 
 #: src/protocols/gg/gg.c:991
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
-msgstr ""
+msgstr "Gaim 無法連接到 Gadu-Gadu 的好友清單伺服器。請等一會後再重試。"
 
 #: src/protocols/gg/gg.c:1059
 msgid "Couldn't export buddy list"
-msgstr ""
+msgstr "無法匯出好友清單"
 
 #: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1082
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
-msgstr ""
+msgstr "Gaim 無法連接到好友清單伺服器。請等一會後再重試。"
 
 #: src/protocols/gg/gg.c:1081
 msgid "Unable to delete Gadu-Gadu buddy list"
-msgstr ""
+msgstr "無法刪除 Gadu-Gadu 的好友清單"
 
 #: src/protocols/gg/gg.c:1129
 msgid "Unable to access directory"
@@ -920,6 +930,7 @@
 "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:1162
 msgid "Unable to change Gadu-Gadu password"
@@ -930,38 +941,42 @@
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
+"因為連接到 Gadu-Gadu 的伺服器時發生了問題，Gaim 無法替您修改您的密碼。請等一"
+"會後再重試。"
 
 #: src/protocols/gg/gg.c:1177
 msgid "Directory Search"
 msgstr "目錄搜尋"
 
 #: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4291
-#: src/protocols/oscar/oscar.c:5855 src/protocols/toc/toc.c:1449
+#: src/protocols/oscar/oscar.c:5846 src/protocols/toc/toc.c:1449
 #: src/dialogs.c:2194 src/dialogs.c:2203
 msgid "Change Password"
 msgstr "修改密碼"
 
 #: src/protocols/gg/gg.c:1193
 msgid "Import Buddy List from Server"
-msgstr "自伺服器上匯入好友名單"
+msgstr "自伺服器上匯入好友清單"
 
 #: src/protocols/gg/gg.c:1199
 msgid "Export Buddy List to Server"
-msgstr "匯出好友名單到伺服器上"
+msgstr "匯出好友清單到伺服器上"
 
 #: src/protocols/gg/gg.c:1205
 msgid "Delete Buddy List from Server"
-msgstr "將伺服器上的好友名單刪除"
+msgstr "將伺服器上的好友清單刪除"
 
 #: src/protocols/gg/gg.c:1237
 msgid "Unable to access user profile."
-msgstr ""
+msgstr "無法存取您的個人檔案。"
 
 #: src/protocols/gg/gg.c:1238
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
+"因為連接至目錄伺服器時出現了錯誤，Gaim 無法存取這使用者的個人檔案。請等一會後"
+"再重試。"
 
 #. *< api_version
 #. *< type
@@ -979,7 +994,7 @@
 
 #: src/protocols/icq/gaim_icq.c:224
 msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr ""
+msgstr "Gaim 與 ICQ 伺服器通訊時出現了錯誤。"
 
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2629
 #: src/dialogs.c:2491 src/gtkconv.c:806 src/gtkconv.c:2645 src/gtkconv.c:3791
@@ -990,11 +1005,11 @@
 #. Cancel button.
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1430
 #: src/protocols/oscar/oscar.c:2387 src/protocols/oscar/oscar.c:2450
-#: src/protocols/oscar/oscar.c:5544 src/protocols/toc/toc.c:1979
+#: src/protocols/oscar/oscar.c:5534 src/protocols/toc/toc.c:1979
 #: src/buddy_chat.c:307 src/dialogs.c:467 src/dialogs.c:474 src/dialogs.c:482
 #: src/dialogs.c:2144 src/dialogs.c:2255 src/dialogs.c:2315 src/dialogs.c:2480
 #: src/dialogs.c:2666 src/dialogs.c:2815 src/dialogs.c:3460 src/dialogs.c:3952
-#: src/dialogs.c:4431 src/dialogs.c:5004 src/gtkft.c:1110 src/multi.c:1507
+#: src/dialogs.c:4430 src/dialogs.c:5003 src/gtkft.c:1110 src/multi.c:1507
 #: src/multi.c:1871 src/prpl.c:250 src/prpl.c:706 src/server.c:1237
 msgid "Cancel"
 msgstr "取消"
@@ -1006,13 +1021,13 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1682
 #: src/protocols/msn/notification.c:374 src/protocols/msn/notification.c:649
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
 msgid "Authorize"
 msgstr "批准"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1682
 #: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:650
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
 #: src/dialogs.c:2479
 msgid "Deny"
 msgstr "拒絕"
@@ -1027,13 +1042,13 @@
 #: src/protocols/msn/msn.c:429 src/protocols/msn/notification.c:1238
 #: src/protocols/napster/napster.c:512
 msgid "Unable to connect"
-msgstr "無法連線"
+msgstr "無法連接"
 
 #: src/protocols/icq/gaim_icq.c:352
 msgid "Connecting..."
-msgstr "連線中"
-
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3867
+msgstr "連接中"
+
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3858
 msgid "Nick:"
 msgstr "暱稱："
 
@@ -1045,17 +1060,17 @@
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
-msgstr ""
+msgstr "(為這個訊息轉換編碼時出現了錯誤。請檢查帳戶的「編碼」設定是否有誤。)"
 
 #: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2613
 #, c-format
 msgid "DCC Chat with %s closed"
-msgstr ""
+msgstr "跟 %s 的 DCC 聊天經已結束"
 
 #: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2622
 #, c-format
 msgid "DCC Chat with %s established"
-msgstr "和 %s 的即時訊息已經被建立"
+msgstr "和 %s 的 DCC 聊天已經被建立"
 
 #: src/protocols/irc/irc.c:691
 msgid "No topic is set"
@@ -1091,7 +1106,7 @@
 #: src/protocols/irc/irc.c:961
 #, c-format
 msgid "%s is an Identified User"
-msgstr ""
+msgstr "%s 是個身份經過驗證的使用者"
 
 #: src/protocols/irc/irc.c:976
 #, c-format
@@ -1143,24 +1158,23 @@
 #: src/protocols/irc/irc.c:1429
 #, c-format
 msgid "%s would like to establish a DCC chat"
-msgstr ""
+msgstr "%s 希望跟您做個 DCC 聊天"
 
 #: src/protocols/irc/irc.c:1430
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
-msgstr ""
+msgstr "兩部電腦會因此直接連接起來；送出的訊息均不會經過 IRC 伺服器"
 
 #: src/protocols/irc/irc.c:1430 src/protocols/oscar/oscar.c:2387
-#: src/protocols/oscar/oscar.c:5544
-#, fuzzy
+#: src/protocols/oscar/oscar.c:5534
 msgid "Connect"
-msgstr "連線成功"
+msgstr "連接"
 
 #: src/protocols/irc/irc.c:1456
 #, c-format
 msgid "Received an invalid file send request from %s."
-msgstr ""
+msgstr "從 %s 收到了個無效的檔案傳輸要求。"
 
 #: src/protocols/irc/irc.c:1537 src/protocols/msn/error.c:132
 #: src/protocols/msn/notification.c:216 src/protocols/msn/notification.c:659
@@ -1193,7 +1207,7 @@
 msgid "CTCP Ping"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1954 src/protocols/oscar/oscar.c:692
+#: src/protocols/irc/irc.c:1954 src/protocols/oscar/oscar.c:693
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
@@ -1225,8 +1239,9 @@
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
-msgstr "<B>CTCP 指令：<BR>CLIENTINFO <暱稱><BR>USERINFO <暱稱><BR>VERSION "
-"<暱稱><BR>PING <暱稱></B><BR>"
+msgstr ""
+"<B>CTCP 指令：<BR>CLIENTINFO <暱稱><BR>USERINFO <暱稱><BR>VERSION <暱稱"
+"><BR>PING <暱稱></B><BR>"
 
 #: src/protocols/irc/irc.c:2392
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
@@ -1239,10 +1254,10 @@
 "W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
 "CTCP commands<BR>Type /HELP DCC for DCC commands"
 msgstr ""
-"<B>目前支援以下指令：<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
-"TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
-"W WHOWAS<BR>輸入 /HELP OPER 列出管理員專用指令<BR>輸入 /HELP CTCP 列出"
-"CTCP 指令<BR>輸入 /HELP DCC 列出 DCC 指令"
+"<B>目前支援以下指令：<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC "
+"KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W "
+"WHOWAS<BR>輸入 /HELP OPER 列出管理員專用指令<BR>輸入 /HELP CTCP 列出CTCP 指令"
+"<BR>輸入 /HELP DCC 列出 DCC 指令"
 
 #: src/protocols/irc/irc.c:2420
 msgid "<B>Unknown command</B>"
@@ -1283,11 +1298,11 @@
 #: src/protocols/msn/msn.c:1208 src/protocols/napster/napster.c:663
 #: src/multi.c:1099
 msgid "Port:"
-msgstr "端口："
+msgstr "連接埠："
 
 #: src/protocols/irc/irc.c:3049
 msgid "Encoding:"
-msgstr "內碼："
+msgstr "編碼："
 
 #: src/protocols/jabber/jabber.c:989
 msgid "Unable to change password."
@@ -1325,8 +1340,8 @@
 msgstr "外出去了"
 
 #: src/protocols/jabber/jabber.c:1185 src/protocols/jabber/jabber.c:3404
-#: src/protocols/jabber/jabber.c:3464 src/protocols/oscar/oscar.c:2784
-#: src/protocols/oscar/oscar.c:4469 src/protocols/oscar/oscar.c:5665
+#: src/protocols/jabber/jabber.c:3464 src/protocols/oscar/oscar.c:2774
+#: src/protocols/oscar/oscar.c:4459 src/protocols/oscar/oscar.c:5656
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -1379,11 +1394,11 @@
 
 #: src/protocols/jabber/jabber.c:2298 src/protocols/jabber/jabber.c:4206
 msgid "Connection lost"
-msgstr "失去連線"
+msgstr "失去連接"
 
 #: src/protocols/jabber/jabber.c:2306
 msgid "Connected"
-msgstr "連線成功"
+msgstr "連接成功"
 
 #: src/protocols/jabber/jabber.c:2309
 msgid "Requesting Authentication Method"
@@ -1394,12 +1409,12 @@
 #: src/protocols/msn/msn.c:423 src/protocols/napster/napster.c:504
 #: src/protocols/yahoo/yahoo.c:987
 msgid "Connecting"
-msgstr "連線中"
+msgstr "連接中"
 
 #: src/protocols/jabber/jabber.c:2655
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr ""
+msgstr "%s 並非有效的 Jabber 帳號，因此沒有新增這個使用者。"
 
 #: src/protocols/jabber/jabber.c:2657
 msgid "Jabber Error"
@@ -1432,7 +1447,7 @@
 msgstr "狀態"
 
 #: src/protocols/jabber/jabber.c:3315 src/protocols/jabber/jabber.c:3337
-#: src/protocols/oscar/oscar.c:5347
+#: src/protocols/oscar/oscar.c:5337
 msgid "Not Authorized"
 msgstr "未獲批准"
 
@@ -1452,10 +1467,10 @@
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
+# XXX tentative translation
 #: src/protocols/jabber/jabber.c:3379
-#, fuzzy
 msgid "Cancel Presence Notification"
-msgstr "跳出通知"
+msgstr "取消通知在或不在"
 
 #: src/protocols/jabber/jabber.c:3387
 msgid "Re-request authorization"
@@ -1463,8 +1478,8 @@
 
 #. state is one of our own strings. it won't be NULL.
 #: src/protocols/jabber/jabber.c:3400 src/protocols/jabber/jabber.c:3450
-#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:4464
-#: src/protocols/oscar/oscar.c:5663 src/protocols/yahoo/yahoo.c:1090
+#: src/protocols/oscar/oscar.c:2786 src/protocols/oscar/oscar.c:4454
+#: src/protocols/oscar/oscar.c:5654 src/protocols/yahoo/yahoo.c:1090
 #: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:872
 #: src/multi.c:274
 msgid "Online"
@@ -1494,10 +1509,10 @@
 msgid "Street Address"
 msgstr "街道地址"
 
+# XXX this probably means "second line of address"
 #: src/protocols/jabber/jabber.c:3596
 msgid "Extended Address"
 msgstr "　　　　"
-# second line of address
 
 #: src/protocols/jabber/jabber.c:3597
 msgid "Locality"
@@ -1544,17 +1559,18 @@
 msgid "Birthday"
 msgstr "生日"
 
+# FIXME: prefs.c usage probably incompatible with other files!!! yuck!!!
 #: src/protocols/jabber/jabber.c:3608 src/dialogs.c:2946 src/prefs.c:428
-#: src/prefs.c:1381
+#: src/prefs.c:1403
 msgid "Description"
 msgstr "說明"
-# FIXME: prefs.c usage probably incompatible with other files!!! yuck!!!
 
 #: src/protocols/jabber/jabber.c:3633
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
-msgstr "以下欄位您都可以選擇填或不填，不想填的都不用理會，只填寫您想填的便可以了"
+msgstr ""
+"以下欄位您都可以選擇填或不填，不想填的都不用理會，只填寫您想填的便可以了"
 
 #: src/protocols/jabber/jabber.c:3634
 msgid "User Identity"
@@ -1572,7 +1588,7 @@
 msgid "Unknown registration error"
 msgstr "不明的註冊錯誤"
 
-#: src/protocols/jabber/jabber.c:4277 src/protocols/oscar/oscar.c:5849
+#: src/protocols/jabber/jabber.c:4277 src/protocols/oscar/oscar.c:5840
 #: src/protocols/toc/toc.c:1437 src/dialogs.c:2279
 msgid "Set User Info"
 msgstr "設定使用者資訊"
@@ -1591,17 +1607,18 @@
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 通訊協定插件"
 
+# XXX
 #: src/protocols/jabber/jabber.c:4394
 msgid "Resource:"
-msgstr ""
+msgstr "資源："
 
 #: src/protocols/jabber/jabber.c:4405
 msgid "Connect Server:"
-msgstr ""
+msgstr "接到伺服器："
 
 #: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:159
 msgid "Protocol not supported"
-msgstr "不支援這種協定"
+msgstr "不支援這種通訊協定"
 
 #: src/protocols/msn/dispatch.c:52
 msgid "Unable to request INF\n"
@@ -1652,10 +1669,10 @@
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "參數無效（大抵是 Gaim 的 Bug）"
 
+# FIXME
 #: src/protocols/msn/error.c:39
 msgid "Invalid User"
 msgstr "無效的使用者"
-# FIXME^
 
 #: src/protocols/msn/error.c:43
 msgid "Fully Qualified Domain Name missing"
@@ -1743,8 +1760,7 @@
 
 #: src/protocols/msn/error.c:111
 msgid "Server unavailable"
-msgstr "伺服器不存在"
-# FIXME^
+msgstr "伺服器暫停使用"
 
 #: src/protocols/msn/error.c:114
 msgid "Peer Notification server down"
@@ -1752,15 +1768,15 @@
 
 #: src/protocols/msn/error.c:117
 msgid "Database connect error"
-msgstr "資料庫連結錯誤"
+msgstr "資料庫連接錯誤"
 
 #: src/protocols/msn/error.c:121
 msgid "Server is going down (abandon ship)"
-msgstr ""
+msgstr "伺服器要停機了（快走罷！）"
 
 #: src/protocols/msn/error.c:125
 msgid "Error creating connection"
-msgstr "連線開啟錯誤"
+msgstr "連接建立時發生了錯誤"
 
 #: src/protocols/msn/error.c:129
 msgid "CVR parameters are either unknown or not allowed"
@@ -1768,7 +1784,7 @@
 
 #: src/protocols/msn/error.c:135
 msgid "Session overload"
-msgstr ""
+msgstr "工作階段超載"
 
 #: src/protocols/msn/error.c:138
 msgid "User is too active"
@@ -1777,12 +1793,11 @@
 #: src/protocols/msn/error.c:141
 msgid "Too many sessions"
 msgstr "太多工作階段"
-# FIXME^
-
+
+# FIXME
 #: src/protocols/msn/error.c:144
 msgid "Not expected"
 msgstr "沒有預期的"
-# FIXME^
 
 #: src/protocols/msn/error.c:147
 msgid "Bad friend file"
@@ -1792,10 +1807,10 @@
 msgid "Authentication failed"
 msgstr "認證失敗"
 
+# FIXME
 #: src/protocols/msn/error.c:154
 msgid "Not allowed when offline"
 msgstr "在離線時是不被允許的"
-# FIXME
 
 #: src/protocols/msn/error.c:157
 msgid "Not accepting new users"
@@ -1998,7 +2013,7 @@
 
 #: src/protocols/msn/notification.c:222
 msgid "Retrieving buddy list"
-msgstr "讀取好友名單中"
+msgstr "讀取好友清單中"
 
 #: src/protocols/msn/notification.c:246
 msgid "Unable to send password"
@@ -2010,11 +2025,11 @@
 
 #: src/protocols/msn/notification.c:269
 msgid "You have been disconnected. You have signed on from another location."
-msgstr "因為您由其他的地方登入，您已被中斷連線了。"
+msgstr "因為您由其他的地方登入，您已被拆接了。"
 
 #: src/protocols/msn/notification.c:275
 msgid "You have been disconnected. The MSN servers are going down temporarily."
-msgstr "因為 MSN 的伺服器要暫停維修，您已被中斷連線了。"
+msgstr "因為 MSN 的伺服器要暫停維修，您已被拆接了。"
 
 #: src/protocols/msn/notification.c:370
 #, c-format
@@ -2046,7 +2061,7 @@
 msgstr ""
 
 #: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1088
-#: src/gtkpounce.c:568 src/prefs.c:1088
+#: src/gtkpounce.c:568 src/prefs.c:1107
 msgid "Idle"
 msgstr "閒置"
 
@@ -2086,7 +2101,7 @@
 #. we have been kicked off =^(
 #: src/protocols/napster/napster.c:344
 msgid "You were disconnected from the server."
-msgstr "您給伺服器中斷了連線了。"
+msgstr "您給伺服器拆接了。"
 
 #. MSG_CLIENT_WHOIS
 #: src/protocols/napster/napster.c:400
@@ -2100,7 +2115,7 @@
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
-msgstr "因為您由其他的地方登入，您已被中斷連線了。"
+msgstr "因為您由其他的地方登入，您已被拆接了。"
 
 #. MSG_CLIENT_PING
 #: src/protocols/napster/napster.c:434
@@ -2108,11 +2123,11 @@
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:548 src/gtkblist.c:1471
+#: src/protocols/napster/napster.c:548 src/gtkblist.c:1494
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/napster/napster.c:562 src/protocols/oscar/oscar.c:5070
+#: src/protocols/napster/napster.c:562 src/protocols/oscar/oscar.c:5060
 #: src/protocols/toc/toc.c:1191
 msgid "Join what group:"
 msgstr "加入群組："
@@ -2240,101 +2255,99 @@
 #: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:602
 #: src/protocols/toc/toc.c:615 src/protocols/toc/toc.c:678
 msgid "Disconnected."
-msgstr "中斷連線了。"
+msgstr "拆接了。"
 
 #: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:854
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "您已經由聊天室 %s 停止了連線。"
-
-#: src/protocols/oscar/oscar.c:570
+msgstr "您已經由聊天室 %s 拆接了。"
+
+#: src/protocols/oscar/oscar.c:571
 msgid "Chat is currently unavailable"
 msgstr "暫時不能交談"
 
-#: src/protocols/oscar/oscar.c:643 src/protocols/oscar/oscar.c:705
+#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:706
 msgid "Couldn't connect to host"
-msgstr "無法連到伺服器"
-
-#: src/protocols/oscar/oscar.c:687
+msgstr "無法連接到伺服器"
+
+#: src/protocols/oscar/oscar.c:688
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:798 src/protocols/oscar/oscar.c:1181
+#: src/protocols/oscar/oscar.c:799 src/protocols/oscar/oscar.c:1182
 msgid "Could Not Connect"
-msgstr "無法連線"
-
-#: src/protocols/oscar/oscar.c:805
+msgstr "無法連接"
+
+#: src/protocols/oscar/oscar.c:806
 msgid "Connection established, cookie sent"
-msgstr "連了線，並已送出了 Cookie"
-
-#: src/protocols/oscar/oscar.c:872 src/protocols/oscar/oscar.c:883
-#: src/protocols/oscar/oscar.c:887
+msgstr "連接成功，並已送出了 Cookie"
+
+#: src/protocols/oscar/oscar.c:873 src/protocols/oscar/oscar.c:884
+#: src/protocols/oscar/oscar.c:888
 msgid "File Transfer Aborted"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:872
+msgstr "檔案傳輸已經異常中止了"
+
+#: src/protocols/oscar/oscar.c:873
 msgid "Unable to establish listener socket."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:883
+#: src/protocols/oscar/oscar.c:884
 msgid "Unable to establish file descriptor."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:887
+msgstr "無法建立檔案描述符"
+
+#: src/protocols/oscar/oscar.c:888
 msgid "Unable to create new connection."
-msgstr ""
+msgstr "無法建立新的連接"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1071 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1072 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1075
+#: src/protocols/oscar/oscar.c:1076
 msgid "Your account is currently suspended."
-msgstr "您目前沒有權利使用您已被暫停的帳戶。"
-# FIXME still weird
+msgstr "您的帳戶給吊銷了。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1079
-#, fuzzy
+#: src/protocols/oscar/oscar.c:1080
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "服務暫時不存在。"
-# FIXME^
+msgstr "AOL 即時傳訊系統服務目前暫停服務。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1083
+#: src/protocols/oscar/oscar.c:1084
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"您的連線／斷線動作太過頻繁了。請等待十分鐘後才再行重試，"
-"否則您只會浪費更多時間。"
+"您的連接／拆接動作太過頻繁了。請等待十分鐘後才再行重試，否則您只會浪費更多時"
+"間。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1087
+#: src/protocols/oscar/oscar.c:1088
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "您所使用的 Client 端程式太過老舊。請更新到 %s 或更新的版本。"
-# FIXME^
-
-#: src/protocols/oscar/oscar.c:1091 src/protocols/toc/toc.c:633
+msgstr "您所使用的客戶端程式太過老舊。請更新到 %s 或更新的版本。"
+
+#: src/protocols/oscar/oscar.c:1092 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "認證失敗"
 
-#: src/protocols/oscar/oscar.c:1119
+#: src/protocols/oscar/oscar.c:1120
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1220 src/protocols/oscar/oscar.c:1250
+#: src/protocols/oscar/oscar.c:1221 src/protocols/oscar/oscar.c:1250
 #: src/protocols/oscar/oscar.c:1336
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:1222 src/protocols/oscar/oscar.c:1252
+"您很有可能很快便會被拆接。在問題被解決前，您可以考慮改用 TOC。請到 %s 找更新"
+"了的版本。"
+
+#: src/protocols/oscar/oscar.c:1223 src/protocols/oscar/oscar.c:1252
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr ""
 
@@ -2342,20 +2355,19 @@
 msgid "Gaim was Unable to get a valid login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1892 src/protocols/oscar/oscar.c:5388
+#: src/protocols/oscar/oscar.c:1892 src/protocols/oscar/oscar.c:5378
 #, c-format
 msgid "Direct IM with %s established"
-msgstr "和 %s 的即時訊息已經被建立"
-# FIXME^
+msgstr "成功建立了和 %s 的直接即時訊息"
 
 #: src/protocols/oscar/oscar.c:2219 src/protocols/oscar/oscar.c:2241
 msgid "(There was an error receiving this message)"
-msgstr ""
+msgstr "(接收這個訊息時發生了錯誤)"
 
 #: src/protocols/oscar/oscar.c:2386
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s 要求與 %s 直接連線"
+msgstr "%s 現正要求與 %s 直接連接"
 
 #: src/protocols/oscar/oscar.c:2387
 msgid ""
@@ -2363,16 +2375,17 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"傳送圖像必須和對方直接連線。對方可因此獲知您的 IP 位址，這可能會對您的隱私構成危險。"
+"傳送圖像必須和對方直接連接。對方可因此獲知您的 IP 位址，這可能會對您的隱私構"
+"成危險。"
 
 #: src/protocols/oscar/oscar.c:2413
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
+# FIXME... still a bad translation
 #: src/protocols/oscar/oscar.c:2421
 msgid "Authorization Request Message:"
 msgstr "要求批准加別人到您的好友清單，請輸入您的理由："
-# FIXME... still a bad translation^
 
 #: src/protocols/oscar/oscar.c:2421
 msgid "Please authorize me!"
@@ -2383,7 +2396,8 @@
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
-msgstr "使用者 %s 要任何人加到好友清單前，都要他事先批准。您想向他作出這個要求嗎？"
+msgstr ""
+"使用者 %s 要任何人加到好友清單前，都要他事先批准。您想向他作出這個要求嗎？"
 
 #: src/protocols/oscar/oscar.c:2450
 msgid "Request Authorization"
@@ -2391,9 +2405,9 @@
 
 #: src/protocols/oscar/oscar.c:2484 src/protocols/oscar/oscar.c:2486
 #: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2560
-#: src/protocols/oscar/oscar.c:2574 src/protocols/oscar/oscar.c:2950
-#: src/protocols/oscar/oscar.c:3001 src/protocols/oscar/oscar.c:4995
-#: src/protocols/oscar/oscar.c:5037
+#: src/protocols/oscar/oscar.c:2574 src/protocols/oscar/oscar.c:2940
+#: src/protocols/oscar/oscar.c:2991 src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5027
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
@@ -2406,10 +2420,11 @@
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason:\n"
 "%s"
-msgstr "使用者 %lu 想要將您加入他的好友清單中，理由如下：\n"
+msgstr ""
+"使用者 %lu 想要將您加入他的好友清單中，理由如下：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
 msgid "Authorization Request"
 msgstr ""
 
@@ -2441,6 +2456,10 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
+"您收到了個特別訊息\n"
+"\n"
+"發訊人：%s [%s]\n"
+"%s"
 
 #: src/protocols/oscar/oscar.c:2596
 #, c-format
@@ -2450,6 +2469,10 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
+"您收到了個 ICQ 傳呼\n"
+"\n"
+"發訊人：%s [%s]\n"
+"%s"
 
 #: src/protocols/oscar/oscar.c:2604
 #, c-format
@@ -2459,209 +2482,213 @@
 "Message is:\n"
 "%s"
 msgstr ""
+"您從 %s [%s] 收到了一封 ICQ 郵件\n"
+"\n"
+"內文：\n"
+"%s"
 
 #: src/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
-msgstr ""
+msgstr "ICQ 使用者 %lu 傳給了您一個好友：%s (%s)"
 
 #: src/protocols/oscar/oscar.c:2629
 msgid "Do you want to add this contact to your Buddy List?"
-msgstr "您想將他（她）加入到您的好友名單中嗎？"
+msgstr "您想將他（她）加入到您的好友清單中嗎？"
 
 #: src/protocols/oscar/oscar.c:2629
 msgid "Decline"
 msgstr "不加了"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:2711
 #, 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 個訊息，因為那是個無效的訊息。"
 msgstr[1] "您遺失了由 %2$s 送來的 %1$hu 個訊息，因為那些都是無效的訊息。"
 
-#: src/protocols/oscar/oscar.c:2724
+#: src/protocols/oscar/oscar.c:2720
 #, 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 個訊息，因為這個訊息太大了。"
 msgstr[1] "您遺失了由 %2$s 送來的 %1$hu 個訊息，因為這些訊息都太大了。"
 
-#: src/protocols/oscar/oscar.c:2735
+#: src/protocols/oscar/oscar.c:2729
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "您遺失了由 %2$s 送來的 %1$hu 個訊息，因為訊息的發送速率已超過了上限。"
-msgstr[1] "您遺失了由 %2$s 送來的 %1$hu 個訊息，因為訊息的發送速率已超過了上限。"
-
-#: src/protocols/oscar/oscar.c:2746
+msgstr[0] ""
+"您遺失了由 %2$s 送來的 %1$hu 個訊息，因為訊息的發送速率已超過了上限。"
+msgstr[1] ""
+"您遺失了由 %2$s 送來的 %1$hu 個訊息，因為訊息的發送速率已超過了上限。"
+
+#: src/protocols/oscar/oscar.c:2738
 #, 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 個訊息，因為發訊人可能不懷好意。"
 msgstr[1] "您遺失了由 %2$s 送來的 %1$hu 個訊息，因為發訊人可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:2747
 #, 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$d 個訊息，因為您可能不懷好意。"
 msgstr[1] "您遺失了由 %2$s 送來的 %1$d 個訊息，因為您可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:2767
+#: src/protocols/oscar/oscar.c:2756
 #, 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$d 個訊息。"
 msgstr[1] "您因為不明的原因，而遺失了由 %2$s 送來的 %1$d 個訊息。"
 
-#: src/protocols/oscar/oscar.c:2782 src/protocols/oscar/oscar.c:4478
-#: src/protocols/oscar/oscar.c:5668
+#: src/protocols/oscar/oscar.c:2772 src/protocols/oscar/oscar.c:4468
+#: src/protocols/oscar/oscar.c:5659
 msgid "Free For Chat"
 msgstr "可和我聊天"
 
-#: src/protocols/oscar/oscar.c:2786 src/protocols/oscar/oscar.c:4472
-#: src/protocols/oscar/oscar.c:5666
+#: src/protocols/oscar/oscar.c:2776 src/protocols/oscar/oscar.c:4462
+#: src/protocols/oscar/oscar.c:5657
 msgid "Not Available"
 msgstr "不在"
 
-#: src/protocols/oscar/oscar.c:2788 src/protocols/oscar/oscar.c:4475
-#: src/protocols/oscar/oscar.c:5667
+#: src/protocols/oscar/oscar.c:2778 src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:5658
 msgid "Occupied"
 msgstr "忙碌中"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:2782
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2852
+#: src/protocols/oscar/oscar.c:2842
 #, 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:2854
+#: src/protocols/oscar/oscar.c:2844
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>狀態：</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2913
+#: src/protocols/oscar/oscar.c:2903
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤：%s\n"
 
-#: src/protocols/oscar/oscar.c:2914
+#: src/protocols/oscar/oscar.c:2904
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:2939
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出："
 
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:2990
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "找不到使用者 %s 的個人資訊："
-# XXX probably still mistranslated
-
-#: src/protocols/oscar/oscar.c:3032
+
+#: src/protocols/oscar/oscar.c:3023
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: src/protocols/oscar/oscar.c:3035
+#: src/protocols/oscar/oscar.c:3026
 msgid "Voice"
 msgstr "聲音"
 
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5692
+#: src/protocols/oscar/oscar.c:3029 src/protocols/oscar/oscar.c:5683
 msgid "Direct IM"
 msgstr "直接即時訊息"
 
-#: src/protocols/oscar/oscar.c:3041 src/gtkblist.c:1480
+#: src/protocols/oscar/oscar.c:3032 src/gtkblist.c:1503
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5704
+#: src/protocols/oscar/oscar.c:3035 src/protocols/oscar/oscar.c:5695
 msgid "Get File"
 msgstr "接收文件"
 
-#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5689
 msgid "Send File"
 msgstr "傳送文件"
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3042
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3045
 msgid "Add-Ins"
 msgstr "插件"
 
+#: src/protocols/oscar/oscar.c:3048
+msgid "Send Buddy List"
+msgstr "送出好友清單"
+
+#: src/protocols/oscar/oscar.c:3051
+msgid "EveryBuddy Bug"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3054
+msgid "AP User"
+msgstr "AP 用戶"
+
 #: src/protocols/oscar/oscar.c:3057
-msgid "Send Buddy List"
-msgstr "送出好友清單"
+msgid "ICQ RTF"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:3060
-msgid "EveryBuddy Bug"
+msgid "Nihilist"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:3063
-msgid "AP User"
-msgstr "AP 用戶"
-
-#: src/protocols/oscar/oscar.c:3066
-msgid "ICQ RTF"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3069
-msgid "Nihilist"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3072
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:3075
+#: src/protocols/oscar/oscar.c:3066
 msgid "ICQ Unknown"
 msgstr "不明的 ICQ 功能"
 
-#: src/protocols/oscar/oscar.c:3078
+#: src/protocols/oscar/oscar.c:3069
 msgid "Trillian Encryption"
 msgstr "Trillian 加密功能"
 
-#: src/protocols/oscar/oscar.c:3081
+#: src/protocols/oscar/oscar.c:3072
 msgid "ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3111
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "無法給您顯示收到的資料，因為不知道這些資料的內碼是什麼。"
 
-#: src/protocols/oscar/oscar.c:3127
+#: src/protocols/oscar/oscar.c:3118
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "自 <b>%s</b> 已登入<br>\n"
-# XXX watch out for formatting problems, ditto below
-
-#: src/protocols/oscar/oscar.c:3132
+
+#: src/protocols/oscar/oscar.c:3123
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "自 <b>%s</b> 已使用這個服務<br>\n"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3129
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "閒置了 <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3132
 msgid "Idle: <b>Active</b>"
 msgstr "<b>沒有閒置</b>"
 
-#: src/protocols/oscar/oscar.c:3144
+#: src/protocols/oscar/oscar.c:3134
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2674,318 +2701,327 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:3176
+#: src/protocols/oscar/oscar.c:3166
 msgid "<i>User has no away message</i>"
 msgstr "<i>使用者沒有離開訊息</i>"
 
-#: src/protocols/oscar/oscar.c:3187
+#: src/protocols/oscar/oscar.c:3177
 msgid "Client Capabilities: "
 msgstr "Client 相容性："
 
-#: src/protocols/oscar/oscar.c:3193
+#: src/protocols/oscar/oscar.c:3183
 msgid "<i>No Information Provided</i>"
-msgstr "<i>未提供任何信息</i>"
-# XXX zh-CN'ism?
-
-#: src/protocols/oscar/oscar.c:3215
+msgstr "<i>未有提供任何信息</i>"
+
+# XXX improper translation here
+#: src/protocols/oscar/oscar.c:3206
 msgid "Your AIM connection may be lost."
-msgstr "您的 AIM 可能斷線了。"
-
-#: src/protocols/oscar/oscar.c:3576
+msgstr "您的 AIM 可能已拆接了。"
+
+#: src/protocols/oscar/oscar.c:3567
 msgid "Rate limiting error."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3577
+msgstr "速率限制錯誤"
+
+#: src/protocols/oscar/oscar.c:3568
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
-msgstr "因為您已經超過了發送訊息速率的上限，您最近的訊息未能送出。請等待十秒後再試一次。"
-
-#: src/protocols/oscar/oscar.c:3636
+msgstr ""
+"因為您已經超過了發送訊息速率的上限，您最近的訊息未能送出。請等待十秒後再試一"
+"次。"
+
+#: src/protocols/oscar/oscar.c:3627
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
-msgstr "因為您用同一帳號已經由其他的地方登入，您已被中斷連線了。"
-
-#: src/protocols/oscar/oscar.c:3638
+msgstr "因為您用同一帳號已經由其他的地方登入，您已被拆接了。"
+
+#: src/protocols/oscar/oscar.c:3629
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明的原因，已經給自動登出了。"
 
-#: src/protocols/oscar/oscar.c:3865
+#: src/protocols/oscar/oscar.c:3856
 msgid "UIN:"
 msgstr "帳號："
 
-#: src/protocols/oscar/oscar.c:3870
+#: src/protocols/oscar/oscar.c:3861
 msgid "First Name:"
 msgstr "名："
 
-#: src/protocols/oscar/oscar.c:3873
+#: src/protocols/oscar/oscar.c:3864
 msgid "Last Name:"
 msgstr "姓："
 
-#: src/protocols/oscar/oscar.c:3876 src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3867 src/protocols/oscar/oscar.c:3873
 msgid "Email Address:"
 msgstr "電郵地址："
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3878
 msgid "Mobile Phone:"
 msgstr "手機號碼："
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:3881
 msgid "Gender:"
 msgstr "性別："
 
-#: src/protocols/oscar/oscar.c:3890
+#: src/protocols/oscar/oscar.c:3881
 msgid "Female"
 msgstr "女"
 
+#: src/protocols/oscar/oscar.c:3881
+msgid "Male"
+msgstr "男"
+
 #: src/protocols/oscar/oscar.c:3890
-msgid "Male"
-msgstr "男"
-
-#: src/protocols/oscar/oscar.c:3899
 msgid "Birthday:"
 msgstr "生日："
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3895
 msgid "Age:"
 msgstr "年齡："
 
-#: src/protocols/oscar/oscar.c:3907
+#: src/protocols/oscar/oscar.c:3898
 msgid "Personal Web Page:"
 msgstr "個人網頁："
 
-#: src/protocols/oscar/oscar.c:3910
+#: src/protocols/oscar/oscar.c:3901
 msgid "Additional Information:"
-msgstr "其他資料："
-
-#: src/protocols/oscar/oscar.c:3914
+msgstr "自訂資料："
+
+#: src/protocols/oscar/oscar.c:3905
 msgid "Home Address:"
 msgstr "住宅地址"
 
-#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
+#: src/protocols/oscar/oscar.c:3907 src/protocols/oscar/oscar.c:3923
 msgid "Address:"
 msgstr "街道地址"
 
-#: src/protocols/oscar/oscar.c:3919 src/protocols/oscar/oscar.c:3935
+#: src/protocols/oscar/oscar.c:3910 src/protocols/oscar/oscar.c:3926
 msgid "City:"
 msgstr "城市："
 
-#: src/protocols/oscar/oscar.c:3922 src/protocols/oscar/oscar.c:3938
+#: src/protocols/oscar/oscar.c:3913 src/protocols/oscar/oscar.c:3929
 msgid "State:"
 msgstr "省/州:"
 
-#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:3941
+#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
 msgid "Zip Code:"
 msgstr "郵區號碼："
 
-#: src/protocols/oscar/oscar.c:3930
+#: src/protocols/oscar/oscar.c:3921
 msgid "Work Address:"
 msgstr "辦公地址："
 
-#: src/protocols/oscar/oscar.c:3946
+#: src/protocols/oscar/oscar.c:3937
 msgid "Work Information:"
 msgstr "工作方面的資料："
 
-#: src/protocols/oscar/oscar.c:3948
+#: src/protocols/oscar/oscar.c:3939
 msgid "Company:"
 msgstr "所屬機構："
 
-#: src/protocols/oscar/oscar.c:3951
+#: src/protocols/oscar/oscar.c:3942
 msgid "Division:"
 msgstr "所屬部門："
 
-#: src/protocols/oscar/oscar.c:3954
+#: src/protocols/oscar/oscar.c:3945
 msgid "Position:"
 msgstr "職位："
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:3948
 msgid "Web Page:"
 msgstr "網址："
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 有下列暱稱：</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4034
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到有關郵址 %s 的資料"
 
-#: src/protocols/oscar/oscar.c:4065
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "您會收到一封叫您確定 %s 的電郵。"
-
-#: src/protocols/oscar/oscar.c:4067
+msgstr "您會收到一封叫您確認 %s 的電郵。"
+
+#: src/protocols/oscar/oscar.c:4057
 msgid "Account Confirmation Requested"
-msgstr "送出了確定帳號的要求"
-
-#: src/protocols/oscar/oscar.c:4095
+msgstr "送出了確認帳號的要求"
+
+#: src/protocols/oscar/oscar.c:4085
 msgid "Error Changing Account Info"
 msgstr "無法更改帳戶資料"
 
-#: src/protocols/oscar/oscar.c:4098
+#: src/protocols/oscar/oscar.c:4088
 #, 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:4101
+#: src/protocols/oscar/oscar.c:4091
 #, 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:4104
+#: src/protocols/oscar/oscar.c:4094
 #, 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:4107
+#: src/protocols/oscar/oscar.c:4097
 #, 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:4110
+#: src/protocols/oscar/oscar.c:4100
 #, 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:4113
+#: src/protocols/oscar/oscar.c:4103
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4116
+#: src/protocols/oscar/oscar.c:4106
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4116
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4127 src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
 msgid "Account Info"
 msgstr "帳戶資料"
 
-#: src/protocols/oscar/oscar.c:4132
+#: src/protocols/oscar/oscar.c:4122
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電郵地址是 %s。"
 
-#: src/protocols/oscar/oscar.c:4354
-#, fuzzy
+#: src/protocols/oscar/oscar.c:4344
 msgid "Unable to set AIM profile."
-msgstr "無法設定 AIM 的帳戶資料。"
-# FIXME get proper translation from Yahoo
-
-#: src/protocols/oscar/oscar.c:4355
+msgstr "無法設定 AIM 的個人檔案。"
+
+#: src/protocols/oscar/oscar.c:4345
 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:4382
+"您大概在登入完了之前就已經要求修改您的個人檔案了；故此，您的個人檔案未能成功"
+"修改。請待您登入完了之後再試試重改一遍。"
+
+#: src/protocols/oscar/oscar.c:4372
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4384
+msgstr "您的個人檔案超過了 %d 個位元組。過長的部分，Gaim 已替您截斷了。"
+
+#: src/protocols/oscar/oscar.c:4374
 msgid "Profile too long."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4400
+msgstr "您的個人檔案太大了。"
+
+#: src/protocols/oscar/oscar.c:4390
 msgid "Unable to set AIM away message."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4401
+msgstr "無法為 AIM 設定離開訊息。"
+
+#: src/protocols/oscar/oscar.c:4391
 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:4437
+"您大概在登入完了之前就已經嘗試設定您的離開訊息了；故此，您的狀態仍然是"
+"「在」。請您等到登入完了之後重試。"
+
+#: src/protocols/oscar/oscar.c:4427
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it and set you away."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4439
+msgstr "您的離開訊息超過了 %d 個位元組。過長的部分，Gaim 已替您截斷了。"
+
+#: src/protocols/oscar/oscar.c:4429
 msgid "Away message too long."
 msgstr "離開訊息太長"
 
-#: src/protocols/oscar/oscar.c:4652
+#: src/protocols/oscar/oscar.c:4642
 msgid "Unable To Retrive Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4652
+#: src/protocols/oscar/oscar.c:4642
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4742 src/protocols/oscar/oscar.c:4743
-#: src/protocols/oscar/oscar.c:4748
+"Gaim 暫時無法從 AIM 的伺服器讀取您的好友清單。您的好友清單依然健在；幾個鐘頭"
+"後應該再次可用。"
+
+#: src/protocols/oscar/oscar.c:4732 src/protocols/oscar/oscar.c:4733
+#: src/protocols/oscar/oscar.c:4738
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4902
 #, 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:4912 src/protocols/oscar/oscar.c:4925
+"無法把 %s 新增到您的好友清單內，因為您的好友清單已有太多好友了。您可以從好友"
+"清單內移除掉一個好友，再試試看。"
+
+#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4915
 msgid "(no name)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4913 src/protocols/oscar/oscar.c:4926
+msgstr "【無名氏】"
+
+#: src/protocols/oscar/oscar.c:4903 src/protocols/oscar/oscar.c:4916
 msgid "Unable To Add"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4925
+msgstr "無法新增"
+
+#: src/protocols/oscar/oscar.c:4915
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4960
+"無法新增好友 %s，但原因不明。最常見的原因是您已有太多好友在好友清單內了。"
+
+#: src/protocols/oscar/oscar.c:4950
 #, 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:4965
+#: src/protocols/oscar/oscar.c:4955
 msgid "Authorization Given"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4995
+msgstr "要求已獲批准"
+
+#: src/protocols/oscar/oscar.c:4985
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -2993,17 +3029,17 @@
 msgstr "使用者 %s 想將您加入他的好友清單中，理由如下：%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5033
+#: src/protocols/oscar/oscar.c:5023
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "使用者 %s 允許了您將其加入您的好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:5034
+#: src/protocols/oscar/oscar.c:5024
 msgid "Authorization Granted"
 msgstr "要求已獲批准"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5037
+#: src/protocols/oscar/oscar.c:5027
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3011,121 +3047,119 @@
 "%s"
 msgstr "使用者 %s 拒絕了您將其加入您的好友清單的要求，理由如下："
 
-
-#: src/protocols/oscar/oscar.c:5038
+#: src/protocols/oscar/oscar.c:5028
 msgid "Authorization Denied"
 msgstr "要求批准被拒"
 
-#: src/protocols/oscar/oscar.c:5075 src/protocols/toc/toc.c:1196
+# XXX unknown meaning -> probably mistranslated
+#: src/protocols/oscar/oscar.c:5065 src/protocols/toc/toc.c:1196
 msgid "Exchange:"
 msgstr "交換："
-# XXX
-
-#: src/protocols/oscar/oscar.c:5295
+
+#: src/protocols/oscar/oscar.c:5285
 msgid "<b>Status:</b> "
 msgstr "<b>狀態：</b>"
 
-#: src/protocols/oscar/oscar.c:5304
+#: src/protocols/oscar/oscar.c:5294
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入了</b> "
+
 # Context: amount of time logged in
-
-#: src/protocols/oscar/oscar.c:5311
+#: src/protocols/oscar/oscar.c:5301
 msgid "<b>Capabilities:</b> "
 msgstr "<b>通訊協定相容性：</b>"
 
-#: src/protocols/oscar/oscar.c:5319
+#: src/protocols/oscar/oscar.c:5309
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態：</b>未獲批准"
 
-#: src/protocols/oscar/oscar.c:5323 src/gtkblist.c:845
+#: src/protocols/oscar/oscar.c:5313 src/gtkblist.c:855
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態：</b>離線"
 
-#: src/protocols/oscar/oscar.c:5349
+#: src/protocols/oscar/oscar.c:5339
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:5530
+#: src/protocols/oscar/oscar.c:5520
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:5543
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您選擇了與 %s 連線，作直接的即時訊息。"
-
-#: src/protocols/oscar/oscar.c:5544
+msgstr "您選擇了與 %s 連接起來，作直接的即時訊息。"
+
+#: src/protocols/oscar/oscar.c:5534
 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:5682
+#: src/protocols/oscar/oscar.c:5673
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:5716
+#: src/protocols/oscar/oscar.c:5707
 msgid "Re-request Authorization"
 msgstr "再次要求批准您加其入好友清單"
 
-#: src/protocols/oscar/oscar.c:5737
+#: src/protocols/oscar/oscar.c:5728
 msgid "The new formatting is invalid."
 msgstr "新的顯示格式並不有效。"
 
-#: src/protocols/oscar/oscar.c:5738
+#: src/protocols/oscar/oscar.c:5729
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "更改帳號的顯示格式，祗可更改大小寫，及加減空白。"
 
-#: src/protocols/oscar/oscar.c:5744
+#: src/protocols/oscar/oscar.c:5735
 msgid "New screenname formatting:"
 msgstr "帳號的顯示格式應該是這樣的："
 
-#: src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:5780
 msgid "Change Address To: "
 msgstr "註冊電郵地址應為："
 
-#: src/protocols/oscar/oscar.c:5799
+#: src/protocols/oscar/oscar.c:5790
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "下列的好友仍未批准您加其入好友清單：<BR>"
 
-#: src/protocols/oscar/oscar.c:5824
+#: src/protocols/oscar/oscar.c:5815
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>沒有人未批准您</i>"
 
-#: src/protocols/oscar/oscar.c:5829
+#: src/protocols/oscar/oscar.c:5820
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
 "clicking on them and clicking \"Re-request authorization.\""
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5862
+#: src/protocols/oscar/oscar.c:5853
 msgid "Change Password (URL)"
 msgstr "修改密碼 (URL)"
 
-#: src/protocols/oscar/oscar.c:5873
+#: src/protocols/oscar/oscar.c:5864
 msgid "Format Screenname"
 msgstr "設定帳號的顯示格式"
 
-#: src/protocols/oscar/oscar.c:5879
+#: src/protocols/oscar/oscar.c:5870
 msgid "Confirm Account"
-msgstr "確定帳號"
-# XXX sounds like a bad translation
-
-#: src/protocols/oscar/oscar.c:5885
+msgstr "確認帳號"
+
+#: src/protocols/oscar/oscar.c:5876
 msgid "Display Current Registered Address"
 msgstr "顯示您目前註了冊的電郵地址"
 
-#: src/protocols/oscar/oscar.c:5891
+#: src/protocols/oscar/oscar.c:5882
 msgid "Change Current Registered Address"
 msgstr "更改您的註冊電郵地址"
 
-#: src/protocols/oscar/oscar.c:5900
+#: src/protocols/oscar/oscar.c:5891
 msgid "Show Buddies Awaiting Authorization"
 msgstr "列出有誰仍未批准您"
 
-#: src/protocols/oscar/oscar.c:5908
+#: src/protocols/oscar/oscar.c:5899
 msgid "Search for Buddy by Email"
 msgstr "以電郵地址找尋好友"
 
@@ -3139,17 +3173,17 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6028 src/protocols/oscar/oscar.c:6030
+#: src/protocols/oscar/oscar.c:6019 src/protocols/oscar/oscar.c:6021
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 通訊協定插件"
 
-#: src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:6039
 msgid "Auth Host:"
-msgstr "伺服器："
-
-#: src/protocols/oscar/oscar.c:6054
+msgstr "認證伺服器："
+
+#: src/protocols/oscar/oscar.c:6045
 msgid "Auth Port:"
-msgstr "端口："
+msgstr "連接埠號碼："
 
 #: src/protocols/toc/toc.c:190
 #, c-format
@@ -3176,11 +3210,11 @@
 msgid "%s not currently logged in."
 msgstr "%s 目前尚未登入。"
 
+# FIXME... what is this?! 
 #: src/protocols/toc/toc.c:502
 #, c-format
 msgid "Warning of %s not allowed."
-msgstr "警告 %s 是不被允許的。"
-# FIXME... what is this?! 
+msgstr "不可警告 %s。"
 
 #: src/protocols/toc/toc.c:505
 msgid "A message has been dropped, you are exceeding the server speed limit."
@@ -3212,22 +3246,19 @@
 
 #: src/protocols/toc/toc.c:523
 msgid "Too many matches."
-msgstr "匹配太多。"
-# FIXME what kind of translation is this?
+msgstr "太多匹配的查詢結果。"
 
 #: src/protocols/toc/toc.c:526
 msgid "Need more qualifiers."
-msgstr ""
+msgstr "須更多的限定詞。"
 
 #: src/protocols/toc/toc.c:529
 msgid "Dir service temporarily unavailable."
-msgstr "目錄服務暫時不存在。"
-# FIXME
+msgstr "目錄服務目前暫停使用。"
 
 #: src/protocols/toc/toc.c:532
 msgid "Email lookup restricted."
-msgstr "禁止 eMail 檢查。"
-# XXX need to verify what this means
+msgstr "電郵查詢被限制了。"
 
 #: src/protocols/toc/toc.c:535
 msgid "Keyword ignored."
@@ -3239,7 +3270,7 @@
 
 #: src/protocols/toc/toc.c:541
 msgid "User has no directory information."
-msgstr "這個使用者沒有他的相關資訊。"
+msgstr "在目錄內沒有這個使用者的資訊。"
 
 #: src/protocols/toc/toc.c:545
 msgid "Country not supported."
@@ -3252,20 +3283,19 @@
 
 #: src/protocols/toc/toc.c:554
 msgid "The service is temporarily unavailable."
-msgstr "服務暫時不存在。"
-# FIXME
+msgstr "服務暫時目前暫停使用。"
 
 #: src/protocols/toc/toc.c:557
 msgid "Your warning level is currently too high to log in."
-msgstr ""
+msgstr "您的警告等級實在太高了，目前無法登入。"
 
 #: src/protocols/toc/toc.c:560
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"您的連線／斷線動作太過頻繁。請等待十分鐘後才再行重試，"
-"否則您只會浪費更多時間。"
+"您的連接／拆接動作太過頻繁。請等待十分鐘後才再行重試，否則您只會浪費更多時"
+"間。"
 
 #: src/protocols/toc/toc.c:562
 #, c-format
@@ -3276,12 +3306,10 @@
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "發生了一個未知的錯誤 %d。資訊：%s"
-# XXX weird
 
 #: src/protocols/toc/toc.c:582
 msgid "Connection Closed"
-msgstr "連線關閉"
-# FIXME
+msgstr "拆接了"
 
 #: src/protocols/toc/toc.c:620
 msgid "Waiting for reply..."
@@ -3322,11 +3350,11 @@
 #: src/protocols/toc/toc.c:1644 src/protocols/toc/toc.c:1683
 #: src/protocols/toc/toc.c:1891
 msgid "Could not connect for transfer."
-msgstr "無法開啟傳輸的連線！"
+msgstr "無法連接，也無法傳輸了。"
 
 #: src/protocols/toc/toc.c:1806
 msgid "Could not connect for transfer!"
-msgstr "無法開啟傳輸的連線！"
+msgstr "無法連接，也無法傳輸了！"
 
 #: src/protocols/toc/toc.c:1838
 msgid "Could not write file header.  The file will not be transferred."
@@ -3372,7 +3400,7 @@
 
 #: src/protocols/toc/toc.c:2075
 msgid "TOC Port:"
-msgstr "TOC 端口："
+msgstr "TOC 連接埠："
 
 #: src/protocols/yahoo/yahoo.c:604
 msgid "Your Yahoo! message did not get sent."
@@ -3409,11 +3437,11 @@
 
 #: src/protocols/yahoo/yahoo.c:1434
 msgid "Pager Host:"
-msgstr ""
+msgstr "傳呼台主機："
 
 #: src/protocols/yahoo/yahoo.c:1440
 msgid "Pager Port:"
-msgstr ""
+msgstr "連接埠號碼："
 
 #. *< api_version
 #. *< type
@@ -3503,10 +3531,9 @@
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
 "written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
-"Gaim 是一個模組化的即時訊息程式，"
-"同時提供 AIM、ICQ、Yahoo!、MSN、IRC、Jabber、Napster、Zephyr "
-"以及 Gadu-Gadu 等多種功能。"
-"以 GTK+ 開發，以 GPL 的方式發佈。<BR><BR>"
+"Gaim 是一個模組化的即時傳訊系統，同時提供 AIM、ICQ、Yahoo!、MSN、IRC、"
+"Jabber、Napster、Zephyr 以及 Gadu-Gadu 等多種功能。以 GTK+ 台階開發，"
+"以 GPL 的方式發佈。<BR><BR>"
 
 #: src/about.c:116
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
@@ -3514,7 +3541,7 @@
 
 #: src/about.c:120
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
-msgstr ""
+msgstr "<FONT SIZE=\"3\">現任開發者：</FONT><BR>"
 
 #: src/about.c:122
 msgid ""
@@ -3526,14 +3553,21 @@
 "A>&gt;<BR>  Nathan 'faceprint' Walp (developer)<BR>  Mark 'KingAnt' Doliner "
 "(developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
 msgstr ""
+"  Rob Flynn (維護者) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (首席開發者) &lt;<A HREF=\"mailto:bj91704@binghamton."
+"edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian Hammond 號 'ChipX86' (開"
+"發者兼網路管理員)<BR>  Herman Bloggs (win32 移植者) &lt;<A HREF=\"mailto:"
+"hermanator12002@yahoo.com\">hermanator12002@yahoo.com</A>&gt;<BR>  Nathan "
+"Walp 號 'faceprint' (開發者)<BR>  Mark Doliner 號 'KingAnt' (開發者)<BR>  "
+"Luke Schierer 號 'LSchiere' (用者支援)<BR><BR>"
 
 #: src/about.c:137
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
-msgstr ""
+msgstr "<FONT SIZE=\"3\">極賣力的修補檔案編寫者：</FONT><BR>"
 
 #: src/about.c:147
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
-msgstr ""
+msgstr "<FONT SIZE=\"3\">已退任的開發者：</FONT><BR>"
 
 #: src/about.c:149
 msgid ""
@@ -3544,6 +3578,12 @@
 "&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
 "Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 msgstr ""
+"  Adam Fritzler (前任 libfaim 維護者)<BR>  Eric Warmenhoven (前任首席開發者)"
+"&lt;<A HREF=\"mailto:warmenhoven@yahoo.com\">warmenhoven@yahoo.com</A>&gt;"
+"<BR>  Jim Duchek (前任維護者)<BR>  Jim Seymour (前任 Jabber 開發者)<BR>  "
+"Mark Spencer (原著者) &lt;<A HREF=\"mailto:markster@marko.net"
+"\">markster@marko.net</A>&gt;<BR>  Syd Logan (程式編寫者及御用司機【懶人】)"
+"<BR><BR>"
 
 #: src/about.c:169 src/dialogs.c:4239 src/prpl.c:500 src/prpl.c:806
 #: src/server.c:1428
@@ -3570,7 +3610,7 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:365 src/prefs.c:1790
+#: src/blist.c:365 src/prefs.c:1812
 msgid "Chats"
 msgstr "聊天"
 
@@ -3713,12 +3753,10 @@
 #: src/dialogs.c:363
 msgid "Warn User"
 msgstr "警告使用者"
-# XXX
 
 #: src/dialogs.c:363
 msgid "_Warn"
-msgstr "警告"
-# XXX
+msgstr "警告(_W)"
 
 #: src/dialogs.c:379
 #, c-format
@@ -3728,6 +3766,9 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">警告 %s 嗎？</span>\n"
+"\n"
+"警告 %s 會提高他的警告等級，令他發出訊息的速率受到愈趨嚴厲的限制。\n"
 
 #: src/dialogs.c:388
 msgid "Warn _anonymously?"
@@ -3735,14 +3776,13 @@
 
 #: src/dialogs.c:395
 msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>匿名的警告比較沒有那麼嚴重。</b>"
+msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
 #: src/dialogs.c:466
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-"您真的要將 %s 從您的好友清單中移除嗎？"
+msgstr "您真的要將 %s 從您的好友清單中移除嗎？"
 
 #: src/dialogs.c:467
 msgid "Remove Buddy"
@@ -3753,8 +3793,7 @@
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr ""
-"您真的要將聊天室「%s」從您的好友清單中移除嗎？"
+msgstr "您真的要將聊天室「%s」從您的好友清單中移除嗎？"
 
 #: src/dialogs.c:474
 msgid "Remove Chat"
@@ -3765,8 +3804,7 @@
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
-msgstr ""
-"您真的要將整個群組「%s」及其內的好友，一併從您的好友清單中移除嗎？"
+msgstr "您真的要將整個群組「%s」及其內的好友，一併從您的好友清單中移除嗎？"
 
 #: src/dialogs.c:482
 msgid "Remove Group"
@@ -3780,16 +3818,15 @@
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 
-# FIXME below... the 2 translated terms will appear identical!!!
+# XXX check all contexts (see also "_Account:" below) (q.v.)
 #: src/dialogs.c:726 src/dialogs.c:827 src/dialogs.c:3779
 msgid "_Screenname:"
-msgstr "對方帳號："
-# XXX check all contexts
-
+msgstr "對方帳號(_S)："
+
+# XXX check all contexts (see also "_Screenname:" above) (q.v.)
 #: src/dialogs.c:741 src/dialogs.c:843 src/gtkpounce.c:518
 msgid "_Account:"
-msgstr "您的帳號："
-# XXX check all contexts
+msgstr "您的帳號(_A)："
 
 #: src/dialogs.c:796
 msgid "Get User Info"
@@ -3809,9 +3846,9 @@
 msgid "Please enter the name of the group to be added.\n"
 msgstr ""
 
-#: src/dialogs.c:1020 src/dialogs.c:4328
+#: src/dialogs.c:1020 src/dialogs.c:4327
 msgid "_Group:"
-msgstr "群組："
+msgstr "群組(_G)："
 
 #: src/dialogs.c:1102
 msgid "Add Buddy"
@@ -3935,10 +3972,10 @@
 #. Line 6
 #: src/dialogs.c:2098 src/dialogs.c:2733
 msgid "State"
-msgstr "省/州"
+msgstr "省╱州"
 
 #: src/dialogs.c:2140 src/dialogs.c:2311 src/dialogs.c:3448 src/dialogs.c:4248
-#: src/dialogs.c:4999
+#: src/dialogs.c:4998
 msgid "Save"
 msgstr "儲存"
 
@@ -3969,14 +4006,14 @@
 
 #. Build OK Button
 #: src/dialogs.c:2251 src/dialogs.c:2383 src/dialogs.c:2665 src/dialogs.c:2811
-#: src/dialogs.c:3945 src/dialogs.c:4425 src/prpl.c:245
+#: src/dialogs.c:3945 src/dialogs.c:4424 src/prpl.c:245
 msgid "OK"
 msgstr "好！"
 
 #: src/dialogs.c:2288
 #, c-format
 msgid "Changing info for %s:"
-msgstr ""
+msgstr "更改 %s 的自訂資料："
 
 #: src/dialogs.c:2369
 msgid "Below are the results of your search: "
@@ -3984,19 +4021,15 @@
 
 #: src/dialogs.c:2477
 msgid "Permit"
-msgstr "許可"
+msgstr "允許這個"
 
 #: src/dialogs.c:2509
-#, fuzzy
 msgid "Add Permit"
-msgstr "許可"
-# FIXME what is this??
+msgstr "新增獲允許的使用者"
 
 #: src/dialogs.c:2511
-#, fuzzy
 msgid "Add Deny"
-msgstr "增加禁止人"
-# FIXME what is this???
+msgstr "新增被拒的使用者"
 
 #: src/dialogs.c:2579
 msgid "Log Conversation"
@@ -4016,19 +4049,17 @@
 
 #: src/dialogs.c:2891
 msgid "Insert Link"
-msgstr "加入連結"
+msgstr "加入鏈結"
 
 #: src/dialogs.c:2893
-#, fuzzy
 msgid "Insert"
-msgstr "加入連結"
-# XXX verify context
+msgstr "加入鏈結"
 
 #: src/dialogs.c:2912
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
-msgstr ""
+msgstr "請輸入鏈結的 URL。您可以選擇同時輸入該鏈結的說明。\n"
 
 #: src/dialogs.c:3077 src/dialogs.c:3094
 msgid "Select Text Color"
@@ -4085,18 +4116,18 @@
 #. Setup the label containing the description.
 #: src/dialogs.c:3679
 msgid "Please enter an aliased name for this chat.\n"
-msgstr ""
+msgstr "請給這個聊天室輸入別名。\n"
 
 #: src/dialogs.c:3691 src/dialogs.c:3793
 msgid "_Alias:"
-msgstr "別名："
+msgstr "別名(_A)："
 
 #. Setup the label containing the description.
 #: src/dialogs.c:3758
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
-msgstr ""
+msgstr "請在給下列用戶輸入別名，或者在您的好友清單內修改這個好友的名稱。\n"
 
 #: src/dialogs.c:3847 src/dialogs.c:3854
 #, c-format
@@ -4151,19 +4182,19 @@
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4302
+#: src/dialogs.c:4301
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/dialogs.c:4319
+#: src/dialogs.c:4318
 msgid "Please enter a new name for the selected group.\n"
-msgstr ""
-
-#: src/dialogs.c:4395 src/dialogs.c:4404
+msgstr "請給您選擇了的群組輸入新名。\n"
+
+#: src/dialogs.c:4394 src/dialogs.c:4403
 msgid "Rename Buddy"
 msgstr "修改好友名稱"
 
-#: src/dialogs.c:4411
+#: src/dialogs.c:4410
 msgid "New name:"
 msgstr "新名字："
 
@@ -4246,170 +4277,169 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr ""
 
-#: src/gaimrc.c:292 src/gaimrc.c:325 src/gaimrc.c:1448
+#: src/gaimrc.c:292 src/gaimrc.c:325 src/gaimrc.c:1451
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1546
+#: src/gaimrc.c:1549
 #, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/gaimrc.c:1603
+#: src/gaimrc.c:1606
 msgid "Unable to Save Preferences"
 msgstr "無法儲存偏好設定"
 
-#: src/gaimrc.c:1603
+#: src/gaimrc.c:1606
 msgid ""
 "Gaim was unable to save your preferences.  Please verify that you have "
 "enough free space."
 msgstr "Gaim 無法儲存您的偏好設定。請查一查您的磁盤是否已無空間。"
 
-#: src/gtkblist.c:382
+#: src/gtkblist.c:392
 msgid "Add a _Buddy"
-msgstr "新增好友"
-
-#: src/gtkblist.c:383
+msgstr "新增好友(_B)"
+
+#: src/gtkblist.c:393
 msgid "Add a C_hat"
 msgstr "新增聊天室(_H)"
-# FIXME
-
-#: src/gtkblist.c:384
+
+#: src/gtkblist.c:394
 msgid "_Delete Group"
 msgstr "移除群組(_D)"
 
-#: src/gtkblist.c:385
+#: src/gtkblist.c:395
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
-#: src/gtkblist.c:387
+#: src/gtkblist.c:397
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:388 src/gtkblist.c:419
+#: src/gtkblist.c:398 src/gtkblist.c:429
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: src/gtkblist.c:389 src/gtkblist.c:420
+#: src/gtkblist.c:399 src/gtkblist.c:430
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:398
+#: src/gtkblist.c:408
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: src/gtkblist.c:400
+#: src/gtkblist.c:410
 msgid "_IM"
 msgstr "即時訊息(_I)"
 
-#: src/gtkblist.c:401
+#: src/gtkblist.c:411
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:402
+#: src/gtkblist.c:412
 msgid "View _Log"
-msgstr "觀看日誌"
+msgstr "觀看日誌(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:733
+#: src/gtkblist.c:743
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:734
+#: src/gtkblist.c:744
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友(B)/送出即時訊息(_I)..."
 
-#: src/gtkblist.c:735
+#: src/gtkblist.c:745
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天室(_C)..."
 
-#: src/gtkblist.c:736
+#: src/gtkblist.c:746
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友(B)/取得使用者資訊(_U)..."
 
-#: src/gtkblist.c:738
+#: src/gtkblist.c:748
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/顯示離線的好友(_O)"
 
-#: src/gtkblist.c:739
+#: src/gtkblist.c:749
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/顯示沒有好友的群組(_E)"
 
-#: src/gtkblist.c:740
+#: src/gtkblist.c:750
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友(B)/加一個好友入好友清單(_A)..."
 
-#: src/gtkblist.c:741
+#: src/gtkblist.c:751
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友(B)/加一個聊天室入好友清單(_H)..."
 
-#: src/gtkblist.c:742
+#: src/gtkblist.c:752
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友(B)/加一個群組入好友清單(_G)..."
 
-#: src/gtkblist.c:744
+#: src/gtkblist.c:754
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:745
+#: src/gtkblist.c:755
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出 Gaim (_Q)"
 
 #. Tools
-#: src/gtkblist.c:748
+#: src/gtkblist.c:758
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:749
+#: src/gtkblist.c:759
 msgid "/Tools/_Away"
 msgstr "/工具(T)/離開(_A)"
 
-#: src/gtkblist.c:750
+#: src/gtkblist.c:760
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:751
+#: src/gtkblist.c:761
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/通訊協定相關功能(_R)"
 
-#: src/gtkblist.c:753
+#: src/gtkblist.c:763
 msgid "/Tools/A_ccounts..."
 msgstr "/工具(T)/帳戶(_C)"
 
-#: src/gtkblist.c:754
+#: src/gtkblist.c:764
 msgid "/Tools/_File Transfers..."
 msgstr "/工具(T)/文件傳輸(_F)"
 
-#: src/gtkblist.c:755
+#: src/gtkblist.c:765
 msgid "/Tools/Preferences..."
 msgstr "/工具(T)/偏好設定"
 
-#: src/gtkblist.c:756
+#: src/gtkblist.c:766
 msgid "/Tools/Pr_ivacy..."
-msgstr "/工具(T)/隱私設定"
-
-#: src/gtkblist.c:758
+msgstr "/工具(T)/隱私設定(_I)"
+
+#: src/gtkblist.c:768
 msgid "/Tools/View System _Log..."
 msgstr "/工具(T)/觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:761
+#: src/gtkblist.c:771
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/gtkblist.c:762
+#: src/gtkblist.c:772
 msgid "/Help/Online _Help"
 msgstr "/說明(H)/線上求助(_H)"
 
-#: src/gtkblist.c:763
+#: src/gtkblist.c:773
 msgid "/Help/_Debug Window..."
 msgstr "/說明(H)/除錯視窗(_D)"
 
-#: src/gtkblist.c:764
+#: src/gtkblist.c:774
 msgid "/Help/_About..."
-msgstr "/說明(H)/關於 Gaim"
-
-#: src/gtkblist.c:798
+msgstr "/說明(H)/關於 G_aim"
+
+#: src/gtkblist.c:808
 #, c-format
 msgid ""
 "\n"
@@ -4418,12 +4448,12 @@
 "\n"
 "<b>帳號：</b> %s"
 
-#: src/gtkblist.c:857
+#: src/gtkblist.c:867
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: src/gtkblist.c:871
+#: src/gtkblist.c:881
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4431,7 +4461,7 @@
 "\n"
 "<b>帳號：</b>"
 
-#: src/gtkblist.c:872
+#: src/gtkblist.c:882
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4439,7 +4469,7 @@
 "\n"
 "<b>別名：</b>"
 
-#: src/gtkblist.c:873
+#: src/gtkblist.c:883
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4447,7 +4477,7 @@
 "\n"
 "<b>暱稱：</b>"
 
-#: src/gtkblist.c:874
+#: src/gtkblist.c:884
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4455,77 +4485,79 @@
 "\n"
 "<b>閒置了</b>"
 
-#: src/gtkblist.c:875
+#: src/gtkblist.c:885
 msgid ""
 "\n"
 "<b>Warned:</b>"
 msgstr ""
-
-#: src/gtkblist.c:877
+"\n"
+"<b>被警告：</b>"
+
+#: src/gtkblist.c:887
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:1169
+#: src/gtkblist.c:1179
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置了%d小時%d分鐘"
 
-#: src/gtkblist.c:1171
+#: src/gtkblist.c:1181
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置了%d分鐘"
 
-#: src/gtkblist.c:1175
+#: src/gtkblist.c:1185
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:1332 src/prefs.c:1787
+#: src/gtkblist.c:1352 src/prefs.c:1809
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: src/gtkblist.c:1356
+#: src/gtkblist.c:1376
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:1359
+#: src/gtkblist.c:1379
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:1362
+#: src/gtkblist.c:1382
 msgid "/Tools/Protocol Actions"
 msgstr "/工具/協定相關功能"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1442
+#: src/gtkblist.c:1465
 msgid "/Buddies/Show Offline Buddies"
-msgstr ""
-
-#: src/gtkblist.c:1444
+msgstr "/好友/顯示離線的好友"
+
+#: src/gtkblist.c:1467
 msgid "/Buddies/Show Empty Groups"
-msgstr ""
-
-#: src/gtkblist.c:1462 src/gtkconv.c:765
+msgstr "/好友/顯示沒有好友的群組"
+
+#: src/gtkblist.c:1485 src/gtkconv.c:765
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkblist.c:1468
+#: src/gtkblist.c:1491
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給選定了的好友"
 
-#: src/gtkblist.c:1477
+#: src/gtkblist.c:1500
 msgid "Get information on the selected buddy"
 msgstr "顯示被選定了的好友的資訊"
 
-#: src/gtkblist.c:1485
+#: src/gtkblist.c:1508
 msgid "Join a chat room"
 msgstr "進入聊天室"
 
-#: src/gtkblist.c:1493
+#: src/gtkblist.c:1516
 msgid "Set an away message"
 msgstr "設定您的離開訊息"
 
@@ -4589,7 +4621,7 @@
 
 #: src/gtkconv.c:2542
 msgid "/Conversation/_Save As..."
-msgstr "/交談(C)/把交談內容存檔..."
+msgstr "/交談(C)/把交談內容存檔(_S)..."
 
 #: src/gtkconv.c:2544
 msgid "/Conversation/View _Log..."
@@ -4649,11 +4681,11 @@
 
 #: src/gtkconv.c:2648 src/gtkconv.c:3794
 msgid "Add the user to your buddy list"
-msgstr "加這個用戶到好友清單內"
+msgstr "加這個使用者到好友清單內"
 
 #: src/gtkconv.c:2654 src/gtkconv.c:3785
 msgid "Remove the user from your buddy list"
-msgstr "由好友名單移除這個用戶"
+msgstr "由好友清單移除這個使用者"
 
 #. Warn button
 #: src/gtkconv.c:2661
@@ -4662,7 +4694,7 @@
 
 #: src/gtkconv.c:2665
 msgid "Warn the user"
-msgstr "警告這個用戶嗎？"
+msgstr "警告這個使用者"
 
 #: src/gtkconv.c:2672 src/gtkconv.c:3103
 msgid "Get the user's information"
@@ -4700,15 +4732,15 @@
 
 #: src/gtkconv.c:2817
 msgid "Larger font size"
-msgstr "字體大一點"
+msgstr "字型變大一點"
 
 #: src/gtkconv.c:2829
 msgid "Normal font size"
-msgstr "正常字體大小"
+msgstr "正常字型大小"
 
 #: src/gtkconv.c:2841
 msgid "Smaller font size"
-msgstr "字體小一點"
+msgstr "字型變小一點"
 
 #: src/gtkconv.c:2858
 msgid "Font Face"
@@ -4716,7 +4748,7 @@
 
 #: src/gtkconv.c:2870
 msgid "Foreground font color"
-msgstr "字體顏色"
+msgstr "字型顏色"
 
 #: src/gtkconv.c:2882
 msgid "Background color"
@@ -4728,7 +4760,7 @@
 
 #: src/gtkconv.c:2908
 msgid "Insert link"
-msgstr "加入連結"
+msgstr "加入鏈結"
 
 #: src/gtkconv.c:2919
 msgid "Insert smiley"
@@ -4745,7 +4777,7 @@
 
 #: src/gtkconv.c:3080
 msgid "IM the user"
-msgstr ""
+msgstr "向這個使用者發出即時訊息"
 
 #: src/gtkconv.c:3092
 msgid "Ignore the user"
@@ -4764,8 +4796,7 @@
 
 #: src/gtkconv.c:4710
 msgid "Disable Animation"
-msgstr "不使用動畫"
-# XXX ???
+msgstr "停用動畫"
 
 #: src/gtkconv.c:4719
 msgid "Enable Animation"
@@ -4781,7 +4812,7 @@
 
 #: src/gtkft.c:103
 msgid "Calculating..."
-msgstr ""
+msgstr "計算中..."
 
 #: src/gtkft.c:106
 msgid "Unknown."
@@ -4794,11 +4825,11 @@
 
 #: src/gtkft.c:218
 msgid "<b>Receiving From:</b>"
-msgstr ""
+msgstr "<b>接收自：</b>"
 
 #: src/gtkft.c:221
 msgid "<b>Sending To:</b>"
-msgstr ""
+msgstr "<b>傳送至：</b>"
 
 #: src/gtkft.c:445
 msgid "Progress"
@@ -4851,21 +4882,21 @@
 #. "Download Details" arrow
 #: src/gtkft.c:614
 msgid "Show download details"
-msgstr ""
+msgstr "顯示下載詳情"
 
 #: src/gtkft.c:615
 msgid "Hide download details"
-msgstr ""
+msgstr "不顯示下載詳情"
 
 #. Pause button
 #: src/gtkft.c:657
 msgid "_Pause"
-msgstr ""
+msgstr "暫停(_P)"
 
 #. Resume button
 #: src/gtkft.c:667
 msgid "_Resume"
-msgstr ""
+msgstr "繼續(_R)"
 
 #: src/gtkft.c:1009
 msgid "That file does not exist."
@@ -4877,7 +4908,7 @@
 
 #: src/gtkft.c:1028
 msgid "That file already exists. Would you like to overwrite it?"
-msgstr ""
+msgstr "該檔案已存在了，您要把它覆蓋掉嗎？"
 
 #: src/gtkft.c:1054
 msgid "Gaim - Open..."
@@ -4890,11 +4921,11 @@
 
 #: src/gtkimhtml.c:342
 msgid "_Copy Link Location"
-msgstr ""
+msgstr "複製這個鏈結的網址(_C)"
 
 #: src/gtkimhtml.c:349
 msgid "_Open Link in Browser"
-msgstr ""
+msgstr "用瀏覽器開啟這個鏈結(_O)"
 
 #: src/gtkimhtml.c:1664
 msgid ""
@@ -4913,11 +4944,11 @@
 
 #: src/gtkimhtml.c:1703
 msgid "_Save Image..."
-msgstr "儲存圖示為..."
+msgstr "儲存圖示為(_S)..."
 
 #: src/gtkpounce.c:121
 msgid "Select a file"
-msgstr ""
+msgstr "請選擇一個檔案"
 
 #: src/gtkpounce.c:170
 msgid "Please enter a buddy to pounce."
@@ -4926,7 +4957,7 @@
 #: src/gtkpounce.c:342
 #, c-format
 msgid "%s has started typing to you"
-msgstr ""
+msgstr "%s 開始打字給您了"
 
 #: src/gtkpounce.c:343
 #, c-format
@@ -4936,17 +4967,17 @@
 #: src/gtkpounce.c:344
 #, c-format
 msgid "%s has returned from being idle"
-msgstr ""
+msgstr "%s 剛才閒置了，現在回來了"
 
 #: src/gtkpounce.c:345
 #, c-format
 msgid "%s has returned from being away"
-msgstr ""
+msgstr "%s 剛才離開了，現在回來了"
 
 #: src/gtkpounce.c:346
 #, c-format
 msgid "%s has stopped typing to you"
-msgstr ""
+msgstr "%s 停了打字給您"
 
 #: src/gtkpounce.c:347
 #, c-format
@@ -4956,16 +4987,16 @@
 #: src/gtkpounce.c:348
 #, c-format
 msgid "%s has become idle"
-msgstr ""
+msgstr "%s 閒置了"
 
 #: src/gtkpounce.c:349
 #, c-format
 msgid "%s has gone away."
-msgstr ""
+msgstr "%s 離開了"
 
 #: src/gtkpounce.c:350
 msgid "Unknown pounce event. Please report this!"
-msgstr ""
+msgstr "捕捉到了不明的好友狀態。請向開發者報告！"
 
 #. "New Buddy Pounce"
 #: src/gtkpounce.c:493 src/gtkpounce.c:883
@@ -4983,7 +5014,7 @@
 
 #: src/gtkpounce.c:533
 msgid "_Buddy Name:"
-msgstr "好友帳號："
+msgstr "好友帳號(_B)："
 
 #. Create the "Pounce When" frame.
 #: src/gtkpounce.c:552
@@ -5024,10 +5055,8 @@
 msgstr "開啟即時訊息視窗"
 
 #: src/gtkpounce.c:611
-#, fuzzy
 msgid "Popup notification"
-msgstr "跳出通知"
-# XXX ?!
+msgstr "即現通知"
 
 #: src/gtkpounce.c:612
 msgid "Send a message"
@@ -5045,13 +5074,13 @@
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/gtkpounce.c:621 src/prefs.c:1614
+#: src/gtkpounce.c:621 src/prefs.c:1636
 msgid "Test"
 msgstr "測試"
 
 #: src/gtkpounce.c:704
 msgid "_Save this pounce after activation"
-msgstr "儲存設定（這樣才能在每次事件發生時發生作用）"
+msgstr "儲存設定(_S)（這樣才能在每次事件發生時發生作用）"
 
 #. "Remove Buddy Pounce"
 #: src/gtkpounce.c:890
@@ -5064,7 +5093,7 @@
 
 #: src/html.c:326
 msgid "g003: Error opening connection.\n"
-msgstr "g003: 連線開啟錯誤。\n"
+msgstr "g003: 連接開啟錯誤。\n"
 
 #: src/log.c:118
 msgid "Gaim - Save Conversation"
@@ -5188,10 +5217,10 @@
 msgid "<New User>"
 msgstr "【新用戶】"
 
+# XXX This is a window title. Do we really want to translate this?
 #: src/main.c:312
-#, fuzzy
 msgid "Login"
-msgstr "登入中"
+msgstr "登入"
 
 #: src/main.c:328
 msgid "Screen Name:"
@@ -5202,7 +5231,7 @@
 msgid "Accounts"
 msgstr "帳號一覽"
 
-#: src/main.c:372 src/prefs.c:1854 src/win32/systray.c:355
+#: src/main.c:372 src/prefs.c:1876 src/win32/systray.c:355
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -5226,7 +5255,7 @@
 msgid "Buddy Icon File:"
 msgstr "好友圖示檔案："
 
-#: src/multi.c:684 src/prefs.c:1618
+#: src/multi.c:684 src/prefs.c:1640
 msgid "Reset"
 msgstr "重置"
 
@@ -5277,11 +5306,11 @@
 
 #: src/multi.c:1022
 msgid "Use Global Proxy Settings"
-msgstr ""
+msgstr "使用整體的代理伺服器設定"
 
 #: src/multi.c:1031
 msgid "No Proxy"
-msgstr "沒有代理伺服器"
+msgstr "毋須代理伺服器"
 
 #: src/multi.c:1083
 msgid "_Host:"
@@ -5307,10 +5336,10 @@
 msgid "Show fewer options"
 msgstr "顯示少些代理伺服器選項"
 
+# XXX verify context
 #: src/multi.c:1339
 msgid "_Login"
 msgstr "帳號(_L)"
-# XXX verify context
 
 #: src/multi.c:1357
 #, c-format
@@ -5325,7 +5354,7 @@
 
 #: src/multi.c:1419
 msgid "TOC not found."
-msgstr ""
+msgstr "找不到 TOC。"
 
 #: src/multi.c:1420
 msgid ""
@@ -5333,6 +5362,9 @@
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
+"您試圖以 TOC 通訊協定登入一個即時訊息帳戶。因為這個通訊協定實在比 OSCAR 遜"
+"色，目前祗預設了以套件形式提供這個通訊協定。要登入這個帳戶，請改用 OSCAR，或"
+"者載入 TOC 套件。"
 
 #: src/multi.c:1426
 msgid "Protocol not found."
@@ -5343,8 +5375,8 @@
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
 msgstr ""
-"您無法使用這個帳號來登入；您可能沒有設定這個帳號所使用的通訊協定，"
-"或者這個通訊協定並不提供登入的功能。"
+"您無法使用這個帳號來登入；您可能沒有設定這個帳號所使用的通訊協定，或者這個通"
+"訊協定並不提供登入的功能。"
 
 #: src/multi.c:1506
 #, c-format
@@ -5364,9 +5396,8 @@
 msgstr "修改(_M)"
 
 #: src/multi.c:1625
-
 msgid "Done."
-msgstr "完了。"
+msgstr "登入完了。"
 
 #: src/multi.c:1861
 msgid "Signon: "
@@ -5407,7 +5438,7 @@
 
 #: src/multi.c:2034
 msgid "Connection Error"
-msgstr "連線錯誤"
+msgstr "連接錯誤"
 
 #: src/prefs.c:205
 msgid "Interface Options"
@@ -5433,31 +5464,31 @@
 
 #: src/prefs.c:456
 msgid "_Bold"
-msgstr "粗體"
+msgstr "粗體(_B)"
 
 #: src/prefs.c:457
 msgid "_Italics"
-msgstr "斜體"
+msgstr "斜體(_I)"
 
 #: src/prefs.c:458
 msgid "_Underline"
-msgstr "加有底線"
+msgstr "加有底線(_U)"
 
 #: src/prefs.c:459
 msgid "_Strikethrough"
-msgstr "刪除樣式"
+msgstr "加有刪除線(_S)"
 
 #: src/prefs.c:461
 msgid "Face"
-msgstr "字體"
+msgstr "字型"
 
 #: src/prefs.c:464
 msgid "Use custo_m face"
-msgstr "自訂字型(_M)"
+msgstr "自訂字體(_M)"
 
 #: src/prefs.c:478
 msgid "Use custom si_ze"
-msgstr "自訂字體大小(_Z)"
+msgstr "自訂字型大小(_Z)"
 
 #: src/prefs.c:486
 msgid "Color"
@@ -5471,7 +5502,7 @@
 msgid "Bac_kground color"
 msgstr "背景顏色(_K)"
 
-#: src/prefs.c:534 src/prefs.c:676 src/prefs.c:717
+#: src/prefs.c:534 src/prefs.c:695 src/prefs.c:736
 msgid "Display"
 msgstr "顯示"
 
@@ -5481,11 +5512,11 @@
 
 #: src/prefs.c:536
 msgid "Show _timestamp on messages"
-msgstr "顯示接收訊息的時間(_T)"
+msgstr "顯示訊息的時間戳(_T)"
 
 #: src/prefs.c:537
 msgid "Show _URLs as links"
-msgstr "以超連結顯示 _URL"
+msgstr "以超鏈結顯示 _URL"
 
 #: src/prefs.c:539
 msgid "_Highlight misspelled words"
@@ -5501,7 +5532,7 @@
 
 #: src/prefs.c:544
 msgid "Ignore font si_zes"
-msgstr "忽略字體大小(_Z)"
+msgstr "忽略字型大小(_Z)"
 
 #: src/prefs.c:556
 msgid "Send Message"
@@ -5509,11 +5540,11 @@
 
 #: src/prefs.c:557
 msgid "_Enter sends message"
-msgstr "按下 _Enter 送出訊息"
+msgstr "按下 _Enter 鍵隨即送出訊息"
 
 #: src/prefs.c:558
 msgid "C_ontrol-Enter sends message"
-msgstr "按下 Ctrl-Enter 送出訊息(_O)"
+msgstr "按下 Ctrl-Enter 鍵隨即送出訊息(_O)"
 
 #: src/prefs.c:560
 msgid "Window Closing"
@@ -5521,11 +5552,11 @@
 
 #: src/prefs.c:561
 msgid "E_scape closes window"
-msgstr "按下 E_scape 即關閉視窗"
+msgstr "按下 E_scape 鍵隨即關閉視窗"
 
 #: src/prefs.c:562
 msgid "Control-_W closes window"
-msgstr "按下 Ctrl-_W 即關閉視窗"
+msgstr "按下 Ctrl-_W 鍵隨即關閉視窗"
 
 #: src/prefs.c:565
 msgid "Control-{B/I/U/S} inserts _HTML tags"
@@ -5535,360 +5566,355 @@
 msgid "Control-(number) inserts _smileys"
 msgstr "按下 CTRL-數字鍵 來加入一個笑臉(_S)"
 
-#: src/prefs.c:579
+#: src/prefs.c:584
+msgid "Buddy List Sorting"
+msgstr "好友清單的排序"
+
+#: src/prefs.c:593
+msgid "Sorting:"
+msgstr "排序："
+
+#: src/prefs.c:598
 msgid "Buddy List Toolbar"
 msgstr "好友清單選項"
 
-#: src/prefs.c:580 src/prefs.c:659 src/prefs.c:702
+#: src/prefs.c:599 src/prefs.c:678 src/prefs.c:721
 msgid "Show _buttons as:"
 msgstr "按紐樣式(_B)："
 
-#: src/prefs.c:581 src/prefs.c:660 src/prefs.c:703
+#: src/prefs.c:600 src/prefs.c:679 src/prefs.c:722
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/prefs.c:582 src/prefs.c:661 src/prefs.c:704
+#: src/prefs.c:601 src/prefs.c:680 src/prefs.c:723
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs.c:583 src/prefs.c:662 src/prefs.c:705
+#: src/prefs.c:602 src/prefs.c:681 src/prefs.c:724
 msgid "Pictures and text"
 msgstr "圖文並茂"
 
-#: src/prefs.c:584 src/prefs.c:1090
+#: src/prefs.c:603 src/prefs.c:1109
 msgid "None"
 msgstr "無"
 
-#: src/prefs.c:587
-#, fuzzy
+#: src/prefs.c:606
 msgid "_Raise window on events"
-msgstr "當事件發生時，將視窗提到最上方"
-# FIXME
-
-#: src/prefs.c:589
+msgstr "當有事件發生時，隨即將視窗提到最頂端(_R)"
+
+#: src/prefs.c:608
 msgid "Group Display"
 msgstr "群組顯示"
 
 #. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#: src/prefs.c:591
+#: src/prefs.c:610
 msgid "Show _numbers in groups"
 msgstr "顯示群組裡的好友數目(_N)"
 
-#: src/prefs.c:593
+#: src/prefs.c:612
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/prefs.c:594
+#: src/prefs.c:613
 msgid "Show buddy _icons"
 msgstr "顯示好友類別圖示(_I)"
 
-#: src/prefs.c:595
+#: src/prefs.c:614
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/prefs.c:600
+#: src/prefs.c:619
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/prefs.c:605
+#: src/prefs.c:624
 msgid "Dim i_dle buddies"
-msgstr "把閒置的好友以灰色顯示(_D)"
-
-#: src/prefs.c:623 src/prefs.c:1788
+msgstr "以灰色顯示閒置的好友(_D)"
+
+#: src/prefs.c:642 src/prefs.c:1810
 msgid "Conversations"
 msgstr "交談"
 
-#: src/prefs.c:631
+#: src/prefs.c:650
 msgid "_Placement:"
 msgstr "位置(_P)："
 
-#: src/prefs.c:639
-#, fuzzy
+#: src/prefs.c:658
 msgid "Show IMs and chats in _same tabbed window."
-msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
-# XXX???
-
-#: src/prefs.c:658 src/prefs.c:701
+msgstr "將所有的即時訊息並聊天，統統顯示在同一個分頁視窗(_S)"
+
+#: src/prefs.c:677 src/prefs.c:720
 msgid "Window"
 msgstr "即時訊息視窗"
 
-#: src/prefs.c:665 src/prefs.c:708
+#: src/prefs.c:684 src/prefs.c:727
 msgid "New window _width:"
 msgstr "新視窗寬度(_W)："
 
-#: src/prefs.c:666 src/prefs.c:709
+#: src/prefs.c:685 src/prefs.c:728
 msgid "New window _height:"
 msgstr "新視窗高度(_H)："
 
-#: src/prefs.c:667 src/prefs.c:710
+#: src/prefs.c:686 src/prefs.c:729
 msgid "_Entry field height:"
 msgstr "輸入欄位的高度(_E)："
 
-#: src/prefs.c:668 src/prefs.c:711
-#, fuzzy
+#: src/prefs.c:687 src/prefs.c:730
 msgid "_Raise windows on events"
-msgstr "當事件發生時，將視窗提到最上方"
-# FIXME
-
-#: src/prefs.c:669
+msgstr "當有事件發生時，隨即將視窗提到最頂端(_R)"
+
+#: src/prefs.c:688
 msgid "Hide window on _send"
 msgstr "送出訊息後隨即隱藏視窗(_S)"
 
-#: src/prefs.c:672
+#: src/prefs.c:691
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/prefs.c:673
+#: src/prefs.c:692
 msgid "Hide buddy _icons"
 msgstr "隱藏好友圖示(_I)"
 
-#: src/prefs.c:674
+#: src/prefs.c:693
 msgid "Disable buddy icon a_nimation"
 msgstr "好友圖示不使用動畫(_N)"
 
-#: src/prefs.c:677
+#: src/prefs.c:696
 msgid "Show _logins in window"
 msgstr "在視窗中顯示登入訊息(_L)"
 
-#: src/prefs.c:678
+#: src/prefs.c:697
 msgid "Show a_liases in tabs/titles"
-msgstr ""
-
-#: src/prefs.c:680
-#, fuzzy
+msgstr "在分頁標籤或視窗標題顯示別名(_L)"
+
+#: src/prefs.c:699
 msgid "Typing Notification"
-msgstr "跳出通知"
-# FIXME
-
-#: src/prefs.c:681
+msgstr "打字通知"
+
+#: src/prefs.c:700
 msgid "Notify buddies that you are _typing to them"
-msgstr "通知您的好友您正在發訊息給他們(_T)"
-
-#: src/prefs.c:713
+msgstr "通知您的好友您正在打訊息給他(_T)"
+
+#: src/prefs.c:732
 msgid "Tab Completion"
 msgstr ""
 
-#: src/prefs.c:714
+#: src/prefs.c:733
 msgid "_Tab-complete nicks"
-msgstr "使用 _Tab Completion 輸入好友別名"
-
-#: src/prefs.c:715
+msgstr "使用 _Tab Completion 完成輸入好友的別名"
+
+#: src/prefs.c:734
 msgid "_Old-style tab completion"
 msgstr "舊式 Tab C_ompletion"
 
-#: src/prefs.c:718
-#, fuzzy
+#: src/prefs.c:737
 msgid "_Show people joining/leaving in window"
 msgstr "在視窗中顯示其他人進入或離開的事件(_S)"
-# XXX
-
-#: src/prefs.c:719
+
+#: src/prefs.c:738
 msgid "Co_lorize screennames"
-msgstr "以彩色顯示好友暱稱"
-
-#: src/prefs.c:736
+msgstr "以彩色顯示好友暱稱(_L)"
+
+#: src/prefs.c:755
 msgid "IM Tabs"
-msgstr "即時訊息用的 Tab"
-# XXX need real translation
-
-#: src/prefs.c:737 src/prefs.c:747
+msgstr "即時訊息分頁"
+
+#: src/prefs.c:756 src/prefs.c:766
 msgid "Tab _placement:"
-msgstr "Tab 位置："
-
-#: src/prefs.c:738 src/prefs.c:748
+msgstr "分頁標籤位置(_P)："
+
+#: src/prefs.c:757 src/prefs.c:767
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/prefs.c:739 src/prefs.c:749
+#: src/prefs.c:758 src/prefs.c:768
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/prefs.c:740 src/prefs.c:750
+#: src/prefs.c:759 src/prefs.c:769
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/prefs.c:741 src/prefs.c:751
+#: src/prefs.c:760 src/prefs.c:770
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/prefs.c:743
-#, fuzzy
+#: src/prefs.c:762
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
-msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
-
-#: src/prefs.c:746
+msgstr "將所有的聊天內容顯示在同一個分頁視窗中(_I)"
+
+#: src/prefs.c:765
 msgid "Chat Tabs"
-msgstr ""
-
-#: src/prefs.c:753
-#, fuzzy
+msgstr "交談分頁"
+
+#: src/prefs.c:772
 msgid "Show all c_hats in one tabbed window"
-msgstr "將所有的聊天顯示在同一個有標籤的視窗中"
-
-#: src/prefs.c:756
+msgstr "將所有的聊天顯示在同一個分頁視窗(_H)"
+
+#: src/prefs.c:775
 msgid "Tab Options"
-msgstr "Tab 選項"
-
-#: src/prefs.c:757
+msgstr "分頁選項"
+
+#: src/prefs.c:776
 msgid "Show _close button on tabs."
-msgstr ""
-
-#: src/prefs.c:777
+msgstr "每個分頁的標籤旁都分別顯示關閉格(_C)"
+
+#: src/prefs.c:796
 msgid "Proxy Type"
 msgstr "代理伺服器類別"
 
-#: src/prefs.c:778
-msgid "Proxy _type:"
-msgstr "代理伺服器類別(_T)："
-
-#: src/prefs.c:779
-msgid "No proxy"
-msgstr "沒有代理伺服器"
-
-#: src/prefs.c:784
-msgid "Proxy Server"
-msgstr "代理伺服器"
-
 #: src/prefs.c:797
+msgid "Proxy _type:"
+msgstr "代理伺服器類別(_T)："
+
+#: src/prefs.c:798
+msgid "No proxy"
+msgstr "毋須代理伺服器"
+
+#: src/prefs.c:803
+msgid "Proxy Server"
+msgstr "代理伺服器"
+
+#: src/prefs.c:816
 msgid "_Host"
-msgstr "位址(_H)"
-
-#: src/prefs.c:811
+msgstr "主機位址(_H)"
+
+#: src/prefs.c:830
 msgid "Port"
-msgstr "端口"
-
-#: src/prefs.c:827
+msgstr "連接埠號碼"
+
+#: src/prefs.c:846
 msgid "_User"
 msgstr "帳號(_U)"
 
-#: src/prefs.c:841
+#: src/prefs.c:860
 msgid "Pa_ssword"
 msgstr "密碼(_S)"
 
-#: src/prefs.c:862
+#: src/prefs.c:881
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-msgstr "您自訂的瀏覽器「%s」並不有效，故此，您將不可能使用超連結功能。"
-
-#: src/prefs.c:883
+msgstr "您自訂的瀏覽器「%s」並不有效，故此，您將不可能使用超鏈結功能。"
+
+#: src/prefs.c:902
 msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:884
+msgstr "Konqueror"
+
+#: src/prefs.c:903
 msgid "Opera"
-msgstr ""
-
-#: src/prefs.c:885
+msgstr "Opera"
+
+#: src/prefs.c:904
 msgid "Galeon"
-msgstr ""
-
-#: src/prefs.c:886
+msgstr "Galeon"
+
+#: src/prefs.c:905
 msgid "Netscape"
-msgstr ""
-
-#: src/prefs.c:887
+msgstr "Netscape"
+
+#: src/prefs.c:906
 msgid "Mozilla"
-msgstr ""
-
-#: src/prefs.c:895
+msgstr "Mozilla"
+
+#: src/prefs.c:914
 msgid "Manual"
 msgstr "自訂"
 
-#: src/prefs.c:919
+#: src/prefs.c:938
 msgid "Browser Selection"
 msgstr "瀏覽器"
 
-#: src/prefs.c:923
+#: src/prefs.c:942
 msgid "_Browser"
 msgstr "瀏覽器(_B)"
 
-#: src/prefs.c:931
+#: src/prefs.c:950
 msgid "_Manual: "
 msgstr "自訂(_M)"
 
-#: src/prefs.c:946
+#: src/prefs.c:965
 msgid "Browser Options"
 msgstr "瀏覽器選項"
 
-#: src/prefs.c:947
+#: src/prefs.c:966
 msgid "Open new _window by default"
 msgstr "叫出瀏覽器時，每次都開一個新的視窗(_W)"
 
-#: src/prefs.c:961
+#: src/prefs.c:980
 msgid "Message Logs"
 msgstr "日誌"
 
-#: src/prefs.c:962
+#: src/prefs.c:981
 msgid "_Log all instant messages"
 msgstr "記錄所有的即時訊息(_L)"
 
-#: src/prefs.c:963
+#: src/prefs.c:982
 msgid "Log all c_hats"
 msgstr "記錄所有的交談內容(_H)"
 
-#: src/prefs.c:964
+#: src/prefs.c:983
 msgid "Strip _HTML from logs"
-msgstr "以純文字記錄日誌（將日誌中的 _HTML 標籤去除）"
-
-#: src/prefs.c:966
+msgstr "以純文字檔記錄日誌（將日誌中的 _HTML 標籤去除）"
+
+#: src/prefs.c:985
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/prefs.c:967
+#: src/prefs.c:986
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入／登出(_S)"
 
-#: src/prefs.c:969
+#: src/prefs.c:988
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置／回來(_I)"
 
-#: src/prefs.c:971
+#: src/prefs.c:990
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開／回來(_B)"
 
-#: src/prefs.c:972
+#: src/prefs.c:991
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入／閒置／離開等狀態(_O)"
 
-#: src/prefs.c:974
+#: src/prefs.c:993
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "使用個別的檔案來記錄個別好友的登入(_N)"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1026
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/prefs.c:1008
+#: src/prefs.c:1027
 msgid "_No sounds when you log in"
-msgstr "當登入時不啟動音效(_N)"
-
-#: src/prefs.c:1009
+msgstr "登入期間時不要發出音效(_N)"
+
+#: src/prefs.c:1028
 msgid "_Sounds while away"
-msgstr "即使離開了，也仍舊發出音效(_S)"
-
-#: src/prefs.c:1012
+msgstr "離開狀態中也依舊發出音效(_S)"
+
+#: src/prefs.c:1031
 msgid "Sound Method"
 msgstr "發聲方法"
 
-#: src/prefs.c:1013
+#: src/prefs.c:1032
 msgid "_Method"
 msgstr "發聲方法(_M)"
 
-#: src/prefs.c:1016
+#: src/prefs.c:1035
 msgid "Console beep"
 msgstr "一般嗶聲"
 
-#: src/prefs.c:1018
+#: src/prefs.c:1037
 msgid "Automatic"
 msgstr "自動選擇"
 
-#: src/prefs.c:1025
+#: src/prefs.c:1044
 msgid "Command"
 msgstr "自訂指令"
 
-#: src/prefs.c:1034
+#: src/prefs.c:1053
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5897,68 +5923,68 @@
 "音效指令(_O) \n"
 "（指令中的檔案名寫「%s」）"
 
-#: src/prefs.c:1073
+#: src/prefs.c:1092
 msgid "_Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態(_S)"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1093
 msgid "_Queue new messages when away"
 msgstr "在離開時，將所有的新訊息置入佇列中(_Q)"
 
-#: src/prefs.c:1076
+#: src/prefs.c:1095
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/prefs.c:1079
+#: src/prefs.c:1098
 msgid "Seconds before _resending:"
 msgstr "每隔多少秒送一次自動回應(_R)："
 
-#: src/prefs.c:1081
+#: src/prefs.c:1100
 msgid "_Don't send auto-response"
 msgstr "不要送出自動回應(_D)"
 
-#: src/prefs.c:1082
+#: src/prefs.c:1101
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候才送出自動回應(_O)"
 
-#: src/prefs.c:1083
+#: src/prefs.c:1102
 msgid "Do_n't send auto-response in active conversations"
-msgstr "交談進行時，千萬不要在那交談中送出自動回應(_N)"
-
-#: src/prefs.c:1089
+msgstr "千萬不要送出自動回應予進行中的交談(_N)"
+
+#: src/prefs.c:1108
 msgid "Idle _time reporting:"
 msgstr "怎樣計算閒置時間(_T)"
 
-#: src/prefs.c:1091
+#: src/prefs.c:1110
 msgid "Gaim usage"
 msgstr "Gaim 的閒置時間"
 
-#: src/prefs.c:1094
+#: src/prefs.c:1113
 msgid "X usage"
 msgstr "X 的閒置時間"
 
-#: src/prefs.c:1096
+# context: "Windows" here means "Microsoft Windows"
+#: src/prefs.c:1115
 msgid "Windows usage"
 msgstr "Windows 的閒置時間"
-# context: "Windows" here means "Microsoft Windows"
-
-#: src/prefs.c:1103
+
+#: src/prefs.c:1122
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/prefs.c:1104
+#: src/prefs.c:1123
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開狀態(_W)"
 
-#: src/prefs.c:1105
+#: src/prefs.c:1124
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘才算離開(_M)："
 
-#: src/prefs.c:1111
+#: src/prefs.c:1130
 msgid "Away m_essage:"
 msgstr "離開訊息(_M)"
 
-#: src/prefs.c:1166
+#: src/prefs.c:1187
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5973,7 +5999,7 @@
 "<span weight=\"bold\">網頁：</span>\t\t%s\n"
 "<span weight=\"bold\">路徑：</span>\t%s"
 
-#: src/prefs.c:1171
+#: src/prefs.c:1192
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5988,97 +6014,96 @@
 "<span weight=\"bold\">網頁：</span>  %s\n"
 "<span weight=\"bold\">路徑：</span>  %s"
 
-#: src/prefs.c:1345
+#: src/prefs.c:1367
 msgid "Load"
 msgstr "使用"
 
-#: src/prefs.c:1352
+#: src/prefs.c:1374
 msgid "Name"
 msgstr "名稱"
 
-#: src/prefs.c:1399
+#: src/prefs.c:1421
 msgid "Details"
 msgstr "其他資料"
 
-#: src/prefs.c:1498
+#: src/prefs.c:1520
 msgid "Sound Selection"
 msgstr "音效選擇"
 
-#: src/prefs.c:1591
+#: src/prefs.c:1613
 msgid "Play"
 msgstr "播音"
 
-#: src/prefs.c:1598
+#: src/prefs.c:1620
 msgid "Event"
-msgstr ""
-
-#: src/prefs.c:1622
+msgstr "事件"
+
+#: src/prefs.c:1644
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/prefs.c:1746
+#: src/prefs.c:1768
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/prefs.c:1782
+#: src/prefs.c:1804
 msgid "Interface"
 msgstr "介面"
 
-#: src/prefs.c:1783
+#: src/prefs.c:1805
 msgid "Smiley Themes"
 msgstr "Smiley 主題"
 
-#: src/prefs.c:1784
+#: src/prefs.c:1806
 msgid "Fonts"
 msgstr "字型"
 
-#: src/prefs.c:1785
+#: src/prefs.c:1807
 msgid "Message Text"
 msgstr "訊息顯示"
 
-#: src/prefs.c:1786
+#: src/prefs.c:1808
 msgid "Shortcuts"
 msgstr "捷徑"
 
-#: src/prefs.c:1789
+#: src/prefs.c:1811
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/prefs.c:1791
+#: src/prefs.c:1813
 msgid "Tabs"
-msgstr "Tab"
-# FIXME need real translation
-
-#: src/prefs.c:1792
+msgstr "分頁顯示"
+
+#: src/prefs.c:1814
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/prefs.c:1795
+#: src/prefs.c:1817
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/prefs.c:1797
+#: src/prefs.c:1819
 msgid "Logging"
 msgstr "日誌"
 
-#: src/prefs.c:1798
+#: src/prefs.c:1820
 msgid "Sounds"
 msgstr "音效"
 
-#: src/prefs.c:1799
+#: src/prefs.c:1821
 msgid "Sound Events"
-msgstr ""
-
-#: src/prefs.c:1800
+msgstr "事件音效"
+
+#: src/prefs.c:1822
 msgid "Away / Idle"
 msgstr "離開╱閒置"
 
-#: src/prefs.c:1801
+#: src/prefs.c:1823
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/prefs.c:1804
+#: src/prefs.c:1826
 msgid "Plugins"
 msgstr "插件"
 
@@ -6086,9 +6111,10 @@
 msgid "Gaim - Prompt"
 msgstr "Gaim - 提示"
 
+# XXX weird translation?
 #: src/prpl.c:302
 msgid "No actions available"
-msgstr ""
+msgstr "沒有可用動作"
 
 #: src/prpl.c:452
 #, c-format
@@ -6122,7 +6148,7 @@
 #: src/prpl.c:694
 #, 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"
+msgstr "%s%s%s%s 把 %s 加了入他的好友清單上了%s%s%s"
 
 #: src/prpl.c:702
 msgid ""
@@ -6132,7 +6158,7 @@
 msgstr ""
 "\n"
 "\n"
-"您想將他（她）加入到您的好友名單中嗎？"
+"您想將他（她）加入到您的好友清單中嗎？"
 
 #: src/prpl.c:704
 msgid "Gaim - Information"
@@ -6140,7 +6166,7 @@
 
 #: src/prpl.c:706
 msgid "Gaim - Confirm"
-msgstr "Gaim - 確定"
+msgstr "Gaim - 確認"
 
 #: src/prpl.c:747
 msgid ""
@@ -6176,12 +6202,12 @@
 #: src/server.c:1072 src/server.c:1079
 #, c-format
 msgid "%s logged in."
-msgstr "%s 登入。"
+msgstr "%s 登入了。"
 
 #: src/server.c:1095 src/server.c:1102
 #, c-format
 msgid "%s logged out."
-msgstr "%s 登出。"
+msgstr "%s 登出了。"
 
 #: src/server.c:1136
 #, c-format
@@ -6189,6 +6215,8 @@
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
+"%s 剛被 %s 警告過了。\n"
+"您目前的警告等級是 %d%%"
 
 #: src/server.c:1139
 msgid "an anonymous person"
@@ -6210,6 +6238,12 @@
 msgid "Buddy Chat Invite"
 msgstr "邀請與好友聊天"
 
+# XXX meaningless if a "proper" translation is used :-(
+# XXX This is a window title. Do we really want to translate this?
+#: src/server.c:1406
+msgid "Gaim - Popup"
+msgstr "Gaim - 彈出資訊"
+
 #: src/server.c:1433
 msgid "More Info"
 msgstr "更多資訊"
@@ -6228,11 +6262,11 @@
 
 #: src/sound.c:81
 msgid "Message received begins conversation"
-msgstr "訊息收到，開始進行交談"
+msgstr "收到訊息，開始交談"
 
 #: src/sound.c:82
 msgid "Message sent"
-msgstr "訊息送出"
+msgstr "送出訊息"
 
 #: src/sound.c:83
 msgid "Person enters chat"
@@ -6314,11 +6348,11 @@
 #: src/util.c:732
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr ""
+msgstr "Gaim %s. 欲知詳情，請用「%s -h」指令。\n"
 
 #: src/util.c:1020
 msgid "Not connected to AIM"
-msgstr "未有連到 AIM 伺服器"
+msgstr "未有連接到 AIM 伺服器"
 
 #: src/util.c:1029 src/util.c:1068
 msgid "No screenname given."
@@ -6337,19 +6371,19 @@
 #.
 #: src/win32/systray.c:36
 msgid "Gaim Instant Messenger"
-msgstr ""
+msgstr "Gaim 即時傳訊系統"
 
 #: src/win32/systray.c:37
 msgid "Gaim Instant Messenger - Signed off"
-msgstr ""
+msgstr "Gaim 即時傳訊系統──登出"
 
 #: src/win32/systray.c:38
 msgid "Gaim Instant Messenger - Away"
-msgstr ""
+msgstr "Gaim 即時傳訊系統──離開"
 
 #: src/win32/systray.c:134
 msgid "New"
-msgstr ""
+msgstr "新"
 
 #: src/win32/systray.c:167
 msgid "Set Away Message"
@@ -6361,16 +6395,16 @@
 
 #: src/win32/systray.c:365
 msgid "Exit"
-msgstr "結束"
+msgstr "退出"
 
 #: src/plugin.c:227
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
-msgstr ""
+msgstr "插件 %s 未有提供有效的插件資訊"
 
 #: src/plugin.c:231
 msgid "Gaim was unable to load your plugin."
-msgstr ""
+msgstr "Gaim 無法載入您的這個插件"
 
 #. * Custom away message.
 #: src/prpl.h:172
@@ -6382,7 +6416,7 @@
 msgstr "除錯視窗"
 
 #~ msgid "Gaim Chat"
-#~ msgstr "Gaim - 聊天"
+#~ msgstr "Gaim 聊天"
 
 #~ msgid "Chat Rooms"
 #~ msgstr "聊天室"
@@ -6406,16 +6440,16 @@
 #~ msgstr "Gadu-Gadu 使用者"
 
 #~ msgid "connection error (rend)\n"
-#~ msgstr "連線錯誤 (rend)\n"
+#~ msgstr "連接錯誤 (rend)\n"
 
 #~ msgid "major connection error\n"
-#~ msgstr "嚴重連線錯誤\n"
+#~ msgstr "嚴重連接錯誤\n"
 
 #~ msgid "Password sent, waiting for response\n"
 #~ msgstr "已送出了密碼，等待回應中\n"
 
 #~ msgid "internal connection error\n"
-#~ msgstr "內部連線錯誤\n"
+#~ msgstr "內部連接錯誤\n"
 
 #~ msgid "Signed off.\n"
 #~ msgstr "登出了。\n"
@@ -6526,7 +6560,7 @@
 #~ msgstr "匯入到："
 
 #~ msgid "Gaim - Import Buddy List"
-#~ msgstr "Gaim - 匯入好友名單"
+#~ msgstr "Gaim - 匯入好友清單"
 
 #~ msgid "Gaim - New away message"
 #~ msgstr "Gaim - 新的離開訊息"
@@ -6641,7 +6675,7 @@
 #~ msgstr "背景顏色"
 
 #~ msgid "Link"
-#~ msgstr "連結"
+#~ msgstr "鏈結"
 
 #~ msgid "Image"
 #~ msgstr "影像"
@@ -6719,16 +6753,16 @@
 #~ msgstr "無法送出 HTTP 要求"
 
 #~ msgid "Buddies List import from Server failed (%s)"
-#~ msgstr "自伺服器上匯入好友名單失敗（%s）"
+#~ msgstr "自伺服器上匯入好友清單失敗（%s）"
 
 #~ msgid "Buddies List export to Server failed (%s)"
-#~ msgstr "匯出好友名單到伺服器上失敗（%s）"
+#~ msgstr "匯出好友清單到伺服器上失敗（%s）"
 
 #~ msgid "Deletion of Buddies List from Server failed (%s)"
-#~ msgstr "刪除伺服器上的好友名單失敗（%s）"
+#~ msgstr "刪除伺服器上的好友清單失敗（%s）"
 
 #~ msgid "Connect to search service failed (%s)"
-#~ msgstr "連線到搜尋服務失敗（%s）"
+#~ msgstr "連接到搜尋服務失敗（%s）"
 
 #~ msgid "Password Change Error!"
 #~ msgstr "密碼修改錯誤！"
@@ -6803,13 +6837,13 @@
 #~ msgstr "Perl 命令稿"
 
 #~ msgid "Automatically show buddy list on sign on"
-#~ msgstr "在登入時自動顯示好友名單"
+#~ msgstr "在登入時自動顯示好友清單"
 
 #~ msgid "Protocol Error"
 #~ msgstr "通訊協定錯誤"
 
 #~ msgid "Disconnect"
-#~ msgstr "中止連線"
+#~ msgstr "中止連接"
 
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "所有的選項將在設定後馬上生效。"
@@ -6855,7 +6889,7 @@
 #~ msgstr "視窗大小"
 
 #~ msgid "Tab Placement"
-#~ msgstr "Tab 位置"
+#~ msgstr "分頁位置"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "將所有的交談顯示在同一個有標籤的視窗中"