changeset 12566:fd6ffacbb6ee

[gaim-migrate @ 14885] a couple translation updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 19 Dec 2005 18:16:03 +0000 (2005-12-19)
parents 3f895385e841
children 1ddbfe726e43
files po/ChangeLog po/da.po po/gl.po po/it.po po/sl.po po/zh_TW.po
diffstat 6 files changed, 11464 insertions(+), 11806 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Mon Dec 19 17:16:15 2005 +0000
+++ b/po/ChangeLog	Mon Dec 19 18:16:03 2005 +0000
@@ -4,6 +4,8 @@
 	* Bosnian translation added (Lejla Hadzialic)
 	* Catalan translation updated (Josep Puigdemont)
 	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Paladin R. Liu)
+	* Danish translation updated (Morten (mbrix) Brix Pedersen)
 	* Dutch translation updated (Roy Spliet)
 	* English (British) translation updated (Stu Tomlinson)
 	* English (Canadian) translation updated (Adam Weinberger)
--- a/po/da.po	Mon Dec 19 17:16:15 2005 +0000
+++ b/po/da.po	Mon Dec 19 18:16:03 2005 +0000
@@ -17,8 +17,8 @@
 msgstr ""
 "Project-Id-Version: gaim 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-08-08 11:41+0200\n"
+"POT-Creation-Date: 2005-12-17 16:48-0500\n"
+"PO-Revision-Date: 2005-12-18 15:36+0200\n"
 "Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -26,22 +26,59 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Skjul fejlbeskeder"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Skjul serverafbrydelsesfejl"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Skjul logind-fejl"
-
-#: plugins/autorecon.c:313
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "Skjul serverafbrydelsesfejl"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ciphertest.c:267 plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr ""
+
+#: plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Ven er inaktiv"
+
+#: plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Ven er frav脱rende"
+
+#: plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Ven er \"udvidet\" frav脱rende"
+
+#: plugins/contact_priority.c:64
+msgid "Buddy is offline"
+msgstr "Ven er offline"
+
+#: plugins/contact_priority.c:86
+msgid "Point values to use when..."
+msgstr "V脱rdier der skal bruges n奪r..."
+
+#: plugins/contact_priority.c:114
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"Vennen med den <i>h淡jeste score</i> er den ven som vil have prioritet i "
+"kontakten.\n"
+
+#: plugins/contact_priority.c:121
+msgid "Use last buddy when scores are equal"
+msgstr "Brug den sidste ven n奪r score er lige"
+
+#: plugins/contact_priority.c:126
+msgid "Point values to use for account..."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -49,58 +86,80 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Genetabl辿r forbindelse automatisk"
+#: plugins/contact_priority.c:177
+msgid "Contact Priority"
+msgstr "Kontaktsprioritet"
+
+#. *< name
+#. *< version
+#. *< summary
+#: plugins/contact_priority.c:180
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Giver mulighed for at kontrollere v脱rdierne associeret med venners "
+"forskellige status."
+
+#. *< description
+#: plugins/contact_priority.c:182
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Giver mulighed for at 脱ndre v脱rdierne af inaktiv/frav脱rende/offline status "
+"for venner i kontaktprioritets beregninger."
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Sk淡rchat"
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Plugin til at etablere en sk淡rchat session."
+
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "N奪r du bliver smidt offline, opretter dette forbindelsen for dig igen."
-
-#: plugins/contact_priority.c:84
-msgid "Point values to use when..."
-msgstr "V脱rdier der skal bruges n奪r..."
-
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "Ven er offline:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "Ven er frav脱rende:"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "Ven er inaktiv:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "Brug den sidste ven der passede"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-#, fuzzy
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"Vennen med den mindste score er den der vil have h淡jeste prioritet i "
-"kontakten.\n"
-"Standard v脱rdierne (offline = 4, frav脱rende = 2, og inaktiv = 1)\n"
-"vil bruge hvad der f淡r var den indbyggede sortering aktive->inaktive-"
-">frav脱rende->frav脱rende+inaktiv->offline."
-
-#: plugins/contact_priority.c:144
-#, fuzzy
-msgid "Point values to use for account..."
-msgstr "V脱rdier der skal bruges for kontoen..."
+#: plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr ""
+"Bruger Gaim til at finde venners ip-adresser til at forbinde til en sk淡rchat session"
+
+#. make the network configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Netv脱rksops脱tning"
+
+#: plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "TCP port"
+
+#: plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "UDP port"
+
+#. make the feature configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr ""
+
+#. add enabled / disabled
+#: plugins/crazychat/cc_gaim_plugin.c:345 src/gtkaccount.c:2236
+#: src/gtkplugin.c:414
+msgid "Enabled"
+msgstr "Sl奪et til"
+
+#: plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Sl奪et fra"
 
 #. *< type
 #. *< ui_requirement
@@ -108,124 +167,157 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
-msgid "Contact Priority"
-msgstr "Kontaktsprioritet"
+#: plugins/dbus-example.c:135
+msgid "DBus"
+msgstr "DBus"
 
 #. *< name
 #. *< version
-#. *< summary
-#: plugins/contact_priority.c:198
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Giver mulighed for at kontrollere v脱rdierne associeret med venners "
-"forskellige status."
-
-#. *< description
-#: plugins/contact_priority.c:200
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Giver mulighed for at 脱ndre v脱rdierne af inaktiv/frav脱rende/offline status "
-"for venner i kontaktprioritets beregninger."
-
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - Logget af"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - Frav脱rende"
-
-#: plugins/docklet/docklet.c:383
-#, fuzzy
+#. *  summary
+#. *  description
+#: plugins/dbus-example.c:138 plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "DBus modul eksempel"
+
+#: plugins/docklet/docklet.c:153
+msgid "Right-click for more unread messages...\n"
+msgstr "H淡jreklik for flere ul脱ste beskeder...\n"
+
+#: plugins/docklet/docklet.c:156 src/gtkblist.c:3244
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d ul脱st besked fra %s\n"
+msgstr[1] "%d ul脱ste beskeder fra %s\n"
+
+#: plugins/docklet/docklet.c:370
 msgid "Show Buddy List"
-msgstr "Venneliste"
-
-#: plugins/docklet/docklet.c:390
+msgstr "Vis venneliste"
+
+#: plugins/docklet/docklet.c:375
+msgid "Unread Messages"
+msgstr "Ul脱ste beskeder"
+
+#: plugins/docklet/docklet.c:396
 msgid "New Message..."
 msgstr "Ny besked..."
 
-#: plugins/docklet/docklet.c:394
+#: plugins/docklet/docklet.c:400
 msgid "Join A Chat..."
 msgstr "Deltag i chat..."
 
-#: plugins/docklet/docklet.c:399
+#: plugins/docklet/docklet.c:405 src/gtkaccount.c:2459
+msgid "Accounts"
+msgstr "Konti"
+
+#: plugins/docklet/docklet.c:406 src/gtkplugin.c:383
+msgid "Plugins"
+msgstr "Udvidelsesmoduler"
+
+#: plugins/docklet/docklet.c:407 src/gtkprefs.c:1779
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: plugins/docklet/docklet.c:411 src/gtkft.c:707
+#: src/protocols/oscar/oscar.c:8423
+msgid "File Transfers"
+msgstr "Filoverf淡rsler"
+
+#: plugins/docklet/docklet.c:413
 msgid "Mute Sounds"
 msgstr "Sl奪 lyde fra"
 
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "Filoverf淡rsler"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "Konti"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "Indstillinger"
-
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: plugins/docklet/docklet.c:416
+#: plugins/docklet/docklet.c:426
 msgid "Quit"
 msgstr "Afslut"
 
+#: plugins/docklet/docklet.c:567
+msgid "Blink tray icon for unread..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:570
+#, fuzzy
+msgid "_Instant Messages:"
+msgstr "Kvikbeskeder"
+
+#: plugins/docklet/docklet.c:572 plugins/docklet/docklet.c:580
+#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:816
+#: src/gtkprefs.c:1665
+msgid "Never"
+msgstr "Aldrig"
+
+#: plugins/docklet/docklet.c:573
+msgid "In hidden conversations"
+msgstr "I skjulte samtaler"
+
+#: plugins/docklet/docklet.c:574 plugins/docklet/docklet.c:582
+#: plugins/win32/winprefs/winprefs.c:413 src/gtkprefs.c:818
+msgid "Always"
+msgstr "Altid"
+
+#: plugins/docklet/docklet.c:578
+msgid "C_hat Messages:"
+msgstr "C_hat beskeder:"
+
+#: plugins/docklet/docklet.c:581
+msgid "When my nick is said"
+msgstr "N奪r mit navn bliver n脱vnt"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: plugins/docklet/docklet.c:607
 msgid "System Tray Icon"
 msgstr "Statusomr奪de ikon"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:610
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Viser et Gaim-ikon i statusomr奪det."
 
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+#: plugins/docklet/docklet.c:612
+#, fuzzy
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
 msgstr ""
 "Viser et ikon i statusomr奪det (i GNOME, KDE eller Windows f.eks.) til at "
 "vise Gaims nuv脱rende status. Det tillader hurtig adgang til ofte brugte "
 "funktioner, og du kan hurtigt skjule/vise vennelisten. Beskeder kan ogs奪 "
 "stilles i k淡, indtil der er klikket p奪 ikonet, ligesom ICQ."
 
-#: plugins/extplacement.c:79
+#: plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr "Placering"
+
+#: plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr "Placering af systemomr奪det."
+
+#: plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Efter antallet af samtaler"
 
-#: plugins/extplacement.c:100
+#: plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Samtale placering"
 
-#: plugins/extplacement.c:105
+#: plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "Antal af samtaler pr. vindue"
 
-#: plugins/extplacement.c:111
+#: plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Seperate besked- og chatvinduer n奪r der placeres med tal"
 
@@ -235,19 +327,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: plugins/extplacement.c:133
 msgid "ExtPlacement"
 msgstr "EkstraPlacering"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: plugins/extplacement.c:135
 msgid "Extra conversation placement options."
 msgstr "Ekstra samtale placerings muligheder."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
+#: plugins/extplacement.c:137
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -304,86 +396,99 @@
 "- Det skriver al indkommende tekst bagvendt\n"
 "- Det sender en besked til folk p奪 din venneliste straks n奪r de logger p奪"
 
-#: plugins/gaimrc.c:40
+#: plugins/gaimrc.c:41
 msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr ""
+msgstr "Mark淡r farve"
 
 #: plugins/gaimrc.c:42
-#, fuzzy
+msgid "Secondary Cursor Color"
+msgstr "Sekund脱r mark淡r farve"
+
+#: plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "Link farve"
 
-#: plugins/gaimrc.c:53
+#: plugins/gaimrc.c:58
 #, fuzzy
 msgid "GtkTreeView Expander Size"
 msgstr "Udfoldelses-pil st淡rrelse"
 
-#: plugins/gaimrc.c:72
+#: plugins/gaimrc.c:59
+#, fuzzy
+msgid "GtkTreeView Expander Indentation"
+msgstr "Udfoldelses-pil st淡rrelse"
+
+#: plugins/gaimrc.c:60
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+#: plugins/gaimrc.c:79
 #, fuzzy
 msgid "Conversation Entry"
 msgstr "Samtaler"
 
-#: plugins/gaimrc.c:73
+#: plugins/gaimrc.c:80
 #, fuzzy
 msgid "Conversation History"
 msgstr "Samtaler"
 
-#: plugins/gaimrc.c:74
+#: plugins/gaimrc.c:81
 #, fuzzy
 msgid "Log Viewer"
 msgstr "Indlogningsserver"
 
-#: plugins/gaimrc.c:75
+#: plugins/gaimrc.c:82
 #, fuzzy
 msgid "Request Dialog"
 msgstr "Anmodning flertydig"
 
-#: plugins/gaimrc.c:76
+#: plugins/gaimrc.c:83
 #, fuzzy
 msgid "Notify Dialog"
 msgstr "P奪mind for"
 
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
+#: plugins/gaimrc.c:286
+#, c-format
 msgid "Select Color for %s"
-msgstr "V脱lg tekstfarve"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
+msgstr "V脱lg farve for %s"
+
+#: plugins/gaimrc.c:288
 msgid "Select Color"
-msgstr "V脱lg tekstfarve"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
+msgstr "V脱lg farve"
+
+#: plugins/gaimrc.c:323
+#, c-format
 msgid "Select Font for %s"
-msgstr "V脱lg skrifttype"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
+msgstr "V脱lg skrifttype for %s"
+
+#: plugins/gaimrc.c:361
 msgid "Select Interface Font"
-msgstr "V脱lg skrifttype"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
+msgstr "V脱lg gr脱nseflade skrifttype"
+
+#: plugins/gaimrc.c:421
 msgid "GTK+ Interface Font"
-msgstr "Gr脱nseflade indstillinger"
-
-#: plugins/gaimrc.c:362
+msgstr "GTK+ gr脱nseflade skrifttype"
+
+#: plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: plugins/gaimrc.c:460
-#, fuzzy
+#: plugins/gaimrc.c:523
+#, c-format
+msgid "Write a gtkrc file with these settings to %s"
+msgstr "Skriv en gtkrc fil med disse indstillinger til %s"
+
+#: plugins/gaimrc.c:531
+msgid "Re-read gtkrc files"
+msgstr "Genindl脱s gtkrc filer"
+
+#: plugins/gaimrc.c:557
 msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim filkontrol"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgstr "Gaim GTK+ tema kontrol"
+
+#: plugins/gaimrc.c:559 plugins/gaimrc.c:560
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "Giver adgang til f脱lles brugte gtkrc indstillinger."
 
 #. Configuration frame
 #: plugins/gestures/gestures.c:243
@@ -438,8 +543,9 @@
 "Tr脱k op og derefter til h淡jre, for at skifte til den n脱ste samtale."
 
 #: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: plugins/gevolution/assoc-buddy.c:119 src/gtkplugin.c:424
+#: src/gtkroomlist.c:572 src/protocols/jabber/jabber.c:686
+#: src/protocols/msn/msn.c:1513
 msgid "Name"
 msgstr "Navn"
 
@@ -455,13 +561,13 @@
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:471
 #: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: src/protocols/oscar/oscar.c:8198
 msgid "Search"
 msgstr "S淡g"
 
 #: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4453
+#: src/gtkblist.c:4833
 msgid "Group:"
 msgstr "Gruppe:"
 
@@ -487,54 +593,57 @@
 
 #. Add the expander
 #: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
 msgid "User _details"
-msgstr "Skjul brugerdetaljer"
+msgstr "Bruger_detaljer"
 
 #. "Associate Buddy" button
 #: plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "_Associ辿r ven"
 
+#: plugins/gevolution/eds-utils.c:73 plugins/gevolution/eds-utils.c:86
+#: src/protocols/jabber/jabber.c:1037 src/protocols/yahoo/yahoo.c:2802
+msgid "None"
+msgstr "Ingen"
+
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: src/blist.c:518 src/blist.c:1275 src/blist.c:1500 src/gtkblist.c:4261
+#: src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Venner"
 
 #: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
 msgid "Unable to send e-mail"
-msgstr "Kunne ikke sende besked."
+msgstr "Kunne ikke sende e-mail."
 
 #: plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "Den ekskvebar Evolution fil blev ikke fundet i PATH."
 
 #: plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
+msgstr "Den angivne ven blev ikke fundet i Evolution kontakter"
 
 #: plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Tilf淡j til adressebog"
 
 #: plugins/gevolution/gevolution.c:290
-#, fuzzy
 msgid "Send E-Mail"
-msgstr "E-post adresse"
+msgstr "Send e-mail"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Evolution-integrering ops脱tning"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "V脱lg alle konti som venner automatisk skal tilf淡jes til."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:450 plugins/idle.c:112 plugins/idle.c:147
+#: src/gtkpounce.c:1167
 msgid "Account"
 msgstr "Konto"
 
@@ -544,7 +653,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:534
 msgid "Evolution Integration"
 msgstr "Evolution-integration"
 
@@ -552,7 +661,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#: plugins/gevolution/gevolution.c:537 plugins/gevolution/gevolution.c:539
 #, fuzzy
 msgid "Provides integration with Evolution."
 msgstr "Giver integration med Ximian Evolution"
@@ -569,8 +678,9 @@
 msgid "Account type:"
 msgstr "Konto type:"
 
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
+#: plugins/gevolution/new_person_dialog.c:294 src/gtkaccount.c:764
+#, fuzzy
+msgid "Screen name:"
 msgstr "Brugernavn:"
 
 #. Optional Information section
@@ -579,8 +689,8 @@
 msgstr "Valgfri oplysninger:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:407
+#: src/gtkaccount.c:429 src/protocols/oscar/oscar.c:613
 msgid "Buddy Icon"
 msgstr "Venneikon"
 
@@ -596,9 +706,27 @@
 msgid "E-mail:"
 msgstr "E-post adresse:"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gtk-signals-test.c:107
+msgid "GTK Signals Test"
+msgstr "GTK signal test"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:110 plugins/gtk-signals-test.c:112
+msgid "Test to see that all ui signals are working properly."
+msgstr "Test for at se at alle grafiske handlinger virker korrekt."
+
 #: plugins/history.c:146
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "Historik modul kr脱ver logging"
 
 #: plugins/history.c:147
 msgid ""
@@ -644,42 +772,43 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimerer vennelisten og dine samtaler n奪r du er frav脱rende."
 
-#: plugins/idle.c:115
+#: plugins/idle.c:116
 msgid "Minutes"
 msgstr "minutter"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: plugins/idle.c:123 plugins/idle.c:156 plugins/idle.c:222
 msgid "I'dle Mak'er"
 msgstr "Inaktivs ops脱tter"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: plugins/idle.c:124 plugins/idle.c:188
 msgid "Set Account Idle Time"
 msgstr "S脱t inaktiv tid for konto"
 
-#: plugins/idle.c:126
+#: plugins/idle.c:127
 msgid "_Set"
 msgstr "_S脱t"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: plugins/idle.c:128 plugins/idle.c:161
 msgid "_Cancel"
 msgstr "_Annull辿r"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
+#: plugins/idle.c:141
+msgid "None of your accounts are idle."
+msgstr "Ingen af dine konti er inaktive."
+
+#: plugins/idle.c:157 plugins/idle.c:192
 msgid "Unset Account Idle Time"
-msgstr "S脱t inaktiv tid for konto"
-
-#: plugins/idle.c:153
-#, fuzzy
+msgstr "Fjern inaktiv tid for konto"
+
+#: plugins/idle.c:160
 msgid "_Unset"
-msgstr "_Brug"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+msgstr ""
+
+#: plugins/idle.c:197
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr ""
+
+#: plugins/idle.c:224 plugins/idle.c:225
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Tillader dig at s脱tte op manuelt hvor lang tid du har v脱ret inaktiv i."
 
@@ -733,6 +862,110 @@
 "Test modul IPC underst淡ttelse, som en server. Dette registrerer IPC "
 "kommandoerne."
 
+#: plugins/log_reader.c:1403
+#, fuzzy
+msgid "User is offline."
+msgstr "Bruger er offline"
+
+#: plugins/log_reader.c:1409
+#, fuzzy
+msgid "Auto-response sent:"
+msgstr "Genetabl辿r forbindelse automatisk"
+
+#: plugins/log_reader.c:1419 plugins/log_reader.c:1422
+#, c-format
+msgid "%s logged out."
+msgstr "%s loggede ud."
+
+#: plugins/log_reader.c:1436
+msgid "One or more messages may have been undeliverable."
+msgstr "En eller flere beskeder er m奪ske ikke blevet leveret."
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: plugins/log_reader.c:1446 src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "Din forbindelse til serveren blev afbrudt."
+
+#: plugins/log_reader.c:1454
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+
+#: plugins/log_reader.c:1469
+#, fuzzy
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Besked kunne ikke sendes, fordi brugeren er offline:"
+
+#: plugins/log_reader.c:1474
+#, fuzzy
+msgid "Message could not be sent."
+msgstr "Din Yahoo! besked blev ikke sendt."
+
+#. Add general preferences.
+#: plugins/log_reader.c:1908
+msgid "General Log Reading Configuration"
+msgstr "Generel logl脱sning ops脱tning"
+
+#: plugins/log_reader.c:1912
+msgid "Fast size calculations"
+msgstr ""
+
+#: plugins/log_reader.c:1916
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: plugins/log_reader.c:1922
+msgid "Log Directory"
+msgstr "Logmappe"
+
+#: plugins/log_reader.c:1926
+msgid "Adium"
+msgstr "Adium"
+
+#: plugins/log_reader.c:1930
+msgid "Fire"
+msgstr "Fire"
+
+#: plugins/log_reader.c:1934
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: plugins/log_reader.c:1938
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: plugins/log_reader.c:1942
+msgid "Trillian"
+msgstr "Trillian"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/log_reader.c:1963
+msgid "Log Reader"
+msgstr "Logl脱ser"
+
+#. *< name
+#. *< version
+#. * summary
+#: plugins/log_reader.c:1967
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Inklud辿r andre klienters logs i logviseren."
+
+#. * description
+#: plugins/log_reader.c:1971
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
+msgstr ""
+
 #: plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Post-overv奪ger"
@@ -745,75 +978,93 @@
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "Tilf淡jer en lille boks til vennelisten der viser om du har ny post."
 
+#: plugins/mono/loader/mono.c:213
+#, fuzzy
+msgid "Mono Plugin Loader"
+msgstr "Tcl-udvidelsesmodul indl脱ser"
+
+#: plugins/mono/loader/mono.c:215 plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Indl脱ser .NET moduler med Mono."
+
+#. Configuration frame
+#: plugins/musicmessaging/musicmessaging.c:622
+msgid "Music Messaging Configuration"
+msgstr ""
+
+#: plugins/musicmessaging/musicmessaging.c:627
+msgid "_Apply"
+msgstr "_Anvend"
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: plugins/notify.c:639
 msgid "Notify For"
 msgstr "P奪mind for"
 
-#: plugins/notify.c:642
+#: plugins/notify.c:643
 msgid "_IM windows"
 msgstr "Besked-v_induer"
 
-#: plugins/notify.c:649
+#: plugins/notify.c:650
 msgid "C_hat windows"
 msgstr "C_hat-vinduer"
 
-#: plugins/notify.c:656
+#: plugins/notify.c:657
 msgid "_Focused windows"
 msgstr "_Fokuserede vinduer"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: plugins/notify.c:665
 msgid "Notification Methods"
 msgstr "P奪mindelse-metoder"
 
-#: plugins/notify.c:671
+#: plugins/notify.c:672
 msgid "Prepend _string into window title:"
 msgstr "Inds脱t _streng i vinduets titel:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: plugins/notify.c:691
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inds脱t antal af nye beskeder ind i vinduets titel"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: plugins/notify.c:699
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "S脱t vinduesh奪ndterings-vinket \"_URGENT\" (\"haster\")"
 
 #. Raise window method button
-#: plugins/notify.c:706
+#: plugins/notify.c:707
 #, fuzzy
 msgid "R_aise conversation window"
 msgstr "Beskedsamtalevinduer"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: plugins/notify.c:715
 msgid "Notification Removal"
 msgstr "Fjernelse af p奪mindelse"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: plugins/notify.c:720
 msgid "Remove when conversation window _gains focus"
 msgstr "Fjern n奪r samtalevindue f奪r _fokus"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: plugins/notify.c:727
 msgid "Remove when conversation window _receives click"
 msgstr "Fjern n奪r samtalevindue modtage_r klik"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: plugins/notify.c:735
 msgid "Remove when _typing in conversation window"
 msgstr "Fjern n奪r der bliver skreve_t i samtalevindue"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: plugins/notify.c:743
 msgid "Remove when a _message gets sent"
 msgstr "Fjern n奪r en _besked bliver sendt"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: plugins/notify.c:752
 msgid "Remove on switch to conversation ta_b"
 msgstr "Fjern n奪r der skiftes til samtale fanebla_d"
 
@@ -823,7 +1074,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: plugins/notify.c:842
 msgid "Message Notification"
 msgstr "P奪mindelse af beskeder"
 
@@ -831,7 +1082,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: plugins/notify.c:845 plugins/notify.c:847
 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."
@@ -853,16 +1104,16 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Giver underst淡ttelse af Perl-udvidelsesmoduler."
 
-#: plugins/raw.c:151
+#: plugins/raw.c:175
 msgid "Raw"
 msgstr "R奪"
 
-#: plugins/raw.c:153
+#: plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 "Giver dig mulighed for at sende r奪 inddata til text-baserede protokoller."
 
-#: plugins/raw.c:154
+#: plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -930,7 +1181,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: plugins/signals-test.c:732
 msgid "Signals Test"
 msgstr "Signal test"
 
@@ -938,7 +1189,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: plugins/signals-test.c:735 plugins/signals-test.c:737
 msgid "Test to see that all signals are working properly."
 msgstr "Test for at se at alle handlinger virker korrekt."
 
@@ -960,51 +1211,51 @@
 msgid "Tests to see that most things are working."
 msgstr "Test for at se de fleste ting virker."
 
-#: plugins/spellchk.c:1788
+#: plugins/spellchk.c:1800
 msgid "Duplicate Correction"
 msgstr ""
 
-#: plugins/spellchk.c:1789
+#: plugins/spellchk.c:1801
 msgid "The specified word already exists in the correction list."
 msgstr ""
 
-#: plugins/spellchk.c:1948
+#: plugins/spellchk.c:1981
 msgid "Text Replacements"
 msgstr "Tekst erstatninger"
 
-#: plugins/spellchk.c:1972
+#: plugins/spellchk.c:2005
 msgid "You type"
 msgstr "Du skriver"
 
-#: plugins/spellchk.c:1984
+#: plugins/spellchk.c:2017
 msgid "You send"
 msgstr "Du sender"
 
-#: plugins/spellchk.c:1996
+#: plugins/spellchk.c:2029
 msgid "Whole words only"
-msgstr ""
-
-#: plugins/spellchk.c:2022
+msgstr "Kun hele ord"
+
+#: plugins/spellchk.c:2055
 msgid "Add a new text replacement"
 msgstr "Tilf淡j en ny tekst erstatning"
 
-#: plugins/spellchk.c:2032
+#: plugins/spellchk.c:2065
 msgid "You _type:"
 msgstr "Du skriver:"
 
-#: plugins/spellchk.c:2048
+#: plugins/spellchk.c:2081
 msgid "You _send:"
 msgstr "Du _sender:"
 
-#: plugins/spellchk.c:2060
+#: plugins/spellchk.c:2093
 msgid "Only replace _whole words"
-msgstr ""
-
-#: plugins/spellchk.c:2097
+msgstr "Erstat kun _hele ord"
+
+#: plugins/spellchk.c:2130
 msgid "Text replacement"
 msgstr "Teksterstatning"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: plugins/spellchk.c:2132 plugins/spellchk.c:2133
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstatter tekst i udg奪ende beskeder udfra bruger-definerede regler."
 
@@ -1062,17 +1313,17 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "En \"wrapper\" omkring SSL underst淡ttelses biblioteker"
 
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s er nu frav脱rende."
-
 #: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s er ikke l脱ngere frav脱rende."
 
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:51
+#, c-format
+msgid "%s has gone away."
+msgstr "%s er nu frav脱rende."
+
+#: plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s blev inaktiv."
@@ -1082,25 +1333,39 @@
 msgid "%s is no longer idle."
 msgstr "%s er ikke l脱ngere inaktiv."
 
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s er logget p奪."
+
+#: plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s er logget ud."
+
+#: plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "P奪mind n奪r"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "Ven bliver _frav脱rende"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "Ven bliver _inaktiv"
 
+#: plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "Ven _logger ind/ud"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:139
 msgid "Buddy State Notification"
 msgstr "Vennestatus p奪mindelse"
 
@@ -1108,7 +1373,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: plugins/statenotify.c:142 plugins/statenotify.c:145
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1129,7 +1394,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:324
 msgid "Buddy Ticker"
 msgstr "Horisontal venneliste"
 
@@ -1137,19 +1402,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:327 plugins/ticker/ticker.c:329
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "En horisontal k淡rende version af vennelisten."
 
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:198
 msgid "iChat Timestamp"
 msgstr "iChat tidsstempel"
 
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:205
 msgid "Delay"
 msgstr "Forsinkelse"
 
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:212
 msgid "minutes."
 msgstr "minutter."
 
@@ -1159,7 +1424,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: plugins/timestamp.c:275
 msgid "Timestamp"
 msgstr "Tidsstempel"
 
@@ -1167,7 +1432,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: plugins/timestamp.c:278 plugins/timestamp.c:280
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Tilf淡jer iChat-tidsstempler til samtaler hvert N'te minut."
 
@@ -1191,15 +1456,13 @@
 msgstr "Vis rullebj脱lke i besked-vindue"
 
 #: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "Beskedvinduer gennemsigtighed"
+msgstr ""
 
 #: plugins/win32/transparency/win2ktrans.c:558
 #: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
 msgid "Always on top"
-msgstr "Alias kontakt"
+msgstr "Altid 淡verst"
 
 #. Buddy List trans options
 #: plugins/win32/transparency/win2ktrans.c:590
@@ -1211,9 +1474,8 @@
 msgstr "Venneliste vindue gennemsigtighed"
 
 #: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Venneliste vindue gennemsigtighed"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -1260,7 +1522,7 @@
 msgstr "_Start Gaim ved Windows opstart"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3498
 msgid "Buddy List"
 msgstr "Venneliste"
 
@@ -1270,18 +1532,8 @@
 
 #. Blist On Top
 #: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
 msgid "_Keep Buddy List window on top:"
-msgstr "Hold venneliste vinduet i forgrunden"
-
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "Aldrig"
-
-#: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
-msgid "Always"
-msgstr "Frav脱rende"
+msgstr "_Hold vennelistevinduet 淡verst:"
 
 #. XXX: Did this ever work?
 #: plugins/win32/winprefs/winprefs.c:415
@@ -1289,15 +1541,14 @@
 msgstr ""
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:812
+#: src/gtkprefs.c:1743
 msgid "Conversations"
 msgstr "Samtaler"
 
 #: plugins/win32/winprefs/winprefs.c:420
-#, fuzzy
 msgid "_Flash window when messages are received"
-msgstr "Blink vindue n奪r beskeder modtages"
+msgstr "_Blink vindue n奪r beskeder modtages"
 
 #: plugins/win32/winprefs/winprefs.c:443
 msgid "WinGaim Options"
@@ -1314,147 +1565,147 @@
 msgstr ""
 
 #: src/account.c:773
-#, fuzzy
 msgid "accounts"
-msgstr "Konti"
-
-#: src/account.c:915
-#, fuzzy
+msgstr "konti"
+
+#: src/account.c:923
 msgid "Password is required to sign on."
-msgstr "Adgangskode er udl淡bet"
-
-#: src/account.c:940
+msgstr "Adgangskode er kr脱vet for at logge p奪."
+
+#: src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Indtast adgangskode for %s (%s)"
 
-#: src/account.c:947
-#, fuzzy
+#: src/account.c:955
 msgid "Enter Password"
-msgstr "Skift adgangskode"
-
-#: src/account.c:952
-#, fuzzy
+msgstr "Indtast adgangskode"
+
+#: src/account.c:960
 msgid "Save password"
-msgstr "Ny adgangskode"
+msgstr "Gem adgangskode"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
+#: src/account.c:968 src/account.c:1139 src/gtkdialogs.c:545
+#: src/gtkdialogs.c:682 src/gtkdialogs.c:750 src/gtkrequest.c:287
+#: src/protocols/gg/gg.c:463 src/protocols/gg/gg.c:604
+#: src/protocols/gg/gg.c:740 src/protocols/jabber/jabber.c:1217
 #: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
 #: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2890
+#: src/protocols/oscar/oscar.c:4392 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:7927 src/protocols/oscar/oscar.c:8052
+#: src/protocols/oscar/oscar.c:8077 src/protocols/oscar/oscar.c:8129
+#: src/protocols/silc/buddy.c:466 src/protocols/silc/buddy.c:1147
+#: src/protocols/silc/chat.c:423 src/protocols/silc/chat.c:461
+#: src/protocols/silc/chat.c:724 src/protocols/silc/ops.c:1297
+#: src/protocols/silc/ops.c:1910 src/protocols/silc/silc.c:739
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2996
+#: src/request.h:1340
 msgid "OK"
 msgstr "O.k."
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: src/account.c:969 src/account.c:1140 src/account.c:1178
+#: src/gtkaccount.c:2156 src/gtkaccount.c:2627 src/gtkblist.c:4874
+#: src/gtkdialogs.c:546 src/gtkdialogs.c:683 src/gtkdialogs.c:751
+#: src/gtkdialogs.c:770 src/gtkdialogs.c:792 src/gtkdialogs.c:812
+#: src/gtkdialogs.c:856 src/gtkdialogs.c:918 src/gtkdialogs.c:960
+#: src/gtkdialogs.c:1002 src/gtkimhtmltoolbar.c:419 src/gtkpounce.c:1000
+#: src/gtkprivacy.c:595 src/gtkprivacy.c:608 src/gtkprivacy.c:633
+#: src/gtkprivacy.c:644 src/gtkrequest.c:288 src/gtksavedstatuses.c:298
+#: src/protocols/gg/gg.c:464 src/protocols/gg/gg.c:605
+#: src/protocols/gg/gg.c:741 src/protocols/gg/gg.c:830
+#: src/protocols/jabber/buddy.c:573 src/protocols/jabber/buddy.c:1358
+#: src/protocols/jabber/buddy.c:1392 src/protocols/jabber/chat.c:780
+#: src/protocols/jabber/jabber.c:755 src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:266 src/protocols/msn/msn.c:281
+#: src/protocols/msn/msn.c:296 src/protocols/msn/msn.c:313
+#: src/protocols/oscar/oscar.c:1584 src/protocols/oscar/oscar.c:2891
+#: src/protocols/oscar/oscar.c:4350 src/protocols/oscar/oscar.c:4393
+#: src/protocols/oscar/oscar.c:4430 src/protocols/oscar/oscar.c:4474
+#: src/protocols/oscar/oscar.c:7928 src/protocols/oscar/oscar.c:8053
+#: src/protocols/oscar/oscar.c:8078 src/protocols/oscar/oscar.c:8130
+#: src/protocols/oscar/oscar.c:8199 src/protocols/sametime/sametime.c:3338
+#: src/protocols/sametime/sametime.c:3421
+#: src/protocols/sametime/sametime.c:3548
+#: src/protocols/sametime/sametime.c:4392
+#: src/protocols/sametime/sametime.c:5394
+#: src/protocols/sametime/sametime.c:5480 src/protocols/silc/buddy.c:467
+#: src/protocols/silc/buddy.c:1043 src/protocols/silc/buddy.c:1148
+#: src/protocols/silc/chat.c:596 src/protocols/silc/chat.c:725
+#: src/protocols/silc/ops.c:1911 src/protocols/silc/silc.c:740
+#: src/protocols/silc/silc.c:945 src/protocols/yahoo/yahoo.c:2988
+#: src/protocols/yahoo/yahoo.c:2997 src/request.h:1340 src/request.h:1350
 msgid "Cancel"
 msgstr "Annull辿r"
 
-#: src/account.c:986 src/connection.c:96
+#: src/account.c:994 src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manglende protokolmodul for %s"
 
-#: src/account.c:988 src/connection.c:99
+#: src/account.c:996 src/connection.c:99
 msgid "Connection Error"
 msgstr "Forbindelsesfejl"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: src/account.c:1076 src/protocols/gg/gg.c:645
+#: src/protocols/jabber/jabber.c:1170
 msgid "New passwords do not match."
 msgstr "Nye adgangskoder er ikke ens."
 
-#: src/account.c:1061
+#: src/account.c:1085
 msgid "Fill out all fields completely."
 msgstr "Udfyld alle felter fuldst脱ndigt."
 
-#: src/account.c:1085
+#: src/account.c:1108
 msgid "Original password"
 msgstr "Oprindelig adgangskode"
 
-#: src/account.c:1092
+#: src/account.c:1115
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: src/account.c:1099
+#: src/account.c:1122
 msgid "New password (again)"
 msgstr "Ny adgangskode (igen)"
 
-#: src/account.c:1105
+#: src/account.c:1128
 #, c-format
 msgid "Change password for %s"
 msgstr "Skift adgangskode for %s"
 
-#: src/account.c:1113
+#: src/account.c:1136
 msgid "Please enter your current password and your new password."
 msgstr "Indtast din nuv脱rende og nye adgangskode."
 
-#: src/account.c:1146
+#: src/account.c:1169
 #, c-format
 msgid "Change user information for %s"
 msgstr "Skift bruger oplysninger for %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
+#: src/account.c:1177 src/gtkdebug.c:684 src/gtkrequest.c:294
 #: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Gem"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
+#: src/account.c:1672 src/gtkft.c:157 src/protocols/jabber/buddy.c:633
 #: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: src/protocols/novell/novell.c:2861
 msgid "Unknown"
 msgstr "Ukendt"
 
 #: src/blist.c:545
-#, fuzzy
 msgid "buddy list"
-msgstr "Venneliste"
-
-#: src/blist.c:1162
+msgstr "venneliste"
+
+#: src/blist.c:1178
 msgid "Chats"
 msgstr "Chat-rum"
 
-#: src/blist.c:1863
+#: src/blist.c:1881
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1469,7 +1720,7 @@
 "%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:1872
+#: src/blist.c:1890
 msgid "Group not removed"
 msgstr "Gruppe ikke fjernet"
 
@@ -1477,65 +1728,78 @@
 msgid "Registration Error"
 msgstr "Fejl under registrering"
 
-#: src/conversation.c:205
-#, fuzzy
+#: src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s loggede p奪"
+
+#: src/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s loggede ud"
+
+#: src/conversation.c:196
 msgid "Unable to send message: The message is too large."
-msgstr "Kunne ikke sende besked: For lang."
-
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
+msgstr "Kunne ikke sende besked: Beskeden er for lang."
+
+#: src/conversation.c:199 src/conversation.c:212
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "Kunne ikke sende besked til %s:"
+msgstr "Kunne ikke sende besked til %s."
+
+#: src/conversation.c:200
+msgid "The message is too large."
+msgstr "Beskeden er for lang."
 
 #: src/conversation.c:209
-msgid "The message is too large."
-msgstr "Beskeden er for lang."
-
-#: src/conversation.c:218
 msgid "Unable to send message."
 msgstr "Kunne ikke sende besked."
 
-#: src/conversation.c:1497
+#: src/conversation.c:1503
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er nu i rummet."
 
-#: src/conversation.c:1499
+#: src/conversation.c:1505
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] tr奪dte ind i rummet."
 
-#: src/conversation.c:1598
+#: src/conversation.c:1608
 #, c-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: src/conversation.c:1613
+#: src/conversation.c:1623
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s kalder sig nu for %s"
 
-#: src/conversation.c:1669
+#: src/conversation.c:1679
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlod rummet (%s)."
 
-#: src/conversation.c:1671
+#: src/conversation.c:1681
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlod rummet."
 
-#: src/conversation.c:1748
+#: src/conversation.c:1758
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d mere)"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1760
 #, c-format
 msgid " left the room (%s)."
 msgstr " forlod rummet (%s)."
 
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: src/desktopitem.c:286 src/desktopitem.c:875
+msgid "No name"
+msgstr "Intet navn"
+
+#: src/ft.c:189 src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1544,7 +1808,7 @@
 "Fejl ved l脱sning af %s: \n"
 "%s.\n"
 
-#: src/ft.c:192
+#: src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1553,7 +1817,7 @@
 "Fejl ved skrivning til %s: \n"
 "%s.\n"
 
-#: src/ft.c:196
+#: src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1562,35 +1826,35 @@
 "Fejl da %s skulle tilg奪s: \n"
 "%s.\n"
 
-#: src/ft.c:229
+#: src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan ikke sende en tom fil."
 
-#: src/ft.c:239
+#: src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "Kan ikke sende en mappe."
 
-#: src/ft.c:248
+#: src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s er ikke en normal fil. N脱gter at overskrive den.\n"
 
-#: src/ft.c:306
+#: src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vil sende dig %s (%s)"
 
-#: src/ft.c:313
+#: src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vil sende dig en fil"
 
-#: src/ft.c:354
+#: src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept辿r filoverf淡rsel anmodning fra %s?"
 
-#: src/ft.c:358
+#: src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1601,65 +1865,65 @@
 "Fjern v脱rt: %s\n"
 "Fjern port: %d"
 
-#: src/ft.c:382
+#: src/ft.c:383
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s tilbyder at sende filen %s"
 
-#: src/ft.c:422
+#: src/ft.c:427
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s er ikke et gyldigt filnavn.\n"
 
-#: src/ft.c:443
+#: src/ft.c:448
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Tilbyder at sende %s til %s"
 
-#: src/ft.c:454
-#, fuzzy, c-format
+#: src/ft.c:459
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Accept辿r filoverf淡rsel anmodning fra %s?"
-
-#: src/ft.c:608
+msgstr "Starter overf淡rsel af %s fra %s"
+
+#: src/ft.c:613
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Overf淡rsel af filen %s f脱rdig"
 
-#: src/ft.c:611
+#: src/ft.c:616
 msgid "File transfer complete"
 msgstr "Filoverf淡rsel f脱rdig"
 
-#: src/ft.c:995
+#: src/ft.c:1000
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Du annullerede overf淡rslen af %s"
 
-#: src/ft.c:1000
+#: src/ft.c:1005
 msgid "File transfer cancelled"
 msgstr "Filoverf淡rsel annulleret"
 
-#: src/ft.c:1057
+#: src/ft.c:1062
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s annullerede overf淡rslen af %s"
 
-#: src/ft.c:1062
+#: src/ft.c:1067
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s annullerede filoverf淡rslen"
 
-#: src/ft.c:1119
-#, fuzzy, c-format
+#: src/ft.c:1124
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "Filoverf淡rsel til %s afbrudt.\n"
-
-#: src/ft.c:1121
-#, fuzzy, c-format
+msgstr "Filoverf淡rsel til %s fejlede."
+
+#: src/ft.c:1126
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "Filoverf淡rsel fra %s afbrudt.\n"
-
-#: src/gtkaccount.c:362
+msgstr "Filoverf淡rsel fra %s fejlede."
+
+#: src/gtkaccount.c:357
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1671,273 +1935,249 @@
 "<b>Billedst淡rrelse:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: src/gtkaccount.c:742
 msgid "Login Options"
 msgstr "Logind-indstillinger"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: src/gtkaccount.c:759 src/gtkft.c:639
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "Brugernavn:"
-
-#: src/gtkaccount.c:825
+#: src/gtkaccount.c:841
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: src/gtkaccount.c:846 src/gtkblist.c:4436 src/gtkblist.c:4818
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:834
+#: src/gtkaccount.c:850
 msgid "Remember password"
 msgstr "Husk adgangskode"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: src/gtkaccount.c:900
 msgid "User Options"
 msgstr "Brugerindstillinger"
 
-#: src/gtkaccount.c:892
+#: src/gtkaccount.c:913
 msgid "New mail notifications"
 msgstr "P奪mindelse om ny post"
 
-#: src/gtkaccount.c:901
+#: src/gtkaccount.c:922
 msgid "Buddy icon:"
 msgstr "Venneikon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: src/gtkaccount.c:1013
 #, c-format
 msgid "%s Options"
 msgstr "%s indstillinger"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: src/gtkaccount.c:1214
 msgid "Use Global Proxy Settings"
 msgstr "Brug globale mellemv脱rts indstillinger"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: src/gtkaccount.c:1220
 msgid "No Proxy"
 msgstr "Ingen mellemv脱rt"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: src/gtkaccount.c:1226
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: src/gtkaccount.c:1232
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: src/gtkaccount.c:1238
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: src/gtkaccount.c:1244 src/gtkprefs.c:1030
 msgid "Use Environmental Settings"
 msgstr "Brug milj淡-indstillinger"
 
-#: src/gtkaccount.c:1249
+#: src/gtkaccount.c:1278
 msgid "you can see the butterflies mating"
 msgstr "du kan se sommerfuglene parre sig"
 
-#: src/gtkaccount.c:1253
+#: src/gtkaccount.c:1282
 msgid "If you look real closely"
 msgstr "Hvis du kigger meget t脱t p奪"
 
-#: src/gtkaccount.c:1269
+#: src/gtkaccount.c:1298
 msgid "Proxy Options"
 msgstr "Mellemv脱rtindstillinger"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: src/gtkaccount.c:1312 src/gtkprefs.c:1024
 msgid "Proxy _type:"
 msgstr "Mellemv脱rts_type:"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: src/gtkaccount.c:1321 src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "_V脱rtsnavn:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: src/gtkaccount.c:1325 src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1308
+#: src/gtkaccount.c:1333
 msgid "_Username:"
 msgstr "_Brugernavn:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: src/gtkaccount.c:1339 src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "Adgang_skode:"
 
-#: src/gtkaccount.c:1700
+#: src/gtkaccount.c:1717
 msgid "Add Account"
 msgstr "Tilf淡j konto"
 
-#: src/gtkaccount.c:1702
+#: src/gtkaccount.c:1719
 msgid "Modify Account"
 msgstr "Redig辿r konto"
 
+#: src/gtkaccount.c:1741
+msgid "_Basic"
+msgstr "_Basal"
+
+#: src/gtkaccount.c:1752
+msgid "_Advanced"
+msgstr "_Advanceret"
+
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1767 src/protocols/jabber/jabber.c:754
 msgid "Register"
 msgstr "Registr辿r"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: src/gtkaccount.c:2150 src/gtksavedstatuses.c:295
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker p奪 at du vil slette %s?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: src/gtkaccount.c:2155 src/gtkpounce.c:999 src/gtkrequest.c:291
+#: src/gtksavedstatuses.c:297
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: src/gtkaccount.c:2213 src/gtksavedstatuses.c:873
+#: src/protocols/oscar/oscar.c:5037
 msgid "Screen Name"
 msgstr "Brugernavn:"
 
-#: src/gtkaccount.c:2210
-#, fuzzy
-msgid "Enabled"
-msgstr "Fejlede"
-
-#: src/gtkaccount.c:2218
+#: src/gtkaccount.c:2244
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2550
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+#: src/gtkaccount.c:2575
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s har gjort %s til sin ven%s%s%s"
 
-#: src/gtkaccount.c:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Vil du tilf淡je vedkommende til din venneliste?"
-
-#: src/gtkaccount.c:2572
+#: src/gtkaccount.c:2624
 msgid "Add buddy to your list?"
 msgstr "Tilf淡j brugeren til din venneliste?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: src/gtkaccount.c:2626 src/gtkblist.c:4873 src/gtkconv.c:1574
+#: src/gtkrequest.c:292 src/protocols/gg/gg.c:829
+#: src/protocols/oscar/oscar.c:4662 src/protocols/sametime/sametime.c:5479
+#: src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Tilf淡j"
 
-#: src/gtkblist.c:595
+#: src/gtkblist.c:662
 msgid "Join a Chat"
 msgstr "Deltag i en chat"
 
-#: src/gtkblist.c:616
+#: src/gtkblist.c:683
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Indtast den n淡dvendige information om den chat du gerne vil deltage i.\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:694 src/gtkpounce.c:500 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: src/gtkblist.c:935
+#: src/gtkblist.c:1002
 msgid "Get _Info"
 msgstr "Hent _info"
 
-#: src/gtkblist.c:938
+#: src/gtkblist.c:1005
 msgid "I_M"
 msgstr "_Besked"
 
-#: src/gtkblist.c:944
+#: src/gtkblist.c:1011
 msgid "_Send File"
 msgstr "_Send fil"
 
-#: src/gtkblist.c:950
+#: src/gtkblist.c:1019
+msgid "Start _Voice Chat"
+msgstr "Start _voice chat"
+
+#: src/gtkblist.c:1025
 msgid "Add Buddy _Pounce"
 msgstr "_Tilf淡j overv奪gning"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: src/gtkblist.c:1029 src/gtkblist.c:1033 src/gtkblist.c:1131
+#: src/gtkblist.c:1154
 msgid "View _Log"
 msgstr "Vis _log"
 
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "_Lav alias for ven..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "_Fjern ven"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "Alias kontakt..."
-
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "Fjern kontakt"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: src/gtkblist.c:1044
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: src/gtkblist.c:1047 src/gtkconv.c:1571 src/gtkrequest.c:293
+msgid "Remove"
+msgstr "Slet"
+
+#: src/gtkblist.c:1055 src/gtkblist.c:1141 src/gtkblist.c:1162
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1102
 msgid "Add a _Buddy"
 msgstr "Tilf淡j en _ven"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1104
 msgid "Add a C_hat"
 msgstr "Tilf淡j en _chat"
 
-#: src/gtkblist.c:1032
+#: src/gtkblist.c:1107
 msgid "_Delete Group"
 msgstr "_Slet gruppe"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1109
 msgid "_Rename"
 msgstr "_Omd淡b"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: src/gtkblist.c:1127 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Deltag"
 
-#: src/gtkblist.c:1054
+#: src/gtkblist.c:1129
 msgid "Auto-Join"
 msgstr "Auto-Deltag"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: src/gtkblist.c:1167 src/gtkblist.c:1190
 msgid "_Collapse"
 msgstr "_Fold sammen"
 
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1195
 msgid "_Expand"
 msgstr "_Udvid"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
-#, fuzzy
+#: src/gtkblist.c:1426 src/gtkblist.c:1436 src/gtkblist.c:3668
+#: src/gtkblist.c:3673
 msgid "/Tools/Mute Sounds"
-msgstr "Sl奪 lyde fra"
-
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+msgstr "/V脱rkt淡jer/Sl奪 lyde fra"
+
+#: src/gtkblist.c:1895 src/gtkconv.c:3909 src/gtkpounce.c:399
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -1945,125 +2185,122 @@
 "ven."
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2460
 msgid "/_Buddies"
 msgstr "/_Venner"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2461
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Venner/Ny _besked..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2462
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Venner/_Deltag i chat..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2463
 msgid "/Buddies/Get User _Info..."
 msgstr "/Venner/_Hent brugeroplysninger..."
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2464
 msgid "/Buddies/View User _Log..."
 msgstr "/Venner/L脱s bruger _log..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2466
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Venner/Vis _offline venner"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2467
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Venner/Vis _tomme grupper"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: src/gtkblist.c:2468
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/Venner/Vis _offline venner"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
-msgid "/Buddies/Sort Buddies"
-msgstr "/Venner/Vis _offline venner"
-
-#: src/gtkblist.c:2340
+msgstr "/Venner/Vis venne_detaljer"
+
+#: src/gtkblist.c:2469
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Venner/_Sort辿r venner"
+
+#: src/gtkblist.c:2471
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Venner/Tilf淡j _ven..."
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2472
 msgid "/Buddies/Add C_hat..."
 msgstr "/Venner/Tilf淡j _chat..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2473
 msgid "/Buddies/Add _Group..."
 msgstr "/Venner/Tilf淡j _gruppe..."
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2475
 msgid "/Buddies/_Quit"
 msgstr "/Venner/_Afslut"
 
+#. Accounts menu
+#: src/gtkblist.c:2478
+msgid "/_Accounts"
+msgstr "/_Konti"
+
+#: src/gtkblist.c:2479 src/gtkblist.c:5453
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Konti/Tilf淡j\\/Redig辿r"
+
 #. Tools
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2482
 msgid "/_Tools"
 msgstr "/V脱rk_t淡jer"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
+#: src/gtkblist.c:2483
+msgid "/Tools/Buddy _Pounces"
 msgstr "/V脱rkt淡jer/_Overv奪gning"
 
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/V脱rkt淡jer/Konti _handlinger"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/V脱rkt淡jer/_Konti"
-
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2484
+msgid "/Tools/Plu_gins"
+msgstr "/V脱rkt淡jer/_Moduler"
+
+#: src/gtkblist.c:2485
 msgid "/Tools/Pr_eferences"
 msgstr "/V脱rkt淡jer/_Indstillinger"
 
-#: src/gtkblist.c:2353
-#, fuzzy
-msgid "/Tools/Plu_gins"
-msgstr "/V脱rkt淡jer/_Modul handlinger"
-
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2486
 msgid "/Tools/Pr_ivacy"
 msgstr "/V脱rkt淡jer/_Privatliv"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2488
 msgid "/Tools/_File Transfers"
 msgstr "/V脱rkt淡jer/_Filoverf淡rsler"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2489
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_um liste"
 
-#: src/gtkblist.c:2358
-#, fuzzy
+#: src/gtkblist.c:2490
+msgid "/Tools/System _Log"
+msgstr "/V脱rkt淡jer/System_log"
+
+#: src/gtkblist.c:2492
 msgid "/Tools/Mute _Sounds"
-msgstr "Sl奪 lyde fra"
-
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/V脱rkt淡jer/Vis system_log"
+msgstr "/V脱rkt淡jer/Sl奪 lyde _fra"
 
 #. Help
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2495
 msgid "/_Help"
 msgstr "/_Hj脱lp"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2496
 msgid "/Help/Online _Help"
 msgstr "/Hj脱lp/Online _hj脱lp"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2497
 msgid "/Help/_Debug Window"
 msgstr "/Hj脱lp/Vis _fejls淡gningsvindue"
 
-#: src/gtkblist.c:2365
+#: src/gtkblist.c:2498
 msgid "/Help/_About"
 msgstr "/Hj脱lp/_Om"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: src/gtkblist.c:2530 src/gtkblist.c:2597
 #, c-format
 msgid ""
 "\n"
@@ -2072,61 +2309,61 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:2473
-#, fuzzy, c-format
+#: src/gtkblist.c:2606
+#, c-format
 msgid ""
 "\n"
 "<b>Contact Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>Kontakt alias:</b>"
-
-#: src/gtkblist.c:2481
-#, fuzzy, c-format
+"<b>Kontakt alias:</b> %s"
+
+#: src/gtkblist.c:2614
+#, c-format
 msgid ""
 "\n"
 "<b>Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>Alias:</b>"
-
-#: src/gtkblist.c:2489
-#, fuzzy, c-format
+"<b>Alias:</b> %s"
+
+#: src/gtkblist.c:2622
+#, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
 msgstr ""
 "\n"
-"<b>K脱lenavn:</b>"
-
-#: src/gtkblist.c:2498
-#, fuzzy, c-format
+"<b>K脱lenavn:</b> %s"
+
+#: src/gtkblist.c:2631
+#, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
 msgstr ""
 "\n"
-"<b>Logget ind:</b>"
-
-#: src/gtkblist.c:2510
-#, fuzzy, c-format
+"<b>Logget ind:</b> %s"
+
+#: src/gtkblist.c:2643
+#, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
 msgstr ""
 "\n"
-"<b>Inaktiv:</b>"
-
-#: src/gtkblist.c:2546
-#, fuzzy, c-format
+"<b>Inaktiv:</b> %s"
+
+#: src/gtkblist.c:2678
+#, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
-
-#: src/gtkblist.c:2554
+"<b>Sidst set:</b> %s siden"
+
+#: src/gtkblist.c:2686
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2134,7 +2371,7 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2577
+#: src/gtkblist.c:2709
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2142,129 +2379,122 @@
 "\n"
 "<b>Beskrivelse:</b> Skr脱mmende"
 
-#: src/gtkblist.c:2579
-#, fuzzy
+#: src/gtkblist.c:2711
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
 msgstr ""
 "\n"
-"<b>Status</b>: Enest奪ende"
-
-#: src/gtkblist.c:2581
-#, fuzzy
+"<b>Status:</b> Enest奪ende"
+
+#: src/gtkblist.c:2713
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>Status</b>: Enest奪ende"
-
-#: src/gtkblist.c:2843
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "Inaktiv (%dt%02dm)"
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "Inaktiv (%dm)"
-
-#: src/gtkblist.c:2848
-#, fuzzy
-msgid "Idle "
+"<b>Status:</b> Fantastisk"
+
+#: src/gtkblist.c:2981
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Inaktiv %dt %02dm"
+
+#: src/gtkblist.c:2983
+#, c-format
+msgid "Idle %dm"
+msgstr "Inaktiv %dm"
+
+#: src/gtkblist.c:2986 src/protocols/bonjour/bonjour.c:323
+#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2855 src/protocols/oscar/oscar.c:5058
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo_profile.c:660
+msgid "Idle"
 msgstr "Inaktiv"
 
-#: src/gtkblist.c:2852
+#: src/gtkblist.c:2990
 msgid "Offline "
 msgstr "Offline "
 
-#: src/gtkblist.c:2968
-#, fuzzy
+#: src/gtkblist.c:3108
 msgid "/Buddies/New Instant Message..."
-msgstr "/Venner/Ny _besked..."
-
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+msgstr "/Venner/Ny besked..."
+
+#: src/gtkblist.c:3109 src/gtkblist.c:3142
 msgid "/Buddies/Join a Chat..."
 msgstr "/Venner/Deltag i chat..."
 
-#: src/gtkblist.c:2970
-#, fuzzy
+#: src/gtkblist.c:3110
 msgid "/Buddies/Get User Info..."
-msgstr "/Venner/_Hent brugeroplysninger..."
-
-#: src/gtkblist.c:2971
-#, fuzzy
+msgstr "/Venner/Hent brugeroplysninger..."
+
+#: src/gtkblist.c:3111
 msgid "/Buddies/Add Buddy..."
-msgstr "/Venner/Tilf淡j _ven..."
-
-#: src/gtkblist.c:2972
-#, fuzzy
+msgstr "/Venner/Tilf淡j ven..."
+
+#: src/gtkblist.c:3112 src/gtkblist.c:3145
 msgid "/Buddies/Add Chat..."
-msgstr "/Venner/Tilf淡j _chat..."
-
-#: src/gtkblist.c:2973
-#, fuzzy
+msgstr "/Venner/Tilf淡j chat..."
+
+#: src/gtkblist.c:3113
 msgid "/Buddies/Add Group..."
-msgstr "/Venner/Tilf淡j _gruppe..."
-
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/V脱rkt淡jer/R_um liste"
-
-#: src/gtkblist.c:3009
+msgstr "/Venner/Tilf淡j gruppe..."
+
+#: src/gtkblist.c:3148
+#, fuzzy
+msgid "/Tools/Buddy Pounces"
+msgstr "/V脱rkt淡jer/Overv奪gning"
+
+#: src/gtkblist.c:3151
 msgid "/Tools/Privacy"
 msgstr "/V脱rkt淡jer/Privatliv"
 
-#: src/gtkblist.c:3085
-#, fuzzy
+#: src/gtkblist.c:3154
+msgid "/Tools/Room List"
+msgstr "/V脱rkt淡jer/R_um liste"
+
+#: src/gtkblist.c:3339
 msgid "Manually"
-msgstr "Andet program"
-
-#: src/gtkblist.c:3087
-#, fuzzy
+msgstr "Manuelt"
+
+#: src/gtkblist.c:3341
 msgid "Alphabetically"
 msgstr "Alfabetisk"
 
-#: src/gtkblist.c:3088
+#: src/gtkblist.c:3342
 msgid "By status"
 msgstr "Status"
 
-#: src/gtkblist.c:3089
+#: src/gtkblist.c:3343
 msgid "By log size"
 msgstr "Logst淡rrelse"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/V脱rkt淡jer/Overv奪gning"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/V脱rkt淡jer/Konti _handlinger"
+#: src/gtkblist.c:3532
+msgid "/Accounts"
+msgstr "/Konti"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: src/gtkblist.c:3664
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Venner/Vis _offline venner"
 
-#: src/gtkblist.c:3324
+#: src/gtkblist.c:3666
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Venner/Vis _tomme grupper"
 
-#: src/gtkblist.c:3328
-#, fuzzy
+#: src/gtkblist.c:3670
 msgid "/Buddies/Show Buddy Details"
-msgstr "/Venner/Vis _offline venner"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+msgstr "/Venner/Vis venne_detaljer"
+
+#: src/gtkblist.c:4369 src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:995 src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1139 src/protocols/yahoo/yahoo.c:2908
 msgid "Add Buddy"
 msgstr "Tilf淡j ven"
 
-#: src/gtkblist.c:4029
+#: src/gtkblist.c:4393
 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. "
@@ -2274,16 +2504,20 @@
 "ogs奪 skrive et alias, eller et k脱lenavn, for vennen. Dette vil blive brugt "
 "istedet for brugernavnet, n奪r det er muligt.\n"
 
+#: src/gtkblist.c:4415
+msgid "Screen Name:"
+msgstr "Brugernavn:"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: src/gtkblist.c:4463 src/gtkblist.c:4798
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/gtkblist.c:4357
+#: src/gtkblist.c:4731
 msgid "This protocol does not support chat rooms."
 msgstr "Denne protokol underst淡tter ikke chatrum."
 
-#: src/gtkblist.c:4373
+#: src/gtkblist.c:4747
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2291,11 +2525,11 @@
 "Du er p奪 nuv脱rende tidspunkt ikke logget p奪 nogen protokoller som har evnen "
 "til at chatte."
 
-#: src/gtkblist.c:4390
+#: src/gtkblist.c:4764
 msgid "Add Chat"
 msgstr "Tilf淡j chat"
 
-#: src/gtkblist.c:4414
+#: src/gtkblist.c:4788
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2303,49 +2537,137 @@
 "Indtast et alias og den n淡dvendige information om den chat du vil tilf淡je "
 "til din venneliste.\n"
 
-#: src/gtkblist.c:4493
+#: src/gtkblist.c:4870 src/protocols/sametime/sametime.c:5393
+#: src/protocols/sametime/sametime.c:5477
 msgid "Add Group"
 msgstr "Tilf淡j gruppe"
 
-#: src/gtkblist.c:4494
+#: src/gtkblist.c:4871
 msgid "Please enter the name of the group to be added."
 msgstr "Indtast navnet p奪 gruppen der skal tilf淡jes."
 
-#: src/gtkblist.c:5025
+#: src/gtkblist.c:5495
+msgid "_Edit Account"
+msgstr "_Redig辿r konto"
+
+#: src/gtkblist.c:5528 src/gtkblist.c:5534
 msgid "No actions available"
 msgstr "Ingen handlinger tilg脱ngelige"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+#: src/gtkblist.c:5542
+msgid "_Disable"
+msgstr "_Sl奪 fra"
+
+#: src/gtkblist.c:5554
+msgid "Enable Account"
+msgstr "Sl奪 konto til"
+
+#: src/gtkblist.c:5609
 msgid "/Tools"
-msgstr "/V脱rk_t淡jer"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
+msgstr "/V脱rkt淡jer"
+
+#: src/gtkblist.c:5704
+msgid "/Buddies/Sort Buddies"
+msgstr "/Venner/Sort辿r venner"
+
+#: src/gtkcellview.c:198
+msgid "Background color name"
+msgstr "Baggrundsfarvenavn"
+
+#: src/gtkcellview.c:199
+msgid "Background color as a string"
+msgstr "Baggrundsfarve som en streng"
+
+#: src/gtkcellview.c:205 src/gtkimhtmltoolbar.c:1007
+msgid "Background color"
+msgstr "Baggrundsfarve"
+
+#: src/gtkcellview.c:206
+msgid "Background color as a GdkColor"
+msgstr "Baggrundsfarve som en GdkColor"
+
+#: src/gtkcellview.c:213
+msgid "Background set"
+msgstr ""
+
+#: src/gtkcellview.c:214
+msgid "Whether this tag affects the background color"
+msgstr ""
+
+#: src/gtkcombobox.c:490
+msgid "ComboBox model"
+msgstr ""
+
+#: src/gtkcombobox.c:491
+msgid "The model for the combo box"
+msgstr ""
+
+#: src/gtkcombobox.c:498
+msgid "Wrap width"
+msgstr ""
+
+#: src/gtkcombobox.c:499
+msgid "Wrap width for layouting the items in a grid"
+msgstr ""
+
+#: src/gtkcombobox.c:508
+msgid "Row span column"
+msgstr ""
+
+#: src/gtkcombobox.c:509
+msgid "TreeModel column containing the row span values"
+msgstr ""
+
+#: src/gtkcombobox.c:518
+msgid "Column span column"
+msgstr ""
+
+#: src/gtkcombobox.c:520
+msgid "TreeModel column containing the column span values"
+msgstr ""
+
+#: src/gtkcombobox.c:529
+msgid "Active item"
+msgstr ""
+
+#: src/gtkcombobox.c:530
+msgid "The item which is currently active"
+msgstr ""
+
+#: src/gtkcombobox.c:538
+msgid "Appears as list"
+msgstr ""
+
+#: src/gtkcombobox.c:539
+msgid "Whether combobox dropdowns should look like lists rather than menus"
+msgstr ""
+
+#: src/gtkconn.c:226
+#, c-format
 msgid "%s disconnected"
-msgstr "Forbindelse afbrudt"
-
-#: src/gtkconn.c:191
+msgstr "%s afbrudt"
+
+#: src/gtkconn.c:227
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
 "Correct the error and reenable the account to connect."
 msgstr ""
 
-#: src/gtkconv.c:325
+#: src/gtkconv.c:349
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "jeg bruger Gaim v%s."
 
-#: src/gtkconv.c:334
+#: src/gtkconv.c:358
 msgid "Supported debug options are:  version"
 msgstr "Underst淡ttede fejls淡gningstilvalg er:  version"
 
-#: src/gtkconv.c:371
+#: src/gtkconv.c:394
 msgid "No such command (in this context)."
 msgstr "Ingen kommando ved det navn (i dette sammenh脱ng)."
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:397
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2353,51 +2675,48 @@
 "Brug \"/help %lt;kommando&gt;\" for hj脱lp til en specifik kommando.\n"
 "De f淡lgende kommandoer er tilg脱ngelige i dette sammenh脱ng:\n"
 
-#: src/gtkconv.c:446
+#: src/gtkconv.c:469
 msgid "No such command."
 msgstr "Ingen kommando ved det navn."
 
-#: src/gtkconv.c:453
+#: src/gtkconv.c:476
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksfejl: Du indtastede det forkert antal argumenter til den kommando."
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:481
 msgid "Your command failed for an unknown reason."
 msgstr "Din kommando fejlede pga. en ukendt 奪rsag."
 
-#: src/gtkconv.c:465
-#, fuzzy
+#: src/gtkconv.c:488
 msgid "That command only works in chats, not IMs."
 msgstr "Den kommando virker kun i chats, ikke i samtalevinduer."
 
-#: src/gtkconv.c:468
-#, fuzzy
+#: src/gtkconv.c:491
 msgid "That command only works in IMs, not chats."
 msgstr "Den besked virker kun i samtalevinduer, ikke i chats."
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:495
 msgid "That command doesn't work on this protocol."
 msgstr "Den kommando virker ikke med denne protokol."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
-#, fuzzy
+#: src/gtkconv.c:729 src/gtkconv.c:755
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Vennen er ikke p奪 den samme protokol som denne chat"
-
-#: src/gtkconv.c:719
+msgstr "Vennen er ikke p奪 den samme protokol som denne chat."
+
+#: src/gtkconv.c:749
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Du er p奪 nuv脱rende tidspunkt ikke logget p奪 nogen konti som kan invitere den "
 "ven."
 
-#: src/gtkconv.c:772
+#: src/gtkconv.c:802
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invit辿r ven med i chat-rum"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: src/gtkconv.c:832
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2405,298 +2724,289 @@
 "Indtast navnet p奪 den bruger, du vil invitere, samt eventuelt en inviterings-"
 "besked."
 
-#: src/gtkconv.c:823
+#: src/gtkconv.c:853
 msgid "_Buddy:"
 msgstr "_Ven:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: src/gtkconv.c:873 src/gtksavedstatuses.c:1077 src/gtksavedstatuses.c:1395
 msgid "_Message:"
 msgstr "_Besked:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: src/gtkconv.c:930 src/gtkconv.c:2275 src/gtkdebug.c:217 src/gtkft.c:487
 msgid "Unable to open file."
 msgstr "Kunne ikke 奪bne fil."
 
-#: src/gtkconv.c:906
+#: src/gtkconv.c:936
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Samtale med %s</h1>\n"
 
-#: src/gtkconv.c:930
+#: src/gtkconv.c:960
 msgid "Save Conversation"
 msgstr "Gem samtale"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: src/gtkconv.c:1077 src/gtkdebug.c:165 src/gtkdebug.c:678
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: src/gtkconv.c:1103 src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_S淡g efter:"
 
-#: src/gtkconv.c:1227
+#: src/gtkconv.c:1274
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: src/gtkconv.c:1235
+msgstr "Logging startet. Fremtidige beskeder i denne samtale vil blive logget."
+
+#: src/gtkconv.c:1282
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-
-#: src/gtkconv.c:1489
+"Logging stoppet. Fremtidige beskeder i denne samtale vil ikke blive logget."
+
+#: src/gtkconv.c:1536
 msgid "IM"
 msgstr "Besked"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: src/gtkconv.c:1542 src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/gtkconv.c:1502
+#: src/gtkconv.c:1549
 msgid "Un-Ignore"
 msgstr "Ignor辿r ikke"
 
-#: src/gtkconv.c:1505
+#: src/gtkconv.c:1552
 msgid "Ignore"
 msgstr "Ignor辿r"
 
-#: src/gtkconv.c:1511
+#: src/gtkconv.c:1558
 msgid "Info"
 msgstr "Information"
 
-#: src/gtkconv.c:1517
-#, fuzzy
+#: src/gtkconv.c:1564
 msgid "Get Away Message"
-msgstr "Ny frav脱rsbesked"
-
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "Slet"
-
-#: src/gtkconv.c:2236
+msgstr "Hent frav脱rsbesked"
+
+#: src/gtkconv.c:2283
 msgid "Unable to save icon file to disk."
 msgstr "Kunne ikke gemme ikonfil til disken."
 
-#: src/gtkconv.c:2259
+#: src/gtkconv.c:2306
 msgid "Save Icon"
 msgstr "Gem ikon"
 
-#: src/gtkconv.c:2308
+#: src/gtkconv.c:2355
 msgid "Animate"
 msgstr "Anim辿r"
 
-#: src/gtkconv.c:2313
+#: src/gtkconv.c:2360
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: src/gtkconv.c:2319
+#: src/gtkconv.c:2366
 msgid "Save Icon As..."
 msgstr "Gem ikon som..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: src/gtkconv.c:2507
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: src/gtkconv.c:2369
+#: src/gtkconv.c:2509
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/Ny _besked..."
 
-#: src/gtkconv.c:2374
+#: src/gtkconv.c:2514
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Find..."
 
-#: src/gtkconv.c:2376
+#: src/gtkconv.c:2516
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/Vis _log"
 
-#: src/gtkconv.c:2377
+#: src/gtkconv.c:2517
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/Gem _som..."
 
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/Samtale/Ryd"
-
-#: src/gtkconv.c:2383
+#: src/gtkconv.c:2519
+msgid "/Conversation/Clea_r"
+msgstr "/Samtale/_Ryd"
+
+#: src/gtkconv.c:2523
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/Se_nd fil..."
 
-#: src/gtkconv.c:2384
+#: src/gtkconv.c:2524
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Tilf淡j overv奪gning..."
 
-#: src/gtkconv.c:2386
+#: src/gtkconv.c:2526
 msgid "/Conversation/_Get Info"
 msgstr "/Samtale/Hent _oplysninger"
 
-#: src/gtkconv.c:2388
+#: src/gtkconv.c:2528
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/In_vit辿r..."
 
-#: src/gtkconv.c:2393
+#: src/gtkconv.c:2533
 msgid "/Conversation/Al_ias..."
 msgstr "/Samtale/Al_ias..."
 
-#: src/gtkconv.c:2395
+#: src/gtkconv.c:2535
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blok辿r..."
 
-#: src/gtkconv.c:2397
+#: src/gtkconv.c:2537
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/_Tilf淡j..."
 
-#: src/gtkconv.c:2399
+#: src/gtkconv.c:2539
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/_Fjern..."
 
-#: src/gtkconv.c:2404
+#: src/gtkconv.c:2544
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Samtale/Inds脱t lin_k..."
 
-#: src/gtkconv.c:2406
+#: src/gtkconv.c:2546
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Samtale/Inds脱t b_illede..."
 
-#: src/gtkconv.c:2411
+#: src/gtkconv.c:2551
 msgid "/Conversation/_Close"
 msgstr "/Samtale/Luk"
 
 #. Options
-#: src/gtkconv.c:2415
+#: src/gtkconv.c:2555
 msgid "/_Options"
 msgstr "/_Valgmuligheder"
 
-#: src/gtkconv.c:2416
+#: src/gtkconv.c:2556
 msgid "/Options/Enable _Logging"
 msgstr "/Valgmuligheder/Aktiver _logning"
 
-#: src/gtkconv.c:2417
+#: src/gtkconv.c:2557
 msgid "/Options/Enable _Sounds"
 msgstr "/Valgmuligheder/Brug _lyde"
 
-#: src/gtkconv.c:2418
-#, fuzzy
+#: src/gtkconv.c:2558
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Valgmuligheder/Vis venne_ikoner"
+
+#: src/gtkconv.c:2560
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Valgmuligheder/Vis _formatteringslinje"
-
-#: src/gtkconv.c:2419
+msgstr "/Valgmuligheder/Vis _formatteringslinjer"
+
+#: src/gtkconv.c:2561
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valgmuligheder/Vis _tidsstempler"
 
-#: src/gtkconv.c:2420
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "Vis venne_ikoner"
-
-#: src/gtkconv.c:2460
+#: src/gtkconv.c:2601
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis log"
 
-#: src/gtkconv.c:2466
+#: src/gtkconv.c:2607
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil..."
 
-#: src/gtkconv.c:2470
+#: src/gtkconv.c:2611
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Tilf淡j overv奪gning..."
 
-#: src/gtkconv.c:2476
+#: src/gtkconv.c:2617
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent oplysninger"
 
-#: src/gtkconv.c:2480
+#: src/gtkconv.c:2621
 msgid "/Conversation/Invite..."
 msgstr "/Samtale/Invit辿r..."
 
-#: src/gtkconv.c:2486
+#: src/gtkconv.c:2627
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Alias..."
 
-#: src/gtkconv.c:2490
+#: src/gtkconv.c:2631
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blok辿r..."
 
-#: src/gtkconv.c:2494
+#: src/gtkconv.c:2635
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Tilf淡j..."
 
-#: src/gtkconv.c:2498
+#: src/gtkconv.c:2639
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern..."
 
-#: src/gtkconv.c:2504
+#: src/gtkconv.c:2645
 msgid "/Conversation/Insert Link..."
 msgstr "/Samtale/Inds脱t link..."
 
-#: src/gtkconv.c:2508
+#: src/gtkconv.c:2649
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Inds脱t b_illede..."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2655
 msgid "/Options/Enable Logging"
 msgstr "/Valgmuligheder/Aktiver _logning"
 
-#: src/gtkconv.c:2517
+#: src/gtkconv.c:2658
 msgid "/Options/Enable Sounds"
 msgstr "/Valgmuligheder/Brug lyde"
 
-#: src/gtkconv.c:2520
-#, fuzzy
+#: src/gtkconv.c:2661
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Valgmuligheder/Vis formatteringslinje"
-
-#: src/gtkconv.c:2523
+msgstr "/Valgmuligheder/Vis formatteringslinjer"
+
+#: src/gtkconv.c:2664
 msgid "/Options/Show Timestamps"
 msgstr "/Valgmuligheder/Vis tidsstempler"
 
-#: src/gtkconv.c:2526
-#, fuzzy
+#: src/gtkconv.c:2667
 msgid "/Options/Show Buddy Icon"
-msgstr "Vis venne_ikoner"
-
-#: src/gtkconv.c:2597
+msgstr "/Valgmuligheder/Vis venne_ikoner"
+
+#: src/gtkconv.c:2739
 msgid "User is typing..."
 msgstr "Bruger skriver..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: src/gtkconv.c:2742
+msgid "User has typed something and stopped"
 msgstr "Bruger har skrevet noget, og stoppet"
 
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+#. Build the Send To menu
+#: src/gtkconv.c:2890
 msgid "_Send To"
-msgstr "S_end som"
-
-#: src/gtkconv.c:3373
+msgstr "_Send til"
+
+#: src/gtkconv.c:3537 src/protocols/sametime/sametime.c:3490
 msgid "Topic:"
 msgstr "Emne:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: src/gtkconv.c:3585
 msgid "0 people in room"
 msgstr "Ingen chattere i rummet"
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3664
 msgid "IM the user"
 msgstr "Send besked til bruger"
 
-#: src/gtkconv.c:3513
+#: src/gtkconv.c:3677
 msgid "Ignore the user"
 msgstr "Ignor辿r brugeren"
 
-#: src/gtkconv.c:3525
+#: src/gtkconv.c:3689
 msgid "Get the user's information"
 msgstr "Hent brugerens oplysninger"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: src/gtkconv.c:4575 src/gtkconv.c:4680 src/gtkconv.c:4735
 #, 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:5582
+#: src/gtkconv.c:5973
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2704,12 +3014,12 @@
 "say &lt;besked&gt;:  Send en besked som normalt hvis du ikke brugte en "
 "kommando."
 
-#: src/gtkconv.c:5585
+#: src/gtkconv.c:5976
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;handling&gt;: Send en IRC-lignende handling til en ven eller en chat."
 
-#: src/gtkconv.c:5588
+#: src/gtkconv.c:5979
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2717,45 +3027,43 @@
 "edbug &lt;tilvalg&gt;: Send forskellige fejls淡gningsoplysninger til den "
 "nuv脱rende samtale."
 
-#: src/gtkconv.c:5591
+#: src/gtkconv.c:5982
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Rydder samtalevinduet for tekst."
 
-#: src/gtkconv.c:5594
+#: src/gtkconv.c:5985
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;kommando&gt;:  Hj脱lp til en specifik kommando."
 
-#: src/gtkconv.c:5709
-#, fuzzy
+#: src/gtkconv.c:6118
 msgid "Confirm close"
-msgstr "Bekr脱ft Konto"
-
-#: src/gtkconv.c:5741
-#, fuzzy
+msgstr "Bekr脱ft lukning"
+
+#: src/gtkconv.c:6150
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Er du sikker p奪 at du vil slette %s?"
-
-#: src/gtkconv.c:6408
+msgstr "Du har ul脱ste beskeder. Er du sikker p奪 at du vil lukke vinduet?"
+
+#: src/gtkconv.c:6946
 msgid "Close conversation"
 msgstr "Luk samtale"
 
-#: src/gtkconv.c:6872
+#: src/gtkconv.c:7410
 msgid "Last created window"
 msgstr "Sidst oprettede vindue"
 
-#: src/gtkconv.c:6874
+#: src/gtkconv.c:7412
 msgid "Separate IM and Chat windows"
 msgstr "Seperate samtale- og chatvinduer"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: src/gtkconv.c:7414 src/gtkprefs.c:1230
 msgid "New window"
 msgstr "Nyt vindue"
 
-#: src/gtkconv.c:6878
+#: src/gtkconv.c:7416
 msgid "By group"
 msgstr "Efter gruppe"
 
-#: src/gtkconv.c:6880
+#: src/gtkconv.c:7418
 msgid "By account"
 msgstr "Efter konto"
 
@@ -2764,9 +3072,8 @@
 msgstr "Gem fejlsporingslog"
 
 #: src/gtkdebug.c:586
-#, fuzzy
 msgid "Invert"
-msgstr "_Inds脱t"
+msgstr "Invert辿r"
 
 #: src/gtkdebug.c:589
 msgid "Highlight matches"
@@ -2777,9 +3084,8 @@
 msgstr "Fejls淡gningsvindue"
 
 #: src/gtkdebug.c:689
-#, fuzzy
 msgid "Clear"
-msgstr "Luk"
+msgstr "Ryd"
 
 #: src/gtkdebug.c:698
 msgid "Pause"
@@ -2790,334 +3096,339 @@
 msgstr "Tidsstempler"
 
 #: src/gtkdebug.c:724
-#, fuzzy
 msgid "Filter"
-msgstr "Fejlede"
+msgstr "Filter"
 
 #: src/gtkdebug.c:743
-#, fuzzy
 msgid "Right click for more options."
-msgstr "Vis flere indstillinger"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+msgstr "H淡jreklik for flere muligheder"
+
+#: src/gtkdialogs.c:61 src/gtkdialogs.c:99
 msgid "lead developer"
 msgstr "hovedudvikler"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:62 src/gtkdialogs.c:63 src/gtkdialogs.c:65
+#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:73
+#: src/gtkdialogs.c:74
 msgid "developer"
 msgstr "udvikler"
 
-#: src/gtkdialogs.c:61
+#: src/gtkdialogs.c:64
+msgid "win32 port"
+msgstr "win32 port"
+
+#: src/gtkdialogs.c:66
 msgid "developer & webmaster"
 msgstr "udvikler & webmaster"
 
-#: src/gtkdialogs.c:62
-msgid "win32 port"
-msgstr "win32 port"
-
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:72
 msgid "support"
 msgstr "support"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: src/gtkdialogs.c:93 src/gtkdialogs.c:94
 msgid "maintainer"
 msgstr "vedligeholder"
 
-#: src/gtkdialogs.c:89
-#, fuzzy
+#: src/gtkdialogs.c:95
 msgid "libfaim maintainer"
-msgstr "tidligere libfaim vedligeholder"
-
-#: src/gtkdialogs.c:92
-#, fuzzy
-msgid "Jabber developer"
-msgstr "tidligere Jabber udvikler"
-
-#: src/gtkdialogs.c:93
-msgid "original author"
-msgstr "Oprindelig forfatter"
-
-#: src/gtkdialogs.c:94
+msgstr "libfaim vedligeholder"
+
+#: src/gtkdialogs.c:96
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:97
+msgid "Jabber developer"
+msgstr "Jabber udvikler"
+
+#: src/gtkdialogs.c:98
+msgid "original author"
+msgstr "Oprindelig forfatter"
+
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:106 src/gtkdialogs.c:154
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: src/gtkdialogs.c:101
-#, fuzzy
+#: src/gtkdialogs.c:107
 msgid "Bosnian"
-msgstr "Estonisk"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "Bosnisk"
+
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:155 src/gtkdialogs.c:156
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:157
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: src/gtkdialogs.c:104
+#: src/gtkdialogs.c:110
 msgid "Danish"
 msgstr "Dansk"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:158
 msgid "German"
 msgstr "Tysk"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:112 src/gtkdialogs.c:113
+msgid "Greek"
+msgstr "Gr脱sk"
+
+#: src/gtkdialogs.c:114
 msgid "Australian English"
 msgstr "Australsk-engelsk"
 
-#: src/gtkdialogs.c:107
-msgid "British English"
-msgstr "Britisk-engelsk"
-
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:115
 msgid "Canadian English"
 msgstr "Canadisk-engelsk"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:116
+msgid "British English"
+msgstr "Britisk-engelsk"
+
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:159
 msgid "Spanish"
 msgstr "Spansk"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:160
 msgid "Finnish"
 msgstr "Finsk"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:161
 msgid "French"
 msgstr "Fransk"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:120
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:121
 msgid "Hindi"
 msgstr "Hindu"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:122
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:123 src/gtkdialogs.c:162
 msgid "Italian"
 msgstr "Italiensk"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:124 src/gtkdialogs.c:163
 msgid "Japanese"
 msgstr "Japansk"
 
-#: src/gtkdialogs.c:117
-msgid "Lithuanian"
-msgstr "Litausk"
-
-#: src/gtkdialogs.c:118
+#: src/gtkdialogs.c:125
 msgid "Georgian"
 msgstr "Geogoriansk"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:126 src/gtkdialogs.c:164
 msgid "Korean"
 msgstr "Koreansk"
 
-#: src/gtkdialogs.c:120
-#, fuzzy
-msgid "Dutch, Flemish"
-msgstr "Hollandsk; Flamsk"
-
-#: src/gtkdialogs.c:121
+#: src/gtkdialogs.c:127
+msgid "Kurdish"
+msgstr "Kurdisk"
+
+#: src/gtkdialogs.c:128
+msgid "Lithuanian"
+msgstr "Litausk"
+
+#: src/gtkdialogs.c:129
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:130
+msgid "Dutch, Flemish"
+msgstr "Hollandsk, Flamsk"
+
+#: src/gtkdialogs.c:131
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:133 src/gtkdialogs.c:165
 msgid "Polish"
 msgstr "Polsk"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:134
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:135
 msgid "Portuguese-Brazil"
 msgstr "Portugisisk-Brasilien"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:136
 msgid "Romanian"
 msgstr "Rum脱nsk"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:137 src/gtkdialogs.c:166 src/gtkdialogs.c:167
 msgid "Russian"
 msgstr "Russisk"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:138 src/gtkdialogs.c:139
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:140
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:141 src/gtkdialogs.c:169
 msgid "Swedish"
 msgstr "Svensk"
 
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:142
+msgid "Tamil"
+msgstr "Tamilsk"
+
+#: src/gtkdialogs.c:143
 msgid "Telugu"
-msgstr ""
-
-#: src/gtkdialogs.c:134
+msgstr "Telugu"
+
+#: src/gtkdialogs.c:144
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: src/gtkdialogs.c:134
+#: src/gtkdialogs.c:144
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh og Gnome-Vi holdet"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:145 src/gtkdialogs.c:170
 msgid "Simplified Chinese"
 msgstr "Simpelt kinesisk"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: src/gtkdialogs.c:146 src/gtkdialogs.c:147 src/gtkdialogs.c:171
 msgid "Traditional Chinese"
 msgstr "Traditionelt kinesisk"
 
-#: src/gtkdialogs.c:143
+#: src/gtkdialogs.c:153
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: src/gtkdialogs.c:158
+#: src/gtkdialogs.c:168
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: src/gtkdialogs.c:202
+#: src/gtkdialogs.c:212
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/gtkdialogs.c:226
+#: src/gtkdialogs.c:236
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under "
+"the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim er et modul脱rt 'kvikbeskedsprogram', der underst淡tter AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, Silc, Novell GroupWise, Napster, Zephyr og Gadu-Gadu p奪 "
 "samme tid. Det er skrevet i Gtk+ og er under GPL-licensen.<BR><BR>"
 
-#: src/gtkdialogs.c:235
+#: src/gtkdialogs.c:245
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim p奪 irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: src/gtkdialogs.c:248
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim p奪 irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
-msgstr "Aktive udviklere"
-
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:254
+msgid "Current Developers"
+msgstr "Nuv脱rende udviklere"
+
+#: src/gtkdialogs.c:269
 msgid "Crazy Patch Writers"
 msgstr "Vilde patch-skrivere"
 
-#: src/gtkdialogs.c:274
+#: src/gtkdialogs.c:284
 msgid "Retired Developers"
 msgstr "Tidligere udviklere"
 
-#: src/gtkdialogs.c:289
+#: src/gtkdialogs.c:299
 msgid "Current Translators"
 msgstr "Nuv脱rende overs脱ttere"
 
-#: src/gtkdialogs.c:309
+#: src/gtkdialogs.c:319
 msgid "Past Translators"
 msgstr "Tidligere overs脱ttere"
 
-#: src/gtkdialogs.c:327
-#, fuzzy
+#: src/gtkdialogs.c:337
 msgid "Debugging Information"
-msgstr "Brugeroplysninger"
-
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
+msgstr "Fejls淡gningsoplysninger"
+
+#: src/gtkdialogs.c:527 src/gtkdialogs.c:664 src/gtkdialogs.c:731
 msgid "_Name"
-msgstr "Navn"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+msgstr "_Navn"
+
+#: src/gtkdialogs.c:532 src/gtkdialogs.c:669 src/gtkdialogs.c:736
 msgid "_Account"
 msgstr "_Konto"
 
-#: src/gtkdialogs.c:502
+#: src/gtkdialogs.c:540
 msgid "New Instant Message"
 msgstr "Ny besked"
 
-#: src/gtkdialogs.c:504
-#, fuzzy
+#: src/gtkdialogs.c:542
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Indtast brugernavnet p奪 personen du vil snakke med."
-
-#: src/gtkdialogs.c:643
+msgstr ""
+"Indtast brugernavnet p奪 personen du vil snakke med."
+
+#: src/gtkdialogs.c:677
 msgid "Get User Info"
 msgstr "Hent brugeroplysninger"
 
-#: src/gtkdialogs.c:645
+#: src/gtkdialogs.c:679
 #, fuzzy
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
-"like to view."
+"like to view.,"
 msgstr "Indtast brugernavnet p奪 den person, hvis oplysninger du gerne vil se."
 
-#: src/gtkdialogs.c:699
-#, fuzzy
+#: src/gtkdialogs.c:745
 msgid "View User Log"
-msgstr "Hent bruger log"
-
-#: src/gtkdialogs.c:701
+msgstr "Vis bruger log"
+
+#: src/gtkdialogs.c:747
 #, fuzzy
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Indtast brugernavnet p奪 den person, hvis log du gerne vil l脱se."
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:766
 msgid "Alias Contact"
 msgstr "Alias kontakt"
 
-#: src/gtkdialogs.c:721
+#: src/gtkdialogs.c:767
 msgid "Enter an alias for this contact."
 msgstr "Indtast et alias for denne kontakt."
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:769 src/gtkdialogs.c:791 src/gtkdialogs.c:811
+#: src/gtkrequest.c:295 src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:741
+#: src/gtkdialogs.c:787
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Indtast et alias for %s."
 
-#: src/gtkdialogs.c:743
+#: src/gtkdialogs.c:789
 msgid "Alias Buddy"
 msgstr "Lav alias for ven"
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:808
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: src/gtkdialogs.c:763
+#: src/gtkdialogs.c:809
 msgid "Enter an alias for this chat."
 msgstr "Indtast et alias for denne chat."
 
-#: src/gtkdialogs.c:800
+#: src/gtkdialogs.c:846
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3132,7 +3443,11 @@
 "Du skal til at fjerne kontakten indeholdende %s og %d andre venner fra din "
 "venneliste. Vil du forts脱tte?"
 
-#: src/gtkdialogs.c:867
+#: src/gtkdialogs.c:854 src/gtkdialogs.c:855
+msgid "Remove Contact"
+msgstr "Fjern kontakt"
+
+#: src/gtkdialogs.c:913
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3141,61 +3456,61 @@
 "Du skal til at fjerne gruppen %s og alle den indeholder fra din venneliste. "
 "Vil du forts脱tte?"
 
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: src/gtkdialogs.c:916 src/gtkdialogs.c:917
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: src/gtkdialogs.c:909
+#: src/gtkdialogs.c:955
 #, 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/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:958 src/gtkdialogs.c:959
 msgid "Remove Buddy"
 msgstr "Fjern ven"
 
-#: src/gtkdialogs.c:951
+#: src/gtkdialogs.c:997
 #, 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/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: src/gtkdialogs.c:1000 src/gtkdialogs.c:1001
 msgid "Remove Chat"
 msgstr "Fjern chat"
 
-#: src/gtkft.c:138
+#: src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: src/gtkft.c:160 src/gtkft.c:1063
 msgid "Finished"
 msgstr "F脱rdig"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: src/gtkft.c:163 src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Annulleret"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: src/gtkft.c:166 src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Venter p奪 at overf淡rsel skal starte"
 
-#: src/gtkft.c:218
+#: src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Modtager som:</b>"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Modtager fra:</b>"
 
-#: src/gtkft.c:224
+#: src/gtkft.c:225
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sender til:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:227
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sender som:</b>"
 
@@ -3207,93 +3522,91 @@
 msgid "An error occurred while opening the file."
 msgstr "En fejl skete ved fors淡g p奪 at 奪bne filen."
 
-#: src/gtkft.c:467
-#, fuzzy, c-format
+#: src/gtkft.c:484
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "Fejl ved k淡rsel af <b>%s</b>: %s"
-
-#: src/gtkft.c:476
-#, fuzzy, c-format
+msgstr "Fejl ved k淡rsel af %s:: %s"
+
+#: src/gtkft.c:493
+#, c-format
 msgid "Error running %s"
-msgstr "Fejl ved deltagelse i chat %s"
-
-#: src/gtkft.c:477
+msgstr "Fejl ved k淡rsel af %s"
+
+#: src/gtkft.c:494
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:572
+msgstr "Proces returnerede fejlkode %d"
+
+#: src/gtkft.c:588
 msgid "Progress"
 msgstr "Fremgang"
 
-#: src/gtkft.c:579
+#: src/gtkft.c:595
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:602
 msgid "Size"
 msgstr "St淡rrelse"
 
-#: src/gtkft.c:593
+#: src/gtkft.c:609
 msgid "Remaining"
 msgstr "Tilbage"
 
-#: src/gtkft.c:624
+#: src/gtkft.c:640
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: src/gtkft.c:625
+#: src/gtkft.c:641
 msgid "Local File:"
 msgstr "Lokal fil:"
 
-#: src/gtkft.c:626
+#: src/gtkft.c:642
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:627
+#: src/gtkft.c:643
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: src/gtkft.c:628
+#: src/gtkft.c:644
 msgid "Time Elapsed:"
 msgstr "Tid g奪et:"
 
-#: src/gtkft.c:629
+#: src/gtkft.c:645
 msgid "Time Remaining:"
 msgstr "Tid tilbage:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "Hold vinduet 奪bent"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: src/gtkft.c:731
+msgid "Close this window when all transfers _finish"
+msgstr "Luk dette vindue n奪r aller overf淡rsler er _f脱rdige"
+
+#: src/gtkft.c:741
 msgid "C_lear finished transfers"
-msgstr "Ryd afsluttede overf淡rsler"
+msgstr "_Ryd afsluttede overf淡rsler"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: src/gtkft.c:750
 msgid "File transfer _details"
-msgstr "Skjul overf淡rselsdetaljer"
+msgstr "Filoverf淡rsels_detaljer"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: src/gtkft.c:780 src/gtkstock.c:143
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:774
+#: src/gtkft.c:790
 msgid "_Resume"
 msgstr "Genoptag"
 
-#: src/gtkft.c:988
+#: src/gtkft.c:1005
 msgid "Failed"
 msgstr "Fejlede"
 
 #: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "_S脱t ind som tekst"
+msgid "Pa_ste as Plain Text"
+msgstr "_Inds脱t som ren tekst"
 
 #: src/gtkimhtml.c:1313
 msgid "Hyperlink color"
@@ -3304,14 +3617,12 @@
 msgstr "Farve som hyperlinks skal v脱re."
 
 #: src/gtkimhtml.c:1317
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Link farve"
+msgstr ""
 
 #: src/gtkimhtml.c:1318
-#, fuzzy
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Farve som hyperlinks skal v脱re."
+msgstr "Farve som hyperlinks skal v脱re n奪r musen er over dem."
 
 #: src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
@@ -3325,7 +3636,7 @@
 msgid "_Copy Link Location"
 msgstr "Kopi辿r link adresse"
 
-#: src/gtkimhtml.c:3234
+#: src/gtkimhtml.c:3243
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3335,7 +3646,7 @@
 "\n"
 "Anvender PNG."
 
-#: src/gtkimhtml.c:3237
+#: src/gtkimhtml.c:3246
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3345,7 +3656,7 @@
 "\n"
 "Anvender PNG."
 
-#: src/gtkimhtml.c:3250
+#: src/gtkimhtml.c:3259
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3356,7 +3667,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: src/gtkimhtml.c:3262
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3367,11 +3678,11 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: src/gtkimhtml.c:3342 src/gtkimhtml.c:3354
 msgid "Save Image"
 msgstr "Gem billede"
 
-#: src/gtkimhtml.c:3373
+#: src/gtkimhtml.c:3382
 msgid "_Save Image..."
 msgstr "_Gem billede..."
 
@@ -3461,14 +3772,9 @@
 msgid "Foreground font color"
 msgstr "Forgrundsfarve"
 
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "Baggrundsfarve"
-
 #: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
 msgid "Clear formatting"
-msgstr "_Ryd formattering"
+msgstr "Ryd formattering"
 
 #: src/gtkimhtmltoolbar.c:1038
 msgid "Insert link"
@@ -3482,53 +3788,52 @@
 msgid "Insert smiley"
 msgstr "Inds脱t smiley"
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
+#: src/gtklog.c:212
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "Samtaler med %s"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
+msgstr "Samtaler i %s p奪 %s"
+
+#: src/gtklog.c:214
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "Samtaler med %s"
-
-#: src/gtklog.c:309
+msgstr "Samtaler med %s p奪 %s"
+
+#: src/gtklog.c:324
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
 
-#: src/gtklog.c:313
+#: src/gtklog.c:328
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
 
-#: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-
-#: src/gtklog.c:320
+#: src/gtklog.c:331
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:335
 msgid "No logs were found"
-msgstr ""
-
-#: src/gtklog.c:396
-#, fuzzy
+msgstr "Ingen logs blev fundet"
+
+#: src/gtklog.c:411
 msgid "Total log size:"
-msgstr "Logst淡rrelse"
-
-#: src/gtklog.c:472
-#, fuzzy, c-format
+msgstr "Total logst淡rrelse:"
+
+#: src/gtklog.c:487
+#, c-format
 msgid "Conversations in %s"
-msgstr "Samtaler med %s"
-
-#: src/gtklog.c:480 src/gtklog.c:531
+msgstr "Samtaler i %s"
+
+#: src/gtklog.c:495 src/gtklog.c:546
 #, c-format
 msgid "Conversations with %s"
 msgstr "Samtaler med %s"
 
-#: src/gtklog.c:556
+#: src/gtklog.c:571
 msgid "System Log"
 msgstr "System log"
 
@@ -3552,34 +3857,64 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
+#: src/gtkmain.c:687 src/gtkmain.c:689
 msgid "Default"
-msgstr "Gnome standard"
+msgstr "Standard"
+
+#: src/gtkmedia.c:52
+msgid "Call ended."
+msgstr "Opkald afsluttet"
+
+#: src/gtkmedia.c:69
+#, c-format
+msgid "Calling %s"
+msgstr "Kalder op til %s"
+
+#: src/gtkmedia.c:73 src/gtkmedia.c:108
+msgid "End Call"
+msgstr "Afslut opkald"
+
+#: src/gtkmedia.c:81
+#, c-format
+msgid "Receiving call from %s"
+msgstr "Modtager opkald fra %s"
+
+#: src/gtkmedia.c:89
+msgid "Reject Call"
+msgstr "Afvid opkald"
+
+#: src/gtkmedia.c:95
+msgid "Accept call"
+msgstr "Accept辿r opkald"
+
+#: src/gtkmedia.c:102
+#, c-format
+msgid "Connected to %s"
+msgstr "Forbundet til %s"
+
+#: src/gtkmedia.c:113
+msgid "_Mute"
+msgstr "_Sl奪 lyd fra"
 
 #. Descriptive label
-#: src/gtknotify.c:275
+#: src/gtknotify.c:269
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s har %d ny besked."
 msgstr[1] "%s har %d nye beskeder."
 
-#: src/gtknotify.c:289
+#: src/gtknotify.c:283
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Fra:</span> %s\n"
 
-#: src/gtknotify.c:298
+#: src/gtknotify.c:292
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Emne:</span> %s\n"
 
-#: src/gtknotify.c:303
+#: src/gtknotify.c:297
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3590,7 +3925,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:319
+#: src/gtknotify.c:313
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3601,195 +3936,244 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: src/gtknotify.c:500
 msgid "Search Results"
 msgstr "S淡geresultater"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: src/gtknotify.c:638 src/protocols/oscar/oscar.c:4846
 #, c-format
 msgid "Info for %s"
 msgstr "Oplysninger for %s"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: src/gtknotify.c:639 src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Venneinformation"
 
-#: src/gtknotify.c:687
+#: src/gtknotify.c:681
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Browser kommandoen <b>%s</b> er ugyldig."
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: src/gtknotify.c:683 src/gtknotify.c:695 src/gtknotify.c:708
+#: src/gtknotify.c:833
 msgid "Unable to open URL"
 msgstr "Kunne ikke 奪bne URL"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: src/gtknotify.c:693 src/gtknotify.c:706
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Fejl ved k淡rsel af <b>%s</b>: %s"
 
-#: src/gtknotify.c:839
+#: src/gtknotify.c:834
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "'Manuel' browser-kommandoen er blevet valgt, men ingen kommando er blevet "
 "sat."
 
-#: src/gtkpounce.c:130
+#: src/gtkplugin.c:268
+#, c-format
+msgid ""
+"%s%s<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 ""
+"%s%s<span weight=\"bold\">Skrevet af:</span>\t%s\n"
+"<span weight=\"bold\">Web site:</span>\t\t%s\n"
+"<span weight=\"bold\">Filnavn:</span>\t%s"
+
+#: src/gtkplugin.c:388
+msgid "Configure Pl_ugin"
+msgstr "Konfigur辿r _modul"
+
+#: src/gtkplugin.c:437
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Modul detaljer</b>"
+
+#: src/gtkpounce.c:157
 msgid "Select a file"
 msgstr "V脱lg en fil"
 
-#: src/gtkpounce.c:161
+#: src/gtkpounce.c:254
 msgid "Please enter a buddy to pounce."
 msgstr "Indtast en ven der skal overv奪ges."
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:476
 msgid "New Buddy Pounce"
 msgstr "Tilf淡j overv奪gning"
 
-#: src/gtkpounce.c:391
+#: src/gtkpounce.c:476
 msgid "Edit Buddy Pounce"
 msgstr "Redig辿r overv奪gning"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
+#: src/gtkpounce.c:493
 msgid "Pounce Who"
 msgstr "Overv奪g hvem"
 
-#: src/gtkpounce.c:435
+#: src/gtkpounce.c:520
 msgid "_Buddy name:"
 msgstr "_Vennenavn:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
+#: src/gtkpounce.c:544
+#, fuzzy
+msgid "Pounce When Buddy..."
 msgstr "Overv奪g hvorn奪r"
 
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
+#: src/gtkpounce.c:552
+#, fuzzy
+msgid "Si_gns on"
 msgstr "_Log p奪"
 
-#: src/gtkpounce.c:469
-msgid "Sign _off"
+#: src/gtkpounce.c:554
+#, fuzzy
+msgid "Signs o_ff"
 msgstr "Log _af"
 
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "_Frav脱rende"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
+#: src/gtkpounce.c:556
+#, fuzzy
+msgid "Goes a_way"
+msgstr "Ven bliver _frav脱rende"
+
+#: src/gtkpounce.c:558
+#, fuzzy
+msgid "Ret_urns from away"
 msgstr "_Returner fra frav脱r"
 
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "_Inaktiv"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "Retur_ner fra inaktivitet"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
+#: src/gtkpounce.c:560
+#, fuzzy
+msgid "Becomes _idle"
+msgstr "%s blev inaktiv"
+
+#: src/gtkpounce.c:562
+#, fuzzy
+msgid "Is no longer i_dle"
+msgstr "%s er ikke l脱ngere inaktiv."
+
+#: src/gtkpounce.c:564
+#, fuzzy
+msgid "Starts _typing"
 msgstr "Ven starter med at _skrive"
 
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
+#: src/gtkpounce.c:566
+#, fuzzy
+msgid "Stops t_yping"
 msgstr "Ven stopper med at s_krive"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
+#: src/gtkpounce.c:595
 msgid "Pounce Action"
 msgstr "Handling"
 
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
+#: src/gtkpounce.c:603
+#, fuzzy
+msgid "Ope_n an IM window"
 msgstr "_�bn et besked-vindue"
 
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
+#: src/gtkpounce.c:605
+#, fuzzy
+msgid "_Pop up a notification"
 msgstr "_Popup-p奪mindelse"
 
-#: src/gtkpounce.c:522
+#: src/gtkpounce.c:607
 msgid "Send a _message"
 msgstr "Send en _besked"
 
-#: src/gtkpounce.c:524
+#: src/gtkpounce.c:609
 msgid "E_xecute a command"
 msgstr "_K淡r en kommando"
 
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:611
 msgid "P_lay a sound"
 msgstr "_Afspil en lyd"
 
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
+#: src/gtkpounce.c:615
+#, fuzzy
+msgid "Brows_e..."
 msgstr "_Gennemse..."
 
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "G_ennemse..."
-
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:617
+#, fuzzy
+msgid "Br_owse..."
+msgstr "_Gennemse..."
+
+#: src/gtkpounce.c:618
 msgid "Pre_view"
 msgstr "Forh奪nds_visning"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "_Gem denne overv奪gning efter aktivering"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "Fjern overv奪gning"
-
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:701
+msgid "_Recurring"
+msgstr ""
+
+#: src/gtkpounce.c:997
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Er du sikker p奪 at du vil slette %s?"
+
+#: src/gtkpounce.c:1145
+#, fuzzy
+msgid "Pounce Target"
+msgstr "Overv奪g hvorn奪r"
+
+#: src/gtkpounce.c:1180
+msgid "Recurring"
+msgstr ""
+
+#: src/gtkpounce.c:1227
+#, fuzzy
+msgid "Buddy Pounces"
+msgstr "Tilf淡j overv奪gning"
+
+#: src/gtkpounce.c:1345
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s er begyndt at skrive til dig (%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:1347
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s er logget ind (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:1349
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s returnerede fra inaktivitet (%s)"
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:1351
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s returnerede fra frav脱r (%s)"
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:1353
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s er stoppet med at skrive til dig (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:1355
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s er logget ud (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:1357
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s blev inaktiv (%s)"
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:1359
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s er nu frav脱rende. (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:1360
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukendt handling. Venligst rapport辿r dette!"
 
-#: src/gtkprefs.c:623
+#: src/gtkprefs.c:511
+msgid "Smiley theme failed to unpack."
+msgstr "Smiley-tema kunne ikke udpakkes."
+
+#: src/gtkprefs.c:630
 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."
@@ -3797,41 +4181,51 @@
 "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/gtkprefs.c:658
+#: src/gtkprefs.c:665
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
+#: src/gtkprefs.c:672 src/protocols/jabber/buddy.c:267
 #: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:814
+#, fuzzy
+msgid "_Hide new IM conversations"
+msgstr "Luk samtale"
+
+#: src/gtkprefs.c:817 src/gtkprefs.c:1666
+msgid "When away"
+msgstr "Hvis frav脱rende"
+
+#: src/gtkprefs.c:821
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Send ukendte \"_skr奪streg\" kommandoer som beskeder"
 
-#: src/gtkprefs.c:807
+#: src/gtkprefs.c:823
 #, fuzzy
 msgid "Show _formatting on incoming messages"
 msgstr "Vis _formatteringslinje"
 
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:826
 msgid "Show buddy _icons"
 msgstr "Vis venne_ikoner"
 
-#: src/gtkprefs.c:811
+#: src/gtkprefs.c:828
 msgid "Enable buddy ic_on animation"
 msgstr "Aktiv辿r animation af venneikoner"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:835
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Fort脱l venner at du er ved at skrive til dem"
 
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
+#: src/gtkprefs.c:838
+#, fuzzy
+msgid "Highlight _misspelled words"
 msgstr "Frem_h脱v forkert stavede ord"
 
-#: src/gtkprefs.c:834
+#: src/gtkprefs.c:856
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3840,164 +4234,164 @@
 "der underst淡tter formattering. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:878
 msgid "Tab Options"
 msgstr "Faneblad indstillinger"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:880
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Vis beskeder og chats i fanebladsvinduer"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:894
 msgid "Show close b_utton on tabs"
 msgstr "Vis _luk knapper p奪 faneblade"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:900
 #, fuzzy
 msgid "_Placement:"
 msgstr "EkstraPlacering"
 
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:902
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:881
+#: src/gtkprefs.c:903
 msgid "Bottom"
 msgstr "Bund"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:904
 msgid "Left"
 msgstr "Venstre"
 
-#: src/gtkprefs.c:883
+#: src/gtkprefs.c:905
 msgid "Right"
 msgstr "H淡jre"
 
-#: src/gtkprefs.c:885
+#: src/gtkprefs.c:907
 msgid "Left Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:886
+msgstr "Venstre-vertikalt"
+
+#: src/gtkprefs.c:908
 msgid "Right Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:891
-#, fuzzy
+msgstr "H淡jre-vertikalt"
+
+#: src/gtkprefs.c:913
 msgid "N_ew conversations:"
-msgstr "Luk samtale"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+msgstr "_Nye samtaler:"
+
+#: src/gtkprefs.c:964 src/protocols/oscar/oscar.c:779
+#: src/protocols/oscar/oscar.c:6001
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: src/gtkprefs.c:944
-#, fuzzy
-msgid "STUN Server:"
-msgstr "_Server:"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
+#: src/gtkprefs.c:966
+msgid "ST_UN server:"
+msgstr "ST_UN server:"
+
+#: src/gtkprefs.c:968
+msgid "_Autodetect IP address"
 msgstr "Find IP-adresse _automatisk"
 
-#: src/gtkprefs.c:955
+#: src/gtkprefs.c:977
 msgid "Public _IP:"
 msgstr "Offentlig _IP-adresse:"
 
-#: src/gtkprefs.c:979
+#: src/gtkprefs.c:1001
 msgid "Ports"
 msgstr "Porte"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:1004
 msgid "_Manually specify range of ports to listen on"
 msgstr "Angiv _manuelt omr奪de af porte der skal lyttes p奪"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
+#: src/gtkprefs.c:1007
+#, fuzzy
+msgid "_Start port:"
 msgstr "_Start port:"
 
-#: src/gtkprefs.c:992
-msgid "_End Port:"
+#: src/gtkprefs.c:1014
+#, fuzzy
+msgid "_End port:"
 msgstr "_Slut port:"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1022
 msgid "Proxy Server"
 msgstr "Server"
 
-#: src/gtkprefs.c:1003
+#: src/gtkprefs.c:1026
 msgid "No proxy"
 msgstr "Ingen mellemv脱rt"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1082
 msgid "_User:"
 msgstr "_Bruger:"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1144
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: src/gtkprefs.c:1145
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: src/gtkprefs.c:1146
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1147
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
+#: src/gtkprefs.c:1148
 #, fuzzy
 msgid "GNOME Default"
 msgstr "Gnome standard"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1149
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1150
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1151
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: src/gtkprefs.c:1152
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: src/gtkprefs.c:1161
 msgid "Manual"
 msgstr "Andet program"
 
-#: src/gtkprefs.c:1189
+#: src/gtkprefs.c:1214
 msgid "Browser Selection"
 msgstr "Browservalg"
 
-#: src/gtkprefs.c:1193
+#: src/gtkprefs.c:1218
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1201
+#: src/gtkprefs.c:1226
 msgid "_Open link in:"
 msgstr "_�bn link i:"
 
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1228
 msgid "Browser default"
 msgstr "Browser standard"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1229
 msgid "Existing window"
 msgstr "Eksisterende vindue"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1231
 msgid "New tab"
 msgstr "Nyt faneblad"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1245
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4006,57 +4400,56 @@
 "_Manuelt:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: src/gtkprefs.c:1281 src/gtkprefs.c:1754
 msgid "Logging"
 msgstr "Logning"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
-msgstr "Log _format:"
-
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1284
+msgid "Log _format:"
+msgstr "Log_format:"
+
+#: src/gtkprefs.c:1289
 #, fuzzy
 msgid "Log all _instant messages"
 msgstr "_Log alle samtaler"
 
-#: src/gtkprefs.c:1266
+#: src/gtkprefs.c:1291
 msgid "Log all c_hats"
 msgstr "Log alle c_hats"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1293
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "Log alle _status 脱ndringer til systemlog"
+
+#: src/gtkprefs.c:1425
 msgid "Sound Selection"
 msgstr "Lydvalg"
 
-#: src/gtkprefs.c:1454
+#: src/gtkprefs.c:1479
 msgid "Sound Method"
 msgstr "Lydmetode"
 
-#: src/gtkprefs.c:1455
+#: src/gtkprefs.c:1480
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1482
 msgid "Console beep"
 msgstr "Konsol-bip"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1484
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1489
 msgid "Command"
 msgstr "Kommando"
 
-#: src/gtkprefs.c:1465
-#, fuzzy
+#: src/gtkprefs.c:1490
 msgid "No sounds"
-msgstr "Lydeffekter"
-
-#: src/gtkprefs.c:1473
+msgstr "Ingen lyde"
+
+#: src/gtkprefs.c:1498
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4065,114 +4458,106 @@
 "Lyd k_ommando:\n"
 "(%s for filnavn)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1524
 msgid "Sound Options"
 msgstr "Lydindstillinger"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1525
 msgid "Sounds when conversation has _focus"
 msgstr "Lyde n奪r samtale har _fokus"
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1527
 msgid "_Sounds while away"
 msgstr "Afspil _lyde under frav脱r"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1537
 msgid "Sound Events"
 msgstr "Lydhandlinger"
 
-#: src/gtkprefs.c:1563
+#: src/gtkprefs.c:1588
 msgid "Play"
 msgstr "Afspil"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1595
 msgid "Event"
 msgstr "Begivenhed"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1614
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1593
+#: src/gtkprefs.c:1618
 msgid "Reset"
 msgstr "Nulstil"
 
-#: src/gtkprefs.c:1597
+#: src/gtkprefs.c:1622
 msgid "Choose..."
 msgstr "V脱lg..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
+#: src/gtkprefs.c:1661 src/gtkstatusbox.c:439
+#: src/protocols/bonjour/bonjour.c:258 src/protocols/irc/irc.c:175
+#: src/protocols/irc/irc.c:457 src/protocols/irc/msgs.c:221
+#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1110
+#: src/protocols/msn/msn.c:585 src/protocols/novell/novell.c:2849
+#: src/protocols/novell/novell.c:2984 src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:6621 src/protocols/oscar/oscar.c:7677
+#: src/protocols/oscar/oscar.c:7834 src/protocols/sametime/sametime.c:3247
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:53
+#: src/protocols/yahoo/yahoo.c:3113 src/protocols/yahoo/yahoo.c:3212
+#: src/protocols/zephyr/zephyr.c:2260 src/status.c:157
 msgid "Away"
 msgstr "Frav脱rende"
 
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "S脱t nye beskeder i k淡 under frav脱r"
-
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1663
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "Hvis frav脱rende"
-
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1667
 #, fuzzy
 msgid "When both away and idle"
 msgstr "Hvis frav脱rende eller inaktiv"
 
-#: src/gtkprefs.c:1662
+#: src/gtkprefs.c:1670
 #, fuzzy
 msgid "_Report idle time"
 msgstr "Vis inaktiv _tid"
 
-#: src/gtkprefs.c:1665
+#: src/gtkprefs.c:1673
 msgid "Auto-away"
 msgstr "Automatisk frav脱rende"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1674
 #, fuzzy
 msgid "Change status when _idle"
 msgstr "S脱t som frav脱rende ved inaktivitet"
 
-#: src/gtkprefs.c:1670
+#: src/gtkprefs.c:1678
 #, fuzzy
 msgid "_Minutes before changing status:"
 msgstr "_Minutter f淡r du s脱ttes frav脱rende:"
 
-#: src/gtkprefs.c:1678
+#: src/gtkprefs.c:1686
 #, fuzzy
 msgid "Change _status to:"
 msgstr "Skift adresse til:"
 
-#: src/gtkprefs.c:1728
+#: src/gtkprefs.c:1744
 msgid "Smiley Themes"
 msgstr "Smiley-temaer"
 
-#: src/gtkprefs.c:1729
+#: src/gtkprefs.c:1745
 msgid "Sounds"
 msgstr "Lydeffekter"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: src/gtkprefs.c:1746 src/protocols/silc/silc.c:1828
 msgid "Network"
 msgstr "Netv脱rk"
 
-#: src/gtkprefs.c:1735
+#: src/gtkprefs.c:1751
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1755
 msgid "Away / Idle"
 msgstr "V脱k / inaktiv"
 
@@ -4247,7 +4632,7 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "Indtast navnet p奪 brugeren som du vil blokere."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1481
 msgid "Block"
 msgstr "Blok辿r"
 
@@ -4264,42 +4649,42 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: src/gtkrequest.c:285 src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:561 src/protocols/msn/msn.c:564
+#: src/protocols/novell/novell.c:1921 src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:117 src/protocols/silc/wb.c:303 src/request.h:1331
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: src/gtkrequest.c:286 src/protocols/msn/dialog.c:115
+#: src/protocols/msn/msn.c:561 src/protocols/msn/msn.c:564
+#: src/protocols/novell/novell.c:1922 src/protocols/silc/buddy.c:314
+#: src/protocols/silc/pk.c:118 src/protocols/silc/wb.c:304 src/request.h:1331
 msgid "No"
 msgstr "Nej"
 
-#: src/gtkrequest.c:263
+#: src/gtkrequest.c:289
 msgid "Apply"
 msgstr "Anvend"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: src/gtkrequest.c:290 src/protocols/msn/msn.c:357
+#: src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Luk"
 
-#: src/gtkrequest.c:1796
+#: src/gtkrequest.c:1832
 msgid "That file already exists"
 msgstr "Den fil eksisterer allerede"
 
-#: src/gtkrequest.c:1797
+#: src/gtkrequest.c:1833
 msgid "Would you like to overwrite it?"
 msgstr "Vil du overskrive den?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: src/gtkrequest.c:1877 src/gtkrequest.c:1918
 msgid "Save File..."
 msgstr "Gem fil..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: src/gtkrequest.c:1878 src/gtkrequest.c:1919
 msgid "Open File..."
 msgstr "�bn fil..."
 
@@ -4312,77 +4697,85 @@
 msgid "_Get List"
 msgstr "_Hent liste"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:436 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "Titel"
 
-#: src/gtksavedstatuses.c:377
+#: src/gtksavedstatuses.c:451
 msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+msgstr "Type"
+
+#: src/gtksavedstatuses.c:462 src/gtksavedstatuses.c:903
+#: src/protocols/bonjour/bonjour.c:252 src/protocols/bonjour/bonjour.c:259
+#: src/protocols/gg/gg.c:1432 src/protocols/gg/gg.c:1437
+#: src/protocols/gg/gg.c:1446 src/protocols/gg/gg.c:1451
+#: src/protocols/gg/gg.c:1456 src/protocols/irc/irc.c:176
+#: src/protocols/jabber/jabber.c:1087 src/protocols/jabber/jabber.c:1095
+#: src/protocols/jabber/jabber.c:1103 src/protocols/jabber/jabber.c:1111
+#: src/protocols/jabber/jabber.c:1119 src/protocols/jabber/jabber.c:1127
+#: src/protocols/novell/novell.c:2869 src/protocols/novell/novell.c:2980
+#: src/protocols/novell/novell.c:2986 src/protocols/novell/novell.c:2992
+#: src/protocols/oscar/oscar.c:7828 src/protocols/oscar/oscar.c:7835
+#: src/protocols/sametime/sametime.c:3242
+#: src/protocols/sametime/sametime.c:3248
+#: src/protocols/sametime/sametime.c:3254
+#: src/protocols/sametime/sametime.c:3327 src/protocols/simple/simple.c:256
+#: src/protocols/yahoo/yahoo.c:3207 src/protocols/yahoo/yahoo.c:3213
+#: src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Besked"
 
-#: src/gtksavedstatuses.c:451
-#, fuzzy
+#: src/gtksavedstatuses.c:525
 msgid "Saved Statuses"
-msgstr "Serverstatistik"
+msgstr "Gemte statuser"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: src/gtksavedstatuses.c:550 src/gtksavedstatuses.c:1150
 msgid "_Use"
 msgstr "_Brug"
 
-#: src/gtksavedstatuses.c:584
+#: src/gtksavedstatuses.c:660
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:675
-#, fuzzy
-msgid "Custom status"
-msgstr "Status"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+msgstr "Titel allerede i brug. Du skal v脱lge en unik titel."
+
+#: src/gtksavedstatuses.c:862
+msgid "Different"
+msgstr "Forskellig"
+
+#: src/gtksavedstatuses.c:892 src/gtksavedstatuses.c:1019
+#: src/protocols/gg/gg.c:1413 src/protocols/gg/gg.c:1418
+#: src/protocols/jabber/buddy.c:626 src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:1060
+#: src/protocols/msn/msn.c:552 src/protocols/novell/novell.c:2868
+#: src/protocols/novell/novell.c:2872 src/protocols/oscar/oscar.c:762
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:769
+#: src/protocols/yahoo/yahoo.c:2809
 msgid "Status"
 msgstr "Status"
 
-#: src/gtksavedstatuses.c:797
-#, fuzzy
+#: src/gtksavedstatuses.c:1038
 msgid "_Title:"
-msgstr "Titel"
-
-#: src/gtksavedstatuses.c:817
-#, fuzzy
+msgstr "_Titel:"
+
+#: src/gtksavedstatuses.c:1058 src/gtksavedstatuses.c:1360
 msgid "_Status:"
-msgstr "Status:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+msgstr "_Status:"
+
+#. Different status message expander
+#: src/gtksavedstatuses.c:1093
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "Brug en _anden status for nogle konti"
+
+#. Save & Use button
+#: src/gtksavedstatuses.c:1159
+msgid "Sa_ve & Use"
+msgstr "G_em og brug"
+
+#: src/gtksavedstatuses.c:1339
+#, c-format
+msgid "Status for %s"
+msgstr "Status for %s"
 
 #: src/gtksound.c:61
 msgid "Buddy logs in"
@@ -4446,145 +4839,151 @@
 "Ikke i stand til at afspille lyd fordi den opsatte lyd kommando ikke kunne "
 "k淡res: %s"
 
-#: src/gtkstatusbox.c:197
+#: src/gtkstatusbox.c:287
 #, fuzzy
 msgid "Typing"
 msgstr "Ping"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: src/gtkstatusbox.c:290 src/protocols/irc/irc.c:257
+#: src/protocols/jabber/jabber.c:893 src/protocols/msn/session.c:349
+#: src/protocols/napster/napster.c:531 src/protocols/novell/novell.c:2183
+#: src/protocols/oscar/oscar.c:1804 src/protocols/sametime/sametime.c:3610
+#: src/protocols/simple/simple.c:1294 src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Tilslutter"
 
 #. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
+#. zephyr has several exposures
+#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+#. OPSTAFF "hidden"
+#. REALM-VISIBLE visible to people in local realm
+#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+#.
+#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+#. Hidden, will set the user's exposure to OPSTAFF
+#.
+#. Away won't change their exposure but will set an auto away message (for IMs only)
+#.
+#: src/gtkstatusbox.c:438 src/protocols/bonjour/bonjour.c:251
+#: src/protocols/gg/gg.c:1437 src/protocols/irc/irc.c:171
+#: src/protocols/jabber/buddy.c:1089 src/protocols/jabber/jabber.c:1094
+#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
+#: src/protocols/msn/state.c:38 src/protocols/napster/napster.c:584
+#: src/protocols/novell/novell.c:2846 src/protocols/novell/novell.c:2978
+#: src/protocols/oscar/oscar.c:7827 src/protocols/silc/silc.c:49
+#: src/protocols/simple/simple.c:254 src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/zephyr/zephyr.c:2253 src/status.c:154
 msgid "Available"
 msgstr "Tilg脱ngelig"
 
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
+#: src/gtkstatusbox.c:440 src/protocols/gg/gg.c:1446
+#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7841
+#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:3245
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
+#: src/gtkstatusbox.c:441 src/protocols/bonjour/bonjour.c:246
+#: src/protocols/gg/gg.c:1432 src/protocols/irc/irc.c:167
+#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1087
+#: src/protocols/msn/msn.c:577 src/protocols/napster/napster.c:579
+#: src/protocols/novell/novell.c:2858 src/protocols/novell/novell.c:2975
+#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7649
+#: src/protocols/oscar/oscar.c:7822 src/protocols/sametime/sametime.c:3237
+#: src/protocols/silc/silc.c:47 src/protocols/simple/simple.c:250
+#: src/protocols/yahoo/yahoo.c:2662 src/protocols/yahoo/yahoo.c:3202
+#: src/status.c:153
 msgid "Offline"
 msgstr "Offline"
 
-#: src/gtkstatusbox.c:299
+#: src/gtkstatusbox.c:443
 #, fuzzy
 msgid "Custom..."
 msgstr "Brugerdefineret"
 
-#: src/gtkstatusbox.c:300
+#: src/gtkstatusbox.c:444
 #, fuzzy
 msgid "Saved..."
 msgstr "Gem fil..."
 
-#: src/gtkstock.c:117
+#: src/gtkstock.c:138
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/gtkstock.c:119
+#: src/gtkstock.c:140
 msgid "_Invite"
 msgstr "_Invit辿r"
 
-#: src/gtkstock.c:120
+#: src/gtkstock.c:141
 msgid "_Modify"
 msgstr "Ret"
 
-#: src/gtkstock.c:121
+#: src/gtkstock.c:142
 msgid "_Open Mail"
 msgstr "�bn post"
 
-#: src/gtkstock.c:123
+#: src/gtkstock.c:144
 msgid "_Warn"
 msgstr "Advar"
 
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, fuzzy, c-format
+#: src/gtkutils.c:1309 src/gtkutils.c:1334
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Der opstod en ukendt fejl under logind: %s."
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
+msgstr "Den f淡lgende fejl opstod ved indl脱sning: %s %s"
+
+#: src/gtkutils.c:1311 src/gtkutils.c:1336
 msgid "Failed to load image"
-msgstr "Kunne ikke gemme billede: %s\n"
-
-#: src/gtkutils.c:1495
-#, fuzzy, c-format
+msgstr "Kunne ikke indl脱se billede"
+
+#: src/gtkutils.c:1411
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "Kan ikke sende fil"
-
-#: src/gtkutils.c:1497
+msgstr "Kan ikke sende mappe %s."
+
+#: src/gtkutils.c:1413
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
+"Gaim kan ikke overf淡re en mappe. Du skal sende filerne individuelt"
+
+#: src/gtkutils.c:1441 src/gtkutils.c:1450 src/gtkutils.c:1455
 msgid "You have dragged an image"
-msgstr "Du har indtastet et ugyldigt brugernavn"
-
-#: src/gtkutils.c:1526
+msgstr ""
+
+#: src/gtkutils.c:1442
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
+#: src/gtkutils.c:1446 src/gtkutils.c:1461
 msgid "Set as buddy icon"
-msgstr "Vis venne_ikoner"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
+msgstr "S脱t som venneikon"
+
+#: src/gtkutils.c:1447 src/gtkutils.c:1462
 msgid "Send image file"
-msgstr "Send besked"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Send billedfil"
+
+#: src/gtkutils.c:1448 src/gtkutils.c:1462
 msgid "Insert in message"
-msgstr "Inds脱t billede"
-
-#: src/gtkutils.c:1535
-#, fuzzy
+msgstr "Inds脱t i besked"
+
+#: src/gtkutils.c:1451
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Vil du deltage i samtalen?"
-
-#: src/gtkutils.c:1540
+msgstr "Vil du s脱tte det som venneikon for denne bruger?"
+
+#: src/gtkutils.c:1456
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: src/gtkutils.c:1542
+#: src/gtkutils.c:1458
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4595,24 +4994,42 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
-#, fuzzy
+#: src/gtkutils.c:1512
 msgid "Cannot send launcher"
-msgstr "Kan ikke sende fil"
-
-#: src/gtkutils.c:1596
+msgstr ""
+
+#: src/gtkutils.c:1512
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: src/gtkwhiteboard.c:344 src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr ""
+
 #: src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Loggeren har ingen l脱se funktion</font></b>"
 
+#: src/log.c:497
+msgid "HTML"
+msgstr "HTML"
+
+#: src/log.c:508
+msgid "Plain text"
+msgstr "Ren tekst"
+
+#: src/log.c:519
+msgid "Old Gaim"
+msgstr "Gammel Gaim"
+
 #: src/log.c:577
 msgid "Logging of this conversation failed."
-msgstr ""
+msgstr "Logging af denne samtale fejlede."
 
 #: src/log.c:839
 msgid "XML"
@@ -4650,7 +5067,7 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
-#: src/plugin.c:331
+#: src/plugin.c:362
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4659,39 +5076,43 @@
 "Det kr脱vede udvidelsesmodul %s blev ikke fundet. Install辿r modulet og pr淡v "
 "igen."
 
-#: src/plugin.c:336 src/plugin.c:364
+#: src/plugin.c:367 src/plugin.c:395
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim kunne ikke indl脱se dit modul."
 
-#: src/plugin.c:360
+#: src/plugin.c:391
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Det kr脱vede modul %s kunne ikke indl脱ses."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Inaktiv"
-
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#. Send a message about the connection error
+#: src/protocols/bonjour/bonjour.c:107
+msgid "Unable to listen for incoming IM connections\n"
+msgstr ""
+
+#: src/protocols/bonjour/bonjour.c:142
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"Kunne ikke etablerede forbindelse til lokal mDNS server. K淡rer den?"
+
+#: src/protocols/bonjour/bonjour.c:328
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
 msgstr ""
 "\n"
-"<b>Status</b>: Enest奪ende"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+"<b>Status</b>: %s"
+
+#: src/protocols/bonjour/bonjour.c:330
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>Besked:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4703,349 +5124,374 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:424 src/protocols/bonjour/bonjour.c:426
 msgid "Bonjour Protocol Plugin"
-msgstr "Yahoo protokolmodul"
+msgstr "Bonjour protokol modul"
+
+#: src/protocols/bonjour/bonjour.c:458 src/protocols/bonjour/bonjour.c:515
+msgid "Gaim User"
+msgstr "Gaim bruger"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
-msgid "Host name"
-msgstr "Efternavn:"
+#: src/protocols/bonjour/bonjour.c:553 src/protocols/silc/silc.c:921
+msgid "Hostname"
+msgstr "V脱rtsnavn"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: src/protocols/bonjour/bonjour.c:557 src/protocols/irc/irc.c:820
+#: src/protocols/msn/msn.c:1943 src/protocols/napster/napster.c:719
+#: src/protocols/sametime/sametime.c:5586 src/protocols/silc/silc.c:1836
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:560 src/protocols/gg/gg.c:571
+#: src/protocols/gg/gg.c:986
 msgid "First name"
-msgstr "Fornavn:"
-
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
+msgstr "Fornavn"
+
+#: src/protocols/bonjour/bonjour.c:563 src/protocols/gg/gg.c:566
 msgid "Last name"
-msgstr "Efternavn:"
-
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
+msgstr "Efternavn"
+
+#: src/protocols/bonjour/bonjour.c:566 src/protocols/jabber/buddy.c:261
 #: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/silc/silc.c:685 src/protocols/silc/silc.c:925
+#: src/protocols/silc/util.c:512 src/protocols/yahoo/yahoo_profile.c:999
 msgid "Email"
 msgstr "E-post adresse"
 
 #: src/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
+msgstr "Bonjour"
+
+#: src/protocols/gg/gg.c:89 src/protocols/gg/gg.c:111
+#: src/protocols/gg/gg.c:146
+msgid "Token Error"
+msgstr "Token fejl"
+
+#: src/protocols/gg/gg.c:90 src/protocols/gg/gg.c:112
+#: src/protocols/gg/gg.c:147
+msgid "Unable to fetch the token.\n"
+msgstr "Ikke i stand til at f奪 fat i token.\n"
+
+#: src/protocols/gg/gg.c:235 src/protocols/gg/gg.c:254
 msgid "Save Buddylist..."
-msgstr "Send venneliste"
-
-#: src/protocols/gg/gg.c:137
+msgstr "Gem venneliste..."
+
+#: src/protocols/gg/gg.c:236
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
+msgstr "Din venneliste er tom, intet blev skrevet til filen."
+
+#: src/protocols/gg/gg.c:242 src/protocols/gg/gg.c:244
 msgid "Couldn't open file"
-msgstr "Kan ikke sende fil"
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
+msgstr "Kan ikke 奪bne fil"
+
+#: src/protocols/gg/gg.c:255
 msgid "Buddylist saved successfully!"
-msgstr "Adgangskoden er 脱ndret"
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "Kan ikke sende fil"
-
-#: src/protocols/gg/gg.c:199
-#, fuzzy
+msgstr "Venneliste gemt!"
+
+#: src/protocols/gg/gg.c:273 src/protocols/gg/gg.c:274
+msgid "Couldn't load buddylist"
+msgstr "Kunne ikke indl脱se venneliste"
+
+#: src/protocols/gg/gg.c:290
 msgid "Load Buddylist..."
-msgstr "_Lav alias for ven..."
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
+msgstr "Indl脱s venneliste..."
+
+#: src/protocols/gg/gg.c:291
 msgid "Buddylist loaded successfully!"
-msgstr "Adgangskoden er 脱ndret"
-
-#: src/protocols/gg/gg.c:211
-#, fuzzy
+msgstr "Venneliste indl脱st!"
+
+#: src/protocols/gg/gg.c:302
 msgid "Save buddylist..."
-msgstr "Send venneliste"
-
-#: src/protocols/gg/gg.c:254
+msgstr "Gem venneliste..."
+
+#: src/protocols/gg/gg.c:346
 msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
+msgstr "Udfyld registreringsfelterne."
+
+#: src/protocols/gg/gg.c:351
 msgid "Passwords do not match."
-msgstr "Nye adgangskoder er ikke ens."
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
+msgstr "Adgangskoder er ikke ens."
+
+#: src/protocols/gg/gg.c:360
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "Ikke ikke etablere ny forbindelse."
-
-#: src/protocols/gg/gg.c:279
+msgstr "Kunne ikke registrere en ny konto. En fejl skete.\n"
+
+#: src/protocols/gg/gg.c:373
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
+msgstr "Ny Gadu-Gadu konto registreret"
+
+#: src/protocols/gg/gg.c:374
 msgid "Registration completed successfully!"
-msgstr "Registering lykkedes"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+msgstr "Registering lykkedes!"
+
+#: src/protocols/gg/gg.c:434
+msgid "e-Mail"
+msgstr "e-mail"
+
+#: src/protocols/gg/gg.c:439 src/protocols/gg/gg.c:713
+#: src/protocols/jabber/jabber.c:680 src/protocols/jabber/jabber.c:1205
+msgid "Password"
+msgstr "Adgangskode"
+
+#: src/protocols/gg/gg.c:444 src/protocols/gg/gg.c:718
+msgid "Password (retype)"
+msgstr "Adgangskode (tast igen)"
+
+#: src/protocols/gg/gg.c:449 src/protocols/gg/gg.c:723
+msgid "Enter current token"
+msgstr ""
+
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:729
+msgid "Current token"
+msgstr ""
+
+#: src/protocols/gg/gg.c:459 src/protocols/gg/gg.c:460
+msgid "Register New Gadu-Gadu Account"
+msgstr "Registr辿r ny Gadu-Gadu konto"
+
+#: src/protocols/gg/gg.c:461
+msgid "Please, fill in the following fields"
+msgstr "Udfyld alle de f淡lgende felter"
+
+#: src/protocols/gg/gg.c:556 src/protocols/gg/gg.c:1605
+msgid "Unable to initiate a new search"
+msgstr "Kunne ikke lave en ny s淡gning"
+
+#: src/protocols/gg/gg.c:557 src/protocols/gg/gg.c:1606
+msgid "You have a pending search. Please wait for it to finish."
+msgstr ""
+
+#: src/protocols/gg/gg.c:576 src/protocols/gg/gg.c:989
+#: src/protocols/gg/gg.c:1985 src/protocols/jabber/buddy.c:252
+#: src/protocols/jabber/buddy.c:698 src/protocols/jabber/buddy.c:1341
+#: src/protocols/jabber/jabber.c:696 src/protocols/msn/msn.c:1368
+#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:1036
+#: src/protocols/silc/ops.c:1179 src/protocols/silc/ops.c:1328
+#: src/protocols/yahoo/yahoo_profile.c:1004
 msgid "Nickname"
 msgstr "K脱lenavn"
 
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: src/protocols/gg/gg.c:581 src/protocols/gg/gg.c:992
+#: src/protocols/jabber/jabber.c:716 src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:6056
 msgid "City"
 msgstr "By"
 
-#: src/protocols/gg/gg.c:417
+#: src/protocols/gg/gg.c:586
 msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
-#, fuzzy
+msgstr "F淡dsels奪r"
+
+#: src/protocols/gg/gg.c:589 src/protocols/msn/msn.c:1527
+#: src/protocols/oscar/oscar.c:6021 src/protocols/yahoo/yahoo_profile.c:1029
+msgid "Gender"
+msgstr "K淡n"
+
+#: src/protocols/gg/gg.c:590
+msgid "Male or female"
+msgstr "Mand eller kvinde"
+
+#: src/protocols/gg/gg.c:591 src/protocols/oscar/oscar.c:6021
+msgid "Male"
+msgstr "Mand"
+
+#: src/protocols/gg/gg.c:592 src/protocols/oscar/oscar.c:6021
+msgid "Female"
+msgstr "Kvinde"
+
+#: src/protocols/gg/gg.c:596
 msgid "Only online"
-msgstr "Logget ind"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
-#, fuzzy
+msgstr "Kun online"
+
+#: src/protocols/gg/gg.c:600 src/protocols/gg/gg.c:601
 msgid "Find buddies"
-msgstr "Vis inaktive venner me_d gr奪 farve"
-
-#: src/protocols/gg/gg.c:432
-#, fuzzy
+msgstr "Find venner"
+
+#: src/protocols/gg/gg.c:602
 msgid "Please, enter your search criteria below"
-msgstr "Indtast din nye adgangskode"
-
-#: src/protocols/gg/gg.c:465
+msgstr ""
+
+#: src/protocols/gg/gg.c:639
 msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
+msgstr "Udfyld felterne."
+
+#: src/protocols/gg/gg.c:651
 msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
-#, fuzzy
+msgstr "Din nuv脱rende adgangskode er forskellig fra den du angav."
+
+#: src/protocols/gg/gg.c:665
 msgid "Unable to change password. Error occured.\n"
-msgstr "Kunne ikke 脱ndre Gadu-Gadu adgangskode"
-
-#: src/protocols/gg/gg.c:500
-#, fuzzy
+msgstr "Kunne ikke 脱ndre Gadu-Gadu adgangskode. En fejl skete.\n"
+
+#: src/protocols/gg/gg.c:674
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Skift adgangskode for %s"
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
+msgstr "Skift adgangskode for Gadu-Gadu kontoen"
+
+#: src/protocols/gg/gg.c:675
 msgid "Password was changed successfully!"
-msgstr "Adgangskoden er 脱ndret"
-
-#: src/protocols/gg/gg.c:535
-#, fuzzy
-msgid "Token Error"
-msgstr "Ukendt fejl"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "Ikke i stand til at hente rumliste."
-
-#: src/protocols/gg/gg.c:551
-#, fuzzy
+msgstr "Adgangskoden blev 脱ndret!"
+
+#: src/protocols/gg/gg.c:708
 msgid "Current password"
-msgstr "Forkert adgangskode."
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "Adgangskode"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Adgangskode sendt"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s er ikke logget p奪 lige nu."
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
-msgid "Current token"
-msgstr "P奪 lige nu"
-
-#: src/protocols/gg/gg.c:574
+msgstr "Nuv脱rende adgangskode"
+
+#: src/protocols/gg/gg.c:733
 #, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Indtast din nuv脱rende og nye adgangskode."
 
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
+#: src/protocols/gg/gg.c:737 src/protocols/gg/gg.c:738
 #, fuzzy
 msgid "Change Gadu-Gadu Password"
 msgstr "Kunne ikke 脱ndre Gadu-Gadu adgangskode"
 
-#: src/protocols/gg/gg.c:649
+#: src/protocols/gg/gg.c:822
 #, fuzzy, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Fjern chatten fra din venneliste"
 
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
+#: src/protocols/gg/gg.c:825 src/protocols/gg/gg.c:826
 #, fuzzy
 msgid "Add to chat..."
 msgstr "Tilf淡j en _chat"
 
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "Kan ikke l脱se fra netv脱rket"
-
-#: src/protocols/gg/gg.c:959
+#: src/protocols/gg/gg.c:965
+#, fuzzy
+msgid "No matching users found"
+msgstr "Ikke-matchende v脱rter"
+
+#: src/protocols/gg/gg.c:966
+#, fuzzy
+msgid "There are no users matching your search criteria."
+msgstr "Indtast din nye adgangskode"
+
+#: src/protocols/gg/gg.c:977 src/protocols/gg/gg.c:1044
+#: src/protocols/oscar/oscar.c:6158
+#, fuzzy
+msgid "Unable to display the search results."
+msgstr "Kunne ikke invitere bruger (%s)."
+
+#: src/protocols/gg/gg.c:983 src/protocols/oscar/oscar.c:5993
+msgid "UIN"
+msgstr "UIN"
+
+#: src/protocols/gg/gg.c:995
+#, fuzzy
+msgid "Birth year"
+msgstr "F淡dsels奪r"
+
+#: src/protocols/gg/gg.c:1035
 msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#: src/protocols/gg/gg.c:960
+#: src/protocols/gg/gg.c:1036
 #, fuzzy
 msgid "Search results"
 msgstr "S淡geresultater"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "Logget ind"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
+#: src/protocols/gg/gg.c:1132 src/protocols/gg/gg.c:1279
+msgid "Unable to read socket"
+msgstr "Kan ikke l脱se fra netv脱rket"
+
+#: src/protocols/gg/gg.c:1215
+#, fuzzy
+msgid "Buddy list downloaded"
+msgstr "Ven er inaktiv:"
+
+#: src/protocols/gg/gg.c:1216
+#, fuzzy
+msgid "Your buddy list was downloaded from the server."
+msgstr "Din forbindelse til serveren blev afbrudt."
+
+#: src/protocols/gg/gg.c:1223
+#, fuzzy
+msgid "Buddy list uploaded"
+msgstr "Visning af venner"
+
+#: src/protocols/gg/gg.c:1224
+#, fuzzy
+msgid "Your buddy list was stored on the server."
+msgstr "Der er ingen venneliste gemt p奪 Gadu-Gadu serveren."
+
+#: src/protocols/gg/gg.c:1313 src/protocols/gg/gg.c:1531
+msgid "Connection failed."
+msgstr "Forbindelse fejlede"
+
+#: src/protocols/gg/gg.c:1451 src/protocols/msn/msn.c:593
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2852
+#: src/protocols/novell/novell.c:2990 src/protocols/silc/buddy.c:1435
+#: src/protocols/silc/silc.c:55 src/protocols/yahoo/yahoo.c:2642
+#: src/protocols/yahoo/yahoo.c:3220
 msgid "Busy"
 msgstr "Travlt"
 
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: src/protocols/gg/gg.c:1456 src/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Blokeret"
 
-#: src/protocols/gg/gg.c:1129
-#, fuzzy
+#: src/protocols/gg/gg.c:1473
 msgid "Add to chat"
-msgstr "Tilf淡j chat"
-
-#: src/protocols/gg/gg.c:1133
+msgstr "Tilf淡j til chat"
+
+#: src/protocols/gg/gg.c:1478
 #, fuzzy
 msgid "Unblock"
 msgstr "Blok辿r"
 
-#: src/protocols/gg/gg.c:1149
+#: src/protocols/gg/gg.c:1497
 #, fuzzy
 msgid "Chat _name:"
 msgstr "Efternavn:"
 
-#: src/protocols/gg/gg.c:1183
-#, fuzzy
-msgid "Connection failed."
-msgstr "Forbindelse fejlede"
-
-#: src/protocols/gg/gg.c:1357
+#: src/protocols/gg/gg.c:1716
 #, fuzzy
 msgid "Chat error"
 msgstr "L脱sefejl"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1717
 #, fuzzy
 msgid "This chat name is already in use"
 msgstr "Den fil eksisterer allerede"
 
-#: src/protocols/gg/gg.c:1435
+#: src/protocols/gg/gg.c:1799
 #, fuzzy
 msgid "Not connected to the server."
 msgstr "Din forbindelse til serveren blev afbrudt."
 
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-#, fuzzy
-msgid "e-Mail"
-msgstr "E-post adresse"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "Registr辿r ny Jabber konto"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1515
-#, fuzzy
-msgid "Change password"
-msgstr "Skift adgangskode"
-
-#: src/protocols/gg/gg.c:1520
+#: src/protocols/gg/gg.c:1822
+#, fuzzy
+msgid "Find buddies..."
+msgstr "Vis inaktive venner me_d gr奪 farve"
+
+#: src/protocols/gg/gg.c:1828
+msgid "Change password..."
+msgstr "Skift adgangskode..."
+
+#: src/protocols/gg/gg.c:1834
 #, fuzzy
 msgid "Upload buddylist to Server"
 msgstr "Eksport辿r venneliste til server"
 
-#: src/protocols/gg/gg.c:1523
+#: src/protocols/gg/gg.c:1838
 #, fuzzy
 msgid "Download buddylist from Server"
 msgstr "Slet venneliste p奪 server"
 
-#: src/protocols/gg/gg.c:1526
+#: src/protocols/gg/gg.c:1842
 #, fuzzy
 msgid "Delete buddylist from Server"
 msgstr "Slet venneliste p奪 server"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1532
-#, fuzzy
-msgid "Load buddylist from file"
+#: src/protocols/gg/gg.c:1846
+#, fuzzy
+msgid "Save buddylist to file..."
+msgstr "Send venneliste"
+
+#: src/protocols/gg/gg.c:1850
+#, fuzzy
+msgid "Load buddylist from file..."
 msgstr "Import辿r venneliste fra server"
 
 #. magic
@@ -5059,33 +5505,32 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: src/protocols/gg/gg.c:1937
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokol-modul"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: src/protocols/gg/gg.c:1938
 msgid "Polish popular IM"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1665
-#, fuzzy
+msgstr "Popul脱r polsk klient"
+
+#: src/protocols/gg/gg.c:1986
 msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu s淡gemaskine"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+msgstr "Gadu-Gadu bruger"
+
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukendt kommando: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: src/protocols/irc/cmds.c:485 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "nuv脱rende emne er: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: src/protocols/irc/cmds.c:489 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1284
 msgid "No topic is set"
 msgstr "Inet emne er sat"
 
@@ -5100,78 +5545,79 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim kunne ikke 奪bne en lyttende port."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Fejl ved visning af MOTD"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "Ingen MOTD tilg脱ngelig"
 
-#: src/protocols/irc/irc.c:80
+#: src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "Der er ingen MOTD associeret med denne forbindelse."
 
-#: src/protocols/irc/irc.c:83
+#: src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:529
+#: src/protocols/irc/irc.c:551
 msgid "Server has disconnected"
 msgstr "Server har afbrudt forbindelse"
 
-#: src/protocols/irc/irc.c:188
+#: src/protocols/irc/irc.c:187
 msgid "View MOTD"
 msgstr "Vis MOTD"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:199 src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:205 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Adgangskode:"
 
-#: src/protocols/irc/irc.c:238
+#: src/protocols/irc/irc.c:237
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC navne m奪 ikke indeholde mellemrum og lignende"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: src/protocols/irc/irc.c:265 src/protocols/jabber/jabber.c:481
+#: src/protocols/jabber/jabber.c:818
 msgid "SSL support unavailable"
 msgstr "SSL-underst淡ttelse ikke tilg脱ngelig"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: src/protocols/irc/irc.c:276 src/protocols/simple/simple.c:392
+#: src/protocols/simple/simple.c:1237
 msgid "Couldn't create socket"
 msgstr "Kunne ikke oprette sokkel"
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: src/protocols/irc/irc.c:347 src/protocols/jabber/jabber.c:354
+#: src/protocols/oscar/oscar.c:1732 src/protocols/oscar/oscar.c:1800
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke kontakte v脱rt"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:372 src/protocols/jabber/jabber.c:381
 msgid "Connection Failed"
 msgstr "Forbindelse fejlede"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: src/protocols/irc/irc.c:375 src/protocols/jabber/jabber.c:384
 msgid "SSL Handshake Failed"
 msgstr "SSL-h奪ndtryk fejlede"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: src/protocols/irc/irc.c:526 src/protocols/irc/irc.c:548
 msgid "Read error"
 msgstr "L脱sefejl"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: src/protocols/irc/irc.c:687 src/protocols/silc/chat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1378
 msgid "Users"
 msgstr "Brugere"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/irc/irc.c:690 src/protocols/sametime/sametime.c:3324
+#: src/protocols/silc/chat.c:1422 src/protocols/silc/ops.c:1380
+#: src/protocols/yahoo/yahoochat.c:1387
 msgid "Topic"
 msgstr "Emne"
 
@@ -5183,34 +5629,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: src/protocols/irc/irc.c:797
 msgid "IRC Protocol Plugin"
 msgstr "IRC prokotolmodul"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: src/protocols/irc/irc.c:798
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC prokotolmodul"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: src/protocols/irc/irc.c:817 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1766 src/protocols/napster/napster.c:714
+#: src/protocols/sametime/sametime.c:5581 src/protocols/silc/ops.c:1242
+#: src/protocols/silc/ops.c:1344 src/protocols/simple/simple.c:1448
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:825
+#: src/protocols/irc/irc.c:823
 msgid "Encodings"
 msgstr "Tegns脱t"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:826 src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:676 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/ops.c:1189 src/protocols/silc/ops.c:1191
+#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1340
+#: src/protocols/silc/silc.c:919
 msgid "Username"
 msgstr "Brugernavn"
 
-#: src/protocols/irc/irc.c:831
+#: src/protocols/irc/irc.c:829
 msgid "Real name"
 msgstr "Rigtigt navn"
 
@@ -5218,7 +5666,7 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
+#: src/protocols/irc/irc.c:837
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
@@ -5247,8 +5695,8 @@
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5994
+#: src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "K脱lenavn"
 
@@ -5267,12 +5715,12 @@
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:1183
+#: src/protocols/silc/ops.c:1332 src/protocols/yahoo/yahoo_profile.c:1009
 msgid "Realname"
 msgstr "Rigtige navn"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "P奪 lige nu"
 
@@ -5317,60 +5765,60 @@
 msgid "Users on %s: %s"
 msgstr "Brugere p奪 %s: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: src/protocols/irc/msgs.c:491
 msgid "Time Response"
 msgstr "Tids svar"
 
-#: src/protocols/irc/msgs.c:483
+#: src/protocols/irc/msgs.c:492
 msgid "The IRC server's local time is:"
 msgstr "IRC-serverens lokale tid er:"
 
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:503
 msgid "No such channel"
 msgstr "Ingen kanal ved det navn"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: src/protocols/irc/msgs.c:514
 msgid "no such channel"
 msgstr "ingen kanal ved det navn"
 
-#: src/protocols/irc/msgs.c:508
+#: src/protocols/irc/msgs.c:517
 msgid "User is not logged in"
 msgstr "Bruger er ikke logget ind"
 
-#: src/protocols/irc/msgs.c:513
+#: src/protocols/irc/msgs.c:522
 msgid "No such nick or channel"
 msgstr "K脱lenavn/kanal findes ikke"
 
-#: src/protocols/irc/msgs.c:533
+#: src/protocols/irc/msgs.c:542
 msgid "Could not send"
 msgstr "Kunne ikke sende"
 
-#: src/protocols/irc/msgs.c:589
+#: src/protocols/irc/msgs.c:598
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Det kr脱ver en invitation for at deltage i %s."
 
-#: src/protocols/irc/msgs.c:590
+#: src/protocols/irc/msgs.c:599
 msgid "Invitation only"
 msgstr "Kun invitation"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:701
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du er blevet smidt ud af %s: (%s)"
 
-#: src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:706
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Smidt ud af %s: (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: src/protocols/irc/msgs.c:730
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) af %s"
 
-#: src/protocols/irc/msgs.c:805
+#: src/protocols/irc/msgs.c:814
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5378,43 +5826,43 @@
 "Dit valgte konto navn blev n脱gtet af serveren. Det indeholder sikkert "
 "ugyldige bogstaver."
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:853
 msgid "Cannot change nick"
 msgstr "Kan ikke 脱ndre navn"
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:853
 msgid "Could not change nick"
 msgstr "Kunne ikke 脱ndre navn"
 
-#: src/protocols/irc/msgs.c:865
+#: src/protocols/irc/msgs.c:874
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har forladt kanalen%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: src/protocols/irc/msgs.c:916
 msgid "Error: invalid PONG from server"
 msgstr "Fejl: Ugyldigt PONG fra server"
 
-#: src/protocols/irc/msgs.c:909
+#: src/protocols/irc/msgs.c:918
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING svar -- Lag: %lu sekunder"
 
-#: src/protocols/irc/msgs.c:984
+#: src/protocols/irc/msgs.c:993
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kan ikke deltage i %s:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:994 src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan ikke deltage i kanalen"
 
-#: src/protocols/irc/msgs.c:1019
+#: src/protocols/irc/msgs.c:1028
 #, fuzzy
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Tjenesten er midlertidigt utilg脱ngelig."
 
-#: src/protocols/irc/msgs.c:1031
+#: src/protocols/irc/msgs.c:1040
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops fra %s"
@@ -5432,6 +5880,11 @@
 "du fra frav脱r."
 
 #: src/protocols/irc/parse.c:116
+#, fuzzy
+msgid "chanserv: Send a command to chanserv"
+msgstr "quote [...]: Sender en r奪 kommando til serveren."
+
+#: src/protocols/irc/parse.c:117
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5439,7 +5892,7 @@
 "deop &lt;navn1&gt; [navn2] ...: Fjern kanal operat淡r status fra en. Du skal "
 "v脱re kanal operat淡r for at g淡re dette."
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5449,7 +5902,7 @@
 "forhindrer dem i at snakke hvis kanalen er modereret (+m). Du skal v脱re "
 "kanal operat淡r for at g淡re dette."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5457,7 +5910,7 @@
 "invite &lt;navn&gt; [rum]: Invit辿r nogle til den angivne kanal, eller den "
 "nuv脱rende kanal."
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:120
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5465,7 +5918,7 @@
 "j &lt;rum1&gt;[,rum2][,...] [n淡gle1[,n淡gle2][,...]]: Deltag i en eller flere "
 "kanaler. Du kan angive en adgangsn淡gle hvis det er kr脱vet."
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5473,7 +5926,7 @@
 "join &lt;rum1&gt;[,rum2][,...] [n淡gle1[,n淡gle2][,...]]: Deltag i en eller "
 "flere kanaler. Du kan angive en adgangsn淡gle hvis det er kr脱vet."
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:122
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5481,7 +5934,7 @@
 "kick &lt;nick&gt; [besked]: Fjern nogle fra kanalen. Du skal have kanal "
 "operat淡r status for at g淡re dette."
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:123
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5489,11 +5942,16 @@
 "list: Vis en liste over chatrum p奪 netv脱rket. <i>Advarsel, nogle servere kan "
 "afbryde forbindelsen n奪r du g淡r dette.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;handling at udf淡re&gt;: Udf淡r en handling."
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125
+#, fuzzy
+msgid "memoserv: Send a command to memoserv"
+msgstr "quote [...]: Sender en r奪 kommando til serveren."
+
+#: src/protocols/irc/parse.c:126
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5501,7 +5959,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-Z&gt; &lt;nick|kanal&gt;: S脱t eller fjern en kanal "
 "eller bruger tilstand"
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:127
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5509,15 +5967,20 @@
 "msg &lt;navn&gt; &lt;besked&gt;: Send en privat besked til en bruger "
 "(istedet for en kanal)."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]: Vis brugerne der er p奪 kanalen lige nu."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: src/protocols/irc/parse.c:129 src/protocols/jabber/jabber.c:1610
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nyt navn&gt;: Skift dit navn."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:130
+#, fuzzy
+msgid "nickserv: Send a command to nickserv"
+msgstr "quote [...]: Sender en r奪 kommando til serveren."
+
+#: src/protocols/irc/parse.c:131
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5525,7 +5988,7 @@
 "op &lt;navn1&gt; [navn2] ...: Giv kanal operat淡r status til en. Du skal selv "
 "v脱re kanal operat淡r for at g淡re dette."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:132
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5533,7 +5996,12 @@
 "operwall &lt;message&gt;: Hvis du ikke ved hvad dette er, s奪 kan du sikkert "
 "ikke bruge det."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:133
+#, fuzzy
+msgid "operserv: Send a command to operserv"
+msgstr "quote [...]: Sender en r奪 kommando til serveren."
+
+#: src/protocols/irc/parse.c:134
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5541,7 +6009,7 @@
 "part [rum] [besked]: Forlad den nuv脱rende kanal, eller angiv en kanal med en "
 "eventuel frav脱rsbesked."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:135
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5549,7 +6017,7 @@
 "ping [navn]: Sp淡rger hvor meget lag (tidsforsinkelse) en bruger (eller "
 "serveren hvis ingen bruger angivet) har."
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:136
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5557,15 +6025,15 @@
 "query &lt;navn&gt; &lt;besked&gt;: Send en privat besked til en bruger "
 "(istedet for en kanal)."
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [besked]: Luk forbindelse til server, med en eventuel besked."
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: Sender en r奪 kommando til serveren."
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:139
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5573,19 +6041,19 @@
 "remove &lt;nick&gt; [besked]: Fjern nogen fra et rum. Du skal have kanal "
 "operat淡r status for at g淡re dette."
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Viser den lokale tid p奪 IRC-serveren."
 
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nyt emne]: Vis eller skift kanalens emne."
 
-#: src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: S脱t eller fjern en bruger tilstand."
 
-#: src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:143
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5593,7 +6061,7 @@
 "voice &lt;navn1&gt; [navn2] ...: Giv kanal 'voice' status til en. Du skal "
 "havekanal operat淡r status for at g淡re dette."
 
-#: src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:144
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5601,25 +6069,25 @@
 "wallops &lt;besked&gt;:  Hvis du ikke ved hvad dette er, s奪 kan du sikkert "
 "ikke bruge det."
 
-#: src/protocols/irc/parse.c:141
+#: src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;navn&gt;: Hent oplysninger om en bruger."
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svartid fra %s: %lu sekunder"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "CTCP PING svar"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
+#: src/protocols/irc/parse.c:543 src/protocols/irc/parse.c:547
+#: src/protocols/oscar/oscar.c:1641 src/protocols/toc/toc.c:190
 #: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
 #: src/protocols/toc/toc.c:780
 msgid "Disconnected."
@@ -5641,18 +6109,18 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server kr脱ver ren tekst godkendelse over en ukrypteret str淡m"
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "Ugyldigt svar fra server."
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:232
+msgid "Server couldn't authenticate you without a password"
+msgstr "Server kunne ikke godkende dig uden en adgangskode"
+
+#: src/protocols/jabber/auth.c:235 src/protocols/jabber/auth.c:236
+#: src/protocols/jabber/auth.c:381 src/protocols/jabber/auth.c:382
+#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:464
 msgid "Plaintext Authentication"
 msgstr "Ren tekst godkendelse"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: src/protocols/jabber/auth.c:237 src/protocols/jabber/auth.c:383
+#: src/protocols/jabber/auth.c:465
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5660,21 +6128,35 @@
 "Denne server kr脱ver at godkendelse sker ved ren tekst (uden kryptering). "
 "Tillad dette og forts脱t godkendelse?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:243 src/protocols/jabber/auth.c:391
+#: src/protocols/jabber/auth.c:473
 msgid "Server does not use any supported authentication method"
 msgstr "Serveren bruger ikke nogle underst淡ttede godkendelsesmetoder"
 
-#: src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: src/protocols/jabber/auth.c:309 src/protocols/jabber/auth.c:426
+#: src/protocols/jabber/auth.c:594 src/protocols/jabber/auth.c:726
+#: src/protocols/jabber/auth.c:738 src/protocols/jabber/auth.c:757
+#: src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "Ugyldigt svar fra server."
+
+#: src/protocols/jabber/auth.c:615
 msgid "Invalid challenge from server"
 msgstr "Ugyldigt svar fra server"
 
+#: src/protocols/jabber/auth.c:701
+#, fuzzy
+msgid "SASL error"
+msgstr "L脱sefejl"
+
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Fulde navn"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Efternavn"
 
@@ -5682,7 +6164,7 @@
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:736
 msgid "URL"
 msgstr "Hjemmeside"
 
@@ -5703,11 +6185,12 @@
 msgstr "Omr奪de"
 
 #: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: src/protocols/jabber/jabber.c:726
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: src/protocols/silc/silc.c:929
 msgid "Country"
 msgstr "Land"
 
@@ -5729,7 +6212,7 @@
 msgstr "Rolle"
 
 #: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: src/protocols/oscar/oscar.c:6029
 msgid "Birthday"
 msgstr "F淡dselsdato"
 
@@ -5749,17 +6232,17 @@
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1769
 msgid "Resource"
 msgstr "Ressource"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:711
+#: src/protocols/oscar/oscar.c:6047 src/protocols/oscar/oscar.c:6055
+#: src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
@@ -5800,41 +6283,41 @@
 msgstr "Afmeld"
 
 #: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1073
+#: src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Fejl"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1102
 msgid "Chatty"
 msgstr "Vil gerne chatte"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1118
+#: src/status.c:158
 msgid "Extended Away"
 msgstr "Totalt frav脱rende"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1126
+#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7861
+#: src/protocols/sametime/sametime.c:3253
 msgid "Do Not Disturb"
 msgstr "Vil ikke forstyrres"
 
 #: src/protocols/jabber/buddy.c:1235
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "Det f淡lgende er resultaterne p奪 din s淡gning"
 
 #: src/protocols/jabber/buddy.c:1327
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+msgstr "Udfyld et eller flere felter for at s淡ge efter Jabber brugere."
+
+#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:701
+#: src/protocols/oscar/oscar.c:6004 src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:706
+#: src/protocols/oscar/oscar.c:6005
 msgid "Last Name"
 msgstr "Efternavn"
 
@@ -5843,31 +6326,26 @@
 msgstr "E-post adresse"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
 msgid "Search for Jabber users"
-msgstr "S淡g efter en ven udfra e-post adresse"
+msgstr "S淡g efter Jabber brugere"
 
 #: src/protocols/jabber/buddy.c:1370
-#, fuzzy
 msgid "Invalid Directory"
-msgstr "Ugyldig fejl"
+msgstr "Ugyldig mappe"
 
 #: src/protocols/jabber/buddy.c:1387
-#, fuzzy
 msgid "Enter a User Directory"
-msgstr "Kan ikke sende en mappe."
+msgstr ""
 
 #: src/protocols/jabber/buddy.c:1388
-#, fuzzy
 msgid "Select a user directory to search"
-msgstr "V脱lg en konference-server at sl奪 op"
+msgstr ""
 
 #: src/protocols/jabber/buddy.c:1391
-#, fuzzy
 msgid "Search Directory"
-msgstr "_S淡g efter:"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
+msgstr ""
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7350
 #: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "_Rum:"
@@ -5932,7 +6410,7 @@
 msgstr "�ndring af navn ikke underst淡ttet i ikke-MUC chatrum"
 
 #: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/silc/ops.c:1449
 #, fuzzy
 msgid "Error retrieving room list"
 msgstr "Fejl ved modtagelse af rumliste"
@@ -5957,420 +6435,420 @@
 msgid "Error initializing session"
 msgstr "Fejl ved initialisering af session"
 
-#: src/protocols/jabber/jabber.c:215
+#: src/protocols/jabber/jabber.c:236 src/protocols/jabber/jabber.c:251
 msgid "Write error"
 msgstr "Fejl ved skrivning"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:289 src/protocols/jabber/jabber.c:321
 msgid "Read Error"
 msgstr "L脱sefejl"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:828
 msgid "Unable to create socket"
 msgstr "Kunne ikke oprette sokkel"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:788
 msgid "Invalid Jabber ID"
 msgstr "Ugyldigt Jabber ID"
 
-#: src/protocols/jabber/jabber.c:473
+#: src/protocols/jabber/jabber.c:521
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registreringen af %s@%s lykkedes"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:523 src/protocols/jabber/jabber.c:524
 msgid "Registration Successful"
 msgstr "Registering lykkedes"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:530 src/protocols/jabber/jabber.c:1354
 msgid "Unknown Error"
 msgstr "Ukendt fejl"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:532 src/protocols/jabber/jabber.c:533
 msgid "Registration Failed"
 msgstr "Registrering fejlede"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:644 src/protocols/jabber/jabber.c:645
 msgid "Already Registered"
 msgstr "Allerede registreret"
 
-#: src/protocols/jabber/jabber.c:643
+#: src/protocols/jabber/jabber.c:691
 msgid "E-Mail"
 msgstr "E-post adresse"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: src/protocols/jabber/jabber.c:721 src/protocols/oscar/oscar.c:6049
+#: src/protocols/oscar/oscar.c:6057
 msgid "State"
 msgstr "Landsdel"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:731 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/silc.c:687 src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:693
+#: src/protocols/jabber/jabber.c:741
 msgid "Date"
 msgstr "Dato"
 
-#: src/protocols/jabber/jabber.c:701
+#: src/protocols/jabber/jabber.c:749
 msgid "Please fill out the information below to register your new account."
 msgstr "Udfyld oplysninger forneden for at registrere din nye konto."
 
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:752 src/protocols/jabber/jabber.c:753
 msgid "Register New Jabber Account"
 msgstr "Registr辿r ny Jabber konto"
 
-#: src/protocols/jabber/jabber.c:842
+#: src/protocols/jabber/jabber.c:897
 msgid "Initializing Stream"
 msgstr "Initialiserer str淡m"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:903 src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/protocols/jabber/jabber.c:857
+#: src/protocols/jabber/jabber.c:912
 msgid "Re-initializing Stream"
 msgstr "Initialiserer str淡m p奪 ny"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:1332
+#: src/protocols/jabber/jabber.c:1373 src/protocols/jabber/jabber.c:1406
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7647
 msgid "Not Authorized"
 msgstr "Ikke godkendt"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:1026
 msgid "Both"
 msgstr "Begge"
 
-#: src/protocols/jabber/jabber.c:973
+#: src/protocols/jabber/jabber.c:1028
 msgid "From (To pending)"
 msgstr "Fra (Til afventer)"
 
-#: src/protocols/jabber/jabber.c:975
+#: src/protocols/jabber/jabber.c:1030
 msgid "From"
 msgstr "Fra"
 
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:1033
 msgid "To"
 msgstr "Til"
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:1035
 msgid "None (To pending)"
 msgstr "Ingen (Til afventer)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "Ingen"
-
-#: src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:1039
 msgid "Subscription"
 msgstr "Abonnering"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
+#: src/protocols/jabber/jabber.c:1094 src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1110 src/protocols/jabber/jabber.c:1118
+#: src/protocols/jabber/jabber.c:1126
 #, fuzzy
 msgid "Priority"
 msgstr "Port"
 
-#: src/protocols/jabber/jabber.c:1093
+#: src/protocols/jabber/jabber.c:1148
 msgid "Password Changed"
 msgstr "Adgangskode 脱ndret"
 
-#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1149
 msgid "Your password has been changed."
 msgstr "Din adgangskode blev 脱ndret."
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: src/protocols/jabber/jabber.c:1153 src/protocols/jabber/jabber.c:1154
 msgid "Error changing password"
 msgstr "Fejl ved 脱ndring af adgangskode"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1210
 msgid "Password (again)"
 msgstr "Adgangskode (igen)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1215 src/protocols/jabber/jabber.c:1216
 msgid "Change Jabber Password"
 msgstr "Skift Jabber adgangskode"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1216
 msgid "Please enter your new password"
 msgstr "Indtast din nye adgangskode"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Ret brugeroplysninger"
+#: src/protocols/jabber/jabber.c:1226 src/protocols/oscar/oscar.c:8282
+#: src/protocols/silc/silc.c:1009
+msgid "Set User Info..."
+msgstr "Ret brugeroplysninger..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Skift adgangskode"
+#: src/protocols/jabber/jabber.c:1231 src/protocols/oscar/oscar.c:8293
+#: src/protocols/silc/silc.c:1005
+msgid "Change Password..."
+msgstr "Skift adgangskode..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
+#: src/protocols/jabber/jabber.c:1236
+#, fuzzy
+msgid "Search for Users..."
 msgstr "_S淡g efter:"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1312
 msgid "Bad Request"
 msgstr "Ugyldig anmodning"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1314
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1316
 msgid "Feature Not Implemented"
 msgstr "Funktion ikke implementeret"
 
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1318
 msgid "Forbidden"
 msgstr "N脱gtet"
 
-#: src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1320
 msgid "Gone"
 msgstr "V脱k"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: src/protocols/jabber/jabber.c:1322 src/protocols/jabber/jabber.c:1396
 msgid "Internal Server Error"
 msgstr "Intern server fejl"
 
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1324
 msgid "Item Not Found"
 msgstr "Punkt ikke fundet"
 
-#: src/protocols/jabber/jabber.c:1271
+#: src/protocols/jabber/jabber.c:1326
 msgid "Malformed Jabber ID"
 msgstr "Ugyldigt Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1328
 msgid "Not Acceptable"
 msgstr "Ikke acceptabel"
 
-#: src/protocols/jabber/jabber.c:1275
+#: src/protocols/jabber/jabber.c:1330
 msgid "Not Allowed"
 msgstr "Ikke tilladt"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1334
 msgid "Payment Required"
 msgstr "Betaling kr脱vet"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1336
 msgid "Recipient Unavailable"
 msgstr "Modtager ikke tilg脱ngelig"
 
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1340
 msgid "Registration Required"
 msgstr "Registrering kr脱vet"
 
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1342
 msgid "Remote Server Not Found"
 msgstr "Fjernserver ikke fundet"
 
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1344
 msgid "Remote Server Timeout"
 msgstr "Fjernserver overl淡b tidsgr脱nsen"
 
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1346
 msgid "Server Overloaded"
 msgstr "Server overbelastet"
 
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1348
 msgid "Service Unavailable"
 msgstr "Service ikke tilg脱ngelig"
 
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1350
 msgid "Subscription Required"
 msgstr "Abonement kr脱vet"
 
-#: src/protocols/jabber/jabber.c:1297
+#: src/protocols/jabber/jabber.c:1352
 msgid "Unexpected Request"
 msgstr "Uventet anmodning"
 
-#: src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1359
 msgid "Authorization Aborted"
 msgstr "Godkendelse afbrudt"
 
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1361
 msgid "Incorrect encoding in authorization"
 msgstr "Ugyldigt tegns脱t i godkendelse"
 
-#: src/protocols/jabber/jabber.c:1309
+#: src/protocols/jabber/jabber.c:1364
 msgid "Invalid authzid"
 msgstr "Ugyldigt authzid"
 
-#: src/protocols/jabber/jabber.c:1312
+#: src/protocols/jabber/jabber.c:1367
 msgid "Invalid Authorization Mechanism"
 msgstr "Ugyldig godkendelsesmekanisme"
 
-#: src/protocols/jabber/jabber.c:1315
+#: src/protocols/jabber/jabber.c:1370
 msgid "Authorization mechanism too weak"
 msgstr "Godkendelsesmekanisme for svag"
 
-#: src/protocols/jabber/jabber.c:1320
+#: src/protocols/jabber/jabber.c:1375
 msgid "Temporary Authentication Failure"
 msgstr "Midlertig godkendelsesfejl"
 
-#: src/protocols/jabber/jabber.c:1322
+#: src/protocols/jabber/jabber.c:1377
 msgid "Authentication Failure"
 msgstr "Godkendelsesfejl"
 
-#: src/protocols/jabber/jabber.c:1326
+#: src/protocols/jabber/jabber.c:1381
 msgid "Bad Format"
 msgstr "Ugyldigt format"
 
-#: src/protocols/jabber/jabber.c:1328
+#: src/protocols/jabber/jabber.c:1383
 msgid "Bad Namespace Prefix"
 msgstr "Ugyldigt navnerum-forans脱ttelse"
 
-#: src/protocols/jabber/jabber.c:1331
+#: src/protocols/jabber/jabber.c:1386
 msgid "Resource Conflict"
 msgstr "Ressurce konflikt"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: src/protocols/jabber/jabber.c:1388 src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Forbindelsen overskred tidsgr脱nsen"
 
-#: src/protocols/jabber/jabber.c:1335
+#: src/protocols/jabber/jabber.c:1390
 msgid "Host Gone"
 msgstr "V脱rt forsvundet"
 
-#: src/protocols/jabber/jabber.c:1337
+#: src/protocols/jabber/jabber.c:1392
 msgid "Host Unknown"
 msgstr "V脱rt ukendt"
 
-#: src/protocols/jabber/jabber.c:1339
+#: src/protocols/jabber/jabber.c:1394
 msgid "Improper Addressing"
 msgstr "Forkert addressering"
 
-#: src/protocols/jabber/jabber.c:1343
+#: src/protocols/jabber/jabber.c:1398
 msgid "Invalid ID"
 msgstr "Ugyldigt ID"
 
-#: src/protocols/jabber/jabber.c:1345
+#: src/protocols/jabber/jabber.c:1400
 msgid "Invalid Namespace"
 msgstr "Ugyldigt navnerum"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1402
 msgid "Invalid XML"
 msgstr "Ugyldigt XML"
 
-#: src/protocols/jabber/jabber.c:1349
+#: src/protocols/jabber/jabber.c:1404
 msgid "Non-matching Hosts"
 msgstr "Ikke-matchende v脱rter"
 
-#: src/protocols/jabber/jabber.c:1353
+#: src/protocols/jabber/jabber.c:1408
 msgid "Policy Violation"
 msgstr "Overtr脱delse af retningslinjer"
 
-#: src/protocols/jabber/jabber.c:1355
+#: src/protocols/jabber/jabber.c:1410
 msgid "Remote Connection Failed"
 msgstr "Fjernstyring fejlede"
 
-#: src/protocols/jabber/jabber.c:1357
+#: src/protocols/jabber/jabber.c:1412
 msgid "Resource Constraint"
 msgstr "Ressurcebegr脱nsning"
 
-#: src/protocols/jabber/jabber.c:1359
+#: src/protocols/jabber/jabber.c:1414
 msgid "Restricted XML"
 msgstr "Begr脱nset XML"
 
-#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:1416
 msgid "See Other Host"
 msgstr "See andre v脱rter"
 
-#: src/protocols/jabber/jabber.c:1363
+#: src/protocols/jabber/jabber.c:1418
 msgid "System Shutdown"
 msgstr "System-nedlukning"
 
-#: src/protocols/jabber/jabber.c:1365
+#: src/protocols/jabber/jabber.c:1420
 msgid "Undefined Condition"
 msgstr "Udefineret tilstand"
 
-#: src/protocols/jabber/jabber.c:1367
+#: src/protocols/jabber/jabber.c:1422
 msgid "Unsupported Encoding"
 msgstr "Ikke-underst淡ttet tegns脱t"
 
-#: src/protocols/jabber/jabber.c:1369
+#: src/protocols/jabber/jabber.c:1424
 msgid "Unsupported Stanza Type"
 msgstr "Ikke-underst淡ttet strofetype"
 
-#: src/protocols/jabber/jabber.c:1371
+#: src/protocols/jabber/jabber.c:1426
 msgid "Unsupported Version"
 msgstr "Ikke underst淡ttet version"
 
-#: src/protocols/jabber/jabber.c:1373
+#: src/protocols/jabber/jabber.c:1428
 msgid "XML Not Well Formed"
 msgstr "XML ikke vel-defineret"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1430
 msgid "Stream Error"
 msgstr "Str淡m fejl"
 
-#: src/protocols/jabber/jabber.c:1442
+#: src/protocols/jabber/jabber.c:1497
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ude af stand til at udvise bruger %s"
 
-#: src/protocols/jabber/jabber.c:1464
+#: src/protocols/jabber/jabber.c:1519
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ukendt kommando: %s"
 
-#: src/protocols/jabber/jabber.c:1469
+#: src/protocols/jabber/jabber.c:1524
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kunne ikke invitere bruger (%s)."
 
-#: src/protocols/jabber/jabber.c:1521
+#: src/protocols/jabber/jabber.c:1576
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ude af stand til at sparke bruge %s"
 
-#: src/protocols/jabber/jabber.c:1547
+#: src/protocols/jabber/jabber.c:1602
 msgid "config:  Configure a chat room."
 msgstr "config: S脱t et chatrum op."
 
-#: src/protocols/jabber/jabber.c:1551
+#: src/protocols/jabber/jabber.c:1606
 msgid "configure:  Configure a chat room."
 msgstr "configure: S脱t et chatrum op."
 
-#: src/protocols/jabber/jabber.c:1560
+#: src/protocols/jabber/jabber.c:1615
 msgid "part [room]:  Leave the room."
 msgstr "part [rum]: Forlad rummet."
 
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1620
 msgid "register:  Register with a chat room."
 msgstr "register: Registr辿r med et chatrum."
 
-#: src/protocols/jabber/jabber.c:1571
+#: src/protocols/jabber/jabber.c:1626
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nyt emne]: Vis eller skift emnet."
 
-#: src/protocols/jabber/jabber.c:1577
+#: src/protocols/jabber/jabber.c:1632
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;bruger&gt; [rum]: Udvis en bruger fra rummet."
 
-#: src/protocols/jabber/jabber.c:1583
+#: src/protocols/jabber/jabber.c:1638
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
-
-#: src/protocols/jabber/jabber.c:1589
+"affiliate &lt;bruger&gt; &lt;owner|admin|member|outcast|none&gt;: S脱t en brugers"
+"tilknytning til rummet."
+
+#: src/protocols/jabber/jabber.c:1644
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;bruger&gt; [besked]: Invit辿r en bruger til rummet."
 
-#: src/protocols/jabber/jabber.c:1595
+#: src/protocols/jabber/jabber.c:1650
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;rum&gt; [server]: Deltag i chatrum p奪 denne server."
 
-#: src/protocols/jabber/jabber.c:1601
+#: src/protocols/jabber/jabber.c:1656
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;bruger&gt; [rum]: Spark en bruger fra rummet."
 
-#: src/protocols/jabber/jabber.c:1606
+#: src/protocols/jabber/jabber.c:1661
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -6386,34 +6864,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: src/protocols/jabber/jabber.c:1744 src/protocols/jabber/jabber.c:1746
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber protokolmodul"
 
-#: src/protocols/jabber/jabber.c:1714
+#: src/protocols/jabber/jabber.c:1772
 msgid "Use TLS if available"
 msgstr "Brug TLS hvis tilg脱ngelig"
 
-#: src/protocols/jabber/jabber.c:1719
+#: src/protocols/jabber/jabber.c:1777
 msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1722
-#, fuzzy
+msgstr "Kr脱v TLS"
+
+#: src/protocols/jabber/jabber.c:1780
 msgid "Force old (port 5223) SSL"
-msgstr "Tving gammel SSL"
-
-#: src/protocols/jabber/jabber.c:1727
+msgstr "Tving gammel (port 5223) SSL"
+
+#: src/protocols/jabber/jabber.c:1785
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillad ren tekst godkendelse over ukrypterede str淡mme"
 
-#: src/protocols/jabber/jabber.c:1732
-#, fuzzy
+#: src/protocols/jabber/jabber.c:1790
 msgid "Connect port"
-msgstr "Tilslut"
+msgstr "Tilslutningsport"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: src/protocols/jabber/jabber.c:1794 src/protocols/silc/silc.c:1832
 msgid "Connect server"
 msgstr "Tilslut til server"
 
@@ -6450,32 +6926,32 @@
 msgid "XML Parse error"
 msgstr "XML l脱sningsfejl"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:305
 msgid "Unknown Error in presence"
 msgstr "Ukendt fejlkode i tilstedev脱relse"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: src/protocols/jabber/presence.c:310 src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Brugeren %s vil tilf淡je %s til sin venneliste."
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
+#: src/protocols/jabber/presence.c:319 src/protocols/msn/userlist.c:111
+#: src/protocols/oscar/oscar.c:4590 src/protocols/oscar/oscar.c:7280
+#: src/protocols/yahoo/yahoo.c:907
 msgid "Authorize"
 msgstr "Godkend"
 
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
+#: src/protocols/jabber/presence.c:320 src/protocols/msn/userlist.c:112
+#: src/protocols/oscar/oscar.c:4592 src/protocols/oscar/oscar.c:7281
+#: src/protocols/yahoo/yahoo.c:909
 msgid "Deny"
 msgstr "N脱gt"
 
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:376 src/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "Opret nyt rum"
 
-#: src/protocols/jabber/presence.c:347
+#: src/protocols/jabber/presence.c:378
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6483,20 +6959,20 @@
 "Du opretter et nyt rum. Vil du konfigurere det, eller bruge "
 "standardindstillingerne?"
 
-#: src/protocols/jabber/presence.c:349
+#: src/protocols/jabber/presence.c:380
 msgid "Configure Room"
 msgstr "Konfigur辿r rum"
 
-#: src/protocols/jabber/presence.c:351
+#: src/protocols/jabber/presence.c:382
 msgid "Accept Defaults"
 msgstr "Brug standardinstillinger"
 
-#: src/protocols/jabber/presence.c:388
+#: src/protocols/jabber/presence.c:419
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fejl i chat %s"
 
-#: src/protocols/jabber/presence.c:391
+#: src/protocols/jabber/presence.c:422
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fejl ved deltagelse i chat %s"
@@ -6512,12 +6988,12 @@
 msgid "File Send Failed"
 msgstr "Afsendelse af fil fejlede"
 
-#: src/protocols/msn/dialog.c:91
+#: src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problemer med synkronisering af venneliste i %s (%s)"
 
-#: src/protocols/msn/dialog.c:97
+#: src/protocols/msn/dialog.c:98
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6526,7 +7002,7 @@
 "%s p奪 den lokale liste er i gruppen \"%s\" men ikke p奪 serverlisten. Vil du "
 "have denne ven tilf淡jet?"
 
-#: src/protocols/msn/dialog.c:105
+#: src/protocols/msn/dialog.c:106
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6612,7 +7088,8 @@
 msgstr "Kan ikke fjerne gruppe nul"
 
 #: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
+#, fuzzy
+msgid "Tried to add a user 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:99
@@ -6631,7 +7108,7 @@
 msgid "Too many hits to a FND"
 msgstr "For mange hits til en FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:205
 msgid "Not logged in"
 msgstr "Ikke logget ind"
 
@@ -6724,8 +7201,8 @@
 msgid "Server too busy"
 msgstr "Server for travlt"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2751
+#: src/protocols/silc/ops.c:1717 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Godkendelse fejlede"
 
@@ -6761,7 +7238,7 @@
 
 #: src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
-msgstr ""
+msgstr "Du har sendt et blink!"
 
 #: src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
@@ -6809,7 +7286,7 @@
 
 #: src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
-msgstr ""
+msgstr "Denne Hotmail konto er m奪ske ikke aktiv."
 
 #: src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
@@ -6819,9 +7296,9 @@
 msgid "Page"
 msgstr "Kald p奪 bipper"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/msn/msn.c:552 src/protocols/msn/msn.c:559
+#: src/protocols/msn/msn.c:562 src/protocols/yahoo/yahoo.c:2809
+#: src/protocols/yahoo/yahoo.c:2815
 #, c-format
 msgid ""
 "\n"
@@ -6830,67 +7307,67 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:559
 msgid "Has you"
 msgstr "Har dig"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2640 src/protocols/yahoo/yahoo.c:3217
 msgid "Be Right Back"
 msgstr "Straks tilbage"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+#: src/protocols/msn/msn.c:597 src/protocols/yahoo/yahoo.c:2650
+#: src/protocols/yahoo/yahoo.c:3232
+msgid "On the Phone"
 msgstr "Snakker i telefon"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
+#: src/protocols/msn/msn.c:601 src/protocols/yahoo/yahoo.c:2654
+#: src/protocols/yahoo/yahoo.c:3238
+msgid "Out to Lunch"
 msgstr "Ude til frokost"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
+#: src/protocols/msn/msn.c:605 src/protocols/zephyr/zephyr.c:2256
+#: src/status.c:156
 msgid "Hidden"
 msgstr "Skjult"
 
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "S脱t synligt navn"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "S脱t hjemmetelefon nummer"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "S脱t arbejdstelefon nummer"
+#: src/protocols/msn/msn.c:621
+msgid "Set Friendly Name..."
+msgstr "S脱t synligt navn..."
 
 #: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "S脱t mobiltelefon nummer"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "Aktiv辿r/Deaktiv辿r mobiltelefoner"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "Tillad/N脱gt mobiltelefon sider"
-
-#: src/protocols/msn/msn.c:647
+msgid "Set Home Phone Number..."
+msgstr "S脱t hjemmetelefon nummer..."
+
+#: src/protocols/msn/msn.c:630
+msgid "Set Work Phone Number..."
+msgstr "S脱t arbejdstelefon nummer..."
+
+#: src/protocols/msn/msn.c:634
+msgid "Set Mobile Phone Number..."
+msgstr "S脱t mobiltelefon nummer..."
+
+#: src/protocols/msn/msn.c:640
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Aktiv辿r/Deaktiv辿r mobiltelefoner..."
+
+#: src/protocols/msn/msn.c:645
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Tillad/N脱gt mobiltelefon sider..."
+
+#: src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: src/protocols/msn/msn.c:671
+msgstr "�bn Hotmail indbakke"
+
+#: src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "Send til mobiltelefon"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: src/protocols/msn/msn.c:688 src/protocols/novell/novell.c:3444
 msgid "Initiate _Chat"
 msgstr "�bn _chat"
 
-#: src/protocols/msn/msn.c:717
+#: src/protocols/msn/msn.c:725
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6898,89 +7375,84 @@
 "SSL-underst淡ttelse skal bruges til MSN. Install辿r et underst淡ttet SSL "
 "bibliotek. Se http://gaim.sf.net/faq-ssl.php for flere oplysninger."
 
-#: src/protocols/msn/msn.c:745
+#: src/protocols/msn/msn.c:753
 msgid "Failed to connect to server."
 msgstr "Kunne ikke forbinde til server."
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1361 src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: src/protocols/msn/msn.c:1368 src/protocols/msn/msn.c:1714
+#: src/protocols/yahoo/yahoo_profile.c:1171 src/util.c:800
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1471
+#: src/protocols/msn/msn.c:1445
 msgid "MSN Profile"
 msgstr "MSN profil"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: src/protocols/msn/msn.c:1450 src/protocols/msn/msn.c:1701
+#: src/protocols/yahoo/yahoo_profile.c:764
 msgid "Error retrieving profile"
 msgstr "Fejl ved modtagelse af profil"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1520 src/protocols/oscar/oscar.c:6034
+#: src/protocols/yahoo/yahoo_profile.c:1019
 msgid "Age"
 msgstr "Alder"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "K淡n"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1536 src/protocols/yahoo/yahoo_profile.c:1024
 msgid "Marital Status"
 msgstr "�gteskabelig stilling"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1543 src/protocols/novell/novell.c:1480
+#: src/protocols/yahoo/yahoo_profile.c:1014
 msgid "Location"
 msgstr "Beliggenhed"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1551 src/protocols/yahoo/yahoo_profile.c:1034
 msgid "Occupation"
 msgstr "Besk脱ftigelse"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1568 src/protocols/msn/msn.c:1574
+#: src/protocols/msn/msn.c:1581 src/protocols/msn/msn.c:1589
+#: src/protocols/msn/msn.c:1596
 msgid "A Little About Me"
 msgstr "Lidt om mig"
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1605 src/protocols/msn/msn.c:1611
+#: src/protocols/msn/msn.c:1618 src/protocols/msn/msn.c:1625
 msgid "Favorite Things"
 msgstr "Yndlings ting"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: src/protocols/msn/msn.c:1634 src/protocols/msn/msn.c:1640
+#: src/protocols/msn/msn.c:1647
 msgid "Hobbies and Interests"
 msgstr "Hobbyer og interesser"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: src/protocols/msn/msn.c:1656 src/protocols/msn/msn.c:1662
+#: src/protocols/yahoo/yahoo_profile.c:1076
 msgid "Favorite Quote"
 msgstr "Yndlings citat"
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1670
 msgid "Last Updated"
 msgstr "Sidst opdateret"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1681 src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: src/protocols/msn/msn.c:1729
+#: src/protocols/msn/msn.c:1703
 msgid "The user has not created a public profile."
 msgstr "Brugeren har ikke oprettet en offentlig profil."
 
-#: src/protocols/msn/msn.c:1730
+#: src/protocols/msn/msn.c:1704
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6990,7 +7462,7 @@
 "betyder enten at brugeren ikke eksisterer, eller at brugeren ikke har "
 "oprettet en offentlig profil."
 
-#: src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1708
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6998,7 +7470,7 @@
 "Gaim kunne ikke finde nogle oplysninger i brugerens profil. Brugeren "
 "eksisterer h淡jst sandsynligt ikke."
 
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: src/protocols/msn/msn.c:1714 src/protocols/yahoo/yahoo_profile.c:1171
 msgid "Profile URL"
 msgstr "Profil URL"
 
@@ -7012,21 +7484,21 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: src/protocols/msn/msn.c:1917 src/protocols/msn/msn.c:1919
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolmodul"
 
-#: src/protocols/msn/msn.c:1963
+#: src/protocols/msn/msn.c:1938
 msgid "Login server"
 msgstr "Indlogningsserver"
 
-#: src/protocols/msn/msn.c:1972
+#: src/protocols/msn/msn.c:1947
 msgid "Use HTTP Method"
 msgstr "Brug HTTP-metode"
 
-#: src/protocols/msn/msn.c:1980
-#, fuzzy
-msgid "nudge: nudge a contact to get their attention"
+#: src/protocols/msn/msn.c:1955
+#, fuzzy
+msgid "nudge: nudge a user to get their attention"
 msgstr "buzz: Buzz en kontakt for at f奪 deres opm脱rksomhed"
 
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
@@ -7039,8 +7511,8 @@
 msgid "%s is not a valid group."
 msgstr "%s er ikke en gyldig gruppe."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:532
+#: src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "Ukendt fejl."
 
@@ -7074,15 +7546,20 @@
 msgid "%s is not a valid passport account."
 msgstr "%s er ikke en gyldig passport konto."
 
-#: src/protocols/msn/notification.c:815
+#: src/protocols/msn/notification.c:528
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Service midlertidigt utilg脱ngelig"
+
+#: src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "Kunne ikke omd淡be gruppe"
 
-#: src/protocols/msn/notification.c:870
+#: src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "Kunne ikke slette gruppe"
 
-#: src/protocols/msn/notification.c:1303
+#: src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7119,76 +7596,76 @@
 msgid "Reading error"
 msgstr "L脱sningsfejl"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:326
+#: src/protocols/oscar/oscar.c:4913
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+#: src/protocols/msn/servconn.c:138
+#, fuzzy, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
 "Forbindelsesfejl fra %s server (%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "Vores protokol underst淡ttes ikke af denne server."
 
-#: src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "Fejl ved fortolkning af HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: src/protocols/msn/session.c:312 src/protocols/napster/napster.c:456
+#: src/protocols/oscar/oscar.c:5667 src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Du er logget ind fra en anden maskine."
 
-#: src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN serverne er midlertidigt utilg脱ngelige. Vent og fors淡g igen senere."
 
-#: src/protocols/msn/session.c:333
+#: src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN serverne lukkes midlertidigt."
 
-#: src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kunne ikke godkende: %s"
 
-#: src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:329
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Din MSN venneliste er midlertidigt utilg脱ngelig. Vent og f淡rs淡g igen senere."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:350 src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "Forhandler"
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "Overf淡rer"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "Starter godkendelse"
 
-#: src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "Henter cookie"
 
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "Sender cookie"
 
-#: src/protocols/msn/session.c:370
+#: src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "Modtager venneliste"
 
@@ -7196,115 +7673,117 @@
 msgid "Away From Computer"
 msgstr "V脱k fra computeren"
 
-#: src/protocols/msn/switchboard.c:403
+#: src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Snakker i telefon"
+
+#: src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Ude til frokost"
+
+#: src/protocols/msn/switchboard.c:405
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "Besked er m奪ske ikke blevet sendt p奪 grund af et tidsudl淡b der overskred "
 "gr脱nsen:"
 
-#: src/protocols/msn/switchboard.c:411
+#: src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Besked kunne ikke sendes, ikke tilladt imens du er usynlig:"
 
-#: src/protocols/msn/switchboard.c:415
+#: src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because the user is offline:"
 msgstr "Besked kunne ikke sendes, fordi brugeren er offline:"
 
-#: src/protocols/msn/switchboard.c:419
+#: src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Besked kunne ikke sendes p奪 grund af en forbindelsesfejl:"
 
-#: src/protocols/msn/switchboard.c:423
+#: src/protocols/msn/switchboard.c:425
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Besked kunne ikke sendes p奪 grund af en fejl med switchboard:"
 
-#: src/protocols/msn/switchboard.c:431
+#: src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Besked kunne ikke sendes p奪 grund af en ukendt 奪rsag:"
 
-#: src/protocols/msn/switchboard.c:952
+#: src/protocols/msn/switchboard.c:954
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vil sende dig en fil"
 
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/userlist.c:96
 #, c-format
 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/userlist.c:275
+#: src/protocols/msn/userlist.c:286
 #, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
+msgid "%s has added you to his or her buddy list."
 msgstr "Brugeren %s vil tilf淡je %s til sin venneliste."
 
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:659
+#: src/protocols/msn/userlist.c:350
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Brugeren %s vil tilf淡je %s til sin venneliste."
+
+#: src/protocols/msn/userlist.c:670
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kunne ikke tilf淡je \"%s\"."
 
-#: src/protocols/msn/userlist.c:661
+#: src/protocols/msn/userlist.c:672
 msgid "The screen name specified is invalid."
 msgstr "Brugernavnet du angav er ugyldigt."
 
-#: src/protocols/napster/napster.c:260
+#: src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "Kunne ikke hente hoved fra server"
 
-#: src/protocols/napster/napster.c:274
+#: src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "Kunne ikke l脱se besked fra server: %s. Kommando er %hd, l脱ngde er %hd."
 
-#: src/protocols/napster/napster.c:290
+#: src/protocols/napster/napster.c:296
 #, fuzzy
 msgid "Unknown server error."
 msgstr "Ukendt fejl."
 
-#: src/protocols/napster/napster.c:339
+#: src/protocols/napster/napster.c:345
 #, 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:350
+#: src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Kunne ikke tilf淡je \"%s\" til din Napster hotlist"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "Din forbindelse til serveren blev afbrudt."
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s anmodede om dine oplysninger"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s anmodede om PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
+#: src/protocols/napster/napster.c:507 src/protocols/napster/napster.c:538
+#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2224
+#: src/protocols/yahoo/yahoo.c:2251 src/protocols/yahoo/yahoo.c:2314
 #: src/protocols/yahoo/yahoo_filexfer.c:69
 #: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
 msgid "Unable to connect."
 msgstr "Kunne ikke f奪 kontakt."
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:596 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -7318,7 +7797,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: src/protocols/napster/napster.c:694 src/protocols/napster/napster.c:696
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER protokolmodul"
 
@@ -7450,43 +7929,43 @@
 msgid "Unknown error: 0x%X"
 msgstr "Ukendt fejl: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Logind slog fejl (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Kunne ikke sende besked. Kunne ikke hente detaljer for bruger (%s)."
 
-#: src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Kunne ikke tilf淡je %s til din venneliste (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kunne ikke sende besked. (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:493 src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kunne ikke invitere bruger (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Kunne ikke sende besked til %s. Kunne ikke oprette konferencen (%s)."
 
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Kunne ikke sende besked. Kunne ikke oprette konferencen (%s)."
 
-#: src/protocols/novell/novell.c:569
+#: src/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7495,7 +7974,7 @@
 "Kunne ikke flytte bruger %s til mappe %s i serverlisten. Fejl skete, da "
 "mappe skulle oprettes (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: src/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7504,67 +7983,67 @@
 "Kunne ikke tilf淡je %s til din venneliste. Fejl ved opretning af mappe i "
 "serverliste (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kunne ikke hente detaljer for bruger %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:751 src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Kunne ikke tilf淡je brugeren til privatlivslisten (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Kunne ikke tilf淡je %s til blokeringslisten (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Kunne ikke tilf淡je %s til tilladelseslisten (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kunne ikke fjerne %s fra privatlivslisten (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:942 src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Kunne ikke 脱ndre privatlivsindstillingerne p奪 serveren (%s)."
 
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Kunne ikke oprette konference (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1123 src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "Fejl under kommunikation med server. Lukker forbindelse."
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Telefon nummer"
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Afdeling"
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Personlig titel"
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Poststop"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/novell/novell.c:1490 src/protocols/oscar/oscar.c:6007
+#: src/protocols/oscar/oscar.c:6014
 msgid "Email Address"
 msgstr "E-post adresse"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "Bruger ID"
 
@@ -7575,46 +8054,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "Fuldt navn"
 
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise konference %d"
 
-#: src/protocols/novell/novell.c:1643
+#: src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "Kunne ikke skabe SSL-forbindelse til server."
 
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "Fejl ved behandling af handling eller svar (%s)."
-
-#: src/protocols/novell/novell.c:1707
+#: src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/protocols/novell/novell.c:1719
+#: src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "Kunne ikke kontakte server."
 
-#: src/protocols/novell/novell.c:1722
+#: src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "Venter p奪 svar..."
 
-#: src/protocols/novell/novell.c:1857
+#: src/protocols/novell/novell.c:1876
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s er blevet inviteret til denne samtale."
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "Invitation til samtale"
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7625,15 +8099,15 @@
 "\n"
 "Sendt: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "Vil du deltage i samtalen?"
 
-#: src/protocols/novell/novell.c:1995
+#: src/protocols/novell/novell.c:2014
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Du er blevet logget af, fordi du er logget p奪 en anden maskine."
 
-#: src/protocols/novell/novell.c:2051
+#: src/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7644,7 +8118,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: src/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7652,16 +8126,15 @@
 "Kunne ikke forbinde til server. Indtast adressen p奪 serveren du vil forbinde "
 "til."
 
-#: src/protocols/novell/novell.c:2171
+#: src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "Fejl. SSL-underst淡ttelse er ikke installeret."
 
-#: src/protocols/novell/novell.c:2475
+#: src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Konferencen er blevet lukket. Der kan ikke sendes flere beskeder."
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
+#: src/protocols/novell/novell.c:2996 src/protocols/yahoo/yahoo.c:2861
 msgid "Appear Offline"
 msgstr "Virk offline"
 
@@ -7675,111 +8148,111 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: src/protocols/novell/novell.c:3543 src/protocols/novell/novell.c:3545
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger protokolmodul"
 
-#: src/protocols/novell/novell.c:3561
+#: src/protocols/novell/novell.c:3564
 msgid "Server address"
 msgstr "Serveradresse"
 
-#: src/protocols/novell/novell.c:3565
+#: src/protocols/novell/novell.c:3568
 msgid "Server port"
 msgstr "Server port"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:201
 msgid "Invalid error"
 msgstr "Ugyldig fejl"
 
+#: src/protocols/oscar/oscar.c:202
+msgid "Invalid SNAC"
+msgstr "Ugyldig SNAC"
+
 #: src/protocols/oscar/oscar.c:203
-msgid "Invalid SNAC"
-msgstr "Ugyldig SNAC"
-
-#: src/protocols/oscar/oscar.c:204
 msgid "Rate to host"
 msgstr "Gr脱nse til v脱rt"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:204
 msgid "Rate to client"
 msgstr "Gr脱nse til klient"
 
+#: src/protocols/oscar/oscar.c:206
+msgid "Service unavailable"
+msgstr "Service ikke tilg脱ngelig"
+
 #: src/protocols/oscar/oscar.c:207
-msgid "Service unavailable"
-msgstr "Service ikke tilg脱ngelig"
+msgid "Service not defined"
+msgstr "Tjeneste ikke defineret"
 
 #: src/protocols/oscar/oscar.c:208
-msgid "Service not defined"
-msgstr "Tjeneste ikke defineret"
+msgid "Obsolete SNAC"
+msgstr "For脱ldet SNAC"
 
 #: src/protocols/oscar/oscar.c:209
-msgid "Obsolete SNAC"
-msgstr "For脱ldet SNAC"
-
-#: src/protocols/oscar/oscar.c:210
 msgid "Not supported by host"
 msgstr "Ikke underst淡ttet af v脱rt"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:210
 msgid "Not supported by client"
 msgstr "Ikke underst淡ttet af klient"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:211
 msgid "Refused by client"
 msgstr "N脱gtet af klient"
 
+#: src/protocols/oscar/oscar.c:212
+msgid "Reply too big"
+msgstr "Svar for stort"
+
 #: src/protocols/oscar/oscar.c:213
-msgid "Reply too big"
-msgstr "Svar for stort"
+msgid "Responses lost"
+msgstr "Svar tabt"
 
 #: src/protocols/oscar/oscar.c:214
-msgid "Responses lost"
-msgstr "Svar tabt"
+msgid "Request denied"
+msgstr "Anmodning n脱gtet"
 
 #: src/protocols/oscar/oscar.c:215
-msgid "Request denied"
-msgstr "Anmodning n脱gtet"
+msgid "Busted SNAC payload"
+msgstr "�delagt SNAC payload"
 
 #: src/protocols/oscar/oscar.c:216
-msgid "Busted SNAC payload"
-msgstr "�delagt SNAC payload"
-
-#: src/protocols/oscar/oscar.c:217
 msgid "Insufficient rights"
 msgstr "Ikke nok rettigheder"
 
-#: src/protocols/oscar/oscar.c:218
+#: src/protocols/oscar/oscar.c:217
 msgid "In local permit/deny"
 msgstr "I den lokale tillad/n脱gt"
 
-#: src/protocols/oscar/oscar.c:219
+#: src/protocols/oscar/oscar.c:218
 msgid "Too evil (sender)"
 msgstr "For ond (afsender)"
 
-#: src/protocols/oscar/oscar.c:220
+#: src/protocols/oscar/oscar.c:219
 msgid "Too evil (receiver)"
 msgstr "For ond (modtager)"
 
+#: src/protocols/oscar/oscar.c:220
+msgid "User temporarily unavailable"
+msgstr "Bruger midlertidigt utilg脱ngelig"
+
 #: src/protocols/oscar/oscar.c:221
-msgid "User temporarily unavailable"
-msgstr "Bruger midlertidigt utilg脱ngelig"
+msgid "No match"
+msgstr "Ingen fundne"
 
 #: src/protocols/oscar/oscar.c:222
-msgid "No match"
-msgstr "Ingen fundne"
+msgid "List overflow"
+msgstr "Liste overl淡b"
 
 #: src/protocols/oscar/oscar.c:223
-msgid "List overflow"
-msgstr "Liste overl淡b"
-
-#: src/protocols/oscar/oscar.c:224
 msgid "Request ambiguous"
 msgstr "Anmodning flertydig"
 
-#: src/protocols/oscar/oscar.c:225
+#: src/protocols/oscar/oscar.c:224
 msgid "Queue full"
 msgstr "K淡 fuld"
 
-#: src/protocols/oscar/oscar.c:226
+#: src/protocols/oscar/oscar.c:225
 msgid "Not while on AOL"
 msgstr "Ikke samtidig med AOL"
 
@@ -7799,12 +8272,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM direkte besked"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:683
+#: src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7968
 msgid "Get File"
 msgstr "Modtag fil"
 
@@ -7876,15 +8349,15 @@
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7851
 msgid "Free For Chat"
 msgstr "Fri til chat"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7866
 msgid "Not Available"
 msgstr "Ikke tilg脱ngelig"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7856
 msgid "Occupied"
 msgstr "Optaget"
 
@@ -7892,57 +8365,57 @@
 msgid "Web Aware"
 msgstr "Web-opm脱rksom"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:713
+msgid "Online"
+msgstr "Logget ind"
+
+#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5038
 msgid "Warning Level"
 msgstr "Advarselsniveau"
 
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "Klient underst淡tter"
-
-#: src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Vennekommentar"
 
-#: src/protocols/oscar/oscar.c:958
+#: src/protocols/oscar/oscar.c:946
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte forbindelse til %s lukket"
 
-#: src/protocols/oscar/oscar.c:960
+#: src/protocols/oscar/oscar.c:948
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte forbindelse til %s fejlede"
 
-#: src/protocols/oscar/oscar.c:968
+#: src/protocols/oscar/oscar.c:956
 msgid "Direct Connect failed"
 msgstr "Direkte forbindelse fejlede"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:1033 src/protocols/oscar/oscar.c:1164
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte forbindelse til %s oprettet"
 
-#: src/protocols/oscar/oscar.c:1126
+#: src/protocols/oscar/oscar.c:1114
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Pr淡ver at forbinde til %s p奪 %s:%hu for direkte forbindelse."
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1535
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Beder %s om at forbinde til os p奪 %s:%hu for direkte forbindelse."
 
-#: src/protocols/oscar/oscar.c:1552
+#: src/protocols/oscar/oscar.c:1540
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke oprette direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1575
 #, 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:1591
+#: src/protocols/oscar/oscar.c:1579
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7950,24 +8423,25 @@
 "Fordi dette afsl淡rer din IP-adresse, ses det som en privatlivs-risiko. Vil "
 "du forts脱tte?"
 
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
+#: src/protocols/oscar/oscar.c:1583 src/protocols/oscar/oscar.c:4349
+#: src/protocols/sametime/sametime.c:3547
 msgid "Connect"
 msgstr "Tilslut"
 
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1649
 #, fuzzy, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Forbindelse til chat-rum %s afbrudt."
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1672
 msgid "Chat is currently unavailable"
 msgstr "Chat er ikke tilg脱ngelig nu"
 
-#: src/protocols/oscar/oscar.c:1754
+#: src/protocols/oscar/oscar.c:1742
 msgid "Screen name sent"
 msgstr "Brugernavn sendt"
 
-#: src/protocols/oscar/oscar.c:1770
+#: src/protocols/oscar/oscar.c:1758
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7978,31 +8452,30 @@
 "ugyldigt. Brugernavne skal enten starte med et bogstav og indeholde kun "
 "bogstaver, tal eller mellemrum, eller kun indeholde tal."
 
-#: src/protocols/oscar/oscar.c:1799
+#: src/protocols/oscar/oscar.c:1787
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge p奪 AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:1891 src/protocols/oscar/oscar.c:2842
 msgid "Could Not Connect"
 msgstr "Forbindelse fejlede"
 
-#: src/protocols/oscar/oscar.c:1911
+#: src/protocols/oscar/oscar.c:1899
 msgid "Connection established, cookie sent"
 msgstr "Forbindelse oprettet, cookie sendt"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2051
 msgid "Attempting connection redirect..."
-msgstr "Pr淡ver at forbinde til %s p奪 %s:%hu for direkte forbindelse."
+msgstr ""
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
 #. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#: src/protocols/oscar/oscar.c:2096
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
@@ -8010,41 +8483,41 @@
 "ICQ."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+#: src/protocols/oscar/oscar.c:2194 src/protocols/yahoo/yahoo_filexfer.c:174
 #: src/protocols/yahoo/yahoo_filexfer.c:183
 #: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Kunne ikke etablere fildeskriptor."
 
-#: src/protocols/oscar/oscar.c:2211
+#: src/protocols/oscar/oscar.c:2199
 msgid "Unable to create new connection."
 msgstr "Ikke ikke etablere ny forbindelse."
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
+#: src/protocols/oscar/oscar.c:2433 src/protocols/oscar/oscar.c:2442
+#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2466
 #, fuzzy
 msgid "Unable to log into file transfer proxy."
 msgstr "Kunne ikke skrive til filen %s."
 
-#: src/protocols/oscar/oscar.c:2532
+#: src/protocols/oscar/oscar.c:2520
 #, fuzzy
 msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "Kan ikke etablere lytte sokkel."
 
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2728 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Forkert navn eller adgangskode."
 
-#: src/protocols/oscar/oscar.c:2738
+#: src/protocols/oscar/oscar.c:2733
 msgid "Your account is currently suspended."
 msgstr "Din konto er ikke aktiv for 淡jeblikket."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: src/protocols/oscar/oscar.c:2737
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger tjenesten er midlertidigt utilg脱ngelig."
 
-#: src/protocols/oscar/oscar.c:2747
+#: src/protocols/oscar/oscar.c:2742
 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."
@@ -8052,33 +8525,33 @@
 "Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
 "minutter og pr淡v s奪 igen, for ellers skal du bare vente endnu l脱ngere."
 
-#: src/protocols/oscar/oscar.c:2752
+#: src/protocols/oscar/oscar.c:2747
 #, 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:2783
+#: src/protocols/oscar/oscar.c:2778
 msgid "Internal Error"
 msgstr "Intern fejl"
 
-#: src/protocols/oscar/oscar.c:2853
+#: src/protocols/oscar/oscar.c:2849
 msgid "Received authorization"
 msgstr "Modtog godkendelse"
 
-#: src/protocols/oscar/oscar.c:2877
+#: src/protocols/oscar/oscar.c:2873
 msgid "The SecurID key entered is invalid."
 msgstr "SecurID-n淡glen du indtastede er ugyldig."
 
-#: src/protocols/oscar/oscar.c:2891
+#: src/protocols/oscar/oscar.c:2887
 msgid "Enter SecurID"
 msgstr "Indtast SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: src/protocols/oscar/oscar.c:2888
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Indtast det 6-cifrede tal fra det digitale display."
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:2928 src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:3047
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8087,24 +8560,24 @@
 "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:2935 src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:2961
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim var ikke i stand til at f奪 gyldig AIM logind-data."
 
-#: src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3050
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim var ikke i stand til at f奪 gyldig logind-data."
 
-#: src/protocols/oscar/oscar.c:3085
+#: src/protocols/oscar/oscar.c:3071
 msgid "Password sent"
 msgstr "Adgangskode sendt"
 
-#: src/protocols/oscar/oscar.c:4352
+#: src/protocols/oscar/oscar.c:4340
 #, 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:4355
+#: src/protocols/oscar/oscar.c:4343
 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 "
@@ -8114,19 +8587,19 @@
 "for billeder. Fordi din IP-adresse vil blive afsl淡ret, kan det anses som en "
 "privatlivs risiko."
 
-#: src/protocols/oscar/oscar.c:4394
+#: src/protocols/oscar/oscar.c:4382
 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:4402
+#: src/protocols/oscar/oscar.c:4390
 msgid "Authorization Request Message:"
 msgstr "Besked til anmodning om godkendelse:"
 
-#: src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:4391
 msgid "Please authorize me!"
 msgstr "Venligst godkend mig!"
 
-#: src/protocols/oscar/oscar.c:4433
+#: src/protocols/oscar/oscar.c:4421
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8135,21 +8608,21 @@
 "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:4438 src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:4426 src/protocols/oscar/oscar.c:4428
 msgid "Request Authorization"
 msgstr "Anmod om godkendelse"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4576 src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:7266 src/protocols/oscar/oscar.c:7318
 msgid "No reason given."
 msgstr "Ingen grund givet."
 
-#: src/protocols/oscar/oscar.c:4483
+#: src/protocols/oscar/oscar.c:4471
 msgid "Authorization Denied Message:"
 msgstr "Besked for n脱gtelse af godkendelses anmodning:"
 
-#: src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:4578
 #, fuzzy, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8158,11 +8631,11 @@
 "Brugeren %u vil tilf淡je dig til sin venneliste af f淡lgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:7278
 msgid "Authorization Request"
 msgstr "Godkendelse anmodning"
 
-#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8173,17 +8646,17 @@
 "af den f淡lgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:4601
 msgid "ICQ authorization denied."
 msgstr "ICQ godkendelse n脱gtet."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: src/protocols/oscar/oscar.c:4608
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Brugeren %u har givet dig lov til at tilf淡je sig til din venneliste."
 
-#: src/protocols/oscar/oscar.c:4628
+#: src/protocols/oscar/oscar.c:4616
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8196,7 +8669,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: src/protocols/oscar/oscar.c:4624
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8209,7 +8682,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4632
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8222,34 +8695,34 @@
 "Beskeden er:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: src/protocols/oscar/oscar.c:4653
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ bruger %u har sendt dig en ven: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4671
+#: src/protocols/oscar/oscar.c:4659
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vil du tilf淡je denne ven til din venneliste?"
 
-#: src/protocols/oscar/oscar.c:4675
+#: src/protocols/oscar/oscar.c:4663
 msgid "Decline"
 msgstr "N脱gt"
 
-#: src/protocols/oscar/oscar.c:4759
+#: src/protocols/oscar/oscar.c:4747
 #, 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:4768
+#: src/protocols/oscar/oscar.c:4756
 #, 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:4777
+#: src/protocols/oscar/oscar.c:4765
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8260,7 +8733,7 @@
 msgstr[1] ""
 "Du har ikke modtaget %hu beskeder fra %s, fordi de blev sendt for hurtigt."
 
-#: src/protocols/oscar/oscar.c:4786
+#: src/protocols/oscar/oscar.c:4774
 #, 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."
@@ -8268,70 +8741,74 @@
 msgstr[1] ""
 "Du har ikke modtaget %hu beskeder fra %s, fordi han/hun var for ond."
 
-#: src/protocols/oscar/oscar.c:4795
+#: src/protocols/oscar/oscar.c:4783
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Du har ikke modtaget %hu besked fra %s, fordi du er for ond."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s, fordi du er for ond."
 
-#: src/protocols/oscar/oscar.c:4804
+#: src/protocols/oscar/oscar.c:4792
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du har ikke modtaget %hu besked fra %s pga. en ukendt 奪rsag."
 msgstr[1] "Du har ikke modtaget %hu beskeder fra %s pga. en ukendt 奪rsag."
 
-#: src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4851
 #, 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:4924
+#: src/protocols/oscar/oscar.c:4912
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fejlen: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: src/protocols/oscar/oscar.c:4949
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kunne ikke sende besked: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:4949 src/protocols/oscar/oscar.c:4954
+#: src/protocols/oscar/oscar.c:5012 src/protocols/oscar/oscar.c:5016
 msgid "Unknown reason."
 msgstr "Ukendt fejl."
 
-#: src/protocols/oscar/oscar.c:4964
+#: src/protocols/oscar/oscar.c:4952 src/protocols/sametime/sametime.c:2303
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kunne ikke sende besked til %s:"
 
-#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5012
 #, c-format
 msgid "User information not available: %s"
 msgstr "Bruger oplysninger er ikke tilg脱ngelige: %s"
 
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Bruger oplysninger for %s er ikke tilg脱ngelige:"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5042
 msgid "Online Since"
 msgstr "Online siden"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:5047 src/protocols/yahoo/yahoo_profile.c:1122
 msgid "Member Since"
 msgstr "Medlem siden"
 
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/oscar/oscar.c:5052
+msgid "Capabilities"
+msgstr "Klient underst淡tter"
+
+#: src/protocols/oscar/oscar.c:5180
 msgid "Your AIM connection may be lost."
 msgstr "Din AIM forbindelse kan v脱re afbrudt."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
+#: src/protocols/oscar/oscar.c:5366
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8339,11 +8816,11 @@
 "[Ude af stand til at vise en besked fra denne bruger, fordi den indeholdte "
 "ugyldige bogstaver.]"
 
-#: src/protocols/oscar/oscar.c:5554
+#: src/protocols/oscar/oscar.c:5592
 msgid "Rate limiting error."
 msgstr "Gr脱nsefejl."
 
-#: src/protocols/oscar/oscar.c:5555
+#: src/protocols/oscar/oscar.c:5593
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8351,105 +8828,94 @@
 "Den sidste handling blev ikke udf淡rt, fordi du har overskredet gr脱nsen. Vent "
 "i 10 sekunder og pr淡v igen."
 
-#: src/protocols/oscar/oscar.c:5631
+#: src/protocols/oscar/oscar.c:5669
 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:5644 src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5682 src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Forbindelse til chat-rum %s afbrudt."
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: src/protocols/oscar/oscar.c:5707
 msgid "Finalizing connection"
 msgstr "F脱rddigg淡rer opkobling"
 
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:6019 src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "Kvinde"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "Mand"
-
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6037
 msgid "Personal Web Page"
 msgstr "Personlig hjemmeside"
 
-#: src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6041
 msgid "Additional Information"
 msgstr "Yderligere information"
 
-#: src/protocols/oscar/oscar.c:6004
+#: src/protocols/oscar/oscar.c:6046
 msgid "Home Address"
 msgstr "Hjemme adresse"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6050 src/protocols/oscar/oscar.c:6058
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6054
 msgid "Work Address"
 msgstr "Arbejds adresse"
 
-#: src/protocols/oscar/oscar.c:6020
+#: src/protocols/oscar/oscar.c:6062
 msgid "Work Information"
 msgstr "Arbejds information"
 
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6063
 msgid "Company"
 msgstr "Firma"
 
-#: src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:6064
 msgid "Division"
 msgstr "Afdeling"
 
-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6065
 msgid "Position"
 msgstr "Stilling"
 
-#: src/protocols/oscar/oscar.c:6025
+#: src/protocols/oscar/oscar.c:6067
 msgid "Web Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/oscar/oscar.c:6082
+#: src/protocols/oscar/oscar.c:6124
 msgid "Pop-Up Message"
 msgstr "Pop-Up besked"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr "F淡lgende brugernavne er associeret med %s"
-
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6164
+#, fuzzy, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "F淡lgende brugernavne er associeret med %s"
+msgstr[1] "F淡lgende brugernavne er associeret med %s"
+
+#: src/protocols/oscar/oscar.c:6195
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ingen resultater fundet for post-adressen %s"
 
-#: src/protocols/oscar/oscar.c:6161
+#: src/protocols/oscar/oscar.c:6216
 #, 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:6163
+#: src/protocols/oscar/oscar.c:6218
 msgid "Account Confirmation Requested"
 msgstr "Der er anmodet om konto bekr脱ftelse"
 
-#: src/protocols/oscar/oscar.c:6194
+#: src/protocols/oscar/oscar.c:6249
 msgid "Error Changing Account Info"
 msgstr "Fejl ved 脱ndring af konto oplysninger"
 
-#: src/protocols/oscar/oscar.c:6197
+#: src/protocols/oscar/oscar.c:6252
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8458,14 +8924,14 @@
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "er forskelligt fra det oprindelige."
 
-#: src/protocols/oscar/oscar.c:6200
+#: src/protocols/oscar/oscar.c:6255
 #, fuzzy, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "er for langt."
 
-#: src/protocols/oscar/oscar.c:6203
+#: src/protocols/oscar/oscar.c:6258
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8474,7 +8940,7 @@
 "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede brugernavn "
 "er for langt."
 
-#: src/protocols/oscar/oscar.c:6206
+#: src/protocols/oscar/oscar.c:6261
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8483,7 +8949,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:6209
+#: src/protocols/oscar/oscar.c:6264
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8492,7 +8958,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:6212
+#: src/protocols/oscar/oscar.c:6267
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8501,12 +8967,12 @@
 "Fejl 0x%04x: Ikke i stand til at 脱ndre e-post adresse, fordi den angivne "
 "adresse er ugyldig."
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6270
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fejl 0x%04x: Ukendt fejl."
 
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6280
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8515,27 +8981,27 @@
 "Dit brugernavn er formatter s奪ledes p奪 nuv脱rende tidspunkt:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6281 src/protocols/oscar/oscar.c:6288
 msgid "Account Info"
 msgstr "Konto Oplysninger"
 
-#: src/protocols/oscar/oscar.c:6231
+#: src/protocols/oscar/oscar.c:6286
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s's post-adresse er %s"
 
-#: src/protocols/oscar/oscar.c:6298
+#: src/protocols/oscar/oscar.c:6353
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Dit billede blev ikke sendt. Du skal v脱re direkte forbundet for at sende "
 "billeder."
 
-#: src/protocols/oscar/oscar.c:6480
+#: src/protocols/oscar/oscar.c:6572
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke 脱ndre AIM profil."
 
-#: src/protocols/oscar/oscar.c:6481
+#: src/protocols/oscar/oscar.c:6573
 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 "
@@ -8545,7 +9011,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:6495
+#: src/protocols/oscar/oscar.c:6587
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8560,11 +9026,11 @@
 "Profil-l脱ngdens maskimal st淡rrelse p奪 %d bogstaver er blevet overskredet. "
 "Gaim har forkortet den."
 
-#: src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:6592
 msgid "Profile too long."
 msgstr "Profil for lang."
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#: src/protocols/oscar/oscar.c:6628
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8579,25 +9045,11 @@
 "Frav脱rsbesked-l脱ngden p奪 %d bogstaver er blevet overskredet. Gaim har "
 "forkortet den for dig."
 
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+#: src/protocols/oscar/oscar.c:6633
 msgid "Away message too long."
 msgstr "Frav脱rsbesked for lang."
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "Kunne ikke s脱tte AIM frav脱rsbesked."
-
-#: src/protocols/oscar/oscar.c:6561
-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 ""
-"Du har sikkert anmodet om at s脱tte din frav脱rsbesked, f淡r login-processen er "
-"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:6691
+#: src/protocols/oscar/oscar.c:6724
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8608,16 +9060,16 @@
 "skal enten starte med 辿t bogstav og indeholde kun bogstaver, tal og "
 "mellemrum, eller kun indeholde tal."
 
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: src/protocols/oscar/oscar.c:6726 src/protocols/oscar/oscar.c:7124
+#: src/protocols/oscar/oscar.c:7138 src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "Ikke i stand til at tilf淡je"
 
-#: src/protocols/oscar/oscar.c:6798
+#: src/protocols/oscar/oscar.c:6831
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunne ikke hente vennelisten"
 
-#: src/protocols/oscar/oscar.c:6799
+#: src/protocols/oscar/oscar.c:6832
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -8627,13 +9079,13 @@
 "serverne. Din venneliste er ikke tabt, og vil sikkert blive tilg脱ngelig "
 "indenfor et par timer."
 
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:7022 src/protocols/oscar/oscar.c:7023
+#: src/protocols/oscar/oscar.c:7028 src/protocols/oscar/oscar.c:7182
+#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7188
 msgid "Orphans"
 msgstr "Tabte"
 
-#: src/protocols/oscar/oscar.c:7090
+#: src/protocols/oscar/oscar.c:7122
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8642,11 +9094,11 @@
 "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:7090 src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7122 src/protocols/oscar/oscar.c:7136
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7136
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8656,7 +9108,7 @@
 "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:7187
+#: src/protocols/oscar/oscar.c:7219
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8665,11 +9117,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:7193
+#: src/protocols/oscar/oscar.c:7225
 msgid "Authorization Given"
 msgstr "Godkendelse Givet"
 
-#: src/protocols/oscar/oscar.c:7237
+#: src/protocols/oscar/oscar.c:7269
 #, fuzzy, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -8679,19 +9131,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7314
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Brugeren %s har givet lov til din anmodning om at tilf淡je dem til din "
 "venneliste."
 
-#: src/protocols/oscar/oscar.c:7283
+#: src/protocols/oscar/oscar.c:7315
 msgid "Authorization Granted"
 msgstr "Godkendelse Givet"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7318
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8702,96 +9154,107 @@
 "f淡lgende grund:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: src/protocols/oscar/oscar.c:7319
 msgid "Authorization Denied"
 msgstr "Godkendelse N脱gtet"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7356 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Udveksl:"
 
-#: src/protocols/oscar/oscar.c:7360
+#: src/protocols/oscar/oscar.c:7392
 msgid "Invalid chat name specified."
 msgstr "Ugyldigt chatnavn angivet."
 
-#: src/protocols/oscar/oscar.c:7430
+#: src/protocols/oscar/oscar.c:7462
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Dit billede blev ikke sendt. Du kan ikke sende billeder i AIM chats."
 
-#: src/protocols/oscar/oscar.c:7565
+#. Available status messages are plain text
+#: src/protocols/oscar/oscar.c:7598
+#, fuzzy
+msgid "Available Message"
+msgstr "Tilg脱ngelig besked:"
+
+#: src/protocols/oscar/oscar.c:7612 src/protocols/oscar/oscar.c:7617
 msgid "Away Message"
 msgstr "Frav脱rsbesked"
 
-#: src/protocols/oscar/oscar.c:7854
+#: src/protocols/oscar/oscar.c:7617
+#, fuzzy
+msgid "(pending)"
+msgstr "Ingen (Til afventer)"
+
+#: src/protocols/oscar/oscar.c:7924
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vennekommentar for %s"
 
-#: src/protocols/oscar/oscar.c:7855
+#: src/protocols/oscar/oscar.c:7925
 msgid "Buddy Comment:"
 msgstr "Vennekommentar:"
 
-#: src/protocols/oscar/oscar.c:7874
+#: src/protocols/oscar/oscar.c:7944
 msgid "Edit Buddy Comment"
 msgstr "Redig辿r vennekommentar"
 
-#: src/protocols/oscar/oscar.c:7880
+#: src/protocols/oscar/oscar.c:7950
 msgid "Get Status Msg"
 msgstr "Hent statusbesked"
 
-#: src/protocols/oscar/oscar.c:7892
+#: src/protocols/oscar/oscar.c:7962
 msgid "Direct IM"
 msgstr "Direkte forbindelse"
 
-#: src/protocols/oscar/oscar.c:7909
+#: src/protocols/oscar/oscar.c:7979
 msgid "Re-request Authorization"
 msgstr "Anmod om ny godkendelse"
 
-#: src/protocols/oscar/oscar.c:7969
+#: src/protocols/oscar/oscar.c:8039
 #, fuzzy
 msgid "Require authorization"
 msgstr "Anmod om godkendelse"
 
-#: src/protocols/oscar/oscar.c:7972
+#: src/protocols/oscar/oscar.c:8042
 #, fuzzy
 msgid "Hide IP address"
 msgstr "IP-adresse"
 
-#: src/protocols/oscar/oscar.c:7975
+#: src/protocols/oscar/oscar.c:8045
 #, fuzzy
 msgid "Web aware"
 msgstr "Web-opm脱rksom"
 
-#: src/protocols/oscar/oscar.c:7980
+#: src/protocols/oscar/oscar.c:8050
 #, fuzzy
 msgid "ICQ Privacy Options"
 msgstr "Mellemv脱rtindstillinger"
 
-#: src/protocols/oscar/oscar.c:7997
+#: src/protocols/oscar/oscar.c:8067
 msgid "The new formatting is invalid."
 msgstr "Den nye formattering er ugyldig."
 
-#: src/protocols/oscar/oscar.c:7998
+#: src/protocols/oscar/oscar.c:8068
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Brugernavn formatering kan kun 脱ndre store/sm奪 bogstaver og mellemrum."
 
-#: src/protocols/oscar/oscar.c:8005
+#: src/protocols/oscar/oscar.c:8075
 msgid "New screen name formatting:"
 msgstr "Ny brugernavn formatering:"
 
-#: src/protocols/oscar/oscar.c:8057
+#: src/protocols/oscar/oscar.c:8127
 msgid "Change Address To:"
 msgstr "Skift adresse til:"
 
-#: src/protocols/oscar/oscar.c:8102
+#: src/protocols/oscar/oscar.c:8172
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du venter ikke p奪 godkendelse</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: src/protocols/oscar/oscar.c:8175
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du afventer godkendelse fra f淡lgende venner"
 
-#: src/protocols/oscar/oscar.c:8106
+#: src/protocols/oscar/oscar.c:8176
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8799,84 +9262,76 @@
 "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:8123
+#: src/protocols/oscar/oscar.c:8193
 msgid "Find Buddy by E-mail"
 msgstr "Find ven udfra e-post adresse"
 
-#: src/protocols/oscar/oscar.c:8124
+#: src/protocols/oscar/oscar.c:8194
 msgid "Search for a buddy by e-mail address"
 msgstr "S淡g efter en ven udfra e-post adresse"
 
-#: src/protocols/oscar/oscar.c:8125
+#: src/protocols/oscar/oscar.c:8195
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Indtast e-mail adressen p奪 vennen du s淡ger efter."
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "Ret brugeroplysninger..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: src/protocols/oscar/oscar.c:8288
 msgid "Set User Info (URL)..."
 msgstr "Ret brugeroplysninger (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "Skift adgangskode..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: src/protocols/oscar/oscar.c:8299
 msgid "Change Password (URL)"
 msgstr "Skift adgangskode (URL)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: src/protocols/oscar/oscar.c:8303
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigur辿r besked-videresendelse (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-#, fuzzy
-msgid "Show privacy options..."
+#: src/protocols/oscar/oscar.c:8313
+#, fuzzy
+msgid "Show Privacy Options..."
 msgstr "Vis flere indstillinger"
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: src/protocols/oscar/oscar.c:8320
 msgid "Format Screen Name..."
 msgstr "Format辿r brugernavn..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: src/protocols/oscar/oscar.c:8324
 msgid "Confirm Account"
 msgstr "Bekr脱ft Konto"
 
-#: src/protocols/oscar/oscar.c:8258
+#: src/protocols/oscar/oscar.c:8328
 msgid "Display Currently Registered Address"
 msgstr "Vis nuv脱rende registeret adresse"
 
-#: src/protocols/oscar/oscar.c:8262
+#: src/protocols/oscar/oscar.c:8332
 msgid "Change Currently Registered Address..."
 msgstr "Skift nuv脱rende registreret adresse..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: src/protocols/oscar/oscar.c:8339
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis venner der afventer godkendelse"
 
-#: src/protocols/oscar/oscar.c:8275
+#: src/protocols/oscar/oscar.c:8345
 msgid "Search for Buddy by Email..."
 msgstr "S淡g efter ven udfra e-post adresse..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: src/protocols/oscar/oscar.c:8350
 msgid "Search for Buddy by Information"
 msgstr "S淡g efter ven udfra oplysninger"
 
-#: src/protocols/oscar/oscar.c:8350
+#: src/protocols/oscar/oscar.c:8416
 #, fuzzy
 msgid "Use recent buddies group"
 msgstr "Bruger ikke i gruppe"
 
-#: src/protocols/oscar/oscar.c:8353
+#: src/protocols/oscar/oscar.c:8419
 #, fuzzy
 msgid "Show how long you have been idle"
 msgstr "Tillader dig at s脱tte op manuelt hvor lang tid du har v脱ret inaktiv i."
 
-#: src/protocols/oscar/oscar.c:8362
+#: src/protocols/oscar/oscar.c:8428
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
 msgstr ""
 
@@ -8890,55 +9345,90 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: src/protocols/oscar/oscar.c:8545 src/protocols/oscar/oscar.c:8547
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ protokolmodul"
 
-#: src/protocols/oscar/oscar.c:8497
+#: src/protocols/oscar/oscar.c:8566
 msgid "Auth host"
 msgstr "Godkendelses server"
 
-#: src/protocols/oscar/oscar.c:8500
+#: src/protocols/oscar/oscar.c:8569
 msgid "Auth port"
 msgstr "Godkendelses port"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:8572 src/protocols/zephyr/zephyr.c:2894
 msgid "Encoding"
 msgstr "Tegns脱t"
 
-#: src/protocols/sametime/sametime.c:1134
+#: src/protocols/sametime/sametime.c:363
+#, fuzzy
+msgid "Connection closed (writing)"
+msgstr "Forbindelse lukket"
+
+#: src/protocols/sametime/sametime.c:1208
+#, fuzzy, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Bruger:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1209
+#, fuzzy, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Bruger:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:1211
+#, fuzzy, c-format
+msgid "Info for Group %s"
+msgstr "Oplysninger for %s"
+
+#: src/protocols/sametime/sametime.c:1213
+#, fuzzy
+msgid "Notes Address Book Information"
+msgstr "Arbejds information"
+
+#: src/protocols/sametime/sametime.c:1245
+#, fuzzy
+msgid "Invite Group to Conference..."
+msgstr "Start konference"
+
+#: src/protocols/sametime/sametime.c:1254
+#, fuzzy
+msgid "Get Notes Address Book Info"
+msgstr "Tilf淡j til adressebog"
+
+#: src/protocols/sametime/sametime.c:1406
 #, fuzzy
 msgid "Sending Handshake"
 msgstr "Sender cookie"
 
-#: src/protocols/sametime/sametime.c:1139
+#: src/protocols/sametime/sametime.c:1411
 #, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Venter p奪 at overf淡rsel skal starte"
 
-#: src/protocols/sametime/sametime.c:1144
+#: src/protocols/sametime/sametime.c:1416
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:1149
+#: src/protocols/sametime/sametime.c:1421
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:1154
+#: src/protocols/sametime/sametime.c:1426
 #, fuzzy
 msgid "Login Redirected"
 msgstr "Indlogningsserver"
 
-#: src/protocols/sametime/sametime.c:1159
+#: src/protocols/sametime/sametime.c:1432
 #, fuzzy
 msgid "Forcing Login"
 msgstr "Logger ind"
 
-#: src/protocols/sametime/sametime.c:1163
+#: src/protocols/sametime/sametime.c:1436
 msgid "Login Acknowledged"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:1168
+#: src/protocols/sametime/sametime.c:1441
 #, fuzzy
 msgid "Connected to Sametime Community Server"
 msgstr "Tilslutter til SILC server"
@@ -8946,129 +9436,457 @@
 #. * @todo Admin alerts should probably be in a conversation window
 #. rather than a gaim_notify_message. Or in some sort of updating
 #. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
+#: src/protocols/sametime/sametime.c:1535
 msgid "Admin Alert"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:2758
+#: src/protocols/sametime/sametime.c:1592
+#, fuzzy
+msgid "Connection reset"
+msgstr "Forbindelse lukket"
+
+#: src/protocols/sametime/sametime.c:1599
+#, fuzzy, c-format
+msgid "Error reading from socket: %s"
+msgstr "Fejl under l脱sning fra netv脱rket."
+
+#. this is a regular connect, error out
+#: src/protocols/sametime/sametime.c:1628
+#: src/protocols/sametime/sametime.c:3613
+#, fuzzy
+msgid "Unable to connect to host"
+msgstr "Kunne ikke kontakte server."
+
+#: src/protocols/sametime/sametime.c:1665
+#, c-format
+msgid "Announcement from %s"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:1836
+#, fuzzy
+msgid "Conference Closed"
+msgstr "Forbindelse lukket"
+
+#: src/protocols/sametime/sametime.c:2297
+#, fuzzy
+msgid "Unable to send message: "
+msgstr "Kunne ikke sende besked: %s"
+
+#: src/protocols/sametime/sametime.c:2893
+#, fuzzy
+msgid "Place Closed"
+msgstr "Annulleret"
+
+#: src/protocols/sametime/sametime.c:3180
+msgid "Microphone"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:3181
+msgid "Speakers"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:3182
+#, fuzzy
+msgid "Video Camera"
+msgstr "Video chat"
+
+#: src/protocols/sametime/sametime.c:3186
+#, fuzzy
+msgid "File Transfer"
+msgstr "Filoverf淡rsler"
+
+#: src/protocols/sametime/sametime.c:3207
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Status</b>: %s"
+msgstr ""
+"\n"
+"<b>Status</b>: Enest奪ende"
+
+#: src/protocols/sametime/sametime.c:3212
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Message</b>: %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/protocols/sametime/sametime.c:3218
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Supports</b>: %s"
+msgstr ""
+"\n"
+"<b>Status</b>: Enest奪ende"
+
+#: src/protocols/sametime/sametime.c:3223
+#, fuzzy
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>Advaret:</b>"
+
+#: src/protocols/sametime/sametime.c:3241
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "Kunne ikke oprette sokkel"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "IRC navne m奪 ikke indeholde mellemrum og lignende"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC prokotolmodul"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC prokotolmodul"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
-msgstr "Bruger ID"
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "Ingen mellemv脱rt"
-
-#: src/protocols/simple/simple.c:1438
-#, fuzzy
-msgid "Proxy"
-msgstr "Ingen mellemv脱rt"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
+#: src/protocols/sametime/sametime.c:3330
+#, fuzzy
+msgid "Create conference with user"
+msgstr "V脱lg en konference-server at sl奪 op"
+
+#: src/protocols/sametime/sametime.c:3331
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:3335
+#, fuzzy
+msgid "New Conference"
+msgstr "Start konference"
+
+#: src/protocols/sametime/sametime.c:3337
+#, fuzzy
+msgid "Create"
+msgstr "Chat"
+
+#: src/protocols/sametime/sametime.c:3399
+#, fuzzy
+msgid "Available Conferences"
+msgstr "Start konference"
+
+#: src/protocols/sametime/sametime.c:3405
+#, fuzzy
+msgid "Create New Conference..."
+msgstr "Start konference"
+
+#: src/protocols/sametime/sametime.c:3412
+#, fuzzy
+msgid "Invite user to a conference"
+msgstr "Start konference"
+
+#: src/protocols/sametime/sametime.c:3413
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:3418
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "Start konference"
+
+#: src/protocols/sametime/sametime.c:3420
+msgid "Invite"
+msgstr "Invit辿r"
+
+#: src/protocols/sametime/sametime.c:3472
+#, fuzzy
+msgid "Invite to Conference..."
+msgstr "Start konference"
+
+#: src/protocols/sametime/sametime.c:3518
+#, fuzzy
+msgid "No Sametime Community Server specified"
+msgstr "Tilslutter til SILC server"
+
+#: src/protocols/sametime/sametime.c:3539
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:3544
+#, fuzzy
+msgid "Meanwhile Connection Setup"
+msgstr "Fjernstyring fejlede"
+
+#: src/protocols/sametime/sametime.c:3545
+#, fuzzy
+msgid "No Sametime Community Server Specified"
+msgstr "Tilslutter til SILC server"
+
+#: src/protocols/sametime/sametime.c:4061
+#, fuzzy
+msgid "<b>External User</b><br>"
+msgstr "<b>Bruger:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4064
+#, fuzzy, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>Bruger:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4070
+#, fuzzy, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>Alias:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4076
+#, fuzzy
+msgid "<b>Last Known Client:</b> "
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/protocols/sametime/sametime.c:4084
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:4091
+#, fuzzy, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: src/protocols/sametime/sametime.c:4097
+#, fuzzy, c-format
+msgid "<b>Status:</b> %s"
+msgstr ""
+"\n"
+"<b>Status</b>: Enest奪ende"
+
+#: src/protocols/sametime/sametime.c:4342
+#: src/protocols/sametime/sametime.c:5369
+msgid "Possible Matches"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:4383
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:4384
+#, fuzzy, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"Mere end 辿n bruger blev fundet med det samme navn. V脱lg den korrekte bruger "
+"fra listen, som du vil tilf淡je til din venneliste."
+
+#: src/protocols/sametime/sametime.c:4389
+#, fuzzy
+msgid "Select User to Add"
+msgstr "Ret brugeroplysninger"
+
+#: src/protocols/sametime/sametime.c:4391
+#, fuzzy
+msgid "Add User"
+msgstr "AP Bruger"
+
+#: src/protocols/sametime/sametime.c:4452
+#, fuzzy
+msgid "Unable to add user: user not found"
+msgstr "Kunne ikke tilf淡je brugeren p奪 %s (%s)"
+
+#: src/protocols/sametime/sametime.c:4454
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:4459
+#, fuzzy
+msgid "Unable to add user"
+msgstr "Ude af stand til at udvise bruger %s"
+
+#: src/protocols/sametime/sametime.c:5029
+#, fuzzy, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Fejl ved l脱sning af %s: \n"
+"%s.\n"
+
+#: src/protocols/sametime/sametime.c:5155
+#, fuzzy
+msgid "Remotely Stored Buddy List"
+msgstr "Send venneliste"
+
+#: src/protocols/sametime/sametime.c:5160
+#, fuzzy
+msgid "Buddy List Storage Mode"
+msgstr "Venneliste sortering"
+
+#: src/protocols/sametime/sametime.c:5163
+#, fuzzy
+msgid "Local Buddy List Only"
+msgstr "_Dockbar venneliste"
+
+#: src/protocols/sametime/sametime.c:5165
+#, fuzzy
+msgid "Merge List from Server"
+msgstr "Slet venneliste p奪 server"
+
+#: src/protocols/sametime/sametime.c:5167
+#, fuzzy
+msgid "Merge and Save List to Server"
+msgstr "Forkert CHL v脱rdi sendt til server"
+
+#: src/protocols/sametime/sametime.c:5169
+msgid "Synchronize List with Server"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5218
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5257
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5308
+#, fuzzy
+msgid "Unable to add group: group exists"
+msgstr "Kunne ikke tilf淡je %s til blokeringslisten (%s)."
+
+#: src/protocols/sametime/sametime.c:5309
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5312
+#: src/protocols/sametime/sametime.c:5437
+#, fuzzy
+msgid "Unable to add group"
+msgstr "Kunne ikke slette gruppe"
+
+#: src/protocols/sametime/sametime.c:5385
+msgid "Notes Address Book group results"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5386
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5391
+#, fuzzy
+msgid "Select Notes Address Book"
+msgstr "Tilf淡j til adressebog"
+
+#: src/protocols/sametime/sametime.c:5431
+#, fuzzy
+msgid "Unable to add group: group not found"
+msgstr "Kan ikke l脱se fra netv脱rket"
+
+#: src/protocols/sametime/sametime.c:5433
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5473
+#, fuzzy
+msgid "Notes Address Book Group"
+msgstr "Tilf淡j til adressebog"
+
+#: src/protocols/sametime/sametime.c:5474
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5489
+msgid "Import Sametime List..."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5493
+msgid "Export Sametime List..."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5497
+#, fuzzy
+msgid "Add Notes Address Book Group..."
+msgstr "Tilf淡j til adressebog"
+
+#. notesbuddy hack encoding
+#: src/protocols/sametime/sametime.c:5591
+#, fuzzy
+msgid "NotesBuddy encoding"
+msgstr "Venneikon"
+
+#: src/protocols/sametime/sametime.c:5600
+msgid "Force login (ignore server redirects)"
+msgstr ""
+
+#. pretend to be Sametime Connect
+#: src/protocols/sametime/sametime.c:5610
+msgid "Hide client identity"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:420
+#: src/protocols/silc/buddy.c:545 src/protocols/silc/buddy.c:712
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "User %s er ikke til stede i netv脱rket"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:53 src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:120 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:139 src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "N淡gle enighed"
 
-#: src/protocols/silc/buddy.c:53
+#: src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Kan ikke udf淡re n淡gle enigheden"
 
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "En fejl skete under n淡gle enigheden"
 
-#: src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "N淡gle enighed fejlede"
 
-#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tidsgr脱nsen udl淡b ved n淡gle enighed"
 
-#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "N淡gle enighed blev afbrudt"
 
-#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "N淡gle enighed er allerede startet"
 
-#: src/protocols/silc/buddy.c:139
+#: src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "N淡gle enighed kan ikke blive startet med dig selv"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:258 src/protocols/silc/buddy.c:388
+#: src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "Brugeren er ikke til stede i netv脱rket l脱ngere"
 
-#: src/protocols/silc/buddy.c:293
+#: src/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "Anmodning om n淡gle enighed modtaget %s. Vil du udf淡re n淡gle enigheden?"
 
-#: src/protocols/silc/buddy.c:297
+#: src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9079,59 +9897,59 @@
 "V脱rt: %s\n"
 "Port: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Anmodning om n淡gle enighed"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: src/protocols/silc/buddy.c:387 src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "Besked med adgangskode"
 
-#: src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Kan ikke s脱tte n淡gle"
 
-#: src/protocols/silc/buddy.c:464
+#: src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "S脱t adgangskode p奪 besked"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:512 src/protocols/silc/buddy.c:547
+#: src/protocols/silc/ops.c:1492 src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "Hent offentlig n淡gle"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:548 src/protocols/silc/ops.c:1493
+#: src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "Kan ikke hente offentlig n淡gle"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:1610
 msgid "Show Public Key"
 msgstr "Vis offentlig n淡gle"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/buddy.c:636 src/protocols/silc/buddy.c:995
+#: src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "Kunne ikke indl脱se offentlig n淡gle"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:1087
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/ops.c:1294
+#: src/protocols/silc/ops.c:1295 src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Brugeroplysninger"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:714 src/protocols/silc/ops.c:1160
+#: src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Kan ikke hente oplysninger"
 
-#: src/protocols/silc/buddy.c:734
+#: src/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Vennen %s er ikke betroet"
 
-#: src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -9141,16 +9959,16 @@
 "hente den offentlige n淡gle."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1029
 msgid "Open..."
 msgstr "�bn..."
 
-#: src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1038
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s vennen er ikke til stede p奪 netv脱rket"
 
-#: src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1041
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9158,15 +9976,15 @@
 "For at tilf淡je en ven, skal du importere hendes/hans offentlige n淡gle. Tryk "
 "Import辿r for at importere en offentlig n淡gle."
 
-#: src/protocols/silc/buddy.c:1043
+#: src/protocols/silc/buddy.c:1044
 msgid "Import..."
 msgstr "Import辿r..."
 
-#: src/protocols/silc/buddy.c:1130
+#: src/protocols/silc/buddy.c:1140
 msgid "Select correct user"
 msgstr "V脱lg en korrekt bruger"
 
-#: src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/buddy.c:1142
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -9174,7 +9992,7 @@
 "Mere end 辿n bruger blev fundet med den samme offentlige n淡gle. V脱lg den "
 "korrekte bruger fra listen som du vil tilf淡je til din venneliste."
 
-#: src/protocols/silc/buddy.c:1134
+#: src/protocols/silc/buddy.c:1144
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9182,213 +10000,217 @@
 "Mere end 辿n bruger blev fundet med det samme navn. V脱lg den korrekte bruger "
 "fra listen, som du vil tilf淡je til din venneliste."
 
-#: src/protocols/silc/buddy.c:1415
+#: src/protocols/silc/buddy.c:1429
 msgid "Detached"
 msgstr "Ikke koblet p奪"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:57
 msgid "Indisposed"
 msgstr "Utilpas"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:59
 msgid "Wake Me Up"
 msgstr "V脱k mig"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:51
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: src/protocols/silc/buddy.c:1427
+#: src/protocols/silc/buddy.c:1441
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:658
+#: src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Glad"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:660
+#: src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "Trist"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:662
+#: src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "Sur"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:664
+#: src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: src/protocols/silc/buddy.c:1456 src/protocols/silc/silc.c:666
+#: src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Skammer sig"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: src/protocols/silc/buddy.c:1458 src/protocols/silc/silc.c:668
+#: src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Us奪rlig"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: src/protocols/silc/buddy.c:1460 src/protocols/silc/silc.c:670
+#: src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Forelsket"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: src/protocols/silc/buddy.c:1462 src/protocols/silc/silc.c:672
+#: src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "S淡vnig"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: src/protocols/silc/buddy.c:1464 src/protocols/silc/silc.c:674
+#: src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Keder sig"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/silc.c:676
+#: src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Begejstret"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: src/protocols/silc/buddy.c:1468 src/protocols/silc/silc.c:678
+#: src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Sp脱ndt"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1500 src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "Bruger tilstande"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Hum淡r"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1513 src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Status tekst"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1518 src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Foretrukne kontakt"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1523 src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Foretrukket sprog"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1528 src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Enhed"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: src/protocols/silc/buddy.c:1533 src/protocols/silc/ops.c:1232
+#: src/protocols/silc/silc.c:726 src/protocols/silc/silc.c:728
 msgid "Timezone"
 msgstr "Tidszone"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1538 src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Placering"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1594
 msgid "Reset IM Key"
 msgstr "Nulstil besked n淡gle"
 
-#: src/protocols/silc/buddy.c:1572
+#: src/protocols/silc/buddy.c:1599
 msgid "IM with Key Exchange"
 msgstr "Besked med n淡gle udveksling"
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1603
 msgid "IM with Password"
 msgstr "Besked med adgangskode"
 
-#: src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1615
 msgid "Get Public Key..."
 msgstr "Hent offentlig n淡gle..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1622 src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "Dr脱b bruger"
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/buddy.c:1631 src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr ""
+
+#: src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Adgangskode:"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanalen %s eksisterer ikke p奪 netv脱rket"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:81 src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "Kanal oplysninger"
 
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kan ikke hente kanal oplysninger"
 
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanal navn:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Bruger antal:</b> %s"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanal stifter:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanal ciffer:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanal HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanalens emne:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanal tilstande:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Stifterens n淡gle fingeraftryk:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Stifterens 'babbleprint':</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "Tilf淡j kanalens offentlige n淡gle"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "�bn offentlig n淡gle..."
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "Kanalens adgangss脱tning"
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "Kanalens liste med offentlige n淡gler"
 
-#: src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:411
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9402,122 +10224,123 @@
 "offentlige n淡gler er sat, s奪 er det kun brugere hvis offentlige n淡gler der "
 "er n脱vnt, som kan deltage."
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:421
+#: src/protocols/silc/chat.c:458 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:905
 msgid "Channel Authentication"
 msgstr "Kanal godkendelse"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "Tilf淡j / Fjern"
 
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:581 src/protocols/silc/ops.c:1908
+#: src/protocols/silc/silc.c:934
 msgid "Passphrase"
 msgstr "Adgangskode"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Indtast %s kanalens private gruppenavn og adgangss脱tning."
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "Tilf淡j kanal privat gruppe"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "Brugergr脱nse"
 
-#: src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "S脱t brugergr脱nse p奪 kanal. S脱t til 0 for at nulstille gr脱nse."
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "Hent info"
 
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "Inviteringsliste"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "Udvist liste"
 
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "Tilf淡j privat gruppe"
 
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "Nulstil permanent"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "S脱t permanent"
 
-#: src/protocols/silc/chat.c:910
+#: src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "S脱t brugergr脱nse"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "Nulstil emne-begr脱nsning"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "S脱t emne-begr脱nsning"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "Nulstil privat kanal"
 
-#: src/protocols/silc/chat.c:933
+#: src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "S脱t privat kanal"
 
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "Nulstil hemmelig kanal"
 
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "S脱t hemmelig kanal"
 
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:1032
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Du er kanal grundl脱gger p奪 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:1036
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanal grundl脱gger p奪 <I>%s</I> er <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: src/protocols/silc/chat.c:1095
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Du skal deltage i %s kanalen f淡r du kan deltage i den private gruppe"
 
-#: src/protocols/silc/chat.c:1073
+#: src/protocols/silc/chat.c:1097
 msgid "Join Private Group"
 msgstr "Deltag i privat gruppe"
 
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1098
 msgid "Cannot join private group"
 msgstr "Kan ikke deltage i privat gruppe"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: src/protocols/silc/chat.c:1292 src/protocols/silc/silc.c:1142
 msgid "Cannot call command"
 msgstr "Kan ikke kalde kommando"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: src/protocols/silc/chat.c:1293 src/protocols/silc/silc.c:1143
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
@@ -9568,150 +10391,150 @@
 msgid "Cannot send file"
 msgstr "Kan ikke sende fil"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:555 src/protocols/silc/ops.c:564
+#: src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s har 脱ndret emnet af <I>%s</I> til: %s"
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> satte kanal <I>%s</I> tilstande til: %s"
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> fjernede alle kanal <I>%s</I> tilstande"
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> satte <I>%s's</I> tilstande til: %s"
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> fjernede alle <I>%s's</I> tilstande"
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Du er blevet sparket fra <I>%s</I> af <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:743 src/protocols/silc/ops.c:748
+#: src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Du er blevet dr脱bt af %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:774 src/protocols/silc/ops.c:779
+#: src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Dr脱bt af %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "Server nedlukning"
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Personlige oplysninger"
 
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "F淡dselsdato"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Job titel"
 
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Stilling"
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:1052 src/protocols/silc/silc.c:927
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Enhed"
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "E-post"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Note"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Deltag i chat"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "Offentlig n淡gle fingeraftryk"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1285 src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "Offentlige n淡gle 'babbleprint'"
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1298
 msgid "More..."
 msgstr "Mere..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: src/protocols/silc/ops.c:1369 src/protocols/silc/silc.c:993
 msgid "Detach From Server"
 msgstr "Kobl af fra server"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Kan ikke koble af"
 
-#: src/protocols/silc/ops.c:1166
+#: src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Kan ikke s脱tte emne"
 
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Kunne ikke 脱ndre navn"
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Rumliste"
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Kan ikke hente rumliste"
 
-#: src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "Ingen offentlig n淡gle var hentet"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1518 src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "Serveroplysninger"
 
-#: src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "Kan ikke hente serveroplysninger"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1548 src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "Serverstatistik"
 
-#: src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "Kunne ikke hente serverstatistik"
 
-#: src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "Ingen serverstatistik tilg脱ngelig"
 
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9746,99 +10569,99 @@
 "Total server operat淡rer: %d\n"
 "Total router operat淡rer: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "Netv脱rk statistik"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1611 src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Ping fejlede"
 
-#: src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "Ping svar modtaget fra server"
 
-#: src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "Kan ikke dr脱be bruger"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "Fejl ved forbindelse til SILC server"
 
-#: src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "N淡gle udveksling fejlede"
 
-#: src/protocols/silc/ops.c:1508
+#: src/protocols/silc/ops.c:1722
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Genoptagelse af tidligere session fejlede. Lav en ny forbindelse ved at "
 "trykke p奪 gentabler forbindelse."
 
-#: src/protocols/silc/ops.c:1543
+#: src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "Afbrudt af server"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: src/protocols/silc/ops.c:1819 src/protocols/silc/ops.c:1866
+#: src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "Genoptager session"
 
-#: src/protocols/silc/ops.c:1607
+#: src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "Godkender forbindelse"
 
-#: src/protocols/silc/ops.c:1654
+#: src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "Verificerer serverens offentlige n淡gle"
 
-#: src/protocols/silc/ops.c:1695
+#: src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "Adgangss脱tning kr脱vet"
 
-#: src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fejl: Version uoverensstemmelse, opgrad辿r din klient"
 
-#: src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fejl: Fjernmaskine stoler eller underst淡tter ikke din offentlige n淡gle"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fejl: Fjernv脱rt underst淡tter ikke foresl奪ede 'KE group'"
 
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Fejl: Fjernv脱rt underst淡tter ikke foresl奪ede ciffer"
 
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fejl: Fjernv脱rt unders淡ttter ikke foresl奪ede PKCS"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fejl: Fjernv脱rt underst淡tter ikke foresl奪ede hash-funktion"
 
-#: src/protocols/silc/ops.c:1742
+#: src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fejl: Fjernv脱rt underst淡tter ikke foresl奪ede HMAC"
 
-#: src/protocols/silc/ops.c:1744
+#: src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "Fejl: Ugyldig signatur"
 
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "Fejl: Ugyldig cookie"
 
-#: src/protocols/silc/ops.c:1757
+#: src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "Fejl: Godkendelse fejlede"
 
@@ -9881,36 +10704,36 @@
 msgid "Unsupported public key type"
 msgstr "Ikke underst淡ttet offentlige n淡gle type"
 
-#: src/protocols/silc/silc.c:154
+#: src/protocols/silc/silc.c:155
 msgid "Connection failed"
 msgstr "Forbindelse fejlede"
 
-#: src/protocols/silc/silc.c:186
+#: src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "Kan ikke initialisere SILC klient forbindelse"
 
-#: src/protocols/silc/silc.c:197
+#: src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "Udf淡rer n淡gleudveksling"
 
-#: src/protocols/silc/silc.c:270
+#: src/protocols/silc/silc.c:273
 msgid "Out of memory"
 msgstr "L淡b t淡r for hukommelse"
 
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: src/protocols/silc/silc.c:326
 msgid "Connecting to SILC Server"
 msgstr "Tilslutter til SILC server"
 
-#: src/protocols/silc/silc.c:630
+#: src/protocols/silc/silc.c:654
 msgid "Your Current Mood"
 msgstr "Dit nuv脱rende hum淡r"
 
-#: src/protocols/silc/silc.c:632
+#: src/protocols/silc/silc.c:656
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:657
+#: src/protocols/silc/silc.c:681
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9918,43 +10741,43 @@
 "\n"
 "Dine fortrukne kontakt metoder"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:689 src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:691 src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:693 src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "Videokonference"
 
-#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:698
 msgid "Your Current Status"
 msgstr "Din nuv脱rende status"
 
-#: src/protocols/silc/silc.c:681
+#: src/protocols/silc/silc.c:705
 msgid "Online Services"
 msgstr "Online tjenester"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:708
 msgid "Let others see what services you are using"
 msgstr "Lad andre se hvilke tjenester du bruger"
 
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:714
 msgid "Let others see what computer you are using"
 msgstr "Lad andre se hvilken computer du bruger"
 
-#: src/protocols/silc/silc.c:697
+#: src/protocols/silc/silc.c:721
 msgid "Your VCard File"
 msgstr "Din VCard fil"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: src/protocols/silc/silc.c:733 src/protocols/silc/silc.c:734
 msgid "User Online Status Attributes"
 msgstr "Online bruger status-attributter"
 
-#: src/protocols/silc/silc.c:712
+#: src/protocols/silc/silc.c:735
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9964,128 +10787,179 @@
 "personlige oplysninger. Udfyld de oplysninger, du gerne vil have at folk kan "
 "se om dig."
 
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: src/protocols/silc/silc.c:775 src/protocols/silc/silc.c:781
+#: src/protocols/silc/silc.c:1421
 msgid "Message of the Day"
 msgstr "Dagens besked (MOTD)"
 
-#: src/protocols/silc/silc.c:752
+#: src/protocols/silc/silc.c:775
 msgid "No Message of the Day available"
 msgstr "Ingen MOTD tilg脱ngelig"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: src/protocols/silc/silc.c:776 src/protocols/silc/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Der er ingen MOTD associeret med denne forbindelse."
 
-#: src/protocols/silc/silc.c:800
+#: src/protocols/silc/silc.c:827 src/protocols/silc/silc.c:871
+#: src/protocols/silc/silc.c:942 src/protocols/silc/silc.c:943
+#, fuzzy
+msgid "Create New SILC Key Pair"
+msgstr "Standard SILC n淡glepar"
+
+#: src/protocols/silc/silc.c:827
+#, fuzzy
+msgid "Passphrases do not match"
+msgstr "Nye adgangskoder er ikke ens."
+
+#: src/protocols/silc/silc.c:871
+#, fuzzy
+msgid "Key Pair Generation failed"
+msgstr "N淡gle enighed fejlede"
+
+#: src/protocols/silc/silc.c:910
+#, fuzzy
+msgid "Key Length"
+msgstr "N淡gle l脱ngde: \t%d bits\n"
+
+#: src/protocols/silc/silc.c:912
+#, fuzzy
+msgid "Public Key File"
+msgstr "Offentlig n淡gle fil"
+
+#: src/protocols/silc/silc.c:914
+#, fuzzy
+msgid "Private Key File"
+msgstr "Privat n淡gle fil"
+
+#: src/protocols/silc/silc.c:923
+#, fuzzy
+msgid "Real Name"
+msgstr "Rigtigt navn"
+
+#: src/protocols/silc/silc.c:937
+#, fuzzy
+msgid "Re-type Passphrase"
+msgstr "Adgangskode"
+
+#: src/protocols/silc/silc.c:944
+#, fuzzy
+msgid "Generate Key Pair"
+msgstr "Standard SILC n淡glepar"
+
+#: src/protocols/silc/silc.c:988
 msgid "Online Status"
 msgstr "Online status"
 
-#: src/protocols/silc/silc.c:809
+#: src/protocols/silc/silc.c:997
 msgid "View Message of the Day"
 msgstr "Vis dagens besked (MOTD)"
 
-#: src/protocols/silc/silc.c:882
+#: src/protocols/silc/silc.c:1001
+#, fuzzy
+msgid "Create SILC Key Pair..."
+msgstr "Opretter SILC n淡glepar..."
+
+#: src/protocols/silc/silc.c:1100
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Bruger <I>%s</I> er ikke til stede p奪 netv脱rket"
 
-#: src/protocols/silc/silc.c:1033
+#: src/protocols/silc/silc.c:1292
 msgid "Topic too long"
 msgstr "Emne for langt"
 
-#: src/protocols/silc/silc.c:1114
+#: src/protocols/silc/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Du skal angive et k脱lenavn"
 
-#: src/protocols/silc/silc.c:1216
+#: src/protocols/silc/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "kanal %s blev ikke fundet"
 
-#: src/protocols/silc/silc.c:1221
+#: src/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanal tilstande for %s: %s"
 
-#: src/protocols/silc/silc.c:1223
+#: src/protocols/silc/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ingen kanal tilstande er sat p奪 %s"
 
-#: src/protocols/silc/silc.c:1236
+#: src/protocols/silc/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Kunne ikke s脱tte cmodes for %s"
 
-#: src/protocols/silc/silc.c:1266
+#: src/protocols/silc/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Ukendt kommando: %s, (m奪ske er det en Gaim-fejl)"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]: Forlad chatten"
 
-#: src/protocols/silc/silc.c:1333
+#: src/protocols/silc/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]: Forlad chatten"
 
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nyt emne&gt;]: Vis eller skift emnet"
 
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;kanal&gt; [&lt;adgangskode&gt;]: Deltag i chat p奪 dette netv脱rk"
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list: Vis kanaler p奪 dette netv脱rk"
 
-#: src/protocols/silc/silc.c:1350
+#: src/protocols/silc/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;navn&gt;: Vis brugerens oplysninger"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1613 src/protocols/zephyr/zephyr.c:2598
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;navn&gt; &lt;besked&gt;: Send en privat besked til en bruger"
 
-#: src/protocols/silc/silc.c:1358
+#: src/protocols/silc/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;navn&gt; [&lt;besked&gt;]: Send en privat besked til en bruger"
 
-#: src/protocols/silc/silc.c:1362
+#: src/protocols/silc/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Vis dagens besked (MOTD)"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  G奪 v脱k fra denne session"
 
-#: src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [besked]: Luk forbindelse til server, med en eventuel besked"
 
-#: src/protocols/silc/silc.c:1374
+#: src/protocols/silc/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;kommando&gt;:  Kald en vilk奪rlig silc klient kommando"
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;k脱lenavn&gt; [-pubkey|&lt;begrundelse&gt;]: Dr脱b k脱lenavn"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nyt navn&gt;: Skift dit navn"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;navn&gt;: Vis brugerens oplysninger"
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10093,7 +10967,7 @@
 "cmode &lt;kanal&gt; [+|-&lt;tilstande&gt;] [argumenter]: S脱t eller fjern en "
 "kanal tilstand"
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10101,15 +10975,15 @@
 "cumode &lt;kanal&gt; +|-&lt;tilstande&gt; &lt;navn&gt;: S脱t brugerens "
 "tilstande p奪 kanal"
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;brugertilstande&gt;: S脱t dine tilstande p奪 netv脱rket"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;navn&gt; [-pubkey]:  F奪 server operat淡r privilegier"
 
-#: src/protocols/silc/silc.c:1408
+#: src/protocols/silc/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10117,36 +10991,36 @@
 "invite &lt;kanal&gt; [-|+]&lt;navn&gt;:  invit辿r navn eller tilf淡j/fjern fra "
 "kanal invitationsliste"
 
-#: src/protocols/silc/silc.c:1412
+#: src/protocols/silc/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kanal&gt; &lt;navn&gt; [comment]:  Spark klient fra kanal"
 
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]: Vis serverens administrative detaljer"
 
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;navn&gt;]:  Udvis klient fra kanal"
 
-#: src/protocols/silc/silc.c:1424
+#: src/protocols/silc/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;navn|server&gt;:  Hent klient eller servers offentlige n淡gle"
 
-#: src/protocols/silc/silc.c:1428
+#: src/protocols/silc/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats: Vis server- og netv脱rksstatistik"
 
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: Send PING til den forbundne server"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Vis brugere p奪 kanalen lige nu"
 
-#: src/protocols/silc/silc.c:1441
+#: src/protocols/silc/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10154,30 +11028,6 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(er)&gt;:  Vis angivne "
 "brugere p奪 kanal(er)"
 
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "Kvikbeskeder"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "Skriv alle kvikbeskeder under med digital signatur"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "Bekr脱ft alle kvikbeskedssignaturer"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "Kanalbeskeder"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "Skriv alle kanal beskeder under med digital signatur"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "Bekr脱ft alle kanal beskeds-signaturer"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10187,91 +11037,113 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: src/protocols/silc/silc.c:1800
 msgid "SILC Protocol Plugin"
 msgstr "SILC prokotolmodul"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: src/protocols/silc/silc.c:1802
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokol"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1839
 msgid "Public Key file"
 msgstr "Offentlig n淡gle fil"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1843
 msgid "Private Key file"
 msgstr "Privat n淡gle fil"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1853
+msgid "Cipher"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1863
+msgid "HMAC"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1866
 msgid "Public key authentication"
 msgstr "Offentlig n淡gle godkendelse"
 
-#: src/protocols/silc/silc.c:1611
+#: src/protocols/silc/silc.c:1869
 msgid "Reject watching by other users"
 msgstr "N脱gt andre brugere at kigge p奪"
 
-#: src/protocols/silc/silc.c:1614
+#: src/protocols/silc/silc.c:1872
 msgid "Block invites"
 msgstr "Blok辿r invitationer"
 
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1875
 msgid "Block IMs without Key Exchange"
 msgstr "Blok辿r kvikbeskeder uden n淡gleudveksling"
 
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1878
 msgid "Reject online status attribute requests"
 msgstr "N脱gt anmodning om online status-attributter"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: src/protocols/silc/silc.c:1881
+msgid "Block messages to whiteboard"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1884
+#, fuzzy
+msgid "Automatically open whiteboard"
+msgstr "_Udvid automatisk kontakter"
+
+#: src/protocols/silc/silc.c:1887
+#, fuzzy
+msgid "Digitally sign and verify all messages"
+msgstr "Skriv alle kvikbeskeder under med digital signatur"
+
+#: src/protocols/silc/util.c:206 src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
 msgstr "Opretter SILC n淡glepar..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Rigtigt navn: \t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Brugernavn. \t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "E-Post: \t\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "V脱rtsnavn: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritme: \t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "N淡gle l脱ngde: \t%d bits\n"
 
-#: src/protocols/silc/util.c:327
+#: src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10282,7 +11154,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10291,26 +11163,97 @@
 "Offentlig n淡gle 'babbleprint':\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:333 src/protocols/silc/util.c:334
 msgid "Public Key Information"
 msgstr "Offentlige n淡gle oplysninger"
 
-#: src/protocols/silc/util.c:515
+#: src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "Persons淡ger"
 
-#: src/protocols/silc/util.c:539
+#: src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Computer"
 
-#: src/protocols/silc/util.c:543
+#: src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "H奪ndholdt"
 
-#: src/protocols/silc/util.c:545
+#: src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "Terminal"
 
+#: src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#: src/protocols/silc/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+#: src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr ""
+
+#: src/protocols/simple/simple.c:202
+#, c-format
+msgid ""
+"Could not add the buddy %s because every simple user has to start with "
+"'sip:'."
+msgstr ""
+
+#: src/protocols/simple/simple.c:1227
+#, fuzzy
+msgid "Could not create listen socket"
+msgstr "Kunne ikke oprette sokkel"
+
+#: src/protocols/simple/simple.c:1281
+#, fuzzy
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "IRC navne m奪 ikke indeholde mellemrum og lignende"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: src/protocols/simple/simple.c:1428
+#, fuzzy
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SILC prokotolmodul"
+
+#. *  summary
+#: src/protocols/simple/simple.c:1429
+#, fuzzy
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SILC prokotolmodul"
+
+#: src/protocols/simple/simple.c:1451
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+#: src/protocols/simple/simple.c:1454
+#, fuzzy
+msgid "Use UDP"
+msgstr "Bruger ID"
+
+#: src/protocols/simple/simple.c:1456
+#, fuzzy
+msgid "Use proxy"
+msgstr "Ingen mellemv脱rt"
+
+#: src/protocols/simple/simple.c:1458
+#, fuzzy
+msgid "Proxy"
+msgstr "Ingen mellemv脱rt"
+
 #: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
@@ -10444,9 +11387,8 @@
 msgstr "En ukendt fejl, %d, er opst奪et. Info: %s"
 
 #: src/protocols/toc/toc.c:584
-#, fuzzy
 msgid "Invalid Groupname"
-msgstr "Ugyldig gruppe"
+msgstr "Ugyldigt gruppenavn"
 
 #: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
@@ -10482,10 +11424,18 @@
 msgid "Get Dir Info"
 msgstr "Hent mappeoplysninger"
 
+#: src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "Ret brugeroplysninger"
+
 #: src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Ret mappeoplysninger"
 
+#: src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "Skift adgangskode"
+
 #: src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
@@ -10530,27 +11480,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2317 src/protocols/toc/toc.c:2319
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolmodul"
 
-#: src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2338
 msgid "TOC host"
 msgstr "TOC V脱rt"
 
-#: src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2342
 msgid "TOC port"
 msgstr "TOC Port"
 
-#: src/protocols/yahoo/yahoo.c:706
+#: src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo! besked blev ikke sendt."
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: src/protocols/yahoo/yahoo.c:758 src/protocols/yahoo/yahoo.c:3487
 msgid "Buzz!!"
 msgstr "Bip!!"
 
-#: src/protocols/yahoo/yahoo.c:797
+#: src/protocols/yahoo/yahoo.c:803
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systembesked til %s:"
@@ -10558,21 +11508,21 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:887
+#: src/protocols/yahoo/yahoo.c:899
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Brugeren %s vil tilf淡je %s til hans eller hendes venneliste%s%s."
 
-#: src/protocols/yahoo/yahoo.c:893
+#: src/protocols/yahoo/yahoo.c:905
 msgid "Message (optional) :"
 msgstr "Besked (valgfri) :"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: src/protocols/yahoo/yahoo.c:947
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s har n脱gtet din anmodning om at tilf淡je dem til din venneliste"
 
-#: src/protocols/yahoo/yahoo.c:938
+#: src/protocols/yahoo/yahoo.c:950
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10582,11 +11532,11 @@
 "grund:\n"
 "%s"
 
-#: src/protocols/yahoo/yahoo.c:941
+#: src/protocols/yahoo/yahoo.c:953
 msgid "Add buddy rejected"
 msgstr "Vennetilf淡jelse n脱gtet"
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: src/protocols/yahoo/yahoo.c:1696
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10597,11 +11547,11 @@
 "Denne version af Gaim vil h淡jst sandsynligt ikke kunne logge p奪 Yahoo. Tjek %"
 "s for opdateringer."
 
-#: src/protocols/yahoo/yahoo.c:1687
+#: src/protocols/yahoo/yahoo.c:1699
 msgid "Failed Yahoo! Authentication"
 msgstr "Fejlede Yahoo! godkendelse"
 
-#: src/protocols/yahoo/yahoo.c:1760
+#: src/protocols/yahoo/yahoo.c:1772
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10610,19 +11560,19 @@
 "Du har pr淡vet at ignorere %s, men brugeren er p奪 din venneliste. Hvis du "
 "klikker p奪 \"Ja\" vil det fjerne og ignorere vennen."
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "Ignor辿r ven?"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "Ugyldigt brugernavn."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "Normal godkendelse fejlede!"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:1821
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10634,127 +11584,123 @@
 "脱ndret. Gaim vil nu fors淡ge at logge ind via Web Messenger-"
 "godkendelsesmetoden, som vil resultere i begr脱nset funktionalitet."
 
-#: src/protocols/yahoo/yahoo.c:1817
+#: src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "Forkert adgangskode."
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: src/protocols/yahoo/yahoo.c:1832
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Din konto er l奪st. Log ind p奪 Yahoo! websitet."
 
-#: src/protocols/yahoo/yahoo.c:1823
+#: src/protocols/yahoo/yahoo.c:1835
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Ukendt fejl nummer %d. Pr淡v at logge ind p奪 Yahoo! websitet for at fixe "
 "dette."
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: src/protocols/yahoo/yahoo.c:1889
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Kunne ikke tilf淡je ven %s til gruppe %s til serverlisten p奪 konto %s."
 
-#: src/protocols/yahoo/yahoo.c:1880
+#: src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
 msgstr "Kunne ikke tilf淡je ven til serverliste"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/yahoo.c:2136 src/protocols/yahoo/yahoo.c:2282
 #: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "Kunne ikke l脱se"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoo.c:2304 src/protocols/yahoo/yahoo.c:2432
+#: src/protocols/yahoo/yahoo.c:2531 src/protocols/yahoo/yahoo.c:2541
+#: src/protocols/yahoo/yahoochat.c:1395 src/protocols/yahoo/yahoochat.c:1465
 #: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Forbindelsesfejl"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
+#: src/protocols/yahoo/yahoo.c:2644 src/protocols/yahoo/yahoo.c:3223
+msgid "Not at Home"
 msgstr "Ikke hjemme"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
+#: src/protocols/yahoo/yahoo.c:2646 src/protocols/yahoo/yahoo.c:3226
+msgid "Not at Desk"
 msgstr "Ikke ved skrivebordet"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
+#: src/protocols/yahoo/yahoo.c:2648 src/protocols/yahoo/yahoo.c:3229
+msgid "Not in Office"
 msgstr "Ikke p奪 kontoret"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: src/protocols/yahoo/yahoo.c:2652 src/protocols/yahoo/yahoo.c:3235
 msgid "On Vacation"
 msgstr "P奪 ferie"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: src/protocols/yahoo/yahoo.c:2656 src/protocols/yahoo/yahoo.c:3241
 msgid "Stepped Out"
 msgstr "Tr奪dt udenfor"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2749 src/protocols/yahoo/yahoo.c:2778
 msgid "Not on server list"
 msgstr "Ikke p奪 server liste"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
-#, fuzzy
+#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2855
 msgid "Appear Online"
 msgstr "Virk offline"
 
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
-#, fuzzy
+#: src/protocols/yahoo/yahoo.c:2798 src/protocols/yahoo/yahoo.c:2877
 msgid "Appear Permanently Offline"
-msgstr "Virk offline"
-
-#: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
-msgid "Stealth"
-msgstr "Landsdel"
-
-#: src/protocols/yahoo/yahoo.c:2849
-#, fuzzy
+msgstr "Virk permanent offline"
+
+#: src/protocols/yahoo/yahoo.c:2816
+msgid "Presence"
+msgstr "Tilstedev脱relse"
+
+#: src/protocols/yahoo/yahoo.c:2871
 msgid "Don't Appear Permanently Offline"
-msgstr "Virk offline"
-
-#: src/protocols/yahoo/yahoo.c:2896
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2918
 msgid "Join in Chat"
 msgstr "Deltag i chat"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: src/protocols/yahoo/yahoo.c:2923
 msgid "Initiate Conference"
 msgstr "Start konference"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:2948
+msgid "Presence Settings"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2954
 msgid "Start Doodling"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2985
 msgid "Active which ID?"
 msgstr "Aktiv辿r hvilket ID?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2994
 msgid "Join who in chat?"
 msgstr "Deltag med hvem i chat?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3004
 msgid "Activate ID..."
 msgstr "Aktiv辿r ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
+#: src/protocols/yahoo/yahoo.c:3008
+msgid "Join User in Chat..."
 msgstr "Deltag med bruger i chat..."
 
-#: src/protocols/yahoo/yahoo.c:3541
+#: src/protocols/yahoo/yahoo.c:3529
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;rum&gt;: Deltag i chatrum p奪 Yahoo-netv脱rket."
 
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
+#: src/protocols/yahoo/yahoo.c:3533
+msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz en kontakt for at f奪 deres opm脱rksomhed"
 
-#: src/protocols/yahoo/yahoo.c:3550
+#: src/protocols/yahoo/yahoo.c:3538
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10768,68 +11714,68 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: src/protocols/yahoo/yahoo.c:3630 src/protocols/yahoo/yahoo.c:3632
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolmodul"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: src/protocols/yahoo/yahoo.c:3649
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: src/protocols/yahoo/yahoo.c:3652
 msgid "Pager host"
 msgstr "Bipper v脱rt"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: src/protocols/yahoo/yahoo.c:3655
 msgid "Japan Pager host"
 msgstr "Japan Bipper v脱rt"
 
+#: src/protocols/yahoo/yahoo.c:3658
+msgid "Pager port"
+msgstr "Bipper port"
+
+#: src/protocols/yahoo/yahoo.c:3661
+msgid "File transfer host"
+msgstr "Filoverf淡rsel v脱rtsnavn"
+
+#: src/protocols/yahoo/yahoo.c:3664
+msgid "Japan file transfer host"
+msgstr "Japan filoverf淡rsel v脱rtsnavn"
+
 #: src/protocols/yahoo/yahoo.c:3667
-msgid "Pager port"
-msgstr "Bipper port"
+msgid "File transfer port"
+msgstr "Filoverf淡rsel port"
 
 #: src/protocols/yahoo/yahoo.c:3670
-msgid "File transfer host"
-msgstr "Filoverf淡rsel v脱rtsnavn"
+msgid "Chat room locale"
+msgstr "Chatrum tegns脱t"
 
 #: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
-msgstr "Japan Filoverf淡rsel v脱rtsnavn"
+msgid "Chat room list URL"
+msgstr "Chatrumsliste adresse"
 
 #: src/protocols/yahoo/yahoo.c:3676
-msgid "File transfer port"
-msgstr "Filoverf淡rsel port"
+msgid "YCHT host"
+msgstr "YCHT v脱rt"
 
 #: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
-msgstr "Chatrum tegns脱t"
-
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
-msgstr "Chatrumsliste adresse"
-
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
-msgstr "YCHT v脱rt"
-
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
-msgstr "YCHT Port"
-
-#: src/protocols/yahoo/yahoo_profile.c:672
+msgid "YCHT port"
+msgstr "YCHT port"
+
+#: src/protocols/yahoo/yahoo_profile.c:676
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP-adresse:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan profil"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: src/protocols/yahoo/yahoo_profile.c:753
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profil"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: src/protocols/yahoo/yahoo_profile.c:797
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10837,62 +11783,62 @@
 "Desv脱rre, profiler der er markeret som indeholdende indhold der ikke er for "
 "b淡rn, er ikke underst淡ttet."
 
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: src/protocols/yahoo/yahoo_profile.c:799
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
 "Vis du vil vise denne profil, skal du bes淡ge dette link i din webbrowser"
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: src/protocols/yahoo/yahoo_profile.c:975
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
 #: src/protocols/yahoo/yahoo_profile.c:1047
 #: src/protocols/yahoo/yahoo_profile.c:1051
+#: src/protocols/yahoo/yahoo_profile.c:1055
 msgid "Hobbies"
 msgstr "Hobbyer"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
 #: src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/yahoo/yahoo_profile.c:1069
 msgid "Latest News"
 msgstr "Seneste nyt"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: src/protocols/yahoo/yahoo_profile.c:1090
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: src/protocols/yahoo/yahoo_profile.c:1105
 msgid "Cool Link 1"
 msgstr "Sejt link 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
-msgid "Cool Link 2"
-msgstr "Sejt link 1"
-
 #: src/protocols/yahoo/yahoo_profile.c:1110
+msgid "Cool Link 2"
+msgstr "Sejt link 1"
+
+#: src/protocols/yahoo/yahoo_profile.c:1114
 msgid "Cool Link 3"
 msgstr "Sejt link 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
+#: src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Last Update"
 msgstr "Sidst opdateret"
 
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: src/protocols/yahoo/yahoo_profile.c:1133
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Bruger oplysninger for %s er ikke tilg脱ngelige"
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr ""
-"Desv脱rre, denne profil er i et sprog som ikke er underst淡ttet p奪 nuv脱rende "
-"tidspunkt."
-
-#: src/protocols/yahoo/yahoo_profile.c:1151
+#: src/protocols/yahoo/yahoo_profile.c:1139
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"Desv脱rre, denne profil er i et sprog eller format som ikke er underst淡ttet p奪"
+" nuv脱rende tidspunkt."
+
+#: src/protocols/yahoo/yahoo_profile.c:1155
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10900,7 +11846,7 @@
 "Kunne ikke modtage brugerens profil. Dette er h淡jst sandsynligt et "
 "midlertidigt server problem. Pr淡v igen senere."
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: src/protocols/yahoo/yahoo_profile.c:1158
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10911,7 +11857,7 @@
 "finde en brugers profil. Hvis du ved at brugeren eksisterer, s奪 pr淡v igen "
 "senere."
 
-#: src/protocols/yahoo/yahoo_profile.c:1162
+#: src/protocols/yahoo/yahoo_profile.c:1166
 msgid "The user's profile is empty."
 msgstr "Brugerens profil er tom."
 
@@ -10950,19 +11896,19 @@
 msgid "Fetching the room list failed."
 msgstr "Hentning af rumliste fejlede."
 
-#: src/protocols/yahoo/yahoochat.c:1379
+#: src/protocols/yahoo/yahoochat.c:1381
 msgid "Voices"
 msgstr "Stemmer"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: src/protocols/yahoo/yahoochat.c:1384
 msgid "Webcams"
 msgstr "Webkameraer"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoochat.c:1395 src/protocols/yahoo/yahoochat.c:1465
 msgid "Unable to fetch room list."
 msgstr "Ikke i stand til at hente rumliste."
 
-#: src/protocols/yahoo/yahoochat.c:1453
+#: src/protocols/yahoo/yahoochat.c:1458
 msgid "User Rooms"
 msgstr "Brugerrum"
 
@@ -10979,77 +11925,76 @@
 "indstillingen i Konto-redigeringen)"
 
 #: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kunne ikke sende til chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Bruger:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1139
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Skjult eller ikke logget ind"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1141
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>%s siden %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1472 src/protocols/zephyr/zephyr.c:1473
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: src/protocols/zephyr/zephyr.c:2274
 msgid "_Class:"
 msgstr "_Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: src/protocols/zephyr/zephyr.c:2280
 msgid "_Instance:"
 msgstr "_Instans:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2286
 msgid "_Recipient:"
 msgstr "_Modtager:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: src/protocols/zephyr/zephyr.c:2297
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Fors淡get p奪 at abbonnere p奪 %s,%s,%s fejlede"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: src/protocols/zephyr/zephyr.c:2603
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;navn&gt;: Find lokalisering p奪 bruger"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: src/protocols/zephyr/zephyr.c:2608
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;navn&gt;: Find lokalering p奪 bruger"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: src/protocols/zephyr/zephyr.c:2613
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instans&gt;: S脱t instans der skal bruges p奪 denne class"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2618
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instans&gt;: S脱t instans der skal bruges p奪 denne class"
 
-#: src/protocols/zephyr/zephyr.c:2622
-#, fuzzy
+#: src/protocols/zephyr/zephyr.c:2623
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instans&gt;: S脱t instans der skal bruges p奪 denne class"
-
-#: src/protocols/zephyr/zephyr.c:2628
+msgstr "topic &lt;instans&gt;: S脱t instans der skal bruges p奪 denne class"
+
+#: src/protocols/zephyr/zephyr.c:2629
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;class&gt; &lt;instans&gt; &lt;modtager&gt;: Deltag i en ny chat"
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: src/protocols/zephyr/zephyr.c:2634
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;instans&gt;: Send en besked til &lt;besked,<i>instans</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: src/protocols/zephyr/zephyr.c:2640
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11057,7 +12002,7 @@
 "zci &lt;klasse&gt; &lt;instans&gt;: Send en besked til &lt;<i>klasse</i>,"
 "<i>instans</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: src/protocols/zephyr/zephyr.c:2646
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11065,7 +12010,7 @@
 "zcir &lt;klasse&gt; &lt;instans&gt; &lt;modtager&gt;: Send en besked til &lt;"
 "<i>klasse</i>,<i>instans</i>,<i>modtager</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: src/protocols/zephyr/zephyr.c:2652
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11073,15 +12018,15 @@
 "zir &lt;instans&gt; &lt;modtager&gt;: Send en besked til &lt;MESSAGE,"
 "<i>instans</i>,<i>modtager</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: src/protocols/zephyr/zephyr.c:2657
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;klasse&gt;: Send en besked til &lt;<i>klasse</i>,PERSONAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: src/protocols/zephyr/zephyr.c:2763
 msgid "Resubscribe"
 msgstr "Gen-abbonn辿r"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: src/protocols/zephyr/zephyr.c:2766
 msgid "Retrieve subscriptions from server"
 msgstr "Modtag abbonneringer fra server"
 
@@ -11095,54 +12040,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2849 src/protocols/zephyr/zephyr.c:2851
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolmodul"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2876
 msgid "Export to .anyone"
 msgstr "Eksport辿r til .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2879
 msgid "Export to .zephyr.subs"
 msgstr "Eksport辿r til .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
+#: src/protocols/zephyr/zephyr.c:2882
 msgid "Import from .anyone"
-msgstr "Eksport辿r til .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
+msgstr "Import辿r fra .anyone"
+
+#: src/protocols/zephyr/zephyr.c:2885
 msgid "Import from .zephyr.subs"
-msgstr "Eksport辿r til .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
+msgstr "Import辿r fra .zephyr.subs"
+
+#: src/protocols/zephyr/zephyr.c:2888
 msgid "Realm"
-msgstr "Rigtige navn"
-
-#: src/protocols/zephyr/zephyr.c:2889
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:2891
 msgid "Exposure"
 msgstr "Fremvisning"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: src/proxy.c:1118 src/proxy.c:1148 src/proxy.c:1170 src/proxy.c:1182
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Proxy forbindelsesfejl %d"
+
 #. Forbidden
-#: src/proxy.c:1036
+#: src/proxy.c:1178
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Adgang n脱gtet: proxy server tillader ikke port %d tunnel."
 
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Proxy forbindelsesfejl %d"
-
-#: src/proxy.c:1874
+#: src/proxy.c:2019
 msgid "Invalid proxy settings"
 msgstr "Ugyldige mellemv脱rts indstillinger"
 
-#: src/proxy.c:1874
+#: src/proxy.c:2019
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11152,85 +12093,90 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1341
+#: src/request.h:1350
 msgid "Accept"
 msgstr "Accept辿r"
 
-#: src/server.c:243
+#: src/savedstatuses.c:502
+msgid "saved statuses"
+msgstr "gemte statuser"
+
+#: src/savedstatuses.c:688
+msgid "Hello!"
+msgstr "Hej!"
+
+#: src/savedstatuses.c:710
+msgid "I'm not here right now"
+msgstr "Jeg er her ikke lige nu"
+
+#: src/server.c:224
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s kalder sig nu for %s.\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d besked)"
-msgstr[1] "(%d beskeder)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 besked)"
-
-#: src/server.c:859
-#, fuzzy, c-format
+#: src/server.c:691
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s har inviteret %s til chatrummet %s\n"
-
-#: src/server.c:864
+msgstr ""
+"%s har inviteret %s til chatrummet %s:\n"
+"%s"
+
+#: src/server.c:696
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s har inviteret %s til chatrummet %s\n"
 
-#: src/server.c:868
+#: src/server.c:700
 msgid "Accept chat invitation?"
 msgstr "Accepter chat invitation?"
 
-#: src/status.c:153
-#, fuzzy
+#: src/status.c:152
 msgid "Unset"
-msgstr "Enhed"
-
-#: src/status.c:156
+msgstr "Ikke sat"
+
+#: src/status.c:155
 msgid "Unavailable"
 msgstr "Ikke tilg脱ngelig"
 
-#: src/status.c:621
+#: src/status.c:620
 #, c-format
 msgid "%s came back"
 msgstr "%s returnerede fra frav脱r"
 
-#: src/status.c:626
+#: src/status.c:625
 #, c-format
 msgid "%s went away"
 msgstr "%s er nu frav脱rende"
 
-#: src/status.c:1308
+#: src/status.c:1271
 #, c-format
 msgid "%s became idle"
 msgstr "%s blev inaktiv"
 
-#: src/status.c:1323
+#: src/status.c:1284
 #, c-format
 msgid "%s became unidle"
 msgstr "%s returnerede fra inaktivitet"
 
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "Automatisk frav脱rende"
+#: src/status.c:1357
+#, c-format
+msgid "+++ %s became idle"
+msgstr "--- %s blev inaktiv"
+
+#: src/status.c:1359
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s returnerede fra inaktivitet"
+
+#: src/util.c:2120
+#, c-format
+msgid "Error Reading %s"
+msgstr "Fejl ved l脱sning af %s"
 
 #: src/util.c:2121
 #, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"Fejl ved l脱sning af %s: \n"
-"%s.\n"
-
-#: src/util.c:2122
-#, fuzzy, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
@@ -11238,1127 +12184,38 @@
 "En fejl opstod da din venneliste skulle indl脱ses. Den er ikke blevet "
 "indl脱st, og den gamle fil er blevet flyttet til blist.xml~."
 
-#: src/util.c:2567
+#: src/util.c:2616
 msgid "Calculating..."
 msgstr "Udregner..."
 
-#: src/util.c:2570
+#: src/util.c:2619
 msgid "Unknown."
 msgstr "Ukendt."
 
-#: src/util.c:2600
+#: src/util.c:2649
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
 msgstr[1] "sekunder"
 
-#: src/util.c:2614
+#: src/util.c:2663
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dage"
 
-#: src/util.c:2622
+#: src/util.c:2671
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: src/util.c:2630
+#: src/util.c:2679
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutter"
 
-#: src/util.c:3053
+#: src/util.c:3117
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fejl ved oprettelse af forbindelse\n"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Venneliste sortering"
-
-#~ msgid "_Sorting:"
-#~ msgstr "_Sortering:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "Visning af venner"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "Vis brugerdetaljer"
-
-#~ msgid "Gnome Default"
-#~ msgstr "Gnome standard"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "Frav脱rsb_esked:"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "Afskedsbesked"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Genskab frav脱rstilstand efter genetablering af forbindelse"
-
-#~ msgid "Mail Server"
-#~ msgstr "Postserver:"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d nye/%d i alt)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Tjek post"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Tjek post hvert Xte sekund.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Auto-logind"
-
-#~ msgid "New..."
-#~ msgstr "Ny..."
-
-#~ msgid "Back"
-#~ msgstr "Tilbage"
-
-#~ msgid "Signoff"
-#~ msgstr "Log af"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Statusikon ops脱tning"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_Gem nye beskeder indtil der er klikket p奪 statusikonet"
-
-#~ msgid "Orientation"
-#~ msgstr "Placering"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Placering af systemomr奪det."
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "Ikke forbundet til AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "Intet k脱lenavn angivet."
-
-#~ msgid "No roomname given."
-#~ msgstr "Intet rumnavn angivet."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "Ugyldig AIM URI"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunne ikke tildele %s til en socket:\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "Kunne ikke 奪bne socket"
-
-#~ msgid "Remote Control"
-#~ msgstr "Fjernstyring"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "Giver fjernstyring til gaim programmer."
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "Giver Gaim muligheden for at blive fjernstyret ved hj脱lp af tredje-parts "
-#~ "programmer eller gennem gaim-remote v脱rkt淡jet."
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "GTK signal test"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "Test for at se at alle grafiske handlinger virker korrekt."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "N奪r en ny samtale bliver 奪bnet, vil dette udvidelsesmodul inds脱tte den "
-#~ "sidste samtale ind i den nye samtale."
-
-#~ msgid "_Apply"
-#~ msgstr "_Anvend"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Docked _venneliste er altid 淡verst"
-
-#~ msgid "Away!"
-#~ msgstr "Frav脱rende!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "Redig辿r denne besked"
-
-#~ msgid "I'm Back!"
-#~ msgstr "S奪 er jeg klar igen"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Er du sikker p奪 at du vil slette frav脱rsbeskeden \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Slet frav脱rsbesked"
-
-#~ msgid "Set All Away"
-#~ msgstr "S脱t alle frav脱rende"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "Du kan ikke gemme en frav脱rsbesked uden en titel"
-
-#~ 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."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "Du kan ikke lave en tom frav脱rsbesked"
-
-#~ msgid "New away message"
-#~ msgstr "Ny frav脱rsbesked"
-
-#~ msgid "Away title: "
-#~ msgstr "Titel: "
-
-#~ msgid "_Save"
-#~ msgstr "_Gem"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "G_em og brug"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "venneliste fejl"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "St淡rrelsen p奪 udfoldelses-pilen"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Brug: %s kommando [tilvalg] [URI]\n"
-#~ "\n"
-#~ "    KOMMANDOER:\n"
-#~ "       uri                      H奪ndt辿r AIM: URI\n"
-#~ "       away                     �bn frav脱rs-diaglogboksen med standard "
-#~ "frav脱rsbeskeden\n"
-#~ "       back                     Fjern frav脱rs-dialogboksen\n"
-#~ "       quit                     Afslut k淡rende version af Gaim\n"
-#~ "\n"
-#~ "    TILVALG:\n"
-#~ "       -h, --help [kommando]    Vis hj脱lp for kommando\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Gaim k淡rer ikke (p奪 session 0)\n"
-#~ "Gaim not running (on session 0)\n"
-#~ "Er \"fjernstyrings\" modulet indl脱st?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Brug af AIM: URI'er:\n"
-#~ "Send en besked til et brugernavn:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "I dette tilf脱lde, 'Penguin' er brugernavnet som vi vil sende beskeden "
-#~ "til, og 'hello world'\n"
-#~ " er beskeden der skal sendes. '+' skal bruges istedet for mellemrum.\n"
-#~ "Bem脱rk citationstegnene der er brugt - hvis du k淡rer dette fra en "
-#~ "kommandoskal, vil '&' have behov for at blive termineret, ellers vil "
-#~ "kommandoen stoppe p奪 det sted.\n"
-#~ "Det f淡lgende vil 奪bne et samtalevindue til et brugernavn,\n"
-#~ "med ingen besked:\n"
-#~ "\tgaim-remote uri aim:goim?screenname=Penguin\n"
-#~ "\n"
-#~ "Deltagelse i chat:\n"
-#~ "\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
-#~ "...deltager i 'PenguinLounge' chat rummet.\n"
-#~ "\n"
-#~ "Tilf淡jelse af ven til din venneliste:\n"
-#~ "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
-#~ "...sp淡rger dig om du vil tilf淡je 'Penguin' til din venneliste.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Afslut k淡rende Gaim\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Mark辿r alle konti som \"frav脱rende\" med standard frav脱rsbeskeden.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Fjern frav脱rsstatus p奪 alle konti.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Vis f脱rre indstillinger"
-
-#~ msgid "Information"
-#~ msgstr "Information"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Venner/_Log af"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/V脱rkt淡jer/Fr_av脱rende"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/V脱rkt淡jer/_Modul handlinger"
-
-#~ msgid "Rename Group"
-#~ msgstr "Omd淡b gruppe"
-
-#~ msgid "New group name"
-#~ msgstr "Nyt gruppenavn"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Indtast et nyt navn for den valgte gruppe."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Konto:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Advaret:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Advaret (%d%%)"
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/V脱rkt淡jer/Frav脱rende"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Send en besked til den valgte ven"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Hent oplysninger om den valgte ven"
-
-#~ msgid "_Chat"
-#~ msgstr "_Chat"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Deltag i chatrum"
-
-#~ msgid "_Away"
-#~ msgstr "_Frav脱rende"
-
-#~ msgid "Set an away message"
-#~ msgstr "S脱t en frav脱rsbesked"
-
-#~ msgid "Done."
-#~ msgstr "F脱rdig."
-
-#~ msgid "Signon: "
-#~ msgstr "Tilsluttet: "
-
-#~ msgid "Signon"
-#~ msgstr "Tilslut"
-
-#~ msgid "Cancel All"
-#~ msgstr "Annull辿r alle"
-
-#~ msgid "_Reconnect"
-#~ msgstr "_Genetabl辿r forbindelse"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s's forbindelse er blevet afbrudt."
-#~ "</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "Ukendt 奪rsag."
-
-#~ msgid "Reconnect _All"
-#~ msgstr "Genetabl辿r forbindelse til _alle"
-
-#~ msgid "Time"
-#~ msgstr "Tid"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Hent frav脱rsbesked"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Samtale/_Advar..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Samtale/Advar..."
-
-#~ msgid "Warn"
-#~ msgstr "Advar"
-
-#~ msgid "Warn the user"
-#~ msgstr "Advar brugeren"
-
-#~ msgid "Block the user"
-#~ msgstr "Ignor辿r brugeren"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Send en fil til brugeren"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Tilf淡j brugeren til din venneliste"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Fjern brugeren fra din venneliste"
-
-#~ msgid "Send"
-#~ msgstr "Send"
-
-#~ msgid "Invite"
-#~ msgstr "Invit辿r"
-
-#~ msgid "Invite a user"
-#~ msgstr "Invit辿r en bruger"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Tilf淡j chatten til din venneliste"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Samtale/Luk"
-
-#~ msgid "former lead developer"
-#~ msgstr "tidligere hovedudvikler"
-
-#~ msgid "former maintainer"
-#~ msgstr "tidligere vedligeholder"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "Azerbajansk"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova og Vladimir (Kaladan) Petkov"
-
-#~ msgid "Burmese"
-#~ msgstr "Burmesisk"
-
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norsk (Nynorsk)"
-
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
-
-#~ msgid "Albanian"
-#~ msgstr "Albansk"
-
-#~ msgid "Turkish"
-#~ msgstr "Tyrkisk"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainsk"
-
-#~ msgid "Xhosa"
-#~ msgstr "Xhosa"
-
-#~ msgid "Chinese"
-#~ msgstr "Kinesisk"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Brugernavn"
-
-#~ msgid "Warn User"
-#~ msgstr "Advar bruger"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Advar %s?</span>\n"
-#~ "\n"
-#~ "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"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Advar _anonymt?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Anonyme advarsler er mindre grove.</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "Vis overf淡rselsdetaljer"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "V_is navne fra serveren hvis intet alias er sat"
-
-#~ msgid "Display"
-#~ msgstr "Visning"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Vis _tidsstempel i beskeder"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ign_or辿r farver"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ignor辿r skrifttyper"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignor辿r skriftst淡rrelser"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Standard formattering"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_Send standard formattering med udg奪ende beskeder"
-
-#~ msgid "Send Message"
-#~ msgstr "Send besked"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter _sender besked"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "C_ontrol-Enter sender besked"
-
-#~ msgid "Window Closing"
-#~ msgstr "Vindue lukker"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape lukker vindue"
-
-#~ msgid "Insertions"
-#~ msgstr "Inds脱ttelser"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} inds脱tter _formattering"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(tal) _inds脱tter hum淡ransigt"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Vis knapper som:"
-
-#~ msgid "Pictures"
-#~ msgstr "Billeder"
-
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Billeder og tekst"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "Send vindue til fo_rgrunden ved aktivitet"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Vis advarselsniveauer"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "_Udvid automatisk kontakter"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Aktiv辿r \"_skr奪streg\" kommandoer"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Vis _aliaser i faneblade/titler"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "Send samtalevindue til fo_rgrunden ved aktivitet"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Send chatvindue til fo_rgrunden ved aktivitet"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Brug _fler-farvede navne i chats"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "_Placering af faneblade:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "Ny samtale _placering:"
-
-#~ msgid "Message Logs"
-#~ msgstr "Besked-logning"
-
-#~ msgid "System Logs"
-#~ msgstr "System log"
-
-#~ msgid "_Enable system log"
-#~ msgstr "_Aktiv辿r system log"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Log n奪r venner _logger p奪 og af"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Log n奪r venner bliver _inaktive og returnerer fra inaktivitet"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Log n奪r venner skifter status til _frav脱rende og ikke frav脱rende"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "Log dine _egne logind/inaktivitet/frav脱r"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "M奪ling af inaktiv _tid:"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Brug af gaim"
-
-#~ msgid "X usage"
-#~ msgstr "Brug af X"
-
-#~ msgid "Windows usage"
-#~ msgstr "Brug af Windows"
-
-#~ 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\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filnavn:</span>\t%s"
-
-#~ 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"
-
-#~ msgid "Load"
-#~ msgstr "Indl脱s"
-
-#~ msgid "Summary"
-#~ msgstr "Kort beskrivelse"
-
-#~ msgid "Details"
-#~ msgstr "Detaljer"
-
-#~ msgid "_Edit"
-#~ msgstr "R_edig辿r"
-
-#~ msgid "Interface"
-#~ msgstr "Gr脱nseflade"
-
-#~ msgid "Message Text"
-#~ msgstr "Beskedtekst"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Genveje"
-
-#~ msgid "Away Messages"
-#~ msgstr "Frav脱rsbeskeder"
-
-#~ msgid "Plugins"
-#~ msgstr "Udvidelsesmoduler"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "Ren tekst"
-
-#~ msgid "Please create an account."
-#~ msgstr "Opret en konto."
-
-#~ msgid "Login"
-#~ msgstr "Log ind"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Konto:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>_Adgangskode:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "_Konti"
-
-#~ msgid "P_references"
-#~ msgstr "_Indstillinger"
-
-#~ msgid "_Sign on"
-#~ msgstr "_Log p奪"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Brug: %s [TILVALG]...\n"
-#~ "\n"
-#~ "  -a, --acct          vis kontiredigerings vindue\n"
-#~ "  -w, --away[=BESK]   v脱r frav脱rende n奪r du logger p奪 (BESK kan bruges "
-#~ "til\n"
-#~ "                      at specificere en frav脱rsbesked)\n"
-#~ "  -l, --login[=NAVN]  automatisk login (NAVN kan bruges til at bestemme\n"
-#~ "                      hvilke konto der skal bruges, separeret af komma)\n"
-#~ "  -n, --loginwin      log ikke automatisk ind; vis logind-vinduet\n"
-#~ "  -u, --user=NAVN     brug konto NAVN\n"
-#~ "  -c, --config=MAPPE  brug MAPPE til ops脱tningsfiler\n"
-#~ "  -d, --debug         skriv fejls淡gningsbeskeder til stdout\n"
-#~ "  -v, --version       vis versionsoplysninger og afslut\n"
-#~ "  -h, --help          vis denne hj脱lp og afslut\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "Kunne ikke indl脱se indstillinger"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim kunne ikke indl脱se dine indstillinger fordi de er gemt i et gammelt "
-#~ "format der ikke l脱ngere er brugt. Du skal s脱tte dine indstillinger op i "
-#~ "Indstillings-vinduet."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "Lidt mindre kedelig standard"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Kun tilg脱ngelig for venner"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Kun frav脱rende for venner"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Kun usynlig for venner"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Kunne ikke sl奪 v脱rtsnavn op."
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "Fejl under l脱sning fra netv脱rket."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Fejl under skrivning til netv脱rket."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Godkendelse fejlede."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "Ukendt fejlkode."
-
-#~ msgid "Status: %s"
-#~ msgstr "Status: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "Kunne ikke f奪 kontakt"
-
-#~ msgid "Reading data"
-#~ msgstr "L脱ser data"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "Finder ledig server"
-
-#~ msgid "Reading server key"
-#~ msgstr "L脱ser serverens n淡gle"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "Udveksler n淡gler"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Kritisk fejl i GG-bibliotek\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "Kunne ikke kontakte server"
-
-#~ msgid "Send as message"
-#~ msgstr "Send som besked"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "S淡ger efter Gadu-Gadu server"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "Ugyldigt Gadu-Gadu UIN"
-
-#~ 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."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "Kunne ikke hente s淡geresultater"
-
-#~ msgid "Birth Year"
-#~ msgstr "F淡dsels奪r"
-
-#~ msgid "Sex"
-#~ msgstr "K淡n"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "Der er ingen venneliste gemt p奪 Gadu-Gadu serveren."
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "Kunne ikke importere venneliste fra server"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Overf淡rsel af venneliste til Gadu-Gadu serveren er g奪et godt"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Kunne ikke overf淡re venneliste til Gadu-Gadu serveren"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Venneliste p奪 Gadu-Gadu server slettet"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Kunne ikke slette venneliste p奪 Gadu-Gadu server"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "Adgangskoden blev ikke 脱ndret"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Fejl under kommunikation med Gadu-Gadu server"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "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."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Kunne ikke importere Gadu-Gadu venneliste"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "Gaim var ikke i stand til at etablere forbindelse til Gadu-Gadu "
-#~ "venneliste serveren. Pr淡v igen senere."
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "Kunne ikke eksportere venneliste"
-
-#~ 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."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Kunne ikke fjerne Gadu-Gadu vennelisten"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "Kunne ikke tilg奪 database"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim kunne ikke s淡ge i databasen, fordi fordi den ikke kunne forbinde til "
-#~ "database serveren. Pr淡v igen senere."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim kunne ikke 脱ndre din adgangskode, fordi der skete en fejl da der "
-#~ "skulle forbindes til Gadu-Gadu serveren. Pr淡v igen senere."
-
-#~ msgid "Directory Search"
-#~ msgstr "Databases淡gning"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "Kunne ikke tilg奪 bruger profilen."
-
-#~ 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 kunne ikke tilg奪 denne brugers profil fordi der skete en fejl da der "
-#~ "skulle forbindes til database serveren. Pr淡v igen senere."
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "En fejl opstod da Gaim skulle kommunikere med ICQ serveren."
-
-#~ 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"
-
-#~ msgid "Send message through server"
-#~ msgstr "Send besked gennem server"
-
-#~ msgid "Connecting..."
-#~ msgstr "Tilslutter..."
-
-#~ msgid "Nick:"
-#~ msgstr "K脱lenavn:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim bruger"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "Filoverf淡rsel afbrudt"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Venneinformation for %s"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Ugyldigt k脱lenavn '%s'"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "Ugyldigt k脱lenavn"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber profil"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Rumliste fejl"
-
-#~ msgid "Logged out"
-#~ msgstr "Logget ud"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Skjul operativsystem"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "Brugeren %s vil tilf淡je dig til sin venneliste."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Vis \"samtale lukket\"-bem脱rkninger"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Vis \"samtalen har overskredet tidsgr脱nsen\"-bem脱rkninger"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "Samtalen er blevet inaktiv og har overskredet tidsgr脱nsen."
-
-#~ msgid "%s has closed the conversation window."
-#~ msgstr "%s har lukket samtalevinduet."
-
-#~ 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."
-
-#~ msgid "User Properties"
-#~ msgstr "Brugeregenskaber"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Overf淡rsel af filen %s overskred tidsgr脱nsen."
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Du er blevet koblet af serveren, da du ogs奪 er logget ind fra en anden "
-#~ "maskine."
-
-#~ msgid "Not specified"
-#~ msgstr "Ikke angivet"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "ICQ oplysninger for %s"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "Fejl 0x%04x: Kunne ikke formattere brugernavn fordi det anmodede "
-#~ "brugernavn ender p奪 et mellemrum."
-
-#~ msgid "Visible"
-#~ msgstr "Synlig"
-
-#~ msgid "Available Message:"
-#~ msgstr "Tilg脱ngelig besked:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Jeg arbejder og h奪ber p奪 at blive distraheret -- skriv til mig!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "S脱t tilg脱ngelig-besked..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Kunne ikke forlade kanal"
-
-#~ msgid "Basic Profile"
-#~ msgstr "Basis profil"
-
-#~ msgid "Profile Information"
-#~ msgstr "Profil information"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "Beskedprotokoller"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "Jeg er fra"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "S脱t dine Trepia profil data."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Set Profile"
-#~ msgstr "S脱t profil"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "Bes淡g hjemmeside"
-
-#~ msgid "Local Users"
-#~ msgstr "Lokale brugere"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia Protokol modul"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "Du er blevet logget af, da du har logget p奪 fra en anden maskine eller "
-#~ "enhed."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Indtast din adgangskode"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s loggede ind."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s loggede p奪"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s loggede ud."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s loggede ud"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s er blevet advaret af %s.\n"
-#~ "Dit nye advarselsniveau er %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "en anonym person"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s har inviteret %s til chatrummet %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Desv脱rre, jeg er g奪et ud et 淡jeblik!"
-
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/Samtale/A_lias..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/Valgmuligheder/Vis _tidsstempler"
-
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Gaim var ikke istand til at g脱tte billedtypen p奪 filnavnet der blev "
-#~ "angivet. Bruger standardv脱rdien PNG."
-
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "Standard SILC n淡glepar"
-
-#~ msgid "SILC Public Key"
-#~ msgstr "SILC offentlig n淡gle"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "SILC privat n淡gle"
--- a/po/gl.po	Mon Dec 19 17:16:15 2005 +0000
+++ b/po/gl.po	Mon Dec 19 18:16:03 2005 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-05 21:24+0100\n"
-"PO-Revision-Date: 2005-12-05 21:38+0100\n"
+"POT-Creation-Date: 2005-12-18 20:09+0100\n"
+"PO-Revision-Date: 2005-12-17 13:04+0100\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ciphertest.c:205
+#: ../plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Proba de Cipher"
 
@@ -32,7 +32,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ciphertest.c:208 ../plugins/ciphertest.c:210
+#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with gaim."
 msgstr ""
 
@@ -86,8 +86,10 @@
 #. *< version
 #. *< summary
 #: ../plugins/contact_priority.c:180
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Permite controlar os valores asociados aos diferentes estados dos amigos."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Permite controlar os valores asociados aos diferentes estados dos amigos."
 
 #. *< description
 #: ../plugins/contact_priority.c:182
@@ -141,7 +143,7 @@
 msgstr "Pedir autorizaci坦n"
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2209
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2236
 #: ../src/gtkplugin.c:414
 msgid "Enabled"
 msgstr "Activado"
@@ -168,85 +170,118 @@
 msgid "DBus Plugin Example"
 msgstr "Exemplo de complemento DBus"
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: ../plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: ../plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - Desconectado"
-
-#: ../plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - Ausente"
-
-#: ../plugins/docklet/docklet.c:293
+#: ../plugins/docklet/docklet.c:153
+#, fuzzy
+msgid "Right-click for more unread messages...\n"
+msgstr "Premer co bot坦n dereito para m叩is opci坦ns."
+
+#: ../plugins/docklet/docklet.c:156 ../src/gtkblist.c:3244
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d mensaxe sen ler de %s\n"
+msgstr[1] "%d mensaxes sen ler de %s\n"
+
+#: ../plugins/docklet/docklet.c:376
 msgid "Show Buddy List"
 msgstr "Amosar lista de amigos"
 
-#: ../plugins/docklet/docklet.c:300
+#: ../plugins/docklet/docklet.c:381
+msgid "Unread Messages"
+msgstr "Mensaxes sen ler"
+
+#: ../plugins/docklet/docklet.c:402
 msgid "New Message..."
 msgstr "Nova mensaxe..."
 
-#: ../plugins/docklet/docklet.c:304
+#: ../plugins/docklet/docklet.c:406
 msgid "Join A Chat..."
 msgstr "Unirse a un Chat..."
 
-#: ../plugins/docklet/docklet.c:309 ../src/gtkaccount.c:2421
+#: ../plugins/docklet/docklet.c:411 ../src/gtkaccount.c:2459
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../plugins/docklet/docklet.c:310 ../src/gtkplugin.c:383
+#: ../plugins/docklet/docklet.c:412 ../src/gtkplugin.c:383
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../plugins/docklet/docklet.c:311 ../src/gtkprefs.c:1779
+#: ../plugins/docklet/docklet.c:413 ../src/gtkprefs.c:1779
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../plugins/docklet/docklet.c:315 ../src/gtkft.c:693
-#: ../src/protocols/oscar/oscar.c:8414
+#: ../plugins/docklet/docklet.c:417 ../src/gtkft.c:707
+#: ../src/protocols/oscar/oscar.c:8423
 msgid "File Transfers"
 msgstr "Transferencia de ficheiros"
 
-#: ../plugins/docklet/docklet.c:317
+#: ../plugins/docklet/docklet.c:419
 msgid "Mute Sounds"
 msgstr "Sen son"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: ../plugins/docklet/docklet.c:330
+#: ../plugins/docklet/docklet.c:432
 msgid "Quit"
 msgstr "Sa鱈r"
 
+#: ../plugins/docklet/docklet.c:573
+msgid "Blink tray icon for unread..."
+msgstr ""
+
+#: ../plugins/docklet/docklet.c:576
+msgid "_Instant Messages:"
+msgstr "Mensaxes _instant叩neas:"
+
+#: ../plugins/docklet/docklet.c:578 ../plugins/docklet/docklet.c:586
+#: ../plugins/win32/winprefs/winprefs.c:412 ../src/gtkprefs.c:816
+#: ../src/gtkprefs.c:1665
+msgid "Never"
+msgstr "Nunca"
+
+#: ../plugins/docklet/docklet.c:579
+msgid "In hidden conversations"
+msgstr "En conversaci坦ns agochadas"
+
+#: ../plugins/docklet/docklet.c:580 ../plugins/docklet/docklet.c:588
+#: ../plugins/win32/winprefs/winprefs.c:413 ../src/gtkprefs.c:818
+msgid "Always"
+msgstr "Sempre"
+
+#: ../plugins/docklet/docklet.c:584
+msgid "C_hat Messages:"
+msgstr "Mensaxes de c_hat:"
+
+#: ../plugins/docklet/docklet.c:587
+msgid "When my nick is said"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/docklet/docklet.c:460
+#: ../plugins/docklet/docklet.c:613
 msgid "System Tray Icon"
 msgstr "Icona do 叩rea de notificaci坦n do sistema"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/docklet/docklet.c:463
+#: ../plugins/docklet/docklet.c:616
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Mostra a icona para Gaim no 叩rea de notificaci坦n do sistema."
 
 #. *  description
-#: ../plugins/docklet/docklet.c:465
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+#: ../plugins/docklet/docklet.c:618
+#, fuzzy
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
 msgstr ""
 "Mostra unha icona no 叩rea de notificaci坦n do sistema (por exemplo en Gnome, "
 "KDE ou Windows) para mostrar o estado actual de Gaim. Permite un acceso "
@@ -493,8 +528,8 @@
 
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:424
-#: ../src/gtkroomlist.c:572 ../src/protocols/jabber/jabber.c:638
-#: ../src/protocols/msn/msn.c:1531
+#: ../src/gtkroomlist.c:572 ../src/protocols/jabber/jabber.c:686
+#: ../src/protocols/msn/msn.c:1513
 msgid "Name"
 msgstr "Nome"
 
@@ -512,13 +547,13 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:471
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1357 ../src/protocols/oscar/oscar.c:8185
+#: ../src/protocols/jabber/buddy.c:1357 ../src/protocols/oscar/oscar.c:8198
 msgid "Search"
 msgstr "Buscar"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:552
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4401
-#: ../src/gtkblist.c:4781
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4453
+#: ../src/gtkblist.c:4833
 msgid "Group:"
 msgstr "Grupo:"
 
@@ -553,13 +588,13 @@
 msgstr "_Asociar amigo"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:982 ../src/protocols/yahoo/yahoo.c:2797
+#: ../src/protocols/jabber/jabber.c:1037 ../src/protocols/yahoo/yahoo.c:2802
 msgid "None"
 msgstr "Ning炭n"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:518 ../src/blist.c:1277 ../src/blist.c:1498
-#: ../src/gtkblist.c:4209 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:518 ../src/blist.c:1275 ../src/blist.c:1500
+#: ../src/gtkblist.c:4261 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Amigos"
 
@@ -592,7 +627,8 @@
 #. Label
 #: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Seleccione todas as contas aos que os amigos engadiranse de forma autom叩tica"
+msgstr ""
+"Seleccione todas as contas aos que os amigos engadiranse de forma autom叩tica"
 
 #: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:112
 #: ../plugins/idle.c:147 ../src/gtkpounce.c:1167
@@ -624,14 +660,15 @@
 
 #: ../plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
-msgstr "Introduza o nome de usuario do seu amigo e o tipo de conta m叩is abaixo."
+msgstr ""
+"Introduza o nome de usuario do seu amigo e o tipo de conta m叩is abaixo."
 
 #: ../plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tipo de conta:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
+#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:764
+msgid "Screen name:"
 msgstr "Nome de usuario:"
 
 #. Optional Information section
@@ -695,7 +732,8 @@
 
 #: ../plugins/history.c:188
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Mostra as conversaci坦ns rexistradas previamente nas novas conversaci坦ns."
+msgstr ""
+"Mostra as conversaci坦ns rexistradas previamente nas novas conversaci坦ns."
 
 #: ../plugins/history.c:189
 msgid ""
@@ -723,7 +761,8 @@
 #. *  description
 #: ../plugins/iconaway.c:104 ../plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Iconiza a lista de amigos e de conversaci坦ns cando vostede est叩 ausente."
+msgstr ""
+"Iconiza a lista de amigos e de conversaci坦ns cando vostede est叩 ausente."
 
 #: ../plugins/idle.c:116
 msgid "Minutes"
@@ -927,7 +966,8 @@
 
 #: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Engade unha pequena caixa 叩 lista de amigos que mostra se ten novo correo."
+msgstr ""
+"Engade unha pequena caixa 叩 lista de amigos que mostra se ten novo correo."
 
 #: ../plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
@@ -1206,7 +1246,8 @@
 
 #: ../plugins/spellchk.c:2132 ../plugins/spellchk.c:2133
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Rempraza o texto das mensaxes sa鱈ntes seg炭n as regras definidas polo usuario."
+msgstr ""
+"Rempraza o texto das mensaxes sa鱈ntes seg炭n as regras definidas polo usuario."
 
 #. *< type
 #. *< ui_requirement
@@ -1260,7 +1301,8 @@
 #. *  description
 #: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Proporciona un recubrimento a trav辿s das bibliotecas de soporte de SSL."
+msgstr ""
+"Proporciona un recubrimento a trav辿s das bibliotecas de soporte de SSL."
 
 #: ../plugins/statenotify.c:49
 #, c-format
@@ -1384,7 +1426,8 @@
 #. *  description
 #: ../plugins/timestamp.c:278 ../plugins/timestamp.c:280
 msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Engade unha marca de tempo ao estilo iChat nas conversaci坦ns cada N minutos."
+msgstr ""
+"Engade unha marca de tempo ao estilo iChat nas conversaci坦ns cada N minutos."
 
 #: ../plugins/win32/transparency/win2ktrans.c:183
 #: ../plugins/win32/transparency/win2ktrans.c:569
@@ -1472,7 +1515,7 @@
 msgstr "_Iniciar Gaim ao iniciar Windows"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:405 ../src/gtkblist.c:3452
+#: ../plugins/win32/winprefs/winprefs.c:405 ../src/gtkblist.c:3498
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
@@ -1485,15 +1528,6 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "_Manter a fiestra de amigos por enriba:"
 
-#: ../plugins/win32/winprefs/winprefs.c:412 ../src/gtkprefs.c:816
-#: ../src/gtkprefs.c:1665
-msgid "Never"
-msgstr "Nunca"
-
-#: ../plugins/win32/winprefs/winprefs.c:413 ../src/gtkprefs.c:818
-msgid "Always"
-msgstr "Sempre"
-
 #. XXX: Did this ever work?
 #: ../plugins/win32/winprefs/winprefs.c:415
 msgid "Only when docked"
@@ -1547,60 +1581,59 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:528
-#: ../src/gtkdialogs.c:665 ../src/gtkdialogs.c:733 ../src/gtkrequest.c:287
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:535
+#: ../src/gtkdialogs.c:672 ../src/gtkdialogs.c:740 ../src/gtkrequest.c:287
 #: ../src/protocols/gg/gg.c:463 ../src/protocols/gg/gg.c:604
-#: ../src/protocols/gg/gg.c:741 ../src/protocols/jabber/jabber.c:1162
+#: ../src/protocols/gg/gg.c:740 ../src/protocols/jabber/jabber.c:1217
 #: ../src/protocols/jabber/xdata.c:337 ../src/protocols/msn/msn.c:250
 #: ../src/protocols/msn/msn.c:265 ../src/protocols/msn/msn.c:280
-#: ../src/protocols/msn/msn.c:295 ../src/protocols/oscar/oscar.c:2896
-#: ../src/protocols/oscar/oscar.c:4398 ../src/protocols/oscar/oscar.c:4479
-#: ../src/protocols/oscar/oscar.c:7914 ../src/protocols/oscar/oscar.c:8039
-#: ../src/protocols/oscar/oscar.c:8064 ../src/protocols/oscar/oscar.c:8116
-#: ../src/protocols/sametime/sametime.c:5358 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1147 ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
-#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:739 ../src/protocols/yahoo/yahoo.c:2982
-#: ../src/protocols/yahoo/yahoo.c:2991 ../src/request.h:1331
+#: ../src/protocols/msn/msn.c:295 ../src/protocols/oscar/oscar.c:2890
+#: ../src/protocols/oscar/oscar.c:4392 ../src/protocols/oscar/oscar.c:4473
+#: ../src/protocols/oscar/oscar.c:7927 ../src/protocols/oscar/oscar.c:8052
+#: ../src/protocols/oscar/oscar.c:8077 ../src/protocols/oscar/oscar.c:8129
+#: ../src/protocols/silc/buddy.c:466 ../src/protocols/silc/buddy.c:1147
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
+#: ../src/protocols/silc/chat.c:724 ../src/protocols/silc/ops.c:1297
+#: ../src/protocols/silc/ops.c:1910 ../src/protocols/silc/silc.c:739
+#: ../src/protocols/yahoo/yahoo.c:2987 ../src/protocols/yahoo/yahoo.c:2996
+#: ../src/request.h:1340
 msgid "OK"
 msgstr "Aceptar"
 
 #: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1178
-#: ../src/gtkaccount.c:2129 ../src/gtkaccount.c:2592 ../src/gtkblist.c:4819
-#: ../src/gtkdialogs.c:529 ../src/gtkdialogs.c:666 ../src/gtkdialogs.c:734
-#: ../src/gtkdialogs.c:753 ../src/gtkdialogs.c:775 ../src/gtkdialogs.c:795
-#: ../src/gtkdialogs.c:839 ../src/gtkdialogs.c:901 ../src/gtkdialogs.c:943
-#: ../src/gtkdialogs.c:985 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkaccount.c:2156 ../src/gtkaccount.c:2627 ../src/gtkblist.c:4874
+#: ../src/gtkdialogs.c:536 ../src/gtkdialogs.c:673 ../src/gtkdialogs.c:741
+#: ../src/gtkdialogs.c:760 ../src/gtkdialogs.c:782 ../src/gtkdialogs.c:802
+#: ../src/gtkdialogs.c:846 ../src/gtkdialogs.c:908 ../src/gtkdialogs.c:950
+#: ../src/gtkdialogs.c:992 ../src/gtkimhtmltoolbar.c:419
 #: ../src/gtkpounce.c:1000 ../src/gtkprivacy.c:595 ../src/gtkprivacy.c:608
 #: ../src/gtkprivacy.c:633 ../src/gtkprivacy.c:644 ../src/gtkrequest.c:288
 #: ../src/gtksavedstatuses.c:298 ../src/protocols/gg/gg.c:464
-#: ../src/protocols/gg/gg.c:605 ../src/protocols/gg/gg.c:742
-#: ../src/protocols/gg/gg.c:831 ../src/protocols/jabber/buddy.c:573
+#: ../src/protocols/gg/gg.c:605 ../src/protocols/gg/gg.c:741
+#: ../src/protocols/gg/gg.c:830 ../src/protocols/jabber/buddy.c:573
 #: ../src/protocols/jabber/buddy.c:1358 ../src/protocols/jabber/buddy.c:1392
-#: ../src/protocols/jabber/chat.c:780 ../src/protocols/jabber/jabber.c:707
-#: ../src/protocols/jabber/jabber.c:1163 ../src/protocols/jabber/xdata.c:338
+#: ../src/protocols/jabber/chat.c:780 ../src/protocols/jabber/jabber.c:755
+#: ../src/protocols/jabber/jabber.c:1218 ../src/protocols/jabber/xdata.c:338
 #: ../src/protocols/msn/msn.c:251 ../src/protocols/msn/msn.c:266
 #: ../src/protocols/msn/msn.c:281 ../src/protocols/msn/msn.c:296
-#: ../src/protocols/msn/msn.c:313 ../src/protocols/oscar/oscar.c:1590
-#: ../src/protocols/oscar/oscar.c:2897 ../src/protocols/oscar/oscar.c:4356
-#: ../src/protocols/oscar/oscar.c:4399 ../src/protocols/oscar/oscar.c:4436
-#: ../src/protocols/oscar/oscar.c:4480 ../src/protocols/oscar/oscar.c:7915
-#: ../src/protocols/oscar/oscar.c:8040 ../src/protocols/oscar/oscar.c:8065
-#: ../src/protocols/oscar/oscar.c:8117 ../src/protocols/oscar/oscar.c:8186
-#: ../src/protocols/sametime/sametime.c:3427
-#: ../src/protocols/sametime/sametime.c:3510
-#: ../src/protocols/sametime/sametime.c:3637
-#: ../src/protocols/sametime/sametime.c:4473
-#: ../src/protocols/sametime/sametime.c:5359
-#: ../src/protocols/sametime/sametime.c:5576
-#: ../src/protocols/sametime/sametime.c:5662 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/msn/msn.c:313 ../src/protocols/oscar/oscar.c:1584
+#: ../src/protocols/oscar/oscar.c:2891 ../src/protocols/oscar/oscar.c:4350
+#: ../src/protocols/oscar/oscar.c:4393 ../src/protocols/oscar/oscar.c:4430
+#: ../src/protocols/oscar/oscar.c:4474 ../src/protocols/oscar/oscar.c:7928
+#: ../src/protocols/oscar/oscar.c:8053 ../src/protocols/oscar/oscar.c:8078
+#: ../src/protocols/oscar/oscar.c:8130 ../src/protocols/oscar/oscar.c:8199
+#: ../src/protocols/sametime/sametime.c:3338
+#: ../src/protocols/sametime/sametime.c:3421
+#: ../src/protocols/sametime/sametime.c:3548
+#: ../src/protocols/sametime/sametime.c:4392
+#: ../src/protocols/sametime/sametime.c:5394
+#: ../src/protocols/sametime/sametime.c:5480 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1043 ../src/protocols/silc/buddy.c:1148
 #: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:740
-#: ../src/protocols/silc/silc.c:945 ../src/protocols/yahoo/yahoo.c:2983
-#: ../src/protocols/yahoo/yahoo.c:2992 ../src/request.h:1331
-#: ../src/request.h:1341
+#: ../src/protocols/silc/silc.c:945 ../src/protocols/yahoo/yahoo.c:2988
+#: ../src/protocols/yahoo/yahoo.c:2997 ../src/request.h:1340
+#: ../src/request.h:1350
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1614,7 +1647,7 @@
 msgstr "Erro de conexi坦n"
 
 #: ../src/account.c:1076 ../src/protocols/gg/gg.c:645
-#: ../src/protocols/jabber/jabber.c:1115
+#: ../src/protocols/jabber/jabber.c:1170
 msgid "New passwords do not match."
 msgstr "Os novos contrasinais non coinciden."
 
@@ -1655,7 +1688,7 @@
 
 #: ../src/account.c:1672 ../src/gtkft.c:157
 #: ../src/protocols/jabber/buddy.c:633 ../src/protocols/jabber/buddy.c:1083
-#: ../src/protocols/jabber/buddy.c:1100 ../src/protocols/novell/novell.c:2863
+#: ../src/protocols/jabber/buddy.c:1100 ../src/protocols/novell/novell.c:2861
 msgid "Unknown"
 msgstr "Desco単ecido"
 
@@ -1663,11 +1696,11 @@
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../src/blist.c:1180
+#: ../src/blist.c:1178
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/blist.c:1879
+#: ../src/blist.c:1881
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1682,7 +1715,7 @@
 "%d amigos do grupo %s non se eliminou porque s炭a conta non estaba conectada. "
 "Este amigo e seus grupos non foron eliminados.\n"
 
-#: ../src/blist.c:1888
+#: ../src/blist.c:1890
 msgid "Group not removed"
 msgstr "Grupo non eliminado"
 
@@ -1897,376 +1930,373 @@
 "<b>Tama単o da imaxe:</b> %dx%d"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:725
+#: ../src/gtkaccount.c:742
 msgid "Login Options"
 msgstr "Opci坦ns de conexi坦n"
 
-#: ../src/gtkaccount.c:742 ../src/gtkft.c:625
+#: ../src/gtkaccount.c:759 ../src/gtkft.c:639
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkaccount.c:747
-msgid "Screen name:"
-msgstr "Nome de usuario:"
-
-#: ../src/gtkaccount.c:821
+#: ../src/gtkaccount.c:841
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../src/gtkaccount.c:826 ../src/gtkblist.c:4384 ../src/gtkblist.c:4766
+#: ../src/gtkaccount.c:846 ../src/gtkblist.c:4436 ../src/gtkblist.c:4818
 msgid "Alias:"
 msgstr "Alcume:"
 
-#: ../src/gtkaccount.c:830
+#: ../src/gtkaccount.c:850
 msgid "Remember password"
 msgstr "Recordar contrasinal"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:875
+#: ../src/gtkaccount.c:900
 msgid "User Options"
 msgstr "Opci坦ns de usuario"
 
-#: ../src/gtkaccount.c:888
+#: ../src/gtkaccount.c:913
 msgid "New mail notifications"
 msgstr "Notificaci坦ns de correo novo"
 
-#: ../src/gtkaccount.c:897
+#: ../src/gtkaccount.c:922
 msgid "Buddy icon:"
 msgstr "Icona de amigo:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:988
+#: ../src/gtkaccount.c:1013
 #, c-format
 msgid "%s Options"
 msgstr "Opci坦ns de %s"
 
-#: ../src/gtkaccount.c:1189
+#: ../src/gtkaccount.c:1214
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuraci坦n global do proxy"
 
-#: ../src/gtkaccount.c:1195
+#: ../src/gtkaccount.c:1220
 msgid "No Proxy"
 msgstr "Sen proxy"
 
-#: ../src/gtkaccount.c:1201
+#: ../src/gtkaccount.c:1226
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1207
+#: ../src/gtkaccount.c:1232
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1213
+#: ../src/gtkaccount.c:1238
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1219 ../src/gtkprefs.c:1030
+#: ../src/gtkaccount.c:1244 ../src/gtkprefs.c:1030
 msgid "Use Environmental Settings"
 msgstr "Usar configuraci坦n do entorno"
 
-#: ../src/gtkaccount.c:1253
+#: ../src/gtkaccount.c:1278
 msgid "you can see the butterflies mating"
 msgstr "podes ver as volvoretas apare叩ndose"
 
-#: ../src/gtkaccount.c:1257
+#: ../src/gtkaccount.c:1282
 msgid "If you look real closely"
 msgstr "Se miras de cerca"
 
-#: ../src/gtkaccount.c:1273
+#: ../src/gtkaccount.c:1298
 msgid "Proxy Options"
 msgstr "Opci坦ns do proxy"
 
-#: ../src/gtkaccount.c:1287 ../src/gtkprefs.c:1024
+#: ../src/gtkaccount.c:1312 ../src/gtkprefs.c:1024
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../src/gtkaccount.c:1296 ../src/gtkprefs.c:1045
+#: ../src/gtkaccount.c:1321 ../src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../src/gtkaccount.c:1300 ../src/gtkprefs.c:1063
+#: ../src/gtkaccount.c:1325 ../src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../src/gtkaccount.c:1308
+#: ../src/gtkaccount.c:1333
 msgid "_Username:"
 msgstr "Nome de _usuario:"
 
-#: ../src/gtkaccount.c:1314 ../src/gtkprefs.c:1100
+#: ../src/gtkaccount.c:1339 ../src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "Co_ntrasinal:"
 
-#: ../src/gtkaccount.c:1690
+#: ../src/gtkaccount.c:1717
 msgid "Add Account"
 msgstr "Engadir conta"
 
-#: ../src/gtkaccount.c:1692
+#: ../src/gtkaccount.c:1719
 msgid "Modify Account"
 msgstr "Modificar conta"
 
-#: ../src/gtkaccount.c:1714
+#: ../src/gtkaccount.c:1741
 msgid "_Basic"
 msgstr "_B叩sico"
 
-#: ../src/gtkaccount.c:1725
+#: ../src/gtkaccount.c:1752
 msgid "_Advanced"
 msgstr "_Avanzado"
 
 #. Register button
-#: ../src/gtkaccount.c:1740 ../src/protocols/jabber/jabber.c:706
+#: ../src/gtkaccount.c:1767 ../src/protocols/jabber/jabber.c:754
 msgid "Register"
 msgstr "Rexistrar"
 
-#: ../src/gtkaccount.c:2123 ../src/gtksavedstatuses.c:295
+#: ../src/gtkaccount.c:2150 ../src/gtksavedstatuses.c:295
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Est叩 seguro de que quere borrar %s?"
 
-#: ../src/gtkaccount.c:2128 ../src/gtkpounce.c:999 ../src/gtkrequest.c:291
+#: ../src/gtkaccount.c:2155 ../src/gtkpounce.c:999 ../src/gtkrequest.c:291
 #: ../src/gtksavedstatuses.c:297
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../src/gtkaccount.c:2186 ../src/gtksavedstatuses.c:873
-#: ../src/protocols/oscar/oscar.c:5043
+#: ../src/gtkaccount.c:2213 ../src/gtksavedstatuses.c:873
+#: ../src/protocols/oscar/oscar.c:5037
 msgid "Screen Name"
 msgstr "Nome de usuario"
 
-#: ../src/gtkaccount.c:2217
+#: ../src/gtkaccount.c:2244
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/gtkaccount.c:2534
+#: ../src/gtkaccount.c:2575
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fixo a %s seu amigo/a%s%s"
 
-#: ../src/gtkaccount.c:2589
+#: ../src/gtkaccount.c:2624
 msgid "Add buddy to your list?"
 msgstr "Engadir o amigo a s炭a lista?"
 
-#: ../src/gtkaccount.c:2591 ../src/gtkblist.c:4818 ../src/gtkconv.c:1571
-#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:830
-#: ../src/protocols/oscar/oscar.c:4668
-#: ../src/protocols/sametime/sametime.c:5661 ../src/protocols/silc/chat.c:595
+#: ../src/gtkaccount.c:2626 ../src/gtkblist.c:4873 ../src/gtkconv.c:1574
+#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:829
+#: ../src/protocols/oscar/oscar.c:4662
+#: ../src/protocols/sametime/sametime.c:5479 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Engadir"
 
-#: ../src/gtkblist.c:657
+#: ../src/gtkblist.c:662
 msgid "Join a Chat"
 msgstr "Unirse a un Chat"
 
-#: ../src/gtkblist.c:678
+#: ../src/gtkblist.c:683
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduza a informaci坦n apropiada do chat ao que desexar鱈a unirse.\n"
 
-#: ../src/gtkblist.c:689 ../src/gtkpounce.c:500 ../src/gtkroomlist.c:354
+#: ../src/gtkblist.c:694 ../src/gtkpounce.c:500 ../src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "Con_ta:"
 
-#: ../src/gtkblist.c:997
+#: ../src/gtkblist.c:1002
 msgid "Get _Info"
 msgstr "Obter _informaci坦n:"
 
-#: ../src/gtkblist.c:1000
+#: ../src/gtkblist.c:1005
 msgid "I_M"
 msgstr "_MI"
 
-#: ../src/gtkblist.c:1006
+#: ../src/gtkblist.c:1011
 msgid "_Send File"
 msgstr "E_nviar ficheiro"
 
-#: ../src/gtkblist.c:1014
+#: ../src/gtkblist.c:1019
 msgid "Start _Voice Chat"
 msgstr "Iniciar chat de _voz"
 
-#: ../src/gtkblist.c:1020
+#: ../src/gtkblist.c:1025
 msgid "Add Buddy _Pounce"
 msgstr "Engadir _aviso de amigo"
 
-#: ../src/gtkblist.c:1024 ../src/gtkblist.c:1028 ../src/gtkblist.c:1126
-#: ../src/gtkblist.c:1149
+#: ../src/gtkblist.c:1029 ../src/gtkblist.c:1033 ../src/gtkblist.c:1131
+#: ../src/gtkblist.c:1154
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-#: ../src/gtkblist.c:1039
+#: ../src/gtkblist.c:1044
 msgid "Alias..."
 msgstr "Alcume..."
 
-#: ../src/gtkblist.c:1042 ../src/gtkconv.c:1568 ../src/gtkrequest.c:293
+#: ../src/gtkblist.c:1047 ../src/gtkconv.c:1571 ../src/gtkrequest.c:293
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../src/gtkblist.c:1048 ../src/gtkblist.c:1134 ../src/gtkblist.c:1155
+#: ../src/gtkblist.c:1053 ../src/gtkblist.c:1139 ../src/gtkblist.c:1160
 msgid "_Alias..."
 msgstr "_Alcume..."
 
-#: ../src/gtkblist.c:1050 ../src/gtkblist.c:1136 ../src/gtkblist.c:1157
+#: ../src/gtkblist.c:1055 ../src/gtkblist.c:1141 ../src/gtkblist.c:1162
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../src/gtkblist.c:1097
+#: ../src/gtkblist.c:1102
 msgid "Add a _Buddy"
 msgstr "Engadir un a_migo"
 
-#: ../src/gtkblist.c:1099
+#: ../src/gtkblist.c:1104
 msgid "Add a C_hat"
 msgstr "Engadir un C_hat"
 
-#: ../src/gtkblist.c:1102
+#: ../src/gtkblist.c:1107
 msgid "_Delete Group"
 msgstr "_Borrar grupo"
 
-#: ../src/gtkblist.c:1104
+#: ../src/gtkblist.c:1109
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../src/gtkblist.c:1122 ../src/gtkroomlist.c:264 ../src/gtkroomlist.c:409
+#: ../src/gtkblist.c:1127 ../src/gtkroomlist.c:264 ../src/gtkroomlist.c:409
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/gtkblist.c:1124
+#: ../src/gtkblist.c:1129
 msgid "Auto-Join"
 msgstr "Conectarse automaticamente"
 
-#: ../src/gtkblist.c:1162 ../src/gtkblist.c:1185
+#: ../src/gtkblist.c:1167 ../src/gtkblist.c:1190
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../src/gtkblist.c:1190
+#: ../src/gtkblist.c:1195
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../src/gtkblist.c:1421 ../src/gtkblist.c:1431 ../src/gtkblist.c:3621
-#: ../src/gtkblist.c:3626
+#: ../src/gtkblist.c:1426 ../src/gtkblist.c:1436 ../src/gtkblist.c:3668
+#: ../src/gtkblist.c:3673
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../src/gtkblist.c:1890 ../src/gtkconv.c:3886 ../src/gtkpounce.c:399
-msgid "You are not currently signed on with an account that can add that buddy."
+#: ../src/gtkblist.c:1895 ../src/gtkconv.c:3909 ../src/gtkpounce.c:399
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr "Non est叩 conectado con ningunha conta que poida engadir a ese amigo."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2454
+#: ../src/gtkblist.c:2460
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../src/gtkblist.c:2455
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Amigos/_Mensaxe instant叩nea nova..."
-
-#: ../src/gtkblist.c:2456
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Amigos/Unirse a un _Chat..."
-
-#: ../src/gtkblist.c:2457
-msgid "/Buddies/Get User _Info..."
-msgstr "/Amigos/Obter _informaci坦n do usuario..."
-
-#: ../src/gtkblist.c:2458
-msgid "/Buddies/View User _Log..."
-msgstr "/Amigos/Ver _rexistro do usuario..."
-
-#: ../src/gtkblist.c:2460
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Amigos/Amosar amigos _desconectados"
-
 #: ../src/gtkblist.c:2461
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Amigos/Amosar grupos _baleiros"
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Amigos/_Mensaxe instant叩nea nova..."
 
 #: ../src/gtkblist.c:2462
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Amigos/Unirse a un _Chat..."
+
+#: ../src/gtkblist.c:2463
+msgid "/Buddies/Get User _Info..."
+msgstr "/Amigos/Obter _informaci坦n do usuario..."
+
+#: ../src/gtkblist.c:2464
+msgid "/Buddies/View User _Log..."
+msgstr "/Amigos/Ver _rexistro do usuario..."
+
+#: ../src/gtkblist.c:2466
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Amigos/Amosar amigos _desconectados"
+
+#: ../src/gtkblist.c:2467
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Amigos/Amosar grupos _baleiros"
+
+#: ../src/gtkblist.c:2468
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Amosar _detalles de amigos"
 
-#: ../src/gtkblist.c:2463
+#: ../src/gtkblist.c:2469
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/_Ordenar amigos"
 
-#: ../src/gtkblist.c:2465
+#: ../src/gtkblist.c:2471
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Engadir un amigo..."
 
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2472
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Engadir un _Chat..."
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2473
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Engadir un _grupo..."
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2475
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sa鱈r"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2472
+#: ../src/gtkblist.c:2478
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../src/gtkblist.c:2473 ../src/gtkblist.c:5382
+#: ../src/gtkblist.c:2479 ../src/gtkblist.c:5453
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Engadir\\/Editar"
 
 #. Tools
-#: ../src/gtkblist.c:2476
+#: ../src/gtkblist.c:2482
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../src/gtkblist.c:2477
+#: ../src/gtkblist.c:2483
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/_Avisos de amigo"
 
-#: ../src/gtkblist.c:2478
+#: ../src/gtkblist.c:2484
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
-#: ../src/gtkblist.c:2479
+#: ../src/gtkblist.c:2485
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferencias"
 
-#: ../src/gtkblist.c:2480
+#: ../src/gtkblist.c:2486
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../src/gtkblist.c:2482
+#: ../src/gtkblist.c:2488
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
-#: ../src/gtkblist.c:2483
+#: ../src/gtkblist.c:2489
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _salas"
 
-#: ../src/gtkblist.c:2484
+#: ../src/gtkblist.c:2490
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../src/gtkblist.c:2486
+#: ../src/gtkblist.c:2492
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar _sons"
 
 #. Help
-#: ../src/gtkblist.c:2489
+#: ../src/gtkblist.c:2495
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../src/gtkblist.c:2490
+#: ../src/gtkblist.c:2496
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en li単a"
 
-#: ../src/gtkblist.c:2491
+#: ../src/gtkblist.c:2497
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Fiestra de _depuraci坦n"
 
-#: ../src/gtkblist.c:2492
+#: ../src/gtkblist.c:2498
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../src/gtkblist.c:2524 ../src/gtkblist.c:2591
+#: ../src/gtkblist.c:2530 ../src/gtkblist.c:2597
 #, c-format
 msgid ""
 "\n"
@@ -2275,7 +2305,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../src/gtkblist.c:2600
+#: ../src/gtkblist.c:2606
 #, c-format
 msgid ""
 "\n"
@@ -2284,7 +2314,7 @@
 "\n"
 "<b>Alcume do contacto:</b> %s"
 
-#: ../src/gtkblist.c:2608
+#: ../src/gtkblist.c:2614
 #, c-format
 msgid ""
 "\n"
@@ -2293,7 +2323,7 @@
 "\n"
 "<b>Alcume:</b> %s"
 
-#: ../src/gtkblist.c:2616
+#: ../src/gtkblist.c:2622
 #, c-format
 msgid ""
 "\n"
@@ -2302,7 +2332,7 @@
 "\n"
 "<b>Alcume:</b> %s"
 
-#: ../src/gtkblist.c:2625
+#: ../src/gtkblist.c:2631
 #, c-format
 msgid ""
 "\n"
@@ -2311,7 +2341,7 @@
 "\n"
 "<b>Conectado:</b> %s"
 
-#: ../src/gtkblist.c:2637
+#: ../src/gtkblist.c:2643
 #, c-format
 msgid ""
 "\n"
@@ -2320,7 +2350,7 @@
 "\n"
 "<b>Inactivo:</b> %s"
 
-#: ../src/gtkblist.c:2672
+#: ../src/gtkblist.c:2678
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2329,7 +2359,7 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/gtkblist.c:2680
+#: ../src/gtkblist.c:2686
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2337,7 +2367,7 @@
 "\n"
 "<b>Estado:</b> Desconectado"
 
-#: ../src/gtkblist.c:2703
+#: ../src/gtkblist.c:2709
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2345,7 +2375,7 @@
 "\n"
 "<b>Descrici坦n:</b> Terror鱈fica"
 
-#: ../src/gtkblist.c:2705
+#: ../src/gtkblist.c:2711
 #, fuzzy
 msgid ""
 "\n"
@@ -2354,7 +2384,7 @@
 "\n"
 "<b>Estado</b>: Xenial"
 
-#: ../src/gtkblist.c:2707
+#: ../src/gtkblist.c:2713
 #, fuzzy
 msgid ""
 "\n"
@@ -2363,109 +2393,106 @@
 "\n"
 "<b>Estado</b>: Rock & roll"
 
-#: ../src/gtkblist.c:2973
-#, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "Inactivo (%dh %02dm) "
-
-#: ../src/gtkblist.c:2975
-#, c-format
-msgid "Idle (%dm) "
-msgstr "Inactivo (%dm) "
-
-#: ../src/gtkblist.c:2978
-msgid "Idle "
-msgstr "Inactivo "
-
-#: ../src/gtkblist.c:2982
+#: ../src/gtkblist.c:2981
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Inactivo %dh %02dm"
+
+#: ../src/gtkblist.c:2983
+#, c-format
+msgid "Idle %dm"
+msgstr "Inactivo %dm"
+
+#: ../src/gtkblist.c:2986 ../src/protocols/bonjour/bonjour.c:323
+#: ../src/protocols/msn/msn.c:554 ../src/protocols/msn/state.c:32
+#: ../src/protocols/novell/novell.c:2855 ../src/protocols/oscar/oscar.c:5058
+#: ../src/protocols/yahoo/yahoo.c:2660
+#: ../src/protocols/yahoo/yahoo_profile.c:660
+msgid "Idle"
+msgstr "Inactivo"
+
+#: ../src/gtkblist.c:2990
 msgid "Offline "
 msgstr "Desconectado "
 
-#: ../src/gtkblist.c:3100
+#: ../src/gtkblist.c:3108
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Mensaxe instant叩nea _nova..."
 
-#: ../src/gtkblist.c:3101 ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3109 ../src/gtkblist.c:3142
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un Chat..."
 
-#: ../src/gtkblist.c:3102
+#: ../src/gtkblist.c:3110
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obter informaci坦n do usuario..."
 
-#: ../src/gtkblist.c:3103
+#: ../src/gtkblist.c:3111
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Engadir un amigo..."
 
-#: ../src/gtkblist.c:3104 ../src/gtkblist.c:3137
+#: ../src/gtkblist.c:3112 ../src/gtkblist.c:3145
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Engadir un Chat..."
 
-#: ../src/gtkblist.c:3105
+#: ../src/gtkblist.c:3113
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Engadir un grupo..."
 
-#: ../src/gtkblist.c:3140
+#: ../src/gtkblist.c:3148
 msgid "/Tools/Buddy Pounces"
 msgstr "/Ferramentas/Avisos de amigo"
 
-#: ../src/gtkblist.c:3143
+#: ../src/gtkblist.c:3151
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../src/gtkblist.c:3146
+#: ../src/gtkblist.c:3154
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../src/gtkblist.c:3225
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d mensaxe sen ler de %s\n"
-msgstr[1] "%d mensaxes sen ler de %s\n"
-
-#: ../src/gtkblist.c:3320
+#: ../src/gtkblist.c:3339
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../src/gtkblist.c:3322
+#: ../src/gtkblist.c:3341
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../src/gtkblist.c:3323
+#: ../src/gtkblist.c:3342
 msgid "By status"
 msgstr "Por estado"
 
-#: ../src/gtkblist.c:3324
+#: ../src/gtkblist.c:3343
 msgid "By log size"
 msgstr "Por tama単o de rexistro"
 
-#: ../src/gtkblist.c:3485
+#: ../src/gtkblist.c:3532
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3617
+#: ../src/gtkblist.c:3664
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Amosar amigos desconectados"
 
-#: ../src/gtkblist.c:3619
+#: ../src/gtkblist.c:3666
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Amosar grupos baleiros"
 
-#: ../src/gtkblist.c:3623
+#: ../src/gtkblist.c:3670
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Amosar detalles de amigos"
 
-#: ../src/gtkblist.c:4317 ../src/protocols/silc/buddy.c:737
+#: ../src/gtkblist.c:4369 ../src/protocols/silc/buddy.c:737
 #: ../src/protocols/silc/buddy.c:995 ../src/protocols/silc/buddy.c:1040
-#: ../src/protocols/silc/buddy.c:1139 ../src/protocols/yahoo/yahoo.c:2903
+#: ../src/protocols/silc/buddy.c:1139 ../src/protocols/yahoo/yahoo.c:2908
 msgid "Add Buddy"
 msgstr "Engadir amigo"
 
-#: ../src/gtkblist.c:4341
+#: ../src/gtkblist.c:4393
 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. "
@@ -2475,30 +2502,31 @@
 "Pode, opcionalmente, introducir un alias ou alcume. O alcume mostrarase en "
 "lugar do nome de usuario sempre que sexa posible.\n"
 
-#: ../src/gtkblist.c:4363
+#: ../src/gtkblist.c:4415
 msgid "Screen Name:"
 msgstr "Nome de usuario:"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4411 ../src/gtkblist.c:4746
+#: ../src/gtkblist.c:4463 ../src/gtkblist.c:4798
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../src/gtkblist.c:4679
+#: ../src/gtkblist.c:4731
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo non est叩 soportado nas salas de chats."
 
-#: ../src/gtkblist.c:4695
+#: ../src/gtkblist.c:4747
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "Non est叩 conectado con ningunha conta que te単a capacidade de acceder a chats."
-
-#: ../src/gtkblist.c:4712
+msgstr ""
+"Non est叩 conectado con ningunha conta que te単a capacidade de acceder a chats."
+
+#: ../src/gtkblist.c:4764
 msgid "Add Chat"
 msgstr "Engadir Chat"
 
-#: ../src/gtkblist.c:4736
+#: ../src/gtkblist.c:4788
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2506,36 +2534,36 @@
 "Introduza un alcume, e a informaci坦n que crea apropiada do chat que "
 "desexar鱈a engadir na lista de amigos.\n"
 
-#: ../src/gtkblist.c:4815 ../src/protocols/sametime/sametime.c:5575
-#: ../src/protocols/sametime/sametime.c:5659
+#: ../src/gtkblist.c:4870 ../src/protocols/sametime/sametime.c:5393
+#: ../src/protocols/sametime/sametime.c:5477
 msgid "Add Group"
 msgstr "Engadir grupo"
 
-#: ../src/gtkblist.c:4816
+#: ../src/gtkblist.c:4871
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo a engadir."
 
-#: ../src/gtkblist.c:5424
+#: ../src/gtkblist.c:5495
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../src/gtkblist.c:5457 ../src/gtkblist.c:5463
+#: ../src/gtkblist.c:5528 ../src/gtkblist.c:5534
 msgid "No actions available"
 msgstr "Non hai acci坦ns dispo単ibles"
 
-#: ../src/gtkblist.c:5471
+#: ../src/gtkblist.c:5542
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/gtkblist.c:5483
+#: ../src/gtkblist.c:5554
 msgid "Enable Account"
 msgstr "Activar conta"
 
-#: ../src/gtkblist.c:5535
+#: ../src/gtkblist.c:5609
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../src/gtkblist.c:5609
+#: ../src/gtkblist.c:5704
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -2563,81 +2591,80 @@
 msgid "Whether this tag affects the background color"
 msgstr ""
 
-#: ../src/gtkcombobox.c:491
+#: ../src/gtkcombobox.c:490
 msgid "ComboBox model"
 msgstr "Modelo ComboBox"
 
-#: ../src/gtkcombobox.c:492
+#: ../src/gtkcombobox.c:491
 msgid "The model for the combo box"
 msgstr "O modelo para a caixa combo"
 
-#: ../src/gtkcombobox.c:499
+#: ../src/gtkcombobox.c:498
 msgid "Wrap width"
 msgstr "Axustar anchura"
 
-#: ../src/gtkcombobox.c:500
+#: ../src/gtkcombobox.c:499
 msgid "Wrap width for layouting the items in a grid"
 msgstr ""
 
+#: ../src/gtkcombobox.c:508
+msgid "Row span column"
+msgstr ""
+
 #: ../src/gtkcombobox.c:509
-msgid "Row span column"
-msgstr ""
-
-#: ../src/gtkcombobox.c:510
 msgid "TreeModel column containing the row span values"
 msgstr ""
 
-#: ../src/gtkcombobox.c:519
+#: ../src/gtkcombobox.c:518
 msgid "Column span column"
 msgstr ""
 
-#: ../src/gtkcombobox.c:521
+#: ../src/gtkcombobox.c:520
 msgid "TreeModel column containing the column span values"
 msgstr ""
 
+#: ../src/gtkcombobox.c:529
+msgid "Active item"
+msgstr "Elemento activo"
+
 #: ../src/gtkcombobox.c:530
-msgid "Active item"
-msgstr "Elemento activo"
-
-#: ../src/gtkcombobox.c:531
 msgid "The item which is currently active"
 msgstr "O elemento que est叩 actualmente activo"
 
+#: ../src/gtkcombobox.c:538
+msgid "Appears as list"
+msgstr "Aparecer como lista"
+
 #: ../src/gtkcombobox.c:539
-#, fuzzy
-msgid "Appears as list"
-msgstr "Parecer desconectado"
-
-#: ../src/gtkcombobox.c:540
 msgid "Whether combobox dropdowns should look like lists rather than menus"
 msgstr ""
 
-#: ../src/gtkconn.c:227
+#: ../src/gtkconn.c:226
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../src/gtkconn.c:228
+#: ../src/gtkconn.c:227
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
 "Correct the error and reenable the account to connect."
 msgstr ""
 
-#: ../src/gtkconv.c:346
+#: ../src/gtkconv.c:349
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "estou utilizando Gaim v%s."
 
-#: ../src/gtkconv.c:355
+#: ../src/gtkconv.c:358
 msgid "Supported debug options are:  version"
 msgstr "As opci坦ns de depuraci坦n soportadas son:  version"
 
-#: ../src/gtkconv.c:391
+#: ../src/gtkconv.c:394
 msgid "No such command (in this context)."
 msgstr "Non existe o comando (neste contexto)."
 
-#: ../src/gtkconv.c:394
+#: ../src/gtkconv.c:397
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2645,44 +2672,46 @@
 "Usar \"/help &lt;comando&gt;\" para obter axuda dun comando espec鱈fico.\n"
 "Os seguintes comandos est叩 dispo単ibles neste contexto:\n"
 
-#: ../src/gtkconv.c:466
+#: ../src/gtkconv.c:469
 msgid "No such command."
 msgstr "Non existe o comando."
 
-#: ../src/gtkconv.c:473
+#: ../src/gtkconv.c:476
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Erro de sintase: Escribiu suficientes argumentos para ese comando."
 
-#: ../src/gtkconv.c:478
+#: ../src/gtkconv.c:481
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando fallou por motivos desco単ecidos."
 
-#: ../src/gtkconv.c:485
-msgid "That command only works in chats, not IMs."
-msgstr "Ese comando s坦 funciona en chats, non en MIs."
-
 #: ../src/gtkconv.c:488
+msgid "That command only works in chats, not IMs."
+msgstr "Ese comando s坦 funciona en chats, non en MIs."
+
+#: ../src/gtkconv.c:491
 msgid "That command only works in IMs, not chats."
 msgstr "Ese comando s坦 funciona en MIs, non en chats."
 
-#: ../src/gtkconv.c:492
+#: ../src/gtkconv.c:495
 msgid "That command doesn't work on this protocol."
 msgstr "Ese comando s坦 funciona neste protocolo."
 
-#: ../src/gtkconv.c:726 ../src/gtkconv.c:752
+#: ../src/gtkconv.c:729 ../src/gtkconv.c:755
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo non utiliza o mesmo protocolo que este chat."
 
-#: ../src/gtkconv.c:746
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Non est叩 conectado con ningunha conta coa que poida invitar a ese amigo."
-
-#: ../src/gtkconv.c:799
+#: ../src/gtkconv.c:749
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Non est叩 conectado con ningunha conta coa que poida invitar a ese amigo."
+
+#: ../src/gtkconv.c:802
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo 叩 sala de Chat"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:829
+#: ../src/gtkconv.c:832
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2690,289 +2719,290 @@
 "Introduza o nome de usuario ao que desexa invitar, xunto cunha mensaxe de "
 "invitaci坦n opcional."
 
-#: ../src/gtkconv.c:850
+#: ../src/gtkconv.c:853
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../src/gtkconv.c:870 ../src/gtksavedstatuses.c:1077
+#: ../src/gtkconv.c:873 ../src/gtksavedstatuses.c:1077
 #: ../src/gtksavedstatuses.c:1395
 msgid "_Message:"
 msgstr "_Mensaxe:"
 
-#: ../src/gtkconv.c:927 ../src/gtkconv.c:2272 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:472
+#: ../src/gtkconv.c:930 ../src/gtkconv.c:2275 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:487
 msgid "Unable to open file."
 msgstr "Non se puido abrir o ficheiro."
 
-#: ../src/gtkconv.c:933
+#: ../src/gtkconv.c:936
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaci坦ns con %s</h1>\n"
 
-#: ../src/gtkconv.c:957
+#: ../src/gtkconv.c:960
 msgid "Save Conversation"
 msgstr "Gardar conversaci坦n"
 
-#: ../src/gtkconv.c:1074 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1077 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/gtkconv.c:1100 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1103 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "Termo a _buscar:"
 
-#: ../src/gtkconv.c:1271
+#: ../src/gtkconv.c:1274
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 
-#: ../src/gtkconv.c:1279
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: ../src/gtkconv.c:1533
+#: ../src/gtkconv.c:1282
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+#: ../src/gtkconv.c:1536
 msgid "IM"
 msgstr "MI"
 
-#: ../src/gtkconv.c:1539 ../src/protocols/oscar/oscar.c:628
+#: ../src/gtkconv.c:1542 ../src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../src/gtkconv.c:1546
+#: ../src/gtkconv.c:1549
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
-#: ../src/gtkconv.c:1549
+#: ../src/gtkconv.c:1552
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/gtkconv.c:1555
+#: ../src/gtkconv.c:1558
 msgid "Info"
 msgstr "Info"
 
-#: ../src/gtkconv.c:1561
+#: ../src/gtkconv.c:1564
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../src/gtkconv.c:2280
+#: ../src/gtkconv.c:2283
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas ao disco."
 
-#: ../src/gtkconv.c:2303
+#: ../src/gtkconv.c:2306
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../src/gtkconv.c:2352
+#: ../src/gtkconv.c:2355
 msgid "Animate"
 msgstr "Animar"
 
-#: ../src/gtkconv.c:2357
+#: ../src/gtkconv.c:2360
 msgid "Hide Icon"
 msgstr "Agochar icona"
 
-#: ../src/gtkconv.c:2363
+#: ../src/gtkconv.c:2366
 msgid "Save Icon As..."
 msgstr "Gardar icona como..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2501
+#: ../src/gtkconv.c:2507
 msgid "/_Conversation"
 msgstr "/_Conversaci坦n"
 
-#: ../src/gtkconv.c:2503
+#: ../src/gtkconv.c:2509
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversaci坦n/_Mensaxe instant叩nea nova..."
 
-#: ../src/gtkconv.c:2508
+#: ../src/gtkconv.c:2514
 msgid "/Conversation/_Find..."
 msgstr "/Conversaci坦n/_Buscar..."
 
-#: ../src/gtkconv.c:2510
+#: ../src/gtkconv.c:2516
 msgid "/Conversation/View _Log"
 msgstr "/Conversaci坦n/Ver _rexistro"
 
-#: ../src/gtkconv.c:2511
+#: ../src/gtkconv.c:2517
 msgid "/Conversation/_Save As..."
 msgstr "/Conversaci坦n/_Gardar como..."
 
-#: ../src/gtkconv.c:2513
+#: ../src/gtkconv.c:2519
 msgid "/Conversation/Clea_r"
 msgstr "/Conversaci坦n/Limpa_r"
 
-#: ../src/gtkconv.c:2517
+#: ../src/gtkconv.c:2523
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversaci坦n/E_nviar ficheiro..."
 
-#: ../src/gtkconv.c:2518
+#: ../src/gtkconv.c:2524
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversaci坦n/Engadir _aviso de amigo..."
 
-#: ../src/gtkconv.c:2520
+#: ../src/gtkconv.c:2526
 msgid "/Conversation/_Get Info"
 msgstr "/Conversaci坦n/_Obter informaci坦n"
 
-#: ../src/gtkconv.c:2522
+#: ../src/gtkconv.c:2528
 msgid "/Conversation/In_vite..."
 msgstr "/Conversaci坦n/In_vitar..."
 
-#: ../src/gtkconv.c:2527
+#: ../src/gtkconv.c:2533
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversaci坦n/Alc_ume..."
 
-#: ../src/gtkconv.c:2529
+#: ../src/gtkconv.c:2535
 msgid "/Conversation/_Block..."
 msgstr "/Conversaci坦n/_Bloquear..."
 
-#: ../src/gtkconv.c:2531
+#: ../src/gtkconv.c:2537
 msgid "/Conversation/_Add..."
 msgstr "/Conversaci坦n/_Engadir..."
 
-#: ../src/gtkconv.c:2533
+#: ../src/gtkconv.c:2539
 msgid "/Conversation/_Remove..."
 msgstr "/Conversaci坦n/El_iminar..."
 
-#: ../src/gtkconv.c:2538
+#: ../src/gtkconv.c:2544
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversaci坦n/Inserir li_gaz坦n..."
 
-#: ../src/gtkconv.c:2540
+#: ../src/gtkconv.c:2546
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversaci坦n/Inserir ima_xe..."
 
-#: ../src/gtkconv.c:2545
+#: ../src/gtkconv.c:2551
 msgid "/Conversation/_Close"
 msgstr "/Conversaci坦n/_Pechar"
 
 #. Options
-#: ../src/gtkconv.c:2549
+#: ../src/gtkconv.c:2555
 msgid "/_Options"
 msgstr "/_Opci坦ns"
 
-#: ../src/gtkconv.c:2550
+#: ../src/gtkconv.c:2556
 msgid "/Options/Enable _Logging"
 msgstr "/Opci坦ns/Activar _rexistro"
 
-#: ../src/gtkconv.c:2551
+#: ../src/gtkconv.c:2557
 msgid "/Options/Enable _Sounds"
 msgstr "/Opci坦ns/Activar _sons"
 
-#: ../src/gtkconv.c:2552
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Opci坦ns/Amosar _barra de formato"
-
-#: ../src/gtkconv.c:2553
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Opci坦ns/Amosar _marcas de tempo"
-
-#: ../src/gtkconv.c:2554
+#: ../src/gtkconv.c:2558
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opci坦ns/Amosar _iconas dos amigos"
 
-#: ../src/gtkconv.c:2594
+#: ../src/gtkconv.c:2560
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Opci坦ns/Amosar _barra de formato"
+
+#: ../src/gtkconv.c:2561
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Opci坦ns/Amosar _marcas de tempo"
+
+#: ../src/gtkconv.c:2601
 msgid "/Conversation/View Log"
 msgstr "/Conversaci坦n/Ver rexistro"
 
-#: ../src/gtkconv.c:2600
+#: ../src/gtkconv.c:2607
 msgid "/Conversation/Send File..."
 msgstr "/Conversaci坦n/Enviar ficheiro..."
 
-#: ../src/gtkconv.c:2604
+#: ../src/gtkconv.c:2611
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversaci坦n/Engadir aviso de amigo..."
 
-#: ../src/gtkconv.c:2610
+#: ../src/gtkconv.c:2617
 msgid "/Conversation/Get Info"
 msgstr "/Conversaci坦n/Obter informaci坦n"
 
-#: ../src/gtkconv.c:2614
+#: ../src/gtkconv.c:2621
 msgid "/Conversation/Invite..."
 msgstr "/Conversaci坦n/Invitar..."
 
-#: ../src/gtkconv.c:2620
+#: ../src/gtkconv.c:2627
 msgid "/Conversation/Alias..."
 msgstr "/Conversaci坦n/Alcume..."
 
-#: ../src/gtkconv.c:2624
+#: ../src/gtkconv.c:2631
 msgid "/Conversation/Block..."
 msgstr "/Conversaci坦n/Bloquear..."
 
-#: ../src/gtkconv.c:2628
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/Add..."
 msgstr "/Conversaci坦n/Engadir..."
 
-#: ../src/gtkconv.c:2632
+#: ../src/gtkconv.c:2639
 msgid "/Conversation/Remove..."
 msgstr "/Conversaci坦n/Eliminar..."
 
-#: ../src/gtkconv.c:2638
+#: ../src/gtkconv.c:2645
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversaci坦n/Inserir ligaz坦n..."
 
-#: ../src/gtkconv.c:2642
+#: ../src/gtkconv.c:2649
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversaci坦n/Inserir imaxe..."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2655
 msgid "/Options/Enable Logging"
 msgstr "/Opci坦ns/Activar rexistro"
 
-#: ../src/gtkconv.c:2651
+#: ../src/gtkconv.c:2658
 msgid "/Options/Enable Sounds"
 msgstr "/Opci坦ns/Activar sons"
 
-#: ../src/gtkconv.c:2654
+#: ../src/gtkconv.c:2661
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opci坦ns/Amosar barra de formato"
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2664
 msgid "/Options/Show Timestamps"
 msgstr "/Opci坦ns/Amosar marcas de tempo"
 
-#: ../src/gtkconv.c:2660
+#: ../src/gtkconv.c:2667
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opci坦ns/Amosar iconas dos amigos"
 
-#: ../src/gtkconv.c:2732
+#: ../src/gtkconv.c:2739
 msgid "User is typing..."
 msgstr "O usuario est叩 escribindo..."
 
-#: ../src/gtkconv.c:2735
+#: ../src/gtkconv.c:2742
 msgid "User has typed something and stopped"
 msgstr "O usuario escribiu algo e parou"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:2883
+#: ../src/gtkconv.c:2890
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../src/gtkconv.c:3514 ../src/protocols/sametime/sametime.c:3579
+#: ../src/gtkconv.c:3537 ../src/protocols/sametime/sametime.c:3490
 msgid "Topic:"
 msgstr "T坦pico:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3562
+#: ../src/gtkconv.c:3585
 msgid "0 people in room"
 msgstr "0 persoas na conversaci坦n"
 
-#: ../src/gtkconv.c:3641
+#: ../src/gtkconv.c:3664
 msgid "IM the user"
 msgstr "Enviar un MI ao usuario"
 
-#: ../src/gtkconv.c:3654
+#: ../src/gtkconv.c:3677
 msgid "Ignore the user"
 msgstr "Ignorar ao usuario"
 
-#: ../src/gtkconv.c:3666
+#: ../src/gtkconv.c:3689
 msgid "Get the user's information"
 msgstr "Obter a informaci坦n do usuario"
 
-#: ../src/gtkconv.c:4552 ../src/gtkconv.c:4657 ../src/gtkconv.c:4712
+#: ../src/gtkconv.c:4575 ../src/gtkconv.c:4680 ../src/gtkconv.c:4735
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na conversaci坦n"
 msgstr[1] "%d persoas na conversaci坦n"
 
-#: ../src/gtkconv.c:5950
+#: ../src/gtkconv.c:5973
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2980,11 +3010,12 @@
 "say &lt;mensaxe&gt;:  Enviar unha mensaxe como se non se estivera utilizando "
 "un comando."
 
-#: ../src/gtkconv.c:5953
+#: ../src/gtkconv.c:5976
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;acci坦n&gt;:  Enviar unha acci坦n estilo IRC a un amigo ou a un chat."
-
-#: ../src/gtkconv.c:5956
+msgstr ""
+"me &lt;acci坦n&gt;:  Enviar unha acci坦n estilo IRC a un amigo ou a un chat."
+
+#: ../src/gtkconv.c:5979
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2992,43 +3023,43 @@
 "debug &lt;opci坦n&gt;:  Enviar informaci坦n de depuraci坦n sobre a conversaci坦n "
 "actual."
 
-#: ../src/gtkconv.c:5959
+#: ../src/gtkconv.c:5982
 msgid "clear: Clears the conversation scrollback."
 msgstr "limpar: Limpa a conversaci坦n desprazada."
 
-#: ../src/gtkconv.c:5962
+#: ../src/gtkconv.c:5985
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Recibir axuda dun comando espec鱈fico."
 
-#: ../src/gtkconv.c:6095
+#: ../src/gtkconv.c:6118
 msgid "Confirm close"
 msgstr "Confirmar peche"
 
-#: ../src/gtkconv.c:6127
+#: ../src/gtkconv.c:6150
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Ten mensaxes sen ler. Est叩 seguro que quere pechar a fiestra?"
 
-#: ../src/gtkconv.c:6922
+#: ../src/gtkconv.c:6946
 msgid "Close conversation"
 msgstr "Pechar conversaci坦n"
 
-#: ../src/gtkconv.c:7386
+#: ../src/gtkconv.c:7410
 msgid "Last created window"
 msgstr "�ltima fiestra creada"
 
-#: ../src/gtkconv.c:7388
+#: ../src/gtkconv.c:7412
 msgid "Separate IM and Chat windows"
 msgstr "Separar fiestras de MIs e Chats"
 
-#: ../src/gtkconv.c:7390 ../src/gtkprefs.c:1230
+#: ../src/gtkconv.c:7414 ../src/gtkprefs.c:1230
 msgid "New window"
 msgstr "Nova fiestra"
 
-#: ../src/gtkconv.c:7392
+#: ../src/gtkconv.c:7416
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../src/gtkconv.c:7394
+#: ../src/gtkconv.c:7418
 msgid "By account"
 msgstr "Por conta"
 
@@ -3111,7 +3142,7 @@
 msgid "original author"
 msgstr "autor orixinal"
 
-#: ../src/gtkdialogs.c:105 ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:105 ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:154
 msgid "Bulgarian"
 msgstr "B炭lgaro"
 
@@ -3119,11 +3150,11 @@
 msgid "Bosnian"
 msgstr "Bosnia"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
 msgid "Catalan"
 msgstr "Catal叩n"
 
-#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:156
+#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:157
 msgid "Czech"
 msgstr "Checo"
 
@@ -3131,7 +3162,7 @@
 msgid "Danish"
 msgstr "Dan辿s"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:158
 msgid "German"
 msgstr "Alem叩n"
 
@@ -3151,15 +3182,15 @@
 msgid "British English"
 msgstr "Ingl辿s brit叩nico"
 
-#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:159
 msgid "Spanish"
 msgstr "Espa単ol"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:160
 msgid "Finnish"
 msgstr "Finland辿s"
 
-#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:161
 msgid "French"
 msgstr "Franc辿s"
 
@@ -3175,11 +3206,11 @@
 msgid "Hungarian"
 msgstr "H炭ngaro"
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:162
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:163
 msgid "Japanese"
 msgstr "Xapon辿s"
 
@@ -3187,7 +3218,7 @@
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:164
 msgid "Korean"
 msgstr "Coreano"
 
@@ -3211,7 +3242,7 @@
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:165
 msgid "Polish"
 msgstr "Polaco"
 
@@ -3227,7 +3258,7 @@
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167
 msgid "Russian"
 msgstr "Ruso"
 
@@ -3239,106 +3270,114 @@
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:169
 msgid "Swedish"
 msgstr "Sueco"
 
 #: ../src/gtkdialogs.c:142
-msgid "Telugu"
-msgstr "Telugu"
-
-#: ../src/gtkdialogs.c:143
-msgid "Vietnamese"
-msgstr "Vietnamita"
+msgid "Tamil"
+msgstr "Tamil"
 
 #: ../src/gtkdialogs.c:143
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../src/gtkdialogs.c:144
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../src/gtkdialogs.c:144
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh eo equipo Gnome-Vi"
 
-#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:169
+#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:170
 msgid "Simplified Chinese"
 msgstr "Chin辿s simplificado"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:147 ../src/gtkdialogs.c:171
 msgid "Traditional Chinese"
 msgstr "Chin辿s tradicional"
 
-#: ../src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:153
 msgid "Amharic"
 msgstr "Amh叩rico"
 
-#: ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:168
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/gtkdialogs.c:211
+#: ../src/gtkdialogs.c:212
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: ../src/gtkdialogs.c:235
+#: ../src/gtkdialogs.c:236
+#, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under "
+"the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim 辿 un cliente modular de mensaxer鱈a instant叩nea, capaz de utilizar AIM, "
 "MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, e "
 "Gadu-Gadu ao mesmo tempo. Est叩 escrito usando Gtk+ e est叩 licenciado coa GNU "
 "GPL.<BR><BR>"
 
-#: ../src/gtkdialogs.c:244
+#: ../src/gtkdialogs.c:245
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim en irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:247
+#: ../src/gtkdialogs.c:248
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim en irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:253
-msgid "Active Developers"
-msgstr "Desenroladores en activo"
-
-#: ../src/gtkdialogs.c:268
+#: ../src/gtkdialogs.c:254
+msgid "Current Developers"
+msgstr "Desenroladores actuais"
+
+#: ../src/gtkdialogs.c:269
 msgid "Crazy Patch Writers"
 msgstr "Tolos escritores de parches"
 
-#: ../src/gtkdialogs.c:283
+#: ../src/gtkdialogs.c:284
 msgid "Retired Developers"
 msgstr "Desenroladores retirados"
 
-#: ../src/gtkdialogs.c:298
+#: ../src/gtkdialogs.c:299
 msgid "Current Translators"
 msgstr "Traductores actuais"
 
-#: ../src/gtkdialogs.c:318
+#: ../src/gtkdialogs.c:319
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../src/gtkdialogs.c:336
+#: ../src/gtkdialogs.c:337
 msgid "Debugging Information"
 msgstr "Informaci坦n de depuraci坦n"
 
-#: ../src/gtkdialogs.c:510 ../src/gtkdialogs.c:647 ../src/gtkdialogs.c:714
+#: ../src/gtkdialogs.c:517 ../src/gtkdialogs.c:654 ../src/gtkdialogs.c:721
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../src/gtkdialogs.c:515 ../src/gtkdialogs.c:652 ../src/gtkdialogs.c:719
+#: ../src/gtkdialogs.c:522 ../src/gtkdialogs.c:659 ../src/gtkdialogs.c:726
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../src/gtkdialogs.c:523
+#: ../src/gtkdialogs.c:530
 msgid "New Instant Message"
 msgstr "Mensaxe instant叩nea nova"
 
-#: ../src/gtkdialogs.c:525
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
-
-#: ../src/gtkdialogs.c:660
+#: ../src/gtkdialogs.c:532
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
+
+#: ../src/gtkdialogs.c:667
 msgid "Get User Info"
 msgstr "Obter informaci坦n do usuario"
 
-#: ../src/gtkdialogs.c:662
+#: ../src/gtkdialogs.c:669
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3346,11 +3385,11 @@
 "Introduza o nome de usuario ou alcume da persoa da cal quere ver a "
 "informaci坦n."
 
-#: ../src/gtkdialogs.c:728
+#: ../src/gtkdialogs.c:735
 msgid "View User Log"
 msgstr "Ver rexistro de usuario"
 
-#: ../src/gtkdialogs.c:730
+#: ../src/gtkdialogs.c:737
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3358,37 +3397,37 @@
 "Introduza o nome de usuario ou alcume da persoa da cal quere ver a "
 "informaci坦n de rexistro."
 
-#: ../src/gtkdialogs.c:749
+#: ../src/gtkdialogs.c:756
 msgid "Alias Contact"
 msgstr "Alcume para contacto"
 
-#: ../src/gtkdialogs.c:750
+#: ../src/gtkdialogs.c:757
 msgid "Enter an alias for this contact."
 msgstr "Introduza un alcume para este contacto"
 
-#: ../src/gtkdialogs.c:752 ../src/gtkdialogs.c:774 ../src/gtkdialogs.c:794
+#: ../src/gtkdialogs.c:759 ../src/gtkdialogs.c:781 ../src/gtkdialogs.c:801
 #: ../src/gtkrequest.c:295 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alcume"
 
-#: ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:777
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduza un alcume para %s."
 
-#: ../src/gtkdialogs.c:772
+#: ../src/gtkdialogs.c:779
 msgid "Alias Buddy"
 msgstr "Alcume de amigo"
 
-#: ../src/gtkdialogs.c:791
+#: ../src/gtkdialogs.c:798
 msgid "Alias Chat"
 msgstr "Alcume no Chat"
 
-#: ../src/gtkdialogs.c:792
+#: ../src/gtkdialogs.c:799
 msgid "Enter an alias for this chat."
 msgstr "Introduza un alcume para este chat."
 
-#: ../src/gtkdialogs.c:829
+#: ../src/gtkdialogs.c:836
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3403,11 +3442,11 @@
 "Est叩 a punto de borrar o contacto que cont辿n a %s e a outros %d amigos da "
 "s炭a lista de amigos. Quere continuar?"
 
-#: ../src/gtkdialogs.c:837 ../src/gtkdialogs.c:838
+#: ../src/gtkdialogs.c:844 ../src/gtkdialogs.c:845
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../src/gtkdialogs.c:896
+#: ../src/gtkdialogs.c:903
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3416,27 +3455,29 @@
 "Est叩 a punto de borrar o grupo %s xunto con todos seus membros da lista de "
 "amigos. Desexa continuar?"
 
-#: ../src/gtkdialogs.c:899 ../src/gtkdialogs.c:900
+#: ../src/gtkdialogs.c:906 ../src/gtkdialogs.c:907
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/gtkdialogs.c:938
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+#: ../src/gtkdialogs.c:945
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Est叩 a punto de eliminar a %s da s炭a lista de amigos. Quere continuar?"
 
-#: ../src/gtkdialogs.c:941 ../src/gtkdialogs.c:942
+#: ../src/gtkdialogs.c:948 ../src/gtkdialogs.c:949
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../src/gtkdialogs.c:980
+#: ../src/gtkdialogs.c:987
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "Est叩 a punto de eliminar o chat %s da s炭a lista de amigos. Quere continuar?"
-
-#: ../src/gtkdialogs.c:983 ../src/gtkdialogs.c:984
+msgstr ""
+"Est叩 a punto de eliminar o chat %s da s炭a lista de amigos. Quere continuar?"
+
+#: ../src/gtkdialogs.c:990 ../src/gtkdialogs.c:991
 msgid "Remove Chat"
 msgstr "Eliminar Chat"
 
@@ -3445,121 +3486,122 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: ../src/gtkft.c:160 ../src/gtkft.c:1049
+#: ../src/gtkft.c:160 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Rematado"
 
-#: ../src/gtkft.c:163 ../src/gtkft.c:989
+#: ../src/gtkft.c:163 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../src/gtkft.c:166 ../src/gtkft.c:908
+#: ../src/gtkft.c:166 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Agardando o comezo da transferencia"
 
-#: ../src/gtkft.c:220
+#: ../src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibindo como:</b>"
 
-#: ../src/gtkft.c:222
+#: ../src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibindo de:</b>"
 
-#: ../src/gtkft.c:226
+#: ../src/gtkft.c:225
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: ../src/gtkft.c:228
+#: ../src/gtkft.c:227
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: ../src/gtkft.c:444
+#: ../src/gtkft.c:442
 msgid "There is no application configured to open this type of file."
-msgstr "Non se configurou ningunha aplicaci坦n para abrir este tipo de ficheiro."
-
-#: ../src/gtkft.c:449
+msgstr ""
+"Non se configurou ningunha aplicaci坦n para abrir este tipo de ficheiro."
+
+#: ../src/gtkft.c:447
 msgid "An error occurred while opening the file."
 msgstr "Produciuse un erro ao abrir o ficheiro."
 
-#: ../src/gtkft.c:469
+#: ../src/gtkft.c:484
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Erro ao lanzar %s: %s"
 
-#: ../src/gtkft.c:478
+#: ../src/gtkft.c:493
 #, c-format
 msgid "Error running %s"
 msgstr "Erro executando %s"
 
-#: ../src/gtkft.c:479
+#: ../src/gtkft.c:494
 #, c-format
 msgid "Process returned error code %d"
 msgstr "O proceso devolveu un erro de c坦digo %d"
 
-#: ../src/gtkft.c:574
+#: ../src/gtkft.c:588
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/gtkft.c:581
+#: ../src/gtkft.c:595
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../src/gtkft.c:588
+#: ../src/gtkft.c:602
 msgid "Size"
 msgstr "Tama単o"
 
-#: ../src/gtkft.c:595
+#: ../src/gtkft.c:609
 msgid "Remaining"
 msgstr "Restante"
 
-#: ../src/gtkft.c:626
+#: ../src/gtkft.c:640
 msgid "Filename:"
 msgstr "Nome de ficheiro:"
 
-#: ../src/gtkft.c:627
+#: ../src/gtkft.c:641
 msgid "Local File:"
 msgstr "Ficheiro local:"
 
-#: ../src/gtkft.c:628
+#: ../src/gtkft.c:642
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/gtkft.c:629
+#: ../src/gtkft.c:643
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../src/gtkft.c:630
+#: ../src/gtkft.c:644
 msgid "Time Elapsed:"
 msgstr "Tempo transcurrido:"
 
-#: ../src/gtkft.c:631
+#: ../src/gtkft.c:645
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: ../src/gtkft.c:717
+#: ../src/gtkft.c:731
 msgid "Close this window when all transfers _finish"
 msgstr "_Pechar esta fiestra cando rematen todas as transferencias"
 
-#: ../src/gtkft.c:727
+#: ../src/gtkft.c:741
 msgid "C_lear finished transfers"
 msgstr "_Limpar transferencias rematadas"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:736
+#: ../src/gtkft.c:750
 msgid "File transfer _details"
 msgstr "_Detalles da transferencia de ficheiros"
 
 #. Pause button
-#: ../src/gtkft.c:766 ../src/gtkstock.c:143
+#: ../src/gtkft.c:780 ../src/gtkstock.c:143
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: ../src/gtkft.c:776
+#: ../src/gtkft.c:790
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../src/gtkft.c:991
+#: ../src/gtkft.c:1005
 msgid "Failed"
 msgstr "Fallou"
 
@@ -3772,7 +3814,8 @@
 msgstr ""
 
 #: ../src/gtklog.c:331
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 
 #: ../src/gtklog.c:335
@@ -3911,7 +3954,7 @@
 msgid "Search Results"
 msgstr "Resultados da busca"
 
-#: ../src/gtknotify.c:638 ../src/protocols/oscar/oscar.c:4852
+#: ../src/gtknotify.c:638 ../src/protocols/oscar/oscar.c:4846
 #, c-format
 msgid "Info for %s"
 msgstr "Informaci坦n sobre %s"
@@ -3926,7 +3969,7 @@
 msgstr "O comando de navegador <b>%s</b> 辿 inv叩lido."
 
 #: ../src/gtknotify.c:683 ../src/gtknotify.c:695 ../src/gtknotify.c:708
-#: ../src/gtknotify.c:832
+#: ../src/gtknotify.c:833
 msgid "Unable to open URL"
 msgstr "Non se puido abrir a URL"
 
@@ -3935,8 +3978,9 @@
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Erro ao lanzar <b>%s</b>: %s"
 
-#: ../src/gtknotify.c:833
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
+#: ../src/gtknotify.c:834
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Definiuse un comando de navegador 'Manual', pero non se definiu ning炭n "
 "comando para executalo."
@@ -4236,7 +4280,7 @@
 msgstr "Conversaci坦ns _novas:"
 
 #: ../src/gtkprefs.c:964 ../src/protocols/oscar/oscar.c:779
-#: ../src/protocols/oscar/oscar.c:6002
+#: ../src/protocols/oscar/oscar.c:6001
 msgid "IP Address"
 msgstr "Enderezo IP"
 
@@ -4446,18 +4490,18 @@
 msgid "Choose..."
 msgstr "Escoller..."
 
-#: ../src/gtkprefs.c:1661 ../src/gtkstatusbox.c:416
+#: ../src/gtkprefs.c:1661 ../src/gtkstatusbox.c:439
 #: ../src/protocols/bonjour/bonjour.c:258 ../src/protocols/irc/irc.c:175
 #: ../src/protocols/irc/irc.c:457 ../src/protocols/irc/msgs.c:221
-#: ../src/protocols/jabber/buddy.c:1093 ../src/protocols/jabber/jabber.c:1055
-#: ../src/protocols/msn/msn.c:585 ../src/protocols/novell/novell.c:2851
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:707
-#: ../src/protocols/oscar/oscar.c:6622 ../src/protocols/oscar/oscar.c:7664
-#: ../src/protocols/oscar/oscar.c:7821
-#: ../src/protocols/sametime/sametime.c:3336
+#: ../src/protocols/jabber/buddy.c:1093 ../src/protocols/jabber/jabber.c:1110
+#: ../src/protocols/msn/msn.c:585 ../src/protocols/novell/novell.c:2849
+#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:707
+#: ../src/protocols/oscar/oscar.c:6621 ../src/protocols/oscar/oscar.c:7677
+#: ../src/protocols/oscar/oscar.c:7834
+#: ../src/protocols/sametime/sametime.c:3247
 #: ../src/protocols/silc/buddy.c:1431 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:3108 ../src/protocols/yahoo/yahoo.c:3207
-#: ../src/protocols/zephyr/zephyr.c:2259 ../src/status.c:157
+#: ../src/protocols/yahoo/yahoo.c:3113 ../src/protocols/yahoo/yahoo.c:3212
+#: ../src/protocols/zephyr/zephyr.c:2260 ../src/status.c:157
 msgid "Away"
 msgstr "Ausente"
 
@@ -4556,7 +4600,8 @@
 
 #: ../src/gtkprivacy.c:591
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Introduza o nome de usuario ao que quere permitir que contacte con vostede."
+msgstr ""
+"Introduza o nome de usuario ao que quere permitir que contacte con vostede."
 
 #: ../src/gtkprivacy.c:594 ../src/gtkprivacy.c:607
 msgid "Permit"
@@ -4585,7 +4630,7 @@
 msgstr "Introduza o nome do usuario a bloquear."
 
 #: ../src/gtkprivacy.c:632 ../src/gtkprivacy.c:643
-#: ../src/protocols/gg/gg.c:1478
+#: ../src/protocols/gg/gg.c:1481
 msgid "Block"
 msgstr "Bloquear"
 
@@ -4604,17 +4649,17 @@
 #.
 #: ../src/gtkrequest.c:285 ../src/protocols/msn/dialog.c:114
 #: ../src/protocols/msn/msn.c:561 ../src/protocols/msn/msn.c:564
-#: ../src/protocols/novell/novell.c:1923 ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
-#: ../src/request.h:1322
+#: ../src/request.h:1331
 msgid "Yes"
 msgstr "Si"
 
 #: ../src/gtkrequest.c:286 ../src/protocols/msn/dialog.c:115
 #: ../src/protocols/msn/msn.c:561 ../src/protocols/msn/msn.c:564
-#: ../src/protocols/novell/novell.c:1924 ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
-#: ../src/request.h:1322
+#: ../src/request.h:1331
 msgid "No"
 msgstr "Non"
 
@@ -4653,7 +4698,7 @@
 msgstr "_Obter a lista"
 
 #: ../src/gtksavedstatuses.c:436 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:805 ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/jabber/buddy.c:805 ../src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "T鱈tulo"
 
@@ -4663,22 +4708,22 @@
 
 #: ../src/gtksavedstatuses.c:462 ../src/gtksavedstatuses.c:903
 #: ../src/protocols/bonjour/bonjour.c:252
-#: ../src/protocols/bonjour/bonjour.c:259 ../src/protocols/gg/gg.c:1429
-#: ../src/protocols/gg/gg.c:1434 ../src/protocols/gg/gg.c:1443
-#: ../src/protocols/gg/gg.c:1448 ../src/protocols/gg/gg.c:1453
-#: ../src/protocols/irc/irc.c:176 ../src/protocols/jabber/jabber.c:1032
-#: ../src/protocols/jabber/jabber.c:1040 ../src/protocols/jabber/jabber.c:1048
-#: ../src/protocols/jabber/jabber.c:1056 ../src/protocols/jabber/jabber.c:1064
-#: ../src/protocols/jabber/jabber.c:1072 ../src/protocols/novell/novell.c:2871
-#: ../src/protocols/novell/novell.c:2982 ../src/protocols/novell/novell.c:2988
-#: ../src/protocols/novell/novell.c:2994 ../src/protocols/oscar/oscar.c:7815
-#: ../src/protocols/oscar/oscar.c:7822
-#: ../src/protocols/sametime/sametime.c:3331
-#: ../src/protocols/sametime/sametime.c:3337
-#: ../src/protocols/sametime/sametime.c:3343
-#: ../src/protocols/sametime/sametime.c:3416
-#: ../src/protocols/simple/simple.c:255 ../src/protocols/yahoo/yahoo.c:3202
-#: ../src/protocols/yahoo/yahoo.c:3208 ../src/protocols/zephyr/zephyr.c:2260
+#: ../src/protocols/bonjour/bonjour.c:259 ../src/protocols/gg/gg.c:1432
+#: ../src/protocols/gg/gg.c:1437 ../src/protocols/gg/gg.c:1446
+#: ../src/protocols/gg/gg.c:1451 ../src/protocols/gg/gg.c:1456
+#: ../src/protocols/irc/irc.c:176 ../src/protocols/jabber/jabber.c:1087
+#: ../src/protocols/jabber/jabber.c:1095 ../src/protocols/jabber/jabber.c:1103
+#: ../src/protocols/jabber/jabber.c:1111 ../src/protocols/jabber/jabber.c:1119
+#: ../src/protocols/jabber/jabber.c:1127 ../src/protocols/novell/novell.c:2869
+#: ../src/protocols/novell/novell.c:2980 ../src/protocols/novell/novell.c:2986
+#: ../src/protocols/novell/novell.c:2992 ../src/protocols/oscar/oscar.c:7828
+#: ../src/protocols/oscar/oscar.c:7835
+#: ../src/protocols/sametime/sametime.c:3242
+#: ../src/protocols/sametime/sametime.c:3248
+#: ../src/protocols/sametime/sametime.c:3254
+#: ../src/protocols/sametime/sametime.c:3327
+#: ../src/protocols/simple/simple.c:256 ../src/protocols/yahoo/yahoo.c:3207
+#: ../src/protocols/yahoo/yahoo.c:3213 ../src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Mensaxe"
 
@@ -4701,13 +4746,13 @@
 msgstr "Diferente"
 
 #: ../src/gtksavedstatuses.c:892 ../src/gtksavedstatuses.c:1019
-#: ../src/protocols/gg/gg.c:1410 ../src/protocols/gg/gg.c:1415
+#: ../src/protocols/gg/gg.c:1413 ../src/protocols/gg/gg.c:1418
 #: ../src/protocols/jabber/buddy.c:626 ../src/protocols/jabber/buddy.c:633
-#: ../src/protocols/jabber/buddy.c:644 ../src/protocols/jabber/jabber.c:1005
-#: ../src/protocols/msn/msn.c:552 ../src/protocols/novell/novell.c:2870
-#: ../src/protocols/novell/novell.c:2874 ../src/protocols/oscar/oscar.c:762
+#: ../src/protocols/jabber/buddy.c:644 ../src/protocols/jabber/jabber.c:1060
+#: ../src/protocols/msn/msn.c:552 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/novell/novell.c:2872 ../src/protocols/oscar/oscar.c:762
 #: ../src/protocols/oscar/oscar.c:767 ../src/protocols/oscar/oscar.c:769
-#: ../src/protocols/yahoo/yahoo.c:2804
+#: ../src/protocols/yahoo/yahoo.c:2809
 msgid "Status"
 msgstr "Estado"
 
@@ -4727,7 +4772,7 @@
 #. Save & Use button
 #: ../src/gtksavedstatuses.c:1159
 msgid "Sa_ve & Use"
-msgstr ""
+msgstr "Ga_rdar e usar"
 
 #: ../src/gtksavedstatuses.c:1339
 #, c-format
@@ -4764,11 +4809,11 @@
 
 #: ../src/gtksound.c:68
 msgid "You talk in chat"
-msgstr "Habla no chat"
+msgstr "Fala no chat"
 
 #: ../src/gtksound.c:69
 msgid "Others talk in chat"
-msgstr "Outros hablan no chat"
+msgstr "Outros falan no chat"
 
 #: ../src/gtksound.c:72
 msgid "Someone says your name in chat"
@@ -4777,7 +4822,8 @@
 #: ../src/gtksound.c:414
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "Non foi posible reproducir o son porque o ficheiro escollido (%s) non existe."
+msgstr ""
+"Non foi posible reproducir o son porque o ficheiro escollido (%s) non existe."
 
 #: ../src/gtksound.c:430
 msgid ""
@@ -4796,57 +4842,72 @@
 "Non foi posible reproducir o son porque o comando de son establecido non se "
 "puido lanzar: %s"
 
-#: ../src/gtkstatusbox.c:264
+#: ../src/gtkstatusbox.c:287
 msgid "Typing"
 msgstr "Escribindo"
 
 #. connect to the server
-#: ../src/gtkstatusbox.c:267 ../src/protocols/irc/irc.c:257
-#: ../src/protocols/jabber/jabber.c:838 ../src/protocols/msn/session.c:349
+#: ../src/gtkstatusbox.c:290 ../src/protocols/irc/irc.c:257
+#: ../src/protocols/jabber/jabber.c:893 ../src/protocols/msn/session.c:349
 #: ../src/protocols/napster/napster.c:531
-#: ../src/protocols/novell/novell.c:2185 ../src/protocols/oscar/oscar.c:1810
-#: ../src/protocols/sametime/sametime.c:3699
-#: ../src/protocols/simple/simple.c:1285 ../src/protocols/yahoo/yahoo.c:2505
-#: ../src/protocols/zephyr/zephyr.c:1546
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1804
+#: ../src/protocols/sametime/sametime.c:3610
+#: ../src/protocols/simple/simple.c:1294 ../src/protocols/yahoo/yahoo.c:2510
+#: ../src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Conectando"
 
 #. hacks
-#: ../src/gtkstatusbox.c:415 ../src/protocols/bonjour/bonjour.c:251
-#: ../src/protocols/irc/irc.c:171 ../src/protocols/jabber/jabber.c:1039
+#. zephyr has several exposures
+#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+#. OPSTAFF "hidden"
+#. REALM-VISIBLE visible to people in local realm
+#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+#.
+#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+#. Hidden, will set the user's exposure to OPSTAFF
+#.
+#. Away won't change their exposure but will set an auto away message (for IMs only)
+#.
+#: ../src/gtkstatusbox.c:438 ../src/protocols/bonjour/bonjour.c:251
+#: ../src/protocols/gg/gg.c:1437 ../src/protocols/irc/irc.c:171
+#: ../src/protocols/jabber/buddy.c:1089 ../src/protocols/jabber/jabber.c:1094
 #: ../src/protocols/msn/msn.c:581 ../src/protocols/msn/state.c:29
 #: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2848
-#: ../src/protocols/novell/novell.c:2980 ../src/protocols/oscar/oscar.c:7814
-#: ../src/protocols/silc/silc.c:49 ../src/protocols/simple/simple.c:253
-#: ../src/status.c:154
+#: ../src/protocols/msn/state.c:38 ../src/protocols/napster/napster.c:584
+#: ../src/protocols/novell/novell.c:2846 ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/oscar/oscar.c:7827 ../src/protocols/silc/silc.c:49
+#: ../src/protocols/simple/simple.c:254 ../src/protocols/yahoo/yahoo.c:2664
+#: ../src/protocols/zephyr/zephyr.c:2253 ../src/status.c:154
 msgid "Available"
 msgstr "Dispo単ible"
 
-#: ../src/gtkstatusbox.c:417 ../src/protocols/gg/gg.c:1443
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:7828
-#: ../src/protocols/yahoo/yahoo.c:2653 ../src/protocols/yahoo/yahoo.c:3240
+#: ../src/gtkstatusbox.c:440 ../src/protocols/gg/gg.c:1446
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:7841
+#: ../src/protocols/yahoo/yahoo.c:2658 ../src/protocols/yahoo/yahoo.c:3245
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../src/gtkstatusbox.c:418 ../src/protocols/bonjour/bonjour.c:246
-#: ../src/protocols/gg/gg.c:1429 ../src/protocols/irc/irc.c:167
-#: ../src/protocols/jabber/buddy.c:1087 ../src/protocols/jabber/jabber.c:1032
+#: ../src/gtkstatusbox.c:441 ../src/protocols/bonjour/bonjour.c:246
+#: ../src/protocols/gg/gg.c:1432 ../src/protocols/irc/irc.c:167
+#: ../src/protocols/jabber/buddy.c:1087 ../src/protocols/jabber/jabber.c:1087
 #: ../src/protocols/msn/msn.c:577 ../src/protocols/napster/napster.c:579
-#: ../src/protocols/novell/novell.c:2860 ../src/protocols/novell/novell.c:2977
-#: ../src/protocols/oscar/oscar.c:769 ../src/protocols/oscar/oscar.c:7639
-#: ../src/protocols/oscar/oscar.c:7809
-#: ../src/protocols/sametime/sametime.c:3326 ../src/protocols/silc/silc.c:47
-#: ../src/protocols/simple/simple.c:249 ../src/protocols/yahoo/yahoo.c:2657
-#: ../src/protocols/yahoo/yahoo.c:3197 ../src/status.c:153
+#: ../src/protocols/novell/novell.c:2858 ../src/protocols/novell/novell.c:2975
+#: ../src/protocols/oscar/oscar.c:769 ../src/protocols/oscar/oscar.c:7649
+#: ../src/protocols/oscar/oscar.c:7822
+#: ../src/protocols/sametime/sametime.c:3237 ../src/protocols/silc/silc.c:47
+#: ../src/protocols/simple/simple.c:250 ../src/protocols/yahoo/yahoo.c:2662
+#: ../src/protocols/yahoo/yahoo.c:3202 ../src/status.c:153
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/gtkstatusbox.c:420
+#: ../src/gtkstatusbox.c:443
 msgid "Custom..."
 msgstr "Personalizado..."
 
-#: ../src/gtkstatusbox.c:421
+#: ../src/gtkstatusbox.c:444
 msgid "Saved..."
 msgstr "Gardado..."
 
@@ -4957,7 +5018,8 @@
 
 #: ../src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">O rexistro non ten funci坦n de lectura</font></b>"
+msgstr ""
+"<b><font color=\"red\">O rexistro non ten funci坦n de lectura</font></b>"
 
 #: ../src/log.c:497
 msgid "HTML"
@@ -4999,7 +5061,8 @@
 
 #: ../src/log.c:957 ../src/log.c:1074
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Non se puido atopar a ruta do rexistro!</b></font>"
+msgstr ""
+"<font color=\"red\"><b>Non se puido atopar a ruta do rexistro!</b></font>"
 
 #: ../src/log.c:967 ../src/log.c:1086
 #, c-format
@@ -5035,15 +5098,10 @@
 msgstr "Imposible escoitar as conexi坦ns de MI entrantes\n"
 
 #: ../src/protocols/bonjour/bonjour.c:142
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "Imposible establecer a conexi坦n co servidor local mDNS. Estase executando?"
-
-#: ../src/protocols/bonjour/bonjour.c:323 ../src/protocols/msn/msn.c:554
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2857
-#: ../src/protocols/oscar/oscar.c:5058 ../src/protocols/yahoo/yahoo.c:2655
-#: ../src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Inactivo"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"Imposible establecer a conexi坦n co servidor local mDNS. Estase executando?"
 
 #: ../src/protocols/bonjour/bonjour.c:328
 #, c-format
@@ -5084,20 +5142,20 @@
 msgstr "Usuario de Gaim"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:553
-msgid "Host name"
+#: ../src/protocols/bonjour/bonjour.c:553 ../src/protocols/silc/silc.c:921
+msgid "Hostname"
 msgstr "Nome do servidor"
 
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:557 ../src/protocols/irc/irc.c:820
-#: ../src/protocols/msn/msn.c:1961 ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5774 ../src/protocols/silc/silc.c:1836
+#: ../src/protocols/msn/msn.c:1943 ../src/protocols/napster/napster.c:719
+#: ../src/protocols/sametime/sametime.c:5586 ../src/protocols/silc/silc.c:1836
 msgid "Port"
 msgstr "Porto"
 
 #: ../src/protocols/bonjour/bonjour.c:560 ../src/protocols/gg/gg.c:571
-#: ../src/protocols/gg/gg.c:987
+#: ../src/protocols/gg/gg.c:986
 msgid "First name"
 msgstr "Nome"
 
@@ -5185,21 +5243,21 @@
 msgid "e-Mail"
 msgstr "Correo electr坦nico"
 
-#: ../src/protocols/gg/gg.c:439 ../src/protocols/gg/gg.c:714
-#: ../src/protocols/jabber/jabber.c:632 ../src/protocols/jabber/jabber.c:1150
+#: ../src/protocols/gg/gg.c:439 ../src/protocols/gg/gg.c:713
+#: ../src/protocols/jabber/jabber.c:680 ../src/protocols/jabber/jabber.c:1205
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../src/protocols/gg/gg.c:444 ../src/protocols/gg/gg.c:719
+#: ../src/protocols/gg/gg.c:444 ../src/protocols/gg/gg.c:718
 msgid "Password (retype)"
 msgstr "Contrasinal (reescribir)"
 
-#: ../src/protocols/gg/gg.c:449 ../src/protocols/gg/gg.c:724
+#: ../src/protocols/gg/gg.c:449 ../src/protocols/gg/gg.c:723
 #, fuzzy
 msgid "Enter current token"
 msgstr "%s non est叩 conectado agora."
 
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:730
+#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:729
 #, fuzzy
 msgid "Current token"
 msgstr "Actualmente en"
@@ -5212,29 +5270,29 @@
 msgid "Please, fill in the following fields"
 msgstr "Por favor, encha os seguintes campos"
 
-#: ../src/protocols/gg/gg.c:556 ../src/protocols/gg/gg.c:1602
+#: ../src/protocols/gg/gg.c:556 ../src/protocols/gg/gg.c:1605
 #, fuzzy
 msgid "Unable to initiate a new search"
 msgstr "Non se puido escribir na rede"
 
-#: ../src/protocols/gg/gg.c:557 ../src/protocols/gg/gg.c:1603
+#: ../src/protocols/gg/gg.c:557 ../src/protocols/gg/gg.c:1606
 #, fuzzy
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "Est叩 enviando mensaxes demasiado r叩pido a %s."
 
-#: ../src/protocols/gg/gg.c:576 ../src/protocols/gg/gg.c:1982
-#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/jabber/buddy.c:1341 ../src/protocols/jabber/jabber.c:648
-#: ../src/protocols/msn/msn.c:1386 ../src/protocols/silc/buddy.c:1494
-#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
-#: ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/gg/gg.c:576 ../src/protocols/gg/gg.c:989
+#: ../src/protocols/gg/gg.c:1985 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:698 ../src/protocols/jabber/buddy.c:1341
+#: ../src/protocols/jabber/jabber.c:696 ../src/protocols/msn/msn.c:1368
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/ops.c:1036
+#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
 #: ../src/protocols/yahoo/yahoo_profile.c:1004
 msgid "Nickname"
 msgstr "Alcume"
 
-#: ../src/protocols/gg/gg.c:581 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/jabber.c:668 ../src/protocols/oscar/oscar.c:6049
-#: ../src/protocols/oscar/oscar.c:6057
+#: ../src/protocols/gg/gg.c:581 ../src/protocols/gg/gg.c:992
+#: ../src/protocols/jabber/jabber.c:716 ../src/protocols/oscar/oscar.c:6048
+#: ../src/protocols/oscar/oscar.c:6056
 msgid "City"
 msgstr "Cidade"
 
@@ -5242,8 +5300,8 @@
 msgid "Year of birth"
 msgstr "Cumpreanos"
 
-#: ../src/protocols/gg/gg.c:589 ../src/protocols/msn/msn.c:1545
-#: ../src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/gg/gg.c:589 ../src/protocols/msn/msn.c:1527
+#: ../src/protocols/oscar/oscar.c:6021
 #: ../src/protocols/yahoo/yahoo_profile.c:1029
 msgid "Gender"
 msgstr "Sexo"
@@ -5252,11 +5310,11 @@
 msgid "Male or female"
 msgstr "Home ou muller"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/oscar/oscar.c:6021
 msgid "Male"
 msgstr "Home"
 
-#: ../src/protocols/gg/gg.c:592 ../src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/gg/gg.c:592 ../src/protocols/oscar/oscar.c:6021
 msgid "Female"
 msgstr "Muller"
 
@@ -5281,202 +5339,157 @@
 msgid "Your current password is different from the one that you specified."
 msgstr "Teu contrasinal actual 辿 diferente do primeiro que especificou."
 
-#: ../src/protocols/gg/gg.c:666
+#: ../src/protocols/gg/gg.c:665
 msgid "Unable to change password. Error occured.\n"
 msgstr "Non se puido cambiar o contrasinal. Ocorreu un erro.\n"
 
-#: ../src/protocols/gg/gg.c:675
+#: ../src/protocols/gg/gg.c:674
 #, fuzzy
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar o contrasinal de %s"
 
-#: ../src/protocols/gg/gg.c:676
+#: ../src/protocols/gg/gg.c:675
 msgid "Password was changed successfully!"
 msgstr "Cambiouse con 辿xito o contrasinal!"
 
-#: ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:708
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: ../src/protocols/gg/gg.c:734
+#: ../src/protocols/gg/gg.c:733
 #, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduza seu contrasinal actual e o contrasinal novo."
 
-#: ../src/protocols/gg/gg.c:738 ../src/protocols/gg/gg.c:739
-#, fuzzy
+#: ../src/protocols/gg/gg.c:737 ../src/protocols/gg/gg.c:738
 msgid "Change Gadu-Gadu Password"
-msgstr "Non se puido cambiar o contrasinal Gadu-Gadu"
-
-#: ../src/protocols/gg/gg.c:823
+msgstr "Cambiar o contrasinal Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:822
 #, fuzzy, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Eliminar o chat da s炭a lista de amigos"
 
-#: ../src/protocols/gg/gg.c:826 ../src/protocols/gg/gg.c:827
-#, fuzzy
+#: ../src/protocols/gg/gg.c:825 ../src/protocols/gg/gg.c:826
 msgid "Add to chat..."
-msgstr "Engadir un C_hat"
+msgstr "Engadir ao chat..."
+
+#: ../src/protocols/gg/gg.c:965
+msgid "No matching users found"
+msgstr "Non se atoparon usuarios coincidintes"
 
 #: ../src/protocols/gg/gg.c:966
 #, fuzzy
-msgid "No matching users found"
-msgstr "Non se atoparon rexistros"
-
-#: ../src/protocols/gg/gg.c:967
-#, fuzzy
 msgid "There are no users matching your search criteria."
 msgstr "Por favor, introduza o seu novo contrasinal"
 
-#: ../src/protocols/gg/gg.c:978 ../src/protocols/gg/gg.c:1045
-#: ../src/protocols/oscar/oscar.c:6159
+#: ../src/protocols/gg/gg.c:977 ../src/protocols/gg/gg.c:1044
+#: ../src/protocols/oscar/oscar.c:6158
 #, fuzzy
 msgid "Unable to display the search results."
 msgstr "Non se puido invitar ao usuario (%s)."
 
-#: ../src/protocols/gg/gg.c:984 ../src/protocols/oscar/oscar.c:5994
+#: ../src/protocols/gg/gg.c:983 ../src/protocols/oscar/oscar.c:5993
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:990
-#, fuzzy
-msgid "Nick name"
-msgstr "Alcume"
-
-#: ../src/protocols/gg/gg.c:996
-#, fuzzy
+#: ../src/protocols/gg/gg.c:995
 msgid "Birth year"
-msgstr "D鱈a de nacemento"
+msgstr "Data de nacemento"
+
+#: ../src/protocols/gg/gg.c:1035
+msgid "Gadu-Gadu Public Directory"
+msgstr "Directorio p炭blico Gadu-Gadu"
 
 #: ../src/protocols/gg/gg.c:1036
-msgid "Gadu-Gadu Public Directory"
-msgstr "Directorio p炭blico Gadu-Gadu"
-
-#: ../src/protocols/gg/gg.c:1037
-#, fuzzy
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../src/protocols/gg/gg.c:1129 ../src/protocols/gg/gg.c:1276
+#: ../src/protocols/gg/gg.c:1132 ../src/protocols/gg/gg.c:1279
 msgid "Unable to read socket"
 msgstr "Non se puido ler o socket"
 
-#: ../src/protocols/gg/gg.c:1212
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1215
 msgid "Buddy list downloaded"
-msgstr "O amigo est叩 inactivo"
-
-#: ../src/protocols/gg/gg.c:1213
-#, fuzzy
+msgstr "Lista de amigos descargada"
+
+#: ../src/protocols/gg/gg.c:1216
 msgid "Your buddy list was downloaded from the server."
-msgstr "Foi desconectado do servidor."
-
-#: ../src/protocols/gg/gg.c:1220
-#, fuzzy
+msgstr "A t炭a lista de amigos foi descargada desde o servidor."
+
+#: ../src/protocols/gg/gg.c:1223
 msgid "Buddy list uploaded"
-msgstr "O amigo est叩 inactivo"
-
-#: ../src/protocols/gg/gg.c:1221
-#, fuzzy
+msgstr "Lista de amigos subida"
+
+#: ../src/protocols/gg/gg.c:1224
 msgid "Your buddy list was stored on the server."
-msgstr "Foi desconectado do servidor."
-
-#: ../src/protocols/gg/gg.c:1310 ../src/protocols/gg/gg.c:1528
-#, fuzzy
+msgstr "A t炭a lista de amigos foi almacenada no servidor."
+
+#: ../src/protocols/gg/gg.c:1313 ../src/protocols/gg/gg.c:1531
 msgid "Connection failed."
-msgstr "Fallou a conexi坦n"
-
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: ../src/protocols/gg/gg.c:1434 ../src/protocols/jabber/buddy.c:1089
-#: ../src/protocols/napster/napster.c:584 ../src/protocols/oscar/oscar.c:713
-#: ../src/protocols/yahoo/yahoo.c:2659 ../src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "Conectado"
-
-#: ../src/protocols/gg/gg.c:1448 ../src/protocols/msn/msn.c:593
-#: ../src/protocols/msn/state.c:31 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/novell/novell.c:2992 ../src/protocols/silc/buddy.c:1435
-#: ../src/protocols/silc/silc.c:55 ../src/protocols/yahoo/yahoo.c:2637
-#: ../src/protocols/yahoo/yahoo.c:3215
+msgstr "Fallou a conexi坦n."
+
+#: ../src/protocols/gg/gg.c:1451 ../src/protocols/msn/msn.c:593
+#: ../src/protocols/msn/state.c:31 ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/novell/novell.c:2990 ../src/protocols/silc/buddy.c:1435
+#: ../src/protocols/silc/silc.c:55 ../src/protocols/yahoo/yahoo.c:2642
+#: ../src/protocols/yahoo/yahoo.c:3220
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/protocols/gg/gg.c:1453 ../src/protocols/msn/msn.c:562
+#: ../src/protocols/gg/gg.c:1456 ../src/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../src/protocols/gg/gg.c:1470
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1473
 msgid "Add to chat"
-msgstr "Engadir Chat"
-
-#: ../src/protocols/gg/gg.c:1475
-#, fuzzy
+msgstr "Engadir ao chat"
+
+#: ../src/protocols/gg/gg.c:1478
 msgid "Unblock"
-msgstr "Bloquear"
-
-#: ../src/protocols/gg/gg.c:1494
-#, fuzzy
+msgstr "Desbloquear"
+
+#: ../src/protocols/gg/gg.c:1497
 msgid "Chat _name:"
-msgstr "Apelidos:"
-
-#: ../src/protocols/gg/gg.c:1713
-#, fuzzy
+msgstr "_Nome do chat:"
+
+#: ../src/protocols/gg/gg.c:1716
 msgid "Chat error"
-msgstr "Erro de lectura"
-
-#: ../src/protocols/gg/gg.c:1714
-#, fuzzy
+msgstr "Erro do chat"
+
+#: ../src/protocols/gg/gg.c:1717
 msgid "This chat name is already in use"
-msgstr "Ese ficheiro xa existe"
-
-#: ../src/protocols/gg/gg.c:1796
-#, fuzzy
+msgstr "O nome deste chat xa est叩 en uso"
+
+#: ../src/protocols/gg/gg.c:1799
 msgid "Not connected to the server."
-msgstr "Foi desconectado do servidor."
-
-#: ../src/protocols/gg/gg.c:1819
-#, fuzzy
+msgstr "Non conectado ao servidor."
+
+#: ../src/protocols/gg/gg.c:1822
 msgid "Find buddies..."
-msgstr "Po単er en g_ris os amigos inactivos"
-
-#: ../src/protocols/gg/gg.c:1825
-#, fuzzy
+msgstr "Procurar amigos..."
+
+#: ../src/protocols/gg/gg.c:1828
 msgid "Change password..."
 msgstr "Trocar contrasinal..."
 
-#: ../src/protocols/gg/gg.c:1831
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1834
 msgid "Upload buddylist to Server"
-msgstr "Exportar lista de amigos ao servidor"
-
-#: ../src/protocols/gg/gg.c:1835
-#, fuzzy
+msgstr "Subir lista de amigos ao servidor"
+
+#: ../src/protocols/gg/gg.c:1838
 msgid "Download buddylist from Server"
-msgstr "Borrar lista de amigos do servidor"
-
-#: ../src/protocols/gg/gg.c:1839
-#, fuzzy
+msgstr "Descargar lista de amigos do servidor"
+
+#: ../src/protocols/gg/gg.c:1842
 msgid "Delete buddylist from Server"
 msgstr "Borrar lista de amigos do servidor"
 
-#: ../src/protocols/gg/gg.c:1843
+#: ../src/protocols/gg/gg.c:1846
 msgid "Save buddylist to file..."
 msgstr "Gardar lista de amigos ao ficheiro..."
 
-#: ../src/protocols/gg/gg.c:1847
+#: ../src/protocols/gg/gg.c:1850
 msgid "Load buddylist from file..."
 msgstr "Cargar lista de amigos desde ficheiro..."
 
@@ -5491,16 +5504,16 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1934
+#: ../src/protocols/gg/gg.c:1937
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1935
+#: ../src/protocols/gg/gg.c:1938
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../src/protocols/gg/gg.c:1983
+#: ../src/protocols/gg/gg.c:1986
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
@@ -5569,26 +5582,26 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Os alcumes de IRC non poden ter espacios en branco"
 
-#: ../src/protocols/irc/irc.c:265 ../src/protocols/jabber/jabber.c:433
-#: ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/irc/irc.c:265 ../src/protocols/jabber/jabber.c:481
+#: ../src/protocols/jabber/jabber.c:818
 msgid "SSL support unavailable"
 msgstr "Soporte SSL non dispo単ible"
 
-#: ../src/protocols/irc/irc.c:276 ../src/protocols/simple/simple.c:383
-#: ../src/protocols/simple/simple.c:1228
+#: ../src/protocols/irc/irc.c:276 ../src/protocols/simple/simple.c:392
+#: ../src/protocols/simple/simple.c:1237
 msgid "Couldn't create socket"
 msgstr "Non se puido crear o socket"
 
-#: ../src/protocols/irc/irc.c:347 ../src/protocols/jabber/jabber.c:306
-#: ../src/protocols/oscar/oscar.c:1738 ../src/protocols/oscar/oscar.c:1806
+#: ../src/protocols/irc/irc.c:347 ../src/protocols/jabber/jabber.c:354
+#: ../src/protocols/oscar/oscar.c:1732 ../src/protocols/oscar/oscar.c:1800
 msgid "Couldn't connect to host"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../src/protocols/irc/irc.c:372 ../src/protocols/jabber/jabber.c:333
+#: ../src/protocols/irc/irc.c:372 ../src/protocols/jabber/jabber.c:381
 msgid "Connection Failed"
 msgstr "Fallou a conexi坦n"
 
-#: ../src/protocols/irc/irc.c:375 ../src/protocols/jabber/jabber.c:336
+#: ../src/protocols/irc/irc.c:375 ../src/protocols/jabber/jabber.c:384
 msgid "SSL Handshake Failed"
 msgstr "Fallou na negociaci坦n SSL"
 
@@ -5601,7 +5614,7 @@
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../src/protocols/irc/irc.c:690 ../src/protocols/sametime/sametime.c:3413
+#: ../src/protocols/irc/irc.c:690 ../src/protocols/sametime/sametime.c:3324
 #: ../src/protocols/silc/chat.c:1422 ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1387
 msgid "Topic"
@@ -5626,10 +5639,10 @@
 
 #. host to connect to
 #: ../src/protocols/irc/irc.c:817 ../src/protocols/irc/msgs.c:233
-#: ../src/protocols/jabber/jabber.c:1710
+#: ../src/protocols/jabber/jabber.c:1766
 #: ../src/protocols/napster/napster.c:714
-#: ../src/protocols/sametime/sametime.c:5769 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1438
+#: ../src/protocols/sametime/sametime.c:5581 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1448
 msgid "Server"
 msgstr "Servidor"
 
@@ -5638,7 +5651,7 @@
 msgstr "Codificaci坦ns"
 
 #: ../src/protocols/irc/irc.c:826 ../src/protocols/irc/msgs.c:227
-#: ../src/protocols/jabber/jabber.c:628 ../src/protocols/silc/buddy.c:1497
+#: ../src/protocols/jabber/jabber.c:676 ../src/protocols/silc/buddy.c:1497
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
 #: ../src/protocols/silc/silc.c:919
@@ -5681,7 +5694,7 @@
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:213 ../src/protocols/oscar/oscar.c:5995
+#: ../src/protocols/irc/msgs.c:213 ../src/protocols/oscar/oscar.c:5994
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Alcume"
@@ -5956,7 +5969,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canle]:  Obter a lista dos usuarios que est叩n no canle."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1555
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1610
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alcume&gt;:  Cambia seu alcume."
 
@@ -6038,7 +6051,8 @@
 
 #: ../src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece ou elimina un modo de usuario."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece ou elimina un modo de usuario."
 
 #: ../src/protocols/irc/parse.c:143
 msgid ""
@@ -6052,7 +6066,8 @@
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr "wallops &lt;mensaxe&gt;:  Se non sabe o que 辿 probablemente non poida usalo."
+msgstr ""
+"wallops &lt;mensaxe&gt;:  Se non sabe o que 辿 probablemente non poida usalo."
 
 #: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -6072,7 +6087,7 @@
 msgstr "Resposta a PING CTCP"
 
 #: ../src/protocols/irc/parse.c:543 ../src/protocols/irc/parse.c:547
-#: ../src/protocols/oscar/oscar.c:1647 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/oscar/oscar.c:1641 ../src/protocols/toc/toc.c:190
 #: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
 #: ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
@@ -6088,24 +6103,25 @@
 
 #: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "O servidor require SSL para conectarlle. Non se disp坦n de soporte TLS/SSL."
+msgstr ""
+"O servidor require SSL para conectarlle. Non se disp坦n de soporte TLS/SSL."
 
 #: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "O servidor solicita autenticaci坦n en claro sobre un canle non cifrado"
 
-#: ../src/protocols/jabber/auth.c:133 ../src/protocols/jabber/auth.c:207
-#: ../src/protocols/jabber/auth.c:375 ../src/protocols/jabber/auth.c:473
-#: ../src/protocols/jabber/auth.c:485 ../src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "Resposta inv叩lida do servidor."
-
-#: ../src/protocols/jabber/auth.c:163 ../src/protocols/jabber/auth.c:164
-#: ../src/protocols/jabber/auth.c:244 ../src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:232
+msgid "Server couldn't authenticate you without a password"
+msgstr ""
+
+#: ../src/protocols/jabber/auth.c:235 ../src/protocols/jabber/auth.c:236
+#: ../src/protocols/jabber/auth.c:381 ../src/protocols/jabber/auth.c:382
+#: ../src/protocols/jabber/auth.c:463 ../src/protocols/jabber/auth.c:464
 msgid "Plaintext Authentication"
 msgstr "Autenticaci坦n en claro"
 
-#: ../src/protocols/jabber/auth.c:165 ../src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:383
+#: ../src/protocols/jabber/auth.c:465
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -6113,14 +6129,27 @@
 "O servidor solicita autenticaci坦n en claro sobre un canle non cifrado. "
 "Permitir isto e continuar co proceso de autenticaci坦n?"
 
-#: ../src/protocols/jabber/auth.c:173 ../src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:243 ../src/protocols/jabber/auth.c:391
+#: ../src/protocols/jabber/auth.c:473
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor non usa un m辿todo de autenticaci坦n co単ecido"
 
-#: ../src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: ../src/protocols/jabber/auth.c:309 ../src/protocols/jabber/auth.c:426
+#: ../src/protocols/jabber/auth.c:594 ../src/protocols/jabber/auth.c:726
+#: ../src/protocols/jabber/auth.c:738 ../src/protocols/jabber/auth.c:757
+#: ../src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "Resposta inv叩lida do servidor."
+
+#: ../src/protocols/jabber/auth.c:615
 msgid "Invalid challenge from server"
 msgstr "Desaf鱈o inv叩lido do servidor"
 
+#: ../src/protocols/jabber/auth.c:701
+msgid "SASL error"
+msgstr "Erro de SASL"
+
 #: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:667
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
@@ -6135,7 +6164,7 @@
 msgid "Given Name"
 msgstr "Nome propio"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:688
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:736
 msgid "URL"
 msgstr "URL"
 
@@ -6156,7 +6185,7 @@
 msgstr "Rexi坦n"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:738
-#: ../src/protocols/jabber/jabber.c:678
+#: ../src/protocols/jabber/jabber.c:726
 msgid "Postal Code"
 msgstr "C坦digo postal"
 
@@ -6183,7 +6212,7 @@
 msgstr "Rol"
 
 #: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:701
-#: ../src/protocols/oscar/oscar.c:6030
+#: ../src/protocols/oscar/oscar.c:6029
 msgid "Birthday"
 msgstr "Ano de nacemento"
 
@@ -6203,7 +6232,7 @@
 msgid "Jabber ID"
 msgstr "ID Jabber"
 
-#: ../src/protocols/jabber/buddy.c:642 ../src/protocols/jabber/jabber.c:1713
+#: ../src/protocols/jabber/buddy.c:642 ../src/protocols/jabber/jabber.c:1769
 msgid "Resource"
 msgstr "Recurso"
 
@@ -6211,8 +6240,8 @@
 msgid "Middle Name"
 msgstr "Nome medio"
 
-#: ../src/protocols/jabber/buddy.c:706 ../src/protocols/jabber/jabber.c:663
-#: ../src/protocols/oscar/oscar.c:6048 ../src/protocols/oscar/oscar.c:6056
+#: ../src/protocols/jabber/buddy.c:706 ../src/protocols/jabber/jabber.c:711
+#: ../src/protocols/oscar/oscar.c:6047 ../src/protocols/oscar/oscar.c:6055
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Enderezo"
@@ -6254,23 +6283,23 @@
 msgstr "De-subscribir"
 
 #: ../src/protocols/jabber/buddy.c:1085 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1018
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1073
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/protocols/jabber/buddy.c:1091 ../src/protocols/jabber/jabber.c:1047
+#: ../src/protocols/jabber/buddy.c:1091 ../src/protocols/jabber/jabber.c:1102
 msgid "Chatty"
 msgstr "Falador"
 
-#: ../src/protocols/jabber/buddy.c:1095 ../src/protocols/jabber/jabber.c:1063
+#: ../src/protocols/jabber/buddy.c:1095 ../src/protocols/jabber/jabber.c:1118
 #: ../src/status.c:158
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/jabber.c:1071
-#: ../src/protocols/oscar/oscar.c:701 ../src/protocols/oscar/oscar.c:7848
-#: ../src/protocols/sametime/sametime.c:3342
+#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/jabber.c:1126
+#: ../src/protocols/oscar/oscar.c:701 ../src/protocols/oscar/oscar.c:7861
+#: ../src/protocols/sametime/sametime.c:3253
 msgid "Do Not Disturb"
 msgstr "Non molestar"
 
@@ -6282,13 +6311,13 @@
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:1331 ../src/protocols/jabber/jabber.c:653
-#: ../src/protocols/oscar/oscar.c:6005 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1331 ../src/protocols/jabber/jabber.c:701
+#: ../src/protocols/oscar/oscar.c:6004 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../src/protocols/jabber/buddy.c:1336 ../src/protocols/jabber/jabber.c:658
-#: ../src/protocols/oscar/oscar.c:6006
+#: ../src/protocols/jabber/buddy.c:1336 ../src/protocols/jabber/jabber.c:706
+#: ../src/protocols/oscar/oscar.c:6005
 msgid "Last Name"
 msgstr "Apelidos"
 
@@ -6316,7 +6345,7 @@
 msgid "Search Directory"
 msgstr "Procurar directorio"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7351
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7350
 #: ../src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -6406,417 +6435,420 @@
 msgid "Error initializing session"
 msgstr "Erro ao inicializar a sesi坦n"
 
-#: ../src/protocols/jabber/jabber.c:215
+#: ../src/protocols/jabber/jabber.c:236 ../src/protocols/jabber/jabber.c:251
 msgid "Write error"
 msgstr "Erro de escritura"
 
-#: ../src/protocols/jabber/jabber.c:253 ../src/protocols/jabber/jabber.c:273
+#: ../src/protocols/jabber/jabber.c:289 ../src/protocols/jabber/jabber.c:321
 msgid "Read Error"
 msgstr "Erro de lectura"
 
-#: ../src/protocols/jabber/jabber.c:359 ../src/protocols/jabber/jabber.c:780
+#: ../src/protocols/jabber/jabber.c:407 ../src/protocols/jabber/jabber.c:828
 msgid "Unable to create socket"
 msgstr "Non se puido crear o socket"
 
-#: ../src/protocols/jabber/jabber.c:403 ../src/protocols/jabber/jabber.c:740
+#: ../src/protocols/jabber/jabber.c:451 ../src/protocols/jabber/jabber.c:788
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber non v叩lido"
 
-#: ../src/protocols/jabber/jabber.c:473
+#: ../src/protocols/jabber/jabber.c:521
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Rexistro de %s@%s con 辿xito"
 
-#: ../src/protocols/jabber/jabber.c:475 ../src/protocols/jabber/jabber.c:476
+#: ../src/protocols/jabber/jabber.c:523 ../src/protocols/jabber/jabber.c:524
 msgid "Registration Successful"
 msgstr "�xito no rexistro"
 
-#: ../src/protocols/jabber/jabber.c:482 ../src/protocols/jabber/jabber.c:1299
+#: ../src/protocols/jabber/jabber.c:530 ../src/protocols/jabber/jabber.c:1354
 msgid "Unknown Error"
 msgstr "Erro desco単ecido"
 
-#: ../src/protocols/jabber/jabber.c:484 ../src/protocols/jabber/jabber.c:485
+#: ../src/protocols/jabber/jabber.c:532 ../src/protocols/jabber/jabber.c:533
 msgid "Registration Failed"
 msgstr "Fallou o rexistro"
 
-#: ../src/protocols/jabber/jabber.c:596 ../src/protocols/jabber/jabber.c:597
+#: ../src/protocols/jabber/jabber.c:644 ../src/protocols/jabber/jabber.c:645
 msgid "Already Registered"
 msgstr "Xa est叩 rexistrado"
 
-#: ../src/protocols/jabber/jabber.c:643
+#: ../src/protocols/jabber/jabber.c:691
 msgid "E-Mail"
 msgstr "Correo electr坦nico"
 
-#: ../src/protocols/jabber/jabber.c:673 ../src/protocols/oscar/oscar.c:6050
-#: ../src/protocols/oscar/oscar.c:6058
+#: ../src/protocols/jabber/jabber.c:721 ../src/protocols/oscar/oscar.c:6049
+#: ../src/protocols/oscar/oscar.c:6057
 msgid "State"
 msgstr "Estado"
 
-#: ../src/protocols/jabber/jabber.c:683 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/jabber/jabber.c:731 ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:687 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Tel辿fono"
 
-#: ../src/protocols/jabber/jabber.c:693
+#: ../src/protocols/jabber/jabber.c:741
 msgid "Date"
 msgstr "Data"
 
-#: ../src/protocols/jabber/jabber.c:701
+#: ../src/protocols/jabber/jabber.c:749
 msgid "Please fill out the information below to register your new account."
-msgstr "Por favor, encha a informaci坦n abaixo indicada para rexistrar s炭a nova conta."
-
-#: ../src/protocols/jabber/jabber.c:704 ../src/protocols/jabber/jabber.c:705
+msgstr ""
+"Por favor, encha a informaci坦n abaixo indicada para rexistrar s炭a nova conta."
+
+#: ../src/protocols/jabber/jabber.c:752 ../src/protocols/jabber/jabber.c:753
 msgid "Register New Jabber Account"
 msgstr "Rexistrando conta nova de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:842
+#: ../src/protocols/jabber/jabber.c:897
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../src/protocols/jabber/jabber.c:848 ../src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:903 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:912
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../src/protocols/jabber/jabber.c:928 ../src/protocols/jabber/jabber.c:1277
-#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/jabber.c:1351
-#: ../src/protocols/oscar/oscar.c:767 ../src/protocols/oscar/oscar.c:7637
+#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/jabber/jabber.c:1332
+#: ../src/protocols/jabber/jabber.c:1373 ../src/protocols/jabber/jabber.c:1406
+#: ../src/protocols/oscar/oscar.c:767 ../src/protocols/oscar/oscar.c:7647
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#: ../src/protocols/jabber/jabber.c:971
+#: ../src/protocols/jabber/jabber.c:1026
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/protocols/jabber/jabber.c:973
+#: ../src/protocols/jabber/jabber.c:1028
 msgid "From (To pending)"
 msgstr "Desde (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:975
+#: ../src/protocols/jabber/jabber.c:1030
 msgid "From"
 msgstr "De"
 
-#: ../src/protocols/jabber/jabber.c:978
+#: ../src/protocols/jabber/jabber.c:1033
 msgid "To"
 msgstr "A"
 
-#: ../src/protocols/jabber/jabber.c:980
+#: ../src/protocols/jabber/jabber.c:1035
 msgid "None (To pending)"
 msgstr "Ningu辿n (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:984
+#: ../src/protocols/jabber/jabber.c:1039
 msgid "Subscription"
 msgstr "Subscrici坦n"
 
-#: ../src/protocols/jabber/jabber.c:1039 ../src/protocols/jabber/jabber.c:1047
-#: ../src/protocols/jabber/jabber.c:1055 ../src/protocols/jabber/jabber.c:1063
-#: ../src/protocols/jabber/jabber.c:1071
+#: ../src/protocols/jabber/jabber.c:1094 ../src/protocols/jabber/jabber.c:1102
+#: ../src/protocols/jabber/jabber.c:1110 ../src/protocols/jabber/jabber.c:1118
+#: ../src/protocols/jabber/jabber.c:1126
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../src/protocols/jabber/jabber.c:1093
+#: ../src/protocols/jabber/jabber.c:1148
 msgid "Password Changed"
 msgstr "Contrasinal modificado"
 
-#: ../src/protocols/jabber/jabber.c:1094
+#: ../src/protocols/jabber/jabber.c:1149
 msgid "Your password has been changed."
 msgstr "Seu contrasinal foi modificado."
 
-#: ../src/protocols/jabber/jabber.c:1098 ../src/protocols/jabber/jabber.c:1099
+#: ../src/protocols/jabber/jabber.c:1153 ../src/protocols/jabber/jabber.c:1154
 msgid "Error changing password"
 msgstr "Erro ao cambiar o contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1155
+#: ../src/protocols/jabber/jabber.c:1210
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../src/protocols/jabber/jabber.c:1160 ../src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1215 ../src/protocols/jabber/jabber.c:1216
 msgid "Change Jabber Password"
 msgstr "Cambiar contrasinal de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1216
 msgid "Please enter your new password"
 msgstr "Por favor, introduza o seu novo contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1171 ../src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/jabber/jabber.c:1226 ../src/protocols/oscar/oscar.c:8282
 #: ../src/protocols/silc/silc.c:1009
 msgid "Set User Info..."
 msgstr "Establecer s炭a informaci坦n de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1176 ../src/protocols/oscar/oscar.c:8280
+#: ../src/protocols/jabber/jabber.c:1231 ../src/protocols/oscar/oscar.c:8293
 #: ../src/protocols/silc/silc.c:1005
 msgid "Change Password..."
 msgstr "Trocar contrasinal..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1181
+#: ../src/protocols/jabber/jabber.c:1236
 msgid "Search for Users..."
 msgstr "Procurar usuarios..."
 
-#: ../src/protocols/jabber/jabber.c:1257
+#: ../src/protocols/jabber/jabber.c:1312
 msgid "Bad Request"
 msgstr "Solicitude err坦nea"
 
-#: ../src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1314
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../src/protocols/jabber/jabber.c:1261
+#: ../src/protocols/jabber/jabber.c:1316
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade non implementada"
 
-#: ../src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1318
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../src/protocols/jabber/jabber.c:1265
-msgid "Gone"
-msgstr "Foise"
-
-#: ../src/protocols/jabber/jabber.c:1267 ../src/protocols/jabber/jabber.c:1341
-msgid "Internal Server Error"
-msgstr "Erro interno do servidor"
-
-#: ../src/protocols/jabber/jabber.c:1269
-msgid "Item Not Found"
-msgstr "Elemento non atopado"
-
-#: ../src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "ID de Jabber non v叩lido"
-
-#: ../src/protocols/jabber/jabber.c:1273
-msgid "Not Acceptable"
-msgstr "Non aceptable"
-
-#: ../src/protocols/jabber/jabber.c:1275
-msgid "Not Allowed"
-msgstr "Non permitido"
-
-#: ../src/protocols/jabber/jabber.c:1279
-msgid "Payment Required"
-msgstr "Pago necesario"
-
-#: ../src/protocols/jabber/jabber.c:1281
-msgid "Recipient Unavailable"
-msgstr "Destinatario non dispo単ible"
-
-#: ../src/protocols/jabber/jabber.c:1285
-msgid "Registration Required"
-msgstr "Rexistro necesario"
-
-#: ../src/protocols/jabber/jabber.c:1287
-msgid "Remote Server Not Found"
-msgstr "Non se atopou o servidor remoto"
-
-#: ../src/protocols/jabber/jabber.c:1289
-msgid "Remote Server Timeout"
-msgstr "Expirou o tempo do servidor remoto"
-
-#: ../src/protocols/jabber/jabber.c:1291
-msgid "Server Overloaded"
-msgstr "Servidor sobrecargado"
-
-#: ../src/protocols/jabber/jabber.c:1293
-msgid "Service Unavailable"
-msgstr "Servizo non dispo単ible"
-
-#: ../src/protocols/jabber/jabber.c:1295
-msgid "Subscription Required"
-msgstr "Subscrici坦n necesaria"
-
-#: ../src/protocols/jabber/jabber.c:1297
-msgid "Unexpected Request"
-msgstr "Solicitude non esperada"
-
-#: ../src/protocols/jabber/jabber.c:1304
-msgid "Authorization Aborted"
-msgstr "Autorizaci坦n interrumpida"
-
-#: ../src/protocols/jabber/jabber.c:1306
-msgid "Incorrect encoding in authorization"
-msgstr "Codificaci坦n incorrecta na autorizaci坦n"
-
-#: ../src/protocols/jabber/jabber.c:1309
-msgid "Invalid authzid"
-msgstr "Authzid inv叩lido"
-
-#: ../src/protocols/jabber/jabber.c:1312
-msgid "Invalid Authorization Mechanism"
-msgstr "Mecanismo de autorizaci坦n inv叩lido"
-
-#: ../src/protocols/jabber/jabber.c:1315
-msgid "Authorization mechanism too weak"
-msgstr "Mecanismo de autorizaci坦n demasiado d辿bil"
-
 #: ../src/protocols/jabber/jabber.c:1320
+msgid "Gone"
+msgstr "Foise"
+
+#: ../src/protocols/jabber/jabber.c:1322 ../src/protocols/jabber/jabber.c:1396
+msgid "Internal Server Error"
+msgstr "Erro interno do servidor"
+
+#: ../src/protocols/jabber/jabber.c:1324
+msgid "Item Not Found"
+msgstr "Elemento non atopado"
+
+#: ../src/protocols/jabber/jabber.c:1326
+msgid "Malformed Jabber ID"
+msgstr "ID de Jabber non v叩lido"
+
+#: ../src/protocols/jabber/jabber.c:1328
+msgid "Not Acceptable"
+msgstr "Non aceptable"
+
+#: ../src/protocols/jabber/jabber.c:1330
+msgid "Not Allowed"
+msgstr "Non permitido"
+
+#: ../src/protocols/jabber/jabber.c:1334
+msgid "Payment Required"
+msgstr "Pago necesario"
+
+#: ../src/protocols/jabber/jabber.c:1336
+msgid "Recipient Unavailable"
+msgstr "Destinatario non dispo単ible"
+
+#: ../src/protocols/jabber/jabber.c:1340
+msgid "Registration Required"
+msgstr "Rexistro necesario"
+
+#: ../src/protocols/jabber/jabber.c:1342
+msgid "Remote Server Not Found"
+msgstr "Non se atopou o servidor remoto"
+
+#: ../src/protocols/jabber/jabber.c:1344
+msgid "Remote Server Timeout"
+msgstr "Expirou o tempo do servidor remoto"
+
+#: ../src/protocols/jabber/jabber.c:1346
+msgid "Server Overloaded"
+msgstr "Servidor sobrecargado"
+
+#: ../src/protocols/jabber/jabber.c:1348
+msgid "Service Unavailable"
+msgstr "Servizo non dispo単ible"
+
+#: ../src/protocols/jabber/jabber.c:1350
+msgid "Subscription Required"
+msgstr "Subscrici坦n necesaria"
+
+#: ../src/protocols/jabber/jabber.c:1352
+msgid "Unexpected Request"
+msgstr "Solicitude non esperada"
+
+#: ../src/protocols/jabber/jabber.c:1359
+msgid "Authorization Aborted"
+msgstr "Autorizaci坦n interrumpida"
+
+#: ../src/protocols/jabber/jabber.c:1361
+msgid "Incorrect encoding in authorization"
+msgstr "Codificaci坦n incorrecta na autorizaci坦n"
+
+#: ../src/protocols/jabber/jabber.c:1364
+msgid "Invalid authzid"
+msgstr "Authzid inv叩lido"
+
+#: ../src/protocols/jabber/jabber.c:1367
+msgid "Invalid Authorization Mechanism"
+msgstr "Mecanismo de autorizaci坦n inv叩lido"
+
+#: ../src/protocols/jabber/jabber.c:1370
+msgid "Authorization mechanism too weak"
+msgstr "Mecanismo de autorizaci坦n demasiado d辿bil"
+
+#: ../src/protocols/jabber/jabber.c:1375
 msgid "Temporary Authentication Failure"
 msgstr "Fallo temporal da autenticaci坦n"
 
-#: ../src/protocols/jabber/jabber.c:1322
+#: ../src/protocols/jabber/jabber.c:1377
 msgid "Authentication Failure"
 msgstr "Fallo de autenticaci坦n"
 
-#: ../src/protocols/jabber/jabber.c:1326
+#: ../src/protocols/jabber/jabber.c:1381
 msgid "Bad Format"
 msgstr "Formato err坦neo"
 
-#: ../src/protocols/jabber/jabber.c:1328
+#: ../src/protocols/jabber/jabber.c:1383
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo do espacio de nomes err坦neo"
 
-#: ../src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1386
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1388 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Expirou a conexi坦n"
 
-#: ../src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1390
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1392
 msgid "Host Unknown"
 msgstr "Servidor desco単ecido"
 
-#: ../src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1394
 msgid "Improper Addressing"
 msgstr "Direccionamento incorrecto"
 
-#: ../src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1398
 msgid "Invalid ID"
 msgstr "ID non v叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1400
 msgid "Invalid Namespace"
 msgstr "Espacio de nomes non v叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1347
+#: ../src/protocols/jabber/jabber.c:1402
 msgid "Invalid XML"
 msgstr "XML inv叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1404
 msgid "Non-matching Hosts"
 msgstr "Non existen servidores coincidintes"
 
-#: ../src/protocols/jabber/jabber.c:1353
+#: ../src/protocols/jabber/jabber.c:1408
 msgid "Policy Violation"
 msgstr "Violaci坦n da pol鱈tica"
 
-#: ../src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1410
 msgid "Remote Connection Failed"
 msgstr "Fallou a conexi坦n remota"
 
-#: ../src/protocols/jabber/jabber.c:1357
+#: ../src/protocols/jabber/jabber.c:1412
 msgid "Resource Constraint"
 msgstr "Restricci坦n de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1414
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
-#: ../src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "See Other Host"
 msgstr "Ver outros servidores"
 
-#: ../src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1418
 msgid "System Shutdown"
 msgstr "Parada do sistema"
 
-#: ../src/protocols/jabber/jabber.c:1365
+#: ../src/protocols/jabber/jabber.c:1420
 msgid "Undefined Condition"
 msgstr "Condici坦n non definida"
 
-#: ../src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1422
 msgid "Unsupported Encoding"
 msgstr "Codificaci坦n non soportada"
 
-#: ../src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:1424
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de Stanza non soportado"
 
-#: ../src/protocols/jabber/jabber.c:1371
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Unsupported Version"
 msgstr "Versi坦n non soportada"
 
-#: ../src/protocols/jabber/jabber.c:1373
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "XML Not Well Formed"
 msgstr "XML mal formado"
 
-#: ../src/protocols/jabber/jabber.c:1375
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Stream Error"
 msgstr "Erro de fluxo"
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1497
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Non puido vetar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1464
+#: ../src/protocols/jabber/jabber.c:1519
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Comando desco単ecido: %s"
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1524
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Non se puido invitar ao usuario (%s)."
 
-#: ../src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1576
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Non puido expulsar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1547
+#: ../src/protocols/jabber/jabber.c:1602
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1551
+#: ../src/protocols/jabber/jabber.c:1606
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1560
+#: ../src/protocols/jabber/jabber.c:1615
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Abandonar a sala."
 
-#: ../src/protocols/jabber/jabber.c:1565
+#: ../src/protocols/jabber/jabber.c:1620
 msgid "register:  Register with a chat room."
 msgstr "register: Rexistrarse nunha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1571
+#: ../src/protocols/jabber/jabber.c:1626
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo t坦pico]:  Ver ou cambiar o t坦pico."
 
-#: ../src/protocols/jabber/jabber.c:1577
+#: ../src/protocols/jabber/jabber.c:1632
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Vetar a un usuario da sala."
 
-#: ../src/protocols/jabber/jabber.c:1583
+#: ../src/protocols/jabber/jabber.c:1638
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../src/protocols/jabber/jabber.c:1589
+#: ../src/protocols/jabber/jabber.c:1644
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaxe]:  Invitar un usuario 叩 sala."
 
-#: ../src/protocols/jabber/jabber.c:1595
+#: ../src/protocols/jabber/jabber.c:1650
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
-
-#: ../src/protocols/jabber/jabber.c:1601
+msgstr ""
+"join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
+
+#: ../src/protocols/jabber/jabber.c:1656
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Botar a un usuario da sala."
 
-#: ../src/protocols/jabber/jabber.c:1606
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../src/protocols/jabber/jabber.c:1661
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe en privado a un "
 "usuario."
@@ -6831,32 +6863,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1688 ../src/protocols/jabber/jabber.c:1690
+#: ../src/protocols/jabber/jabber.c:1744 ../src/protocols/jabber/jabber.c:1746
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1716
+#: ../src/protocols/jabber/jabber.c:1772
 msgid "Use TLS if available"
 msgstr "Usar TLS se est叩 dispo単ible"
 
-#: ../src/protocols/jabber/jabber.c:1721
+#: ../src/protocols/jabber/jabber.c:1777
 msgid "Require TLS"
 msgstr "Require TLS"
 
-#: ../src/protocols/jabber/jabber.c:1724
+#: ../src/protocols/jabber/jabber.c:1780
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antigo (porto 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1729
+#: ../src/protocols/jabber/jabber.c:1785
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticaci坦n en claro sobre canles non cifrados"
 
-#: ../src/protocols/jabber/jabber.c:1734
+#: ../src/protocols/jabber/jabber.c:1790
 msgid "Connect port"
 msgstr "Conectar co porto"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1738 ../src/protocols/silc/silc.c:1832
+#: ../src/protocols/jabber/jabber.c:1794 ../src/protocols/silc/silc.c:1832
 msgid "Connect server"
 msgstr "Conectar co servidor"
 
@@ -6897,20 +6929,20 @@
 msgid "Unknown Error in presence"
 msgstr "Erro desco単ecido en presencia"
 
-#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:93
+#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "O usuario %s quere engadir a %s a s炭a lista de amigos."
 
-#: ../src/protocols/jabber/presence.c:319 ../src/protocols/msn/userlist.c:100
-#: ../src/protocols/oscar/oscar.c:4596 ../src/protocols/oscar/oscar.c:7281
-#: ../src/protocols/yahoo/yahoo.c:902
+#: ../src/protocols/jabber/presence.c:319 ../src/protocols/msn/userlist.c:111
+#: ../src/protocols/oscar/oscar.c:4590 ../src/protocols/oscar/oscar.c:7280
+#: ../src/protocols/yahoo/yahoo.c:907
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../src/protocols/jabber/presence.c:320 ../src/protocols/msn/userlist.c:101
-#: ../src/protocols/oscar/oscar.c:4598 ../src/protocols/oscar/oscar.c:7282
-#: ../src/protocols/yahoo/yahoo.c:904
+#: ../src/protocols/jabber/presence.c:320 ../src/protocols/msn/userlist.c:112
+#: ../src/protocols/oscar/oscar.c:4592 ../src/protocols/oscar/oscar.c:7281
+#: ../src/protocols/yahoo/yahoo.c:909
 msgid "Deny"
 msgstr "Denegar"
 
@@ -7169,7 +7201,7 @@
 msgid "Server too busy"
 msgstr "Servidor moi ocupado"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2757
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2751
 #: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Fallou a autenticaci坦n"
@@ -7265,8 +7297,8 @@
 msgstr "P叩xina"
 
 #: ../src/protocols/msn/msn.c:552 ../src/protocols/msn/msn.c:559
-#: ../src/protocols/msn/msn.c:562 ../src/protocols/yahoo/yahoo.c:2804
-#: ../src/protocols/yahoo/yahoo.c:2810
+#: ../src/protocols/msn/msn.c:562 ../src/protocols/yahoo/yahoo.c:2809
+#: ../src/protocols/yahoo/yahoo.c:2815
 #, c-format
 msgid ""
 "\n"
@@ -7280,21 +7312,21 @@
 msgstr "Tenlle"
 
 #: ../src/protocols/msn/msn.c:589 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2635 ../src/protocols/yahoo/yahoo.c:3212
+#: ../src/protocols/yahoo/yahoo.c:2640 ../src/protocols/yahoo/yahoo.c:3217
 msgid "Be Right Back"
 msgstr "Volvo enseguida"
 
-#: ../src/protocols/msn/msn.c:597 ../src/protocols/msn/state.c:35
-#: ../src/protocols/yahoo/yahoo.c:2645 ../src/protocols/yahoo/yahoo.c:3227
-msgid "On The Phone"
+#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2650
+#: ../src/protocols/yahoo/yahoo.c:3232
+msgid "On the Phone"
 msgstr "Ao tel辿fono"
 
-#: ../src/protocols/msn/msn.c:601 ../src/protocols/msn/state.c:36
-#: ../src/protocols/yahoo/yahoo.c:2649 ../src/protocols/yahoo/yahoo.c:3233
-msgid "Out To Lunch"
-msgstr "Sa鱈n a comer"
-
-#: ../src/protocols/msn/msn.c:605 ../src/protocols/zephyr/zephyr.c:2255
+#: ../src/protocols/msn/msn.c:601 ../src/protocols/yahoo/yahoo.c:2654
+#: ../src/protocols/yahoo/yahoo.c:3238
+msgid "Out to Lunch"
+msgstr "Sa鱈n a xantar"
+
+#: ../src/protocols/msn/msn.c:605 ../src/protocols/zephyr/zephyr.c:2256
 #: ../src/status.c:156
 msgid "Hidden"
 msgstr "Agochado"
@@ -7331,7 +7363,7 @@
 msgid "Send to Mobile"
 msgstr "Enviar a un m坦vil"
 
-#: ../src/protocols/msn/msn.c:688 ../src/protocols/novell/novell.c:3446
+#: ../src/protocols/msn/msn.c:688 ../src/protocols/novell/novell.c:3444
 msgid "Initiate _Chat"
 msgstr "Iniciar _Chat"
 
@@ -7347,80 +7379,80 @@
 msgid "Failed to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../src/protocols/msn/msn.c:1379 ../src/protocols/yahoo/yahoo_profile.c:654
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1361 ../src/protocols/yahoo/yahoo_profile.c:654
+#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alcume:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1386 ../src/protocols/msn/msn.c:1732
+#: ../src/protocols/msn/msn.c:1368 ../src/protocols/msn/msn.c:1714
 #: ../src/protocols/yahoo/yahoo_profile.c:1171 ../src/util.c:800
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1463
+#: ../src/protocols/msn/msn.c:1445
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1719
+#: ../src/protocols/msn/msn.c:1450 ../src/protocols/msn/msn.c:1701
 #: ../src/protocols/yahoo/yahoo_profile.c:764
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
 
-#: ../src/protocols/msn/msn.c:1538 ../src/protocols/oscar/oscar.c:6035
+#: ../src/protocols/msn/msn.c:1520 ../src/protocols/oscar/oscar.c:6034
 #: ../src/protocols/yahoo/yahoo_profile.c:1019
 msgid "Age"
 msgstr "Edade"
 
-#: ../src/protocols/msn/msn.c:1554 ../src/protocols/yahoo/yahoo_profile.c:1024
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/yahoo/yahoo_profile.c:1024
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../src/protocols/msn/msn.c:1561 ../src/protocols/novell/novell.c:1482
+#: ../src/protocols/msn/msn.c:1543 ../src/protocols/novell/novell.c:1480
 #: ../src/protocols/yahoo/yahoo_profile.c:1014
 msgid "Location"
 msgstr "Ubicaci坦n"
 
-#: ../src/protocols/msn/msn.c:1569 ../src/protocols/yahoo/yahoo_profile.c:1034
+#: ../src/protocols/msn/msn.c:1551 ../src/protocols/yahoo/yahoo_profile.c:1034
 msgid "Occupation"
 msgstr "Ocupaci坦n"
 
-#: ../src/protocols/msn/msn.c:1586 ../src/protocols/msn/msn.c:1592
-#: ../src/protocols/msn/msn.c:1599 ../src/protocols/msn/msn.c:1607
-#: ../src/protocols/msn/msn.c:1614
+#: ../src/protocols/msn/msn.c:1568 ../src/protocols/msn/msn.c:1574
+#: ../src/protocols/msn/msn.c:1581 ../src/protocols/msn/msn.c:1589
+#: ../src/protocols/msn/msn.c:1596
 msgid "A Little About Me"
 msgstr "Un pouco sobre min"
 
-#: ../src/protocols/msn/msn.c:1623 ../src/protocols/msn/msn.c:1629
-#: ../src/protocols/msn/msn.c:1636 ../src/protocols/msn/msn.c:1643
+#: ../src/protocols/msn/msn.c:1605 ../src/protocols/msn/msn.c:1611
+#: ../src/protocols/msn/msn.c:1618 ../src/protocols/msn/msn.c:1625
 msgid "Favorite Things"
 msgstr "Cousas preferidas"
 
-#: ../src/protocols/msn/msn.c:1652 ../src/protocols/msn/msn.c:1658
-#: ../src/protocols/msn/msn.c:1665
+#: ../src/protocols/msn/msn.c:1634 ../src/protocols/msn/msn.c:1640
+#: ../src/protocols/msn/msn.c:1647
 msgid "Hobbies and Interests"
 msgstr "Afici坦ns e intereses"
 
-#: ../src/protocols/msn/msn.c:1674 ../src/protocols/msn/msn.c:1680
+#: ../src/protocols/msn/msn.c:1656 ../src/protocols/msn/msn.c:1662
 #: ../src/protocols/yahoo/yahoo_profile.c:1076
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../src/protocols/msn/msn.c:1688
+#: ../src/protocols/msn/msn.c:1670
 msgid "Last Updated"
 msgstr "�ltima actualizaci坦n"
 
-#: ../src/protocols/msn/msn.c:1699 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1681 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "P叩xina persoal"
 
-#: ../src/protocols/msn/msn.c:1721
+#: ../src/protocols/msn/msn.c:1703
 msgid "The user has not created a public profile."
 msgstr "O usuario non creou un perfil p炭blico."
 
-#: ../src/protocols/msn/msn.c:1722
+#: ../src/protocols/msn/msn.c:1704
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7430,7 +7462,7 @@
 "que ou ben o usuario non existe ou que o usuario existe pero non creou un "
 "perfil p炭blico."
 
-#: ../src/protocols/msn/msn.c:1726
+#: ../src/protocols/msn/msn.c:1708
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7438,7 +7470,7 @@
 "Gaim non puido atopar informaci坦n no perfil de usuario. � probable que o "
 "usuario non exista."
 
-#: ../src/protocols/msn/msn.c:1732 ../src/protocols/yahoo/yahoo_profile.c:1171
+#: ../src/protocols/msn/msn.c:1714 ../src/protocols/yahoo/yahoo_profile.c:1171
 msgid "Profile URL"
 msgstr "URL do perfil"
 
@@ -7452,19 +7484,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:1935 ../src/protocols/msn/msn.c:1937
+#: ../src/protocols/msn/msn.c:1917 ../src/protocols/msn/msn.c:1919
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../src/protocols/msn/msn.c:1956
+#: ../src/protocols/msn/msn.c:1938
 msgid "Login server"
 msgstr "Servidor de conexi坦n"
 
-#: ../src/protocols/msn/msn.c:1965
+#: ../src/protocols/msn/msn.c:1947
 msgid "Use HTTP Method"
 msgstr "Usar m辿todo HTTP"
 
-#: ../src/protocols/msn/msn.c:1973
+#: ../src/protocols/msn/msn.c:1955
 #, fuzzy
 msgid "nudge: nudge a user to get their attention"
 msgstr "buzz: Avisar a un contacto para chamar s炭a atenci坦n"
@@ -7566,7 +7598,7 @@
 msgstr "Erro de lectura"
 
 #: ../src/protocols/msn/servconn.c:133 ../src/protocols/msn/session.c:326
-#: ../src/protocols/oscar/oscar.c:4919
+#: ../src/protocols/oscar/oscar.c:4913
 msgid "Unknown error"
 msgstr "Erro desco単ecido"
 
@@ -7590,7 +7622,7 @@
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
 #: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5668 ../src/protocols/yahoo/yahoo.c:194
+#: ../src/protocols/oscar/oscar.c:5667 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Conectouse desde outra ubicaci坦n."
 
@@ -7610,7 +7642,8 @@
 msgstr "Non se puido autenticar: %s"
 
 #: ../src/protocols/msn/session.c:329
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "S炭a lista de amigos MSN est叩 indispo単ible temporalmente. Por favor, espere e "
 "volva a tentalo m叩is tarde."
@@ -7643,13 +7676,22 @@
 msgid "Away From Computer"
 msgstr "Ausente"
 
+#: ../src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Ao tel辿fono"
+
+#: ../src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Sa鱈n a comer"
+
 #: ../src/protocols/msn/switchboard.c:405
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Posiblemente non se puido enviar a mensaxe porque expirou a conexi坦n:"
 
 #: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Non se puido enviar a mensaxe, non est叩 permitido mentras sexa invisible:"
+msgstr ""
+"Non se puido enviar a mensaxe, non est叩 permitido mentras sexa invisible:"
 
 #: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because the user is offline:"
@@ -7660,8 +7702,10 @@
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro na conexi坦n:"
 
 #: ../src/protocols/msn/switchboard.c:425
-msgid "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+"Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
 
 #: ../src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
@@ -7672,27 +7716,27 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s quere enviarlle un ficheiro"
 
-#: ../src/protocols/msn/userlist.c:85
+#: ../src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "O usuario %s (%s) quere engadir a %s a s炭a lista de amigos."
 
-#: ../src/protocols/msn/userlist.c:275
+#: ../src/protocols/msn/userlist.c:286
 #, fuzzy, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "O usuario %s quere engadir a %s a s炭a lista de amigos."
 
-#: ../src/protocols/msn/userlist.c:339
+#: ../src/protocols/msn/userlist.c:350
 #, fuzzy, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s eliminoute da s炭a lista de contactos"
 
-#: ../src/protocols/msn/userlist.c:659
+#: ../src/protocols/msn/userlist.c:670
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Imposible engadir \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:661
+#: ../src/protocols/msn/userlist.c:672
 msgid "The screen name specified is invalid."
 msgstr "O nome especificado 辿 inv叩lido."
 
@@ -7737,8 +7781,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:538 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2219 ../src/protocols/yahoo/yahoo.c:2246
-#: ../src/protocols/yahoo/yahoo.c:2309
+#: ../src/protocols/yahoo/yahoo.c:2224 ../src/protocols/yahoo/yahoo.c:2251
+#: ../src/protocols/yahoo/yahoo.c:2314
 #: ../src/protocols/yahoo/yahoo_filexfer.c:69
 #: ../src/protocols/yahoo/yahoo_filexfer.c:111
 #: ../src/protocols/yahoo/ycht.c:481
@@ -7924,7 +7968,8 @@
 #: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%s)."
+msgstr ""
+"Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%s)."
 
 #: ../src/protocols/novell/novell.c:537
 #, c-format
@@ -7974,7 +8019,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Non se puido eliminar %s da s炭a lista de privacidade (%s)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1656
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Non se puideron cambiar as opci坦ns de privacidade do servidor (%s)."
@@ -7984,32 +8029,32 @@
 msgid "Unable to create conference (%s)."
 msgstr "Non se puido crear a conferencia (%s)."
 
-#: ../src/protocols/novell/novell.c:1125 ../src/protocols/novell/novell.c:1695
+#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro comunic叩ndose co servidor. Pecharase a conexi坦n."
 
-#: ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "N炭mero de tel辿fono"
 
-#: ../src/protocols/novell/novell.c:1484
+#: ../src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Departamento"
 
-#: ../src/protocols/novell/novell.c:1486
+#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "T鱈tulo"
 
-#: ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Buz坦n de correo"
 
-#: ../src/protocols/novell/novell.c:1492 ../src/protocols/oscar/oscar.c:6008
-#: ../src/protocols/oscar/oscar.c:6015
+#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6007
+#: ../src/protocols/oscar/oscar.c:6014
 msgid "Email Address"
 msgstr "Enderezo electr坦nico"
 
-#: ../src/protocols/novell/novell.c:1508
+#: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -8020,41 +8065,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1522
+#: ../src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../src/protocols/novell/novell.c:1646
+#: ../src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../src/protocols/novell/novell.c:1671
+#: ../src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "Non se puido establecer unha conexi坦n SSL co servidor."
 
-#: ../src/protocols/novell/novell.c:1728
+#: ../src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../src/protocols/novell/novell.c:1740
+#: ../src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../src/protocols/novell/novell.c:1743
+#: ../src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: ../src/protocols/novell/novell.c:1878
+#: ../src/protocols/novell/novell.c:1876
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Invitouse a %s a esta conversaci坦n."
 
-#: ../src/protocols/novell/novell.c:1906
+#: ../src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "Invitaci坦n a unha conversaci坦n"
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8065,17 +8110,18 @@
 "\n"
 "Enviada: %s"
 
-#: ../src/protocols/novell/novell.c:1909
+#: ../src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "Desexa unirse 叩 conversaci坦n?"
 
-#: ../src/protocols/novell/novell.c:2016
+#: ../src/protocols/novell/novell.c:2014
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Foi desconectado porque se conectou desde outra estaci坦n de traballo."
 
-#: ../src/protocols/novell/novell.c:2072
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+#: ../src/protocols/novell/novell.c:2070
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "Non parece que %s estea conectado e non recibiu a mensaxe que acaba de "
 "enviar."
@@ -8084,7 +8130,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2170
+#: ../src/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8092,15 +8138,15 @@
 "Non se puido contactar co servidor. Por favor, indique o enderezo do "
 "servidor co que desexa conectarse."
 
-#: ../src/protocols/novell/novell.c:2192
+#: ../src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O soporte SSL non est叩 instalado."
 
-#: ../src/protocols/novell/novell.c:2501
+#: ../src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Pechouse esta conferencia. Non se poden enviar m叩is mensaxes."
 
-#: ../src/protocols/novell/novell.c:2998 ../src/protocols/yahoo/yahoo.c:2856
+#: ../src/protocols/novell/novell.c:2996 ../src/protocols/yahoo/yahoo.c:2861
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
@@ -8114,15 +8160,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3545 ../src/protocols/novell/novell.c:3547
+#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensaxer鱈a de Grupos Novell"
 
-#: ../src/protocols/novell/novell.c:3566
+#: ../src/protocols/novell/novell.c:3564
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: ../src/protocols/novell/novell.c:3570
+#: ../src/protocols/novell/novell.c:3568
 msgid "Server port"
 msgstr "Porto do servidor"
 
@@ -8243,7 +8289,7 @@
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/protocols/oscar/oscar.c:625 ../src/protocols/oscar/oscar.c:7955
+#: ../src/protocols/oscar/oscar.c:625 ../src/protocols/oscar/oscar.c:7968
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
@@ -8315,15 +8361,15 @@
 msgid "Camera"
 msgstr "C叩mara"
 
-#: ../src/protocols/oscar/oscar.c:699 ../src/protocols/oscar/oscar.c:7838
+#: ../src/protocols/oscar/oscar.c:699 ../src/protocols/oscar/oscar.c:7851
 msgid "Free For Chat"
 msgstr "Dispo単ible para conversar"
 
-#: ../src/protocols/oscar/oscar.c:703 ../src/protocols/oscar/oscar.c:7853
+#: ../src/protocols/oscar/oscar.c:703 ../src/protocols/oscar/oscar.c:7866
 msgid "Not Available"
 msgstr "Non dispo単ible"
 
-#: ../src/protocols/oscar/oscar.c:705 ../src/protocols/oscar/oscar.c:7843
+#: ../src/protocols/oscar/oscar.c:705 ../src/protocols/oscar/oscar.c:7856
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -8331,57 +8377,57 @@
 msgid "Web Aware"
 msgstr "Capacidade Web"
 
-#: ../src/protocols/oscar/oscar.c:786 ../src/protocols/oscar/oscar.c:5044
+#: ../src/protocols/oscar/oscar.c:713
+msgid "Online"
+msgstr "Conectado"
+
+#: ../src/protocols/oscar/oscar.c:786 ../src/protocols/oscar/oscar.c:5038
 msgid "Warning Level"
 msgstr "Nivel de aviso"
 
-#: ../src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "Capacidades"
-
-#: ../src/protocols/oscar/oscar.c:801
+#: ../src/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../src/protocols/oscar/oscar.c:952
+#: ../src/protocols/oscar/oscar.c:946
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Pechouse o MI con %s"
 
-#: ../src/protocols/oscar/oscar.c:954
+#: ../src/protocols/oscar/oscar.c:948
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Fallou un MI directo con %s"
 
-#: ../src/protocols/oscar/oscar.c:962
+#: ../src/protocols/oscar/oscar.c:956
 msgid "Direct Connect failed"
 msgstr "Fallou a conexi坦n directa"
 
-#: ../src/protocols/oscar/oscar.c:1039 ../src/protocols/oscar/oscar.c:1170
+#: ../src/protocols/oscar/oscar.c:1033 ../src/protocols/oscar/oscar.c:1164
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Estableceuse un MI directo con %s"
 
-#: ../src/protocols/oscar/oscar.c:1120
+#: ../src/protocols/oscar/oscar.c:1114
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Intentando conectarse a %s en %s: %hu para IM Directo."
 
-#: ../src/protocols/oscar/oscar.c:1541
+#: ../src/protocols/oscar/oscar.c:1535
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Solicitando a %s que se conecte con nos en %s: %hu para MI directo."
 
-#: ../src/protocols/oscar/oscar.c:1546
+#: ../src/protocols/oscar/oscar.c:1540
 msgid "Unable to open Direct IM"
 msgstr "Non se puido abrir un MI directo"
 
-#: ../src/protocols/oscar/oscar.c:1581
+#: ../src/protocols/oscar/oscar.c:1575
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Vostede pediu abrir unha conexi坦n MI directa con %s."
 
-#: ../src/protocols/oscar/oscar.c:1585
+#: ../src/protocols/oscar/oscar.c:1579
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8389,25 +8435,25 @@
 "Como isto revela seu enderezo IP, pode ser considerado como un resgo a s炭a "
 "privacidade. Quere continuar?"
 
-#: ../src/protocols/oscar/oscar.c:1589 ../src/protocols/oscar/oscar.c:4355
-#: ../src/protocols/sametime/sametime.c:3636
+#: ../src/protocols/oscar/oscar.c:1583 ../src/protocols/oscar/oscar.c:4349
+#: ../src/protocols/sametime/sametime.c:3547
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/protocols/oscar/oscar.c:1655
+#: ../src/protocols/oscar/oscar.c:1649
 #, fuzzy, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "Foi desconectado da sala de chat: %s."
 
-#: ../src/protocols/oscar/oscar.c:1678
+#: ../src/protocols/oscar/oscar.c:1672
 msgid "Chat is currently unavailable"
 msgstr "O chat non est叩 dispo単ible"
 
-#: ../src/protocols/oscar/oscar.c:1748
+#: ../src/protocols/oscar/oscar.c:1742
 msgid "Screen name sent"
 msgstr "Enviouse o nome de usuario"
 
-#: ../src/protocols/oscar/oscar.c:1764
+#: ../src/protocols/oscar/oscar.c:1758
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8418,22 +8464,22 @@
 "non 辿 v叩lido. Os nomes de usuario deben comezar con letras e s坦 poden conter "
 "letras, n炭meros e espacios, ou conter s坦 n炭meros."
 
-#: ../src/protocols/oscar/oscar.c:1793
+#: ../src/protocols/oscar/oscar.c:1787
 msgid "Unable to login to AIM"
 msgstr "Non se puido conectar con AIM"
 
-#: ../src/protocols/oscar/oscar.c:1897 ../src/protocols/oscar/oscar.c:2848
+#: ../src/protocols/oscar/oscar.c:1891 ../src/protocols/oscar/oscar.c:2842
 msgid "Could Not Connect"
 msgstr "Non se puido conectar"
 
-#: ../src/protocols/oscar/oscar.c:1905
+#: ../src/protocols/oscar/oscar.c:1899
 msgid "Connection established, cookie sent"
 msgstr "Conexi坦n establecida, cookie enviada"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
 #. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2057
+#: ../src/protocols/oscar/oscar.c:2051
 #, fuzzy
 msgid "Attempting connection redirect..."
 msgstr "Intentando conectarse a %s en %s: %hu para IM Directo."
@@ -8442,7 +8488,7 @@
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
 #. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2102
+#: ../src/protocols/oscar/oscar.c:2096
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
@@ -8450,42 +8496,43 @@
 "ICQ."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:2200
+#: ../src/protocols/oscar/oscar.c:2194
 #: ../src/protocols/yahoo/yahoo_filexfer.c:174
 #: ../src/protocols/yahoo/yahoo_filexfer.c:183
 #: ../src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Non se puido establecer o descritor de ficheiro."
 
-#: ../src/protocols/oscar/oscar.c:2205
+#: ../src/protocols/oscar/oscar.c:2199
 msgid "Unable to create new connection."
 msgstr "Non se puido crear unha nova conexi坦n."
 
-#: ../src/protocols/oscar/oscar.c:2439 ../src/protocols/oscar/oscar.c:2448
-#: ../src/protocols/oscar/oscar.c:2462 ../src/protocols/oscar/oscar.c:2472
+#: ../src/protocols/oscar/oscar.c:2433 ../src/protocols/oscar/oscar.c:2442
+#: ../src/protocols/oscar/oscar.c:2456 ../src/protocols/oscar/oscar.c:2466
 #, fuzzy
 msgid "Unable to log into file transfer proxy."
 msgstr "Non se puido escribir o ficheiro %s."
 
-#: ../src/protocols/oscar/oscar.c:2526
+#: ../src/protocols/oscar/oscar.c:2520
 #, fuzzy
 msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "NOn se puido crear o socket de escoita."
 
-#: ../src/protocols/oscar/oscar.c:2734 ../src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:2728 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Nome de conta ou contrasinal incorrecto."
 
-#: ../src/protocols/oscar/oscar.c:2739
+#: ../src/protocols/oscar/oscar.c:2733
 msgid "Your account is currently suspended."
 msgstr "S炭a conta est叩 deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2743
+#: ../src/protocols/oscar/oscar.c:2737
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "O servizo de Mensaxer鱈a Instant叩nea AOL est叩 temporalmente non dispo単ible."
-
-#: ../src/protocols/oscar/oscar.c:2748
+msgstr ""
+"O servizo de Mensaxer鱈a Instant叩nea AOL est叩 temporalmente non dispo単ible."
+
+#: ../src/protocols/oscar/oscar.c:2742
 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."
@@ -8493,33 +8540,34 @@
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e int辿nteo "
 "de novo. Se segue intent叩ndoo, necesitar叩 agardar incluso m叩is tempo."
 
-#: ../src/protocols/oscar/oscar.c:2753
+#: ../src/protocols/oscar/oscar.c:2747
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "A versi坦n do cliente que usa 辿 demasiado antiga. Por favor, actual鱈cea en %s"
-
-#: ../src/protocols/oscar/oscar.c:2784
+msgstr ""
+"A versi坦n do cliente que usa 辿 demasiado antiga. Por favor, actual鱈cea en %s"
+
+#: ../src/protocols/oscar/oscar.c:2778
 msgid "Internal Error"
 msgstr "Erro interno"
 
-#: ../src/protocols/oscar/oscar.c:2855
+#: ../src/protocols/oscar/oscar.c:2849
 msgid "Received authorization"
 msgstr "Recibiuse a autorizaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:2879
+#: ../src/protocols/oscar/oscar.c:2873
 msgid "The SecurID key entered is invalid."
 msgstr "A clave SecurID que se introduciu non 辿 v叩lida."
 
-#: ../src/protocols/oscar/oscar.c:2893
+#: ../src/protocols/oscar/oscar.c:2887
 msgid "Enter SecurID"
 msgstr "Introduza SecurID"
 
-#: ../src/protocols/oscar/oscar.c:2894
+#: ../src/protocols/oscar/oscar.c:2888
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduza o d鱈xito de seis n炭meros que aparece na pantalla."
 
-#: ../src/protocols/oscar/oscar.c:2934 ../src/protocols/oscar/oscar.c:2964
-#: ../src/protocols/oscar/oscar.c:3053
+#: ../src/protocols/oscar/oscar.c:2928 ../src/protocols/oscar/oscar.c:2958
+#: ../src/protocols/oscar/oscar.c:3047
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8528,24 +8576,24 @@
 "Quizais sexa desconectado en breve. Pode quere usar TOC ata que se resolva "
 "isto. Comprobe %s para novidades."
 
-#: ../src/protocols/oscar/oscar.c:2937 ../src/protocols/oscar/oscar.c:2967
+#: ../src/protocols/oscar/oscar.c:2931 ../src/protocols/oscar/oscar.c:2961
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim non puido obter un hash de conexi坦n a AIM v叩lido."
 
-#: ../src/protocols/oscar/oscar.c:3056
+#: ../src/protocols/oscar/oscar.c:3050
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim non puido obter un hash de conexi坦n v叩lido."
 
-#: ../src/protocols/oscar/oscar.c:3077
+#: ../src/protocols/oscar/oscar.c:3071
 msgid "Password sent"
 msgstr "Contrasinal enviado"
 
-#: ../src/protocols/oscar/oscar.c:4346
+#: ../src/protocols/oscar/oscar.c:4340
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s pide conectarse directamente a %s"
 
-#: ../src/protocols/oscar/oscar.c:4349
+#: ../src/protocols/oscar/oscar.c:4343
 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 "
@@ -8555,19 +8603,20 @@
 "para Imaxes de MI. Como seu enderezo IP ser叩 revelado, pode considerarse "
 "isto como un risco a s炭a privacidade."
 
-#: ../src/protocols/oscar/oscar.c:4388
+#: ../src/protocols/oscar/oscar.c:4382
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Por favor, autor鱈ceme para que poida engadirlle a mi単a lista de amigos."
-
-#: ../src/protocols/oscar/oscar.c:4396
+msgstr ""
+"Por favor, autor鱈ceme para que poida engadirlle a mi単a lista de amigos."
+
+#: ../src/protocols/oscar/oscar.c:4390
 msgid "Authorization Request Message:"
 msgstr "Mensaxe de solicitude de autorizaci坦n:"
 
-#: ../src/protocols/oscar/oscar.c:4397
+#: ../src/protocols/oscar/oscar.c:4391
 msgid "Please authorize me!"
 msgstr "Por favor, autor鱈ceme!"
 
-#: ../src/protocols/oscar/oscar.c:4427
+#: ../src/protocols/oscar/oscar.c:4421
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8576,21 +8625,21 @@
 "O usuario %s require autorizaci坦n antes de permitir que o incorporen a unha "
 "lista de amigos. Desexa enviar unha solicitude de autorizaci坦n?"
 
-#: ../src/protocols/oscar/oscar.c:4432 ../src/protocols/oscar/oscar.c:4434
+#: ../src/protocols/oscar/oscar.c:4426 ../src/protocols/oscar/oscar.c:4428
 msgid "Request Authorization"
 msgstr "Pedir autorizaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:4472 ../src/protocols/oscar/oscar.c:4478
-#: ../src/protocols/oscar/oscar.c:4582 ../src/protocols/oscar/oscar.c:4606
-#: ../src/protocols/oscar/oscar.c:7267 ../src/protocols/oscar/oscar.c:7319
+#: ../src/protocols/oscar/oscar.c:4466 ../src/protocols/oscar/oscar.c:4472
+#: ../src/protocols/oscar/oscar.c:4576 ../src/protocols/oscar/oscar.c:4600
+#: ../src/protocols/oscar/oscar.c:7266 ../src/protocols/oscar/oscar.c:7318
 msgid "No reason given."
 msgstr "Non se indicou un raz坦n."
 
-#: ../src/protocols/oscar/oscar.c:4477
+#: ../src/protocols/oscar/oscar.c:4471
 msgid "Authorization Denied Message:"
 msgstr "Mensaxe de autorizaci坦n denegada:"
 
-#: ../src/protocols/oscar/oscar.c:4584
+#: ../src/protocols/oscar/oscar.c:4578
 #, fuzzy, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8599,11 +8648,11 @@
 "O usuario %u quere engadirlle a s炭a lista de amigos polo seguinte motivo:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4594 ../src/protocols/oscar/oscar.c:7279
+#: ../src/protocols/oscar/oscar.c:4588 ../src/protocols/oscar/oscar.c:7278
 msgid "Authorization Request"
 msgstr "Solicitude de autorizaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:4606
+#: ../src/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8614,17 +8663,17 @@
 "seguinte raz坦n:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4607
+#: ../src/protocols/oscar/oscar.c:4601
 msgid "ICQ authorization denied."
 msgstr "Autorizaci坦n ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4614
+#: ../src/protocols/oscar/oscar.c:4608
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "O usuario %u autorizou s炭a petici坦n de engadilo a s炭a lista de amigos."
 
-#: ../src/protocols/oscar/oscar.c:4622
+#: ../src/protocols/oscar/oscar.c:4616
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8637,7 +8686,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4630
+#: ../src/protocols/oscar/oscar.c:4624
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8650,7 +8699,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4638
+#: ../src/protocols/oscar/oscar.c:4632
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8663,113 +8712,120 @@
 "Mensaxe:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4659
+#: ../src/protocols/oscar/oscar.c:4653
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuario ICQ %u envioulle un amigo: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:4665
+#: ../src/protocols/oscar/oscar.c:4659
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Desexa engadir este amigo a s炭a lista de amigos?"
 
-#: ../src/protocols/oscar/oscar.c:4669
+#: ../src/protocols/oscar/oscar.c:4663
 msgid "Decline"
 msgstr "Non engadilo"
 
-#: ../src/protocols/oscar/oscar.c:4753
+#: ../src/protocols/oscar/oscar.c:4747
 #, 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] "Vostede perdeu %hu mensaxe de %s porque non era v叩lido."
 msgstr[1] "Perd辿ronse %hu mensaxes de %s porque non eran v叩lidos."
 
-#: ../src/protocols/oscar/oscar.c:4762
+#: ../src/protocols/oscar/oscar.c:4756
 #, 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] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
 msgstr[1] "Perd辿ronse %hu mensaxes de %s porque eran demasiado longas."
 
-#: ../src/protocols/oscar/oscar.c:4771
-#, 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."
+#: ../src/protocols/oscar/oscar.c:4765
+#, 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] "Perdeu %hu mensaxe de %s porque foi mandado demasiado r叩pido."
-msgstr[1] "Perd辿ronse %hu mensaxes de %s porque foron mandadas demasiado r叩pido."
-
-#: ../src/protocols/oscar/oscar.c:4780
+msgstr[1] ""
+"Perd辿ronse %hu mensaxes de %s porque foron mandadas demasiado r叩pido."
+
+#: ../src/protocols/oscar/oscar.c:4774
 #, 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] "Perdeuse %hu mensaxe de %s porque el/ela 辿 moi malvado/a."
 msgstr[1] "Perd辿ronse %hu mensaxes de %s porque el/ela 辿 moi malvado/a."
 
-#: ../src/protocols/oscar/oscar.c:4789
+#: ../src/protocols/oscar/oscar.c:4783
 #, 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] "Perdeuse %hu mensaxe de %s porque vostede 辿 moi malvado/a."
 msgstr[1] "Perd辿ronse %hu mensaxes de %s porque vostede 辿 moi malvado/a."
 
-#: ../src/protocols/oscar/oscar.c:4798
+#: ../src/protocols/oscar/oscar.c:4792
 #, 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] "Perdeuse %hu mensaxe de %s por motivos desco単ecidos."
 msgstr[1] "Perd辿ronse %hu mensaxes de %s por motivos desco単ecidos."
 
-#: ../src/protocols/oscar/oscar.c:4857
+#: ../src/protocols/oscar/oscar.c:4851
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:4918
+#: ../src/protocols/oscar/oscar.c:4912
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC eviou o erro: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:4955
+#: ../src/protocols/oscar/oscar.c:4949
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Non se puido enviar a mensaxe: %s"
 
-#: ../src/protocols/oscar/oscar.c:4955 ../src/protocols/oscar/oscar.c:4960
-#: ../src/protocols/oscar/oscar.c:5018 ../src/protocols/oscar/oscar.c:5022
+#: ../src/protocols/oscar/oscar.c:4949 ../src/protocols/oscar/oscar.c:4954
+#: ../src/protocols/oscar/oscar.c:5012 ../src/protocols/oscar/oscar.c:5016
 msgid "Unknown reason."
 msgstr "Raz坦n desco単ecida."
 
-#: ../src/protocols/oscar/oscar.c:4958
-#: ../src/protocols/sametime/sametime.c:2381
+#: ../src/protocols/oscar/oscar.c:4952
+#: ../src/protocols/sametime/sametime.c:2303
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Non se puido enviar a mensaxe a %s:"
 
-#: ../src/protocols/oscar/oscar.c:5018
+#: ../src/protocols/oscar/oscar.c:5012
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informaci坦n de usuario non dispo単ible: %s"
 
-#: ../src/protocols/oscar/oscar.c:5021
+#: ../src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informaci坦n de usuario de %s non dispo単ible:"
 
-#: ../src/protocols/oscar/oscar.c:5048
+#: ../src/protocols/oscar/oscar.c:5042
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../src/protocols/oscar/oscar.c:5053
+#: ../src/protocols/oscar/oscar.c:5047
 #: ../src/protocols/yahoo/yahoo_profile.c:1122
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../src/protocols/oscar/oscar.c:5181
+#: ../src/protocols/oscar/oscar.c:5052
+msgid "Capabilities"
+msgstr "Capacidades"
+
+#: ../src/protocols/oscar/oscar.c:5180
 msgid "Your AIM connection may be lost."
 msgstr "S炭a conexi坦n AIM pode que se perdera."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5367
+#: ../src/protocols/oscar/oscar.c:5366
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8777,11 +8833,11 @@
 "[Non se puido amosar unha mensaxe deste usuario porque cont辿n caracteres "
 "inv叩lidos.]"
 
-#: ../src/protocols/oscar/oscar.c:5593
+#: ../src/protocols/oscar/oscar.c:5592
 msgid "Rate limiting error."
 msgstr "Erro do limitador de tasa de mensaxes."
 
-#: ../src/protocols/oscar/oscar.c:5594
+#: ../src/protocols/oscar/oscar.c:5593
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8790,94 +8846,94 @@
 "l鱈mite na tasa de env鱈o de mensaxes. Por favor, agarde 10 segundos e volva a "
 "intentalo."
 
-#: ../src/protocols/oscar/oscar.c:5670
+#: ../src/protocols/oscar/oscar.c:5669
 msgid "You have been signed off for an unknown reason."
 msgstr "Foi desconectado por motivos desco単ecidos."
 
-#: ../src/protocols/oscar/oscar.c:5683 ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5682 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Foi desconectado da sala de chat: %s."
 
 #. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5708
+#: ../src/protocols/oscar/oscar.c:5707
 msgid "Finalizing connection"
 msgstr "Rematando a conexi坦n"
 
-#: ../src/protocols/oscar/oscar.c:6020 ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:6019 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Tel辿fono m坦vil"
 
-#: ../src/protocols/oscar/oscar.c:6038
+#: ../src/protocols/oscar/oscar.c:6037
 msgid "Personal Web Page"
 msgstr "P叩xina web persoal"
 
-#: ../src/protocols/oscar/oscar.c:6042
+#: ../src/protocols/oscar/oscar.c:6041
 msgid "Additional Information"
 msgstr "Informaci坦n adicional"
 
-#: ../src/protocols/oscar/oscar.c:6047
+#: ../src/protocols/oscar/oscar.c:6046
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../src/protocols/oscar/oscar.c:6051 ../src/protocols/oscar/oscar.c:6059
+#: ../src/protocols/oscar/oscar.c:6050 ../src/protocols/oscar/oscar.c:6058
 msgid "Zip Code"
 msgstr "C坦digo postal"
 
-#: ../src/protocols/oscar/oscar.c:6055
+#: ../src/protocols/oscar/oscar.c:6054
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
-#: ../src/protocols/oscar/oscar.c:6063
+#: ../src/protocols/oscar/oscar.c:6062
 msgid "Work Information"
 msgstr "Informaci坦n do traballo"
 
+#: ../src/protocols/oscar/oscar.c:6063
+msgid "Company"
+msgstr "Compa単鱈a"
+
 #: ../src/protocols/oscar/oscar.c:6064
-msgid "Company"
-msgstr "Compa単鱈a"
-
-#: ../src/protocols/oscar/oscar.c:6065
 msgid "Division"
 msgstr "Secci坦n"
 
-#: ../src/protocols/oscar/oscar.c:6066
+#: ../src/protocols/oscar/oscar.c:6065
 msgid "Position"
 msgstr "Cargo"
 
-#: ../src/protocols/oscar/oscar.c:6068
+#: ../src/protocols/oscar/oscar.c:6067
 msgid "Web Page"
 msgstr "P叩xina web"
 
-#: ../src/protocols/oscar/oscar.c:6125
+#: ../src/protocols/oscar/oscar.c:6124
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
-#: ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/oscar/oscar.c:6164
 #, fuzzy, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Os seguintes nomes de usuarios est叩n asociados a %s"
 msgstr[1] "Os seguintes nomes de usuarios est叩n asociados a %s"
 
-#: ../src/protocols/oscar/oscar.c:6196
+#: ../src/protocols/oscar/oscar.c:6195
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Non se atoparon resultados para o enderezo de correo %s"
 
-#: ../src/protocols/oscar/oscar.c:6217
+#: ../src/protocols/oscar/oscar.c:6216
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Deber鱈a recibir unha mensaxe solicitando confirmaci坦n de %s."
 
-#: ../src/protocols/oscar/oscar.c:6219
+#: ../src/protocols/oscar/oscar.c:6218
 msgid "Account Confirmation Requested"
 msgstr "Confirmaci坦n de conta solicitada"
 
-#: ../src/protocols/oscar/oscar.c:6250
+#: ../src/protocols/oscar/oscar.c:6249
 msgid "Error Changing Account Info"
 msgstr "Erro cambiando a informaci坦n da conta"
 
-#: ../src/protocols/oscar/oscar.c:6253
+#: ../src/protocols/oscar/oscar.c:6252
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8886,14 +8942,14 @@
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
 "usuario solicitado difire do orixinal."
 
-#: ../src/protocols/oscar/oscar.c:6256
+#: ../src/protocols/oscar/oscar.c:6255
 #, fuzzy, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
 "usuario solicitado 辿 demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:6259
+#: ../src/protocols/oscar/oscar.c:6258
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8902,7 +8958,7 @@
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
 "usuario solicitado 辿 demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:6262
+#: ../src/protocols/oscar/oscar.c:6261
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8911,7 +8967,7 @@
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electr坦nico porque xa "
 "existe unha solicitude pendente para este nome de usuario."
 
-#: ../src/protocols/oscar/oscar.c:6265
+#: ../src/protocols/oscar/oscar.c:6264
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8920,7 +8976,7 @@
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electr坦nico porque o "
 "enderezo dado xa ten demasiados nomes de usuarios asociados."
 
-#: ../src/protocols/oscar/oscar.c:6268
+#: ../src/protocols/oscar/oscar.c:6267
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8929,12 +8985,12 @@
 "Erro 0x%04x: Non es pode cambiar o enderezo de correo electr坦nico porque o "
 "enderezo dado 辿 inv叩lido."
 
-#: ../src/protocols/oscar/oscar.c:6271
+#: ../src/protocols/oscar/oscar.c:6270
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desco単ecido."
 
-#: ../src/protocols/oscar/oscar.c:6281
+#: ../src/protocols/oscar/oscar.c:6280
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8943,26 +8999,27 @@
 "O formato de seu nome de usuario 辿 actualmente o seguinte:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6282 ../src/protocols/oscar/oscar.c:6289
+#: ../src/protocols/oscar/oscar.c:6281 ../src/protocols/oscar/oscar.c:6288
 msgid "Account Info"
 msgstr "Informaci坦n da conta"
 
-#: ../src/protocols/oscar/oscar.c:6287
+#: ../src/protocols/oscar/oscar.c:6286
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "O enderezo de correo electr坦nico de %s 辿 %s"
 
-#: ../src/protocols/oscar/oscar.c:6354
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+#: ../src/protocols/oscar/oscar.c:6353
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Non se enviou s炭a imaxe MI. Debe estar directamente conectado para enviar "
 "imaxes MI."
 
-#: ../src/protocols/oscar/oscar.c:6573
+#: ../src/protocols/oscar/oscar.c:6572
 msgid "Unable to set AIM profile."
 msgstr "Non se puido establecer o perfil AIM."
 
-#: ../src/protocols/oscar/oscar.c:6574
+#: ../src/protocols/oscar/oscar.c:6573
 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 "
@@ -8972,7 +9029,7 @@
 "conexi坦n complet叩rase. Seu perfil quedar叩 sen cambiar, int辿nteo novamente "
 "cando xa estea conectado completamente."
 
-#: ../src/protocols/oscar/oscar.c:6588
+#: ../src/protocols/oscar/oscar.c:6587
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8980,14 +9037,16 @@
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[0] "Excedeuse o tama単o m叩ximo de perfil de %d byte. Gaim aplicouno truncado."
-msgstr[1] "Excedeuse o tama単o m叩ximo de perfil de %d bytes. Gaim aplicouno truncado."
-
-#: ../src/protocols/oscar/oscar.c:6593
+msgstr[0] ""
+"Excedeuse o tama単o m叩ximo de perfil de %d byte. Gaim aplicouno truncado."
+msgstr[1] ""
+"Excedeuse o tama単o m叩ximo de perfil de %d bytes. Gaim aplicouno truncado."
+
+#: ../src/protocols/oscar/oscar.c:6592
 msgid "Profile too long."
 msgstr "Perfil demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:6629
+#: ../src/protocols/oscar/oscar.c:6628
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9002,11 +9061,11 @@
 "Excedeuse o l鱈mite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 
-#: ../src/protocols/oscar/oscar.c:6634
+#: ../src/protocols/oscar/oscar.c:6633
 msgid "Away message too long."
 msgstr "Mensaxe de ausencia demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:6725
+#: ../src/protocols/oscar/oscar.c:6724
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9017,16 +9076,16 @@
 "nome de usuario deben comezar con letras s坦 poden conter letras, n炭mero e "
 "espacios, ou conter s坦 n炭meros."
 
-#: ../src/protocols/oscar/oscar.c:6727 ../src/protocols/oscar/oscar.c:7125
-#: ../src/protocols/oscar/oscar.c:7139 ../src/protocols/simple/simple.c:203
+#: ../src/protocols/oscar/oscar.c:6726 ../src/protocols/oscar/oscar.c:7124
+#: ../src/protocols/oscar/oscar.c:7138 ../src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../src/protocols/oscar/oscar.c:6832
+#: ../src/protocols/oscar/oscar.c:6831
 msgid "Unable To Retrieve Buddy List"
 msgstr "Non se puido obter a lista de amigos"
 
-#: ../src/protocols/oscar/oscar.c:6833
+#: ../src/protocols/oscar/oscar.c:6832
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -9035,13 +9094,13 @@
 "Gaim non pode obter neste momento a lista de amigos dos servidores de AIM. A "
 "lista non borrou, e seguramente volver叩 a estar dispo単ible nunhas horas."
 
-#: ../src/protocols/oscar/oscar.c:7023 ../src/protocols/oscar/oscar.c:7024
-#: ../src/protocols/oscar/oscar.c:7029 ../src/protocols/oscar/oscar.c:7183
-#: ../src/protocols/oscar/oscar.c:7184 ../src/protocols/oscar/oscar.c:7189
+#: ../src/protocols/oscar/oscar.c:7022 ../src/protocols/oscar/oscar.c:7023
+#: ../src/protocols/oscar/oscar.c:7028 ../src/protocols/oscar/oscar.c:7182
+#: ../src/protocols/oscar/oscar.c:7183 ../src/protocols/oscar/oscar.c:7188
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../src/protocols/oscar/oscar.c:7123
+#: ../src/protocols/oscar/oscar.c:7122
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9050,11 +9109,11 @@
 "Non se puido engadir o amigo %s porque hai demasiados contactos na lista de "
 "amigos. Por favor, elimine un e volva a probar."
 
-#: ../src/protocols/oscar/oscar.c:7123 ../src/protocols/oscar/oscar.c:7137
+#: ../src/protocols/oscar/oscar.c:7122 ../src/protocols/oscar/oscar.c:7136
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../src/protocols/oscar/oscar.c:7137
+#: ../src/protocols/oscar/oscar.c:7136
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9065,7 +9124,7 @@
 "habitual 辿 que chegou ao m叩ximo n炭mero de amigos permitidos na s炭a lista de "
 "amigos."
 
-#: ../src/protocols/oscar/oscar.c:7220
+#: ../src/protocols/oscar/oscar.c:7219
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9074,11 +9133,11 @@
 "O usuario %s deulle permiso para engadirlle a s炭a lista de amigos. Desexa "
 "facelo?"
 
-#: ../src/protocols/oscar/oscar.c:7226
+#: ../src/protocols/oscar/oscar.c:7225
 msgid "Authorization Given"
 msgstr "Autorizaci坦n otorgada"
 
-#: ../src/protocols/oscar/oscar.c:7270
+#: ../src/protocols/oscar/oscar.c:7269
 #, fuzzy, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9088,17 +9147,18 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7315
+#: ../src/protocols/oscar/oscar.c:7314
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "O usuario %s autorizou s炭a solicitude de engadilo a s炭a lista de amigos."
-
-#: ../src/protocols/oscar/oscar.c:7316
+msgstr ""
+"O usuario %s autorizou s炭a solicitude de engadilo a s炭a lista de amigos."
+
+#: ../src/protocols/oscar/oscar.c:7315
 msgid "Authorization Granted"
 msgstr "Autorizaci坦n aceptada"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7319
+#: ../src/protocols/oscar/oscar.c:7318
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9109,101 +9169,105 @@
 "seguinte raz坦n:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7320
+#: ../src/protocols/oscar/oscar.c:7319
 msgid "Authorization Denied"
 msgstr "Autorizaci坦n denegada"
 
-#: ../src/protocols/oscar/oscar.c:7357 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7356 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Troco:"
 
-#: ../src/protocols/oscar/oscar.c:7393
+#: ../src/protocols/oscar/oscar.c:7392
 msgid "Invalid chat name specified."
 msgstr "Especificouse un nome de chat inv叩lido."
 
-#: ../src/protocols/oscar/oscar.c:7463
+#: ../src/protocols/oscar/oscar.c:7462
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Non se enviou s炭a imaxe MI. Non se poden enviar imaxes MI en chats AIM."
+msgstr ""
+"Non se enviou s炭a imaxe MI. Non se poden enviar imaxes MI en chats AIM."
 
 #. Available status messages are plain text
-#: ../src/protocols/oscar/oscar.c:7597
+#: ../src/protocols/oscar/oscar.c:7598
 msgid "Available Message"
 msgstr "Mensaxe dispo単ible"
 
-#: ../src/protocols/oscar/oscar.c:7606
-#: ../src/protocols/sametime/sametime.c:5343
+#: ../src/protocols/oscar/oscar.c:7612 ../src/protocols/oscar/oscar.c:7617
 msgid "Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../src/protocols/oscar/oscar.c:7911
+#: ../src/protocols/oscar/oscar.c:7617
+msgid "(pending)"
+msgstr "(pendente)"
+
+#: ../src/protocols/oscar/oscar.c:7924
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../src/protocols/oscar/oscar.c:7912
+#: ../src/protocols/oscar/oscar.c:7925
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../src/protocols/oscar/oscar.c:7931
+#: ../src/protocols/oscar/oscar.c:7944
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../src/protocols/oscar/oscar.c:7937
+#: ../src/protocols/oscar/oscar.c:7950
 msgid "Get Status Msg"
 msgstr "Obter msx de estado"
 
-#: ../src/protocols/oscar/oscar.c:7949
+#: ../src/protocols/oscar/oscar.c:7962
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../src/protocols/oscar/oscar.c:7966
+#: ../src/protocols/oscar/oscar.c:7979
 msgid "Re-request Authorization"
 msgstr "Solicitar autorizaci坦n outra vez"
 
-#: ../src/protocols/oscar/oscar.c:8026
+#: ../src/protocols/oscar/oscar.c:8039
 msgid "Require authorization"
 msgstr "Pedir autorizaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8029
+#: ../src/protocols/oscar/oscar.c:8042
 msgid "Hide IP address"
 msgstr "Agochar enderezo IP"
 
-#: ../src/protocols/oscar/oscar.c:8032
+#: ../src/protocols/oscar/oscar.c:8045
 #, fuzzy
 msgid "Web aware"
 msgstr "Capacidade Web"
 
-#: ../src/protocols/oscar/oscar.c:8037
+#: ../src/protocols/oscar/oscar.c:8050
 msgid "ICQ Privacy Options"
 msgstr "Opci坦ns de privacidade ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8054
+#: ../src/protocols/oscar/oscar.c:8067
 msgid "The new formatting is invalid."
 msgstr "O novo formato 辿 inv叩lido."
 
-#: ../src/protocols/oscar/oscar.c:8055
+#: ../src/protocols/oscar/oscar.c:8068
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "O formato do nome de usuario s坦 pode cambiar na capitalizaci坦n e espacio en "
 "branco."
 
-#: ../src/protocols/oscar/oscar.c:8062
+#: ../src/protocols/oscar/oscar.c:8075
 msgid "New screen name formatting:"
 msgstr "Novo formato do nome de usuario:"
 
-#: ../src/protocols/oscar/oscar.c:8114
+#: ../src/protocols/oscar/oscar.c:8127
 msgid "Change Address To:"
 msgstr "Cambiar enderezo a:"
 
-#: ../src/protocols/oscar/oscar.c:8159
+#: ../src/protocols/oscar/oscar.c:8172
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vostede non est叩 agardando autorizaci坦n</i>"
 
-#: ../src/protocols/oscar/oscar.c:8162
+#: ../src/protocols/oscar/oscar.c:8175
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Agardando a autorizaci坦n dos seguintes amigos"
 
-#: ../src/protocols/oscar/oscar.c:8163
+#: ../src/protocols/oscar/oscar.c:8176
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9211,73 +9275,73 @@
 "Pode volver a pedir autorizaci坦n a estos amigos premendo o bot坦n dereito do "
 "rato sobre eles e escollendo \"Solicitar autorizaci坦n outra vez.\""
 
-#: ../src/protocols/oscar/oscar.c:8180
+#: ../src/protocols/oscar/oscar.c:8193
 msgid "Find Buddy by E-mail"
 msgstr "Buscar un amigo polo correo electr坦nico"
 
-#: ../src/protocols/oscar/oscar.c:8181
+#: ../src/protocols/oscar/oscar.c:8194
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo polo enderezo de correo electr坦nico"
 
-#: ../src/protocols/oscar/oscar.c:8182
+#: ../src/protocols/oscar/oscar.c:8195
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Escriba o enderezo de correo electr坦nico do amigo que est叩 buscando."
 
-#: ../src/protocols/oscar/oscar.c:8275
+#: ../src/protocols/oscar/oscar.c:8288
 msgid "Set User Info (URL)..."
 msgstr "Establecer s炭a informaci坦n de usuario (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8286
+#: ../src/protocols/oscar/oscar.c:8299
 msgid "Change Password (URL)"
 msgstr "Trocar contrasinal (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8290
+#: ../src/protocols/oscar/oscar.c:8303
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenv鱈o de MI (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8300
+#: ../src/protocols/oscar/oscar.c:8313
 msgid "Show Privacy Options..."
 msgstr "Amosar opci坦ns de privacidade..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8307
+#: ../src/protocols/oscar/oscar.c:8320
 msgid "Format Screen Name..."
 msgstr "Formato do nome de usuario..."
 
-#: ../src/protocols/oscar/oscar.c:8311
+#: ../src/protocols/oscar/oscar.c:8324
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../src/protocols/oscar/oscar.c:8315
+#: ../src/protocols/oscar/oscar.c:8328
 msgid "Display Currently Registered Address"
 msgstr "Mostrar enderezo rexistrado actualmente"
 
-#: ../src/protocols/oscar/oscar.c:8319
+#: ../src/protocols/oscar/oscar.c:8332
 msgid "Change Currently Registered Address..."
 msgstr "Cambiar o enderezo rexistrado..."
 
-#: ../src/protocols/oscar/oscar.c:8326
+#: ../src/protocols/oscar/oscar.c:8339
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Amosar amigos pendentes de autorizaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8332
+#: ../src/protocols/oscar/oscar.c:8345
 msgid "Search for Buddy by Email..."
 msgstr "Buscar amigo por correo electr坦nico..."
 
-#: ../src/protocols/oscar/oscar.c:8337
+#: ../src/protocols/oscar/oscar.c:8350
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a trav辿s da s炭a informaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8407
+#: ../src/protocols/oscar/oscar.c:8416
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos recente"
 
-#: ../src/protocols/oscar/oscar.c:8410
+#: ../src/protocols/oscar/oscar.c:8419
 msgid "Show how long you have been idle"
 msgstr "Amosar canto tempo estivo ausente"
 
-#: ../src/protocols/oscar/oscar.c:8419
+#: ../src/protocols/oscar/oscar.c:8428
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
 msgstr ""
 
@@ -9291,19 +9355,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8536 ../src/protocols/oscar/oscar.c:8538
+#: ../src/protocols/oscar/oscar.c:8545 ../src/protocols/oscar/oscar.c:8547
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8557
+#: ../src/protocols/oscar/oscar.c:8566
 msgid "Auth host"
 msgstr "Servidor de autenticaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8560
+#: ../src/protocols/oscar/oscar.c:8569
 msgid "Auth port"
 msgstr "Porto de autenticaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8563 ../src/protocols/zephyr/zephyr.c:2893
+#: ../src/protocols/oscar/oscar.c:8572 ../src/protocols/zephyr/zephyr.c:2894
 msgid "Encoding"
 msgstr "Codificaci坦n"
 
@@ -9311,66 +9375,66 @@
 msgid "Connection closed (writing)"
 msgstr "Conexi坦n pechada (escribindo)"
 
-#: ../src/protocols/sametime/sametime.c:1276
+#: ../src/protocols/sametime/sametime.c:1208
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>T鱈tulo do grupo:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1277
+#: ../src/protocols/sametime/sametime.c:1209
 #, fuzzy, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Usuario:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1279
+#: ../src/protocols/sametime/sametime.c:1211
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informaci坦n sobre o grupo %s"
 
-#: ../src/protocols/sametime/sametime.c:1281
+#: ../src/protocols/sametime/sametime.c:1213
 #, fuzzy
 msgid "Notes Address Book Information"
 msgstr "Informaci坦n do traballo"
 
-#: ../src/protocols/sametime/sametime.c:1313
+#: ../src/protocols/sametime/sametime.c:1245
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo 叩 conferencia..."
 
-#: ../src/protocols/sametime/sametime.c:1322
+#: ../src/protocols/sametime/sametime.c:1254
 #, fuzzy
 msgid "Get Notes Address Book Info"
 msgstr "Engadir 叩 axenda"
 
-#: ../src/protocols/sametime/sametime.c:1484
+#: ../src/protocols/sametime/sametime.c:1406
 #, fuzzy
 msgid "Sending Handshake"
 msgstr "Enviando cookie"
 
-#: ../src/protocols/sametime/sametime.c:1489
+#: ../src/protocols/sametime/sametime.c:1411
 #, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Agardando o comezo da transferencia"
 
-#: ../src/protocols/sametime/sametime.c:1494
+#: ../src/protocols/sametime/sametime.c:1416
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1499
+#: ../src/protocols/sametime/sametime.c:1421
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1504
+#: ../src/protocols/sametime/sametime.c:1426
 msgid "Login Redirected"
 msgstr "Conexi坦n redireccionada"
 
-#: ../src/protocols/sametime/sametime.c:1510
+#: ../src/protocols/sametime/sametime.c:1432
 msgid "Forcing Login"
 msgstr "Forzando conexi坦n"
 
-#: ../src/protocols/sametime/sametime.c:1514
+#: ../src/protocols/sametime/sametime.c:1436
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1519
+#: ../src/protocols/sametime/sametime.c:1441
 #, fuzzy
 msgid "Connected to Sametime Community Server"
 msgstr "Conectando co servidor SILC"
@@ -9378,59 +9442,59 @@
 #. * @todo Admin alerts should probably be in a conversation window
 #. rather than a gaim_notify_message. Or in some sort of updating
 #. dialog, or something.
-#: ../src/protocols/sametime/sametime.c:1613
+#: ../src/protocols/sametime/sametime.c:1535
 msgid "Admin Alert"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1670
+#: ../src/protocols/sametime/sametime.c:1592
 msgid "Connection reset"
 msgstr "Conexi坦n reiniciada"
 
-#: ../src/protocols/sametime/sametime.c:1677
+#: ../src/protocols/sametime/sametime.c:1599
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Erro ao ler do socket: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1706
-#: ../src/protocols/sametime/sametime.c:3702
+#: ../src/protocols/sametime/sametime.c:1628
+#: ../src/protocols/sametime/sametime.c:3613
 msgid "Unable to connect to host"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../src/protocols/sametime/sametime.c:1743
+#: ../src/protocols/sametime/sametime.c:1665
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:1914
+#: ../src/protocols/sametime/sametime.c:1836
 msgid "Conference Closed"
 msgstr "Conferencia pechada"
 
-#: ../src/protocols/sametime/sametime.c:2375
+#: ../src/protocols/sametime/sametime.c:2297
 msgid "Unable to send message: "
 msgstr "Non se puido enviar a mensaxe: "
 
-#: ../src/protocols/sametime/sametime.c:2982
+#: ../src/protocols/sametime/sametime.c:2893
 msgid "Place Closed"
 msgstr "Lugar pechado"
 
-#: ../src/protocols/sametime/sametime.c:3269
+#: ../src/protocols/sametime/sametime.c:3180
 msgid "Microphone"
 msgstr "Micr坦fono"
 
-#: ../src/protocols/sametime/sametime.c:3270
+#: ../src/protocols/sametime/sametime.c:3181
 msgid "Speakers"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3271
+#: ../src/protocols/sametime/sametime.c:3182
 msgid "Video Camera"
 msgstr "Video c叩mara"
 
-#: ../src/protocols/sametime/sametime.c:3275
+#: ../src/protocols/sametime/sametime.c:3186
 msgid "File Transfer"
 msgstr "Transferencia de ficheiros"
 
-#: ../src/protocols/sametime/sametime.c:3296
+#: ../src/protocols/sametime/sametime.c:3207
 #, c-format
 msgid ""
 "\n"
@@ -9439,7 +9503,7 @@
 "\n"
 "<b>Estado</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:3301
+#: ../src/protocols/sametime/sametime.c:3212
 #, c-format
 msgid ""
 "\n"
@@ -9448,7 +9512,7 @@
 "\n"
 "<b>Mensaxe</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:3307
+#: ../src/protocols/sametime/sametime.c:3218
 #, c-format
 msgid ""
 "\n"
@@ -9457,7 +9521,7 @@
 "\n"
 "<b>Soporte</b>: %s"
 
-#: ../src/protocols/sametime/sametime.c:3312
+#: ../src/protocols/sametime/sametime.c:3223
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9465,42 +9529,42 @@
 "\n"
 "<b>Usuario externo</b>"
 
-#: ../src/protocols/sametime/sametime.c:3330
+#: ../src/protocols/sametime/sametime.c:3241
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/protocols/sametime/sametime.c:3419
+#: ../src/protocols/sametime/sametime.c:3330
 msgid "Create conference with user"
 msgstr "Crear conferencia co usuario"
 
-#: ../src/protocols/sametime/sametime.c:3420
+#: ../src/protocols/sametime/sametime.c:3331
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3424
+#: ../src/protocols/sametime/sametime.c:3335
 msgid "New Conference"
 msgstr "Nova conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3426
+#: ../src/protocols/sametime/sametime.c:3337
 msgid "Create"
 msgstr "Crear"
 
-#: ../src/protocols/sametime/sametime.c:3488
+#: ../src/protocols/sametime/sametime.c:3399
 msgid "Available Conferences"
 msgstr "Conferencias dispo単ibles"
 
-#: ../src/protocols/sametime/sametime.c:3494
+#: ../src/protocols/sametime/sametime.c:3405
 msgid "Create New Conference..."
 msgstr "Crear unha nova conferencia..."
 
-#: ../src/protocols/sametime/sametime.c:3501
+#: ../src/protocols/sametime/sametime.c:3412
 msgid "Invite user to a conference"
 msgstr "Invitar ao usuario a unha conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3502
+#: ../src/protocols/sametime/sametime.c:3413
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -9508,81 +9572,81 @@
 "this user to."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3507
+#: ../src/protocols/sametime/sametime.c:3418
 msgid "Invite to Conference"
 msgstr "Invitar a unha conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3509
+#: ../src/protocols/sametime/sametime.c:3420
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/protocols/sametime/sametime.c:3561
+#: ../src/protocols/sametime/sametime.c:3472
 msgid "Invite to Conference..."
 msgstr "Invitar a unha conferencia.."
 
-#: ../src/protocols/sametime/sametime.c:3607
+#: ../src/protocols/sametime/sametime.c:3518
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3628
+#: ../src/protocols/sametime/sametime.c:3539
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:3633
+#: ../src/protocols/sametime/sametime.c:3544
 #, fuzzy
 msgid "Meanwhile Connection Setup"
 msgstr "Fallou a conexi坦n remota"
 
-#: ../src/protocols/sametime/sametime.c:3634
+#: ../src/protocols/sametime/sametime.c:3545
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4150
+#: ../src/protocols/sametime/sametime.c:4061
 msgid "<b>External User</b><br>"
 msgstr "<b>Usuario externo</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4153
+#: ../src/protocols/sametime/sametime.c:4064
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>ID de usuario:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4159
+#: ../src/protocols/sametime/sametime.c:4070
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Nome completo:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4165
+#: ../src/protocols/sametime/sametime.c:4076
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>�ltimo cliente co単ecido:</b>"
 
-#: ../src/protocols/sametime/sametime.c:4173
+#: ../src/protocols/sametime/sametime.c:4084
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Desco単ecido (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4180
+#: ../src/protocols/sametime/sametime.c:4091
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Soporta:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4186
+#: ../src/protocols/sametime/sametime.c:4097
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Estado:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4427
-#: ../src/protocols/sametime/sametime.c:5551
+#: ../src/protocols/sametime/sametime.c:4342
+#: ../src/protocols/sametime/sametime.c:5369
 msgid "Possible Matches"
 msgstr "Coincidencias posibles"
 
-#: ../src/protocols/sametime/sametime.c:4464
+#: ../src/protocols/sametime/sametime.c:4383
 msgid "An ambiguous user ID was entered"
 msgstr "Introduciuse un ID de usuario ambiguo"
 
-#: ../src/protocols/sametime/sametime.c:4465
+#: ../src/protocols/sametime/sametime.c:4384
 #, fuzzy, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -9591,30 +9655,30 @@
 "Atopouse m叩is dun usuario co mesmo nome. Seleccione o usuario que desexa "
 "engadir a s炭a lista de amigos da lista amosada."
 
-#: ../src/protocols/sametime/sametime.c:4470
+#: ../src/protocols/sametime/sametime.c:4389
 msgid "Select User to Add"
 msgstr "Seleccionar usuario a engadir"
 
-#: ../src/protocols/sametime/sametime.c:4472
+#: ../src/protocols/sametime/sametime.c:4391
 msgid "Add User"
 msgstr "Engadir usuario"
 
-#: ../src/protocols/sametime/sametime.c:4533
+#: ../src/protocols/sametime/sametime.c:4452
 msgid "Unable to add user: user not found"
 msgstr "Non se puido engadir ao usuario: usuario non atopado"
 
-#: ../src/protocols/sametime/sametime.c:4535
+#: ../src/protocols/sametime/sametime.c:4454
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:4540
+#: ../src/protocols/sametime/sametime.c:4459
 msgid "Unable to add user"
 msgstr "Imposible engadir ao usuario"
 
-#: ../src/protocols/sametime/sametime.c:5110
+#: ../src/protocols/sametime/sametime.c:5029
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -9623,78 +9687,62 @@
 "Erro lendo o ficheiro %s: \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5236
+#: ../src/protocols/sametime/sametime.c:5155
 #, fuzzy
 msgid "Remotely Stored Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../src/protocols/sametime/sametime.c:5241
+#: ../src/protocols/sametime/sametime.c:5160
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento da lista de amigos"
 
-#: ../src/protocols/sametime/sametime.c:5244
+#: ../src/protocols/sametime/sametime.c:5163
 msgid "Local Buddy List Only"
 msgstr "S坦 lista de amigos local"
 
-#: ../src/protocols/sametime/sametime.c:5246
+#: ../src/protocols/sametime/sametime.c:5165
 #, fuzzy
 msgid "Merge List from Server"
 msgstr "Borrar lista de amigos do servidor"
 
-#: ../src/protocols/sametime/sametime.c:5248
+#: ../src/protocols/sametime/sametime.c:5167
 #, fuzzy
 msgid "Merge and Save List to Server"
 msgstr "Exportar lista de amigos ao servidor"
 
-#: ../src/protocols/sametime/sametime.c:5250
+#: ../src/protocols/sametime/sametime.c:5169
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5337
-msgid "Active Message"
-msgstr "Mensaxe de activo"
-
-#: ../src/protocols/sametime/sametime.c:5349
-msgid "Busy Message"
-msgstr "Mensaxe de ocupado"
-
-#: ../src/protocols/sametime/sametime.c:5353
-msgid "Default status messages"
-msgstr "Mensaxes de estado predeterminadas"
-
-#: ../src/protocols/sametime/sametime.c:5356
-msgid "Edit Status Messages"
-msgstr "Editar mensaxes de estado"
-
-#: ../src/protocols/sametime/sametime.c:5400
+#: ../src/protocols/sametime/sametime.c:5218
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5439
+#: ../src/protocols/sametime/sametime.c:5257
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5490
+#: ../src/protocols/sametime/sametime.c:5308
 msgid "Unable to add group: group exists"
 msgstr "Imposible engadir o grupo: o grupo existe"
 
-#: ../src/protocols/sametime/sametime.c:5491
+#: ../src/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5494
-#: ../src/protocols/sametime/sametime.c:5619
+#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "Imposible engadir o grupo"
 
-#: ../src/protocols/sametime/sametime.c:5567
+#: ../src/protocols/sametime/sametime.c:5385
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5568
+#: ../src/protocols/sametime/sametime.c:5386
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -9702,60 +9750,56 @@
 "to your buddy list."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5573
+#: ../src/protocols/sametime/sametime.c:5391
 msgid "Select Notes Address Book"
 msgstr "Seleccionar notas do libro de enderezos"
 
-#: ../src/protocols/sametime/sametime.c:5613
+#: ../src/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "Imposible engadir o grupo: grupo non atopado"
 
-#: ../src/protocols/sametime/sametime.c:5615
+#: ../src/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5655
+#: ../src/protocols/sametime/sametime.c:5473
 msgid "Notes Address Book Group"
 msgstr "Notas do grupo do libro de enderezos"
 
-#: ../src/protocols/sametime/sametime.c:5656
+#: ../src/protocols/sametime/sametime.c:5474
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5672
-msgid "Set Status Messages..."
-msgstr "Establecer mensaxes de estado..."
-
-#: ../src/protocols/sametime/sametime.c:5677
+#: ../src/protocols/sametime/sametime.c:5489
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5681
+#: ../src/protocols/sametime/sametime.c:5493
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../src/protocols/sametime/sametime.c:5685
+#: ../src/protocols/sametime/sametime.c:5497
 msgid "Add Notes Address Book Group..."
 msgstr "Engadir notas ao grupo do libro de enderezos..."
 
 #. notesbuddy hack encoding
-#: ../src/protocols/sametime/sametime.c:5779
+#: ../src/protocols/sametime/sametime.c:5591
 #, fuzzy
-msgid "NotesBuddy Encoding"
+msgid "NotesBuddy encoding"
 msgstr "Codificaci坦n non soportada"
 
-#: ../src/protocols/sametime/sametime.c:5788
-msgid "Force Login (Ignore Server Redirects)"
+#: ../src/protocols/sametime/sametime.c:5600
+msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5798
-msgid "Hide Client Identity"
+#: ../src/protocols/sametime/sametime.c:5610
+msgid "Hide client identity"
 msgstr ""
 
 #: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
@@ -10253,7 +10297,8 @@
 
 #: ../src/protocols/silc/chat.c:1095
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "Ten que unirse ao canle %s antes de poder unirse ao grupo privado"
 
 #: ../src/protocols/silc/chat.c:1097
@@ -10527,7 +10572,8 @@
 msgstr "Fallou o troco de claves"
 
 #: ../src/protocols/silc/ops.c:1722
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Produciuse un erro ao retomar a sesi坦n desligada. Prema Reconectar para "
 "crear unha nova conexi坦n."
@@ -10555,7 +10601,8 @@
 
 #: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Fallo: Existe unha diferencia nas versi坦ns, por favor, actualice seu cliente"
+msgstr ""
+"Fallo: Existe unha diferencia nas versi坦ns, por favor, actualice seu cliente"
 
 #: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
@@ -10754,10 +10801,6 @@
 msgid "Private Key File"
 msgstr "Ficheiro de clave privada"
 
-#: ../src/protocols/silc/silc.c:921
-msgid "Hostname"
-msgstr "Nome do servidor"
-
 #: ../src/protocols/silc/silc.c:923
 msgid "Real Name"
 msgstr "Nome real"
@@ -10846,9 +10889,10 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;alcume&gt;:  Ver informaci坦n do alcume"
 
-#: ../src/protocols/silc/silc.c:1613 ../src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1613 ../src/protocols/zephyr/zephyr.c:2598
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;alcume&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un usuario"
+msgstr ""
+"msg &lt;alcume&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un usuario"
 
 #: ../src/protocols/silc/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
@@ -10920,7 +10964,8 @@
 
 #: ../src/protocols/silc/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente do canle"
+msgstr ""
+"kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente do canle"
 
 #: ../src/protocols/silc/silc.c:1675
 msgid "info [server]:  View server administrative details"
@@ -11133,11 +11178,11 @@
 "'sip:'."
 msgstr ""
 
-#: ../src/protocols/simple/simple.c:1218
+#: ../src/protocols/simple/simple.c:1227
 msgid "Could not create listen socket"
 msgstr "Non se puido crear o socket para escoitar"
 
-#: ../src/protocols/simple/simple.c:1272
+#: ../src/protocols/simple/simple.c:1281
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Os alcumes de IRC non poden ter espacios en branco"
@@ -11150,33 +11195,28 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1418
+#: ../src/protocols/simple/simple.c:1428
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1419
+#: ../src/protocols/simple/simple.c:1429
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "O complemento de protocolo SIP/SIMPLE"
 
-#. *  description
-#: ../src/protocols/simple/simple.c:1420
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr "Thomas Butter <butter@uni-mannheim.de>"
-
-#: ../src/protocols/simple/simple.c:1441
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: ../src/protocols/simple/simple.c:1444
+#: ../src/protocols/simple/simple.c:1451
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+#: ../src/protocols/simple/simple.c:1454
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../src/protocols/simple/simple.c:1446
-msgid "Use Proxy"
+#: ../src/protocols/simple/simple.c:1456
+msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../src/protocols/simple/simple.c:1448
+#: ../src/protocols/simple/simple.c:1458
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -11423,15 +11463,15 @@
 msgid "TOC port"
 msgstr "Porto TOC"
 
-#: ../src/protocols/yahoo/yahoo.c:713
+#: ../src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "S炭a mensaxe Yahoo! non se enviou."
 
-#: ../src/protocols/yahoo/yahoo.c:759 ../src/protocols/yahoo/yahoo.c:3482
+#: ../src/protocols/yahoo/yahoo.c:758 ../src/protocols/yahoo/yahoo.c:3487
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: ../src/protocols/yahoo/yahoo.c:804
+#: ../src/protocols/yahoo/yahoo.c:803
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
@@ -11439,23 +11479,23 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:894
+#: ../src/protocols/yahoo/yahoo.c:899
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "O usuario %s quere engadir a %s a s炭a lista de amigos %s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:900
+#: ../src/protocols/yahoo/yahoo.c:905
 msgid "Message (optional) :"
 msgstr "Mensaxe (opcional) :"
 
-#: ../src/protocols/yahoo/yahoo.c:942
+#: ../src/protocols/yahoo/yahoo.c:947
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "O usuario %s rechazou s炭a solicitude de engadilo a s炭a lista de amigos (de "
 "forma retroactiva)."
 
-#: ../src/protocols/yahoo/yahoo.c:945
+#: ../src/protocols/yahoo/yahoo.c:950
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11464,11 +11504,11 @@
 "O usuario %s negou (de forma retroactiva) s炭a solicitude de engadilo a s炭a "
 "lista de amigos pola seguinte raz坦n: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:948
+#: ../src/protocols/yahoo/yahoo.c:953
 msgid "Add buddy rejected"
 msgstr "Rechazouse a adici坦n do amigo"
 
-#: ../src/protocols/yahoo/yahoo.c:1691
+#: ../src/protocols/yahoo/yahoo.c:1696
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11479,11 +11519,11 @@
 "Esta versi坦n de Gaim posiblemente non sexa capaz de conectarse a Yahoo. "
 "Comprobe %s para obter unha actualizaci坦n."
 
-#: ../src/protocols/yahoo/yahoo.c:1694
+#: ../src/protocols/yahoo/yahoo.c:1699
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticaci坦n en Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1767
+#: ../src/protocols/yahoo/yahoo.c:1772
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11492,19 +11532,19 @@
 "Intentou ignorar a %s, pero o usuario est叩 na s炭a lista de amigos. Se "
 "selecciona \"Si\" eliminar叩selle e ignorarase a este amigo."
 
-#: ../src/protocols/yahoo/yahoo.c:1770
+#: ../src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../src/protocols/yahoo/yahoo.c:1804
+#: ../src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "Nome de usuario inv叩lido."
 
-#: ../src/protocols/yahoo/yahoo.c:1815
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "Fallou a autenticaci坦n habitual!"
 
-#: ../src/protocols/yahoo/yahoo.c:1816
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11516,127 +11556,131 @@
 "cambiou. Gaim tentar叩 conectarse a trav辿s da autenticaci坦n de Mensaxer鱈a web "
 "que poder叩 dar lugar a un acceso a menos funcionalidades e funci坦ns."
 
-#: ../src/protocols/yahoo/yahoo.c:1824
+#: ../src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: ../src/protocols/yahoo/yahoo.c:1827
+#: ../src/protocols/yahoo/yahoo.c:1832
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "S炭a conta est叩 bloqueada. Por favor, con辿ctese ao servidor de web de Yahoo!."
-
-#: ../src/protocols/yahoo/yahoo.c:1830
+msgstr ""
+"S炭a conta est叩 bloqueada. Por favor, con辿ctese ao servidor de web de Yahoo!."
+
+#: ../src/protocols/yahoo/yahoo.c:1835
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erro desco単ecido n炭mero %d. Se se conecta ao servidor de web de Yahoo! 辿 "
 "posible que isto arr辿grese."
 
-#: ../src/protocols/yahoo/yahoo.c:1884
+#: ../src/protocols/yahoo/yahoo.c:1889
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Non se puido engadir ao amigo %s ao grupo %s da lista no servidor para a "
 "conta %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1887
+#: ../src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
 msgstr "Non se puido engadir o amigo 叩 lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2131 ../src/protocols/yahoo/yahoo.c:2277
+#: ../src/protocols/yahoo/yahoo.c:2136 ../src/protocols/yahoo/yahoo.c:2282
 #: ../src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "Non se puido ler"
 
-#: ../src/protocols/yahoo/yahoo.c:2299 ../src/protocols/yahoo/yahoo.c:2427
-#: ../src/protocols/yahoo/yahoo.c:2526 ../src/protocols/yahoo/yahoo.c:2536
+#: ../src/protocols/yahoo/yahoo.c:2304 ../src/protocols/yahoo/yahoo.c:2432
+#: ../src/protocols/yahoo/yahoo.c:2531 ../src/protocols/yahoo/yahoo.c:2541
 #: ../src/protocols/yahoo/yahoochat.c:1395
 #: ../src/protocols/yahoo/yahoochat.c:1465 ../src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Problema de conexi坦n"
 
-#: ../src/protocols/yahoo/yahoo.c:2639 ../src/protocols/yahoo/yahoo.c:3218
-msgid "Not At Home"
+#: ../src/protocols/yahoo/yahoo.c:2644 ../src/protocols/yahoo/yahoo.c:3223
+#, fuzzy
+msgid "Not at Home"
 msgstr "Fora da casa"
 
-#: ../src/protocols/yahoo/yahoo.c:2641 ../src/protocols/yahoo/yahoo.c:3221
-msgid "Not At Desk"
+#: ../src/protocols/yahoo/yahoo.c:2646 ../src/protocols/yahoo/yahoo.c:3226
+#, fuzzy
+msgid "Not at Desk"
 msgstr "Lexos do escritorio"
 
-#: ../src/protocols/yahoo/yahoo.c:2643 ../src/protocols/yahoo/yahoo.c:3224
-msgid "Not In Office"
+#: ../src/protocols/yahoo/yahoo.c:2648 ../src/protocols/yahoo/yahoo.c:3229
+#, fuzzy
+msgid "Not in Office"
 msgstr "Fora da oficina"
 
-#: ../src/protocols/yahoo/yahoo.c:2647 ../src/protocols/yahoo/yahoo.c:3230
+#: ../src/protocols/yahoo/yahoo.c:2652 ../src/protocols/yahoo/yahoo.c:3235
 msgid "On Vacation"
 msgstr "De vacaci坦ns"
 
-#: ../src/protocols/yahoo/yahoo.c:2651 ../src/protocols/yahoo/yahoo.c:3236
+#: ../src/protocols/yahoo/yahoo.c:2656 ../src/protocols/yahoo/yahoo.c:3241
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../src/protocols/yahoo/yahoo.c:2744 ../src/protocols/yahoo/yahoo.c:2773
+#: ../src/protocols/yahoo/yahoo.c:2749 ../src/protocols/yahoo/yahoo.c:2778
 msgid "Not on server list"
 msgstr "Non est叩 na lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2790 ../src/protocols/yahoo/yahoo.c:2850
+#: ../src/protocols/yahoo/yahoo.c:2795 ../src/protocols/yahoo/yahoo.c:2855
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2793 ../src/protocols/yahoo/yahoo.c:2872
+#: ../src/protocols/yahoo/yahoo.c:2798 ../src/protocols/yahoo/yahoo.c:2877
 msgid "Appear Permanently Offline"
 msgstr "Parecer permanentemente desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2811
+#: ../src/protocols/yahoo/yahoo.c:2816
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../src/protocols/yahoo/yahoo.c:2866
+#: ../src/protocols/yahoo/yahoo.c:2871
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Parecer desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2913
+#: ../src/protocols/yahoo/yahoo.c:2918
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../src/protocols/yahoo/yahoo.c:2918
+#: ../src/protocols/yahoo/yahoo.c:2923
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../src/protocols/yahoo/yahoo.c:2943
+#: ../src/protocols/yahoo/yahoo.c:2948
 msgid "Presence Settings"
 msgstr "Configuraci坦n do entorno"
 
-#: ../src/protocols/yahoo/yahoo.c:2949
+#: ../src/protocols/yahoo/yahoo.c:2954
 msgid "Start Doodling"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2980
+#: ../src/protocols/yahoo/yahoo.c:2985
 msgid "Active which ID?"
 msgstr "Que ID quere activar?"
 
-#: ../src/protocols/yahoo/yahoo.c:2989
+#: ../src/protocols/yahoo/yahoo.c:2994
 msgid "Join who in chat?"
 msgstr "Xuntarse con quen nun chat?"
 
-#: ../src/protocols/yahoo/yahoo.c:2999
+#: ../src/protocols/yahoo/yahoo.c:3004
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3003
+#: ../src/protocols/yahoo/yahoo.c:3008
 msgid "Join User in Chat..."
 msgstr "Xuntarse cun usuario nun chat..."
 
-#: ../src/protocols/yahoo/yahoo.c:3524
+#: ../src/protocols/yahoo/yahoo.c:3529
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede de Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3528
+#: ../src/protocols/yahoo/yahoo.c:3533
 #, fuzzy
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Avisar a un contacto para chamar s炭a atenci坦n"
 
-#: ../src/protocols/yahoo/yahoo.c:3533
+#: ../src/protocols/yahoo/yahoo.c:3538
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -11650,51 +11694,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3625 ../src/protocols/yahoo/yahoo.c:3627
+#: ../src/protocols/yahoo/yahoo.c:3630 ../src/protocols/yahoo/yahoo.c:3632
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3644
+#: ../src/protocols/yahoo/yahoo.c:3649
 msgid "Yahoo Japan"
 msgstr "Yahoo Xap坦n"
 
-#: ../src/protocols/yahoo/yahoo.c:3647
+#: ../src/protocols/yahoo/yahoo.c:3652
 msgid "Pager host"
 msgstr "Servidor de buscapersoas"
 
-#: ../src/protocols/yahoo/yahoo.c:3650
+#: ../src/protocols/yahoo/yahoo.c:3655
 msgid "Japan Pager host"
 msgstr "Servidor de buscapersoas xapon辿s"
 
-#: ../src/protocols/yahoo/yahoo.c:3653
+#: ../src/protocols/yahoo/yahoo.c:3658
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../src/protocols/yahoo/yahoo.c:3656
+#: ../src/protocols/yahoo/yahoo.c:3661
 msgid "File transfer host"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3659
+#: ../src/protocols/yahoo/yahoo.c:3664
 msgid "Japan file transfer host"
 msgstr "Servidor de transferencia de ficheiros xapon辿s"
 
-#: ../src/protocols/yahoo/yahoo.c:3662
+#: ../src/protocols/yahoo/yahoo.c:3667
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3665
+#: ../src/protocols/yahoo/yahoo.c:3670
 msgid "Chat room locale"
 msgstr "Ubicaci坦n da sala de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3668
+#: ../src/protocols/yahoo/yahoo.c:3673
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3671
+#: ../src/protocols/yahoo/yahoo.c:3676
 msgid "YCHT host"
 msgstr "Servidor YCHT"
 
-#: ../src/protocols/yahoo/yahoo.c:3674
+#: ../src/protocols/yahoo/yahoo.c:3679
 msgid "YCHT port"
 msgstr "Porto YCHT"
 
@@ -11715,13 +11759,15 @@
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "S鱈ntoo, os perfiles con contido s坦 para adultos non est叩n soportados a鱈nda."
+msgstr ""
+"S鱈ntoo, os perfiles con contido s坦 para adultos non est叩n soportados a鱈nda."
 
 #: ../src/protocols/yahoo/yahoo_profile.c:799
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
-msgstr "Se desexa ver este perfil, deber鱈a visitar este ligaz坦n co seu navegador web"
+msgstr ""
+"Se desexa ver este perfil, deber鱈a visitar este ligaz坦n co seu navegador web"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:975
 msgid "Yahoo! ID"
@@ -11764,9 +11810,10 @@
 msgstr "Informaci坦n de usuario de %s non dispo単ible"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1139
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
+#, fuzzy
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
 msgstr "S鱈ntoo, este perfil parece estar nun idioma a鱈nda non soportado."
 
 #: ../src/protocols/yahoo/yahoo_profile.c:1155
@@ -11794,7 +11841,8 @@
 #: ../src/protocols/yahoo/yahoochat.c:202
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declinou s炭a invitaci坦n de conferencia na sala \"%s\" porque \"%s\"."
+msgstr ""
+"%s declinou s炭a invitaci坦n de conferencia na sala \"%s\" porque \"%s\"."
 
 #: ../src/protocols/yahoo/yahoochat.c:204
 msgid "Invitation Rejected"
@@ -11859,74 +11907,75 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Non se puido enviar ao chat %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuario:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Agochado ou non conectado"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1471 ../src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
 msgid "Anyone"
 msgstr "Calquera"
 
-#: ../src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2274
 msgid "_Class:"
 msgstr "_Clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2279
+#: ../src/protocols/zephyr/zephyr.c:2280
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../src/protocols/zephyr/zephyr.c:2285
+#: ../src/protocols/zephyr/zephyr.c:2286
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../src/protocols/zephyr/zephyr.c:2296
+#: ../src/protocols/zephyr/zephyr.c:2297
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Fallou o intento de suscrici坦n a %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/zephyr/zephyr.c:2603
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;alcume&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2608
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;alcume&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2613
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2618
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2623
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2628
+#: ../src/protocols/zephyr/zephyr.c:2629
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Unirse a un novo "
 "chat"
 
-#: ../src/protocols/zephyr/zephyr.c:2633
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+#: ../src/protocols/zephyr/zephyr.c:2634
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar unha mensaxe a &lt;mensaxe,<i>instancia</i>,"
 "*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2639
+#: ../src/protocols/zephyr/zephyr.c:2640
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11934,7 +11983,7 @@
 "zci &lt;clase&gt; &lt;instance&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2645
+#: ../src/protocols/zephyr/zephyr.c:2646
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11942,7 +11991,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha "
 "mensaxe a &lt;<i>clase</i>,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2651
+#: ../src/protocols/zephyr/zephyr.c:2652
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11950,15 +11999,15 @@
 "zir &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha mensaxe a &lt;"
 "MENSAXE,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2657
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,PERSOAL,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2762
+#: ../src/protocols/zephyr/zephyr.c:2763
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: ../src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2766
 msgid "Retrieve subscriptions from server"
 msgstr "Obter as suscrici坦ns do servidor"
 
@@ -11972,52 +12021,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2848 ../src/protocols/zephyr/zephyr.c:2850
+#: ../src/protocols/zephyr/zephyr.c:2849 ../src/protocols/zephyr/zephyr.c:2851
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../src/protocols/zephyr/zephyr.c:2875
+#: ../src/protocols/zephyr/zephyr.c:2876
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2878
+#: ../src/protocols/zephyr/zephyr.c:2879
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2881
+#: ../src/protocols/zephyr/zephyr.c:2882
 msgid "Import from .anyone"
 msgstr "Importar desde .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2884
+#: ../src/protocols/zephyr/zephyr.c:2885
 msgid "Import from .zephyr.subs"
 msgstr "Importar desde .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2887
-#, fuzzy
+#: ../src/protocols/zephyr/zephyr.c:2888
 msgid "Realm"
-msgstr "Nome real"
-
-#: ../src/protocols/zephyr/zephyr.c:2890
+msgstr "Reino"
+
+#: ../src/protocols/zephyr/zephyr.c:2891
 msgid "Exposure"
 msgstr "Exposici坦n"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: ../src/proxy.c:1118 ../src/proxy.c:1148 ../src/proxy.c:1170
+#: ../src/proxy.c:1182
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Erro de conexi坦n no proxy %d"
+
 #. Forbidden
-#: ../src/proxy.c:1099
+#: ../src/proxy.c:1178
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Acceso denegado: o servidor proxy non permite t炭neles no porto %d."
 
-#: ../src/proxy.c:1103
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Erro de conexi坦n no proxy %d"
-
-#: ../src/proxy.c:1939
+#: ../src/proxy.c:2019
 msgid "Invalid proxy settings"
 msgstr "Configuraci坦n inv叩lida de proxy"
 
-#: ../src/proxy.c:1939
+#: ../src/proxy.c:2019
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -12028,7 +12076,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../src/request.h:1341
+#: ../src/request.h:1350
 msgid "Accept"
 msgstr "Aceptar"
 
@@ -12086,22 +12134,22 @@
 msgid "%s went away"
 msgstr "%s marchouse"
 
-#: ../src/status.c:1269
+#: ../src/status.c:1271
 #, c-format
 msgid "%s became idle"
 msgstr "%s agora est叩 inactivo"
 
-#: ../src/status.c:1282
+#: ../src/status.c:1284
 #, c-format
 msgid "%s became unidle"
 msgstr "%s agora est叩 activo"
 
-#: ../src/status.c:1355
+#: ../src/status.c:1357
 #, fuzzy, c-format
 msgid "+++ %s became idle"
 msgstr "%s agora est叩 inactivo"
 
-#: ../src/status.c:1357
+#: ../src/status.c:1359
 #, fuzzy, c-format
 msgid "+++ %s became unidle"
 msgstr "%s agora est叩 activo"
@@ -12120,39 +12168,53 @@
 "Encontrouse un erro ao interpretar a lista de amigos. Non se cargou e o "
 "ficheiro antigo foi movido a blist.xml~."
 
-#: ../src/util.c:2597
+#: ../src/util.c:2616
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../src/util.c:2600
+#: ../src/util.c:2619
 msgid "Unknown."
 msgstr "Desco単ecido."
 
-#: ../src/util.c:2630
+#: ../src/util.c:2649
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"
 
-#: ../src/util.c:2644
+#: ../src/util.c:2663
 msgid "day"
 msgid_plural "days"
 msgstr[0] "d鱈a"
 msgstr[1] "d鱈as"
 
-#: ../src/util.c:2652
+#: ../src/util.c:2671
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../src/util.c:2660
+#: ../src/util.c:2679
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../src/util.c:3098
+#: ../src/util.c:3117
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erro abrindo a conexi坦n.\n"
 
+#~ msgid "Active Message"
+#~ msgstr "Mensaxe de activo"
+
+#~ msgid "Busy Message"
+#~ msgstr "Mensaxe de ocupado"
+
+#~ msgid "Default status messages"
+#~ msgstr "Mensaxes de estado predeterminadas"
+
+#~ msgid "Edit Status Messages"
+#~ msgstr "Editar mensaxes de estado"
+
+#~ msgid "Set Status Messages..."
+#~ msgstr "Establecer mensaxes de estado..."
--- a/po/it.po	Mon Dec 19 17:16:15 2005 +0000
+++ b/po/it.po	Mon Dec 19 18:16:03 2005 +0000
@@ -7234,7 +7234,7 @@
 
 #: src/protocols/msn/switchboard.c:419
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "Il messaggio non � stato inviato a causa di un errore di conessione:"
+msgstr "Il messaggio non � stato inviato a causa di un errore di connessione:"
 
 #: src/protocols/msn/switchboard.c:423
 msgid ""
--- a/po/sl.po	Mon Dec 19 17:16:15 2005 +0000
+++ b/po/sl.po	Mon Dec 19 18:16:03 2005 +0000
@@ -9,9 +9,9 @@
 "Project-Id-Version: Gaim 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2005-12-14 18:04+0100\n"
+"PO-Revision-Date: 2005-12-17 14:32+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
-"Language-Team: LUGOS <sl@li.org>\n"
+"Language-Team: Martin Srebotnjak, LUGOS <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -136,7 +136,7 @@
 
 #. add enabled / disabled
 #: plugins/crazychat/cc_gaim_plugin.c:345
-#: src/gtkaccount.c:2226
+#: src/gtkaccount.c:2209
 #: src/gtkplugin.c:414
 msgid "Enabled"
 msgstr "Omogo�en"
@@ -164,11 +164,11 @@
 msgid "DBus Plugin Example"
 msgstr "Primer vstavka DBus"
 
-#: plugins/docklet/docklet.c:152
+#: plugins/docklet/docklet.c:153
 msgid "Right-click for more unread messages...\n"
 msgstr "Za ve� neprebranih sporo�il kliknite na desni mi邸kin gumb ...\n"
 
-#: plugins/docklet/docklet.c:155
+#: plugins/docklet/docklet.c:156
 #: src/gtkblist.c:3243
 #, c-format
 msgid "%d unread message from %s\n"
@@ -178,86 +178,86 @@
 msgstr[2] "%d neprebrani sporo�ili od %s\n"
 msgstr[3] "%d neprebrana sporo�ila od %s\n"
 
-#: plugins/docklet/docklet.c:374
+#: plugins/docklet/docklet.c:375
 msgid "Show Buddy List"
 msgstr "Poka転i seznam prijateljev"
 
-#: plugins/docklet/docklet.c:379
+#: plugins/docklet/docklet.c:380
 msgid "Unread Messages"
 msgstr "Neprebrana sporo�ila"
 
-#: plugins/docklet/docklet.c:400
+#: plugins/docklet/docklet.c:401
 msgid "New Message..."
 msgstr "Novo sporo�ilo ..."
 
-#: plugins/docklet/docklet.c:404
+#: plugins/docklet/docklet.c:405
 msgid "Join A Chat..."
 msgstr "Pridru転i se pomenku ..."
 
-#: plugins/docklet/docklet.c:409
-#: src/gtkaccount.c:2438
+#: plugins/docklet/docklet.c:410
+#: src/gtkaccount.c:2421
 msgid "Accounts"
 msgstr "Ra�uni"
 
-#: plugins/docklet/docklet.c:410
+#: plugins/docklet/docklet.c:411
 #: src/gtkplugin.c:383
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: plugins/docklet/docklet.c:411
+#: plugins/docklet/docklet.c:412
 #: src/gtkprefs.c:1779
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: plugins/docklet/docklet.c:415
-#: src/gtkft.c:692
-#: src/protocols/oscar/oscar.c:8427
+#: plugins/docklet/docklet.c:416
+#: src/gtkft.c:707
+#: src/protocols/oscar/oscar.c:8423
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: plugins/docklet/docklet.c:417
+#: plugins/docklet/docklet.c:418
 msgid "Mute Sounds"
 msgstr "Uti邸aj zvoke"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: plugins/docklet/docklet.c:430
+#: plugins/docklet/docklet.c:431
 msgid "Quit"
 msgstr "Kon�aj"
 
-#: plugins/docklet/docklet.c:568
+#: plugins/docklet/docklet.c:575
 msgid "Blink tray icon for unread..."
 msgstr "Utripaj ikono na pladnju za neprebrano ..."
 
-#: plugins/docklet/docklet.c:571
+#: plugins/docklet/docklet.c:578
 msgid "_Instant Messages:"
 msgstr "_Neposredna sporo�ila:"
 
-#: plugins/docklet/docklet.c:573
-#: plugins/docklet/docklet.c:581
+#: plugins/docklet/docklet.c:580
+#: plugins/docklet/docklet.c:588
 #: plugins/win32/winprefs/winprefs.c:412
 #: src/gtkprefs.c:816
 #: src/gtkprefs.c:1665
 msgid "Never"
 msgstr "nikoli"
 
-#: plugins/docklet/docklet.c:574
+#: plugins/docklet/docklet.c:581
 msgid "In hidden conversations"
 msgstr "V skritih pogovorih"
 
-#: plugins/docklet/docklet.c:575
-#: plugins/docklet/docklet.c:583
+#: plugins/docklet/docklet.c:582
+#: plugins/docklet/docklet.c:590
 #: plugins/win32/winprefs/winprefs.c:413
 #: src/gtkprefs.c:818
 msgid "Always"
 msgstr "vedno"
 
-#: plugins/docklet/docklet.c:579
+#: plugins/docklet/docklet.c:586
 msgid "C_hat Messages:"
 msgstr "_Sporo�ila klepeta:"
 
-#: plugins/docklet/docklet.c:582
+#: plugins/docklet/docklet.c:589
 msgid "When my nick is said"
 msgstr "Ko je vzdevek v sporo�ilu"
 
@@ -267,21 +267,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:608
+#: plugins/docklet/docklet.c:615
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:611
+#: plugins/docklet/docklet.c:618
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Prika転e ikono za Gaim v sistemskem pladnju."
 
 #. *  description
-#: plugins/docklet/docklet.c:613
-msgid "Displays a system tray icon (in GNOME, KDE or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list or login window. Also allows messages to be queued until the icon is clicked, similar to ICQ."
-msgstr "Prika転e ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s tem prikazuje trenutno stanje pogovorov ter omogo�a la転ji dostop do pogosto uporabljanih funkcij. S to ikono lahko tudi skrije oz. prika転e seznam stikov ali prijavni zaslon. Omogo�a tudi �akanje sporo�il, dokler ne kliknete ikone, podobno kot pri ICQ."
+#: plugins/docklet/docklet.c:620
+msgid "Displays a system tray icon (in GNOME, KDE, or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list. Also provides options to blink for unread messages."
+msgstr "Prika転e ikono v sistemskem pladnju (na primer v GNOME, KDE ali Windows) in s tem prikazuje trenutno stanje pogovorov ter omogo�a la転ji dostop do pogosto uporabljanih funkcij. S to ikono lahko tudi skrije oz. prika転e seznam stikov ali prijavni zaslon. Omogo�a tudi mo転nosti utripanja ob neprebranih sporo�ilih."
 
 #: plugins/docklet/eggtrayicon.c:122
 msgid "Orientation"
@@ -529,8 +529,8 @@
 #: plugins/gevolution/assoc-buddy.c:119
 #: src/gtkplugin.c:424
 #: src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638
-#: src/protocols/msn/msn.c:1531
+#: src/protocols/jabber/jabber.c:686
+#: src/protocols/msn/msn.c:1513
 msgid "Name"
 msgstr "Ime"
 
@@ -586,7 +586,7 @@
 
 #: plugins/gevolution/eds-utils.c:73
 #: plugins/gevolution/eds-utils.c:86
-#: src/protocols/jabber/jabber.c:981
+#: src/protocols/jabber/jabber.c:1037
 #: src/protocols/yahoo/yahoo.c:2802
 msgid "None"
 msgstr "brez"
@@ -671,8 +671,9 @@
 msgstr "Vrsta ra�una:"
 
 #: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
-msgstr "Ime:"
+#: src/gtkaccount.c:747
+msgid "Screen name:"
+msgstr "Zaslonsko ime:"
 
 #. Optional Information section
 #: plugins/gevolution/new_person_dialog.c:314
@@ -1593,14 +1594,14 @@
 #.
 #: src/account.c:968
 #: src/account.c:1139
-#: src/gtkdialogs.c:529
-#: src/gtkdialogs.c:666
-#: src/gtkdialogs.c:734
+#: src/gtkdialogs.c:535
+#: src/gtkdialogs.c:672
+#: src/gtkdialogs.c:740
 #: src/gtkrequest.c:287
 #: src/protocols/gg/gg.c:463
 #: src/protocols/gg/gg.c:604
 #: src/protocols/gg/gg.c:740
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1217
 #: src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:250
 #: src/protocols/msn/msn.c:265
@@ -1613,7 +1614,7 @@
 #: src/protocols/oscar/oscar.c:8052
 #: src/protocols/oscar/oscar.c:8077
 #: src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:5357
+#: src/protocols/sametime/sametime.c:5361
 #: src/protocols/silc/buddy.c:466
 #: src/protocols/silc/buddy.c:1147
 #: src/protocols/silc/chat.c:423
@@ -1631,19 +1632,19 @@
 #: src/account.c:969
 #: src/account.c:1140
 #: src/account.c:1178
-#: src/gtkaccount.c:2146
-#: src/gtkaccount.c:2603
+#: src/gtkaccount.c:2129
+#: src/gtkaccount.c:2586
 #: src/gtkblist.c:4862
-#: src/gtkdialogs.c:530
-#: src/gtkdialogs.c:667
-#: src/gtkdialogs.c:735
-#: src/gtkdialogs.c:754
-#: src/gtkdialogs.c:776
-#: src/gtkdialogs.c:796
-#: src/gtkdialogs.c:840
-#: src/gtkdialogs.c:902
-#: src/gtkdialogs.c:944
-#: src/gtkdialogs.c:986
+#: src/gtkdialogs.c:536
+#: src/gtkdialogs.c:673
+#: src/gtkdialogs.c:741
+#: src/gtkdialogs.c:760
+#: src/gtkdialogs.c:782
+#: src/gtkdialogs.c:802
+#: src/gtkdialogs.c:846
+#: src/gtkdialogs.c:908
+#: src/gtkdialogs.c:950
+#: src/gtkdialogs.c:992
 #: src/gtkimhtmltoolbar.c:419
 #: src/gtkpounce.c:1000
 #: src/gtkprivacy.c:595
@@ -1660,8 +1661,8 @@
 #: src/protocols/jabber/buddy.c:1358
 #: src/protocols/jabber/buddy.c:1392
 #: src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/jabber.c:755
+#: src/protocols/jabber/jabber.c:1218
 #: src/protocols/jabber/xdata.c:338
 #: src/protocols/msn/msn.c:251
 #: src/protocols/msn/msn.c:266
@@ -1682,10 +1683,10 @@
 #: src/protocols/sametime/sametime.c:3427
 #: src/protocols/sametime/sametime.c:3510
 #: src/protocols/sametime/sametime.c:3637
-#: src/protocols/sametime/sametime.c:4472
-#: src/protocols/sametime/sametime.c:5358
-#: src/protocols/sametime/sametime.c:5575
-#: src/protocols/sametime/sametime.c:5661
+#: src/protocols/sametime/sametime.c:4476
+#: src/protocols/sametime/sametime.c:5362
+#: src/protocols/sametime/sametime.c:5579
+#: src/protocols/sametime/sametime.c:5665
 #: src/protocols/silc/buddy.c:467
 #: src/protocols/silc/buddy.c:1043
 #: src/protocols/silc/buddy.c:1148
@@ -1714,7 +1715,7 @@
 
 #: src/account.c:1076
 #: src/protocols/gg/gg.c:645
-#: src/protocols/jabber/jabber.c:1114
+#: src/protocols/jabber/jabber.c:1170
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
 
@@ -1999,174 +2000,170 @@
 "<b>Velikost slike:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:738
+#: src/gtkaccount.c:725
 msgid "Login Options"
 msgstr "Mo転nosti prijave"
 
-#: src/gtkaccount.c:755
-#: src/gtkft.c:624
+#: src/gtkaccount.c:742
+#: src/gtkft.c:639
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:760
-msgid "Screen name:"
-msgstr "Zaslonsko ime:"
-
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:821
 msgid "Password:"
 msgstr "Geslo:"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:826
 #: src/gtkblist.c:4424
 #: src/gtkblist.c:4806
 msgid "Alias:"
 msgstr "Psevdonim:"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:830
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:892
+#: src/gtkaccount.c:875
 msgid "User Options"
 msgstr "Mo転nosti uporabnika"
 
-#: src/gtkaccount.c:905
+#: src/gtkaccount.c:888
 msgid "New mail notifications"
 msgstr "Obve邸�anje o prispeli po邸ti"
 
-#: src/gtkaccount.c:914
+#: src/gtkaccount.c:897
 msgid "Buddy icon:"
 msgstr "Ikona prijatelja:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:1005
+#: src/gtkaccount.c:988
 #, c-format
 msgid "%s Options"
 msgstr "%s Mo転nosti"
 
-#: src/gtkaccount.c:1206
+#: src/gtkaccount.c:1189
 msgid "Use Global Proxy Settings"
 msgstr "uporabljaj splo邸no nastavitev stre転nikov proxy"
 
-#: src/gtkaccount.c:1212
+#: src/gtkaccount.c:1195
 msgid "No Proxy"
 msgstr "brez stre転nika proxy"
 
-#: src/gtkaccount.c:1218
+#: src/gtkaccount.c:1201
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/gtkaccount.c:1224
+#: src/gtkaccount.c:1207
 msgid "SOCKS 4"
 msgstr "SOCKS4"
 
-#: src/gtkaccount.c:1230
+#: src/gtkaccount.c:1213
 msgid "SOCKS 5"
 msgstr "SOCKS5"
 
-#: src/gtkaccount.c:1236
+#: src/gtkaccount.c:1219
 #: src/gtkprefs.c:1030
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
-#: src/gtkaccount.c:1270
+#: src/gtkaccount.c:1253
 msgid "you can see the butterflies mating"
 msgstr "lahko opazite metulje, ki se parijo"
 
-#: src/gtkaccount.c:1274
+#: src/gtkaccount.c:1257
 msgid "If you look real closely"
 msgstr "�e pogledate zelo pozorno,"
 
-#: src/gtkaccount.c:1290
+#: src/gtkaccount.c:1273
 msgid "Proxy Options"
 msgstr "Mo転nosti stre転nika proxy"
 
-#: src/gtkaccount.c:1304
+#: src/gtkaccount.c:1287
 #: src/gtkprefs.c:1024
 msgid "Proxy _type:"
 msgstr "Vrsta s_tre転nika proxy:"
 
-#: src/gtkaccount.c:1313
+#: src/gtkaccount.c:1296
 #: src/gtkprefs.c:1045
 msgid "_Host:"
 msgstr "_Stre転nik:"
 
-#: src/gtkaccount.c:1317
+#: src/gtkaccount.c:1300
 #: src/gtkprefs.c:1063
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: src/gtkaccount.c:1325
+#: src/gtkaccount.c:1308
 msgid "_Username:"
 msgstr "_Uporabni邸ko ime:"
 
-#: src/gtkaccount.c:1331
+#: src/gtkaccount.c:1314
 #: src/gtkprefs.c:1100
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: src/gtkaccount.c:1707
+#: src/gtkaccount.c:1690
 msgid "Add Account"
 msgstr "Dodaj ra�un"
 
-#: src/gtkaccount.c:1709
+#: src/gtkaccount.c:1692
 msgid "Modify Account"
 msgstr "Spremeni ra�un"
 
-#: src/gtkaccount.c:1731
+#: src/gtkaccount.c:1714
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: src/gtkaccount.c:1742
+#: src/gtkaccount.c:1725
 msgid "_Advanced"
 msgstr "N_apredno"
 
 #. Register button
-#: src/gtkaccount.c:1757
-#: src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1740
+#: src/protocols/jabber/jabber.c:754
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gtkaccount.c:2140
+#: src/gtkaccount.c:2123
 #: src/gtksavedstatuses.c:295
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepri�ani, da 転elite izbrisati %s?"
 
-#: src/gtkaccount.c:2145
+#: src/gtkaccount.c:2128
 #: src/gtkpounce.c:999
 #: src/gtkrequest.c:291
 #: src/gtksavedstatuses.c:297
 msgid "Delete"
 msgstr "Zbri邸i"
 
-#: src/gtkaccount.c:2203
+#: src/gtkaccount.c:2186
 #: src/gtksavedstatuses.c:873
 #: src/protocols/oscar/oscar.c:5037
 msgid "Screen Name"
 msgstr "Ime"
 
-#: src/gtkaccount.c:2234
+#: src/gtkaccount.c:2217
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2551
+#: src/gtkaccount.c:2534
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s"
 
-#: src/gtkaccount.c:2600
+#: src/gtkaccount.c:2583
 msgid "Add buddy to your list?"
 msgstr "貼elite dodati prijatelja na seznam?"
 
-#: src/gtkaccount.c:2602
+#: src/gtkaccount.c:2585
 #: src/gtkblist.c:4861
 #: src/gtkconv.c:1574
 #: src/gtkrequest.c:292
 #: src/protocols/gg/gg.c:829
 #: src/protocols/oscar/oscar.c:4662
-#: src/protocols/sametime/sametime.c:5660
+#: src/protocols/sametime/sametime.c:5664
 #: src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Dodaj"
@@ -2635,8 +2632,8 @@
 msgstr "Prosim vnesite psevdonim in ostale informacije za pomenek, ki ga 転elite dodati na seznam prijateljev.\n"
 
 #: src/gtkblist.c:4858
-#: src/protocols/sametime/sametime.c:5574
-#: src/protocols/sametime/sametime.c:5658
+#: src/protocols/sametime/sametime.c:5578
+#: src/protocols/sametime/sametime.c:5662
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
@@ -2694,51 +2691,51 @@
 msgid "Whether this tag affects the background color"
 msgstr "Ali ta zaznamek vpliva na barvo ozadja"
 
-#: src/gtkcombobox.c:491
+#: src/gtkcombobox.c:490
 msgid "ComboBox model"
 msgstr "Model kombiniranega polja"
 
-#: src/gtkcombobox.c:492
+#: src/gtkcombobox.c:491
 msgid "The model for the combo box"
 msgstr "Model kombiniranega polja"
 
-#: src/gtkcombobox.c:499
+#: src/gtkcombobox.c:498
 msgid "Wrap width"
 msgstr "�irina preloma"
 
-#: src/gtkcombobox.c:500
+#: src/gtkcombobox.c:499
 msgid "Wrap width for layouting the items in a grid"
 msgstr "�irina preloma za prikaz elementov v mre転i"
 
+#: src/gtkcombobox.c:508
+msgid "Row span column"
+msgstr "Stolpec raz邸iri vrstica"
+
 #: src/gtkcombobox.c:509
-msgid "Row span column"
-msgstr "Stolpec raz邸iri vrstica"
-
-#: src/gtkcombobox.c:510
 msgid "TreeModel column containing the row span values"
 msgstr "Stolpec TreeModel vsebuje vrednosti raz邸irjenosti vrstice"
 
-#: src/gtkcombobox.c:519
+#: src/gtkcombobox.c:518
 msgid "Column span column"
 msgstr "Stolpec raz邸iri stolpec"
 
-#: src/gtkcombobox.c:521
+#: src/gtkcombobox.c:520
 msgid "TreeModel column containing the column span values"
 msgstr "Vrstica TreeModel vsebuje vrednosti raz邸irjenosti stolpca"
 
-#: src/gtkcombobox.c:530
+#: src/gtkcombobox.c:529
 msgid "Active item"
 msgstr "Aktivni element"
 
-#: src/gtkcombobox.c:531
+#: src/gtkcombobox.c:530
 msgid "The item which is currently active"
 msgstr "Element, ki je trenutno aktiven"
 
+#: src/gtkcombobox.c:538
+msgid "Appears as list"
+msgstr "V obliki seznama"
+
 #: src/gtkcombobox.c:539
-msgid "Appears as list"
-msgstr "V obliki seznama"
-
-#: src/gtkcombobox.c:540
 msgid "Whether combobox dropdowns should look like lists rather than menus"
 msgstr "�e naj bodo roletni meniji kombiniranega polja seznami namesto menijev"
 
@@ -2828,7 +2825,7 @@
 #: src/gtkconv.c:930
 #: src/gtkconv.c:2275
 #: src/gtkdebug.c:217
-#: src/gtkft.c:471
+#: src/gtkft.c:487
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogo�e odprti."
 
@@ -3441,8 +3438,8 @@
 msgstr "O programu Gaim"
 
 #: src/gtkdialogs.c:236
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr "Gaim je modularen odjemalec za neposredna sporo�ila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr in Gadu-Gadu. Uporablja Gtk+ in je objavljen pod licenco GNU GPL.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+msgstr "Gaim je modularen odjemalec za neposredna sporo�ila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr in Gadu-Gadu. Uporablja Gtk+ in je objavljen pod licenco GNU GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:245
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -3476,76 +3473,76 @@
 msgid "Debugging Information"
 msgstr "Informacije za razhro邸�evanje"
 
-#: src/gtkdialogs.c:511
-#: src/gtkdialogs.c:648
-#: src/gtkdialogs.c:715
+#: src/gtkdialogs.c:517
+#: src/gtkdialogs.c:654
+#: src/gtkdialogs.c:721
 msgid "_Name"
 msgstr "_Ime"
 
-#: src/gtkdialogs.c:516
-#: src/gtkdialogs.c:653
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:522
+#: src/gtkdialogs.c:659
+#: src/gtkdialogs.c:726
 msgid "_Account"
 msgstr "_Ra�un"
 
-#: src/gtkdialogs.c:524
+#: src/gtkdialogs.c:530
 msgid "New Instant Message"
 msgstr "Novo neposredno sporo�ilo"
 
-#: src/gtkdialogs.c:526
+#: src/gtkdialogs.c:532
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Vnesite vzdevek osebe, ki ji 転elite poslati neposredno sporo�ilo."
 
-#: src/gtkdialogs.c:661
+#: src/gtkdialogs.c:667
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: src/gtkdialogs.c:663
+#: src/gtkdialogs.c:669
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri si 転elite ogledati podatke."
 
-#: src/gtkdialogs.c:729
+#: src/gtkdialogs.c:735
 msgid "View User Log"
 msgstr "Prika転i uporabni邸ki dnevnik"
 
-#: src/gtkdialogs.c:731
+#: src/gtkdialogs.c:737
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri 転elite pridobiti dnevnik."
 
-#: src/gtkdialogs.c:750
+#: src/gtkdialogs.c:756
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: src/gtkdialogs.c:751
+#: src/gtkdialogs.c:757
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/gtkdialogs.c:753
-#: src/gtkdialogs.c:775
-#: src/gtkdialogs.c:795
+#: src/gtkdialogs.c:759
+#: src/gtkdialogs.c:781
+#: src/gtkdialogs.c:801
 #: src/gtkrequest.c:295
 #: src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: src/gtkdialogs.c:771
+#: src/gtkdialogs.c:777
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: src/gtkdialogs.c:773
+#: src/gtkdialogs.c:779
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: src/gtkdialogs.c:792
+#: src/gtkdialogs.c:798
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: src/gtkdialogs.c:793
+#: src/gtkdialogs.c:799
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: src/gtkdialogs.c:830
+#: src/gtkdialogs.c:836
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
@@ -3554,38 +3551,38 @@
 msgstr[2] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga prijatelja. Ali 転elite nadaljevati?"
 msgstr[3] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge prijatelje. Ali 転elite nadaljevati?"
 
-#: src/gtkdialogs.c:838
-#: src/gtkdialogs.c:839
+#: src/gtkdialogs.c:844
+#: src/gtkdialogs.c:845
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: src/gtkdialogs.c:897
+#: src/gtkdialogs.c:903
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili skupino %s. Ali 転elite nadaljevati?"
 
-#: src/gtkdialogs.c:900
-#: src/gtkdialogs.c:901
+#: src/gtkdialogs.c:906
+#: src/gtkdialogs.c:907
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: src/gtkdialogs.c:939
+#: src/gtkdialogs.c:945
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali 転elite nadaljevati?"
 
-#: src/gtkdialogs.c:942
-#: src/gtkdialogs.c:943
+#: src/gtkdialogs.c:948
+#: src/gtkdialogs.c:949
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: src/gtkdialogs.c:981
+#: src/gtkdialogs.c:987
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali 転elite nadaljevati?"
 
-#: src/gtkdialogs.c:984
-#: src/gtkdialogs.c:985
+#: src/gtkdialogs.c:990
+#: src/gtkdialogs.c:991
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
@@ -3595,17 +3592,17 @@
 msgstr "%.2f KB/s"
 
 #: src/gtkft.c:160
-#: src/gtkft.c:1048
+#: src/gtkft.c:1063
 msgid "Finished"
 msgstr "Kon�ano"
 
 #: src/gtkft.c:163
-#: src/gtkft.c:988
+#: src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Preklicano"
 
 #: src/gtkft.c:166
-#: src/gtkft.c:907
+#: src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "�akanje na za�etek prenosa"
 
@@ -3625,94 +3622,94 @@
 msgid "<b>Sending As:</b>"
 msgstr "<b>Po邸iljam kot:</b>"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:442
 msgid "There is no application configured to open this type of file."
 msgstr "Za odpiranje datotek te vrste ni nastavljen noben program."
 
-#: src/gtkft.c:448
+#: src/gtkft.c:447
 msgid "An error occurred while opening the file."
 msgstr "Med odpiranjem datoteke je pri邸lo do napake."
 
-#: src/gtkft.c:468
+#: src/gtkft.c:484
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Napaka pri zagonu %s: %s"
 
-#: src/gtkft.c:477
+#: src/gtkft.c:493
 #, c-format
 msgid "Error running %s"
 msgstr "Napaka pri uporabi %s"
 
-#: src/gtkft.c:478
+#: src/gtkft.c:494
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proces je vrnil kodo napake %d"
 
-#: src/gtkft.c:573
+#: src/gtkft.c:588
 msgid "Progress"
 msgstr "Potek"
 
-#: src/gtkft.c:580
+#: src/gtkft.c:595
 msgid "Filename"
 msgstr "Datoteka"
 
-#: src/gtkft.c:587
+#: src/gtkft.c:602
 msgid "Size"
 msgstr "Velikost"
 
-#: src/gtkft.c:594
+#: src/gtkft.c:609
 msgid "Remaining"
 msgstr "Preostanek"
 
-#: src/gtkft.c:625
+#: src/gtkft.c:640
 msgid "Filename:"
 msgstr "Datoteka:"
 
-#: src/gtkft.c:626
+#: src/gtkft.c:641
 msgid "Local File:"
 msgstr "Lokalna datoteka:"
 
-#: src/gtkft.c:627
+#: src/gtkft.c:642
 msgid "Status:"
 msgstr "Stanje:"
 
-#: src/gtkft.c:628
+#: src/gtkft.c:643
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: src/gtkft.c:629
+#: src/gtkft.c:644
 msgid "Time Elapsed:"
 msgstr "Porabljen �as:"
 
-#: src/gtkft.c:630
+#: src/gtkft.c:645
 msgid "Time Remaining:"
 msgstr "Preostali �as:"
 
-#: src/gtkft.c:716
+#: src/gtkft.c:731
 msgid "Close this window when all transfers _finish"
 msgstr "Zapri to okno po zaklju�ku _vseh prenosov"
 
-#: src/gtkft.c:726
+#: src/gtkft.c:741
 msgid "C_lear finished transfers"
 msgstr "_Po�isti dokon�ane prenose"
 
 #. "Download Details" arrow
-#: src/gtkft.c:735
+#: src/gtkft.c:750
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
 #. Pause button
-#: src/gtkft.c:765
+#: src/gtkft.c:780
 #: src/gtkstock.c:143
 msgid "_Pause"
 msgstr "_Premor"
 
 #. Resume button
-#: src/gtkft.c:775
+#: src/gtkft.c:790
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: src/gtkft.c:990
+#: src/gtkft.c:1005
 msgid "Failed"
 msgstr "Neuspeh"
 
@@ -4597,7 +4594,7 @@
 #: src/protocols/irc/irc.c:457
 #: src/protocols/irc/msgs.c:221
 #: src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1054
+#: src/protocols/jabber/jabber.c:1110
 #: src/protocols/msn/msn.c:585
 #: src/protocols/novell/novell.c:2849
 #: src/protocols/novell/novell.c:2984
@@ -4839,12 +4836,12 @@
 #: src/protocols/gg/gg.c:1451
 #: src/protocols/gg/gg.c:1456
 #: src/protocols/irc/irc.c:176
-#: src/protocols/jabber/jabber.c:1031
-#: src/protocols/jabber/jabber.c:1039
-#: src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055
-#: src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
+#: src/protocols/jabber/jabber.c:1087
+#: src/protocols/jabber/jabber.c:1095
+#: src/protocols/jabber/jabber.c:1103
+#: src/protocols/jabber/jabber.c:1111
+#: src/protocols/jabber/jabber.c:1119
+#: src/protocols/jabber/jabber.c:1127
 #: src/protocols/novell/novell.c:2869
 #: src/protocols/novell/novell.c:2980
 #: src/protocols/novell/novell.c:2986
@@ -4887,7 +4884,7 @@
 #: src/protocols/jabber/buddy.c:626
 #: src/protocols/jabber/buddy.c:633
 #: src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1004
+#: src/protocols/jabber/jabber.c:1060
 #: src/protocols/msn/msn.c:552
 #: src/protocols/novell/novell.c:2868
 #: src/protocols/novell/novell.c:2872
@@ -4983,7 +4980,7 @@
 #. connect to the server
 #: src/gtkstatusbox.c:290
 #: src/protocols/irc/irc.c:257
-#: src/protocols/jabber/jabber.c:837
+#: src/protocols/jabber/jabber.c:893
 #: src/protocols/msn/session.c:349
 #: src/protocols/napster/napster.c:531
 #: src/protocols/novell/novell.c:2183
@@ -5014,7 +5011,7 @@
 #: src/protocols/gg/gg.c:1437
 #: src/protocols/irc/irc.c:171
 #: src/protocols/jabber/buddy.c:1089
-#: src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/jabber.c:1094
 #: src/protocols/msn/msn.c:581
 #: src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30
@@ -5046,7 +5043,7 @@
 #: src/protocols/gg/gg.c:1432
 #: src/protocols/irc/irc.c:167
 #: src/protocols/jabber/buddy.c:1087
-#: src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:1087
 #: src/protocols/msn/msn.c:577
 #: src/protocols/napster/napster.c:579
 #: src/protocols/novell/novell.c:2858
@@ -5283,16 +5280,17 @@
 
 #. Creating the user splits
 #: src/protocols/bonjour/bonjour.c:553
-msgid "Host name"
+#: src/protocols/silc/silc.c:921
+msgid "Hostname"
 msgstr "Ime gostitelja"
 
 #. Creating the options for the protocol
 #. port to connect to
 #: src/protocols/bonjour/bonjour.c:557
 #: src/protocols/irc/irc.c:820
-#: src/protocols/msn/msn.c:1961
+#: src/protocols/msn/msn.c:1943
 #: src/protocols/napster/napster.c:719
-#: src/protocols/sametime/sametime.c:5773
+#: src/protocols/sametime/sametime.c:5777
 #: src/protocols/silc/silc.c:1836
 msgid "Port"
 msgstr "Vrata"
@@ -5396,8 +5394,8 @@
 
 #: src/protocols/gg/gg.c:439
 #: src/protocols/gg/gg.c:713
-#: src/protocols/jabber/jabber.c:632
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:680
+#: src/protocols/jabber/jabber.c:1205
 msgid "Password"
 msgstr "Geslo"
 
@@ -5436,12 +5434,13 @@
 msgstr "Imate iskanje na �akanju. Prosimo, da po�akate na njegovo izvr邸itev."
 
 #: src/protocols/gg/gg.c:576
+#: src/protocols/gg/gg.c:989
 #: src/protocols/gg/gg.c:1985
 #: src/protocols/jabber/buddy.c:252
 #: src/protocols/jabber/buddy.c:698
 #: src/protocols/jabber/buddy.c:1341
-#: src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1386
+#: src/protocols/jabber/jabber.c:696
+#: src/protocols/msn/msn.c:1368
 #: src/protocols/silc/buddy.c:1494
 #: src/protocols/silc/ops.c:1036
 #: src/protocols/silc/ops.c:1179
@@ -5452,7 +5451,7 @@
 
 #: src/protocols/gg/gg.c:581
 #: src/protocols/gg/gg.c:992
-#: src/protocols/jabber/jabber.c:668
+#: src/protocols/jabber/jabber.c:716
 #: src/protocols/oscar/oscar.c:6048
 #: src/protocols/oscar/oscar.c:6056
 msgid "City"
@@ -5463,7 +5462,7 @@
 msgstr "Leto rojstva"
 
 #: src/protocols/gg/gg.c:589
-#: src/protocols/msn/msn.c:1545
+#: src/protocols/msn/msn.c:1527
 #: src/protocols/oscar/oscar.c:6021
 #: src/protocols/yahoo/yahoo_profile.c:1029
 msgid "Gender"
@@ -5558,10 +5557,6 @@
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:989
-msgid "Nick name"
-msgstr "Vzdevek"
-
 #: src/protocols/gg/gg.c:995
 msgid "Birth year"
 msgstr "Leto rojstva"
@@ -5765,8 +5760,8 @@
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
 #: src/protocols/irc/irc.c:265
-#: src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: src/protocols/jabber/jabber.c:481
+#: src/protocols/jabber/jabber.c:818
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
@@ -5777,19 +5772,19 @@
 msgstr "Vti�nika ni bilo mogo�e ustvariti"
 
 #: src/protocols/irc/irc.c:347
-#: src/protocols/jabber/jabber.c:306
+#: src/protocols/jabber/jabber.c:354
 #: src/protocols/oscar/oscar.c:1732
 #: src/protocols/oscar/oscar.c:1800
 msgid "Couldn't connect to host"
 msgstr "Nisem se mogel povezati do gostitelja"
 
 #: src/protocols/irc/irc.c:372
-#: src/protocols/jabber/jabber.c:333
+#: src/protocols/jabber/jabber.c:381
 msgid "Connection Failed"
 msgstr "Povezava ni uspela"
 
 #: src/protocols/irc/irc.c:375
-#: src/protocols/jabber/jabber.c:336
+#: src/protocols/jabber/jabber.c:384
 msgid "SSL Handshake Failed"
 msgstr "Rokovanje SSL ni uspelo"
 
@@ -5832,12 +5827,12 @@
 #. host to connect to
 #: src/protocols/irc/irc.c:817
 #: src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1709
+#: src/protocols/jabber/jabber.c:1766
 #: src/protocols/napster/napster.c:714
-#: src/protocols/sametime/sametime.c:5768
+#: src/protocols/sametime/sametime.c:5772
 #: src/protocols/silc/ops.c:1242
 #: src/protocols/silc/ops.c:1344
-#: src/protocols/simple/simple.c:1447
+#: src/protocols/simple/simple.c:1448
 msgid "Server"
 msgstr "Stre転nik"
 
@@ -5847,7 +5842,7 @@
 
 #: src/protocols/irc/irc.c:826
 #: src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628
+#: src/protocols/jabber/jabber.c:676
 #: src/protocols/silc/buddy.c:1497
 #: src/protocols/silc/ops.c:1189
 #: src/protocols/silc/ops.c:1191
@@ -6129,7 +6124,7 @@
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
 #: src/protocols/irc/parse.c:129
-#: src/protocols/jabber/jabber.c:1554
+#: src/protocols/jabber/jabber.c:1610
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite va邸 vzdevek."
 
@@ -6232,36 +6227,50 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Stre転nik zahteva overovitev z navadnim besedilom preko ne邸ifriranega toka"
 
-#: src/protocols/jabber/auth.c:133
-#: src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:232
+msgid "Server couldn't authenticate you without a password"
+msgstr "Stre転nik ne more preveriti va邸e identitete brez gesla."
+
+#: src/protocols/jabber/auth.c:235
+#: src/protocols/jabber/auth.c:236
+#: src/protocols/jabber/auth.c:381
+#: src/protocols/jabber/auth.c:382
+#: src/protocols/jabber/auth.c:463
+#: src/protocols/jabber/auth.c:464
+msgid "Plaintext Authentication"
+msgstr "Overovitev z navadnim besedilom"
+
+#: src/protocols/jabber/auth.c:237
+#: src/protocols/jabber/auth.c:383
+#: src/protocols/jabber/auth.c:465
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "Stre転nik zahteva overovitev z navadnim besedilom preko ne邸ifrirane povezave. Se strinjate s tem in 転elite nadaljevati z overovitvijo?"
+
+#: src/protocols/jabber/auth.c:243
+#: src/protocols/jabber/auth.c:391
 #: src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485
+msgid "Server does not use any supported authentication method"
+msgstr "Stre転nik ne uporablja nobene podprte metode overovitve"
+
+#. This should never happen!
+#: src/protocols/jabber/auth.c:309
+#: src/protocols/jabber/auth.c:426
+#: src/protocols/jabber/auth.c:594
+#: src/protocols/jabber/auth.c:726
+#: src/protocols/jabber/auth.c:738
+#: src/protocols/jabber/auth.c:757
 #: src/protocols/jabber/jabber.c:110
 msgid "Invalid response from server."
 msgstr "Neveljaven odgovor stre転nika."
 
-#: src/protocols/jabber/auth.c:163
-#: src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244
-#: src/protocols/jabber/auth.c:245
-msgid "Plaintext Authentication"
-msgstr "Overovitev z navadnim besedilom"
-
-#: src/protocols/jabber/auth.c:165
-#: src/protocols/jabber/auth.c:246
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "Stre転nik zahteva overovitev z navadnim besedilom preko ne邸ifrirane povezave. Se strinjate s tem in 転elite nadaljevati z overovitvijo?"
-
-#: src/protocols/jabber/auth.c:173
-#: src/protocols/jabber/auth.c:254
-msgid "Server does not use any supported authentication method"
-msgstr "Stre転nik ne uporablja nobene podprte metode overovitve"
-
-#: src/protocols/jabber/auth.c:396
+#: src/protocols/jabber/auth.c:615
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv stre転nika"
 
+#: src/protocols/jabber/auth.c:701
+msgid "SASL error"
+msgstr "Napaka SASL"
+
 #: src/protocols/jabber/buddy.c:249
 #: src/protocols/jabber/buddy.c:667
 #: src/protocols/silc/ops.c:1020
@@ -6280,7 +6289,7 @@
 msgstr "Ime"
 
 #: src/protocols/jabber/buddy.c:253
-#: src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/jabber.c:736
 msgid "URL"
 msgstr "URL"
 
@@ -6306,7 +6315,7 @@
 
 #: src/protocols/jabber/buddy.c:258
 #: src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: src/protocols/jabber/jabber.c:726
 msgid "Postal Code"
 msgstr "Po邸tna 邸tevilka"
 
@@ -6357,7 +6366,7 @@
 msgstr "Jabber ID oznaka"
 
 #: src/protocols/jabber/buddy.c:642
-#: src/protocols/jabber/jabber.c:1712
+#: src/protocols/jabber/jabber.c:1769
 msgid "Resource"
 msgstr "Vir"
 
@@ -6367,7 +6376,7 @@
 msgstr "Drugo ime"
 
 #: src/protocols/jabber/buddy.c:706
-#: src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/jabber.c:711
 #: src/protocols/oscar/oscar.c:6047
 #: src/protocols/oscar/oscar.c:6055
 #: src/protocols/silc/ops.c:1064
@@ -6413,24 +6422,24 @@
 #: src/protocols/jabber/buddy.c:1085
 #: src/protocols/jabber/chat.c:677
 #: src/protocols/jabber/chat.c:688
-#: src/protocols/jabber/jabber.c:1017
+#: src/protocols/jabber/jabber.c:1073
 #: src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Napaka"
 
 #: src/protocols/jabber/buddy.c:1091
-#: src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:1102
 msgid "Chatty"
 msgstr "Pomenek"
 
 #: src/protocols/jabber/buddy.c:1095
-#: src/protocols/jabber/jabber.c:1062
+#: src/protocols/jabber/jabber.c:1118
 #: src/status.c:158
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
 #: src/protocols/jabber/buddy.c:1097
-#: src/protocols/jabber/jabber.c:1070
+#: src/protocols/jabber/jabber.c:1126
 #: src/protocols/oscar/oscar.c:701
 #: src/protocols/oscar/oscar.c:7861
 #: src/protocols/sametime/sametime.c:3342
@@ -6446,14 +6455,14 @@
 msgstr "Izpolnite eno ali ve� polj za iskanje uporabnikov Jabberja."
 
 #: src/protocols/jabber/buddy.c:1331
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/jabber.c:701
 #: src/protocols/oscar/oscar.c:6004
 #: src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Ime"
 
 #: src/protocols/jabber/buddy.c:1336
-#: src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:706
 #: src/protocols/oscar/oscar.c:6005
 msgid "Last Name"
 msgstr "Priimek"
@@ -6578,437 +6587,438 @@
 msgid "Error initializing session"
 msgstr "Napaka pri inicializaciji seje"
 
-#: src/protocols/jabber/jabber.c:215
+#: src/protocols/jabber/jabber.c:236
+#: src/protocols/jabber/jabber.c:251
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
-#: src/protocols/jabber/jabber.c:253
-#: src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:289
+#: src/protocols/jabber/jabber.c:321
 msgid "Read Error"
 msgstr "Napaka pri branju"
 
-#: src/protocols/jabber/jabber.c:359
-#: src/protocols/jabber/jabber.c:780
+#: src/protocols/jabber/jabber.c:407
+#: src/protocols/jabber/jabber.c:828
 msgid "Unable to create socket"
 msgstr "Ni mogo�e ustvariti vti�nika"
 
-#: src/protocols/jabber/jabber.c:403
-#: src/protocols/jabber/jabber.c:740
+#: src/protocols/jabber/jabber.c:451
+#: src/protocols/jabber/jabber.c:788
 msgid "Invalid Jabber ID"
 msgstr "Neveljaven Jabber ID"
 
-#: src/protocols/jabber/jabber.c:473
+#: src/protocols/jabber/jabber.c:521
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
 
-#: src/protocols/jabber/jabber.c:475
-#: src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:523
+#: src/protocols/jabber/jabber.c:524
 msgid "Registration Successful"
 msgstr "Registracija uspela!"
 
-#: src/protocols/jabber/jabber.c:482
-#: src/protocols/jabber/jabber.c:1298
+#: src/protocols/jabber/jabber.c:530
+#: src/protocols/jabber/jabber.c:1354
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
-#: src/protocols/jabber/jabber.c:484
-#: src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:532
+#: src/protocols/jabber/jabber.c:533
 msgid "Registration Failed"
 msgstr "Napaka pri registraciji"
 
-#: src/protocols/jabber/jabber.c:596
-#: src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:644
+#: src/protocols/jabber/jabber.c:645
 msgid "Already Registered"
 msgstr "貼e registriran"
 
-#: src/protocols/jabber/jabber.c:643
+#: src/protocols/jabber/jabber.c:691
 msgid "E-Mail"
 msgstr "E-po邸ta"
 
-#: src/protocols/jabber/jabber.c:673
+#: src/protocols/jabber/jabber.c:721
 #: src/protocols/oscar/oscar.c:6049
 #: src/protocols/oscar/oscar.c:6057
 msgid "State"
 msgstr "Zvezna dr転ava"
 
-#: src/protocols/jabber/jabber.c:683
+#: src/protocols/jabber/jabber.c:731
 #: src/protocols/silc/ops.c:1069
 #: src/protocols/silc/silc.c:687
 #: src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:693
+#: src/protocols/jabber/jabber.c:741
 msgid "Date"
 msgstr "Datum"
 
-#: src/protocols/jabber/jabber.c:701
+#: src/protocols/jabber/jabber.c:749
 msgid "Please fill out the information below to register your new account."
 msgstr "Za registracijo novega ra�una morate izpolniti spodnja polja."
 
-#: src/protocols/jabber/jabber.c:704
-#: src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:752
+#: src/protocols/jabber/jabber.c:753
 msgid "Register New Jabber Account"
 msgstr "Registrirajte nov ra�un za Jabber"
 
-#: src/protocols/jabber/jabber.c:841
+#: src/protocols/jabber/jabber.c:897
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: src/protocols/jabber/jabber.c:847
+#: src/protocols/jabber/jabber.c:903
 #: src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Overovljanje"
 
-#: src/protocols/jabber/jabber.c:856
+#: src/protocols/jabber/jabber.c:912
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: src/protocols/jabber/jabber.c:927
-#: src/protocols/jabber/jabber.c:1276
-#: src/protocols/jabber/jabber.c:1317
-#: src/protocols/jabber/jabber.c:1350
+#: src/protocols/jabber/jabber.c:983
+#: src/protocols/jabber/jabber.c:1332
+#: src/protocols/jabber/jabber.c:1373
+#: src/protocols/jabber/jabber.c:1406
 #: src/protocols/oscar/oscar.c:767
 #: src/protocols/oscar/oscar.c:7647
 msgid "Not Authorized"
 msgstr "Nepoobla邸�eno"
 
-#: src/protocols/jabber/jabber.c:970
+#: src/protocols/jabber/jabber.c:1026
 msgid "Both"
 msgstr "Oboje"
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:1028
 msgid "From (To pending)"
 msgstr "Od (Za �akajo�e)"
 
-#: src/protocols/jabber/jabber.c:974
+#: src/protocols/jabber/jabber.c:1030
 msgid "From"
 msgstr "Od"
 
-#: src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:1033
 msgid "To"
 msgstr "Za"
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:1035
 msgid "None (To pending)"
 msgstr "Brez (Za �akajo�e)"
 
-#: src/protocols/jabber/jabber.c:983
+#: src/protocols/jabber/jabber.c:1039
 msgid "Subscription"
 msgstr "Naro�ilo"
 
-#: src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/jabber.c:1046
-#: src/protocols/jabber/jabber.c:1054
-#: src/protocols/jabber/jabber.c:1062
-#: src/protocols/jabber/jabber.c:1070
+#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1110
+#: src/protocols/jabber/jabber.c:1118
+#: src/protocols/jabber/jabber.c:1126
 msgid "Priority"
 msgstr "Prednost stika"
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1148
 msgid "Password Changed"
 msgstr "Geslo spremenjeno"
 
-#: src/protocols/jabber/jabber.c:1093
+#: src/protocols/jabber/jabber.c:1149
 msgid "Your password has been changed."
 msgstr "Va邸e geslo je bilo spremenjeno."
 
-#: src/protocols/jabber/jabber.c:1097
-#: src/protocols/jabber/jabber.c:1098
+#: src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1154
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1210
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: src/protocols/jabber/jabber.c:1159
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1216
 msgid "Change Jabber Password"
 msgstr "Spremeni geslo za Jabber"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1216
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1226
 #: src/protocols/oscar/oscar.c:8282
 #: src/protocols/silc/silc.c:1009
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:1231
 #: src/protocols/oscar/oscar.c:8293
 #: src/protocols/silc/silc.c:1005
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1236
 msgid "Search for Users..."
 msgstr "Najdi uporabnike ..."
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1312
 msgid "Bad Request"
 msgstr "Napa�na zahteva"
 
-#: src/protocols/jabber/jabber.c:1258
+#: src/protocols/jabber/jabber.c:1314
 msgid "Conflict"
 msgstr "Spor"
 
-#: src/protocols/jabber/jabber.c:1260
+#: src/protocols/jabber/jabber.c:1316
 msgid "Feature Not Implemented"
 msgstr "Mo転nost ni uvedena"
 
-#: src/protocols/jabber/jabber.c:1262
+#: src/protocols/jabber/jabber.c:1318
 msgid "Forbidden"
 msgstr "Prepovedano"
 
-#: src/protocols/jabber/jabber.c:1264
+#: src/protocols/jabber/jabber.c:1320
 msgid "Gone"
 msgstr "Ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1266
-#: src/protocols/jabber/jabber.c:1340
+#: src/protocols/jabber/jabber.c:1322
+#: src/protocols/jabber/jabber.c:1396
 msgid "Internal Server Error"
 msgstr "Notranja napaka stre転nika"
 
-#: src/protocols/jabber/jabber.c:1268
+#: src/protocols/jabber/jabber.c:1324
 msgid "Item Not Found"
 msgstr "Predmeta ni mogo�e najti"
 
-#: src/protocols/jabber/jabber.c:1270
+#: src/protocols/jabber/jabber.c:1326
 msgid "Malformed Jabber ID"
 msgstr "Nepravilen Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1272
+#: src/protocols/jabber/jabber.c:1328
 msgid "Not Acceptable"
 msgstr "Ni mogo�e sprejeti"
 
-#: src/protocols/jabber/jabber.c:1274
+#: src/protocols/jabber/jabber.c:1330
 msgid "Not Allowed"
 msgstr "Ni dovoljeno"
 
-#: src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1334
 msgid "Payment Required"
 msgstr "Zahtevano pla�ilo"
 
-#: src/protocols/jabber/jabber.c:1280
+#: src/protocols/jabber/jabber.c:1336
 msgid "Recipient Unavailable"
 msgstr "Dobitnik ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1284
+#: src/protocols/jabber/jabber.c:1340
 msgid "Registration Required"
 msgstr "Zahtevana registracija"
 
-#: src/protocols/jabber/jabber.c:1286
+#: src/protocols/jabber/jabber.c:1342
 msgid "Remote Server Not Found"
 msgstr "Oddaljenega stre転nika ni mogo�e najti"
 
-#: src/protocols/jabber/jabber.c:1288
+#: src/protocols/jabber/jabber.c:1344
 msgid "Remote Server Timeout"
 msgstr "�asovna omejitev oddaljenega stre転nika je potekla"
 
-#: src/protocols/jabber/jabber.c:1290
+#: src/protocols/jabber/jabber.c:1346
 msgid "Server Overloaded"
 msgstr "Stre転nik je preobremenjen"
 
-#: src/protocols/jabber/jabber.c:1292
+#: src/protocols/jabber/jabber.c:1348
 msgid "Service Unavailable"
 msgstr "Storitev ni dostopna"
 
-#: src/protocols/jabber/jabber.c:1294
+#: src/protocols/jabber/jabber.c:1350
 msgid "Subscription Required"
 msgstr "Zahtevano naro�ilo"
 
-#: src/protocols/jabber/jabber.c:1296
+#: src/protocols/jabber/jabber.c:1352
 msgid "Unexpected Request"
 msgstr "Nepri�akovana zahteva"
 
-#: src/protocols/jabber/jabber.c:1303
+#: src/protocols/jabber/jabber.c:1359
 msgid "Authorization Aborted"
 msgstr "Pooblastitev prekinjena"
 
-#: src/protocols/jabber/jabber.c:1305
+#: src/protocols/jabber/jabber.c:1361
 msgid "Incorrect encoding in authorization"
 msgstr "Napa�no kodiranje pri pooblastitvi"
 
-#: src/protocols/jabber/jabber.c:1308
+#: src/protocols/jabber/jabber.c:1364
 msgid "Invalid authzid"
 msgstr "Neveljaven ID pooblastila"
 
-#: src/protocols/jabber/jabber.c:1311
+#: src/protocols/jabber/jabber.c:1367
 msgid "Invalid Authorization Mechanism"
 msgstr "Neveljaven mehanizem pooblastil"
 
-#: src/protocols/jabber/jabber.c:1314
+#: src/protocols/jabber/jabber.c:1370
 msgid "Authorization mechanism too weak"
 msgstr "Pre邸ibek mehanizem pooblastil"
 
-#: src/protocols/jabber/jabber.c:1319
+#: src/protocols/jabber/jabber.c:1375
 msgid "Temporary Authentication Failure"
 msgstr "Napaka za�asne overovitve"
 
-#: src/protocols/jabber/jabber.c:1321
+#: src/protocols/jabber/jabber.c:1377
 msgid "Authentication Failure"
 msgstr "Napaka pri overovitvi"
 
-#: src/protocols/jabber/jabber.c:1325
+#: src/protocols/jabber/jabber.c:1381
 msgid "Bad Format"
 msgstr "Napa�na oblika"
 
-#: src/protocols/jabber/jabber.c:1327
+#: src/protocols/jabber/jabber.c:1383
 msgid "Bad Namespace Prefix"
 msgstr "Napa�na predpona imenskega prostora"
 
-#: src/protocols/jabber/jabber.c:1330
+#: src/protocols/jabber/jabber.c:1386
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: src/protocols/jabber/jabber.c:1332
+#: src/protocols/jabber/jabber.c:1388
 #: src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "�asovna omejitev povezave potekla"
 
-#: src/protocols/jabber/jabber.c:1334
+#: src/protocols/jabber/jabber.c:1390
 msgid "Host Gone"
 msgstr "Gostitelj ni na voljo"
 
-#: src/protocols/jabber/jabber.c:1336
+#: src/protocols/jabber/jabber.c:1392
 msgid "Host Unknown"
 msgstr "Neznan gostitelj"
 
-#: src/protocols/jabber/jabber.c:1338
+#: src/protocols/jabber/jabber.c:1394
 msgid "Improper Addressing"
 msgstr "Neustrezno naslavljanje"
 
-#: src/protocols/jabber/jabber.c:1342
+#: src/protocols/jabber/jabber.c:1398
 msgid "Invalid ID"
 msgstr "Neveljaven ID"
 
-#: src/protocols/jabber/jabber.c:1344
+#: src/protocols/jabber/jabber.c:1400
 msgid "Invalid Namespace"
 msgstr "Neveljaven imenski prostor"
 
-#: src/protocols/jabber/jabber.c:1346
+#: src/protocols/jabber/jabber.c:1402
 msgid "Invalid XML"
 msgstr "Neveljaven XML"
 
-#: src/protocols/jabber/jabber.c:1348
+#: src/protocols/jabber/jabber.c:1404
 msgid "Non-matching Hosts"
 msgstr "Neujemajo�i gostitelji"
 
-#: src/protocols/jabber/jabber.c:1352
+#: src/protocols/jabber/jabber.c:1408
 msgid "Policy Violation"
 msgstr "Zloraba politike"
 
-#: src/protocols/jabber/jabber.c:1354
+#: src/protocols/jabber/jabber.c:1410
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-#: src/protocols/jabber/jabber.c:1356
+#: src/protocols/jabber/jabber.c:1412
 msgid "Resource Constraint"
 msgstr "Zadrega vira"
 
-#: src/protocols/jabber/jabber.c:1358
+#: src/protocols/jabber/jabber.c:1414
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
-#: src/protocols/jabber/jabber.c:1360
+#: src/protocols/jabber/jabber.c:1416
 msgid "See Other Host"
 msgstr "Glej druge gostitelje"
 
-#: src/protocols/jabber/jabber.c:1362
+#: src/protocols/jabber/jabber.c:1418
 msgid "System Shutdown"
 msgstr "Izklop sistema"
 
-#: src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1420
 msgid "Undefined Condition"
 msgstr "Nedolo�en pogoj"
 
-#: src/protocols/jabber/jabber.c:1366
+#: src/protocols/jabber/jabber.c:1422
 msgid "Unsupported Encoding"
 msgstr "Nepodprto kodiranje"
 
-#: src/protocols/jabber/jabber.c:1368
+#: src/protocols/jabber/jabber.c:1424
 msgid "Unsupported Stanza Type"
 msgstr "Nepodprt tip vrstice"
 
-#: src/protocols/jabber/jabber.c:1370
+#: src/protocols/jabber/jabber.c:1426
 msgid "Unsupported Version"
 msgstr "Nepodprta razli�ica"
 
-#: src/protocols/jabber/jabber.c:1372
+#: src/protocols/jabber/jabber.c:1428
 msgid "XML Not Well Formed"
 msgstr "Slabo oblikovan XML"
 
-#: src/protocols/jabber/jabber.c:1374
+#: src/protocols/jabber/jabber.c:1430
 msgid "Stream Error"
 msgstr "Napaka toka"
 
-#: src/protocols/jabber/jabber.c:1441
+#: src/protocols/jabber/jabber.c:1497
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ni mogo�e prepovedati uporabnika %s"
 
-#: src/protocols/jabber/jabber.c:1463
+#: src/protocols/jabber/jabber.c:1519
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Neznana v�lanitev: \"%s\""
 
-#: src/protocols/jabber/jabber.c:1468
+#: src/protocols/jabber/jabber.c:1524
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Uporabnika %s ni mogo�e v�laniti kot \"%s\""
 
-#: src/protocols/jabber/jabber.c:1520
+#: src/protocols/jabber/jabber.c:1576
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ni mogo�e brcniti uporabnika %s"
 
-#: src/protocols/jabber/jabber.c:1546
+#: src/protocols/jabber/jabber.c:1602
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: src/protocols/jabber/jabber.c:1550
+#: src/protocols/jabber/jabber.c:1606
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#: src/protocols/jabber/jabber.c:1559
+#: src/protocols/jabber/jabber.c:1615
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: src/protocols/jabber/jabber.c:1564
+#: src/protocols/jabber/jabber.c:1620
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
-#: src/protocols/jabber/jabber.c:1570
+#: src/protocols/jabber/jabber.c:1626
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
 
-#: src/protocols/jabber/jabber.c:1576
+#: src/protocols/jabber/jabber.c:1632
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
-#: src/protocols/jabber/jabber.c:1582
+#: src/protocols/jabber/jabber.c:1638
 msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
 msgstr "affiliate &lt;uporabnik&gt; &lt;lastnik|skrbnik|�lan|izlo�enec|nih�e&gt;: Nastavitev uporabnikovega statusa v sobi."
 
-#: src/protocols/jabber/jabber.c:1588
+#: src/protocols/jabber/jabber.c:1644
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
 
-#: src/protocols/jabber/jabber.c:1594
+#: src/protocols/jabber/jabber.c:1650
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [stre転nik]:  Pridru転i se pomenku na tem stre転niku."
 
-#: src/protocols/jabber/jabber.c:1600
+#: src/protocols/jabber/jabber.c:1656
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
-#: src/protocols/jabber/jabber.c:1605
+#: src/protocols/jabber/jabber.c:1661
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;uporabnik&gt; &lt;sporo�ilo&gt;:  Po邸ljite zasebno sporo�ilo drugemu uporabniku."
 
@@ -7022,33 +7032,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1687
-#: src/protocols/jabber/jabber.c:1689
+#: src/protocols/jabber/jabber.c:1744
+#: src/protocols/jabber/jabber.c:1746
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatek za protokol Jabber"
 
-#: src/protocols/jabber/jabber.c:1715
+#: src/protocols/jabber/jabber.c:1772
 msgid "Use TLS if available"
 msgstr "Uporabite TLS, �e je na voljo"
 
-#: src/protocols/jabber/jabber.c:1720
+#: src/protocols/jabber/jabber.c:1777
 msgid "Require TLS"
 msgstr "Zahtevaj TLS"
 
-#: src/protocols/jabber/jabber.c:1723
+#: src/protocols/jabber/jabber.c:1780
 msgid "Force old (port 5223) SSL"
 msgstr "Vsili star SSL (vrata 5223)"
 
-#: src/protocols/jabber/jabber.c:1728
+#: src/protocols/jabber/jabber.c:1785
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko ne邸ifriranih toka"
 
-#: src/protocols/jabber/jabber.c:1733
+#: src/protocols/jabber/jabber.c:1790
 msgid "Connect port"
 msgstr "Pove転i vrata"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1737
+#: src/protocols/jabber/jabber.c:1794
 #: src/protocols/silc/silc.c:1832
 msgid "Connect server"
 msgstr "Pove転i se na stre転nik"
@@ -7474,15 +7484,15 @@
 msgstr "Pridem precej nazaj"
 
 #: src/protocols/msn/msn.c:597
-#: src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2650
 #: src/protocols/yahoo/yahoo.c:3232
-msgid "On The Phone"
+msgid "On the Phone"
 msgstr "Na telefonu"
 
 #: src/protocols/msn/msn.c:601
-#: src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2654
 #: src/protocols/yahoo/yahoo.c:3238
-msgid "Out To Lunch"
+msgid "Out to Lunch"
 msgstr "Na kosilu"
 
 #: src/protocols/msn/msn.c:605
@@ -7536,7 +7546,7 @@
 msgid "Failed to connect to server."
 msgstr "Povezava na stre転nik neuspe邸na."
 
-#: src/protocols/msn/msn.c:1379
+#: src/protocols/msn/msn.c:1361
 #: src/protocols/yahoo/yahoo_profile.c:654
 #: src/protocols/zephyr/zephyr.c:721
 #: src/protocols/zephyr/zephyr.c:1136
@@ -7545,95 +7555,95 @@
 msgstr "<b>Psevdonim:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1386
-#: src/protocols/msn/msn.c:1732
+#: src/protocols/msn/msn.c:1368
+#: src/protocols/msn/msn.c:1714
 #: src/protocols/yahoo/yahoo_profile.c:1171
 #: src/util.c:800
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1463
+#: src/protocols/msn/msn.c:1445
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: src/protocols/msn/msn.c:1468
-#: src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1450
+#: src/protocols/msn/msn.c:1701
 #: src/protocols/yahoo/yahoo_profile.c:764
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#: src/protocols/msn/msn.c:1538
+#: src/protocols/msn/msn.c:1520
 #: src/protocols/oscar/oscar.c:6034
 #: src/protocols/yahoo/yahoo_profile.c:1019
 msgid "Age"
 msgstr "Starost"
 
-#: src/protocols/msn/msn.c:1554
+#: src/protocols/msn/msn.c:1536
 #: src/protocols/yahoo/yahoo_profile.c:1024
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: src/protocols/msn/msn.c:1561
+#: src/protocols/msn/msn.c:1543
 #: src/protocols/novell/novell.c:1480
 #: src/protocols/yahoo/yahoo_profile.c:1014
 msgid "Location"
 msgstr "Lokacija"
 
-#: src/protocols/msn/msn.c:1569
+#: src/protocols/msn/msn.c:1551
 #: src/protocols/yahoo/yahoo_profile.c:1034
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: src/protocols/msn/msn.c:1586
-#: src/protocols/msn/msn.c:1592
-#: src/protocols/msn/msn.c:1599
-#: src/protocols/msn/msn.c:1607
-#: src/protocols/msn/msn.c:1614
+#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1574
+#: src/protocols/msn/msn.c:1581
+#: src/protocols/msn/msn.c:1589
+#: src/protocols/msn/msn.c:1596
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
-#: src/protocols/msn/msn.c:1623
-#: src/protocols/msn/msn.c:1629
-#: src/protocols/msn/msn.c:1636
-#: src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1605
+#: src/protocols/msn/msn.c:1611
+#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1625
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: src/protocols/msn/msn.c:1652
-#: src/protocols/msn/msn.c:1658
-#: src/protocols/msn/msn.c:1665
+#: src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1640
+#: src/protocols/msn/msn.c:1647
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: src/protocols/msn/msn.c:1674
-#: src/protocols/msn/msn.c:1680
+#: src/protocols/msn/msn.c:1656
+#: src/protocols/msn/msn.c:1662
 #: src/protocols/yahoo/yahoo_profile.c:1076
 msgid "Favorite Quote"
 msgstr "Najljub邸i citat"
 
-#: src/protocols/msn/msn.c:1688
+#: src/protocols/msn/msn.c:1670
 msgid "Last Updated"
 msgstr "Nazadnje osve転eno"
 
-#: src/protocols/msn/msn.c:1699
+#: src/protocols/msn/msn.c:1681
 #: src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Doma�a stran"
 
-#: src/protocols/msn/msn.c:1721
+#: src/protocols/msn/msn.c:1703
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: src/protocols/msn/msn.c:1722
+#: src/protocols/msn/msn.c:1704
 msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
 msgstr "MSN ne more najti uporabnikovega profila. To lahko pomeni, da uporabnik ne obstaja, ali pa 邸e ni ustvaril javnega profila."
 
-#: src/protocols/msn/msn.c:1726
+#: src/protocols/msn/msn.c:1708
 msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
 msgstr "Gaim v uporabnikovem profilu ne more najti informacij. Uporabnik verjetno ne obstaja."
 
-#: src/protocols/msn/msn.c:1732
+#: src/protocols/msn/msn.c:1714
 #: src/protocols/yahoo/yahoo_profile.c:1171
 msgid "Profile URL"
 msgstr "URL profila"
@@ -7648,20 +7658,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1935
-#: src/protocols/msn/msn.c:1937
+#: src/protocols/msn/msn.c:1917
+#: src/protocols/msn/msn.c:1919
 msgid "MSN Protocol Plugin"
 msgstr "Vti�nik za protokol MSN"
 
-#: src/protocols/msn/msn.c:1956
+#: src/protocols/msn/msn.c:1938
 msgid "Login server"
 msgstr "Prijavni stre転nik"
 
-#: src/protocols/msn/msn.c:1965
+#: src/protocols/msn/msn.c:1947
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
-#: src/protocols/msn/msn.c:1973
+#: src/protocols/msn/msn.c:1955
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
@@ -7838,6 +7848,14 @@
 msgid "Away From Computer"
 msgstr "Stran od ra�unalnika"
 
+#: src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Na telefonu"
+
+#: src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Na kosilu"
+
 #: src/protocols/msn/switchboard.c:405
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Sporo�ila morda ni bilo poslano, ker je pri邸lo do �asovne prekora�itve:"
@@ -9253,7 +9271,7 @@
 
 #: src/protocols/oscar/oscar.c:7612
 #: src/protocols/oscar/oscar.c:7617
-#: src/protocols/sametime/sametime.c:5342
+#: src/protocols/sametime/sametime.c:5346
 msgid "Away Message"
 msgstr "Sporo�ilo o odsotnosti"
 
@@ -9388,15 +9406,15 @@
 msgid "Search for Buddy by Information"
 msgstr "I邸�i prijatelja po informaciji"
 
-#: src/protocols/oscar/oscar.c:8420
+#: src/protocols/oscar/oscar.c:8416
 msgid "Use recent buddies group"
 msgstr "Uporabi skupino zadnjih prijateljev"
 
-#: src/protocols/oscar/oscar.c:8423
+#: src/protocols/oscar/oscar.c:8419
 msgid "Show how long you have been idle"
 msgstr "Prika転i �as lastne neaktivnosti"
 
-#: src/protocols/oscar/oscar.c:8432
+#: src/protocols/oscar/oscar.c:8428
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
 msgstr "Uporabi stre転nik proxy AIM/ICQ (po�asneje/varnej邸e/ponavadi deluje)"
 
@@ -9410,20 +9428,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8549
-#: src/protocols/oscar/oscar.c:8551
+#: src/protocols/oscar/oscar.c:8545
+#: src/protocols/oscar/oscar.c:8547
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Vstavek za protokol AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8570
+#: src/protocols/oscar/oscar.c:8566
 msgid "Auth host"
 msgstr "Stre転nik za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8573
+#: src/protocols/oscar/oscar.c:8569
 msgid "Auth port"
 msgstr "Vrata za avtentikacijo"
 
-#: src/protocols/oscar/oscar.c:8576
+#: src/protocols/oscar/oscar.c:8572
 #: src/protocols/zephyr/zephyr.c:2894
 msgid "Encoding"
 msgstr "Kodiranje"
@@ -9682,42 +9700,42 @@
 msgid "<b>Status:</b> %s"
 msgstr "<b>Stanje</b>: %s"
 
-#: src/protocols/sametime/sametime.c:4426
-#: src/protocols/sametime/sametime.c:5550
+#: src/protocols/sametime/sametime.c:4430
+#: src/protocols/sametime/sametime.c:5554
 msgid "Possible Matches"
 msgstr "Mo転ni zadetki"
 
-#: src/protocols/sametime/sametime.c:4463
+#: src/protocols/sametime/sametime.c:4467
 msgid "An ambiguous user ID was entered"
 msgstr "Vnesli ste dvoumen uporabni邸ki ID"
 
-#: src/protocols/sametime/sametime.c:4464
+#: src/protocols/sametime/sametime.c:4468
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
 msgstr "Imenovalec '%s' se morda nana邸a na vse na邸tete uporabnike. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: src/protocols/sametime/sametime.c:4469
+#: src/protocols/sametime/sametime.c:4473
 msgid "Select User to Add"
 msgstr "Izberite uporabnika, ki ga 転elite dodati"
 
-#: src/protocols/sametime/sametime.c:4471
+#: src/protocols/sametime/sametime.c:4475
 msgid "Add User"
 msgstr "Dodaj uporabnika"
 
-#: src/protocols/sametime/sametime.c:4532
+#: src/protocols/sametime/sametime.c:4536
 msgid "Unable to add user: user not found"
 msgstr "Ni mo� dodati uporabnika: ni ga mogo�e najti"
 
-#: src/protocols/sametime/sametime.c:4534
+#: src/protocols/sametime/sametime.c:4538
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom v va邸i skupnosti Sametime. Ta vnos je bil odstranjen iz va邸ega seznama prijateljev."
 
-#: src/protocols/sametime/sametime.c:4539
+#: src/protocols/sametime/sametime.c:4543
 msgid "Unable to add user"
 msgstr "Ni mogo�e dodati uporabnika"
 
-#: src/protocols/sametime/sametime.c:5109
+#: src/protocols/sametime/sametime.c:5113
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -9726,128 +9744,128 @@
 "Napaka pri branju datoteke %s: \n"
 "%s.\n"
 
-#: src/protocols/sametime/sametime.c:5235
+#: src/protocols/sametime/sametime.c:5239
 msgid "Remotely Stored Buddy List"
 msgstr "Oddaljeno shranjeni seznam prijateljev"
 
-#: src/protocols/sametime/sametime.c:5240
+#: src/protocols/sametime/sametime.c:5244
 msgid "Buddy List Storage Mode"
 msgstr "Na�in hrambe seznama prijateljev"
 
-#: src/protocols/sametime/sametime.c:5243
+#: src/protocols/sametime/sametime.c:5247
 msgid "Local Buddy List Only"
 msgstr "Le krajevni seznam prijateljev"
 
-#: src/protocols/sametime/sametime.c:5245
-msgid "Merge List from Server"
-msgstr "Spoji seznam prijateljev s stre転nikovim"
-
-#: src/protocols/sametime/sametime.c:5247
-msgid "Merge and Save List to Server"
-msgstr "Spoji seznam prijateljev s stre転nikovim in ga shrani"
-
 #: src/protocols/sametime/sametime.c:5249
+msgid "Merge List from Server"
+msgstr "Spoji seznam prijateljev s stre転nikovim"
+
+#: src/protocols/sametime/sametime.c:5251
+msgid "Merge and Save List to Server"
+msgstr "Spoji seznam prijateljev s stre転nikovim in ga shrani"
+
+#: src/protocols/sametime/sametime.c:5253
 msgid "Synchronize List with Server"
 msgstr "Sinhroniziraj seznam s stre転nikom"
 
-#: src/protocols/sametime/sametime.c:5336
+#: src/protocols/sametime/sametime.c:5340
 msgid "Active Message"
 msgstr "Sporo�ilo o aktivnosti"
 
-#: src/protocols/sametime/sametime.c:5348
+#: src/protocols/sametime/sametime.c:5352
 msgid "Busy Message"
 msgstr "Sporo�ilo o zasedenosti"
 
-#: src/protocols/sametime/sametime.c:5352
+#: src/protocols/sametime/sametime.c:5356
 msgid "Default status messages"
 msgstr "Privzeta sporo�ila o stanju"
 
-#: src/protocols/sametime/sametime.c:5355
+#: src/protocols/sametime/sametime.c:5359
 msgid "Edit Status Messages"
 msgstr "Uredi sporo�ila o stanju"
 
-#: src/protocols/sametime/sametime.c:5399
+#: src/protocols/sametime/sametime.c:5403
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Uvozi seznam Sametime za ra�un %s"
 
-#: src/protocols/sametime/sametime.c:5438
+#: src/protocols/sametime/sametime.c:5442
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Izvozi seznam Sametime za ra�un %s"
 
-#: src/protocols/sametime/sametime.c:5489
+#: src/protocols/sametime/sametime.c:5493
 msgid "Unable to add group: group exists"
 msgstr "Skupine ni bilo mogo�e dodati: 転e obstaja"
 
-#: src/protocols/sametime/sametime.c:5490
+#: src/protocols/sametime/sametime.c:5494
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Skupina z imenom '%s' 転e obstaja v va邸em seznamu prijateljev."
 
-#: src/protocols/sametime/sametime.c:5493
-#: src/protocols/sametime/sametime.c:5618
+#: src/protocols/sametime/sametime.c:5497
+#: src/protocols/sametime/sametime.c:5622
 msgid "Unable to add group"
 msgstr "Skupine ni mogo�e dodati"
 
-#: src/protocols/sametime/sametime.c:5566
+#: src/protocols/sametime/sametime.c:5570
 msgid "Notes Address Book group results"
 msgstr "Skupinski rezultati adresarjev zapiskov"
 
-#: src/protocols/sametime/sametime.c:5567
+#: src/protocols/sametime/sametime.c:5571
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
 msgstr "Imenovalec '%s' se morda nana邸a na eno od naslednjih skupin adresarjev zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj seznam prijateljev."
 
-#: src/protocols/sametime/sametime.c:5572
+#: src/protocols/sametime/sametime.c:5576
 msgid "Select Notes Address Book"
 msgstr "Izberite adresar zapiskov"
 
-#: src/protocols/sametime/sametime.c:5612
+#: src/protocols/sametime/sametime.c:5616
 msgid "Unable to add group: group not found"
 msgstr "Dodajanje skupine ni uspelo: skupina ne obstaja"
 
-#: src/protocols/sametime/sametime.c:5614
+#: src/protocols/sametime/sametime.c:5618
 #, c-format
 msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v va邸i skupnosti Sametime."
 
-#: src/protocols/sametime/sametime.c:5654
+#: src/protocols/sametime/sametime.c:5658
 msgid "Notes Address Book Group"
 msgstr "Skupina adresarja zapiskov"
 
-#: src/protocols/sametime/sametime.c:5655
+#: src/protocols/sametime/sametime.c:5659
 msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
 msgstr "Vnesite ime skupine opomb adresarja v spodnje polje, s �imer boste lahko v seznam prijateljev vnesli skupino in njene �lane."
 
-#: src/protocols/sametime/sametime.c:5671
+#: src/protocols/sametime/sametime.c:5675
 msgid "Set Status Messages..."
 msgstr "Nastavi sporo�ila o stanju ..."
 
-#: src/protocols/sametime/sametime.c:5676
+#: src/protocols/sametime/sametime.c:5680
 msgid "Import Sametime List..."
 msgstr "Uvozi seznam Sametime ..."
 
-#: src/protocols/sametime/sametime.c:5680
+#: src/protocols/sametime/sametime.c:5684
 msgid "Export Sametime List..."
 msgstr "Izvozi seznam Sametime ..."
 
-#: src/protocols/sametime/sametime.c:5684
+#: src/protocols/sametime/sametime.c:5688
 msgid "Add Notes Address Book Group..."
 msgstr "Dodaj skupino adresarja zapiskov ..."
 
 #. notesbuddy hack encoding
-#: src/protocols/sametime/sametime.c:5778
-msgid "NotesBuddy Encoding"
+#: src/protocols/sametime/sametime.c:5782
+msgid "NotesBuddy encoding"
 msgstr "Kodiranje NotesBuddy"
 
-#: src/protocols/sametime/sametime.c:5787
-msgid "Force Login (Ignore Server Redirects)"
+#: src/protocols/sametime/sametime.c:5791
+msgid "Force login (ignore server redirects)"
 msgstr "Prisilna prijava (prezri stre転ni邸ke preusmeritve)"
 
 #. pretend to be Sametime Connect
-#: src/protocols/sametime/sametime.c:5797
-msgid "Hide Client Identity"
+#: src/protocols/sametime/sametime.c:5801
+msgid "Hide client identity"
 msgstr "Skrij identiteto odjemalca"
 
 #: src/protocols/silc/buddy.c:52
@@ -10875,10 +10893,6 @@
 msgid "Private Key File"
 msgstr "Datoteka z zasebnim klju�em"
 
-#: src/protocols/silc/silc.c:921
-msgid "Hostname"
-msgstr "Ime gostitelja"
-
 #: src/protocols/silc/silc.c:923
 msgid "Real Name"
 msgstr "Resni�no ime"
@@ -11244,33 +11258,28 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/simple/simple.c:1427
+#: src/protocols/simple/simple.c:1428
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
 #. *  summary
-#: src/protocols/simple/simple.c:1428
+#: src/protocols/simple/simple.c:1429
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Vstavek za protokol SIP/SIMPLE"
 
-#. *  description
-#: src/protocols/simple/simple.c:1429
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr "Thomas Butter <butter@uni-mannheim.de>"
-
-#: src/protocols/simple/simple.c:1450
-msgid "Publish Status (note: everyone may watch you)"
+#: src/protocols/simple/simple.c:1451
+msgid "Publish status (note: everyone may watch you)"
 msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
 
-#: src/protocols/simple/simple.c:1453
+#: src/protocols/simple/simple.c:1454
 msgid "Use UDP"
 msgstr "Uporabi UDP"
 
-#: src/protocols/simple/simple.c:1455
-msgid "Use Proxy"
-msgstr "Uporabi proxy"
-
-#: src/protocols/simple/simple.c:1457
+#: src/protocols/simple/simple.c:1456
+msgid "Use proxy"
+msgstr "Uporabi prehod (proxy)"
+
+#: src/protocols/simple/simple.c:1458
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -11615,30 +11624,25 @@
 msgstr "Te転ava s povezavo"
 
 #: src/protocols/yahoo/yahoo.c:2644
+#: src/protocols/yahoo/yahoo.c:3223
 msgid "Not at Home"
 msgstr "Nisem doma"
 
 #: src/protocols/yahoo/yahoo.c:2646
+#: src/protocols/yahoo/yahoo.c:3226
 msgid "Not at Desk"
 msgstr "Nisem za mizo"
 
 #: src/protocols/yahoo/yahoo.c:2648
+#: src/protocols/yahoo/yahoo.c:3229
 msgid "Not in Office"
 msgstr "Nisem v pisarni"
 
-#: src/protocols/yahoo/yahoo.c:2650
-msgid "On the Phone"
-msgstr "Na telefonu"
-
 #: src/protocols/yahoo/yahoo.c:2652
 #: src/protocols/yahoo/yahoo.c:3235
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: src/protocols/yahoo/yahoo.c:2654
-msgid "Out to Lunch"
-msgstr "Na kosilu"
-
 #: src/protocols/yahoo/yahoo.c:2656
 #: src/protocols/yahoo/yahoo.c:3241
 msgid "Stepped Out"
@@ -11699,18 +11703,6 @@
 msgid "Join User in Chat..."
 msgstr "Pridru転i se uporabniku v pomenku ..."
 
-#: src/protocols/yahoo/yahoo.c:3223
-msgid "Not At Home"
-msgstr "Nisem doma"
-
-#: src/protocols/yahoo/yahoo.c:3226
-msgid "Not At Desk"
-msgstr "Nisem za mizo"
-
-#: src/protocols/yahoo/yahoo.c:3229
-msgid "Not In Office"
-msgstr "Nisem v pisarni"
-
 #: src/protocols/yahoo/yahoo.c:3529
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;soba&gt;:  Pridru転ite se klepetalnici v omre転ju Yahoo."
@@ -12165,15 +12157,15 @@
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Pri branju va邸ega %s je pri邸lo do napake, zato ni bil nalo転en. Stara datoteka se je preimenovala v %s~."
 
-#: src/util.c:2597
+#: src/util.c:2616
 msgid "Calculating..."
 msgstr "Prera�unavanje ..."
 
-#: src/util.c:2600
+#: src/util.c:2619
 msgid "Unknown."
 msgstr "Neznano."
 
-#: src/util.c:2630
+#: src/util.c:2649
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
@@ -12181,7 +12173,7 @@
 msgstr[2] "sekundi"
 msgstr[3] "sekunde"
 
-#: src/util.c:2644
+#: src/util.c:2663
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dni"
@@ -12189,7 +12181,7 @@
 msgstr[2] "dneva"
 msgstr[3] "dnevi"
 
-#: src/util.c:2652
+#: src/util.c:2671
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ur"
@@ -12197,7 +12189,7 @@
 msgstr[2] "uri"
 msgstr[3] "ure"
 
-#: src/util.c:2660
+#: src/util.c:2679
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -12205,7 +12197,7 @@
 msgstr[2] "minuti"
 msgstr[3] "minute"
 
-#: src/util.c:3098
+#: src/util.c:3117
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Napaka pri vzpostavljanju povezave.\n"
 
--- a/po/zh_TW.po	Mon Dec 19 17:16:15 2005 +0000
+++ b/po/zh_TW.po	Mon Dec 19 18:16:03 2005 +0000
@@ -44,108 +44,144 @@
 msgstr ""
 "Project-Id-Version: Gaim 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-08-07 21:48-0400\n"
-"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
+"POT-Creation-Date: 2005-12-19 23:53+0800\n"
+"PO-Revision-Date: 2005-12-20 00:38+0800\n"
+"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"\n"
-
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "���荐�������"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "筝�蕁�ず筝㊥�潔�g����"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "筝�蕁�ず�糸�ラ���"
-
-#: plugins/autorecon.c:313
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "筝�蕁�ず筝㊥�潔�g����"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "��絲�羝��"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ciphertest.c:267
+#: plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr ""
+
+#: plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "絅遵���臀�"
+
+#: plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "絅遵��∫��"
+
+#: plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "絅遵��∫��"
+
+#: plugins/contact_priority.c:64
+msgid "Buddy is offline"
+msgstr "絅遵��∝�"
+
+#: plugins/contact_priority.c:86
+msgid "Point values to use when..."
+msgstr "���ュソ��������緇����種�"
+
+#: plugins/contact_priority.c:114
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr ""
+
+#: plugins/contact_priority.c:121
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+# NOTE ������鐚�筝��ラ���������藝�?!
+#: plugins/contact_priority.c:126
+msgid "Point values to use for account..."
+msgstr "���ュ験����緇�����"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "�������育�g�"
+#: plugins/contact_priority.c:177
+msgid "Contact Priority"
+msgstr "絅遵�����罨≦�"
+
+#. *< name
+#. *< version
+#. *< summary
+#: plugins/contact_priority.c:180
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "莅�篏��������絅遵�������緇����若��"
+
+#. *< description
+#: plugins/contact_priority.c:182
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "莅�篏��������臀��������∫���������∝���������緇����種�篁ヤ梢荐�膊�絅遵�絽活��������罨≦���"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/crazychat/cc_gaim_plugin.c:146
+#, fuzzy
+msgid "Crazychat"
+msgstr "��紊�"
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr ""
+
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "�銀��欠���鐚�膤紫輝������綛�����育�g���"
-
-#: plugins/contact_priority.c:84
-msgid "Point values to use when..."
-msgstr "���ュソ��������緇����種�"
-
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "絅遵��∝�鐚�"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "絅遵��∫��鐚�"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "絅遵���臀��"
-
-# NOTE 茘����後� by Etan Reisner (���取��箙�筝�)
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "篏睡����緇�鐚���������鐚�筝����拷����絅遵�絽活��"
-
-# NOTE 罸頫�筝���お�件�筝��篋堺������\n������鐚�����荀�腦�������
-#. Explanation
-#: plugins/contact_priority.c:141
-#, fuzzy
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n"
-"��腟����緇����取���鐚�腥�����絨����冴��������鐚����榊�倶��絲���\n"
-"篏睡����絅遵�絽活����\n"
-"���∝���������荐㊤� 4 ��鐚����∫��������鐚�����臀���1 ����\n"
-"荀�緇��咲��荐㊦������罨≦���羃���臀�����臀����∫�����∫���守��臀���鐚�\n"
-"篏睡���������荐㊤�弱�喝���"
-
-#: plugins/contact_priority.c:144
-#, fuzzy
-msgid "Point values to use for account..."
-msgstr "���ュ験����緇����種�"
+#: plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr ""
+
+#. make the network configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:295
+#, fuzzy
+msgid "Network Configuration"
+msgstr "羯�藜���篏�荐㊤�"
+
+#: plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "TCP��荐���"
+
+#: plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "UDP��荐���"
+
+#. make the feature configuration frame
+#: plugins/crazychat/cc_gaim_plugin.c:329
+#, fuzzy
+msgid "Feature Calibration"
+msgstr "荀�羆�茯�茘�"
+
+#. add enabled / disabled
+#: plugins/crazychat/cc_gaim_plugin.c:345
+#: src/gtkaccount.c:2235
+#: src/gtkplugin.c:414
+msgid "Enabled"
+msgstr "����"
+
+#: plugins/crazychat/cc_gaim_plugin.c:350
+#, fuzzy
+msgid "Disabled"
+msgstr "����"
 
 #. *< type
 #. *< ui_requirement
@@ -153,123 +189,165 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
-msgid "Contact Priority"
-msgstr "絅遵�����罨≦�"
+#: plugins/dbus-example.c:135
+#, fuzzy
+msgid "DBus"
+msgstr "綽�腆�"
 
 #. *< name
 #. *< version
-#. *< summary
-#: plugins/contact_priority.c:198
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "莅�篏��������絅遵�������緇����若��"
-
-#. *< description
-#: plugins/contact_priority.c:200
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"莅�篏��������臀��������∫���������∝���������緇����種�篁ヤ梢荐�膊�絅遵�絽活��������罨�"
-"綺��"
-
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - 鎴牙�糸��"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - �∫��"
-
-#: plugins/docklet/docklet.c:383
-#, fuzzy
+#. *  summary
+#. *  description
+#: plugins/dbus-example.c:138
+#: plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "DBus罔∞�膀�箴�"
+
+#  NOTE 茘����翫�� by Ambrose
+#: plugins/docklet/docklet.c:153
+#, fuzzy
+msgid "Right-click for more unread messages...\n"
+msgstr "蕁�ず膣亥�"
+
+#: plugins/docklet/docklet.c:156
+#: src/gtkblist.c:3244
+#, fuzzy, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d ���� %s �弱�榊��絨������荐���\n"
+msgstr[1] "%d ���� %s �弱�榊��絨������荐���\n"
+
+#: plugins/docklet/docklet.c:370
 msgid "Show Buddy List"
-msgstr "絅遵�羝���"
-
-#: plugins/docklet/docklet.c:390
+msgstr "蕁�ず絅遵�羝���"
+
+#: plugins/docklet/docklet.c:375
+msgid "Unread Messages"
+msgstr "���荐���"
+
+#: plugins/docklet/docklet.c:396
 msgid "New Message..."
 msgstr "�域���..."
 
-#: plugins/docklet/docklet.c:394
+#: plugins/docklet/docklet.c:400
 msgid "Join A Chat..."
 msgstr "���ヨ��紊��..."
 
-#: plugins/docklet/docklet.c:399
+#: plugins/docklet/docklet.c:405
+#: src/gtkaccount.c:2458
+msgid "Accounts"
+msgstr "絽活��羝���"
+
+#: plugins/docklet/docklet.c:406
+#: src/gtkplugin.c:383
+msgid "Plugins"
+msgstr "罔∞�羝���"
+
+#: plugins/docklet/docklet.c:407
+#: src/gtkprefs.c:1781
+msgid "Preferences"
+msgstr "�鎁処┃絎�"
+
+#: plugins/docklet/docklet.c:411
+#: src/gtkft.c:707
+#: src/protocols/oscar/oscar.c:8423
+msgid "File Transfers"
+msgstr "罟�罅��活叱"
+
+#: plugins/docklet/docklet.c:413
 msgid "Mute Sounds"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "罟�罅��活叱"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "絽活��羝���"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "�鎁処┃絎�"
-
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: plugins/docklet/docklet.c:416
+#: plugins/docklet/docklet.c:426
 msgid "Quit"
 msgstr "腟���腮�綣�"
 
+#: plugins/docklet/docklet.c:567
+msgid "Blink tray icon for unread..."
+msgstr ""
+
+#: plugins/docklet/docklet.c:570
+msgid "_Instant Messages:"
+msgstr "�恰��荐���(_I)鐚�"
+
+#: plugins/docklet/docklet.c:572
+#: plugins/docklet/docklet.c:580
+#: plugins/win32/winprefs/winprefs.c:412
+#: src/gtkprefs.c:816
+#: src/gtkprefs.c:1667
+msgid "Never"
+msgstr "緇�筝�"
+
+#: plugins/docklet/docklet.c:573
+msgid "In hidden conversations"
+msgstr "���沿�鋋よ�"
+
+#: plugins/docklet/docklet.c:574
+#: plugins/docklet/docklet.c:582
+#: plugins/win32/winprefs/winprefs.c:413
+#: src/gtkprefs.c:818
+#, fuzzy
+msgid "Always"
+msgstr "�∫��"
+
+#: plugins/docklet/docklet.c:578
+msgid "C_hat Messages:"
+msgstr "��紊����(_H)鐚�"
+
+#: plugins/docklet/docklet.c:581
+msgid "When my nick is said"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: plugins/docklet/docklet.c:607
 msgid "System Tray Icon"
 msgstr "膤紫輝綏ヤ��e��腓�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: plugins/docklet/docklet.c:610
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "��鎧腟怨轡篏��d賢蕁�ず Gaim ����腓冴��"
 
 # NOTE queuing semantics clarified by marv on #gaim
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"��轡篏��d�鐚�箴�絋� GNOME��KDE ��緇��荀�腦�膈���綏ヤ��o�蕁�ず Gaim ����������鐚�莅���"
-"綽�������篏� Gaim ��綛冗��絽悟�����緒���������������絅遵�羝������糸�ヨ�腦�鐚�鐚�筝�����"
-"鋌ラ�御��絨��九�亥��荐�����遺���筝㍼��翫�医轡篏��e��腓肴←藥���鐚�絋���篏睡�� ICQ 筝�罔c��"
-
-#: plugins/extplacement.c:79
+#: plugins/docklet/docklet.c:612
+#, fuzzy
+msgid "Displays a system tray icon (in GNOME, KDE, or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list. Also provides options to blink for unread messages."
+msgstr "��轡篏��d�鐚�箴�絋� GNOME��KDE ��緇��荀�腦�膈���綏ヤ��o�蕁�ず Gaim ����������鐚�莅���辱������篏� Gaim ��綛冗��絽悟�����緒���������������絅遵�羝������糸�ヨ�腦�鐚�鐚�筝�����札�御��絨��九�亥��荐�����遺���筝㍼��翫�医轡篏��e��腓肴←藥���鐚�絋���篏睡�� ICQ 筝�罔c��"
+
+#: plugins/docklet/eggtrayicon.c:122
+#, fuzzy
+msgid "Orientation"
+msgstr "��絮��罕�"
+
+#: plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr ""
+
+#: plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "箴�篋よ�����"
 
-#: plugins/extplacement.c:100
+#: plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "篋よ�篏�臀�"
 
-#: plugins/extplacement.c:105
+#: plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "荀�腦��т�篋よ����娯���"
 
 #  XXX 荀��後�茘���鐚�
-#: plugins/extplacement.c:111
+#: plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "箴�篋よ����御�丞舟�遺困茫���鐚�篁ヤ�����荀�腦�蕁�ず�恰��荐�������紊�"
 
@@ -279,23 +357,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: plugins/extplacement.c:133
 msgid "ExtPlacement"
 msgstr "荀�腦�篏�臀��紊��檎��"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: plugins/extplacement.c:135
 msgid "Extra conversation placement options."
 msgstr "篋よ�荀�腦�篏�臀��紊��檎����"
 
 #  XXX 茘��緇�綏��茫��壕�� :-(
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
+#: plugins/extplacement.c:137
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
 msgstr "���区�腦����箙�篋よ��悟���篋���御��篁ヤ�����荀�腦�蕁�ず�恰��荐�������紊�"
 
 #. *< type
@@ -312,7 +388,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: plugins/filectl.c:248
+#: plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "��荐掩�����罅�筝㊧叱�ユ��篁や札�у�� Gaim��"
 
@@ -347,84 +424,92 @@
 "- 絎���絨������九�亥��荐���窪�恰�莉�\n"
 "- 絎���������絅遵��糸�ユ��鐚�腴��脂���坂���荐���畿篁���"
 
-#: plugins/gaimrc.c:40
+#: plugins/gaimrc.c:41
 msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr ""
+msgstr "羝御�蕁��"
 
 #: plugins/gaimrc.c:42
-#, fuzzy
+msgid "Secondary Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:43
 msgid "Hyperlink Color"
-msgstr "���蕁��"
-
-#: plugins/gaimrc.c:53
-#, fuzzy
+msgstr "顥��g�蕁��"
+
+#: plugins/gaimrc.c:58
 msgid "GtkTreeView Expander Size"
-msgstr "鎡�����ぇ絨�"
-
-#: plugins/gaimrc.c:72
-#, fuzzy
+msgstr "GtkTreeView絮�����ぇ絨�"
+
+#: plugins/gaimrc.c:59
+#, fuzzy
+msgid "GtkTreeView Expander Indentation"
+msgstr "GtkTreeView絮�����ぇ絨�"
+
+#: plugins/gaimrc.c:60
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+#: plugins/gaimrc.c:79
 msgid "Conversation Entry"
-msgstr "篋よ�"
-
-#: plugins/gaimrc.c:73
-#, fuzzy
+msgstr ""
+
+#: plugins/gaimrc.c:80
 msgid "Conversation History"
-msgstr "篋よ�"
-
-#: plugins/gaimrc.c:74
-#, fuzzy
+msgstr "篋よ�罩桁�"
+
+#: plugins/gaimrc.c:81
 msgid "Log Viewer"
-msgstr "�嶃�ヤ失����"
-
-#: plugins/gaimrc.c:75
-#, fuzzy
+msgstr "�ヨ�罟∵���"
+
+#: plugins/gaimrc.c:82
 msgid "Request Dialog"
-msgstr "荀�羆�筝���∈"
-
-#: plugins/gaimrc.c:76
-#, fuzzy
+msgstr ""
+
+#: plugins/gaimrc.c:83
 msgid "Notify Dialog"
-msgstr "���ョ┏蕁�"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
+msgstr ""
+
+#: plugins/gaimrc.c:286
+#, c-format
 msgid "Select Color for %s"
-msgstr "荐㊤���絖�蕁��"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
+msgstr "��%s�虁��蕁��"
+
+#: plugins/gaimrc.c:288
 msgid "Select Color"
-msgstr "頥㊤���絖�蕁��"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
+msgstr "�虁��蕁��"
+
+#: plugins/gaimrc.c:323
+#, c-format
 msgid "Select Font for %s"
-msgstr "�虁��絖���"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
+msgstr "��%s�御��絖���"
+
+#: plugins/gaimrc.c:361
 msgid "Select Interface Font"
-msgstr "�御��絖���"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
+msgstr "�御��篁��√���"
+
+#: plugins/gaimrc.c:419
 msgid "GTK+ Interface Font"
-msgstr "篁��∫�檎��"
-
-#: plugins/gaimrc.c:362
+msgstr "GTK+篁��√���"
+
+#: plugins/gaimrc.c:439
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: plugins/gaimrc.c:460
-#, fuzzy
+#: plugins/gaimrc.c:528
+#, c-format
+msgid "Write settings to %s/gtkrc-2.0"
+msgstr ""
+
+#: plugins/gaimrc.c:536
+msgid "Re-read gtkrc files"
+msgstr "���域���gtkrc罟�罅�"
+
+#: plugins/gaimrc.c:562
 msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim 罟�罅��у��"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgstr ""
+
+#: plugins/gaimrc.c:564
+#: plugins/gaimrc.c:565
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 
@@ -482,8 +567,11 @@
 
 # NOTE ���処⑮����腮宴��鐚����阪����茹d���篋阪��������罔∞���腮宴��
 #: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: plugins/gevolution/assoc-buddy.c:119
+#: src/gtkplugin.c:424
+#: src/gtkroomlist.c:572
+#: src/protocols/jabber/jabber.c:686
+#: src/protocols/msn/msn.c:1513
 msgid "Name"
 msgstr "��腮�"
 
@@ -501,14 +589,16 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: plugins/gevolution/assoc-buddy.c:353
+#: src/protocols/jabber/buddy.c:1357
+#: src/protocols/oscar/oscar.c:8198
 msgid "Search"
 msgstr "��絨�"
 
 #: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: plugins/gevolution/new_person_dialog.c:306
+#: src/gtkblist.c:4453
+#: src/gtkblist.c:4833
 msgid "Group:"
 msgstr "臂ょ�鐚�"
 
@@ -527,19 +617,14 @@
 #  NOTE 絨��� evolution PO 罟�箙�茘��鐚�荅活�筝��≪��Local Addressbook��罌�
 #. Add the label.
 #: plugins/gevolution/assoc-buddy.c:340
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"茫�緇�篏������������御��筝����g機篋削�絅醇������絅遵����峨サ鐚�篏�篋��札�御���医�筝����g機"
-"篋冴��"
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "茫�緇�篏������������御��筝����g機篋削�絅醇������絅遵����峨サ鐚�篏�篋��札�御���医�筝����g機篋冴��"
 
 # XXX ��⑮
 #. Add the expander
 #: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
 msgid "User _details"
-msgstr "�沿�鋎睡����膣亥�"
+msgstr "篏睡����膣亥� (_D)"
 
 # XXX ��⑮
 #. "Associate Buddy" button
@@ -547,16 +632,27 @@
 msgid "_Associate Buddy"
 msgstr "���絅遵� (_A)"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: plugins/gevolution/eds-utils.c:73
+#: plugins/gevolution/eds-utils.c:86
+#: src/protocols/jabber/jabber.c:1037
+#: src/protocols/yahoo/yahoo.c:2802
+msgid "None"
+msgstr "��"
+
+#: plugins/gevolution/gevo-util.c:64
+#: plugins/gevolution/gevolution.c:96
+#: src/blist.c:518
+#: src/blist.c:1275
+#: src/blist.c:1500
+#: src/gtkblist.c:4261
+#: src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "絅遵�"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
+#: plugins/gevolution/gevolution.c:262
+#: plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
-msgstr "�≧����肴�����"
+msgstr "�≧����咲�糸��灸散"
 
 #: plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
@@ -572,12 +668,11 @@
 msgstr "紜����育��荐���"
 
 #: plugins/gevolution/gevolution.c:290
-#, fuzzy
 msgid "Send E-Mail"
-msgstr "�糸��灸散"
+msgstr "�渇���糸��灸散"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Evolution �翫��荐㊤�"
 
@@ -585,11 +680,14 @@
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "茫��御���医�絅遵��渇�e江��絽活����"
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:450
+#: plugins/idle.c:112
+#: plugins/idle.c:147
+#: src/gtkpounce.c:1167
 msgid "Account"
 msgstr "絽活��"
 
@@ -599,7 +697,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:534
 msgid "Evolution Integration"
 msgstr "Evolution �翫��"
 
@@ -610,10 +708,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
+#: plugins/gevolution/gevolution.c:537
+#: plugins/gevolution/gevolution.c:539
 msgid "Provides integration with Evolution."
-msgstr "��箴��� Ximian Evolution ���翫����"
+msgstr "��箴��� Evolution ���翫����"
 
 #: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
@@ -628,7 +726,8 @@
 msgstr "絽活��蕁���鐚�"
 
 #: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
+#: src/gtkaccount.c:764
+msgid "Screen name:"
 msgstr "絽活��鐚�"
 
 #  NOTE �御���ц�荐�
@@ -638,8 +737,10 @@
 msgstr "�銀�莖�荐�鐚�"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: plugins/gevolution/new_person_dialog.c:337
+#: src/gtkaccount.c:407
+#: src/gtkaccount.c:429
+#: src/protocols/oscar/oscar.c:613
 msgid "Buddy Icon"
 msgstr "絅遵���腓�"
 
@@ -655,6 +756,25 @@
 msgid "E-mail:"
 msgstr "�糸��灸散鐚�"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gtk-signals-test.c:107
+msgid "GTK Signals Test"
+msgstr "GTK篆∴��羝��"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:110
+#: plugins/gtk-signals-test.c:112
+msgid "Test to see that all ui signals are working properly."
+msgstr "罟∽�ヤ戎����篁��∝����腮�拭�������処�醇③絽檎��篏���"
+
 #: plugins/history.c:146
 msgid "History Plugin Requires Logging"
 msgstr ""
@@ -663,8 +783,7 @@
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 
 #: plugins/history.c:186
@@ -677,12 +796,9 @@
 
 #: plugins/history.c:189
 msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
+"When a new conversation is opened this plugin will insert the last conversation into the current conversation.\n"
 "\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
+"The history plugin requires logging be enabled. Logging can be enabled from Tools -> Preferences -> Logging. Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 
 #. *< type
@@ -699,50 +815,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: plugins/iconaway.c:104
+#: plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "�����∫����鐚���絨��鎁遵�羝������篋よ�荀�腦���"
 
 #  NOTE ������叱�ユ�篏�綏�����罔�膠わ���綛上����������������吾�������
 #  FIXME 顑�����緇��拷��
-#: plugins/idle.c:115
+#: plugins/idle.c:116
 msgid "Minutes"
 msgstr "������"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: plugins/idle.c:123
+#: plugins/idle.c:156
+#: plugins/idle.c:222
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: plugins/idle.c:124
+#: plugins/idle.c:188
 msgid "Set Account Idle Time"
 msgstr "������ュ験������臀�����"
 
-#: plugins/idle.c:126
+#: plugins/idle.c:127
 msgid "_Set"
 msgstr "荐㊤�(_S)"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: plugins/idle.c:128
+#: plugins/idle.c:161
 msgid "_Cancel"
 msgstr "��羔�(_C)"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
+#: plugins/idle.c:141
+msgid "None of your accounts are idle."
+msgstr "����絽活���巡�����臀�������"
+
+#: plugins/idle.c:157
+#: plugins/idle.c:192
 msgid "Unset Account Idle Time"
-msgstr "������ュ験������臀�����"
-
-#: plugins/idle.c:153
-#, fuzzy
+msgstr "��羔�絽活����臀�����荐㊤�"
+
+#: plugins/idle.c:160
 msgid "_Unset"
-msgstr "篏睡��(_U)"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+msgstr "��羔�荐㊤�(_U)"
+
+#: plugins/idle.c:197
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "��羔�����綏臥��臀�験������臀�����"
+
+#: plugins/idle.c:224
+#: plugins/idle.c:225
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "��荐掩�������峨�ラ��臀�����鐚�筝�┃絎���臀��箙�����"
+msgstr "��荐掩������荐㊤���群��臀��紊�箙�����"
 
 #. *< type
 #. *< ui_requirement
@@ -752,25 +876,22 @@
 #. *< id
 #: plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
-msgstr "IPC 羝��絎∽�句�"
+msgstr "IPC 羝�����句�"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr "篁ュ��句�荳�蚕羝����篁句鎧腟援�� IPC ��叵��"
+msgstr "篁ョ���句�荳�蚕羝����篁句鎧腟援�� IPC ��叵��"
 
 # FIXME ��綽�荀�荀��檎��罧笈⑮��!!!
 # NOTE 茘����翫�� by Paladin
 # NOTE Patch by Kevin Leung
 #. *  description
 #: plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"篁ュ��句�荳�蚕羝��罔∞�膤紫輝�� IPC ��呃��恰���上�篌堺����─腟�緇��弱ü�����莠�����篁ゃ��"
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "篁ョ���句�荳�蚕羝��罔∞�膤紫輝�� IPC ��呃��恰���上�篌堺����─腟�緇��弱ü�����莠�����篁ゃ��"
 
 #. *< type
 #. *< ui_requirement
@@ -797,6 +918,108 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "篁ヤ失����昆篁醇謙荅�─腟�膤紫輝�� IPC ��呃��恰���莠�羝������ IPC ��篁ゃ��"
 
+#: plugins/log_reader.c:1403
+msgid "User is offline."
+msgstr "篏睡�������∝�����"
+
+#: plugins/log_reader.c:1409
+msgid "Auto-response sent:"
+msgstr "�����������削�"
+
+#: plugins/log_reader.c:1419
+#: plugins/log_reader.c:1422
+#, c-format
+msgid "%s logged out."
+msgstr "%s �糸�冴��"
+
+#: plugins/log_reader.c:1436
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: plugins/log_reader.c:1446
+#: src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "��群膓���罩∵��篌堺�������g���"
+
+#: plugins/log_reader.c:1454
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr ""
+
+#: plugins/log_reader.c:1469
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "�掩�守���育�桁墾筝���鐚���篁ヨ����≧����冴��"
+
+#: plugins/log_reader.c:1474
+msgid "Message could not be sent."
+msgstr "荐����≧����冴��"
+
+#. Add general preferences.
+#: plugins/log_reader.c:1908
+#, fuzzy
+msgid "General Log Reading Configuration"
+msgstr "羯�藜���篏�荐㊤�"
+
+#: plugins/log_reader.c:1912
+msgid "Fast size calculations"
+msgstr "綽���荐�膊��ヨ�紊у�"
+
+#: plugins/log_reader.c:1916
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: plugins/log_reader.c:1922
+#, fuzzy
+msgid "Log Directory"
+msgstr "��絨�(_S)鐚�"
+
+# #NOTE �号����plugins/log_reader.c#1971����荐�����ゆ�件���荅我����筝�腮��医�����荐���絎���
+#: plugins/log_reader.c:1926
+msgid "Adium"
+msgstr "Adium"
+
+#: plugins/log_reader.c:1930
+msgid "Fire"
+msgstr "Fire"
+
+#: plugins/log_reader.c:1934
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: plugins/log_reader.c:1938
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+# #NOTE �号����plugins/log_reader.c#1971����荐�����ゆ�件���荅我����筝�腮��医�����荐���絎���
+#: plugins/log_reader.c:1942
+msgid "Trillian"
+msgstr "Trillian"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/log_reader.c:1963
+#, fuzzy
+msgid "Log Reader"
+msgstr "�ヨ�罟∵���"
+
+#. *< name
+#. *< version
+#. * summary
+#: plugins/log_reader.c:1967
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "���ヨ��頳遵��賢�����銀��恰��荐������句��ヨ���"
+
+#. * description
+#: plugins/log_reader.c:1971
+msgid "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and Trillian."
+msgstr "�句�頳醇�ヨ���鐚�����罔∞������銀��恰��荐������句����ヨ�箙������俄���������� Adium��Fire��Messenger Plus!��MSN Messenger��篁ュ� Trillian��"
+
 #: plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "�灸散罟∽��"
@@ -809,34 +1032,53 @@
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "��ソ��羝����у��筝�絨�弻����蕁�ず����羃����育�灸散��"
 
+#: plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Mono 罔∞�莠��ュ��"
+
+#: plugins/mono/loader/mono.c:215
+#: plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "篏睡��Mono莅���.NET罔∞�"
+
+#. Configuration frame
+#: plugins/musicmessaging/musicmessaging.c:622
+#, fuzzy
+msgid "Music Messaging Configuration"
+msgstr "羯�藜���篏�荐㊤�"
+
+#: plugins/musicmessaging/musicmessaging.c:627
+msgid "_Apply"
+msgstr "絅���(_A)"
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: plugins/notify.c:639
 msgid "Notify For"
 msgstr "���ョ┏蕁�"
 
-#: plugins/notify.c:642
+#: plugins/notify.c:643
 msgid "_IM windows"
 msgstr "�恰��荐����腦�(_I)"
 
-#: plugins/notify.c:649
+#: plugins/notify.c:650
 msgid "C_hat windows"
 msgstr "��紊��腦�(_H)"
 
-#: plugins/notify.c:656
+#: plugins/notify.c:657
 msgid "_Focused windows"
 msgstr "���荀�腦�(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: plugins/notify.c:665
 msgid "Notification Methods"
 msgstr "���ユ�劫�"
 
-#: plugins/notify.c:671
+#: plugins/notify.c:672
 msgid "Prepend _string into window title:"
 msgstr "���ュ�筝峨�域�腦�罔�蕁�箙���(_S)鐚�"
 
 #. Count method button
-#: plugins/notify.c:690
+#: plugins/notify.c:691
 msgid "Insert c_ount of new messages into window title"
 msgstr "���ユ�域����悟���域�腦�罔�蕁�筝�(_O)"
 
@@ -844,43 +1086,43 @@
 # NOTE��URGENT��筝�絖�紊ф���荅俄���鐚����榊�紊у��悟��荀�腦�膊∞���♂�巡���呃���筝���綣��翫�����緇���
 # NOTE 茘����翫�� by Ambrose
 #. Urgent method button
-#: plugins/notify.c:698
+#: plugins/notify.c:699
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "荐㊤�荀�腦�����URGENT��鐚�膩��ヨ�荐�鐚���腓�(_U)"
 
 #. Raise window method button
-#: plugins/notify.c:706
+#: plugins/notify.c:707
 #, fuzzy
 msgid "R_aise conversation window"
 msgstr "�恰��荐���困茫�荀�腦�"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: plugins/notify.c:715
 msgid "Notification Removal"
 msgstr "���ョЩ��"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: plugins/notify.c:720
 msgid "Remove when conversation window _gains focus"
 msgstr "�銀困茫���緇�莠後�ョ�����腱脂�ら����(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: plugins/notify.c:727
 msgid "Remove when conversation window _receives click"
 msgstr "�銀困茫�荀�腦�茴���御��腱脂�ら����(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: plugins/notify.c:735
 msgid "Remove when _typing in conversation window"
 msgstr "�九��困茫�荀�腦�筝㊧叱�ユ��腱脂�ら����(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: plugins/notify.c:743
 msgid "Remove when a _message gets sent"
 msgstr "���肴����腱脂�ら����(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: plugins/notify.c:752
 msgid "Remove on switch to conversation ta_b"
 msgstr "�区�腦�罔�膠よ←藥��後�腱脂�ら����(_B)"
 
@@ -890,7 +1132,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: plugins/notify.c:842
 msgid "Message Notification"
 msgstr "荐�������"
 
@@ -898,7 +1140,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: plugins/notify.c:845
+#: plugins/notify.c:847
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "��箴�紊�腮��劫�箴����ユ�����������荐�����"
 
@@ -915,28 +1158,25 @@
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: plugins/perl/perl.c:589
+#: plugins/perl/perl.c:590
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�莅��� Perl 罔∞�����叵��"
 
 # TODO Untranslated
 # TODO 緇��荀�腦���Adobe�域;罘�薊���腮�綣��札�上�遺�����Raw����茘�� (篏���綽�篋�)
-#: plugins/raw.c:151
+#: plugins/raw.c:175
 msgid "Raw"
 msgstr ""
 
 # NOTE: ����茘���筝�羝�罐�鐚���筝��梧儀箴���������
-#: plugins/raw.c:153
+#: plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎��画���篏���"
 
-#: plugins/raw.c:154
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� Jabber��MSN��IRC �� TOC鐚��画�"
-"��篏�����叱�ユ�篏�莠後�ユ��篁わ��� Enter 緇��級���削��檎��莖�荐������ら���腦�蕁�ず��"
+#: plugins/raw.c:178
+msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� Jabber��MSN��IRC �� TOC鐚��画���篏�����叱�ユ�篏�莠後�ユ��篁わ��� Enter 緇��級���削��檎��莖�荐������ら���腦�蕁�ず��"
 
 # XXX ��⑮
 #: plugins/relnot.c:63
@@ -955,14 +1195,11 @@
 
 #: plugins/relnot.c:74
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"���札�延���膓峨��鐚���緇����亥�� Gaim %s ��鐚�<br><a href=\"http://gaim."
-"sourceforge.net/\">http://gaim.sourceforge.net</a>."
-
-#: plugins/relnot.c:78 plugins/relnot.c:79
+msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+msgstr "���札�延���膓峨��鐚���緇����亥�� Gaim %s ��鐚�<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+
+#: plugins/relnot.c:78
+#: plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "���亥����"
 
@@ -985,11 +1222,8 @@
 
 #. *  description
 #: plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"筝����ョ����羃����亥������筝��主憝��鐚�絨演���渇�e��荅牙���������処����篏級���ヤ戎������"
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "筝����ョ����羃����亥������筝��主憝��鐚�絨演���渇�e��荅牙���������処����篏級���ヤ戎������"
 
 #. *< type
 #. *< ui_requirement
@@ -997,7 +1231,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: plugins/signals-test.c:732
 msgid "Signals Test"
 msgstr "篆∴��羝��"
 
@@ -1005,7 +1239,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: plugins/signals-test.c:735
+#: plugins/signals-test.c:737
 msgid "Test to see that all signals are working properly."
 msgstr "罟∽�ュ��腮�拭�������処�醇③絽檎��篏���"
 
@@ -1023,55 +1258,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: plugins/simple.c:37
+#: plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "���羝������ぇ��蚕���沿タ�処�醇③絽檎��篏���"
 
-#: plugins/spellchk.c:1788
+#: plugins/spellchk.c:1800
 msgid "Duplicate Correction"
 msgstr ""
 
-#: plugins/spellchk.c:1789
+#: plugins/spellchk.c:1801
 msgid "The specified word already exists in the correction list."
 msgstr ""
 
-#: plugins/spellchk.c:1948
+#: plugins/spellchk.c:1981
 msgid "Text Replacements"
 msgstr "��絖���篁�"
 
-#: plugins/spellchk.c:1972
+#: plugins/spellchk.c:2005
 msgid "You type"
 msgstr "�倶��叱��"
 
-#: plugins/spellchk.c:1984
+#: plugins/spellchk.c:2017
 msgid "You send"
 msgstr "絨�������"
 
-#: plugins/spellchk.c:1996
+#: plugins/spellchk.c:2029
 msgid "Whole words only"
 msgstr ""
 
-#: plugins/spellchk.c:2022
+#: plugins/spellchk.c:2055
 msgid "Add a new text replacement"
 msgstr "���ヤ����亥����絖���篁h���"
 
-#: plugins/spellchk.c:2032
+#: plugins/spellchk.c:2065
 msgid "You _type:"
 msgstr "�倶��叱��(_T)鐚�"
 
-#: plugins/spellchk.c:2048
+#: plugins/spellchk.c:2081
 msgid "You _send:"
 msgstr "絨�������(_S)鐚�"
 
-#: plugins/spellchk.c:2060
+#: plugins/spellchk.c:2093
 msgid "Only replace _whole words"
 msgstr ""
 
-#: plugins/spellchk.c:2097
+#: plugins/spellchk.c:2130
 msgid "Text replacement"
 msgstr "��絖���篁�"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: plugins/spellchk.c:2132
+#: plugins/spellchk.c:2133
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "箴��т戎������絎�臂���荀��鋐���篁i���肴���賢����絖���"
 
@@ -1089,7 +1326,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: plugins/ssl/ssl-gnutls.c:230
+#: plugins/ssl/ssl-gnutls.c:232
 msgid "Provides SSL support through GNUTLS."
 msgstr "��� GNUTLS ��鋐� SSL ����叵��"
 
@@ -1107,7 +1345,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: plugins/ssl/ssl-nss.c:322
+#: plugins/ssl/ssl-nss.c:324
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "��� Mozilla �� NSS ��鋐� SSL ����叵��"
 
@@ -1125,21 +1364,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: plugins/ssl/ssl.c:97
+#: plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "�堺��� SSL ���恖�綺��箴�筝��� Wrapper��"
 
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s 綏牙��∫����"
-
 #: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s �演�∫��菴�����"
 
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:51
+#, c-format
+msgid "%s has gone away."
+msgstr "%s 綏牙��∫����"
+
+#: plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s 莅��雁�����咲��臀���"
@@ -1149,25 +1389,39 @@
 msgid "%s is no longer idle."
 msgstr "%s �演��臀������"
 
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s 綏牙��糸�ャ��"
+
+#: plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s 綏牙��糸�冴��"
+
+#: plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "篏�������"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "絅遵��∫��(_A)"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "絅遵���臀�(_I)"
 
+#: plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "絅遵��糸�ワ��糸�� (_S)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:139
 msgid "Buddy State Notification"
 msgstr "絅遵���������"
 
@@ -1175,17 +1429,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
+#: plugins/statenotify.c:142
+#: plugins/statenotify.c:145
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
 msgstr "��困茫�荀�腦�筝㊨¨腓阪ソ���∫�������演�∫��鐚���臀��菴��������ヨ�����"
 
 #: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 罔∞�莠��ュ��"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: plugins/tcl/tcl.c:365
+#: plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "��箴�莅��� Tcl 罔∞������"
 
@@ -1195,7 +1449,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:75
+#: plugins/ticker/ticker.c:324
 msgid "Buddy Ticker"
 msgstr "鎁遵�莊�薤���"
 
@@ -1203,19 +1458,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:327
+#: plugins/ticker/ticker.c:329
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "絅遵�羝�����羂翫抗�峨������"
 
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:198
 msgid "iChat Timestamp"
 msgstr "iChat �����活�"
 
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:205
 msgid "Delay"
 msgstr "綮狗��"
 
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:212
 msgid "minutes."
 msgstr "������"
 
@@ -1225,7 +1481,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: plugins/timestamp.c:275
 msgid "Timestamp"
 msgstr "�����活�"
 
@@ -1233,7 +1489,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: plugins/timestamp.c:278
+#: plugins/timestamp.c:280
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "罸�� N �������� iChat 馺��主�������活��遺困茫�筝㏍��"
 
@@ -1259,14 +1516,13 @@
 #: plugins/win32/transparency/win2ktrans.c:555
 #, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "�恰��荐����腦����嫜(_I)"
-
-# XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
+msgstr "�恰��荐����腦����嫜"
+
+# XXX ��荅我����W32腮�綣鋇㏍��絨�荀�腦�篆����惹��∽��筝�絮ゃ�����純��
 #: plugins/win32/transparency/win2ktrans.c:558
 #: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
 msgid "Always on top"
-msgstr "�咲��腟�絅遵���筝��ュ��"
+msgstr "膰醇������筝�絮�"
 
 #. Buddy List trans options
 #: plugins/win32/transparency/win2ktrans.c:590
@@ -1303,8 +1559,7 @@
 #: plugins/win32/transparency/win2ktrans.c:662
 #, fuzzy
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
@@ -1326,7 +1581,8 @@
 msgstr "�� Windows �����������決� Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: plugins/win32/winprefs/winprefs.c:405
+#: src/gtkblist.c:3498
 msgid "Buddy List"
 msgstr "絅遵�羝���"
 
@@ -1340,23 +1596,15 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "絨�絅遵�羝����腦�篆�������∝����筝�絮�(_K)"
 
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "緇�筝�"
-
-#: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
-msgid "Always"
-msgstr "�∫��"
-
 #. XXX: Did this ever work?
 #: plugins/win32/winprefs/winprefs.c:415
 msgid "Only when docked"
 msgstr ""
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: plugins/win32/winprefs/winprefs.c:419
+#: src/gtkprefs.c:812
+#: src/gtkprefs.c:1745
 msgid "Conversations"
 msgstr "篋よ�"
 
@@ -1374,169 +1622,221 @@
 msgstr "Windows Gaim ���檎���檎����"
 
 #: plugins/win32/winprefs/winprefs.c:446
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
+msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
 msgstr ""
 
 #: src/account.c:773
-#, fuzzy
 msgid "accounts"
 msgstr "絽活��羝���"
 
-#: src/account.c:915
-#, fuzzy
+#: src/account.c:923
 msgid "Password is required to sign on."
-msgstr "絲�腆弱群����"
-
-#: src/account.c:940
+msgstr "�糸�ユ����荀�絲�腆若��"
+
+#: src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "莠後�� %s (%s) ��絲�腆�"
 
-#: src/account.c:947
-#, fuzzy
+#: src/account.c:955
 msgid "Enter Password"
-msgstr "篆��劫�腆�"
-
-#: src/account.c:952
-#, fuzzy
+msgstr "莠後�ュ�腆�"
+
+#: src/account.c:960
 msgid "Save password"
-msgstr "�医�腆�"
+msgstr "�峨�絲�腆�"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: src/account.c:968
+#: src/account.c:1139
+#: src/gtkdialogs.c:545
+#: src/gtkdialogs.c:682
+#: src/gtkdialogs.c:750
+#: src/gtkrequest.c:287
+#: src/protocols/gg/gg.c:463
+#: src/protocols/gg/gg.c:604
+#: src/protocols/gg/gg.c:740
+#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:250
+#: src/protocols/msn/msn.c:265
+#: src/protocols/msn/msn.c:280
+#: src/protocols/msn/msn.c:295
+#: src/protocols/oscar/oscar.c:2890
+#: src/protocols/oscar/oscar.c:4392
+#: src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:7927
+#: src/protocols/oscar/oscar.c:8052
+#: src/protocols/oscar/oscar.c:8077
+#: src/protocols/oscar/oscar.c:8129
+#: src/protocols/silc/buddy.c:466
+#: src/protocols/silc/buddy.c:1147
+#: src/protocols/silc/chat.c:423
+#: src/protocols/silc/chat.c:461
+#: src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1297
+#: src/protocols/silc/ops.c:1910
+#: src/protocols/silc/silc.c:739
+#: src/protocols/yahoo/yahoo.c:2987
+#: src/protocols/yahoo/yahoo.c:2996
+#: src/request.h:1340
 msgid "OK"
 msgstr "腆阪�"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: src/account.c:969
+#: src/account.c:1140
+#: src/account.c:1178
+#: src/gtkaccount.c:2155
+#: src/gtkaccount.c:2626
+#: src/gtkblist.c:4874
+#: src/gtkdialogs.c:546
+#: src/gtkdialogs.c:683
+#: src/gtkdialogs.c:751
+#: src/gtkdialogs.c:770
+#: src/gtkdialogs.c:792
+#: src/gtkdialogs.c:812
+#: src/gtkdialogs.c:856
+#: src/gtkdialogs.c:918
+#: src/gtkdialogs.c:960
+#: src/gtkdialogs.c:1002
+#: src/gtkimhtmltoolbar.c:419
+#: src/gtkpounce.c:1000
+#: src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608
+#: src/gtkprivacy.c:633
+#: src/gtkprivacy.c:644
+#: src/gtkrequest.c:288
+#: src/gtksavedstatuses.c:298
+#: src/protocols/gg/gg.c:464
+#: src/protocols/gg/gg.c:605
+#: src/protocols/gg/gg.c:741
+#: src/protocols/gg/gg.c:830
+#: src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:1358
+#: src/protocols/jabber/buddy.c:1392
+#: src/protocols/jabber/chat.c:780
+#: src/protocols/jabber/jabber.c:755
+#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:281
+#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:313
+#: src/protocols/oscar/oscar.c:1584
+#: src/protocols/oscar/oscar.c:2891
+#: src/protocols/oscar/oscar.c:4350
+#: src/protocols/oscar/oscar.c:4393
+#: src/protocols/oscar/oscar.c:4430
+#: src/protocols/oscar/oscar.c:4474
+#: src/protocols/oscar/oscar.c:7928
+#: src/protocols/oscar/oscar.c:8053
+#: src/protocols/oscar/oscar.c:8078
+#: src/protocols/oscar/oscar.c:8130
+#: src/protocols/oscar/oscar.c:8199
+#: src/protocols/sametime/sametime.c:3338
+#: src/protocols/sametime/sametime.c:3421
+#: src/protocols/sametime/sametime.c:3548
+#: src/protocols/sametime/sametime.c:4392
+#: src/protocols/sametime/sametime.c:5394
+#: src/protocols/sametime/sametime.c:5480
+#: src/protocols/silc/buddy.c:467
+#: src/protocols/silc/buddy.c:1043
+#: src/protocols/silc/buddy.c:1148
+#: src/protocols/silc/chat.c:596
+#: src/protocols/silc/chat.c:725
+#: src/protocols/silc/ops.c:1911
+#: src/protocols/silc/silc.c:740
+#: src/protocols/silc/silc.c:945
+#: src/protocols/yahoo/yahoo.c:2988
+#: src/protocols/yahoo/yahoo.c:2997
+#: src/request.h:1340
+#: src/request.h:1350
 msgid "Cancel"
 msgstr "��羔�"
 
-#: src/account.c:986 src/connection.c:96
+#: src/account.c:994
+#: src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "�鞘��� %s ����絎�罔∞�"
 
-#: src/account.c:988 src/connection.c:99
+#: src/account.c:996
+#: src/connection.c:99
 msgid "Connection Error"
 msgstr "�g����"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: src/account.c:1076
+#: src/protocols/gg/gg.c:645
+#: src/protocols/jabber/jabber.c:1170
 msgid "New passwords do not match."
 msgstr "�医�腆寂研筝��悟���"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/account.c:1061
+#: src/account.c:1085
 msgid "Fill out all fields completely."
 msgstr "茫�紂�Ε�岩蚕茵��惹������罨�篏���"
 
-#: src/account.c:1085
+#: src/account.c:1108
 msgid "Original password"
 msgstr "��絲�腆�"
 
-#: src/account.c:1092
+#: src/account.c:1115
 msgid "New password"
 msgstr "�医�腆�"
 
-#: src/account.c:1099
+#: src/account.c:1122
 msgid "New password (again)"
 msgstr "�医�腆種���罨∞∈茯�鐚�"
 
-#: src/account.c:1105
+#: src/account.c:1128
 #, c-format
 msgid "Change password for %s"
 msgstr "篆��� %s ��絲�腆�"
 
-#: src/account.c:1113
+#: src/account.c:1136
 msgid "Please enter your current password and your new password."
 msgstr "茫�莠後�ユ��������絲�腆寂札��絽���篏睡�����医�腆若��"
 
-#: src/account.c:1146
+#: src/account.c:1169
 #, c-format
 msgid "Change user information for %s"
 msgstr "�贋�� %s ����篋肴�荐�"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
+#: src/account.c:1177
+#: src/gtkdebug.c:684
+#: src/gtkrequest.c:294
 #: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "�峨�"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: src/account.c:1672
+#: src/gtkft.c:157
+#: src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:1083
+#: src/protocols/jabber/buddy.c:1100
+#: src/protocols/novell/novell.c:2861
 msgid "Unknown"
 msgstr "����"
 
 #: src/blist.c:545
-#, fuzzy
 msgid "buddy list"
 msgstr "絅遵�羝���"
 
-#: src/blist.c:1162
+#: src/blist.c:1178
 msgid "Chats"
 msgstr "��紊�"
 
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
-"%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�鐚�絅刻���絨�����絽活��筝�����糸�ャ������絅�"
-"����臂ょ�羃���茴�Щ�ゃ��\n"
-msgstr[1] ""
-"%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��筝�����糸�ャ����篋�絅遵���"
-"臂ょ�羃���茴�Щ�ゃ��\n"
-
-#: src/blist.c:1872
+#: src/blist.c:1881
+#, c-format
+msgid "%d buddy from group %s was not removed because its account was not logged in.  This buddy and the group were not removed.\n"
+msgid_plural "%d buddies from group %s were not removed because their accounts were not logged in.  These buddies and the group were not removed.\n"
+msgstr[0] "%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�鐚�絅刻���絨�����絽活��筝�����糸�ャ������絅遵���臂ょ�羃���茴�Щ�ゃ��\n"
+msgstr[1] "%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��筝�����糸�ャ����篋�絅遵���臂ょ�羃���茴�Щ�ゃ��\n"
+
+#: src/blist.c:1890
 msgid "Group not removed"
 msgstr "臂ょ���←腱脂��"
 
@@ -1544,21 +1844,31 @@
 msgid "Registration Error"
 msgstr "荐糸�����"
 
-#: src/conversation.c:205
-#, fuzzy
+#: src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s �糸��"
+
+#: src/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s �糸��"
+
+#: src/conversation.c:196
 msgid "Unable to send message: The message is too large."
-msgstr "�≧����肴���������荐���お紊т���"
-
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
+msgstr "�≧����肴��������荐���お紊т���"
+
+#: src/conversation.c:199
+#: src/conversation.c:212
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "�≧����肴����� %s鐚�"
+msgstr "�≧����肴���畿 %s��"
+
+#: src/conversation.c:200
+msgid "The message is too large."
+msgstr "����荐���お紊т���"
 
 #: src/conversation.c:209
-msgid "The message is too large."
-msgstr "����荐���お紊т���"
-
-#: src/conversation.c:218
 msgid "Unable to send message."
 msgstr "�≧����肴�����"
 
@@ -1567,7 +1877,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1497
+#: src/conversation.c:1503
 #, c-format
 msgid "%s entered the room."
 msgstr "%s �峨�ヨ��紊����"
@@ -1577,42 +1887,49 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1499
+#: src/conversation.c:1505
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] �峨�ヨ��紊����"
 
-#: src/conversation.c:1598
+#: src/conversation.c:1608
 #, c-format
 msgid "You are now known as %s"
 msgstr "篏��壕��援┗�� %s"
 
-#: src/conversation.c:1613
+#: src/conversation.c:1623
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �壕��援┗�� %s"
 
-#: src/conversation.c:1669
+#: src/conversation.c:1679
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s �∫����紊�� (%s)��"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1681
 #, c-format
 msgid "%s left the room."
 msgstr "%s �∫����紊����"
 
-#: src/conversation.c:1748
+#: src/conversation.c:1758
 #, c-format
 msgid "(+%d more)"
 msgstr "鐚�篁ュ���� %d ��鐚�"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1760
 #, c-format
 msgid " left the room (%s)."
 msgstr " �∫����紊�� (%s)��"
 
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+# NOTE ��⑮鐚���荐掩���銀��靸�
+#: src/desktopitem.c:286
+#: src/desktopitem.c:875
+msgid "No name"
+msgstr "���遵��"
+
+#: src/ft.c:189
+#: src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1621,7 +1938,7 @@
 "莅��� %s ��筝㊦�主��篋����鐚�\n"
 "%s��\n"
 
-#: src/ft.c:192
+#: src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1630,7 +1947,7 @@
 "絲��� %s ��筝㊦�主��篋����鐚�\n"
 "%s��\n"
 
-#: src/ft.c:196
+#: src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1639,36 +1956,36 @@
 "絖��� %s ��筝㊦�主��篋����鐚�\n"
 "%s��\n"
 
-#: src/ft.c:229
+#: src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "�≧��渇��腥榊��罟�罅���"
 
-#: src/ft.c:239
+#: src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "�≧��渇��������"
 
-#: src/ft.c:248
+#: src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 筝�������罅�鐚���罩や���荀���絎���\n"
 
-#: src/ft.c:306
+#: src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s �活��� %s (%s) 腟���"
 
-#: src/ft.c:313
+#: src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s �活��渇����罟�罅�腟���"
 
-#: src/ft.c:354
+#: src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "�ュ�箴����若��%s����罟�罅��活叱荀�羆����"
 
 #  XXX ��⑮
-#: src/ft.c:358
+#: src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1679,65 +1996,65 @@
 "��腴�源罘���鐚�%s\n"
 "��腴���荐���鐚�%d"
 
-#: src/ft.c:382
+#: src/ft.c:383
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s ���阪�渇��罟�罅���%s��"
 
-#: src/ft.c:422
+#: src/ft.c:427
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 筝������������罟�罅���腮宴��\n"
 
-#: src/ft.c:443
+#: src/ft.c:448
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "�� %2$s ���阪�渇�� %1$s 筝�"
 
-#: src/ft.c:454
-#, fuzzy, c-format
+#: src/ft.c:459
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "�ュ�箴����若��%s����罟�罅��活叱荀�羆����"
-
-#: src/ft.c:608
+msgstr "��紮��� %2$s �渇�� %1$s"
+
+#: src/ft.c:613
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "罟�罅� %s �渇��絎���"
 
-#: src/ft.c:611
+#: src/ft.c:616
 msgid "File transfer complete"
 msgstr "罟�罅��活叱絎���"
 
-#: src/ft.c:995
+#: src/ft.c:1000
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "篏���羔�篋� %s ���渇��"
 
-#: src/ft.c:1000
+#: src/ft.c:1005
 msgid "File transfer cancelled"
 msgstr "罟�罅��活叱綏峨�羔�"
 
-#: src/ft.c:1057
+#: src/ft.c:1062
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ��羔�篋� %s ���渇��"
 
-#: src/ft.c:1062
+#: src/ft.c:1067
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ��羔�篋�罟�罅��活叱"
 
-#: src/ft.c:1119
-#, fuzzy, c-format
+#: src/ft.c:1124
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "�渇��罟�罅��� %s 茴��羔���\n"
-
-#: src/ft.c:1121
-#, fuzzy, c-format
+msgstr "�渇��罟�罅��� %s 紊掩����"
+
+#: src/ft.c:1126
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "�� %s �渇��罟�罅�茴��羔���\n"
-
-#: src/gtkaccount.c:362
+msgstr "�� %s �渇��罟�罅�紊掩����"
+
+#: src/gtkaccount.c:357
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1749,405 +2066,412 @@
 "<b>���鎞阪�鐚�</b> %d�%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: src/gtkaccount.c:742
 msgid "Login Options"
 msgstr "�糸�ラ�檎��"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: src/gtkaccount.c:759
+#: src/gtkft.c:639
 msgid "Protocol:"
 msgstr "��荐���絎�鐚�"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "絽活��鐚�"
-
-#: src/gtkaccount.c:825
+#: src/gtkaccount.c:838
 msgid "Password:"
 msgstr "絲�腆種�"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: src/gtkaccount.c:843
+#: src/gtkblist.c:4436
+#: src/gtkblist.c:4818
 msgid "Alias:"
 msgstr "�ュ��鐚�"
 
-#: src/gtkaccount.c:834
+#: src/gtkaccount.c:847
 msgid "Remember password"
 msgstr "荐�篏鎛�腆�"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: src/gtkaccount.c:899
 msgid "User Options"
 msgstr "篏睡��������檎��"
 
-#: src/gtkaccount.c:892
+#: src/gtkaccount.c:912
 msgid "New mail notifications"
 msgstr "�育�灸散����"
 
-#: src/gtkaccount.c:901
+#: src/gtkaccount.c:921
 msgid "Buddy icon:"
 msgstr "絅遵���腓削�"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: src/gtkaccount.c:1012
 #, c-format
 msgid "%s Options"
 msgstr "%s �檎��"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: src/gtkaccount.c:1213
 msgid "Use Global Proxy Settings"
 msgstr "篏睡��������篁g��篌堺����┃絎�"
 
 # NOTE ��札��篁g��篌堺�����罸�����
 # NOTE 薤�羝���������罸�����鐚�篏�茗���茯���罸�������筝�����鐚���筝�篏睡����莠�絅�
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: src/gtkaccount.c:1219
 msgid "No Proxy"
 msgstr "筝�篏睡��撮��篌堺����"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: src/gtkaccount.c:1225
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: src/gtkaccount.c:1231
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: src/gtkaccount.c:1237
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: src/gtkaccount.c:1243
+#: src/gtkprefs.c:1032
 msgid "Use Environmental Settings"
 msgstr "篏睡���医�莅��梧┃絎�"
 
-#: src/gtkaccount.c:1249
+#: src/gtkaccount.c:1277
 msgid "you can see the butterflies mating"
 msgstr "藉�藉��頑�銀���緇�荀���"
 
-#: src/gtkaccount.c:1253
+#: src/gtkaccount.c:1281
 msgid "If you look real closely"
 msgstr "絋�������緇�紊�篁�膣�"
 
-#: src/gtkaccount.c:1269
+#: src/gtkaccount.c:1297
 msgid "Proxy Options"
 msgstr "篁g��篌堺�����檎��"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: src/gtkaccount.c:1311
+#: src/gtkprefs.c:1026
 msgid "Proxy _type:"
 msgstr "篁g��篌堺��������(_T)鐚�"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: src/gtkaccount.c:1320
+#: src/gtkprefs.c:1047
 msgid "_Host:"
 msgstr "筝紙�篏���(_H)鐚�"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: src/gtkaccount.c:1324
+#: src/gtkprefs.c:1065
 msgid "_Port:"
 msgstr "��荐���(_P)鐚�"
 
-#: src/gtkaccount.c:1308
+#: src/gtkaccount.c:1332
 msgid "_Username:"
 msgstr "篏睡����(_U)鐚�"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: src/gtkaccount.c:1338
+#: src/gtkprefs.c:1102
 msgid "Pa_ssword:"
 msgstr "絲�腆�(_S)鐚�"
 
-#: src/gtkaccount.c:1700
+#: src/gtkaccount.c:1716
 msgid "Add Account"
 msgstr "�医�絽活��"
 
-#: src/gtkaccount.c:1702
+#: src/gtkaccount.c:1718
 msgid "Modify Account"
 msgstr "篆��劫験��"
 
+#: src/gtkaccount.c:1740
+msgid "_Basic"
+msgstr "�堺��┃絎�(_B)"
+
+#: src/gtkaccount.c:1751
+msgid "_Advanced"
+msgstr "�臥��┃絎�(_A)"
+
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1766
+#: src/protocols/jabber/jabber.c:754
 msgid "Register"
 msgstr "荐糸��"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: src/gtkaccount.c:2149
+#: src/gtksavedstatuses.c:295
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "��∈絎�荀����� %s鐚�"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: src/gtkaccount.c:2154
+#: src/gtkpounce.c:999
+#: src/gtkrequest.c:291
+#: src/gtksavedstatuses.c:297
 msgid "Delete"
 msgstr "����"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: src/gtkaccount.c:2212
+#: src/gtksavedstatuses.c:873
+#: src/protocols/oscar/oscar.c:5037
 msgid "Screen Name"
 msgstr "絽活��"
 
-#: src/gtkaccount.c:2210
-#, fuzzy
-msgid "Enabled"
-msgstr "紊掩��"
-
-#: src/gtkaccount.c:2218
+#: src/gtkaccount.c:2243
 msgid "Protocol"
 msgstr "��荐���絎�"
 
-#: src/gtkaccount.c:2550
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+#: src/gtkaccount.c:2574
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ���ヤ� %s �坂�鐚�絅刻���絅遵� %s%s%s"
 
-#: src/gtkaccount.c:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
-
-#: src/gtkaccount.c:2572
+#: src/gtkaccount.c:2623
 msgid "Add buddy to your list?"
 msgstr "絨�篏睡�������ユ����絅遵�羝����"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: src/gtkaccount.c:2625
+#: src/gtkblist.c:4873
+#: src/gtkconv.c:1574
+#: src/gtkrequest.c:292
+#: src/protocols/gg/gg.c:829
+#: src/protocols/oscar/oscar.c:4662
+#: src/protocols/sametime/sametime.c:5479
+#: src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "����"
 
 # TODO ��莎隙���荅牙�阪��筝����亥����紊��鐚�筝�����紊��罩檎��井����臂ょ���
 # NOTE 茘����翫�� by Paladin
-#: src/gtkblist.c:595
+#: src/gtkblist.c:662
 msgid "Join a Chat"
 msgstr "���ヨ��紊��"
 
-#: src/gtkblist.c:616
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+#: src/gtkblist.c:683
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "茫�莠後�ラ���惹�����喝���ュソ��羝�������紊�������区�荐���\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:694
+#: src/gtkpounce.c:500
+#: src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "絽活��(_A)鐚�"
 
-#: src/gtkblist.c:935
+#: src/gtkblist.c:1002
 msgid "Get _Info"
 msgstr "��緇�莖�荐�(_I)"
 
-#: src/gtkblist.c:938
+#: src/gtkblist.c:1005
 msgid "I_M"
 msgstr "�恰��荐���(_M)"
 
-#: src/gtkblist.c:944
+#: src/gtkblist.c:1011
 msgid "_Send File"
 msgstr "�渇��罟�罅�(_S)"
 
-#: src/gtkblist.c:950
+#: src/gtkblist.c:1019
+msgid "Start _Voice Chat"
+msgstr "����茯��活��紊�"
+
+#: src/gtkblist.c:1025
 msgid "Add Buddy _Pounce"
 msgstr "���ュソ����������(_P)"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: src/gtkblist.c:1029
+#: src/gtkblist.c:1033
+#: src/gtkblist.c:1131
+#: src/gtkblist.c:1154
 msgid "View _Log"
 msgstr "茹����ヨ�(_L)"
 
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "�咲����絅遵���筝��ュ��(_A)..."
-
-# XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "腱脂�ら����絅遵�(_R)"
-
-# XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "�咲��腟�絅遵���筝��ュ��..."
-
-# XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "腱脂�ら��腟�絅遵�"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: src/gtkblist.c:1044
+msgid "Alias..."
+msgstr "�ュ��..."
+
+#: src/gtkblist.c:1047
+#: src/gtkconv.c:1571
+#: src/gtkrequest.c:293
+msgid "Remove"
+msgstr "腱脂��"
+
+#: src/gtkblist.c:1053
+#: src/gtkblist.c:1139
+#: src/gtkblist.c:1160
 msgid "_Alias..."
 msgstr "�ュ��(_A)..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: src/gtkblist.c:1055
+#: src/gtkblist.c:1141
+#: src/gtkblist.c:1162
 msgid "_Remove"
 msgstr "腱脂��(_R)"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1102
 msgid "Add a _Buddy"
 msgstr "�医�筝���絅遵�(_B)"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1104
 msgid "Add a C_hat"
 msgstr "�医�筝�����紊��(_H)"
 
-#: src/gtkblist.c:1032
+#: src/gtkblist.c:1107
 msgid "_Delete Group"
 msgstr "���ょ召腟�(_D)"
 
-#: src/gtkblist.c:1034
+#: src/gtkblist.c:1109
 msgid "_Rename"
 msgstr "���遵��(_R)"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: src/gtkblist.c:1127
+#: src/gtkroomlist.c:264
+#: src/gtkroomlist.c:409
+#: src/gtkstock.c:139
 msgid "_Join"
 msgstr "����(_J)"
 
-#: src/gtkblist.c:1054
+#: src/gtkblist.c:1129
 msgid "Auto-Join"
 msgstr "��������"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: src/gtkblist.c:1167
+#: src/gtkblist.c:1190
 msgid "_Collapse"
 msgstr "�区儀(_C)"
 
-#: src/gtkblist.c:1120
+#: src/gtkblist.c:1195
 msgid "_Expand"
 msgstr "絮���(_E)"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
-#, fuzzy
+#: src/gtkblist.c:1426
+#: src/gtkblist.c:1436
+#: src/gtkblist.c:3668
+#: src/gtkblist.c:3673
 msgid "/Tools/Mute Sounds"
-msgstr "����"
+msgstr "/綏ュ��/����"
 
 # XXX ��⑮
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: src/gtkblist.c:1895
+#: src/gtkconv.c:3909
+#: src/gtkpounce.c:399
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "��研���糸�ヤ算篏�筝���������医�����絅遵�����荐���絎���"
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2460
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2461
 msgid "/Buddies/New Instant _Message..."
 msgstr "/絅遵�/�医�恰��荐���(_M)"
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2462
 msgid "/Buddies/Join a _Chat..."
 msgstr "/絅遵�/���ヨ��紊��(_C)"
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2463
 msgid "/Buddies/Get User _Info..."
 msgstr "/絅遵�/��緇�篏睡����莖�荐�(_I)..."
 
 #  NOTE 罩よ��茘���莅�����篌寂�莠�����緇���絅巡�藥�
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2464
 msgid "/Buddies/View User _Log..."
 msgstr "/絅遵�/莅���篏睡�����ヨ�(_L)..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2466
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�(_O)"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2467
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊�順��臂ょ�(_E)"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: src/gtkblist.c:2468
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/絅遵�/蕁�ず�∝�絅遵�"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
-msgid "/Buddies/Sort Buddies"
-msgstr "/絅遵�/蕁�ず�∝�絅遵�"
-
-#: src/gtkblist.c:2340
+msgstr "/絅遵�/蕁�ず絅遵�膣亥�(_D)"
+
+#: src/gtkblist.c:2469
+msgid "/Buddies/_Sort Buddies"
+msgstr "/絅遵�/絅遵�羝����綺�(_S)"
+
+#: src/gtkblist.c:2471
 msgid "/Buddies/_Add Buddy..."
 msgstr "/絅遵�/�医�絅遵�(_A)..."
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2472
 msgid "/Buddies/Add C_hat..."
 msgstr "/絅遵�/�医���紊��(_H)..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2473
 msgid "/Buddies/Add _Group..."
 msgstr "/絅遵�/�医�臂ょ�(_G)..."
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2475
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�/腟���腮�綣�(_Q)"
 
+#. Accounts menu
+#: src/gtkblist.c:2478
+msgid "/_Accounts"
+msgstr "/絽活��(_A)"
+
+#: src/gtkblist.c:2479
+#: src/gtkblist.c:5453
+msgid "/Accounts/Add\\/Edit"
+msgstr "/絽活��(_A)/�医�\\/膩�鹿"
+
 #. Tools
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2482
 msgid "/_Tools"
 msgstr "綏ュ��(_T)"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
+#: src/gtkblist.c:2483
+msgid "/Tools/Buddy _Pounces"
 msgstr "/綏ュ��/絅遵���������(_P)"
 
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/綏ュ��/絽活���檎����篁�(_T)"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/綏ュ��/絽活��羝���(_C)"
-
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2484
+msgid "/Tools/Plu_gins"
+msgstr "/綏ュ��/罔∞�(_G)"
+
+#: src/gtkblist.c:2485
 msgid "/Tools/Pr_eferences"
 msgstr "/綏ュ��/�鎁処┃絎�(_E)"
 
-#: src/gtkblist.c:2353
-#, fuzzy
-msgid "/Tools/Plu_gins"
-msgstr "/綏ュ��/罔∞��檎����篁�"
-
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2486
 msgid "/Tools/Pr_ivacy"
 msgstr "/綏ュ��/�援�荐㊤�(_I)"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2488
 msgid "/Tools/_File Transfers"
 msgstr "/綏ュ��/罟�罅��活叱(_F)"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2489
 msgid "/Tools/R_oom List"
 msgstr "/綏ュ��/��紊��羝���(_O)"
 
-#: src/gtkblist.c:2358
-#, fuzzy
+#: src/gtkblist.c:2490
+msgid "/Tools/System _Log"
+msgstr "/綏ュ��/膤紫輝�ヨ�(_L)"
+
+#: src/gtkblist.c:2492
 msgid "/Tools/Mute _Sounds"
-msgstr "����"
-
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "茹���膤紫輝�ヨ�(_L)"
+msgstr "/綏ュ��/����(_S)"
 
 #. Help
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2495
 msgid "/_Help"
 msgstr "茯���(_H)"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2496
 msgid "/Help/Online _Help"
 msgstr "膩�筝�茯���(_H)"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2497
 msgid "/Help/_Debug Window"
 msgstr "/茯���/�ら���腦�(_D)"
 
-#: src/gtkblist.c:2365
+#: src/gtkblist.c:2498
 msgid "/Help/_About"
 msgstr "/茯���/����(_A)"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: src/gtkblist.c:2530
+#: src/gtkblist.c:2597
 #, c-format
 msgid ""
 "\n"
@@ -2156,7 +2480,7 @@
 "\n"
 "<b>絽活��鐚�</b>%s"
 
-#: src/gtkblist.c:2473
+#: src/gtkblist.c:2606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2165,43 +2489,43 @@
 "\n"
 "<b>�ュ��鐚�</b>"
 
-#: src/gtkblist.c:2481
-#, fuzzy, c-format
+#: src/gtkblist.c:2614
+#, c-format
 msgid ""
 "\n"
 "<b>Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>�ュ��鐚�</b>"
-
-#: src/gtkblist.c:2489
-#, fuzzy, c-format
+"<b>�ュ��鐚�</b>%s"
+
+#: src/gtkblist.c:2622
+#, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
 msgstr ""
 "\n"
-"<b>�援┗鐚�</b>"
-
-#: src/gtkblist.c:2498
-#, fuzzy, c-format
+"<b>�援┗鐚�</b>%s"
+
+#: src/gtkblist.c:2631
+#, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
 msgstr ""
 "\n"
-"<b>�糸�ユ����鐚�</b>"
-
-#: src/gtkblist.c:2510
-#, fuzzy, c-format
+"<b>�糸�ユ����鐚�</b>%s"
+
+#: src/gtkblist.c:2643
+#, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
 msgstr ""
 "\n"
-"<b>��臀��</b>"
-
-#: src/gtkblist.c:2546
+"<b>��臀��</b>%s"
+
+#: src/gtkblist.c:2678
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2210,7 +2534,7 @@
 "\n"
 "<b>%s鐚�</b>%s"
 
-#: src/gtkblist.c:2554
+#: src/gtkblist.c:2686
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2218,7 +2542,7 @@
 "\n"
 "<b>����鐚�</b>�∝�"
 
-#: src/gtkblist.c:2577
+#: src/gtkblist.c:2709
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2226,7 +2550,7 @@
 "\n"
 "<b>篁�膣刻�</b>綛初��篌主��"
 
-#: src/gtkblist.c:2579
+#: src/gtkblist.c:2711
 #, fuzzy
 msgid ""
 "\n"
@@ -2235,7 +2559,7 @@
 "\n"
 "<b>����鐚�</b>���怨��"
 
-#: src/gtkblist.c:2581
+#: src/gtkblist.c:2713
 #, fuzzy
 msgid ""
 "\n"
@@ -2244,188 +2568,287 @@
 "\n"
 "<b>����鐚�</b>���怨��"
 
-#: src/gtkblist.c:2843
+#: src/gtkblist.c:2981
 #, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
+msgid "Idle %dh %02dm"
 msgstr "��臀��%d 絨�� %02d ����"
 
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
+#: src/gtkblist.c:2983
+#, fuzzy, c-format
+msgid "Idle %dm"
 msgstr "��臀��%d ��鐚�"
 
-#: src/gtkblist.c:2848
-msgid "Idle "
-msgstr "��臀� "
-
-#: src/gtkblist.c:2852
+#: src/gtkblist.c:2986
+#: src/protocols/bonjour/bonjour.c:323
+#: src/protocols/msn/msn.c:554
+#: src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2855
+#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/yahoo/yahoo.c:2660
+#: src/protocols/yahoo/yahoo_profile.c:660
+msgid "Idle"
+msgstr "��臀�"
+
+#: src/gtkblist.c:2990
 msgid "Offline "
 msgstr "�∝� "
 
-#: src/gtkblist.c:2968
-#, fuzzy
+#: src/gtkblist.c:3108
 msgid "/Buddies/New Instant Message..."
-msgstr "/絅遵�/�医�恰��荐���(_M)"
-
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+msgstr "/絅遵�/�医�恰��荐���..."
+
+#: src/gtkblist.c:3109
+#: src/gtkblist.c:3142
 msgid "/Buddies/Join a Chat..."
 msgstr "/絅遵�/���ヨ��紊��(_C)..."
 
-#: src/gtkblist.c:2970
-#, fuzzy
+#: src/gtkblist.c:3110
 msgid "/Buddies/Get User Info..."
-msgstr "/絅遵�/��緇�篏睡����莖�荐�(_I)..."
-
-#: src/gtkblist.c:2971
-#, fuzzy
+msgstr "/絅遵�/��緇�篏睡����莖�荐�..."
+
+#: src/gtkblist.c:3111
 msgid "/Buddies/Add Buddy..."
-msgstr "/絅遵�/�医�絅遵�(_A)..."
-
-#: src/gtkblist.c:2972
-#, fuzzy
+msgstr "/絅遵�/�医�絅遵�..."
+
+#: src/gtkblist.c:3112
+#: src/gtkblist.c:3145
 msgid "/Buddies/Add Chat..."
-msgstr "/絅遵�/�医���紊��(_H)..."
-
-#: src/gtkblist.c:2973
-#, fuzzy
+msgstr "/絅遵�/�医���紊��..."
+
+#: src/gtkblist.c:3113
 msgid "/Buddies/Add Group..."
-msgstr "/絅遵�/�医�臂ょ�(_G)..."
-
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/綏ュ��/��紊��羝���"
-
-#: src/gtkblist.c:3009
+msgstr "/絅遵�/�医�臂ょ�..."
+
+#: src/gtkblist.c:3148
+msgid "/Tools/Buddy Pounces"
+msgstr "/綏ュ��/絅遵���������"
+
+#: src/gtkblist.c:3151
 msgid "/Tools/Privacy"
 msgstr "/綏ュ��/�援�荐㊤�"
 
-#: src/gtkblist.c:3085
-#, fuzzy
+#: src/gtkblist.c:3154
+msgid "/Tools/Room List"
+msgstr "/綏ュ��/��紊��羝���"
+
+#: src/gtkblist.c:3339
 msgid "Manually"
 msgstr "篏睡�������"
 
-#: src/gtkblist.c:3087
-#, fuzzy
+#: src/gtkblist.c:3341
 msgid "Alphabetically"
 msgstr "箴��у�罸�"
 
-#: src/gtkblist.c:3088
+#: src/gtkblist.c:3342
 msgid "By status"
 msgstr "箴��х����"
 
-#: src/gtkblist.c:3089
+#: src/gtkblist.c:3343
 msgid "By log size"
 msgstr "箴��ф�ヨ�紊у�"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/綏ュ��/絅遵���������"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/綏ュ��/絽活���檎����篁�"
+#: src/gtkblist.c:3532
+msgid "/Accounts"
+msgstr "/絽活��"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: src/gtkblist.c:3664
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�"
 
-#: src/gtkblist.c:3324
+#: src/gtkblist.c:3666
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊��絅順��臂ょ�"
 
-#: src/gtkblist.c:3328
-#, fuzzy
+#: src/gtkblist.c:3670
 msgid "/Buddies/Show Buddy Details"
-msgstr "/絅遵�/蕁�ず�∝�絅遵�"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+msgstr "/絅遵�/蕁�ず絅遵�膣亥�"
+
+#: src/gtkblist.c:4369
+#: src/protocols/silc/buddy.c:737
+#: src/protocols/silc/buddy.c:995
+#: src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1139
+#: src/protocols/yahoo/yahoo.c:2908
 msgid "Add Buddy"
 msgstr "�医�絅遵�"
 
-#: src/gtkblist.c:4029
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨���"
-"��ソ��羝���賢蕁�ず��\n"
+#: src/gtkblist.c:4393
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨�����ソ��羝���賢蕁�ず��\n"
+
+#: src/gtkblist.c:4415
+msgid "Screen Name:"
+msgstr "絽活��鐚�"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: src/gtkblist.c:4463
+#: src/gtkblist.c:4798
 msgid "Account:"
 msgstr "絽活��鐚�"
 
-#: src/gtkblist.c:4357
+#: src/gtkblist.c:4731
 msgid "This protocol does not support chat rooms."
 msgstr "������荐���絎�筝���吧��紊����"
 
-#: src/gtkblist.c:4373
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+#: src/gtkblist.c:4747
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "��研���糸�ヤ算篏�筝�����������ヨ��紊������荐���絎���"
 
-#: src/gtkblist.c:4390
+#: src/gtkblist.c:4764
 msgid "Add Chat"
 msgstr "�医���紊��"
 
-#: src/gtkblist.c:4414
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
+#: src/gtkblist.c:4788
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "茫�莠後�ュ�ュ��鐚��������惹�����喝���ュソ��羝�������紊�������区�荐���\n"
 
-#: src/gtkblist.c:4493
+#: src/gtkblist.c:4870
+#: src/protocols/sametime/sametime.c:5393
+#: src/protocols/sametime/sametime.c:5477
 msgid "Add Group"
 msgstr "���ョ召腟�"
 
-#: src/gtkblist.c:4494
+#: src/gtkblist.c:4871
 msgid "Please enter the name of the group to be added."
 msgstr "茫�腟����医���臂ょ�莠後�ュ��腮宴��"
 
+#: src/gtkblist.c:5495
+msgid "_Edit Account"
+msgstr "膩�鹿絽活��(_E)"
+
 #  NOTE ��筝�����筝���荐宴��������羃�����鐚�絨ゅ�倶�����亥����罔∞��檎����篁ゃ��羝����
 #  NOTE 茘�����筝���荐宴������絽御��
-#: src/gtkblist.c:5025
+#: src/gtkblist.c:5528
+#: src/gtkblist.c:5534
 msgid "No actions available"
 msgstr "羃����檎����篁�"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+# #NOTE 絲���羝����鎧腟怨���遵�鐚��主憥������Disable�����������絽活�����g�����鐚���篁ョ浸茘������∝�����荅我���糸��������
+#: src/gtkblist.c:5542
+msgid "_Disable"
+msgstr "�∝�(_D)"
+
+#: src/gtkblist.c:5554
+msgid "Enable Account"
+msgstr "����絽活��"
+
+#: src/gtkblist.c:5609
 msgid "/Tools"
-msgstr "綏ュ��(_T)"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
+msgstr "/綏ュ��"
+
+#: src/gtkblist.c:5704
+msgid "/Buddies/Sort Buddies"
+msgstr "/絅遵�/絅遵�羝����綺�"
+
+#: src/gtkcellview.c:198
+#, fuzzy
+msgid "Background color name"
+msgstr "�������"
+
+#: src/gtkcellview.c:199
+#, fuzzy
+msgid "Background color as a string"
+msgstr "�������"
+
+#: src/gtkcellview.c:205
+#: src/gtkimhtmltoolbar.c:1007
+msgid "Background color"
+msgstr "�������"
+
+#: src/gtkcellview.c:206
+#, fuzzy
+msgid "Background color as a GdkColor"
+msgstr "�������"
+
+#: src/gtkcellview.c:213
+#, fuzzy
+msgid "Background set"
+msgstr "�������"
+
+#: src/gtkcellview.c:214
+msgid "Whether this tag affects the background color"
+msgstr "筝�膊♂����罔�膠ゆ����襲�粋�������"
+
+#: src/gtkcombobox.c:490
+msgid "ComboBox model"
+msgstr "ComboBox罔e�"
+
+#: src/gtkcombobox.c:491
+msgid "The model for the combo box"
+msgstr "Combo Box��罔e�"
+
+#: src/gtkcombobox.c:498
+msgid "Wrap width"
+msgstr "��茵�絲�墾"
+
+#: src/gtkcombobox.c:499
+msgid "Wrap width for layouting the items in a grid"
+msgstr "�у�狗���� Grid 筝㊨¨腓榊����茵�絲�墾"
+
+#: src/gtkcombobox.c:508
+msgid "Row span column"
+msgstr "罘���莊��"
+
+#: src/gtkcombobox.c:509
+msgid "TreeModel column containing the row span values"
+msgstr ""
+
+#: src/gtkcombobox.c:518
+msgid "Column span column"
+msgstr "膰怨��莊��"
+
+#: src/gtkcombobox.c:520
+msgid "TreeModel column containing the column span values"
+msgstr ""
+
+#  XXX ������藥����茘����
+#: src/gtkcombobox.c:529
+#, fuzzy
+msgid "Active item"
+msgstr "����"
+
+#: src/gtkcombobox.c:530
+#, fuzzy
+msgid "The item which is currently active"
+msgstr "�����≧�篏睡����紊��"
+
+#  NOTE ��������箴����∝������銀���絎������∝�������箙�筝�筝�絎��������∝�鐚����喝Ű⑮���∝���箙�筝�紊��∵�
+#: src/gtkcombobox.c:538
+#, fuzzy
+msgid "Appears as list"
+msgstr "�∝�"
+
+#: src/gtkcombobox.c:539
+msgid "Whether combobox dropdowns should look like lists rather than menus"
+msgstr ""
+
+#: src/gtkconn.c:226
+#, c-format
 msgid "%s disconnected"
-msgstr "��罩∫�g���"
-
-#: src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:325
+msgstr "%s 腟����g�"
+
+#: src/gtkconn.c:227
+#, c-format
+msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and reenable the account to connect."
+msgstr ""
+
+#: src/gtkconv.c:349
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "������ Gaim v%s��"
 
-#: src/gtkconv.c:334
+#: src/gtkconv.c:358
 msgid "Supported debug options are:  version"
 msgstr "��吡���ら���檎����鐚�version"
 
-#: src/gtkconv.c:371
+#: src/gtkconv.c:394
 msgid "No such command (in this context)."
 msgstr "羃���������篁わ�������茖鋎睡���"
 
-#: src/gtkconv.c:374
+#: src/gtkconv.c:397
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2433,406 +2856,398 @@
 "荀��峨���筝���篁ょ��茯����莠後�ャ��/help &lt;��篁�&gt;���喝���\n"
 "����茖����������篁ゆ��鐚�\n"
 
-#: src/gtkconv.c:446
+#: src/gtkconv.c:469
 msgid "No such command."
 msgstr "�≧④��篁ゃ��"
 
-#: src/gtkconv.c:453
+#: src/gtkconv.c:476
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "茯�羈����鐚�莠後�ョ�����後��惹��篁ゆ���������御�檎���"
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:481
 msgid "Your command failed for an unknown reason."
 msgstr "��鋌ゅ�決�紊掩��鐚�����筝�����"
 
-#: src/gtkconv.c:465
-#, fuzzy
+#: src/gtkconv.c:488
 msgid "That command only works in chats, not IMs."
 msgstr "������篁ゅÛ����紊���ф����鐚����恰��荐���賢�≧����"
 
-#: src/gtkconv.c:468
-#, fuzzy
+#: src/gtkconv.c:491
 msgid "That command only works in IMs, not chats."
 msgstr "������篁ゅÛ���恰��荐���賢����鐚�����紊���х�≧����"
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:495
 msgid "That command doesn't work on this protocol."
 msgstr "������篁ゅ��������荐���絎��х�≧����"
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
-#, fuzzy
+#: src/gtkconv.c:729
+#: src/gtkconv.c:755
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "荅峨��絅遵���������紊�研��篏睡����筝�腮�����荐���絎�"
 
 # XXX ��⑮
-#: src/gtkconv.c:719
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+#: src/gtkconv.c:749
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "��研���糸�ヤ算篏�筝����������茫�����絅遵�����荐���絎���"
 
-#: src/gtkconv.c:772
+#: src/gtkconv.c:802
 msgid "Invite Buddy Into Chat Room"
 msgstr "��茫�絅遵��峨�ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
+#: src/gtkconv.c:832
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "茫�莠後�ユ���渇��茫���篏睡������腮縁�篁ュ���茫���荐�����"
 
-#: src/gtkconv.c:823
+#: src/gtkconv.c:853
 msgid "_Buddy:"
 msgstr "絅遵�(_B)鐚�"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: src/gtkconv.c:873
+#: src/gtksavedstatuses.c:1077
+#: src/gtksavedstatuses.c:1395
 msgid "_Message:"
 msgstr "荐���(_M)鐚�"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: src/gtkconv.c:930
+#: src/gtkconv.c:2275
+#: src/gtkdebug.c:217
+#: src/gtkft.c:487
 msgid "Unable to open file."
 msgstr "�≧�����罟�罅���"
 
-#: src/gtkconv.c:906
+#: src/gtkconv.c:936
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>�� %s ��篋よ�</h1>\n"
 
-#: src/gtkconv.c:930
+#: src/gtkconv.c:960
 msgid "Save Conversation"
 msgstr "�峨���紊��у�"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: src/gtkconv.c:1077
+#: src/gtkdebug.c:165
+#: src/gtkdebug.c:678
 msgid "Find"
 msgstr "��絨�"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: src/gtkconv.c:1103
+#: src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "��絨�(_S)鐚�"
 
-#: src/gtkconv.c:1227
+#: src/gtkconv.c:1274
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: src/gtkconv.c:1235
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: src/gtkconv.c:1489
+msgstr "�ヨ�膤紫輝���������������篋よ�筝㊦��荐����遵�茴�����惹�ヨ�筝㏍��"
+
+#: src/gtkconv.c:1282
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "�ヨ�膤紫輝���������������篋よ�筝㊦��荐����遵�筝���茴�����惹�ヨ�筝㏍��"
+
+#: src/gtkconv.c:1536
 msgid "IM"
 msgstr "�恰��荐���"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: src/gtkconv.c:1542
+#: src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "�渇��罟�罅�"
 
-#: src/gtkconv.c:1502
+#: src/gtkconv.c:1549
 msgid "Un-Ignore"
 msgstr "��羔�綽順�ヤ戎����"
 
 #  NOTE��Ignore����茘���綽順�ヤ戎������鐚�篏� gtkprefs.c 筝㊦����Ignore��
 #  NOTE 箙���綽順�ユ�弱���������������処⑮����綽順�ャ��
-#: src/gtkconv.c:1505
+#: src/gtkconv.c:1552
 msgid "Ignore"
 msgstr "綽順��"
 
 # XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
 # XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
-#: src/gtkconv.c:1511
+#: src/gtkconv.c:1558
 msgid "Info"
 msgstr "��緇�莖�荐�"
 
-#: src/gtkconv.c:1517
-#, fuzzy
+#: src/gtkconv.c:1564
 msgid "Get Away Message"
-msgstr "�亥���∫��荐���"
-
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "腱脂��"
-
-#: src/gtkconv.c:2236
+msgstr "��緇��∫��荐���"
+
+#: src/gtkconv.c:2283
 msgid "Unable to save icon file to disk."
 msgstr "�≧��峨���腓堺�罅��括�腆�筝���"
 
-#: src/gtkconv.c:2259
+#: src/gtkconv.c:2306
 msgid "Save Icon"
 msgstr "�峨���腓�"
 
-#: src/gtkconv.c:2308
+#: src/gtkconv.c:2355
 msgid "Animate"
 msgstr "����"
 
-#: src/gtkconv.c:2313
+#: src/gtkconv.c:2360
 msgid "Hide Icon"
 msgstr "�沿���霚�"
 
 #  NOTE ����Right-Click��腓堺��蕁�ず����篁わ�茘���As���冴���冴����緇�絅���
-#: src/gtkconv.c:2319
+#: src/gtkconv.c:2366
 msgid "Save Icon As..."
 msgstr "�峨���腓�..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: src/gtkconv.c:2507
 msgid "/_Conversation"
 msgstr "/篋よ�(_C)"
 
-#: src/gtkconv.c:2369
+#: src/gtkconv.c:2509
 msgid "/Conversation/New Instant _Message..."
 msgstr "/絅遵�/�医�恰��荐���(_M)..."
 
-#: src/gtkconv.c:2374
+#: src/gtkconv.c:2514
 msgid "/Conversation/_Find..."
 msgstr "/篋よ�/��絨�(_F)..."
 
-#: src/gtkconv.c:2376
+#: src/gtkconv.c:2516
 msgid "/Conversation/View _Log"
 msgstr "/篋よ�/茹���罩桁兓���(_L)"
 
-#: src/gtkconv.c:2377
+#: src/gtkconv.c:2517
 msgid "/Conversation/_Save As..."
 msgstr "/篋よ�/����井�(_S)..."
 
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/篋よ�/羝�腥�"
-
-#: src/gtkconv.c:2383
+#: src/gtkconv.c:2519
+msgid "/Conversation/Clea_r"
+msgstr "/篋よ�/羝�腥�(_R)"
+
+#: src/gtkconv.c:2523
 msgid "/Conversation/Se_nd File..."
 msgstr "/篋よ�/�渇��罟�罅�(_N)..."
 
-#: src/gtkconv.c:2384
+#: src/gtkconv.c:2524
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/篋よ�/�医�絅遵���������(_P)..."
 
-#: src/gtkconv.c:2386
+#: src/gtkconv.c:2526
 msgid "/Conversation/_Get Info"
 msgstr "/篋よ�/��緇�莖�荐�(_G)"
 
-#: src/gtkconv.c:2388
+#: src/gtkconv.c:2528
 msgid "/Conversation/In_vite..."
 msgstr "/篋よ�/��茫�(_V)..."
 
-#: src/gtkconv.c:2393
+#: src/gtkconv.c:2533
 msgid "/Conversation/Al_ias..."
 msgstr "/篋よ�/�ュ��(_I)..."
 
-#: src/gtkconv.c:2395
+#: src/gtkconv.c:2535
 msgid "/Conversation/_Block..."
 msgstr "/篋よ�/絨���(_B)..."
 
-#: src/gtkconv.c:2397
+#: src/gtkconv.c:2537
 msgid "/Conversation/_Add..."
 msgstr "/篋よ�/�医�(_A)..."
 
-#: src/gtkconv.c:2399
+#: src/gtkconv.c:2539
 msgid "/Conversation/_Remove..."
 msgstr "/篋よ�/腱脂��(_R)..."
 
-#: src/gtkconv.c:2404
+#: src/gtkconv.c:2544
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/篋よ�/���ラ�g�(_k)..."
 
-#: src/gtkconv.c:2406
+#: src/gtkconv.c:2546
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/篋よ�/���ュ襲��(_E)..."
 
-#: src/gtkconv.c:2411
+#: src/gtkconv.c:2551
 msgid "/Conversation/_Close"
 msgstr "/篋よ�/����(_C)"
 
 #. Options
-#: src/gtkconv.c:2415
+#: src/gtkconv.c:2555
 msgid "/_Options"
 msgstr "/�檎��(_O)"
 
-#: src/gtkconv.c:2416
+#: src/gtkconv.c:2556
 msgid "/Options/Enable _Logging"
 msgstr "/�檎��/��紮�荐����ヨ�(_L)"
 
-#: src/gtkconv.c:2417
+#: src/gtkconv.c:2557
 msgid "/Options/Enable _Sounds"
 msgstr "/�檎��/�����恰��(_S)"
 
-#: src/gtkconv.c:2418
-#, fuzzy
+#: src/gtkconv.c:2558
+msgid "/Options/Show Buddy _Icon"
+msgstr "/�檎��/蕁�ず絅遵���腓�(_I)"
+
+#: src/gtkconv.c:2560
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/�檎��/蕁�ず�弱�綏ュ�桁��(_T)"
 
-#: src/gtkconv.c:2419
+#: src/gtkconv.c:2561
 msgid "/Options/Show Ti_mestamps"
 msgstr "/�檎��/蕁�ず�����活�(_M)"
 
-#: src/gtkconv.c:2420
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "蕁�ず絅遵���腓�(_I)"
-
-#: src/gtkconv.c:2460
+#: src/gtkconv.c:2601
 msgid "/Conversation/View Log"
 msgstr "/篋よ�/茹���罩桁兓���"
 
-#: src/gtkconv.c:2466
+#: src/gtkconv.c:2607
 msgid "/Conversation/Send File..."
 msgstr "/篋よ�/�渇��罟�罅�..."
 
-#: src/gtkconv.c:2470
+#: src/gtkconv.c:2611
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/篋よ�/�医�絅遵���������..."
 
-#: src/gtkconv.c:2476
+#: src/gtkconv.c:2617
 msgid "/Conversation/Get Info"
 msgstr "/篋よ�/��緇�莖�荐�"
 
-#: src/gtkconv.c:2480
+#: src/gtkconv.c:2621
 msgid "/Conversation/Invite..."
 msgstr "/篋よ�/��茫�..."
 
-#: src/gtkconv.c:2486
+#: src/gtkconv.c:2627
 msgid "/Conversation/Alias..."
 msgstr "/篋よ�/�ュ��..."
 
-#: src/gtkconv.c:2490
+#: src/gtkconv.c:2631
 msgid "/Conversation/Block..."
 msgstr "/篋よ�/絨���..."
 
-#: src/gtkconv.c:2494
+#: src/gtkconv.c:2635
 msgid "/Conversation/Add..."
 msgstr "/篋よ�/�医�..."
 
-#: src/gtkconv.c:2498
+#: src/gtkconv.c:2639
 msgid "/Conversation/Remove..."
 msgstr "/篋よ�/腱脂��..."
 
-#: src/gtkconv.c:2504
+#: src/gtkconv.c:2645
 msgid "/Conversation/Insert Link..."
 msgstr "/篋よ�/���ラ�g�..."
 
-#: src/gtkconv.c:2508
+#: src/gtkconv.c:2649
 msgid "/Conversation/Insert Image..."
 msgstr "/篋よ�/���ュ襲��..."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2655
 msgid "/Options/Enable Logging"
 msgstr "/�檎��/��紮�荐����ヨ�"
 
-#: src/gtkconv.c:2517
+#: src/gtkconv.c:2658
 msgid "/Options/Enable Sounds"
 msgstr "/�檎��/�����恰��"
 
-#: src/gtkconv.c:2520
-#, fuzzy
+#: src/gtkconv.c:2661
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�檎��/蕁�ず�弱�綏ュ�桁��"
 
-#: src/gtkconv.c:2523
+#: src/gtkconv.c:2664
 msgid "/Options/Show Timestamps"
 msgstr "/�檎��/蕁�ず�����活�"
 
-#: src/gtkconv.c:2526
-#, fuzzy
+#: src/gtkconv.c:2667
 msgid "/Options/Show Buddy Icon"
-msgstr "蕁�ず絅遵���腓�(_I)"
-
-#: src/gtkconv.c:2597
+msgstr "/�檎��/蕁�ず絅遵���腓�"
+
+#: src/gtkconv.c:2739
 msgid "User is typing..."
 msgstr "篏睡����罩e��叱��..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: src/gtkconv.c:2742
+#, fuzzy
+msgid "User has typed something and stopped"
 msgstr "篏睡������紮�篋�莠後�ワ�筝�������篋�"
 
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+#. Build the Send To menu
+#: src/gtkconv.c:2890
 msgid "_Send To"
-msgstr "篏睡��験��(_S)"
-
-#: src/gtkconv.c:3373
+msgstr "�渇����(_S)"
+
+#: src/gtkconv.c:3537
+#: src/protocols/sametime/sametime.c:3490
 msgid "Topic:"
 msgstr "筝脂�鐚�"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: src/gtkconv.c:3585
 msgid "0 people in room"
 msgstr "羃���篋阪�������翠��"
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3664
 msgid "IM the user"
 msgstr "���阪�恰��荐���畿篏睡����"
 
-#: src/gtkconv.c:3513
+#: src/gtkconv.c:3677
 msgid "Ignore the user"
 msgstr "綽順�ヤ戎����"
 
-#: src/gtkconv.c:3525
+#: src/gtkconv.c:3689
 msgid "Get the user's information"
 msgstr "��緇�篏睡����莖�荐�"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: src/gtkconv.c:4580
+#: src/gtkconv.c:4685
+#: src/gtkconv.c:4740
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ��篋阪�������翠��"
 msgstr[1] "%d ��篋阪�������翠��"
 
-#: src/gtkconv.c:5582
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
+#: src/gtkconv.c:5979
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;荐���&gt;鐚�絨���絎���荐����倶��筝������③絽檎���削������句�堺��篁よ������"
 
-#: src/gtkconv.c:5585
+#: src/gtkconv.c:5982
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;荀��決�����篏�&gt;鐚�罔>賛IRC鐚��決�筝�����篏���"
 
-#: src/gtkconv.c:5588
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
+#: src/gtkconv.c:5985
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "debug &lt;�檎��&gt;鐚���������篋よ����坂�篋��ら���荐���"
 
 # XXX
-#: src/gtkconv.c:5591
+#: src/gtkconv.c:5988
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear鐚�羝�腥坂困茫������牙粂茵���"
 
-#: src/gtkconv.c:5594
+#: src/gtkconv.c:5991
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;��篁�&gt;鐚�蕁�ず��筝���篁ょ��茯�����"
 
-#: src/gtkconv.c:5709
-#, fuzzy
+#: src/gtkconv.c:6124
 msgid "Confirm close"
-msgstr "腆肴�絽活��"
-
-#: src/gtkconv.c:5741
-#, fuzzy
+msgstr "腆肴�����"
+
+#: src/gtkconv.c:6156
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "��∈絎�荀����� %s鐚�"
-
-#: src/gtkconv.c:6408
+msgstr "�������������荐�������∈絎�荀���������荀�腦����"
+
+#: src/gtkconv.c:6952
 msgid "Close conversation"
 msgstr "����篋よ�"
 
-#: src/gtkconv.c:6872
+#: src/gtkconv.c:7416
 msgid "Last created window"
 msgstr "筝�筝���������荀�腦�"
 
-#: src/gtkconv.c:6874
+#: src/gtkconv.c:7418
 msgid "Separate IM and Chat windows"
 msgstr "篁ヤ�����荀�腦�蕁�ず�恰��荐�������紊�"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: src/gtkconv.c:7420
+#: src/gtkprefs.c:1232
 msgid "New window"
 msgstr "�域�腦�"
 
-#: src/gtkconv.c:6878
+#: src/gtkconv.c:7422
 msgid "By group"
 msgstr "箴�臂ょ�"
 
-#: src/gtkconv.c:6880
+#: src/gtkconv.c:7424
 msgid "By account"
 msgstr "箴�絽活��"
 
@@ -2841,10 +3256,10 @@
 msgid "Save Debug Log"
 msgstr "�峨��ら�����"
 
+# NOTE ���醇�����������後���
 #: src/gtkdebug.c:586
-#, fuzzy
 msgid "Invert"
-msgstr "����(_I)"
+msgstr "����"
 
 #: src/gtkdebug.c:589
 msgid "Highlight matches"
@@ -2855,22 +3270,21 @@
 msgstr "�ら���腦�"
 
 #: src/gtkdebug.c:689
-#, fuzzy
 msgid "Clear"
-msgstr "蕁��"
+msgstr "闐���"
 
 #: src/gtkdebug.c:698
 msgid "Pause"
 msgstr "����"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: src/gtkdebug.c:705
+#: src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "�����活�"
 
 #: src/gtkdebug.c:724
-#, fuzzy
 msgid "Filter"
-msgstr "紊掩��"
+msgstr "��疹��"
 
 #  NOTE 茘����翫�� by Ambrose
 #: src/gtkdebug.c:743
@@ -2878,108 +3292,129 @@
 msgid "Right click for more options."
 msgstr "蕁�ず膣亥�"
 
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+#: src/gtkdialogs.c:61
+#: src/gtkdialogs.c:99
 msgid "lead developer"
 msgstr "筝肢����取��"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:63
+#: src/gtkdialogs.c:65
+#: src/gtkdialogs.c:67
+#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70
+#: src/gtkdialogs.c:71
+#: src/gtkdialogs.c:73
+#: src/gtkdialogs.c:74
 msgid "developer"
 msgstr "���取��"
 
-#: src/gtkdialogs.c:61
-msgid "developer & webmaster"
-msgstr "���取���主恐腴�膊∞����"
-
-#: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:64
 msgid "win32 port"
 msgstr "Windows ����Щ罎�"
 
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:66
+msgid "developer & webmaster"
+msgstr "���取���主恐腴�膊∞����"
+
+#: src/gtkdialogs.c:72
 msgid "support"
 msgstr "���"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: src/gtkdialogs.c:93
+#: src/gtkdialogs.c:94
 msgid "maintainer"
 msgstr "靛㊧Ⅲ��"
 
-#: src/gtkdialogs.c:89
-#, fuzzy
+#: src/gtkdialogs.c:95
 msgid "libfaim maintainer"
-msgstr "�� libfaim 膓㊧Ⅲ��"
-
-#: src/gtkdialogs.c:92
-#, fuzzy
+msgstr "libfaim 膓㊧Ⅲ��"
+
+#: src/gtkdialogs.c:96
+msgid "hacker and designated driver [lazy bum]"
+msgstr "腮�綣靣�����惹��絎��御� [�銀査]"
+
+#: src/gtkdialogs.c:97
 msgid "Jabber developer"
-msgstr "�� Jabber ���取��"
-
-#: src/gtkdialogs.c:93
+msgstr "Jabber ���取��"
+
+#: src/gtkdialogs.c:98
 msgid "original author"
 msgstr "��篏���"
 
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "腮�綣靣�����惹��絎��御� [�銀査]"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:105
+#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:154
 msgid "Bulgarian"
 msgstr "篆��������"
 
-#: src/gtkdialogs.c:101
+#: src/gtkdialogs.c:107
 #, fuzzy
 msgid "Bosnian"
 msgstr "��羃�絨寂���"
 
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:155
+#: src/gtkdialogs.c:156
 msgid "Catalan"
 msgstr "��羈育����"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:157
 msgid "Czech"
 msgstr "�桁����"
 
-#: src/gtkdialogs.c:104
+#: src/gtkdialogs.c:110
 msgid "Danish"
 msgstr "筝拷坤��"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:158
 msgid "German"
 msgstr "緇傑��"
 
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:113
+msgid "Greek"
+msgstr "絽�����"
+
+#: src/gtkdialogs.c:114
 msgid "Australian English"
 msgstr "羮恰寛綣�偎��"
 
-#: src/gtkdialogs.c:107
+#: src/gtkdialogs.c:115
+msgid "Canadian English"
+msgstr "���水ぇ綣�偎��"
+
+#: src/gtkdialogs.c:116
 msgid "British English"
 msgstr "�怨��掩��"
 
-#: src/gtkdialogs.c:108
-msgid "Canadian English"
-msgstr "���水ぇ綣�偎��"
-
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:159
 msgid "Spanish"
 msgstr "茱睡�����"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:118
+#: src/gtkdialogs.c:160
 msgid "Finnish"
 msgstr "���㊥��"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:161
 msgid "French"
 msgstr "羈���"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:120
 msgid "Hebrew"
 msgstr "絽�篌����"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:121
 msgid "Hindi"
 msgstr "���医墾��"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:122
 msgid "Hungarian"
 msgstr "��������"
 
@@ -2987,63 +3422,76 @@
 #  NOTE ��茯��肢�俄����育�緒�綮f�沿����峨�紫�後勲�������榊�f��膓牙�絲����鎀у����鐚�
 #  NOTE �榊�g��筝㊤�����後��蕁�羈�篋������鎀у����罌�鐚�茘����鎀у������荅我�莠�絅純��
 #  NOTE����荀���Slovenian����
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:162
 msgid "Italian"
 msgstr "�鎀у����"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:124
+#: src/gtkdialogs.c:163
 msgid "Japanese"
 msgstr "�ユ��"
 
-#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:125
+msgid "Georgian"
+msgstr "��音篋���"
+
+#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:164
+msgid "Korean"
+msgstr "����"
+
+#: src/gtkdialogs.c:127
+#, fuzzy
+msgid "Kurdish"
+msgstr "���喝�倶��"
+
+#: src/gtkdialogs.c:128
 msgid "Lithuanian"
 msgstr "腴��九���"
 
-#: src/gtkdialogs.c:118
-msgid "Georgian"
-msgstr "��音篋���"
-
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
-msgid "Korean"
-msgstr "����"
+#  NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆�
+#: src/gtkdialogs.c:129
+msgid "Macedonian"
+msgstr "薤��狗����"
 
 # NOTE Flemish 茘�����篋�http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch �� Flemish ����筝�腮��荐�鐚�������荅峨Û����決�㊥����鐚���サ��羈��㊤招������鐚�
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:130
 #, fuzzy
 msgid "Dutch, Flemish"
 msgstr "�決�㊥��鐚閿��㊤招����"
 
-#  NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆�
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "薤��狗����"
-
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:131
 msgid "Norwegian"
 msgstr "�����"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:165
 msgid "Polish"
 msgstr "羈∵�㊥��"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:134
 msgid "Portuguese"
 msgstr "罔�羣�����"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:135
 msgid "Portuguese-Brazil"
 msgstr "綏頑タ����"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:136
 msgid "Romanian"
 msgstr "臂�薤�絢篋���"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:137
+#: src/gtkdialogs.c:166
+#: src/gtkdialogs.c:167
 msgid "Russian"
 msgstr "篆���"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:138
+#: src/gtkdialogs.c:139
 msgid "Serbian"
 msgstr "紂��丞境篋���"
 
@@ -3051,257 +3499,249 @@
 #  NOTE 篁ョ乙茯��守�鰹�莊��肴⑮�����守�活�羣�鐚�羈�筝�鐚����喝���臂��箙���zh_TW鐚�
 #  NOTE ��篁ヤ�莊�羝�⑮鐚��九���ぇ�梧⑮羈�鐚�鐚�莊��肴⑮��
 #  NOTE����荀���Italian����
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:140
 msgid "Slovenian"
 msgstr "���膓㊤絢篋���"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:141
+#: src/gtkdialogs.c:169
 msgid "Swedish"
 msgstr "���御��"
 
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:142
+msgid "Tamil"
+msgstr "腟�腴��"
+
+#: src/gtkdialogs.c:143
 msgid "Telugu"
 msgstr ""
 
-#: src/gtkdialogs.c:134
+#: src/gtkdialogs.c:144
 msgid "Vietnamese"
 msgstr "莇�����"
 
-#: src/gtkdialogs.c:134
+#: src/gtkdialogs.c:144
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh �� Gnome 莇�����膺肢⑮絨靚�箙��銀�腟���"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:145
+#: src/gtkdialogs.c:170
 msgid "Simplified Chinese"
 msgstr "膂♂�筝㊥��"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: src/gtkdialogs.c:146
+#: src/gtkdialogs.c:147
+#: src/gtkdialogs.c:171
 msgid "Traditional Chinese"
 msgstr "罩i�筝㊥��"
 
 # XXX Yahoo茘��
-#: src/gtkdialogs.c:143
+#: src/gtkdialogs.c:153
 msgid "Amharic"
 msgstr "�水�������"
 
-#: src/gtkdialogs.c:158
+#: src/gtkdialogs.c:168
 msgid "Slovak"
 msgstr "���篌�����"
 
-#: src/gtkdialogs.c:202
+#: src/gtkdialogs.c:212
 msgid "About Gaim"
 msgstr "���� Gaim"
 
-#: src/gtkdialogs.c:226
-#, fuzzy
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-"Gaim �����罔∞�����荐����綣��������箴� AIM��ICQ��Yahoo!��MSN��IRC��Jabber��"
-"Napster��Zephyr鐚�篁ュ� Gadu-Gadu 膈����純��絎���札 GTK+ ���種�筝�札 GPL ���劫���"
-"篏���<BR><BR>"
-
-#: src/gtkdialogs.c:235
+#: src/gtkdialogs.c:236
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+msgstr "Gaim �����罔∞�����荐����綣��������箴� AIM��MSN��Yahoo!��Jabber��ICQ��IRC��SILC��Novell GroupWise��Lotus Sametime��Napster��Zephyr鐚�篁ュ� Gadu-Gadu 膈����純��絎���札 GTK+ ���種�筝�札 GPL ���劫��寂���<BR><BR>"
+
+#: src/gtkdialogs.c:245
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #wingaim �脂��<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #wingaim �脂��<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: src/gtkdialogs.c:238
+#: src/gtkdialogs.c:248
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #gaim �脂��<BR><BR><FONT "
-"SIZE=\"4\">罩i�筝㊥����莖�荐�:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
-"\">http://gaim.myweb.hinet.net/</A><BR><BR>"
-
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #gaim �脂��<BR><BR><FONT SIZE=\"4\">罩i�筝㊥����莖�荐�:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/\">http://gaim.myweb.hinet.net/</A><BR><BR>"
+
+#: src/gtkdialogs.c:254
+msgid "Current Developers"
 msgstr "�鞘算���取��"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 茯�:����篋�篋坂�������篋�鐚�����筝����� gaim 莖e����
 # NOTE 筝����膺紙�������援��罔∞�篏�������罸�莠�絅�
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:269
 msgid "Crazy Patch Writers"
 msgstr "���援��罔∞�篏���"
 
-#: src/gtkdialogs.c:274
+#: src/gtkdialogs.c:284
 msgid "Retired Developers"
 msgstr "��篁脂���取��"
 
-#: src/gtkdialogs.c:289
+#: src/gtkdialogs.c:299
 msgid "Current Translators"
 msgstr "�鞘算茘���"
 
-#: src/gtkdialogs.c:309
+#: src/gtkdialogs.c:319
 msgid "Past Translators"
 msgstr "��篁肢⑮��"
 
-#: src/gtkdialogs.c:327
-#, fuzzy
+#: src/gtkdialogs.c:337
 msgid "Debugging Information"
-msgstr "篏睡����莖�荐�"
+msgstr "�ら�����"
 
 # NOTE ���処⑮����腮宴��鐚����阪����茹d���篋阪��������罔∞���腮宴��
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
+#: src/gtkdialogs.c:527
+#: src/gtkdialogs.c:664
+#: src/gtkdialogs.c:731
 msgid "_Name"
-msgstr "��腮�"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+msgstr "��腮�(_N)"
+
+#: src/gtkdialogs.c:532
+#: src/gtkdialogs.c:669
+#: src/gtkdialogs.c:736
 msgid "_Account"
 msgstr "絽活��(_A)"
 
-#: src/gtkdialogs.c:502
+#: src/gtkdialogs.c:540
 msgid "New Instant Message"
 msgstr "�医�恰��荐���"
 
-#: src/gtkdialogs.c:504
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: src/gtkdialogs.c:542
+msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "茫�莠後�ユ�����活��守���恰��荐����莟∞��絽活����"
 
-#: src/gtkdialogs.c:643
+#: src/gtkdialogs.c:677
 msgid "Get User Info"
 msgstr "��緇�篏睡����莖�荐�"
 
-#: src/gtkdialogs.c:645
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+#: src/gtkdialogs.c:679
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "茫�莠後�ユ�����活��ヨ�絨�莟∞��絽活����"
 
 #  NOTE 罩よ��茘���莅�����篌寂�莠�����緇���絅巡�藥�
-#: src/gtkdialogs.c:699
-#, fuzzy
+#: src/gtkdialogs.c:745
 msgid "View User Log"
-msgstr "莅���篏睡�����ヨ�"
-
-#: src/gtkdialogs.c:701
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+msgstr "茹���篏睡�����ヨ�"
+
+#: src/gtkdialogs.c:747
+#, fuzzy
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "茫�莠後�ユ�����活�莅����ヨ���篏睡������絽活����"
 
 # XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:766
 msgid "Alias Contact"
 msgstr "�咲��腟�絅遵���筝��ュ��"
 
 # XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
-#: src/gtkdialogs.c:721
+#: src/gtkdialogs.c:767
 msgid "Enter an alias for this contact."
 msgstr "茫��咲��腟�絅遵�莠後�ヤ����ュ����"
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:769
+#: src/gtkdialogs.c:791
+#: src/gtkdialogs.c:811
+#: src/gtkrequest.c:295
+#: src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "�ュ��"
 
-#: src/gtkdialogs.c:741
+#: src/gtkdialogs.c:787
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "茫��� %s 莠後�ヤ����ュ��"
 
-#: src/gtkdialogs.c:743
+#: src/gtkdialogs.c:789
 msgid "Alias Buddy"
 msgstr "�咲����絅遵���筝��ュ��"
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:808
 msgid "Alias Chat"
 msgstr "腟���紊���劫�ュ��"
 
-#: src/gtkdialogs.c:763
+#: src/gtkdialogs.c:809
 msgid "Enter an alias for this chat."
 msgstr "茫��咲������紊��莠後�ヤ����ュ����"
 
-#: src/gtkdialogs.c:800
-#, fuzzy, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������"
-"篏����"
-msgstr[1] ""
-"��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������"
-"篏����"
-
-#: src/gtkdialogs.c:867
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
-
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: src/gtkdialogs.c:846
+#, c-format
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
+msgstr[1] "��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
+
+# XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
+#: src/gtkdialogs.c:854
+#: src/gtkdialogs.c:855
+msgid "Remove Contact"
+msgstr "腱脂�ら��腟�絅遵�"
+
+#: src/gtkdialogs.c:913
+#, c-format
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
+
+#: src/gtkdialogs.c:916
+#: src/gtkdialogs.c:917
 msgid "Remove Group"
 msgstr "腱脂�ょ召腟�"
 
-#: src/gtkdialogs.c:909
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+#: src/gtkdialogs.c:955
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "��③荅���絨� %s  緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
 # XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:958
+#: src/gtkdialogs.c:959
 msgid "Remove Buddy"
 msgstr "腱脂�ら����絅遵�"
 
-#: src/gtkdialogs.c:951
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+#: src/gtkdialogs.c:997
+#, c-format
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "��③荅���絨� %s 緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: src/gtkdialogs.c:1000
+#: src/gtkdialogs.c:1001
 msgid "Remove Chat"
 msgstr "腱脂�よ��紊��"
 
-#: src/gtkft.c:138
+#: src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: src/gtkft.c:160
+#: src/gtkft.c:1063
 msgid "Finished"
 msgstr "綏峨���"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: src/gtkft.c:163
+#: src/gtkft.c:1003
 msgid "Canceled"
 msgstr "綏峨�羔�"
 
 #  XXX ��⑮
-#: src/gtkft.c:165 src/gtkft.c:905
+#: src/gtkft.c:166
+#: src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "膈�緇���紮��活叱罟�罅�筝�..."
 
 # XXX ��⑮
-#: src/gtkft.c:218
+#: src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
 msgstr "<b>篁ヤ�荳����ユ�駈�</b>"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
 msgstr "<b>�ユ�区���</b>"
 
-#: src/gtkft.c:224
+#: src/gtkft.c:225
 msgid "<b>Sending To:</b>"
 msgstr "<b>�渇���逸�</b>"
 
 # XXX ��⑮
-#: src/gtkft.c:226
+#: src/gtkft.c:227
 msgid "<b>Sending As:</b>"
 msgstr "<b>篁ヤ�荳����渇��鐚�</b>"
 
@@ -3313,96 +3753,96 @@
 msgid "An error occurred while opening the file."
 msgstr "����罟�罅���筝㊦�主�������"
 
-#: src/gtkft.c:467
-#, fuzzy, c-format
+#: src/gtkft.c:484
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "�決���%s�����主��篋����鐚�%s"
-
-#: src/gtkft.c:476
-#, fuzzy, c-format
+msgstr "���� %s ���主�����鐚�%s"
+
+#: src/gtkft.c:493
+#, c-format
 msgid "Error running %s"
-msgstr "���ヨ��紊�� %s ���主�����"
-
-#: src/gtkft.c:477
+msgstr "�決� %s ���主�����"
+
+#: src/gtkft.c:494
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:572
+msgstr "�����������篁g⊆ %d"
+
+#: src/gtkft.c:588
 msgid "Progress"
 msgstr "�峨墾"
 
-#: src/gtkft.c:579
+#: src/gtkft.c:595
 msgid "Filename"
 msgstr "罟���"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:602
 msgid "Size"
 msgstr "紊у�"
 
-#: src/gtkft.c:593
+#: src/gtkft.c:609
 msgid "Remaining"
 msgstr "���"
 
-#: src/gtkft.c:624
+#: src/gtkft.c:640
 msgid "Filename:"
 msgstr "罟���鐚�"
 
 # NOTE Debian 茘���local���冴�����亥���
 # XXX
-#: src/gtkft.c:625
+#: src/gtkft.c:641
 msgid "Local File:"
 msgstr "���亥�罟�罅�鐚�"
 
-#: src/gtkft.c:626
+#: src/gtkft.c:642
 msgid "Status:"
 msgstr "����鐚�"
 
-#: src/gtkft.c:627
+#: src/gtkft.c:643
 msgid "Speed:"
 msgstr "��綺��"
 
-#: src/gtkft.c:628
+#: src/gtkft.c:644
 msgid "Time Elapsed:"
 msgstr "膓�������鐚�"
 
-#: src/gtkft.c:629
+#: src/gtkft.c:645
 msgid "Time Remaining:"
 msgstr "絨�������鐚�"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "篆���絨�荅掩�����(_K)"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: src/gtkft.c:731
+#, fuzzy
+msgid "Close this window when all transfers _finish"
+msgstr "������罟�罅��括�鎘��∽��鐚���������荀�腦� [_C]"
+
+#: src/gtkft.c:741
 msgid "C_lear finished transfers"
 msgstr "羝��ゅ群絎������活叱(_C)"
 
 # XXX ��⑮
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: src/gtkft.c:750
 msgid "File transfer _details"
-msgstr "�沿��勈叱膣亥�"
+msgstr "罟�罅��活叱膣亥�(_D)"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: src/gtkft.c:780
+#: src/gtkstock.c:143
 msgid "_Pause"
 msgstr "����(_P)"
 
 #. Resume button
-#: src/gtkft.c:774
+#: src/gtkft.c:790
 msgid "_Resume"
 msgstr "�√奨(_R)"
 
-#: src/gtkft.c:988
+#: src/gtkft.c:1005
 msgid "Failed"
 msgstr "紊掩��"
 
 #  NOTE Nautilus茘���莢寂�������鐚�Abiword茘������弱���莢寂���鐚��巡��醇��篋���
 #: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
+msgid "Pa_ste as Plain Text"
 msgstr "莢寂�膣���絖�(_S)"
 
 #: src/gtkimhtml.c:1313
@@ -3414,14 +3854,12 @@
 msgstr "蕁�ず�g���������蕁�儸��"
 
 #: src/gtkimhtml.c:1317
-#, fuzzy
 msgid "Hyperlink prelight color"
 msgstr "�g�蕁��"
 
 #: src/gtkimhtml.c:1318
-#, fuzzy
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "馹�ず�g���������蕁�儸��"
+msgstr "�倶�藜�膓����g������g�蕁�儸��"
 
 #: src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
@@ -3436,7 +3874,7 @@
 msgstr "茲�茖初�g�篏���(_C)"
 
 # NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-#: src/gtkimhtml.c:3234
+#: src/gtkimhtml.c:3259
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3447,7 +3885,7 @@
 "����倶�� PNG 罟�������"
 
 # NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-#: src/gtkimhtml.c:3237
+#: src/gtkimhtml.c:3262
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3457,7 +3895,7 @@
 "\n"
 "����倶�� PNG 罟�������"
 
-#: src/gtkimhtml.c:3250
+#: src/gtkimhtml.c:3275
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3468,7 +3906,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: src/gtkimhtml.c:3278
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3479,11 +3917,12 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: src/gtkimhtml.c:3358
+#: src/gtkimhtml.c:3370
 msgid "Save Image"
 msgstr "�峨�綵怨��"
 
-#: src/gtkimhtml.c:3373
+#: src/gtkimhtml.c:3398
 msgid "_Save Image..."
 msgstr "�峨�綵怨��(_S)..."
 
@@ -3508,9 +3947,7 @@
 msgstr "�颷�(_D)"
 
 #: src/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "茫�莠後�ユ����荀����ョ�� URL ��絎����颷逸��颷井���御���х��鐚������叱�ャ��"
 
 #: src/gtkimhtmltoolbar.c:409
@@ -3530,7 +3967,8 @@
 msgid "Failed to store image: %s\n"
 msgstr "�≧��峨�綵怨���%s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:513
+#: src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "���ュ襲��"
 
@@ -3572,15 +4010,9 @@
 msgid "Foreground font color"
 msgstr "�������"
 
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "�������"
-
-#  XXX ��⑮
 #: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
 msgid "Clear formatting"
-msgstr "羝��ゆ�弱���(_C)"
+msgstr "羝��ゆ�弱���"
 
 #: src/gtkimhtmltoolbar.c:1038
 msgid "Insert link"
@@ -3594,62 +4026,57 @@
 msgid "Insert smiley"
 msgstr "���ヨ;��"
 
-#: src/gtklog.c:200
+#: src/gtklog.c:212
 #, fuzzy, c-format
 msgid "Conversation in %s on %s"
 msgstr "�� %s ��篋よ�"
 
-#: src/gtklog.c:202
+#: src/gtklog.c:214
 #, fuzzy, c-format
 msgid "Conversation with %s on %s"
 msgstr "�� %s ��篋よ�"
 
-#: src/gtklog.c:309
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:313
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-
-#: src/gtklog.c:320
+#: src/gtklog.c:324
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "��������荐������������壕��括鎧腟掩�ヨ����檎��茴�������鐚�膤紫輝篋�篁倶����茴�����亥鎧腟掩�ヨ�筝㏍��"
+
+#: src/gtklog.c:328
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:331
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:335
 msgid "No logs were found"
-msgstr ""
-
-#: src/gtklog.c:396
-#, fuzzy
+msgstr "�鞘��井�ヨ�"
+
+#: src/gtklog.c:411
 msgid "Total log size:"
-msgstr "箴��ф�ヨ�紊у�"
-
-#: src/gtklog.c:472
+msgstr "�����ヨ�絨鎀э�"
+
+#: src/gtklog.c:487
 #, fuzzy, c-format
 msgid "Conversations in %s"
 msgstr "�� %s ��篋よ�"
 
-#: src/gtklog.c:480 src/gtklog.c:531
+#: src/gtklog.c:495
+#: src/gtklog.c:546
 #, c-format
 msgid "Conversations with %s"
 msgstr "�� %s ��篋よ�"
 
-#: src/gtklog.c:556
+#: src/gtklog.c:571
 msgid "System Log"
 msgstr "膤紫輝�ヨ�"
 
-#: src/gtkmain.c:326
+#: src/gtkmain.c:306
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s���決���%s -h��篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
 
-#: src/gtkmain.c:328
+#: src/gtkmain.c:308
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3664,34 +4091,97 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
+#: src/gtkmain.c:480
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"It is possible that this bug is already fixed in CVS.\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+msgstr ""
+
+#: src/gtkmain.c:486
+msgid ""
+"bug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+msgstr ""
+
+#: src/gtkmain.c:490
+msgid ""
+"gdb.php.  If you need further\n"
+"assistance, please IM either SeanEgn or LSchiere (via AIM).\n"
+"Contact information for Sean and Luke on other protocols is at\n"
+msgstr ""
+
+#: src/gtkmain.c:493
+msgid "contactinfo.php.\n"
+msgstr ""
+
+#: src/gtkmain.c:698
+#: src/gtkmain.c:700
 msgid "Default"
-msgstr "GNOME��荐㊤��"
+msgstr "��荐�"
+
+#: src/gtkmedia.c:52
+msgid "Call ended."
+msgstr "腟����弱ù��"
+
+#: src/gtkmedia.c:69
+#, c-format
+msgid "Calling %s"
+msgstr "�弱� %s"
+
+#: src/gtkmedia.c:73
+#: src/gtkmedia.c:108
+msgid "End Call"
+msgstr "靚����弱�"
+
+#: src/gtkmedia.c:81
+#, c-format
+msgid "Receiving call from %s"
+msgstr "�嚭�遺��� %s ���弱�"
+
+#: src/gtkmedia.c:89
+msgid "Reject Call"
+msgstr "��靚��弱�"
+
+#: src/gtkmedia.c:95
+msgid "Accept call"
+msgstr "����弱�"
+
+#: src/gtkmedia.c:102
+#, c-format
+msgid "Connected to %s"
+msgstr "鎴臥�g��� %s"
+
+#: src/gtkmedia.c:113
+msgid "_Mute"
+msgstr "����(_M)"
 
 #. Descriptive label
-#: src/gtknotify.c:275
+#: src/gtknotify.c:269
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s �� %d 絨��育�灸散��"
 msgstr[1] "%s �� %d 絨��育�灸散��"
 
-#: src/gtknotify.c:289
+#: src/gtknotify.c:283
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">箴����</span> %s\n"
 
-#: src/gtknotify.c:298
+#: src/gtknotify.c:292
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">筝脂�鐚�</span> %s\n"
 
-#: src/gtknotify.c:303
+#: src/gtknotify.c:297
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3702,7 +4192,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:319
+#: src/gtknotify.c:313
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3713,400 +4203,443 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: src/gtknotify.c:500
 msgid "Search Results"
 msgstr "��絨�腟���"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: src/gtknotify.c:638
+#: src/protocols/oscar/oscar.c:4846
 #, c-format
 msgid "Info for %s"
 msgstr "%s ��莖�荐�"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: src/gtknotify.c:639
+#: src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "絅遵�莖�荐�"
 
-#: src/gtknotify.c:687
+#: src/gtknotify.c:681
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "�頳遵����篁ゃ��%s�����≧������"
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: src/gtknotify.c:683
+#: src/gtknotify.c:695
+#: src/gtknotify.c:708
+#: src/gtknotify.c:833
 msgid "Unable to open URL"
 msgstr "�≧�����膓臥��"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: src/gtknotify.c:693
+#: src/gtknotify.c:706
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "�決���%s�����主��篋����鐚�%s"
 
-#: src/gtknotify.c:839
+#: src/gtknotify.c:834
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "���悟�����篏睡��������頳遵����鐚��紙����荐㊤���篁ゃ��"
+
+#: src/gtkplugin.c:268
+#, c-format
 msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "���悟�����篏睡��������頳遵����鐚��紙����荐㊤���篁ゃ��"
-
-#: src/gtkpounce.c:130
+"%s%s<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 ""
+"%s%s<span weight=\"bold\">篏���鐚�</span>\t%s\n"
+"<span weight=\"bold\">膓牙�鐚�</span>\t\t%s\n"
+"<span weight=\"bold\">罟���鐚�</span>\t%s"
+
+#: src/gtkplugin.c:388
+msgid "Configure Pl_ugin"
+msgstr "荐㊤�罔∞�(_U)"
+
+#: src/gtkplugin.c:437
+msgid "<b>Plugin Details</b>"
+msgstr "<b>罔∞���完</b>"
+
+#: src/gtkpounce.c:157
 msgid "Select a file"
 msgstr "�御��罟�罅�"
 
-#: src/gtkpounce.c:161
+#: src/gtkpounce.c:254
 msgid "Please enter a buddy to pounce."
 msgstr "茫�莠後�ヤ���絅遵�篁ラ�画�������"
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:476
 msgid "New Buddy Pounce"
 msgstr "�医�絅遵���������"
 
-#: src/gtkpounce.c:391
+#: src/gtkpounce.c:476
 msgid "Edit Buddy Pounce"
 msgstr "膩�鹿絅遵���������"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
+#: src/gtkpounce.c:493
 msgid "Pounce Who"
 msgstr "荀�����茯亥������"
 
-#: src/gtkpounce.c:435
+#: src/gtkpounce.c:520
 msgid "_Buddy name:"
 msgstr "絅遵���腮�(_B)鐚�"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "����篁�藝惹┌������"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
+#: src/gtkpounce.c:544
+msgid "Pounce When Buddy..."
+msgstr "��������..."
+
+#: src/gtkpounce.c:552
+msgid "Si_gns on"
 msgstr "�糸��(_G)"
 
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "�糸��(_O)"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
+#: src/gtkpounce.c:554
+msgid "Signs o_ff"
+msgstr "�糸��(_F)"
+
+#: src/gtkpounce.c:556
+msgid "Goes a_way"
 msgstr "�∫��(_W)"
 
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "�演�∫��菴���(_R)"
-
-#: src/gtkpounce.c:475
-msgid "_Idle"
+#: src/gtkpounce.c:558
+msgid "Ret_urns from away"
+msgstr "菴���(_U)"
+
+#: src/gtkpounce.c:560
+msgid "Becomes _idle"
 msgstr "��臀�(_I)"
 
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "�演��臀����(_N)"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "絅遵���紮�莠後��(_T)"
-
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "絅遵���罩∵叱��(_Y)"
+#: src/gtkpounce.c:562
+msgid "Is no longer i_dle"
+msgstr "筝�����臀�(_D)"
+
+#: src/gtkpounce.c:564
+msgid "Starts _typing"
+msgstr "��紮�莠後��(_T)"
+
+#: src/gtkpounce.c:566
+msgid "Stops t_yping"
+msgstr "��罩∵叱��(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
+#: src/gtkpounce.c:595
 msgid "Pounce Action"
 msgstr "������篏�"
 
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
-msgstr "�����恰��荐����腦�(_E)"
-
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
+#: src/gtkpounce.c:603
+msgid "Ope_n an IM window"
+msgstr "�����恰��荐����腦�(_N)"
+
+#: src/gtkpounce.c:605
+msgid "_Pop up a notification"
 msgstr "綵��咲����(_P)"
 
-#: src/gtkpounce.c:522
+#: src/gtkpounce.c:607
 msgid "Send a _message"
 msgstr "���肴���(_M)"
 
-#: src/gtkpounce.c:524
+#: src/gtkpounce.c:609
 msgid "E_xecute a command"
 msgstr "�決���篁�(_X)"
 
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:611
 msgid "P_lay a sound"
 msgstr "�㊥�冗�恰��(_L)"
 
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
-msgstr "�頳�(_R)..."
-
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "�頳�(_W)..."
-
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:615
+msgid "Brows_e..."
+msgstr "�頳�(_E)..."
+
+#: src/gtkpounce.c:617
+msgid "Br_owse..."
+msgstr "�頳�(_O)..."
+
+#: src/gtkpounce.c:618
 msgid "Pre_view"
 msgstr "��荀�(_V)"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "�峨�荐㊤�筝�����(_E)"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "腱脂�ゅソ����������"
-
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:701
+msgid "_Recurring"
+msgstr "��罨≦�弱�(_R)"
+
+#: src/gtkpounce.c:997
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "��∈絎�������ゅ� %2$s �� %1$s ����鐚�"
+
+#: src/gtkpounce.c:1145
+msgid "Pounce Target"
+msgstr "�������"
+
+#: src/gtkpounce.c:1180
+msgid "Recurring"
+msgstr "��罨≦�弱�"
+
+#: src/gtkpounce.c:1227
+msgid "Buddy Pounces"
+msgstr "鎁遵���������"
+
+#: src/gtkpounce.c:1345
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ��紮�莠後�ヨ���畿�� (%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:1347
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 綏牙��糸�� (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:1349
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s �演��臀���� (%s)"
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:1351
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s �演�∫��菴��� (%s)"
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:1353
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ��罩∵叱�ヨ���畿�� (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:1355
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 綏牙��糸�� (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:1357
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 莅��雁�����咲��臀� (%s)"
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:1359
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 綏牙��∫���� (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:1360
 msgid "Unknown pounce event. Please report this!"
 msgstr "���ョ������篋�篁吟��茫����演�����馹�鐚�"
 
-#: src/gtkprefs.c:623
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"����∝��羝���賢�後�筝��������喝��罩∞��茵���筝脂������札�����括���劫�絨��亥��茵���筝脂�"
-"絎�茖��井���賢��"
-
-#: src/gtkprefs.c:658
+#: src/gtkprefs.c:511
+msgid "Smiley theme failed to unpack."
+msgstr ""
+
+#: src/gtkprefs.c:630
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "����∝��羝���賢�後�筝��������喝��罩∞��茵���筝脂������札�����括���劫�絨��亥��茵���筝脂�絎�茖��井���賢��"
+
+#: src/gtkprefs.c:665
 msgid "Icon"
 msgstr "��腓�"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:672
+#: src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:811
+#: src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "�颷�"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:814
+msgid "_Hide new IM conversations"
+msgstr "�沿��佂���恰��荐���困茫�(_H)"
+
+#: src/gtkprefs.c:817
+#: src/gtkprefs.c:1668
+msgid "When away"
+msgstr "�∫������"
+
+#: src/gtkprefs.c:821
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "筝���������膩�����篁わ�筝�緇��倶��荐�������(_S)"
 
-#: src/gtkprefs.c:807
-#, fuzzy
+#: src/gtkprefs.c:823
 msgid "Show _formatting on incoming messages"
-msgstr "綽順�ユ���区������弱���(_I)"
-
-#: src/gtkprefs.c:809
+msgstr "蕁�ず���区������弱���(_F)"
+
+#: src/gtkprefs.c:826
 msgid "Show buddy _icons"
 msgstr "蕁�ず絅遵���腓�(_I)"
 
-#: src/gtkprefs.c:811
+#: src/gtkprefs.c:828
 msgid "Enable buddy ic_on animation"
 msgstr "����絅遵���腓阪����(_O)"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:835
 msgid "_Notify buddies that you are typing to them"
 msgstr "���ユ����絅遵���③���取���畿篁���(_N)"
 
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
-msgstr "罔�腓阪�堺�守����絖�(_H)"
-
-#: src/gtkprefs.c:834
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+#: src/gtkprefs.c:838
+msgid "Highlight _misspelled words"
+msgstr "罔�腓阪�堺�守����絖�(_M)"
+
+#: src/gtkprefs.c:842
+msgid "Use smooth-scrolling"
+msgstr ""
+
+#: src/gtkprefs.c:858
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
 msgstr "��絋���戎������絎���吚�弱���鐚����肴�����綣閞e���蕁�篌寂札筝���罔f���"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:880
 msgid "Tab Options"
 msgstr "罔�膠ら�檎��"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:882
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "篏睡���膠よ�腦�蕁�ず�恰��荐�������紊�(_T)"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:896
 msgid "Show close b_utton on tabs"
 msgstr "���膠や�蕁�ず������(_U)"
 
-#: src/gtkprefs.c:878
-#, fuzzy
+#: src/gtkprefs.c:902
 msgid "_Placement:"
-msgstr "荀�腦�篏�臀��紊��檎��"
-
-#: src/gtkprefs.c:880
+msgstr "荀�腦�篏�臀��紊��檎��(_P)鐚�"
+
+#: src/gtkprefs.c:904
 msgid "Top"
 msgstr "荀�腦�筝���"
 
-#: src/gtkprefs.c:881
+#: src/gtkprefs.c:905
 msgid "Bottom"
 msgstr "荀�腦�筝���"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:906
 msgid "Left"
 msgstr "荀�腦�綏���"
 
-#: src/gtkprefs.c:883
+#: src/gtkprefs.c:907
 msgid "Right"
 msgstr "荀�腦��喝��"
 
-#: src/gtkprefs.c:885
+#: src/gtkprefs.c:909
 msgid "Left Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:886
+msgstr "綏�������"
+
+#: src/gtkprefs.c:910
 msgid "Right Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:891
-#, fuzzy
+msgstr "�渇������"
+
+#: src/gtkprefs.c:915
 msgid "N_ew conversations:"
-msgstr "����篋よ�"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+msgstr "�遺困茫�(_E)鐚�"
+
+#: src/gtkprefs.c:966
+#: src/protocols/oscar/oscar.c:779
+#: src/protocols/oscar/oscar.c:6001
 msgid "IP Address"
 msgstr "IP 篏���"
 
-#: src/gtkprefs.c:944
-#, fuzzy
-msgid "STUN Server:"
-msgstr "篌堺����(_S)鐚�"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
+#: src/gtkprefs.c:968
+msgid "ST_UN server:"
+msgstr "STUN 篌堺����(_S)鐚�"
+
+#: src/gtkprefs.c:970
+msgid "_Autodetect IP address"
 msgstr "�����究謙 IP 篏���(_A)"
 
-#: src/gtkprefs.c:955
-msgid "Public _IP:"
-msgstr "����IP (_I)鐚�"
-
 #: src/gtkprefs.c:979
+msgid "Public _IP:"
+msgstr "����IP (_I)鐚�"
+
+#: src/gtkprefs.c:1003
 msgid "Ports"
 msgstr "��荐���"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:1006
 msgid "_Manually specify range of ports to listen on"
 msgstr "�����荐����h�順���(_M)"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
+#: src/gtkprefs.c:1009
+msgid "_Start port:"
 msgstr "��紮���荐���(_S)鐚�"
 
-#: src/gtkprefs.c:992
-msgid "_End Port:"
+#: src/gtkprefs.c:1016
+msgid "_End port:"
 msgstr "腟�����荐���(_E)鐚�"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1024
 msgid "Proxy Server"
 msgstr "篁g��篌堺����"
 
 # NOTE ���怨����鐚�筝�����罸�����鐚��合�冴��筝�篏睡����
-#: src/gtkprefs.c:1003
+#: src/gtkprefs.c:1028
 msgid "No proxy"
 msgstr "筝�篏睡��撮��篌堺����"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1084
 msgid "_User:"
 msgstr "篏睡����(_U)鐚�"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1146
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: src/gtkprefs.c:1147
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: src/gtkprefs.c:1148
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1149
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
-#, fuzzy
+#: src/gtkprefs.c:1150
 msgid "GNOME Default"
-msgstr "GNOME��荐㊤��"
-
-#: src/gtkprefs.c:1124
+msgstr "GNOME��荐�"
+
+#: src/gtkprefs.c:1151
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1152
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1153
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: src/gtkprefs.c:1154
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: src/gtkprefs.c:1163
 msgid "Manual"
 msgstr "篏睡�������"
 
-#: src/gtkprefs.c:1189
+#: src/gtkprefs.c:1216
 msgid "Browser Selection"
 msgstr "�御���頳遵��"
 
-#: src/gtkprefs.c:1193
+#: src/gtkprefs.c:1220
 msgid "_Browser:"
 msgstr "�頳遵��(_B)鐚�"
 
-#: src/gtkprefs.c:1201
+#: src/gtkprefs.c:1228
 msgid "_Open link in:"
 msgstr "���頳遵��賢�����g�(_O)鐚�"
 
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1230
 msgid "Browser default"
 msgstr "�頳遵����荐�"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1231
 msgid "Existing window"
 msgstr "�∽����荀�腦�"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1233
 msgid "New tab"
 msgstr "�井�膠�"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1247
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4115,57 +4648,56 @@
 "篏睡�������(_M)鐚�\n"
 "(茫�篁� %s 篁h;膓峨��)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: src/gtkprefs.c:1283
+#: src/gtkprefs.c:1756
 msgid "Logging"
 msgstr "�ヨ�"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
+#: src/gtkprefs.c:1286
+msgid "Log _format:"
 msgstr "�ヨ��弱�(_F)鐚�"
 
-#: src/gtkprefs.c:1264
-#, fuzzy
+#: src/gtkprefs.c:1291
 msgid "Log all _instant messages"
-msgstr "荐��������恰��荐���(_L)"
-
-#: src/gtkprefs.c:1266
+msgstr "荐��������恰��荐���(_I)"
+
+#: src/gtkprefs.c:1293
 msgid "Log all c_hats"
 msgstr "荐���������紊��у�(_H)"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1295
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "荐��������������壕��括鎧腟掩�ヨ�"
+
+#: src/gtkprefs.c:1427
 msgid "Sound Selection"
 msgstr "�後��恰��"
 
-#: src/gtkprefs.c:1454
+#: src/gtkprefs.c:1481
 msgid "Sound Method"
 msgstr "�恰���㊥�丈�劫�"
 
-#: src/gtkprefs.c:1455
+#: src/gtkprefs.c:1482
 msgid "_Method:"
 msgstr "�㊥�丈�劫�(_M)鐚�"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1484
 msgid "Console beep"
 msgstr "�銀���"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1486
 msgid "Automatic"
 msgstr "����"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1491
 msgid "Command"
 msgstr "��篁�"
 
-#: src/gtkprefs.c:1465
-#, fuzzy
+#: src/gtkprefs.c:1492
 msgid "No sounds"
-msgstr "�恰��"
-
-#: src/gtkprefs.c:1473
+msgstr "�♂�恰��"
+
+#: src/gtkprefs.c:1500
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4174,115 +4706,114 @@
 "�恰����篁�(_C)鐚�\n"
 "(茫�篁� %s 篁h;罟���)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1526
 msgid "Sound Options"
 msgstr "�恰���檎��"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1527
 msgid "Sounds when conversation has _focus"
 msgstr "�銀困茫���緇�莠後�ョ����弱�咲�恰��(_F)"
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1529
 msgid "_Sounds while away"
 msgstr "�∫����篁��弱�咲�恰��(_S)"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1539
 msgid "Sound Events"
 msgstr "篋�篁狗�恰��"
 
-#: src/gtkprefs.c:1563
+#: src/gtkprefs.c:1590
 msgid "Play"
 msgstr "�㊥��"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1597
 msgid "Event"
 msgstr "篋�篁�"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1616
 msgid "Test"
 msgstr "羝��"
 
-#: src/gtkprefs.c:1593
+#: src/gtkprefs.c:1620
 msgid "Reset"
 msgstr "��臀�"
 
-#: src/gtkprefs.c:1597
+#: src/gtkprefs.c:1624
 msgid "Choose..."
 msgstr "�御��..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
+#: src/gtkprefs.c:1663
+#: src/gtkstatusbox.c:439
+#: src/protocols/bonjour/bonjour.c:258
+#: src/protocols/irc/irc.c:175
+#: src/protocols/irc/irc.c:457
+#: src/protocols/irc/msgs.c:221
+#: src/protocols/jabber/buddy.c:1093
+#: src/protocols/jabber/jabber.c:1110
+#: src/protocols/msn/msn.c:585
+#: src/protocols/novell/novell.c:2849
+#: src/protocols/novell/novell.c:2984
+#: src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:6621
+#: src/protocols/oscar/oscar.c:7677
+#: src/protocols/oscar/oscar.c:7834
+#: src/protocols/sametime/sametime.c:3247
+#: src/protocols/silc/buddy.c:1431
+#: src/protocols/silc/silc.c:53
+#: src/protocols/yahoo/yahoo.c:3113
+#: src/protocols/yahoo/yahoo.c:3212
+#: src/protocols/zephyr/zephyr.c:2260
+#: src/status.c:157
 msgid "Away"
 msgstr "�∫��"
 
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "���∫����鐚�絨��������域���舟�ヤ���筝�(_Q)"
-
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1665
 msgid "_Auto-reply:"
 msgstr "篏������肴��������鐚�"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "�∫������"
-
-#: src/gtkprefs.c:1659
-#, fuzzy
+#: src/gtkprefs.c:1669
 msgid "When both away and idle"
-msgstr "�∫��筝��������臀�����"
-
-#: src/gtkprefs.c:1662
-#, fuzzy
+msgstr "�狗�∫��筝�������臀���"
+
+#: src/gtkprefs.c:1672
 msgid "_Report idle time"
-msgstr "蕁�ず��臀�����(_T)"
-
-#: src/gtkprefs.c:1665
+msgstr "���演��臀�����(_R)"
+
+#: src/gtkprefs.c:1675
 msgid "Auto-away"
 msgstr "�����∫��"
 
-#: src/gtkprefs.c:1666
-#, fuzzy
+#: src/gtkprefs.c:1676
 msgid "Change status when _idle"
-msgstr "��臀�������荐㊦�咲�∫��(_W)"
+msgstr "��臀����贋�合����(_I)"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/gtkprefs.c:1670
-#, fuzzy
+#: src/gtkprefs.c:1680
 msgid "_Minutes before changing status:"
 msgstr "��臀��絨�����荐㊦�咲�∫��(_M)鐚�"
 
-#: src/gtkprefs.c:1678
-#, fuzzy
+#: src/gtkprefs.c:1688
 msgid "Change _status to:"
-msgstr "莅��翫�医���削�"
-
-#: src/gtkprefs.c:1728
+msgstr "�贋�合������(_S)鐚�"
+
+#: src/gtkprefs.c:1746
 msgid "Smiley Themes"
 msgstr "茵���筝脂�"
 
-#: src/gtkprefs.c:1729
+#: src/gtkprefs.c:1747
 msgid "Sounds"
 msgstr "�恰��"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: src/gtkprefs.c:1748
+#: src/protocols/silc/silc.c:1828
 msgid "Network"
 msgstr "膓画君"
 
-#: src/gtkprefs.c:1735
+#: src/gtkprefs.c:1753
 msgid "Browser"
 msgstr "�頳遵��"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1757
 msgid "Away / Idle"
 msgstr "�∫�� / ��臀�"
 
@@ -4319,7 +4850,8 @@
 msgid "Set privacy for:"
 msgstr "絽活��鐚�"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: src/gtkprivacy.c:589
+#: src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "荐怨�戎����"
 
@@ -4331,7 +4863,8 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "茫�莠後�ユ����荐怨���機����篏睡��������腮宴��"
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "荐怨�"
 
@@ -4345,7 +4878,8 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "��∈絎�荐怨� %s ��機�����"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: src/gtkprivacy.c:628
+#: src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "��腟�篏睡����"
 
@@ -4357,7 +4891,9 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "茫�莠後�ヨ←����腟���篏睡��������腮宴��"
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
+#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:643
+#: src/protocols/gg/gg.c:1481
 msgid "Block"
 msgstr "絨���"
 
@@ -4374,42 +4910,55 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: src/gtkrequest.c:285
+#: src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:561
+#: src/protocols/msn/msn.c:564
+#: src/protocols/novell/novell.c:1921
+#: src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:117
+#: src/protocols/silc/wb.c:303
+#: src/request.h:1331
 msgid "Yes"
 msgstr "��"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: src/gtkrequest.c:286
+#: src/protocols/msn/dialog.c:115
+#: src/protocols/msn/msn.c:561
+#: src/protocols/msn/msn.c:564
+#: src/protocols/novell/novell.c:1922
+#: src/protocols/silc/buddy.c:314
+#: src/protocols/silc/pk.c:118
+#: src/protocols/silc/wb.c:304
+#: src/request.h:1331
 msgid "No"
 msgstr "��"
 
-#: src/gtkrequest.c:263
+#: src/gtkrequest.c:289
 msgid "Apply"
 msgstr "絅���"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: src/gtkrequest.c:290
+#: src/protocols/msn/msn.c:357
+#: src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "����"
 
-#: src/gtkrequest.c:1796
+#: src/gtkrequest.c:1832
 msgid "That file already exists"
 msgstr "�e��罟�罅�綏牙�絖���"
 
-#: src/gtkrequest.c:1797
+#: src/gtkrequest.c:1833
 msgid "Would you like to overwrite it?"
 msgstr "���荀���絎����"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: src/gtkrequest.c:1877
+#: src/gtkrequest.c:1918
 msgid "Save File..."
 msgstr "�峨�罟�罅�..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: src/gtkrequest.c:1878
+#: src/gtkrequest.c:1919
 msgid "Open File..."
 msgstr "����罟�罅�..."
 
@@ -4423,78 +4972,111 @@
 msgid "_Get List"
 msgstr "��緇�羝���(_G)"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:436
+#: src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805
+#: src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "�潔��"
 
-#: src/gtksavedstatuses.c:377
+# NOTE �����ゅ������弱�
+#: src/gtksavedstatuses.c:451
 msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+msgstr "�弱�"
+
+#: src/gtksavedstatuses.c:462
+#: src/gtksavedstatuses.c:903
+#: src/protocols/bonjour/bonjour.c:252
+#: src/protocols/bonjour/bonjour.c:259
+#: src/protocols/gg/gg.c:1432
+#: src/protocols/gg/gg.c:1437
+#: src/protocols/gg/gg.c:1446
+#: src/protocols/gg/gg.c:1451
+#: src/protocols/gg/gg.c:1456
+#: src/protocols/irc/irc.c:176
+#: src/protocols/jabber/jabber.c:1087
+#: src/protocols/jabber/jabber.c:1095
+#: src/protocols/jabber/jabber.c:1103
+#: src/protocols/jabber/jabber.c:1111
+#: src/protocols/jabber/jabber.c:1119
+#: src/protocols/jabber/jabber.c:1127
+#: src/protocols/novell/novell.c:2869
+#: src/protocols/novell/novell.c:2980
+#: src/protocols/novell/novell.c:2986
+#: src/protocols/novell/novell.c:2992
+#: src/protocols/oscar/oscar.c:7828
+#: src/protocols/oscar/oscar.c:7835
+#: src/protocols/sametime/sametime.c:3242
+#: src/protocols/sametime/sametime.c:3248
+#: src/protocols/sametime/sametime.c:3254
+#: src/protocols/sametime/sametime.c:3327
+#: src/protocols/simple/simple.c:256
+#: src/protocols/yahoo/yahoo.c:3207
+#: src/protocols/yahoo/yahoo.c:3213
+#: src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "荐���"
 
-#: src/gtksavedstatuses.c:451
-#, fuzzy
+#: src/gtksavedstatuses.c:525
 msgid "Saved Statuses"
-msgstr "篌堺����輝荐�莖���"
+msgstr "�峨�����"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: src/gtksavedstatuses.c:550
+#: src/gtksavedstatuses.c:1150
 msgid "_Use"
 msgstr "篏睡��(_U)"
 
-#: src/gtksavedstatuses.c:584
+#: src/gtksavedstatuses.c:660
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:675
-#, fuzzy
-msgid "Custom status"
-msgstr "箴��х����"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+msgstr "����罔�蕁�罩e��戎��賢��������後�筝��������罔�蕁���"
+
+#: src/gtksavedstatuses.c:862
+msgid "Different"
+msgstr "綏���"
+
+#: src/gtksavedstatuses.c:892
+#: src/gtksavedstatuses.c:1019
+#: src/protocols/gg/gg.c:1413
+#: src/protocols/gg/gg.c:1418
+#: src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:1060
+#: src/protocols/msn/msn.c:552
+#: src/protocols/novell/novell.c:2868
+#: src/protocols/novell/novell.c:2872
+#: src/protocols/oscar/oscar.c:762
+#: src/protocols/oscar/oscar.c:767
+#: src/protocols/oscar/oscar.c:769
+#: src/protocols/yahoo/yahoo.c:2809
 msgid "Status"
 msgstr "����"
 
-#: src/gtksavedstatuses.c:797
-#, fuzzy
+#: src/gtksavedstatuses.c:1038
 msgid "_Title:"
-msgstr "�潔��"
-
-#: src/gtksavedstatuses.c:817
-#, fuzzy
+msgstr "�潔��(_T)鐚�"
+
+#: src/gtksavedstatuses.c:1058
+#: src/gtksavedstatuses.c:1360
 msgid "_Status:"
-msgstr "����鐚�"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+msgstr "����(_S)鐚�"
+
+#. Different status message expander
+#: src/gtksavedstatuses.c:1093
 msgid "Use a _different status for some accounts"
 msgstr ""
 
+#. Save & Use button
+#: src/gtksavedstatuses.c:1159
+msgid "Sa_ve & Use"
+msgstr ""
+
+#: src/gtksavedstatuses.c:1339
+#, c-format
+msgid "Status for %s"
+msgstr "����鐚�%s"
+
 #: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "絅遵��糸��"
@@ -4541,500 +5123,34 @@
 msgstr "�≧��㊥�冗�恰��鐚����堺���後���罟�罅� (%s) 筝�絖�����"
 
 #: src/gtksound.c:430
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
+msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
 msgstr "�≧��㊥�冗�恰��鐚����咲�後�篋�����篁ゃ���堺�㊥�丈─綣������研羃���荐㊤�篁私���篁ゃ��"
 
 #: src/gtksound.c:442
 #, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
+msgid "Unable to play sound because the configured sound command could not be launched: %s"
 msgstr "�≧��㊥�冗�恰��鐚����榊�≧��決���荐㊤����恰����篁わ�%s"
 
-#: src/gtkstatusbox.c:197
-#, fuzzy
+#: src/gtkstatusbox.c:287
 msgid "Typing"
-msgstr "Ping"
+msgstr "莠後�ヤ賢"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: src/gtkstatusbox.c:290
+#: src/protocols/irc/irc.c:257
+#: src/protocols/jabber/jabber.c:893
+#: src/protocols/msn/session.c:349
+#: src/protocols/napster/napster.c:531
+#: src/protocols/novell/novell.c:2183
+#: src/protocols/oscar/oscar.c:1804
+#: src/protocols/sametime/sametime.c:3610
+#: src/protocols/simple/simple.c:1294
+#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "�g�筝�"
 
 #. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "筝�膩�"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "�沿昆"
-
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "�∝�"
-
-#: src/gtkstatusbox.c:299
-#, fuzzy
-msgid "Custom..."
-msgstr "篏睡�������"
-
-# XXX 荀�荀���
-#: src/gtkstatusbox.c:300
-#, fuzzy
-msgid "Saved..."
-msgstr "����井�..."
-
-#: src/gtkstock.c:117
-msgid "_Alias"
-msgstr "�ュ��(_A)"
-
-#: src/gtkstock.c:119
-msgid "_Invite"
-msgstr "��茫�(_I)"
-
-#: src/gtkstock.c:120
-msgid "_Modify"
-msgstr "篆���(_M)"
-
-#: src/gtkstock.c:121
-msgid "_Open Mail"
-msgstr "�����灸散(_O)"
-
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "茘���(_W)"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, fuzzy, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "�主��篋�筝������ョ���糸�ラ���鐚�%s��"
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
-msgid "Failed to load image"
-msgstr "�≧��峨�綵怨���%s\n"
-
-#: src/gtkutils.c:1495
-#, fuzzy, c-format
-msgid "Cannot send folder %s."
-msgstr "�≧��渇��罟�罅�"
-
-#: src/gtkutils.c:1497
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
-msgid "You have dragged an image"
-msgstr "��叱�ヤ��≧����篏睡������腮�"
-
-#: src/gtkutils.c:1526
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
-msgid "Set as buddy icon"
-msgstr "蕁�ず絅遵���腓�(_I)"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
-msgid "Send image file"
-msgstr "���肴���"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
-msgid "Insert in message"
-msgstr "���ュ襲��"
-
-#: src/gtkutils.c:1535
-#, fuzzy
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "������ュ����篋よ����"
-
-#: src/gtkutils.c:1540
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1542
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
-#, fuzzy
-msgid "Cannot send launcher"
-msgstr "�≧��渇��罟�罅�"
-
-#: src/gtkutils.c:1596
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: src/log.c:129
-msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">�����ヨ�罔∞�羃���絎�臂���莅������醇��</font></b>"
-
-#: src/log.c:577
-msgid "Logging of this conversation failed."
-msgstr ""
-
-#: src/log.c:839
-msgid "XML"
-msgstr "XML"
-
-#: src/log.c:904
-#, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;��������&gt;:"
-"</b></font> %s<br/>\n"
-
-#: src/log.c:906
-#, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;��������&gt;:"
-"</b></font> %s<br/>\n"
-
-# XXX ��⑮
-#: src/log.c:957 src/log.c:1074
-msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>�鞘��井�ヨ�罟�罅�鐚�</b></font>"
-
-#: src/log.c:967 src/log.c:1086
-#, c-format
-msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>�≧�莅���罟�罅�鐚�%s</b></font>"
-
-#: src/log.c:1019
-#, c-format
-msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr "(%s) %s <��������>鐚�%s\n"
-
-#: src/plugin.c:331
-#, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr "�鞘��育��荀���罔∞���%s����茫����医�茖�����罔∞�箙�緇���荅���"
-
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim �≧�莅��ユ������箴���罔∞���"
-
-#: src/plugin.c:360
-#, c-format
-msgid "The required plugin %s was unable to load."
-msgstr "�≧�莠��ラ��荀���罔∞���%s����"
-
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "��臀�"
-
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Status:</b> %s"
-msgstr "<b>����鐚�</b>%s"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Message:</b> %s"
-msgstr ""
-"\n"
-"<b>%s鐚�</b>%s"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
-msgid "Bonjour Protocol Plugin"
-msgstr "Yahoo ��絎�罔∞�"
-
-#. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
-msgid "Host name"
-msgstr "筝紙���腮�"
-
-#. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
-msgid "Port"
-msgstr "��荐���"
-
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-msgid "First name"
-msgstr "��"
-
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-msgid "Last name"
-msgstr "紮�"
-
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
-msgid "Email"
-msgstr "�糸��灸散"
-
-#: src/protocols/bonjour/bonjour.h:35
-msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
-msgid "Save Buddylist..."
-msgstr "���阪ソ��羝���"
-
-#: src/protocols/gg/gg.c:137
-msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
-msgid "Couldn't open file"
-msgstr "�≧��渇��罟�罅�"
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
-msgid "Buddylist saved successfully!"
-msgstr "絲�腆寂信�号����"
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "�≧��渇��罟�罅�"
-
-#: src/protocols/gg/gg.c:199
-#, fuzzy
-msgid "Load Buddylist..."
-msgstr "�咲����絅遵���筝��ュ��(_A)..."
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
-msgid "Buddylist loaded successfully!"
-msgstr "絲�腆寂信�号����"
-
-# XXX 荀�荀���
-#: src/protocols/gg/gg.c:211
-#, fuzzy
-msgid "Save buddylist..."
-msgstr "����井�..."
-
-#: src/protocols/gg/gg.c:254
-msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "�医�腆寂研筝��悟���"
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "�≧������育�g���"
-
-#: src/protocols/gg/gg.c:279
-msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
-msgid "Registration completed successfully!"
-msgstr "荐糸������"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
-msgid "Nickname"
-msgstr "�援┗"
-
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
-msgid "City"
-msgstr "���"
-
-#: src/protocols/gg/gg.c:417
-msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
-#, fuzzy
-msgid "Only online"
-msgstr "筝�膩�"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
-#, fuzzy
-msgid "Find buddies"
-msgstr "����臀���絅遵�荐㊦�榊�域��(_D)"
-
-#: src/protocols/gg/gg.c:432
-#, fuzzy
-msgid "Please, enter your search criteria below"
-msgstr "茫�莠後�ユ�����医�腆�"
-
-#: src/protocols/gg/gg.c:465
-msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
-msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
-#, fuzzy
-msgid "Unable to change password. Error occured.\n"
-msgstr "�≧�篆��� Gadu-Gadu 絲�腆�"
-
-#: src/protocols/gg/gg.c:500
-#, fuzzy
-msgid "Change password for the Gadu-Gadu account"
-msgstr "篆��� %s ��絲�腆�"
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
-msgid "Password was changed successfully!"
-msgstr "絲�腆寂信�号����"
-
-#: src/protocols/gg/gg.c:535
-#, fuzzy
-msgid "Token Error"
-msgstr "���ラ���"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "�≧���緇���紊��羝�����"
-
-#: src/protocols/gg/gg.c:551
-#, fuzzy
-msgid "Current password"
-msgstr "�����絲�腆若��"
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "絲�腆�"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
-msgid "Password (retype)"
-msgstr "絲�腆守����"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s ����筝����糸�ャ��"
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
-msgid "Current token"
-msgstr "�����脂��"
-
-#: src/protocols/gg/gg.c:574
-#, fuzzy
-msgid "Please, enter your current password and your new password for UIN: "
-msgstr "茫�莠後�ユ��������絲�腆寂札��絽���篏睡�����医�腆若��"
-
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
-#, fuzzy
-msgid "Change Gadu-Gadu Password"
-msgstr "�≧�篆��� Gadu-Gadu 絲�腆�"
-
-#: src/protocols/gg/gg.c:649
-#, fuzzy, c-format
-msgid "Select a chat for buddy: %s"
-msgstr "絨�������紊��������絅遵�羝���賢腱脂��"
-
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
-msgid "Add to chat..."
-msgstr "�医�筝�����紊��(_H)"
-
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "�≧�莅��� Socket"
-
-#: src/protocols/gg/gg.c:959
-msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: src/protocols/gg/gg.c:960
-#, fuzzy
-msgid "Search results"
-msgstr "��絨�腟���"
-
 #. zephyr has several exposures
 #. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
 #. OPSTAFF "hidden"
@@ -5048,109 +5164,686 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
+#: src/gtkstatusbox.c:438
+#: src/protocols/bonjour/bonjour.c:251
+#: src/protocols/gg/gg.c:1437
+#: src/protocols/irc/irc.c:171
+#: src/protocols/jabber/buddy.c:1089
+#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/msn/msn.c:581
+#: src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38
+#: src/protocols/napster/napster.c:584
+#: src/protocols/novell/novell.c:2846
+#: src/protocols/novell/novell.c:2978
+#: src/protocols/oscar/oscar.c:7827
+#: src/protocols/silc/silc.c:49
+#: src/protocols/simple/simple.c:254
+#: src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/zephyr/zephyr.c:2253
+#: src/status.c:154
+msgid "Available"
 msgstr "筝�膩�"
 
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
+#: src/gtkstatusbox.c:440
+#: src/protocols/gg/gg.c:1446
+#: src/protocols/oscar/oscar.c:711
+#: src/protocols/oscar/oscar.c:7841
+#: src/protocols/yahoo/yahoo.c:2658
+#: src/protocols/yahoo/yahoo.c:3245
+msgid "Invisible"
+msgstr "�沿昆"
+
+#: src/gtkstatusbox.c:441
+#: src/protocols/bonjour/bonjour.c:246
+#: src/protocols/gg/gg.c:1432
+#: src/protocols/irc/irc.c:167
+#: src/protocols/jabber/buddy.c:1087
+#: src/protocols/jabber/jabber.c:1087
+#: src/protocols/msn/msn.c:577
+#: src/protocols/napster/napster.c:579
+#: src/protocols/novell/novell.c:2858
+#: src/protocols/novell/novell.c:2975
+#: src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:7649
+#: src/protocols/oscar/oscar.c:7822
+#: src/protocols/sametime/sametime.c:3237
+#: src/protocols/silc/silc.c:47
+#: src/protocols/simple/simple.c:250
+#: src/protocols/yahoo/yahoo.c:2662
+#: src/protocols/yahoo/yahoo.c:3202
+#: src/status.c:153
+msgid "Offline"
+msgstr "�∝�"
+
+#: src/gtkstatusbox.c:443
+msgid "Custom..."
+msgstr "篏睡�������..."
+
+# XXX 荀�荀���
+#: src/gtkstatusbox.c:444
+msgid "Saved..."
+msgstr "綏峨�峨�..."
+
+#: src/gtkstock.c:138
+msgid "_Alias"
+msgstr "�ュ��(_A)"
+
+#: src/gtkstock.c:140
+msgid "_Invite"
+msgstr "��茫�(_I)"
+
+#: src/gtkstock.c:141
+msgid "_Modify"
+msgstr "篆���(_M)"
+
+#: src/gtkstock.c:142
+msgid "_Open Mail"
+msgstr "�����灸散(_O)"
+
+#: src/gtkstock.c:144
+msgid "_Warn"
+msgstr "茘���(_W)"
+
+#: src/gtkutils.c:1309
+#: src/gtkutils.c:1334
+#, fuzzy, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "�主��篋�筝������ョ���糸�ラ���鐚�%s��"
+
+#: src/gtkutils.c:1311
+#: src/gtkutils.c:1336
+msgid "Failed to load image"
+msgstr "莅���綵怨�鎀掩��"
+
+#: src/gtkutils.c:1411
+#, fuzzy, c-format
+msgid "Cannot send folder %s."
+msgstr "�≧��渇��罟�罅�"
+
+#: src/gtkutils.c:1413
+msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
+msgstr "Gaim 羃���莨���渇������������荀����ュ�渇��罟�罅�"
+
+#: src/gtkutils.c:1441
+#: src/gtkutils.c:1450
+#: src/gtkutils.c:1455
+#, fuzzy
+msgid "You have dragged an image"
+msgstr "��叱�ヤ��≧����篏睡������腮�"
+
+#: src/gtkutils.c:1442
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "���札����镾��活叱�����ヨ����������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�腟�����篏睡������"
+
+#: src/gtkutils.c:1446
+#: src/gtkutils.c:1461
+msgid "Set as buddy icon"
+msgstr "荐㊦�阪ソ����腓�"
+
+#: src/gtkutils.c:1447
+#: src/gtkutils.c:1462
+msgid "Send image file"
+msgstr "�渇��綵怨�閡�"
+
+#: src/gtkutils.c:1448
+#: src/gtkutils.c:1462
+msgid "Insert in message"
+msgstr "���ュ�域���"
+
+#: src/gtkutils.c:1451
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "�����絎�荐㊦�咲����篏睡������絅遵���腓阪���"
+
+#: src/gtkutils.c:1456
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "���札����镾��活叱�����ヨ����������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�腟�����篏睡������"
+
+#: src/gtkutils.c:1458
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "���札����������������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�腟�����篏睡������"
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: src/gtkutils.c:1512
+#, fuzzy
+msgid "Cannot send launcher"
+msgstr "�≧��渇��罟�罅�"
+
+#: src/gtkutils.c:1512
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr ""
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: src/gtkwhiteboard.c:344
+#: src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr ""
+
+#: src/log.c:129
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">�����ヨ�罔∞�羃���絎�臂���莅������醇��</font></b>"
+
+#: src/log.c:497
+msgid "HTML"
+msgstr "HTML"
+
+# NOTE Nautilus茘���莢寂�������鐚�Abiword茘������弱���莢寂���鐚��巡��醇��篋���
+# ANS �頑⑮��膣���絖���
+#: src/log.c:508
+msgid "Plain text"
+msgstr "膣���絖�"
+
+#: src/log.c:519
+msgid "Old Gaim"
+msgstr "���� Gaim"
+
+#: src/log.c:577
+msgid "Logging of this conversation failed."
+msgstr ""
+
+#: src/log.c:839
+msgid "XML"
+msgstr "XML"
+
+#: src/log.c:904
+#, c-format
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;��������&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:906
+#, c-format
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;��������&gt;:</b></font> %s<br/>\n"
+
+# XXX ��⑮
+#: src/log.c:957
+#: src/log.c:1074
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<font color=\"red\"><b>�鞘��井�ヨ�罟�罅�鐚�</b></font>"
+
+#: src/log.c:967
+#: src/log.c:1086
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<font color=\"red\"><b>�≧�莅���罟�罅�鐚�%s</b></font>"
+
+#: src/log.c:1019
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <��������>鐚�%s\n"
+
+#: src/plugin.c:362
+#, c-format
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "�鞘��育��荀���罔∞���%s����茫����医�茖�����罔∞�箙�緇���荅���"
+
+#: src/plugin.c:367
+#: src/plugin.c:395
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim �≧�莅��ユ������箴���罔∞���"
+
+#: src/plugin.c:391
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "�≧�莠��ラ��荀���罔∞���%s����"
+
+#. Send a message about the connection error
+#: src/protocols/bonjour/bonjour.c:107
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "�≧��ユ�狗�e�ョ���恰��荐����g�\n"
+
+#: src/protocols/bonjour/bonjour.c:142
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+
+#: src/protocols/bonjour/bonjour.c:328
+#, c-format
+msgid ""
+"\n"
+"<b>Status:</b> %s"
+msgstr ""
+"\n"
+"<b>����鐚�</b>%s"
+
+#: src/protocols/bonjour/bonjour.c:330
+#, c-format
+msgid ""
+"\n"
+"<b>Message:</b> %s"
+msgstr ""
+"\n"
+"<b>荐����</b>%s"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/bonjour/bonjour.c:424
+#: src/protocols/bonjour/bonjour.c:426
+msgid "Bonjour Protocol Plugin"
+msgstr "Bonjour ��絎�罔∞�"
+
+#: src/protocols/bonjour/bonjour.c:458
+#: src/protocols/bonjour/bonjour.c:515
+msgid "Gaim User"
+msgstr "Gaim 篏睡����"
+
+#. Creating the user splits
+#: src/protocols/bonjour/bonjour.c:553
+#: src/protocols/silc/silc.c:921
+msgid "Hostname"
+msgstr "筝紙���腮�"
+
+#. Creating the options for the protocol
+#. port to connect to
+#: src/protocols/bonjour/bonjour.c:557
+#: src/protocols/irc/irc.c:820
+#: src/protocols/msn/msn.c:1943
+#: src/protocols/napster/napster.c:719
+#: src/protocols/sametime/sametime.c:5586
+#: src/protocols/silc/silc.c:1836
+msgid "Port"
+msgstr "��荐���"
+
+#: src/protocols/bonjour/bonjour.c:560
+#: src/protocols/gg/gg.c:571
+#: src/protocols/gg/gg.c:986
+msgid "First name"
+msgstr "��"
+
+#: src/protocols/bonjour/bonjour.c:563
+#: src/protocols/gg/gg.c:566
+msgid "Last name"
+msgstr "紮�"
+
+#: src/protocols/bonjour/bonjour.c:566
+#: src/protocols/jabber/buddy.c:261
+#: src/protocols/jabber/buddy.c:772
+#: src/protocols/jabber/buddy.c:780
+#: src/protocols/silc/silc.c:685
+#: src/protocols/silc/silc.c:925
+#: src/protocols/silc/util.c:512
+#: src/protocols/yahoo/yahoo_profile.c:999
+msgid "Email"
+msgstr "�糸��灸散"
+
+# NOTE 羈������ュ���
+#: src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr "��ソ"
+
+#: src/protocols/gg/gg.c:89
+#: src/protocols/gg/gg.c:111
+#: src/protocols/gg/gg.c:146
+#, fuzzy
+msgid "Token Error"
+msgstr "���ラ���"
+
+#: src/protocols/gg/gg.c:90
+#: src/protocols/gg/gg.c:112
+#: src/protocols/gg/gg.c:147
+#, fuzzy
+msgid "Unable to fetch the token.\n"
+msgstr "�≧���緇���紊��羝�����"
+
+#: src/protocols/gg/gg.c:235
+#: src/protocols/gg/gg.c:254
+msgid "Save Buddylist..."
+msgstr "�峨�絅遵�羝���..."
+
+#: src/protocols/gg/gg.c:236
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr "����絅遵�羝��������鐚���篁ユ���莖���茴���ユ�罅�筝㏍��"
+
+#: src/protocols/gg/gg.c:242
+#: src/protocols/gg/gg.c:244
+msgid "Couldn't open file"
+msgstr "�≧�����罟�罅�"
+
+#: src/protocols/gg/gg.c:255
+msgid "Buddylist saved successfully!"
+msgstr "絅遵�羝����峨�����鐚�"
+
+#: src/protocols/gg/gg.c:273
+#: src/protocols/gg/gg.c:274
+msgid "Couldn't load buddylist"
+msgstr "�≧�莅��ュソ��羝���"
+
+#: src/protocols/gg/gg.c:290
+msgid "Load Buddylist..."
+msgstr "莅���絅遵�羝���..."
+
+#: src/protocols/gg/gg.c:291
+msgid "Buddylist loaded successfully!"
+msgstr "絅遵�羝����������鐚�"
+
+#: src/protocols/gg/gg.c:302
+msgid "Save buddylist..."
+msgstr "�峨�絅遵�羝���..."
+
+#: src/protocols/gg/gg.c:346
+msgid "Fill in the registration fields."
+msgstr ""
+
+#: src/protocols/gg/gg.c:351
+msgid "Passwords do not match."
+msgstr "�医�腆寂研筝��悟���"
+
+#: src/protocols/gg/gg.c:360
+msgid "Unable to register new account. Error occurred.\n"
+msgstr "�≧�荐糸���医験��������主����\n"
+
+#: src/protocols/gg/gg.c:373
+msgid "New Gadu-Gadu Account Registered"
+msgstr "�亥�� Gadu-Gadu 絽活��綏画┿��"
+
+#: src/protocols/gg/gg.c:374
+msgid "Registration completed successfully!"
+msgstr "荐糸������鐚�"
+
+#: src/protocols/gg/gg.c:434
+msgid "e-Mail"
+msgstr "�糸��灸散"
+
+#: src/protocols/gg/gg.c:439
+#: src/protocols/gg/gg.c:713
+#: src/protocols/jabber/jabber.c:680
+#: src/protocols/jabber/jabber.c:1205
+msgid "Password"
+msgstr "絲�腆�"
+
+#: src/protocols/gg/gg.c:444
+#: src/protocols/gg/gg.c:718
+msgid "Password (retype)"
+msgstr "絲�腆種���罨∴叱�ワ�"
+
+#: src/protocols/gg/gg.c:449
+#: src/protocols/gg/gg.c:723
+msgid "Enter current token"
+msgstr "莠後�ョ������絲�腆�"
+
+#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:729
+msgid "Current token"
+msgstr "����絲�腆�"
+
+#: src/protocols/gg/gg.c:459
+#: src/protocols/gg/gg.c:460
+msgid "Register New Gadu-Gadu Account"
+msgstr "荐糸���亥�� Gadu-Gadu 絽活��"
+
+#: src/protocols/gg/gg.c:461
+msgid "Please, fill in the following fields"
+msgstr "茫�莠後�ヤ札筝���罨�篏�"
+
+#: src/protocols/gg/gg.c:556
+#: src/protocols/gg/gg.c:1605
+msgid "Unable to initiate a new search"
+msgstr "�≧���紮�筝����亥����絨�"
+
+#: src/protocols/gg/gg.c:557
+#: src/protocols/gg/gg.c:1606
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "����筝�������筝㊦����絨���茫�膈���絎�絎�����"
+
+#: src/protocols/gg/gg.c:576
+#: src/protocols/gg/gg.c:989
+#: src/protocols/gg/gg.c:1985
+#: src/protocols/jabber/buddy.c:252
+#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:1341
+#: src/protocols/jabber/jabber.c:696
+#: src/protocols/msn/msn.c:1368
+#: src/protocols/silc/buddy.c:1494
+#: src/protocols/silc/ops.c:1036
+#: src/protocols/silc/ops.c:1179
+#: src/protocols/silc/ops.c:1328
+#: src/protocols/yahoo/yahoo_profile.c:1004
+msgid "Nickname"
+msgstr "�援┗"
+
+#: src/protocols/gg/gg.c:581
+#: src/protocols/gg/gg.c:992
+#: src/protocols/jabber/jabber.c:716
+#: src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:6056
+msgid "City"
+msgstr "���"
+
+#: src/protocols/gg/gg.c:586
+msgid "Year of birth"
+msgstr "�榊��綛�"
+
+#: src/protocols/gg/gg.c:589
+#: src/protocols/msn/msn.c:1527
+#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/yahoo/yahoo_profile.c:1029
+msgid "Gender"
+msgstr "�у��"
+
+#: src/protocols/gg/gg.c:590
+msgid "Male or female"
+msgstr "�傑�ф��絅恰��"
+
+#: src/protocols/gg/gg.c:591
+#: src/protocols/oscar/oscar.c:6021
+msgid "Male"
+msgstr "��"
+
+#: src/protocols/gg/gg.c:592
+#: src/protocols/oscar/oscar.c:6021
+msgid "Female"
+msgstr "絅�"
+
+#: src/protocols/gg/gg.c:596
+msgid "Only online"
+msgstr "����筝�膩�"
+
+#: src/protocols/gg/gg.c:600
+#: src/protocols/gg/gg.c:601
+msgid "Find buddies"
+msgstr "��絨�絅遵�"
+
+#: src/protocols/gg/gg.c:602
+msgid "Please, enter your search criteria below"
+msgstr "茫�����壕叱�ユ������絨�罌�篁�"
+
+#: src/protocols/gg/gg.c:639
+msgid "Fill in the fields."
+msgstr "紂��井�篏�筝㏍��"
+
+#: src/protocols/gg/gg.c:651
+msgid "Your current password is different from the one that you specified."
+msgstr ""
+
+#: src/protocols/gg/gg.c:665
+msgid "Unable to change password. Error occured.\n"
+msgstr "�≧�篆��劫�腆若������主����\n"
+
+#: src/protocols/gg/gg.c:674
+msgid "Change password for the Gadu-Gadu account"
+msgstr "莅��� Gadu-Gadu 絽活����絲�腆�"
+
+#: src/protocols/gg/gg.c:675
+msgid "Password was changed successfully!"
+msgstr "絲�腆寂信�号����鐚�"
+
+#: src/protocols/gg/gg.c:708
+msgid "Current password"
+msgstr "��絲�腆�"
+
+#: src/protocols/gg/gg.c:733
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr "茫�莠御������絲�腆弱�篏����医�腆種�"
+
+#: src/protocols/gg/gg.c:737
+#: src/protocols/gg/gg.c:738
+msgid "Change Gadu-Gadu Password"
+msgstr "莅��� Gadu-Gadu 絲�腆�"
+
+#: src/protocols/gg/gg.c:822
+#, fuzzy, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "絨�������紊��������絅遵�羝���賢腱脂��"
+
+#: src/protocols/gg/gg.c:825
+#: src/protocols/gg/gg.c:826
+#, fuzzy
+msgid "Add to chat..."
+msgstr "�医�筝�����紊��(_H)"
+
+#: src/protocols/gg/gg.c:965
+msgid "No matching users found"
+msgstr "�鞘��亥�����篏睡����"
+
+#: src/protocols/gg/gg.c:966
+msgid "There are no users matching your search criteria."
+msgstr "�≧�箴��ф��絨�罌�篁倶�上�亥�悟���篏睡������"
+
+#: src/protocols/gg/gg.c:977
+#: src/protocols/gg/gg.c:1044
+#: src/protocols/oscar/oscar.c:6158
+msgid "Unable to display the search results."
+msgstr "�≧�蕁�ず��絨�腟�����"
+
+#: src/protocols/gg/gg.c:983
+#: src/protocols/oscar/oscar.c:5993
+msgid "UIN"
+msgstr "絽活��"
+
+#: src/protocols/gg/gg.c:995
+msgid "Birth year"
+msgstr "����"
+
+#: src/protocols/gg/gg.c:1035
+msgid "Gadu-Gadu Public Directory"
+msgstr "Gadu-Gadu ���怨���"
+
+#: src/protocols/gg/gg.c:1036
+msgid "Search results"
+msgstr "��絨�腟���"
+
+#: src/protocols/gg/gg.c:1132
+#: src/protocols/gg/gg.c:1279
+msgid "Unable to read socket"
+msgstr "�≧�莅��� Socket"
+
+#: src/protocols/gg/gg.c:1215
+msgid "Buddy list downloaded"
+msgstr "筝�莠�絅遵�羝���"
+
+#: src/protocols/gg/gg.c:1216
+msgid "Your buddy list was downloaded from the server."
+msgstr "��群緇�篌堺�����莠�絅遵�羝�����"
+
+#: src/protocols/gg/gg.c:1223
+msgid "Buddy list uploaded"
+msgstr "筝��喝ソ��羝���"
+
+#: src/protocols/gg/gg.c:1224
+msgid "Your buddy list was stored on the server."
+msgstr "����絅遵�羝���群茴���丈�寂失�������"
+
+#: src/protocols/gg/gg.c:1313
+#: src/protocols/gg/gg.c:1531
+msgid "Connection failed."
+msgstr "�g�紊掩����"
+
+#: src/protocols/gg/gg.c:1451
+#: src/protocols/msn/msn.c:593
+#: src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2852
+#: src/protocols/novell/novell.c:2990
+#: src/protocols/silc/buddy.c:1435
+#: src/protocols/silc/silc.c:55
+#: src/protocols/yahoo/yahoo.c:2642
+#: src/protocols/yahoo/yahoo.c:3220
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: src/protocols/gg/gg.c:1456
+#: src/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "絨���"
 
-#: src/protocols/gg/gg.c:1129
+#: src/protocols/gg/gg.c:1473
 #, fuzzy
 msgid "Add to chat"
 msgstr "�医���紊��"
 
-#: src/protocols/gg/gg.c:1133
+#: src/protocols/gg/gg.c:1478
 #, fuzzy
 msgid "Unblock"
 msgstr "絨���"
 
-#: src/protocols/gg/gg.c:1149
+#: src/protocols/gg/gg.c:1497
 #, fuzzy
 msgid "Chat _name:"
 msgstr "紮�鐚�"
 
-#: src/protocols/gg/gg.c:1183
-#, fuzzy
-msgid "Connection failed."
-msgstr "�g�紊掩��"
-
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: src/protocols/gg/gg.c:1357
+#: src/protocols/gg/gg.c:1716
 #, fuzzy
 msgid "Chat error"
 msgstr "莅������"
 
-#: src/protocols/gg/gg.c:1358
+#: src/protocols/gg/gg.c:1717
 #, fuzzy
 msgid "This chat name is already in use"
 msgstr "�e��罟�罅�綏牙�絖���"
 
-#: src/protocols/gg/gg.c:1435
+#: src/protocols/gg/gg.c:1799
 #, fuzzy
 msgid "Not connected to the server."
 msgstr "��群膓���罩∵��篌堺�������g���"
 
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-#, fuzzy
-msgid "e-Mail"
-msgstr "�糸��灸散"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "荐糸���亥�� Jabber 絽恰��"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1515
-#, fuzzy
-msgid "Change password"
-msgstr "篆��劫�腆�"
-
-#: src/protocols/gg/gg.c:1520
+#: src/protocols/gg/gg.c:1822
+#, fuzzy
+msgid "Find buddies..."
+msgstr "����臀���絅遵�荐㊦�榊�域��(_D)"
+
+#: src/protocols/gg/gg.c:1828
+#, fuzzy
+msgid "Change password..."
+msgstr "篆��劫�腆�..."
+
+#: src/protocols/gg/gg.c:1834
 #, fuzzy
 msgid "Upload buddylist to Server"
 msgstr "���阪ソ�������遺失�����"
 
-#: src/protocols/gg/gg.c:1523
+#: src/protocols/gg/gg.c:1838
 #, fuzzy
 msgid "Download buddylist from Server"
 msgstr "絨�篌堺�������絅遵���������"
 
-#: src/protocols/gg/gg.c:1526
+#: src/protocols/gg/gg.c:1842
 #, fuzzy
 msgid "Delete buddylist from Server"
 msgstr "絨�篌堺�������絅遵���������"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1532
-#, fuzzy
-msgid "Load buddylist from file"
+#: src/protocols/gg/gg.c:1846
+#, fuzzy
+msgid "Save buddylist to file..."
+msgstr "�峨�絅遵�羝����井�罅�筝�"
+
+#: src/protocols/gg/gg.c:1850
+#, fuzzy
+msgid "Load buddylist from file..."
 msgstr "��失��������ュソ������"
 
 #. magic
@@ -5164,37 +5857,41 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: src/protocols/gg/gg.c:1937
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu ��絎�罔∞�"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: src/protocols/gg/gg.c:1938
 msgid "Polish popular IM"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1665
+msgstr "羈∵�㊤撮��罩∴����恰����荐�腮�綣�"
+
+#: src/protocols/gg/gg.c:1986
 #, fuzzy
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ��絨�綣���"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+#: src/protocols/irc/cmds.c:43
+#: src/protocols/silc/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "���ョ����篁わ�%s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: src/protocols/irc/cmds.c:485
+#: src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "�上����筝脂��削�%s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: src/protocols/irc/cmds.c:489
+#: src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1284
 msgid "No topic is set"
 msgstr "羃���荐㊤�筝脂�"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
+#: src/protocols/irc/dcc_send.c:272
+#: src/protocols/yahoo/yahoo_filexfer.c:173
 #: src/protocols/yahoo/yahoo_filexfer.c:182
 #: src/protocols/yahoo/yahoo_filexfer.c:191
 #, fuzzy
@@ -5205,83 +5902,97 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim �≧������h�遵����"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "蕁�ず���ヨ������主��篋����"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "羃������ヨ���"
 
-#: src/protocols/irc/irc.c:80
+#: src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "�����g�羃����檎�������ヨ�����"
 
-#: src/protocols/irc/irc.c:83
+#: src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s �����ヨ���"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: src/protocols/irc/irc.c:102
+#: src/protocols/irc/irc.c:529
+#: src/protocols/irc/irc.c:551
 msgid "Server has disconnected"
 msgstr "篌堺����群��罩∫�g�"
 
-#: src/protocols/irc/irc.c:188
+#: src/protocols/irc/irc.c:187
 msgid "View MOTD"
 msgstr "蕁�ず���ヨ��� (MOTD)"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:199
+#: src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "�脂��(_C)鐚�"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:205
+#: src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "絲�腆�(_P)鐚�"
 
-#: src/protocols/irc/irc.c:238
+#: src/protocols/irc/irc.c:237
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC �援┗筝�������腥榊�遵���"
 
 # XXX ��⑮
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: src/protocols/irc/irc.c:265
+#: src/protocols/jabber/jabber.c:481
+#: src/protocols/jabber/jabber.c:818
 msgid "SSL support unavailable"
 msgstr "羃��� SSL ���"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: src/protocols/irc/irc.c:276
+#: src/protocols/simple/simple.c:392
+#: src/protocols/simple/simple.c:1237
 msgid "Couldn't create socket"
 msgstr "���綮榊� Socket"
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: src/protocols/irc/irc.c:347
+#: src/protocols/jabber/jabber.c:354
+#: src/protocols/oscar/oscar.c:1732
+#: src/protocols/oscar/oscar.c:1800
 msgid "Couldn't connect to host"
 msgstr "�≧��e�遺失����"
 
 # NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX ��罩g����������≧��g��活�茘���������腴��羣���鐚�筝������g�紊掩����鐚�荀�筝�����腴�鐚�
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:372
+#: src/protocols/jabber/jabber.c:381
 msgid "Connection Failed"
 msgstr "�≧��g��活�茘���������腴��羣�"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: src/protocols/irc/irc.c:375
+#: src/protocols/jabber/jabber.c:384
 msgid "SSL Handshake Failed"
 msgstr "SSL 篋よ�紊掩��"
 
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: src/protocols/irc/irc.c:526
+#: src/protocols/irc/irc.c:548
 msgid "Read error"
 msgstr "莅������"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: src/protocols/irc/irc.c:687
+#: src/protocols/silc/chat.c:1419
+#: src/protocols/yahoo/yahoochat.c:1378
 msgid "Users"
 msgstr "篏睡����"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/irc/irc.c:690
+#: src/protocols/sametime/sametime.c:3324
+#: src/protocols/silc/chat.c:1422
+#: src/protocols/silc/ops.c:1380
+#: src/protocols/yahoo/yahoochat.c:1387
 msgid "Topic"
 msgstr "筝脂�"
 
@@ -5293,34 +6004,44 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: src/protocols/irc/irc.c:797
 msgid "IRC Protocol Plugin"
 msgstr "IRC ��絎�罔∞�"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: src/protocols/irc/irc.c:798
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "莠�絅順�� IRC ��絎�罔∞�"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: src/protocols/irc/irc.c:817
+#: src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1765
+#: src/protocols/napster/napster.c:714
+#: src/protocols/sametime/sametime.c:5581
+#: src/protocols/silc/ops.c:1242
+#: src/protocols/silc/ops.c:1344
+#: src/protocols/simple/simple.c:1448
 msgid "Server"
 msgstr "篌堺����"
 
-#: src/protocols/irc/irc.c:825
+#: src/protocols/irc/irc.c:823
 msgid "Encodings"
 msgstr "膩�⊆"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:826
+#: src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:676
+#: src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/ops.c:1189
+#: src/protocols/silc/ops.c:1191
+#: src/protocols/silc/ops.c:1338
+#: src/protocols/silc/ops.c:1340
+#: src/protocols/silc/silc.c:919
 msgid "Username"
 msgstr "篏睡����"
 
-#: src/protocols/irc/irc.c:831
+#: src/protocols/irc/irc.c:829
 msgid "Real name"
 msgstr "紮���"
 
@@ -5328,7 +6049,7 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
+#: src/protocols/irc/irc.c:837
 #, fuzzy
 msgid "Use SSL"
 msgstr "SSL"
@@ -5354,14 +6075,16 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "�≧�胼�罩� %s鐚�胼�罩∽���群羯�"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:213
+#: src/protocols/irc/msgs.c:233
 #: src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s鐚�</b>%s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/irc/msgs.c:213
+#: src/protocols/oscar/oscar.c:5994
+#: src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "�援┗"
 
@@ -5373,19 +6096,24 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(綏臥�茘�)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
+#: src/protocols/irc/msgs.c:221
+#: src/protocols/irc/msgs.c:227
+#: src/protocols/irc/msgs.c:228
+#: src/protocols/irc/msgs.c:239
 #: src/protocols/yahoo/yahoo_profile.c:660
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s鐚�</b>%s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:228
+#: src/protocols/silc/ops.c:1183
+#: src/protocols/silc/ops.c:1332
+#: src/protocols/yahoo/yahoo_profile.c:1009
 msgid "Realname"
 msgstr "紮���"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:239
+#: src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "�����脂��"
 
@@ -5432,105 +6160,104 @@
 msgstr "�� %s �х��篏睡����鐚�%s"
 
 #  XXX
-#: src/protocols/irc/msgs.c:482
+#: src/protocols/irc/msgs.c:491
 msgid "Time Response"
 msgstr "��������"
 
 #  XXX
-#: src/protocols/irc/msgs.c:483
+#: src/protocols/irc/msgs.c:492
 msgid "The IRC server's local time is:"
 msgstr "IRC 篌堺�����箙������削�"
 
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:503
 msgid "No such channel"
 msgstr "羃����e���脂��"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: src/protocols/irc/msgs.c:514
 msgid "no such channel"
 msgstr "羃����e���脂��"
 
-#: src/protocols/irc/msgs.c:508
+#: src/protocols/irc/msgs.c:517
 msgid "User is not logged in"
 msgstr "篏睡����羃����糸��"
 
-#: src/protocols/irc/msgs.c:513
+#: src/protocols/irc/msgs.c:522
 msgid "No such nick or channel"
 msgstr "羃����e���援┗���脂��"
 
-#: src/protocols/irc/msgs.c:533
+#: src/protocols/irc/msgs.c:542
 msgid "Could not send"
 msgstr "�≧�����"
 
-#: src/protocols/irc/msgs.c:589
+#: src/protocols/irc/msgs.c:598
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "����茴���茫����������� %s��"
 
-#: src/protocols/irc/msgs.c:590
+#: src/protocols/irc/msgs.c:599
 msgid "Invitation only"
 msgstr "����茴���茫���"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:701
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��← %s 荼√�削�(%s)"
 
-#: src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:706
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "茴� %s 荼√�� (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: src/protocols/irc/msgs.c:730
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "罔≦� (%s %s) 茴� %s 荐㊤�"
 
-#: src/protocols/irc/msgs.c:805
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
+#: src/protocols/irc/msgs.c:814
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "篌堺������腟�篋�������絎���絽活����腮縁���腮延賢紊ф������≧��絖�����"
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:853
 msgid "Cannot change nick"
 msgstr "�≧��贋�号�援┗"
 
-#: src/protocols/irc/msgs.c:844
+#: src/protocols/irc/msgs.c:853
 msgid "Could not change nick"
 msgstr "�≧��贋�号�援┗"
 
-#: src/protocols/irc/msgs.c:865
+#: src/protocols/irc/msgs.c:874
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "���∫��篋��脂��%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: src/protocols/irc/msgs.c:916
 msgid "Error: invalid PONG from server"
 msgstr "���鐚�箴���失������ PONG �≧��"
 
-#: src/protocols/irc/msgs.c:909
+#: src/protocols/irc/msgs.c:918
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING ��膈�����綮狗�駕�%lu腱�"
 
-#: src/protocols/irc/msgs.c:984
+#: src/protocols/irc/msgs.c:993
 #, c-format
 msgid "Cannot join %s:"
 msgstr "�≧����� %s鐚�"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:994
+#: src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�≧����ラ�脂��"
 
 #  NOTE�������≧�篏睡������荅我�������筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/irc/msgs.c:1019
+#: src/protocols/irc/msgs.c:1028
 #, fuzzy
 msgid "Nick or channel is temporarily unavailable."
 msgstr "�����≧�篏睡�����������"
 
-#: src/protocols/irc/msgs.c:1031
+#: src/protocols/irc/msgs.c:1040
 #, c-format
 msgid "Wallops from %s"
 msgstr "箴��� %s �� Wallops"
@@ -5540,212 +6267,166 @@
 msgstr "action &lt;荀��決�����篏�&gt;鐚��決�筝�����篏���"
 
 #: src/protocols/irc/parse.c:115
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
 msgstr "away [荐���]鐚�荐㊤�筝����∫��荐�����������∫����筝���絎�篁私�荐�����"
 
 # XXX ��⑮
 #: src/protocols/irc/parse.c:116
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;�援┗1&gt; [�援┗2] ...鐚�腱脂�ゆ����篋榊�����脂��膊∞������罨�����������傑��"
-"���脂��膊∞��������罨������遵��決�������篏���"
-
+#, fuzzy
+msgid "chanserv: Send a command to chanserv"
+msgstr "quote [...]鐚����坂��� RAW ��篁ゅ�遺失������"
+
+# XXX ��⑮
 #: src/protocols/irc/parse.c:117
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;�援┗1&gt; [�援┗2] ...鐚�腱脂�ゆ����篋榊�����取���罨�����胼�罩∽��篋�篋阪���脂��"
-"筝㊦�取;筝��句��荐�茫���������傑�����脂��膊∞��������罨������遵��決�������篏���"
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;�援┗1&gt; [�援┗2] ...鐚�腱脂�ゆ����篋榊�����脂��膊∞������罨�����������傑�����脂��膊∞��������罨������遵��決�������篏���"
 
 #: src/protocols/irc/parse.c:118
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt�援┗&gt; [��紊��]鐚���茫�����篋坂����ユ������絎����脂��鐚�����������������"
-"�脂����"
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;�援┗1&gt; [�援┗2] ...鐚�腱脂�ゆ����篋榊�����取���罨�����胼�罩∽��篋�篋阪���脂��筝㊦�取;筝��句��荐�茫���������傑�����脂��膊∞��������罨������遵��決�������篏���"
 
 #: src/protocols/irc/parse.c:119
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;��紊��1&gt;[,��紊��2][,...] [絲���1[,絲���2][,...]]鐚�篁ユ��絎���絲��逸�絋���腟�"
-"篋�筝�����荀�鐚����ユ����絎�����紊����"
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt�援┗&gt; [��紊��]鐚���茫�����篋坂����ユ������絎����脂��鐚������������������脂����"
 
 #: src/protocols/irc/parse.c:120
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;��紊��1&gt;[,��紊��2][,...] [絲���1[,絲���2][,...]]鐚�篁ユ��絎���絲��逸�絋�"
-"��腟��筝�����荀�鐚����ユ����絎�����紊����"
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;��紊��1&gt;[,��紊��2][,...] [絲���1[,絲���2][,...]]鐚�篁ユ��絎���絲��逸�絋���腟��筝�����荀�鐚����ユ����絎�����紊����"
 
 #: src/protocols/irc/parse.c:121
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;�援┗&gt; [荐���]鐚�絨�����篏睡����荼√�咲�脂����������傑�����脂��膊∞������罨���"
-"���遵��決�������篏���"
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;��紊��1&gt;[,��紊��2][,...] [絲���1[,絲���2][,...]]鐚�篁ユ��絎���絲��逸�絋���腟��筝�����荀�鐚����ユ����絎�����紊����"
 
 #: src/protocols/irc/parse.c:122
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list鐚����榊������恐腟>�����紊��羝�����<i>茫�羈������篋�篌堺�����������決�篋�������篏�"
-"箙�緇�鐚�綣決�筝㊥②�����g���</i>"
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;�援┗&gt; [荐���]鐚�絨�����篏睡����荼√�咲�脂����������傑�����脂��膊∞������罨������遵��決�������篏���"
 
 #: src/protocols/irc/parse.c:123
-msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;荀��決�����篏�&gt;鐚��決�筝�����篏���"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list鐚����榊������恐腟>�����紊��羝�����<i>茫�羈������篋�篌堺�����������決�篋�������篏�箙�緇�鐚�綣決�筝㊥②�����g���</i>"
 
 #: src/protocols/irc/parse.c:124
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;�援┗|�脂��&gt;鐚�荐㊤���茹i�ら�脂���延戎����罔≦���"
-
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;荀��決�����篏�&gt;鐚��決�筝�����篏���"
+
+# XXX ��⑮
 #: src/protocols/irc/parse.c:125
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����鐚��水���渇���医����"
-"�脂��筝㍼���"
+#, fuzzy
+msgid "memoserv: Send a command to memoserv"
+msgstr "quote [...]鐚����坂��� RAW ��篁ゅ�遺失������"
 
 #: src/protocols/irc/parse.c:126
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;�援┗|�脂��&gt;鐚�荐㊤���茹i�ら�脂���延戎����罔≦���"
+
+#: src/protocols/irc/parse.c:127
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����鐚��水���渇���医���冗�脂��筝㍼���"
+
+#: src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [�脂��]鐚����榊�������脂��筝㊦��篏睡����羝�����"
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
-msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;�井�援┗&gt;鐚��壕������援┗��"
-
-#: src/protocols/irc/parse.c:128
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;�援┗&gt; [�援┗] ...鐚�莖�������篏睡�������脂��膊∞������罨�����������傑������"
-"��膊∞������罨������遵�決�������篏���"
-
 #: src/protocols/irc/parse.c:129
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;荐���&gt;鐚�絋�������ラ������更篁�藝主����鐚�����醇���莨��篏睡��������"
-"篁ゃ��"
-
+#: src/protocols/jabber/jabber.c:1610
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;�井�援┗&gt;鐚��壕������援┗��"
+
+# XXX ��⑮
 #: src/protocols/irc/parse.c:130
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [�脂��] [荐���]鐚��∫���������脂������絎����脂������絎��脂������������絎����榊��荐�"
-"����"
+#, fuzzy
+msgid "nickserv: Send a command to nickserv"
+msgstr "quote [...]鐚����坂��� RAW ��篁ゅ�遺失������"
 
 #: src/protocols/irc/parse.c:131
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [�援┗]鐚��ヨ���筝���篏睡������膓画君������綺�����������絎�篏睡������鐚��ヨ�篌堺����"
-"��������綺����"
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;�援┗&gt; [�援┗] ...鐚�莖�������篏睡�������脂��膊∞������罨�����������傑�����脂��膊∞������罨������遵�決�������篏���"
 
 #: src/protocols/irc/parse.c:132
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����鐚��水���守���医��"
-"�冗�脂��鐚���"
-
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;荐���&gt;鐚�絋�������ラ������更篁�藝主����鐚�����醇���莨��篏睡��������篁ゃ��"
+
+# XXX ��⑮
 #: src/protocols/irc/parse.c:133
+#, fuzzy
+msgid "operserv: Send a command to operserv"
+msgstr "quote [...]鐚����坂��� RAW ��篁ゅ�遺失������"
+
+#: src/protocols/irc/parse.c:134
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [�脂��] [荐���]鐚��∫���������脂������絎����脂������絎��脂������������絎����榊��荐�����"
+
+#: src/protocols/irc/parse.c:135
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [�援┗]鐚��ヨ���筝���篏睡������膓画君������綺�����������絎�篏睡������鐚��ヨ�篌堺������������綺����"
+
+#: src/protocols/irc/parse.c:136
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����鐚��水���守���医���冗�脂��鐚���"
+
+#: src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [荐���]鐚���失�����∝�鐚�筝����堺��絎���荐�����"
 
 # XXX ��⑮
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]鐚����坂��� RAW ��篁ゅ�遺失������"
 
-#: src/protocols/irc/parse.c:135
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;�援┗&gt; [荐���]鐚�絨�����篏睡����荼√�咲�脂����������傑�����脂��膊∞��������"
-"罨������遵��決�������篏���"
-
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:139
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;�援┗&gt; [荐���]鐚�絨�����篏睡����荼√�咲�脂����������傑�����脂��膊∞��������罨������遵��決�������篏���"
+
+#: src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time鐚�蕁�ず IRC 篌堺���������遺����井������"
 
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [�遺源蕁�]鐚�罟∵���篆��拷�脂��筝脂�"
 
-#: src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;鐚�荐㊤���茹i�や戎����罔≦���"
 
-#: src/protocols/irc/parse.c:139
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;�援┗&gt; [�援┗] ...鐚�莖���篏睡���������取���罨�����������傑�����脂��膊∞��"
-"������罨������遵�決�������篏���"
-
-#: src/protocols/irc/parse.c:140
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;message&gt;鐚�絋�������ラ������更篁�藝主����鐚�����遵葦羃���莨��篏睡���"
-"篋���"
-
-#: src/protocols/irc/parse.c:141
+#: src/protocols/irc/parse.c:143
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;�援┗&gt; [�援┗] ...鐚�莖���篏睡���������取���罨�����������傑�����脂��膊∞��������罨������遵�決�������篏���"
+
+#: src/protocols/irc/parse.c:144
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;message&gt;鐚�絋�������ラ������更篁�藝主����鐚�����遵葦羃���莨��篏睡���篋���"
+
+#: src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [篌堺������腮�] &lt;�援┗&gt;鐚���緇�篏睡����莖�荐���"
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s ��膈�����鐚�%lu 腱�"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "CTCP PING ��膈�"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
+#: src/protocols/irc/parse.c:543
+#: src/protocols/irc/parse.c:547
+#: src/protocols/oscar/oscar.c:1641
+#: src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:688
+#: src/protocols/toc/toc.c:704
 #: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "��罩∫�g���"
 
 #: src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-"�糸�ラ����篌堺������荀�篏睡�� TLS/SSL��茫���験��羝�������篆��劫験����荀�腦�藥��吾��TLS ����"
-"�������檎����"
+msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
+msgstr "�糸�ラ����篌堺������荀�篏睡�� TLS/SSL��茫���験��羝�������篆��劫験����荀�腦�藥��吾��TLS �����������檎����"
 
 #: src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -5755,105 +6436,141 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "篌堺������荀�膓��掩�����絲���筝我��画�����茯�茘�"
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "�≧����篌堺����������"
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:232
+msgid "Server couldn't authenticate you without a password"
+msgstr ""
+
+#: src/protocols/jabber/auth.c:235
+#: src/protocols/jabber/auth.c:236
+#: src/protocols/jabber/auth.c:396
+#: src/protocols/jabber/auth.c:397
+#: src/protocols/jabber/auth.c:478
+#: src/protocols/jabber/auth.c:479
 msgid "Plaintext Authentication"
 msgstr "����茯�茘�"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
+#: src/protocols/jabber/auth.c:237
+#: src/protocols/jabber/auth.c:398
+#: src/protocols/jabber/auth.c:480
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "篌堺������荀�膓��掩�����絲���筝我��画�����茯�茘�����荐延研膵主��画�茯�茘�鐚�"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:243
+#: src/protocols/jabber/auth.c:406
+#: src/protocols/jabber/auth.c:488
 msgid "Server does not use any supported authentication method"
 msgstr "篌堺����研筝���箴�篁私�筝�腮�←��吡��茯�茘��劫�"
 
+#. This should never happen!
+#: src/protocols/jabber/auth.c:319
+#: src/protocols/jabber/auth.c:441
+#: src/protocols/jabber/auth.c:609
+#: src/protocols/jabber/auth.c:742
+#: src/protocols/jabber/auth.c:754
+#: src/protocols/jabber/auth.c:773
+#: src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "�≧����篌堺����������"
+
 # XXX 絅遵���鋋����茘�����緇��拷��
-#: src/protocols/jabber/auth.c:396
+#: src/protocols/jabber/auth.c:630
 msgid "Invalid challenge from server"
 msgstr "篌堺������箴�篋��≧����薊�茘�����"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+# NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
+#: src/protocols/jabber/auth.c:717
+#, fuzzy
+msgid "SASL error"
+msgstr "莅������"
+
+#: src/protocols/jabber/buddy.c:249
+#: src/protocols/jabber/buddy.c:667
+#: src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "����"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:250
+#: src/protocols/jabber/buddy.c:680
+#: src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "紮�"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/buddy.c:251
+#: src/protocols/jabber/buddy.c:684
 msgid "Given Name"
 msgstr "��"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/buddy.c:253
+#: src/protocols/jabber/jabber.c:736
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/buddy.c:254
+#: src/protocols/jabber/buddy.c:726
 msgid "Street Address"
 msgstr "茵����医��"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:255
+#: src/protocols/jabber/buddy.c:722
 msgid "Extended Address"
 msgstr "�医��(膾�)"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: src/protocols/jabber/buddy.c:256
+#: src/protocols/jabber/buddy.c:730
 msgid "Locality"
 msgstr "絽�鐚��"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/buddy.c:734
 msgid "Region"
 msgstr "���鎴�"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: src/protocols/jabber/buddy.c:258
+#: src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/jabber.c:726
 msgid "Postal Code"
 msgstr "�級������"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:259
+#: src/protocols/jabber/buddy.c:743
+#: src/protocols/silc/silc.c:929
 msgid "Country"
 msgstr "��絎�"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:260
+#: src/protocols/jabber/buddy.c:754
 #: src/protocols/jabber/buddy.c:761
 msgid "Telephone"
 msgstr "�肢�"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: src/protocols/jabber/buddy.c:262
+#: src/protocols/jabber/buddy.c:795
 msgid "Organization Name"
 msgstr "��絮��罕�"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:799
 msgid "Organization Unit"
 msgstr "��絮�����"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:808
 msgid "Role"
 msgstr "�決岡"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:701
+#: src/protocols/oscar/oscar.c:6029
 msgid "Birthday"
 msgstr "����"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:567
+#: src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "膩�鹿 Jabber vCard"
 
 #: src/protocols/jabber/buddy.c:569
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "篁ヤ�������罨�篏��醇���御���х������Ű�莠後�ユ���活叱�ユ���喝゛�ョ��荐����喝���"
 
 #: src/protocols/jabber/buddy.c:616
@@ -5865,19 +6582,23 @@
 # NOTE Jabber ��絎�����Resource��筝�荅���絽娯���筝�腮�戎���������絖�筝駕�
 # NOTE ��札茵�ず������井�劫�����糸�ヤ�����綵≫�鐚�������絲����臀�
 # NOTE 荀� http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: src/protocols/jabber/buddy.c:642
+#: src/protocols/jabber/jabber.c:1768
 msgid "Resource"
 msgstr ""
 
 # NOTE: 羈���緇傑����茘���膃��������鐚����㊥��茘����銀�����鐚��ユ���活⑮篋�篋�
 # NOTE: ��恐筝�綛冗���亥�eぇ絖後����掩���ュ����鐚��上����箙�莊����㊥��PO罟�������羈��後��
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:688
+#: src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "�掩���ュ��"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:706
+#: src/protocols/jabber/jabber.c:711
+#: src/protocols/oscar/oscar.c:6047
+#: src/protocols/oscar/oscar.c:6055
+#: src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "�医��"
 
@@ -5920,24 +6641,30 @@
 msgid "Unsubscribe"
 msgstr "緇�絅遵�����賢腱脂��"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/jabber/buddy.c:1085
+#: src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688
+#: src/protocols/jabber/jabber.c:1073
+#: src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "���"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/buddy.c:1091
+#: src/protocols/jabber/jabber.c:1102
 msgid "Chatty"
 msgstr "�活��紊�"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: src/protocols/jabber/buddy.c:1095
+#: src/protocols/jabber/jabber.c:1118
+#: src/status.c:158
 msgid "Extended Away"
 msgstr "�傑�����∫��"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: src/protocols/jabber/buddy.c:1097
+#: src/protocols/jabber/jabber.c:1126
+#: src/protocols/oscar/oscar.c:701
+#: src/protocols/oscar/oscar.c:7861
+#: src/protocols/sametime/sametime.c:3253
 msgid "Do Not Disturb"
 msgstr "茫��炊����"
 
@@ -5949,13 +6676,16 @@
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+#: src/protocols/jabber/buddy.c:1331
+#: src/protocols/jabber/jabber.c:701
+#: src/protocols/oscar/oscar.c:6004
+#: src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "��"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: src/protocols/jabber/buddy.c:1336
+#: src/protocols/jabber/jabber.c:706
+#: src/protocols/oscar/oscar.c:6005
 msgid "Last Name"
 msgstr "紮�"
 
@@ -5963,7 +6693,8 @@
 msgid "E-Mail Address"
 msgstr "�糸��灸散"
 
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
+#: src/protocols/jabber/buddy.c:1355
+#: src/protocols/jabber/buddy.c:1356
 #, fuzzy
 msgid "Search for Jabber users"
 msgstr "篏睡���糸��灸散�医����絨�絅遵�"
@@ -5989,7 +6720,8 @@
 msgid "Search Directory"
 msgstr "��絨�(_S)鐚�"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
+#: src/protocols/jabber/chat.c:41
+#: src/protocols/oscar/oscar.c:7350
 #: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "��紊��(_R)鐚�"
@@ -6016,7 +6748,8 @@
 msgid "%s is not a valid server name"
 msgstr "%s 筝������������篌堺������腮�"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:230
+#: src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "篌堺������腮援�≧��"
 
@@ -6027,7 +6760,8 @@
 msgstr "%s 筝�������������援┗"
 
 # NOTE Arto Alakulju �主憗��room handle���恰����紊���т戎�����������援┗��綏�
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:236
+#: src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "�援┗�≧��"
 
@@ -6035,7 +6769,8 @@
 msgid "Configuration error"
 msgstr "荐㊤����"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:404
+#: src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "�≧�荐㊤�"
 
@@ -6048,7 +6783,8 @@
 msgid "This room is not capable of being configured"
 msgstr "������紊��筝���吧┃絎�"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: src/protocols/jabber/chat.c:471
+#: src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "荐糸�����"
 
@@ -6059,8 +6795,9 @@
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "���� MUC 罔≦�����紊���т���吂信�号�援┗"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: src/protocols/jabber/chat.c:678
+#: src/protocols/jabber/chat.c:689
+#: src/protocols/silc/ops.c:1449
 #, fuzzy
 msgid "Error retrieving room list"
 msgstr "莅�����紊��羝������主�����"
@@ -6088,84 +6825,100 @@
 msgid "Error initializing session"
 msgstr "絨�綏ヤ�����画���紮������主��篋����"
 
-#: src/protocols/jabber/jabber.c:215
+#: src/protocols/jabber/jabber.c:236
+#: src/protocols/jabber/jabber.c:251
 msgid "Write error"
 msgstr "絲��ラ���"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:289
+#: src/protocols/jabber/jabber.c:321
 msgid "Read Error"
 msgstr "莅������"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: src/protocols/jabber/jabber.c:407
+#: src/protocols/jabber/jabber.c:828
 msgid "Unable to create socket"
 msgstr "�≧�綮榊� Socket"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: src/protocols/jabber/jabber.c:451
+#: src/protocols/jabber/jabber.c:788
 msgid "Invalid Jabber ID"
 msgstr "Jabber 絽活���≧��"
 
-#: src/protocols/jabber/jabber.c:473
+#: src/protocols/jabber/jabber.c:521
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "����荐糸�� %s@%s"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:523
+#: src/protocols/jabber/jabber.c:524
 msgid "Registration Successful"
 msgstr "荐糸������"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:530
+#: src/protocols/jabber/jabber.c:1354
 msgid "Unknown Error"
 msgstr "���ラ���"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:532
+#: src/protocols/jabber/jabber.c:533
 msgid "Registration Failed"
 msgstr "荐糸��紊掩��"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:644
+#: src/protocols/jabber/jabber.c:645
 msgid "Already Registered"
 msgstr "綏牙�荐糸��"
 
-#: src/protocols/jabber/jabber.c:643
+#: src/protocols/jabber/jabber.c:691
 msgid "E-Mail"
 msgstr "�糸��灸散"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: src/protocols/jabber/jabber.c:721
+#: src/protocols/oscar/oscar.c:6049
+#: src/protocols/oscar/oscar.c:6057
 msgid "State"
 msgstr "��鐚鎴�"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:731
+#: src/protocols/silc/ops.c:1069
+#: src/protocols/silc/silc.c:687
+#: src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "�肢�"
 
-#: src/protocols/jabber/jabber.c:693
+#: src/protocols/jabber/jabber.c:741
 msgid "Date"
 msgstr "�ユ��"
 
-#: src/protocols/jabber/jabber.c:701
+#: src/protocols/jabber/jabber.c:749
 msgid "Please fill out the information below to register your new account."
 msgstr "�堺�����医験�区┿��鐚�茫�紂��筝���莖���鐚�"
 
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+#: src/protocols/jabber/jabber.c:752
+#: src/protocols/jabber/jabber.c:753
 msgid "Register New Jabber Account"
 msgstr "荐糸���亥�� Jabber 絽恰��"
 
-#: src/protocols/jabber/jabber.c:842
+#: src/protocols/jabber/jabber.c:897
 msgid "Initializing Stream"
 msgstr "筝我���紮�筝�"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:903
+#: src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "茯�茘�筝�"
 
-#: src/protocols/jabber/jabber.c:857
+#: src/protocols/jabber/jabber.c:912
 msgid "Re-initializing Stream"
 msgstr "筝我����医��紮�筝�"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: src/protocols/jabber/jabber.c:983
+#: src/protocols/jabber/jabber.c:1332
+#: src/protocols/jabber/jabber.c:1373
+#: src/protocols/jabber/jabber.c:1406
+#: src/protocols/oscar/oscar.c:767
+#: src/protocols/oscar/oscar.c:7647
 msgid "Not Authorized"
 msgstr "���茘�"
 
@@ -6174,86 +6927,90 @@
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:1026
 msgid "Both"
 msgstr "綏俄��梧�茘�"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:973
+#: src/protocols/jabber/jabber.c:1028
 msgid "From (To pending)"
 msgstr "綏画�茘�絨��刻�篏�篁�膈�緇�絨��壕�茘����"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:975
+#: src/protocols/jabber/jabber.c:1030
 msgid "From"
 msgstr "綏画�茘�絨���"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:978
+#: src/protocols/jabber/jabber.c:1033
 msgid "To"
 msgstr "綏牙�峨��壕�茘�"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:1035
 msgid "None (To pending)"
 msgstr "�¥�篏�罩g�緇�絨��壕�茘����"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "��"
-
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:984
+#: src/protocols/jabber/jabber.c:1039
 msgid "Subscription"
 msgstr "茯�茘�����"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
+#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1110
+#: src/protocols/jabber/jabber.c:1118
+#: src/protocols/jabber/jabber.c:1126
 msgid "Priority"
 msgstr "����罨≦�"
 
-#: src/protocols/jabber/jabber.c:1093
+#: src/protocols/jabber/jabber.c:1148
 msgid "Password Changed"
 msgstr "絲�腆寂信�号����"
 
-#: src/protocols/jabber/jabber.c:1094
+#: src/protocols/jabber/jabber.c:1149
 msgid "Your password has been changed."
 msgstr "����篆��剛�����絲�腆若��"
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1154
 msgid "Error changing password"
 msgstr "篆��劫�腆惹�����榊憥���"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1210
 msgid "Password (again)"
 msgstr "��絲�腆種���罨∞∈茯�鐚�"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1216
 msgid "Change Jabber Password"
 msgstr "篆��� Jabber 絲�腆�"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1216
 msgid "Please enter your new password"
 msgstr "茫�莠後�ユ�����医�腆�"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "荐㊤�篏睡����莖�荐�"
+#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/oscar/oscar.c:8282
+#: src/protocols/silc/silc.c:1009
+msgid "Set User Info..."
+msgstr "荐㊤�篏睡����莖�荐�..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "篆��劫�腆�"
+#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/oscar/oscar.c:8293
+#: src/protocols/silc/silc.c:1005
+msgid "Change Password..."
+msgstr "篆��劫�腆�..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
+#: src/protocols/jabber/jabber.c:1236
+#, fuzzy
+msgid "Search for Users..."
 msgstr "��絨�(_S)鐚�"
 
 # NOTE 荀� http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1312
 msgid "Bad Request"
 msgstr "�渇��膓峨�����主��篋�筝��������"
 
@@ -6261,50 +7018,51 @@
 #  NOTE鐚�紊ф�篆����糸�ョ����篏睡�������絖�筝駕���綏ヤ�����糸�ワ�篁ヨ�雁�≧�絖���
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1314
 msgid "Conflict"
 msgstr "��腮掩��篏���茵�腦�"
 
-#: src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1316
 msgid "Feature Not Implemented"
 msgstr "荅峨���遵����篏�"
 
 #  NOTE Jabber ��� <forbidden/>鐚����閫e幻鐚�茵�ず罨���筝�紊�鐚�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1318
 msgid "Forbidden"
 msgstr "罨���筝�紊�"
 
 #  NOTE Jabber ��� <gone/>鐚�茵�ず篏睡������篌堺�����丞�筝�膩�鐚�緇�箴��≫�膩�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1320
 msgid "Gone"
 msgstr "綏臥�∝�"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: src/protocols/jabber/jabber.c:1322
+#: src/protocols/jabber/jabber.c:1396
 msgid "Internal Server Error"
 msgstr "篌堺�����ч�����"
 
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1324
 msgid "Item Not Found"
 msgstr "�������上��"
 
-#: src/protocols/jabber/jabber.c:1271
+#: src/protocols/jabber/jabber.c:1326
 msgid "Malformed Jabber ID"
 msgstr "�後���� Jabber ID"
 
 #  NOTE Jabber ��� <not-acceptable/>鐚�茵�ず�����榊��荀�羆����初���遺失�������銀散篋堺��荐�筝���
 #  NOTE 罌�篁駈�箴�絋�荐���賢����胼�絖�鐚�鐚�篁ヨ�雁�≧�絖���
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1328
 msgid "Not Acceptable"
 msgstr "�≧��ュ�"
 
-#: src/protocols/jabber/jabber.c:1275
+#: src/protocols/jabber/jabber.c:1330
 msgid "Not Allowed"
 msgstr "筝�茴���荐�"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1334
 msgid "Payment Required"
 msgstr "綽���篁�罨�"
 
@@ -6312,78 +7070,78 @@
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE�������≧���機����荅我���筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1336
 msgid "Recipient Unavailable"
 msgstr "�����≧���機�ユ�区��"
 
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1340
 msgid "Registration Required"
 msgstr "綽���荐糸��"
 
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1342
 msgid "Remote Server Not Found"
 msgstr "��腴�失�������上��"
 
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1344
 msgid "Remote Server Timeout"
 msgstr "��腴�失�����丈��"
 
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1346
 msgid "Server Overloaded"
 msgstr "篌堺�����莠�"
 
 #  NOTE Jabber ��� <service-unavailable/>鐚�茵�ず篌堺�����九�遺����靸��������篁�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1348
 msgid "Service Unavailable"
 msgstr "筝���箴�荅臥������"
 
 #  NOTE Jabber ��� <subscription-required/>鐚�茵�ず篏睡������������
 #  NOTE 綽���篋�����緇���Subscription��鐚�茯�茘�鐚�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1350
 msgid "Subscription Required"
 msgstr "綽���茯�茘�"
 
-#: src/protocols/jabber/jabber.c:1297
+#: src/protocols/jabber/jabber.c:1352
 msgid "Unexpected Request"
 msgstr "��������荀�羆�"
 
-#: src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1359
 msgid "Authorization Aborted"
 msgstr "茯�茘���羔�"
 
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1361
 msgid "Incorrect encoding in authorization"
 msgstr "茯�茘��������膩�⊆"
 
-#: src/protocols/jabber/jabber.c:1309
+#: src/protocols/jabber/jabber.c:1364
 msgid "Invalid authzid"
 msgstr "�≧���� authzid"
 
 # XXX 荀�荀��ヨ⑮��
-#: src/protocols/jabber/jabber.c:1312
+#: src/protocols/jabber/jabber.c:1367
 msgid "Invalid Authorization Mechanism"
 msgstr "�≧����茯�茘�罘���"
 
-#: src/protocols/jabber/jabber.c:1315
+#: src/protocols/jabber/jabber.c:1370
 msgid "Authorization mechanism too weak"
 msgstr "茯�茘�罘��九お��綣延�"
 
-#: src/protocols/jabber/jabber.c:1320
+#: src/protocols/jabber/jabber.c:1375
 msgid "Temporary Authentication Failure"
 msgstr "茯�茘�����紊掩��"
 
-#: src/protocols/jabber/jabber.c:1322
+#: src/protocols/jabber/jabber.c:1377
 msgid "Authentication Failure"
 msgstr "茯�茘�紊掩��"
 
-#: src/protocols/jabber/jabber.c:1326
+#: src/protocols/jabber/jabber.c:1381
 msgid "Bad Format"
 msgstr "�≧�����弱�"
 
-#: src/protocols/jabber/jabber.c:1328
+#: src/protocols/jabber/jabber.c:1383
 msgid "Bad Namespace Prefix"
 msgstr "�≧���� Namespace Prefix"
 
@@ -6393,143 +7151,144 @@
 # NOTE 荀� http://www.jabber.org/user/userguide.html
 # NOTE Jabber ��絎�筝� Stanza Error ��筝�腮���� <conflict/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1331
+#: src/protocols/jabber/jabber.c:1386
 msgid "Resource Conflict"
 msgstr "綏牙�篁ユ��絎��� Resource ���銀��井�合�糸��"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: src/protocols/jabber/jabber.c:1388
+#: src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "�g�綏臥�丈��"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-gone/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1335
+#: src/protocols/jabber/jabber.c:1390
 msgid "Host Gone"
 msgstr "篌堺����群筝�����吚��腟����篌堺������腮�"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-unknown/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1337
+#: src/protocols/jabber/jabber.c:1392
 msgid "Host Unknown"
 msgstr "筝�����篌堺������腮�"
 
-#: src/protocols/jabber/jabber.c:1339
+#: src/protocols/jabber/jabber.c:1394
 msgid "Improper Addressing"
 msgstr "�����絎���"
 
-#: src/protocols/jabber/jabber.c:1343
+#: src/protocols/jabber/jabber.c:1398
 msgid "Invalid ID"
 msgstr "絽活���≧��"
 
 # FIXME 綽���荀��ヨ⑮��
-#: src/protocols/jabber/jabber.c:1345
+#: src/protocols/jabber/jabber.c:1400
 msgid "Invalid Namespace"
 msgstr "�遵��腥咲���≧��"
 
-#: src/protocols/jabber/jabber.c:1347
+#: src/protocols/jabber/jabber.c:1402
 msgid "Invalid XML"
 msgstr "�≧���� XML"
 
 # XXX ������⑮鐚�茘�����緇��拷��
 # NOTE Jabber ��絎�筝㊦����nonmatching-hosts��
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1349
+#: src/protocols/jabber/jabber.c:1404
 msgid "Non-matching Hosts"
 msgstr "筝紙���腮延��娯�"
 
 # XXX ������⑮鐚�茘�����緇��拷�蚊��筝���ソ�������鋋咲��罔e�鐚�紊ф�羃���紊�ぇ���馹�
 # NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <policy-violation/>
 # NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: src/protocols/jabber/jabber.c:1353
+#: src/protocols/jabber/jabber.c:1408
 msgid "Policy Violation"
 msgstr "����篋������睡�"
 
 # NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1355
+#: src/protocols/jabber/jabber.c:1410
 msgid "Remote Connection Failed"
 msgstr "�≧��g��活�茘���������腴��羣�"
 
 # NOTE Jabber ��絎� Stream Error ��筝�腮���� <resource-constraint/>
 # NOTE ����茖�� Resource 鋇�荅����糸�ユ��篏睡���������� Resource 筝�荅��靸�研筝��後��
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1357
+#: src/protocols/jabber/jabber.c:1412
 msgid "Resource Constraint"
 msgstr "篌堺�����羣��㊦失"
 
 # NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <restricted-xml/>
 # NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: src/protocols/jabber/jabber.c:1359
+#: src/protocols/jabber/jabber.c:1414
 msgid "Restricted XML"
 msgstr "XML 筝㊤����� Jabber ��絎�筝�絎壕┗�� XML ��膣�"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <see-other-host/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:1416
 msgid "See Other Host"
 msgstr "篌堺�������茘�����荀�羆�篋����医����喝Ί�篌堺����"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <system-shutdown/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1363
+#: src/protocols/jabber/jabber.c:1418
 msgid "System Shutdown"
 msgstr "篌堺������������罘�筝�"
 
 # NOTE 荀� http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1365
+#: src/protocols/jabber/jabber.c:1420
 msgid "Undefined Condition"
 msgstr "�渇��膓峨�����主��篋�筝��������"
 
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: src/protocols/jabber/jabber.c:1367
+#: src/protocols/jabber/jabber.c:1422
 msgid "Unsupported Encoding"
 msgstr "篌堺�������吡畿絎���絖���膩�⊆"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-stanza-type/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1369
+#: src/protocols/jabber/jabber.c:1424
 msgid "Unsupported Stanza Type"
 msgstr "篌堺�������吡畿絎���罧笈�初��� (Stanza Type)"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-version/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1371
+#: src/protocols/jabber/jabber.c:1426
 msgid "Unsupported Version"
 msgstr "筝���吡畿絎��� XMPP ����"
 
-#: src/protocols/jabber/jabber.c:1373
+#: src/protocols/jabber/jabber.c:1428
 msgid "XML Not Well Formed"
 msgstr "XML ��篁倶�弱����馹�"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1430
 msgid "Stream Error"
 msgstr "筝我����"
 
-#: src/protocols/jabber/jabber.c:1442
+#: src/protocols/jabber/jabber.c:1497
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�≧�胼�罩≫戎���� %s"
 
-#: src/protocols/jabber/jabber.c:1464
+#: src/protocols/jabber/jabber.c:1519
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "���ョ����篁わ�%s"
 
-#: src/protocols/jabber/jabber.c:1469
+#: src/protocols/jabber/jabber.c:1524
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "�≧���茫�篏睡���� (%s)��"
 
-#: src/protocols/jabber/jabber.c:1521
+#: src/protocols/jabber/jabber.c:1576
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�≧�荼√�坂戎���� %s"
 
-#: src/protocols/jabber/jabber.c:1547
+#: src/protocols/jabber/jabber.c:1602
 msgid "config:  Configure a chat room."
 msgstr "config鐚�荐㊤�筝�����紊��"
 
-#: src/protocols/jabber/jabber.c:1551
+#: src/protocols/jabber/jabber.c:1606
 msgid "configure:  Configure a chat room."
 msgstr "configure鐚�荐㊤�筝�����紊��"
 
@@ -6538,43 +7297,40 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/protocols/jabber/jabber.c:1560
+#: src/protocols/jabber/jabber.c:1615
 msgid "part [room]:  Leave the room."
 msgstr "part [��紊��]鐚��∫����紊����"
 
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1620
 msgid "register:  Register with a chat room."
 msgstr "register鐚����ヤ�����紊��"
 
-#: src/protocols/jabber/jabber.c:1571
+#: src/protocols/jabber/jabber.c:1626
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [�遺源蕁�]鐚�罟∵���篆��壕��紊�源蕁�"
 
-#: src/protocols/jabber/jabber.c:1577
+#: src/protocols/jabber/jabber.c:1632
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [��紊��]鐚�胼�罩∽��篏睡�����峨�ヨ��紊��"
 
-#: src/protocols/jabber/jabber.c:1583
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1589
+#: src/protocols/jabber/jabber.c:1638
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1644
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt篏睡����&gt; [荐���]鐚���茫�篏睡�����峨�ヨ��紊��"
 
-#: src/protocols/jabber/jabber.c:1595
+#: src/protocols/jabber/jabber.c:1650
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt��紊��&gt; [篌堺����]鐚����ヤ��守����篌堺������筝�����紊��"
 
-#: src/protocols/jabber/jabber.c:1601
+#: src/protocols/jabber/jabber.c:1656
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;篏睡����&gt; [��紊��]鐚�絨�篏睡����緇���紊��筝㊧権�冴��"
 
-#: src/protocols/jabber/jabber.c:1606
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: src/protocols/jabber/jabber.c:1661
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;篏睡����&gt; &lt;荐���&gt;鐚��渇��腱�篋肴���畿�����篏睡����"
 
 #. *< type
@@ -6587,36 +7343,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: src/protocols/jabber/jabber.c:1743
+#: src/protocols/jabber/jabber.c:1745
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber ��絎�罔∞�"
 
 # XXX ��⑮
-#: src/protocols/jabber/jabber.c:1714
+#: src/protocols/jabber/jabber.c:1771
 msgid "Use TLS if available"
 msgstr "TLS ��������"
 
-#: src/protocols/jabber/jabber.c:1719
+#: src/protocols/jabber/jabber.c:1776
 msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1722
+msgstr "��荀�TLS"
+
+#: src/protocols/jabber/jabber.c:1779
 #, fuzzy
 msgid "Force old (port 5223) SSL"
 msgstr "綣決辱篏睡����綣� SSL"
 
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/jabber/jabber.c:1727
+#: src/protocols/jabber/jabber.c:1784
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "��荐延戎������鐚��������絲���筝我�筝��画�茯�茘�"
 
-#: src/protocols/jabber/jabber.c:1732
+#: src/protocols/jabber/jabber.c:1789
 #, fuzzy
 msgid "Connect port"
 msgstr "�g�"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: src/protocols/jabber/jabber.c:1793
+#: src/protocols/silc/silc.c:1832
 msgid "Connect server"
 msgstr "�g�篌堺����"
 
@@ -6653,51 +7411,55 @@
 msgid "XML Parse error"
 msgstr "XML �������"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:305
 msgid "Unknown Error in presence"
 msgstr "��∈絎�絅遵����g�������鐚��主��篋����ョ�����"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: src/protocols/jabber/presence.c:310
+#: src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "篏睡���� %s �活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝�����"
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
+#: src/protocols/jabber/presence.c:319
+#: src/protocols/msn/userlist.c:111
+#: src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/yahoo/yahoo.c:907
 msgid "Authorize"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
+#: src/protocols/jabber/presence.c:320
+#: src/protocols/msn/userlist.c:112
+#: src/protocols/oscar/oscar.c:4592
+#: src/protocols/oscar/oscar.c:7281
+#: src/protocols/yahoo/yahoo.c:909
 msgid "Deny"
 msgstr "��腟�"
 
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:376
+#: src/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "綮榊��域��紊��"
 
-#: src/protocols/jabber/presence.c:347
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
+#: src/protocols/jabber/presence.c:378
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "��③荀�綮榊�筝����亥����紊��鐚����荐㊤�絎�鐚�����戎����荐㊤�種�"
 
-#: src/protocols/jabber/presence.c:349
+#: src/protocols/jabber/presence.c:380
 msgid "Configure Room"
 msgstr "荐㊤���紊��"
 
-#: src/protocols/jabber/presence.c:351
+#: src/protocols/jabber/presence.c:382
 msgid "Accept Defaults"
 msgstr "篏睡����荐㊤��"
 
-#: src/protocols/jabber/presence.c:388
+#: src/protocols/jabber/presence.c:419
 #, c-format
 msgid "Error in chat %s"
 msgstr "��紊�� %s �主�����"
 
-#: src/protocols/jabber/presence.c:391
+#: src/protocols/jabber/presence.c:422
 #, c-format
 msgid "Error joining chat %s"
 msgstr "���ヨ��紊�� %s ���主�����"
@@ -6707,34 +7469,28 @@
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "�≧��渇��罟�罅��� %s鐚����阪��剛���吚�罅��活叱"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: src/protocols/jabber/si.c:592
+#: src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "�渇��罟�罅�紊掩��"
 
 # XXX ��⑮
-#: src/protocols/msn/dialog.c:91
+#: src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�"
 
 # XXX ��⑮
-#: src/protocols/msn/dialog.c:97
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s �����亥���絅遵�羝�������%s��臂ょ�茖���私���失�����鐚�����医�����絅遵��割失����"
-"��絅遵�羝������"
+#: src/protocols/msn/dialog.c:98
+#, c-format
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s �����亥���絅遵�羝�������%s��臂ょ�茖���私���失�����鐚�����医�����絅遵��割失������絅遵�羝������"
 
 # XXX ��⑮
-#: src/protocols/msn/dialog.c:105
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s �����亥���絅遵�羝�����や���失�����鐚�����医�����絅遵��割失������絅遵�羝������"
+#: src/protocols/msn/dialog.c:106
+#, c-format
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s �����亥���絅遵�羝�����や���失�����鐚�����医�����絅遵��割失������絅遵�羝������"
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6781,7 +7537,8 @@
 msgid "Not on list"
 msgstr "筝������賢"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70
+#: src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "篏睡�������∝���"
 
@@ -6814,7 +7571,8 @@
 msgstr "�≧�腱脂�ゃ���吟����臂ょ�"
 
 #: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
+#, fuzzy
+msgid "Tried to add a user to a group that doesn't exist"
 msgstr "�≧�絨�絅遵����ヤ���筝�絖�����臂ょ�"
 
 #: src/protocols/msn/error.c:99
@@ -6833,7 +7591,8 @@
 msgid "Too many hits to a FND"
 msgstr "FND ��腟�����紊���拷��"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: src/protocols/msn/error.c:112
+#: src/protocols/oscar/oscar.c:205
 msgid "Not logged in"
 msgstr "絨����糸��"
 
@@ -6868,7 +7627,8 @@
 msgid "Server busy"
 msgstr "篌堺�����腆�"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:138
+#: src/protocols/msn/error.c:151
 #: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "篌堺��������筝���箴�����"
@@ -6930,8 +7690,10 @@
 msgid "Server too busy"
 msgstr "篌堺����お綽�腆�"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198
+#: src/protocols/oscar/oscar.c:2751
+#: src/protocols/silc/ops.c:1717
+#: src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "茯�茘�紊掩��"
 
@@ -7004,12 +7766,8 @@
 msgstr "��荐� MSN �喝�種�"
 
 #: src/protocols/msn/msn.c:307
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���"
-"茖�臀�����"
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���茖�臀�����"
 
 #: src/protocols/msn/msn.c:311
 msgid "Allow"
@@ -7021,7 +7779,7 @@
 
 #: src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
-msgstr ""
+msgstr "����Hotmail絽活�����遵���←������"
 
 #: src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
@@ -7031,9 +7789,11 @@
 msgid "Page"
 msgstr "�喝��"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/msn/msn.c:552
+#: src/protocols/msn/msn.c:559
+#: src/protocols/msn/msn.c:562
+#: src/protocols/yahoo/yahoo.c:2809
+#: src/protocols/yahoo/yahoo.c:2815
 #, c-format
 msgid ""
 "\n"
@@ -7042,176 +7802,183 @@
 "\n"
 "<b>%s鐚�</b>%s"
 
-#: src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:559
 msgid "Has you"
 msgstr "篏����鐚�絅刻���絅遵�羝����"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: src/protocols/msn/msn.c:589
+#: src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2640
+#: src/protocols/yahoo/yahoo.c:3217
 msgid "Be Right Back"
 msgstr "薤����箴�"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+#: src/protocols/msn/msn.c:597
+#: src/protocols/yahoo/yahoo.c:2650
+#: src/protocols/yahoo/yahoo.c:3232
+#, fuzzy
+msgid "On the Phone"
 msgstr "�肢�筝�"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
+#: src/protocols/msn/msn.c:601
+#: src/protocols/yahoo/yahoo.c:2654
+#: src/protocols/yahoo/yahoo.c:3238
+#, fuzzy
+msgid "Out to Lunch"
 msgstr "紊��榊���"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
+#: src/protocols/msn/msn.c:605
+#: src/protocols/zephyr/zephyr.c:2256
+#: src/status.c:156
 msgid "Hidden"
 msgstr "�沿��"
 
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "荐㊤��援┗"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "荐㊤�篏鎘狗�肢���腆�"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "荐㊤�綏ヤ��肢���腆�"
+#: src/protocols/msn/msn.c:621
+msgid "Set Friendly Name..."
+msgstr "荐㊤��援┗..."
 
 #: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "荐㊤�茵����肢���腆�"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "���� / ����茵���茖�臀�"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "��荐� / 筝���荐� Mobile Page"
-
-#: src/protocols/msn/msn.c:647
+msgid "Set Home Phone Number..."
+msgstr "荐㊤�篏鎘狗�肢���腆�..."
+
+#: src/protocols/msn/msn.c:630
+msgid "Set Work Phone Number..."
+msgstr "荐㊤�綏ヤ��肢���腆�..."
+
+#: src/protocols/msn/msn.c:634
+msgid "Set Mobile Phone Number..."
+msgstr "荐㊤�茵����肢���腆�..."
+
+#: src/protocols/msn/msn.c:640
+msgid "Enable/Disable Mobile Devices..."
+msgstr "���� / ����茵���茖�臀�..."
+
+#: src/protocols/msn/msn.c:645
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "��荐� / 筝���荐� Mobile Page..."
+
+#: src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: src/protocols/msn/msn.c:671
+msgstr "����Hotmail�銀散��"
+
+#: src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "�渇���活����肢�"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: src/protocols/msn/msn.c:688
+#: src/protocols/novell/novell.c:3444
 msgid "Initiate _Chat"
 msgstr "������紊��(_C)"
 
 # XXX ��⑮
-#: src/protocols/msn/msn.c:717
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"MSN ��荀� SSL 腮�綣鎺�����呃�茫�絎�茖�筝�������吡�� SSL 腮�綣鎺���荅恰��茫��� http://"
-"gaim.sf.net/faq-ssl.php��"
-
-#: src/protocols/msn/msn.c:745
+#: src/protocols/msn/msn.c:725
+msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
+msgstr "MSN ��荀� SSL 腮�綣鎺�����呃�茫�絎�茖�筝�������吡�� SSL 腮�綣鎺���荅恰��茫��� http://gaim.sf.net/faq-ssl.php��"
+
+#: src/protocols/msn/msn.c:753
 msgid "Failed to connect to server."
 msgstr "�≧��g��遺失������"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1361
+#: src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721
+#: src/protocols/zephyr/zephyr.c:1136
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>�ュ��鐚�</b>%s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: src/protocols/msn/msn.c:1368
+#: src/protocols/msn/msn.c:1714
+#: src/protocols/yahoo/yahoo_profile.c:1171
+#: src/util.c:800
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s鐚�</b>"
 
-#: src/protocols/msn/msn.c:1471
+#: src/protocols/msn/msn.c:1445
 msgid "MSN Profile"
 msgstr "MSN ��篋肴���"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: src/protocols/msn/msn.c:1450
+#: src/protocols/msn/msn.c:1701
+#: src/protocols/yahoo/yahoo_profile.c:764
 msgid "Error retrieving profile"
 msgstr "��緇���篋肴�荐����主�����"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1520
+#: src/protocols/oscar/oscar.c:6034
+#: src/protocols/yahoo/yahoo_profile.c:1019
 msgid "Age"
 msgstr "綛顔宗"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "�у��"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1536
+#: src/protocols/yahoo/yahoo_profile.c:1024
 msgid "Marital Status"
 msgstr "紿�紮紫��羈�"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1543
+#: src/protocols/novell/novell.c:1480
+#: src/protocols/yahoo/yahoo_profile.c:1014
 msgid "Location"
 msgstr "�����臀�"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1551
+#: src/protocols/yahoo/yahoo_profile.c:1034
 msgid "Occupation"
 msgstr "�傑キ"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
+#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1574
+#: src/protocols/msn/msn.c:1581
+#: src/protocols/msn/msn.c:1589
+#: src/protocols/msn/msn.c:1596
 msgid "A Little About Me"
 msgstr "����膂>�"
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1605
+#: src/protocols/msn/msn.c:1611
+#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1625
 msgid "Favorite Things"
 msgstr "����篋���"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1640
+#: src/protocols/msn/msn.c:1647
 msgid "Hobbies and Interests"
 msgstr "��絅�/��莇�"
 
 # NOTE �ユ��po罟���MSN��昆��茘���綺у勌����
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: src/protocols/msn/msn.c:1656
+#: src/protocols/msn/msn.c:1662
+#: src/protocols/yahoo/yahoo_profile.c:1076
 msgid "Favorite Quote"
 msgstr "綺у勌��"
 
-#: src/protocols/msn/msn.c:1696
+#: src/protocols/msn/msn.c:1670
 msgid "Last Updated"
 msgstr "�贋�井�ユ��"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1681
+#: src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "膓臥��"
 
-#: src/protocols/msn/msn.c:1729
+#: src/protocols/msn/msn.c:1703
 msgid "The user has not created a public profile."
 msgstr "����篏睡��������綮榊���������篋肴�����"
 
-#: src/protocols/msn/msn.c:1730
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN ���沿��鞘��育����篏睡��������篋肴�������茵�ず����篏睡�������巡�絖����篋������巡戎"
-"����絖����篏�羃���綮榊���������篋肴�����"
-
-#: src/protocols/msn/msn.c:1734
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-"Gaim ������篏睡��������篋肴���膓臥���鞘��遺算篏�������莖���������篏睡����罐究�����巡研筝�絖�"
-"����"
-
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: src/protocols/msn/msn.c:1704
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "MSN ���沿��鞘��育����篏睡��������篋肴�������茵�ず����篏睡�������巡�絖����篋������巡戎����絖����篏�羃���綮榊���������篋肴�����"
+
+#: src/protocols/msn/msn.c:1708
+msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Gaim ������篏睡��������篋肴���膓臥���鞘��遺算篏�������莖���������篏睡����罐究�����巡研筝�絖�����"
+
+#: src/protocols/msn/msn.c:1714
+#: src/protocols/yahoo/yahoo_profile.c:1171
 msgid "Profile URL"
 msgstr "��篋肴���膓峨��"
 
@@ -7225,24 +7992,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: src/protocols/msn/msn.c:1917
+#: src/protocols/msn/msn.c:1919
 msgid "MSN Protocol Plugin"
 msgstr "MSN ��絎�罔∞�"
 
-#: src/protocols/msn/msn.c:1963
+#: src/protocols/msn/msn.c:1938
 msgid "Login server"
 msgstr "�糸�ヤ失����"
 
-#: src/protocols/msn/msn.c:1972
+#: src/protocols/msn/msn.c:1947
 msgid "Use HTTP Method"
 msgstr "篏睡�� HTTP �劫�"
 
-#: src/protocols/msn/msn.c:1980
-#, fuzzy
-msgid "nudge: nudge a contact to get their attention"
+#: src/protocols/msn/msn.c:1955
+#, fuzzy
+msgid "nudge: nudge a user to get their attention"
 msgstr "buzz: 腟�ソ��筝������吟��綣�篁�鐚�絅刻�羈���"
 
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/msn/nexus.c:103
+#: src/protocols/msn/servconn.c:127
 #: src/protocols/yahoo/yahoochat.c:1326
 msgid "Unable to connect"
 msgstr "�≧��g�"
@@ -7252,8 +8021,9 @@
 msgid "%s is not a valid group."
 msgstr "%s 筝������������臂ょ���"
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: src/protocols/msn/notification.c:184
+#: src/protocols/msn/notification.c:532
+#: src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "���ラ�����"
 
@@ -7292,40 +8062,39 @@
 msgid "%s is not a valid passport account."
 msgstr "%s 筝������������ Passport 絽活��"
 
-#: src/protocols/msn/notification.c:815
+#  NOTE�������≧�篏睡������荅我�������筝�絖���������
+#  NOTE 茘����翫�� by Ambrose
+#: src/protocols/msn/notification.c:528
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "�����≧�篏睡������"
+
+#: src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "�≧��贋�合召腟���腮�"
 
-#: src/protocols/msn/notification.c:870
+#: src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "�≧�腱脂�ょ召腟�"
 
 # NOTE "in %d minutes" ��寚���� %d ����箙��с�������
 # NOTE 顑����翫�� by Ambrose
-#: src/protocols/msn/notification.c:1303
+#: src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���"
-"綽������������篋よ���\n"
+"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���綽������������篋よ���\n"
 "\n"
 "�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
 msgstr[1] ""
-"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���"
-"綽������������篋よ���\n"
+"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���綽������������篋よ���\n"
 "\n"
 "�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
 
@@ -7338,76 +8107,79 @@
 msgid "Reading error"
 msgstr "莅������"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
+#: src/protocols/msn/servconn.c:133
+#: src/protocols/msn/session.c:326
+#: src/protocols/oscar/oscar.c:4913
 msgid "Unknown error"
 msgstr "���ラ���"
 
 #  NOTE 薤��� %s �冴��Notification������Switchboard���銀�鐚�罨∞�坂失������腮縁������咲���荐���
-#: src/protocols/msn/servconn.c:136
-#, c-format
+#: src/protocols/msn/servconn.c:138
+#, fuzzy, c-format
 msgid ""
-"Connection error from %s server (%s):\n"
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
 "%s 篌堺���� (%s) �割�篋�筝����g����鐚�\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "����篌堺�������吚����篏睡������荐���絎���"
 
-#: src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "茹f�� HTTP ��筝㊦�主�������"
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: src/protocols/msn/session.c:312
+#: src/protocols/napster/napster.c:456
+#: src/protocols/oscar/oscar.c:5667
+#: src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "���怨�銀����井�合�糸�ャ��"
 
 #  XXX
-#: src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "�����≧�篏睡�� MSN 篏炊�����茫������緇���荅���"
 
-#: src/protocols/msn/session.c:333
+#: src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 篌堺���������������"
 
-#: src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "�≧�茯�茘�鐚�%s"
 
-#: src/protocols/msn/session.c:342
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+#: src/protocols/msn/session.c:329
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "�����≧���緇�����絅遵�羝����茫������緇���荅���"
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:350
+#: src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "篋よ�筝�"
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "�活叱筝�"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "茯�茘���紮�筝�"
 
-#: src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "��緇� Cookie 筝�"
 
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "�渇�� Cookie 筝�"
 
-#: src/protocols/msn/session.c:370
+#: src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "莅���絅遵�羝���賢"
 
@@ -7415,113 +8187,119 @@
 msgid "Away From Computer"
 msgstr "筝����肢����"
 
-#: src/protocols/msn/switchboard.c:403
+#: src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "�肢�筝�"
+
+#: src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "紊��榊���"
+
+#: src/protocols/msn/switchboard.c:405
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "���肴����丈��鐚����醇������肴����"
 
-#: src/protocols/msn/switchboard.c:411
+#: src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "�沿昆���≧����肴����"
 
-#: src/protocols/msn/switchboard.c:415
+#: src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because the user is offline:"
 msgstr "���坂戎���������∝�鐚���篁ョ�≧����肴����"
 
-#: src/protocols/msn/switchboard.c:419
+#: src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "���咲�g��主�����鐚���篁ヨ����≧����削�"
 
-#: src/protocols/msn/switchboard.c:423
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+#: src/protocols/msn/switchboard.c:425
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "���� Switchboard �主�����鐚���篁ヨ����≧�����"
 
-#: src/protocols/msn/switchboard.c:431
+#: src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "���榊�主��筝��������鐚�荐�����醇������削�"
 
-#: src/protocols/msn/switchboard.c:952
+#: src/protocols/msn/switchboard.c:954
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s �活��渇����罟�罅�腟���"
 
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "篏睡���� %s鐚�%s鐚��活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝�����"
 
-#: src/protocols/msn/userlist.c:275
+#: src/protocols/msn/userlist.c:286
 #, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
+msgid "%s has added you to his or her buddy list."
 msgstr "篏睡���� %s �活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝�����"
 
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:659
+#: src/protocols/msn/userlist.c:350
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 絨����篁�鐚�絅刻�����機羝���賢腱脂�ゃ��"
+
+#: src/protocols/msn/userlist.c:670
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "�≧��医���%s����"
 
-#: src/protocols/msn/userlist.c:661
+#: src/protocols/msn/userlist.c:672
 msgid "The screen name specified is invalid."
 msgstr "����莠後�ョ���援┗�≧����"
 
-#: src/protocols/napster/napster.c:260
+#: src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "�≧��延失�������罔��㊧�荐�"
 
-#: src/protocols/napster/napster.c:274
+#: src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "�≧��延失�������莖�荐�鐚�%s����篁ょ�� %hd鐚��桁墾�� %hd��"
 
-#: src/protocols/napster/napster.c:290
+#: src/protocols/napster/napster.c:296
 #, fuzzy
 msgid "Unknown server error."
 msgstr "���ラ�����"
 
-#: src/protocols/napster/napster.c:339
+#: src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "篏睡����鐚�%s鐚�罟�罅�鐚�%s鐚�紊у�鐚�%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "�≧�絨���%s�����ユ���� Napster �演��羝���賢"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "��群膓���罩∵��篌堺�������g���"
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s �ヨ�����篏睡����莖�荐�"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 荀�羆�筝��� PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
+#: src/protocols/napster/napster.c:507
+#: src/protocols/napster/napster.c:538
+#: src/protocols/toc/toc.c:172
+#: src/protocols/yahoo/yahoo.c:2224
+#: src/protocols/yahoo/yahoo.c:2251
+#: src/protocols/yahoo/yahoo.c:2314
 #: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+#: src/protocols/yahoo/yahoo_filexfer.c:111
+#: src/protocols/yahoo/ycht.c:481
 msgid "Unable to connect."
 msgstr "�≧��g���"
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:596
+#: src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "臂ょ�(_G)鐚�"
 
@@ -7535,7 +8313,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: src/protocols/napster/napster.c:694
+#: src/protocols/napster/napster.c:696
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER ��絎�罔∞�"
 
@@ -7623,9 +8402,7 @@
 msgstr "�≧�莨������莠後�ョ��筝紙���篏睡������腮�"
 
 #: src/protocols/novell/nmuser.c:1932
-msgid ""
-"Your account has been disabled because too many invalid passwords were "
-"entered"
+msgid "Your account has been disabled because too many invalid passwords were entered"
 msgstr "����絽活��綏画←��������肴叱�ヤ�紊���≧����絲�腆�"
 
 #: src/protocols/novell/nmuser.c:1935
@@ -7653,9 +8430,7 @@
 msgstr "荅俄戎������腟�篋���"
 
 #: src/protocols/novell/nmuser.c:1954
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "荅�������紊����荐怨����篏睡���������糸��"
 
 #: src/protocols/novell/nmuser.c:1957
@@ -7667,120 +8442,121 @@
 msgid "Unknown error: 0x%X"
 msgstr "���ラ���鐚�0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "�糸�ュけ�� (%s)��"
 
 #  XXX ��⑮
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "�≧����肴������≧���緇�篏睡������膣亥� (%s)��"
 
-#: src/protocols/novell/novell.c:381
+#: src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "�≧��� %s ���恰����絅遵�羝��� (%s)��"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "�≧����肴��� (%s)��"
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:493
+#: src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "�≧���茫�篏睡���� (%s)��"
 
-#: src/protocols/novell/novell.c:517
+#: src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "�≧����肴����� %s���≧�綮榊���茘� (%s)��"
 
-#: src/protocols/novell/novell.c:522
+#: src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "�≧����肴������≧�綮榊���茘� (%s)��"
 
-#: src/protocols/novell/novell.c:569
-#, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
 msgstr "�≧���失�������羝�����篏睡���� %s 腱肢�括���� %s��綮榊��������主����� (%s)��"
 
-#: src/protocols/novell/novell.c:617
-#, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
+#: src/protocols/novell/novell.c:632
+#, c-format
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
 msgstr "�≧��医� %s �喝ソ��羝�������失�������羝���産腴��������主����� (%s)��"
 
-#: src/protocols/novell/novell.c:690
+#: src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "�≧���緇�篏睡���� %s ��膣亥� (%s)��"
 
 #  FIXME 茘�����緇��拷��
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:751
+#: src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "�≧���篏睡�������恰�����援�羝��� (%s)��"
 
-#: src/protocols/novell/novell.c:783
+#: src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "�≧��� %s ���恰������腟�羝��� (%s)��"
 
-#: src/protocols/novell/novell.c:836
+#: src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "�≧��� %s ���恰������荐掩��� (%s)��"
 
-#: src/protocols/novell/novell.c:904
+#: src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "�≧��� %s 腱脂�よ�������援�羝��� (%s)��"
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:942
+#: src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "�≧���失�����篆��拷�援�荐㊤� (%s)��"
 
-#: src/protocols/novell/novell.c:999
+#: src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "�≧�綮榊���茘� (%s)��"
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1123
+#: src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "��篌堺����������荐��主������������g���"
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "�肢���腆�"
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "��絮�����"
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "��篋肴�潔��"
 
 #  NOTE 篌寂��>賢��茘���
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: src/protocols/novell/novell.c:1490
+#: src/protocols/oscar/oscar.c:6007
+#: src/protocols/oscar/oscar.c:6014
 msgid "Email Address"
 msgstr "�糸��灸散"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "篏睡����ID"
 
@@ -7791,48 +8567,43 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "����"
 
 #  NOTE��GroupWise�����篁九��腮縁�罩e�筝㊥����紊ф�筝�������臂ょ���...
-#: src/protocols/novell/novell.c:1618
+#: src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise ��茘� %d"
 
-#: src/protocols/novell/novell.c:1643
+#: src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "�≧�篏睡�� SSL ��絎��g��遺失������"
 
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "����篋�篁倶����荀����主����� (%s)��"
-
-#: src/protocols/novell/novell.c:1707
+#: src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "茯�茘�筝�..."
 
-#: src/protocols/novell/novell.c:1719
+#: src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "�≧��g��遺失������"
 
-#: src/protocols/novell/novell.c:1722
+#: src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "膈�緇���荀�筝�..."
 
-#: src/protocols/novell/novell.c:1857
+#: src/protocols/novell/novell.c:1876
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "��茫�篋� %s ���ラ����篋よ���"
 
-#: src/protocols/novell/novell.c:1885
+#: src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "��茫����ヤ困茫�"
 
 #  NOTE��Sent��篆����弱�咲��茫���������
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7843,42 +8614,39 @@
 "\n"
 "����鐚�%s"
 
-#: src/protocols/novell/novell.c:1888
+#: src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "������ュ����篋よ����"
 
 # XXX ��⑮
-#: src/protocols/novell/novell.c:1995
+#: src/protocols/novell/novell.c:2014
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "��群膓�茴��糸�削����堺��群���銀��肢����糸�ャ��"
 
-#: src/protocols/novell/novell.c:2051
-#, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+#: src/protocols/novell/novell.c:2070
+#, c-format
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ����篌寂��∝�鐚���篁ヤ����九�井���������榊��荐�����"
 
 #. TODO: Would be nice to prompt if not set!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+#: src/protocols/novell/novell.c:2168
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr "�≧��g��割失������茫�莠後�ユ������g��括��篌堺������篏�����"
 
-#: src/protocols/novell/novell.c:2171
+#: src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "���鐚�羃���絎�茖� SSL ��叵��"
 
-#: src/protocols/novell/novell.c:2475
+#: src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "������茘医群膓��������≧�膵主����坂算篏�荐�����"
 
 #  NOTE ��������箴����∝������銀���絎������∝�������箙�筝�筝�絎��������∝�鐚����喝Ű⑮���∝���箙�筝�紊��∵�
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
+#: src/protocols/novell/novell.c:2996
+#: src/protocols/yahoo/yahoo.c:2861
 msgid "Appear Offline"
 msgstr "�∝�"
 
@@ -7892,126 +8660,124 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: src/protocols/novell/novell.c:3543
+#: src/protocols/novell/novell.c:3545
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger ��絎�罔∞�"
 
-#: src/protocols/novell/novell.c:3561
+#: src/protocols/novell/novell.c:3564
 msgid "Server address"
 msgstr "篌堺�������"
 
-#: src/protocols/novell/novell.c:3565
+#: src/protocols/novell/novell.c:3568
 msgid "Server port"
 msgstr "篌堺������荐���"
 
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:201
 msgid "Invalid error"
 msgstr "�≧�����"
 
+#: src/protocols/oscar/oscar.c:202
+msgid "Invalid SNAC"
+msgstr "�≧���� SNAC"
+
 #: src/protocols/oscar/oscar.c:203
-msgid "Invalid SNAC"
-msgstr "�≧���� SNAC"
-
-#: src/protocols/oscar/oscar.c:204
 msgid "Rate to host"
 msgstr "�遺失��������"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:204
 msgid "Rate to client"
-msgstr "�医��句�����"
+msgstr "�亥���句�����"
 
 #  XXX ���醇���茘�
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:206
 msgid "Service unavailable"
 msgstr "篌堺�����絖���"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:207
 msgid "Service not defined"
 msgstr "羃�����絎�����"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:208
 msgid "Obsolete SNAC"
 msgstr "������ SNAC"
 
+#: src/protocols/oscar/oscar.c:209
+msgid "Not supported by host"
+msgstr "篌堺��������"
+
 #: src/protocols/oscar/oscar.c:210
-msgid "Not supported by host"
-msgstr "鋍堺��������"
+msgid "Not supported by client"
+msgstr "���句�筝����"
 
 #: src/protocols/oscar/oscar.c:211
-msgid "Not supported by client"
-msgstr "鎘∽�句�筝����"
+msgid "Refused by client"
+msgstr "頮����句���腟�"
 
 #: src/protocols/oscar/oscar.c:212
-msgid "Refused by client"
-msgstr "茴���句���腟�"
-
-#: src/protocols/oscar/oscar.c:213
 msgid "Reply too big"
 msgstr "��荀�紊�ぇ篋�"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:213
 msgid "Responses lost"
 msgstr "�阪け����"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:214
 msgid "Request denied"
 msgstr "荀�羆�茴���"
 
 # NOTE��Busted������SNAC payload����茯�����Luke Schierer��#gaim��箴�
 # NOTE �翫�������嚭�篆������罨♂���渇��紊��莖�荐�篋���
-#: src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:215
 msgid "Busted SNAC payload"
 msgstr "SNAC莢�莠���ぇ"
 
-#: src/protocols/oscar/oscar.c:217
+#: src/protocols/oscar/oscar.c:216
 msgid "Insufficient rights"
 msgstr "罨���筝�紊�"
 
 # NOTE Debian 茘���local���冴�����亥���(Windows ��茘������違��鐚��域⑮�������)
-#: src/protocols/oscar/oscar.c:218
+#: src/protocols/oscar/oscar.c:217
 msgid "In local permit/deny"
 msgstr "���亥�����荐縁���腟�羝���"
 
-#: src/protocols/oscar/oscar.c:219
+#: src/protocols/oscar/oscar.c:218
 msgid "Too evil (sender)"
 msgstr "紊����>�鐚�絲�篁銀査鐚�"
 
+#: src/protocols/oscar/oscar.c:219
+msgid "Too evil (receiver)"
+msgstr "紊����>�鐚��銀散篋削�"
+
 #: src/protocols/oscar/oscar.c:220
-msgid "Too evil (receiver)"
-msgstr "紊����>�鐚��銀散篋削�"
+msgid "User temporarily unavailable"
+msgstr "篏睡��������筝���"
 
 #: src/protocols/oscar/oscar.c:221
-msgid "User temporarily unavailable"
-msgstr "篏睡��������筝���"
+msgid "No match"
+msgstr "羃����悟�����"
 
 #: src/protocols/oscar/oscar.c:222
-msgid "No match"
-msgstr "羃����悟�����"
+msgid "List overflow"
+msgstr "羝���頃��"
 
 #: src/protocols/oscar/oscar.c:223
-msgid "List overflow"
-msgstr "羝���頃��"
+msgid "Request ambiguous"
+msgstr "荀�羆�筝���∈"
 
 #: src/protocols/oscar/oscar.c:224
-msgid "Request ambiguous"
-msgstr "荀�羆�筝���∈"
-
-#: src/protocols/oscar/oscar.c:225
 msgid "Queue full"
 msgstr "篏���羯推�"
 
-#: src/protocols/oscar/oscar.c:226
+#: src/protocols/oscar/oscar.c:225
 msgid "Not while on AOL"
 msgstr "�� AOL ��筝���荐�"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-msgstr ""
-"鐚��ユ�狗����荐������主��篋������罩e�����困茫���絅遵�緇����醇����戎�����馹���絎∽�句�腮�"
-"綣����"
+#: src/protocols/oscar/oscar.c:417
+#: src/protocols/oscar/oscar.c:502
+msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
+msgstr "鐚��ユ�狗����荐������主��篋������罩e�����困茫���絅遵�緇����醇����戎�����馹������句�腮�綣����"
 
 #: src/protocols/oscar/oscar.c:616
 msgid "Voice"
@@ -8022,12 +8788,14 @@
 msgid "AIM Direct IM"
 msgstr "AIM 綣�勄��荐���"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: src/protocols/oscar/oscar.c:622
+#: src/protocols/silc/silc.c:683
+#: src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: src/protocols/oscar/oscar.c:625
+#: src/protocols/oscar/oscar.c:7968
 msgid "Get File"
 msgstr "�ユ�倶�罅�"
 
@@ -8110,15 +8878,18 @@
 msgid "Camera"
 msgstr "�х�御�"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: src/protocols/oscar/oscar.c:699
+#: src/protocols/oscar/oscar.c:7851
 msgid "Free For Chat"
 msgstr "����腥肴��紊�"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: src/protocols/oscar/oscar.c:703
+#: src/protocols/oscar/oscar.c:7866
 msgid "Not Available"
 msgstr "�傑�����∫��"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:705
+#: src/protocols/oscar/oscar.c:7856
 msgid "Occupied"
 msgstr "綽�腆�"
 
@@ -8127,105 +8898,103 @@
 msgid "Web Aware"
 msgstr "��荐怨�銀�篏睡������恐莊���ョ��������������"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:713
+msgid "Online"
+msgstr "筝�膩�"
+
+#: src/protocols/oscar/oscar.c:786
+#: src/protocols/oscar/oscar.c:5038
 msgid "Warning Level"
 msgstr "茘���膈�膣�"
 
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "�後���"
-
-#: src/protocols/oscar/oscar.c:801
+#: src/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "絅遵�茯���"
 
-#: src/protocols/oscar/oscar.c:958
+#: src/protocols/oscar/oscar.c:946
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "�� %s ���恰��荐�������"
 
-#: src/protocols/oscar/oscar.c:960
+#: src/protocols/oscar/oscar.c:948
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "�� %s ���恰��荐���け��"
 
-#: src/protocols/oscar/oscar.c:968
+#: src/protocols/oscar/oscar.c:956
 msgid "Direct Connect failed"
 msgstr "�贋・�g�紊掩��"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:1033
+#: src/protocols/oscar/oscar.c:1164
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "�� %s ���恰��荐���群膓�茴�産腴�"
 
-#: src/protocols/oscar/oscar.c:1126
+#: src/protocols/oscar/oscar.c:1114
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "罩e����荅��g��� %2$s:%3$hu鐚�篁ヤ梢�� %1$s 綮榊��恰��荐�����"
 
-#: src/protocols/oscar/oscar.c:1547
+#: src/protocols/oscar/oscar.c:1535
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "罩e���羆� %s �g��恰④�� (%s:%hu)鐚�篁ヤ梢綮榊��恰��荐�����"
 
-#: src/protocols/oscar/oscar.c:1552
+#: src/protocols/oscar/oscar.c:1540
 msgid "Unable to open Direct IM"
 msgstr "�≧������贋・���恰��荐���"
 
-#: src/protocols/oscar/oscar.c:1587
+#: src/protocols/oscar/oscar.c:1575
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "���御��篋��� %s ����筝����贋・�恰��荐�����"
 
-#: src/protocols/oscar/oscar.c:1591
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
+#: src/protocols/oscar/oscar.c:1579
+msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
 msgstr "��罔e������峨�堺���� IP 篏���鐚���罩ゅ��醇�����援�筝���蘂��������活�膵主����"
 
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
+#: src/protocols/oscar/oscar.c:1583
+#: src/protocols/oscar/oscar.c:4349
+#: src/protocols/sametime/sametime.c:3547
 msgid "Connect"
 msgstr "�g�"
 
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1649
 #, fuzzy, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
 
-#: src/protocols/oscar/oscar.c:1684
+#: src/protocols/oscar/oscar.c:1672
 msgid "Chat is currently unavailable"
 msgstr "�����≧�篏睡����紊��"
 
-#: src/protocols/oscar/oscar.c:1754
+#: src/protocols/oscar/oscar.c:1742
 msgid "Screen name sent"
 msgstr "���阪験��"
 
-#: src/protocols/oscar/oscar.c:1770
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"�≧��糸�ワ��≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽���篁ヨ�掩��絖�罸�莎桁�鐚�"
-"筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����"
-
-#: src/protocols/oscar/oscar.c:1799
+#: src/protocols/oscar/oscar.c:1758
+#, c-format
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "�≧��糸�ワ��≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽���篁ヨ�掩��絖�罸�莎桁�鐚�筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����"
+
+#: src/protocols/oscar/oscar.c:1787
 msgid "Unable to login to AIM"
 msgstr "�≧��糸�ュ�� AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:1891
+#: src/protocols/oscar/oscar.c:2842
 msgid "Could Not Connect"
 msgstr "�≧��g�"
 
-#: src/protocols/oscar/oscar.c:1911
+#: src/protocols/oscar/oscar.c:1899
 msgid "Connection established, cookie sent"
 msgstr "�g�綏峨産腴�鐚�筝�群���� Cookie"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
+#: src/protocols/oscar/oscar.c:2051
 #, fuzzy
 msgid "Attempting connection redirect..."
 msgstr "罩e����荅��g��� %2$s:%3$hu鐚�篁ヤ梢�� %1$s 綮榊��恰��荐�����"
@@ -8234,153 +9003,147 @@
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
 #. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#: src/protocols/oscar/oscar.c:2096
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2194
+#: src/protocols/yahoo/yahoo_filexfer.c:174
 #: src/protocols/yahoo/yahoo_filexfer.c:183
 #: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "�≧�綮榊�罟�罅�篁�膣鴻��"
 
-#: src/protocols/oscar/oscar.c:2211
+#: src/protocols/oscar/oscar.c:2199
 msgid "Unable to create new connection."
 msgstr "�≧������育�g���"
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
+#: src/protocols/oscar/oscar.c:2433
+#: src/protocols/oscar/oscar.c:2442
+#: src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:2466
 #, fuzzy
 msgid "Unable to log into file transfer proxy."
 msgstr "�≧��糸�ュ�� Rendezvous"
 
-#: src/protocols/oscar/oscar.c:2532
+#: src/protocols/oscar/oscar.c:2520
 #, fuzzy
 msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "�≧�綮榊��h�遵�� Socket��"
 
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2728
+#: src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "������援┗��絲�腆�"
 
-#: src/protocols/oscar/oscar.c:2738
+#: src/protocols/oscar/oscar.c:2733
 msgid "Your account is currently suspended."
 msgstr "����絽活����������賢��"
 
 #  NOTE�������≧�篏睡������荅我�������筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: src/protocols/oscar/oscar.c:2737
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "�����≧�篏睡�� AOL �恰��荐���������"
 
+#: src/protocols/oscar/oscar.c:2742
+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 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅����g�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
+
 #: src/protocols/oscar/oscar.c:2747
-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 ""
-"�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
-"膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
-
-#: src/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "����篏睡����絎∽�句�腮�綣鎀���������茫��� %s �贋��"
-
-#: src/protocols/oscar/oscar.c:2783
+msgstr "����篏睡�������句�腮�綣鎀���������茫��� %s �贋��"
+
+#: src/protocols/oscar/oscar.c:2778
 msgid "Internal Error"
 msgstr "�ч�����"
 
-#: src/protocols/oscar/oscar.c:2853
+#: src/protocols/oscar/oscar.c:2849
 msgid "Received authorization"
 msgstr "�九�域�茘�"
 
-#: src/protocols/oscar/oscar.c:2877
+#: src/protocols/oscar/oscar.c:2873
 msgid "The SecurID key entered is invalid."
 msgstr "����莠後�ョ�� SecurID 腆主�≧����"
 
-#: src/protocols/oscar/oscar.c:2891
+#: src/protocols/oscar/oscar.c:2887
 msgid "Enter SecurID"
 msgstr "茫�莠後�� SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: src/protocols/oscar/oscar.c:2888
 msgid "Enter the 6 digit number from the digital display."
 msgstr "茫�莠後�ユ�悟⊆蕁�ず����蕁�ず���℡��後���"
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"����醇���㊥����筝㊥�潔�g�������醇���喝�������馹�茴�信罩e�篏睡�� TOC��茫��� %s ������"
-"羃����贋�違��"
-
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2928
+#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:3047
+#, c-format
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "����醇���㊥����筝㊥�潔�g�������醇���喝�������馹�茴�信罩e�篏睡�� TOC��茫��� %s ������羃����贋�違��"
+
+#: src/protocols/oscar/oscar.c:2931
+#: src/protocols/oscar/oscar.c:2961
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim �≧���緇������� AIM �糸�ョ⊆��"
 
-#: src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3050
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim �≧���緇��������糸�ョ⊆��"
 
-#: src/protocols/oscar/oscar.c:3085
+#: src/protocols/oscar/oscar.c:3071
 msgid "Password sent"
 msgstr "絲�腆守����"
 
-#: src/protocols/oscar/oscar.c:4352
+#: src/protocols/oscar/oscar.c:4340
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����荀�羆��贋・�g��� %s"
 
-#: src/protocols/oscar/oscar.c:4355
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"����荀�羆�絨����������肢����綮榊�莎欠�贋・�g�鐚����������渇���恰��荐���襲�����鏆�������"
-"��罔e������我���� IP 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
-
-#: src/protocols/oscar/oscar.c:4394
+#: src/protocols/oscar/oscar.c:4343
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "����荀�羆�絨����������肢����綮榊�莎欠�贋・�g�鐚����������渇���恰��荐���襲�����鏆���������罔e������我���� IP 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
+
+#: src/protocols/oscar/oscar.c:4382
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨������ユ����絅遵�羝���賢��"
 
-#: src/protocols/oscar/oscar.c:4402
+#: src/protocols/oscar/oscar.c:4390
 msgid "Authorization Request Message:"
 msgstr "茯�茘�荀�羆�荐����"
 
-#: src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:4391
 msgid "Please authorize me!"
 msgstr "茫���������茯�茘�鐚�"
 
-#: src/protocols/oscar/oscar.c:4433
-#, c-format
-msgid ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
+#: src/protocols/oscar/oscar.c:4421
+#, c-format
+msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
 msgstr "篏睡���� %s 荀�羆������ュソ��羝���������緇�篁���茯�茘���������堺����茯�茘�荀�羆����"
 
-#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:4426
+#: src/protocols/oscar/oscar.c:4428
 msgid "Request Authorization"
 msgstr "荀�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:4466
+#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4576
+#: src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:7266
+#: src/protocols/oscar/oscar.c:7318
 msgid "No reason given."
 msgstr "羃���腟��������"
 
-#: src/protocols/oscar/oscar.c:4483
+#: src/protocols/oscar/oscar.c:4471
 msgid "Authorization Denied Message:"
 msgstr "��腟�茯�茘�荐����"
 
-#: src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:4578
 #, fuzzy, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8389,31 +9152,31 @@
 "篏睡���� %u ���坂�������鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���賢鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:4588
+#: src/protocols/oscar/oscar.c:7278
 msgid "Authorization Request"
 msgstr "茯�茘�荀�羆�"
 
-#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:4600
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "篏睡���� %u ���坂�������鐚���腟�篋�����九���ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:4601
 msgid "ICQ authorization denied."
 msgstr "ICQ 茯�茘���腟���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: src/protocols/oscar/oscar.c:4608
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "篏睡���� %u ���鋋�����九���ュソ��羝�����荀�羆���"
 
-#: src/protocols/oscar/oscar.c:4628
+#: src/protocols/oscar/oscar.c:4616
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8426,7 +9189,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: src/protocols/oscar/oscar.c:4624
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8439,7 +9202,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4632
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8452,282 +9215,262 @@
 "荐����削�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: src/protocols/oscar/oscar.c:4653
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 篏睡���� %u ��箴�筝���絅遵�莖�荐�鐚�%s (%s)"
 
-#: src/protocols/oscar/oscar.c:4671
+#: src/protocols/oscar/oscar.c:4659
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
 
-#: src/protocols/oscar/oscar.c:4675
+#: src/protocols/oscar/oscar.c:4663
 msgid "Decline"
 msgstr "紿���"
 
-#: src/protocols/oscar/oscar.c:4759
+#: src/protocols/oscar/oscar.c:4747
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐�������阪����≧������"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪������≧������"
 
-#: src/protocols/oscar/oscar.c:4768
+#: src/protocols/oscar/oscar.c:4756
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐�������阪�紊�ぇ篋���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪���紊�ぇ篋���"
 
-#: src/protocols/oscar/oscar.c:4777
-#, 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."
+#: src/protocols/oscar/oscar.c:4765
+#, 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] "���阪け篋� %hu ���� %s ��箴���荐�������阪��渇������綺�お綽���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����渇������綺�お綽���"
 
 # XXX 莊����㊥����茘���������鐚��頑⑮�����<��絅遵�頫�筝���鐚�筝���
-#: src/protocols/oscar/oscar.c:4786
+#: src/protocols/oscar/oscar.c:4774
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐�������坂�鐚�絅刻�紊����>���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������坂�鐚�絅刻�紊����>���"
 
-#: src/protocols/oscar/oscar.c:4795
+#: src/protocols/oscar/oscar.c:4783
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���>���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���>���"
 
-#: src/protocols/oscar/oscar.c:4804
+#: src/protocols/oscar/oscar.c:4792
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐��������筝�����"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐��������筝�����"
 
-#: src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4851
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>絽活��鐚�</B> %s<BR><B>����鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:4912
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 筝��咲���鐚�%s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: src/protocols/oscar/oscar.c:4949
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "�≧����肴����%s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:4949
+#: src/protocols/oscar/oscar.c:4954
+#: src/protocols/oscar/oscar.c:5012
+#: src/protocols/oscar/oscar.c:5016
 msgid "Unknown reason."
 msgstr "����筝�����"
 
-#: src/protocols/oscar/oscar.c:4964
+#: src/protocols/oscar/oscar.c:4952
+#: src/protocols/sametime/sametime.c:2303
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "�≧����肴����� %s鐚�"
 
-#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5012
 #, c-format
 msgid "User information not available: %s"
 msgstr "�≧���緇���篋肴�荐�鐚�%s"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�鐚�"
 
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/oscar/oscar.c:5042
 msgid "Online Since"
 msgstr "筝�膩���"
 
 # XXX �壕⑮��荐糸���ユ���������莠�����鐚�
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/yahoo/yahoo_profile.c:1122
 msgid "Member Since"
 msgstr "���堺���∞������"
 
-#: src/protocols/oscar/oscar.c:5142
+#: src/protocols/oscar/oscar.c:5052
+msgid "Capabilities"
+msgstr "�後���"
+
+#: src/protocols/oscar/oscar.c:5180
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM ���醇�欠�篋���"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
+#: src/protocols/oscar/oscar.c:5366
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "���≧�蕁�ず箴�������篏睡������荐�������阪�������≧��絖�������"
 
-#: src/protocols/oscar/oscar.c:5554
+#: src/protocols/oscar/oscar.c:5592
 msgid "Rate limiting error."
 msgstr "�������狗�����"
 
-#: src/protocols/oscar/oscar.c:5555
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���"
-"荅��罨<��"
-
-#: src/protocols/oscar/oscar.c:5631
+#: src/protocols/oscar/oscar.c:5593
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���荅��罨<��"
+
+#: src/protocols/oscar/oscar.c:5669
 msgid "You have been signed off for an unknown reason."
 msgstr "�����坂���������糸�冴��"
 
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5682
+#: src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: src/protocols/oscar/oscar.c:5707
 msgid "Finalizing connection"
 msgstr "絎����g�"
 
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "絽活��"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:6019
+#: src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "茵����肢�"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "絅�"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "��"
-
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6037
 msgid "Personal Web Page"
 msgstr "��篋榊恐��"
 
-#: src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6041
 msgid "Additional Information"
 msgstr "�銀�莖�荐�"
 
-#: src/protocols/oscar/oscar.c:6004
+#: src/protocols/oscar/oscar.c:6046
 msgid "Home Address"
 msgstr "篏鎘九�医��"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6050
+#: src/protocols/oscar/oscar.c:6058
 msgid "Zip Code"
 msgstr "�級������"
 
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6054
 msgid "Work Address"
 msgstr "綏ヤ��医��"
 
-#: src/protocols/oscar/oscar.c:6020
+#: src/protocols/oscar/oscar.c:6062
 msgid "Work Information"
 msgstr "綏ヤ�莖�荐�"
 
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6063
 msgid "Company"
 msgstr "��夔��腮�"
 
-#: src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:6064
 msgid "Division"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6065
 msgid "Position"
 msgstr "�隙�"
 
-#: src/protocols/oscar/oscar.c:6025
+#: src/protocols/oscar/oscar.c:6067
 msgid "Web Page"
 msgstr "膓臥��"
 
 # XXX �����藝� (��綵≫��榊憟��)鐚� (絅遵���札��茘���荐��������e��??)
-#: src/protocols/oscar/oscar.c:6082
+#: src/protocols/oscar/oscar.c:6124
 msgid "Pop-Up Message"
 msgstr "綵��肴���"
 
 # Patch by Kevin Leung
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr "筝����� %s ��絽活��"
-
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6164
+#, fuzzy, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "筝����� %s ��絽活��"
+msgstr[1] "筝����� %s ��絽活��"
+
+#: src/protocols/oscar/oscar.c:6195
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�鞘��医���糸��灸散�医�� %s �檎����腟���"
 
-#: src/protocols/oscar/oscar.c:6161
+#: src/protocols/oscar/oscar.c:6216
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "����荅我���九�遺�絨�荀�羆�絨� %s �画�茯�茘����糸��灸散��"
 
-#: src/protocols/oscar/oscar.c:6163
+#: src/protocols/oscar/oscar.c:6218
 msgid "Account Confirmation Requested"
 msgstr "絽活��腆肴�"
 
-#: src/protocols/oscar/oscar.c:6194
+#: src/protocols/oscar/oscar.c:6249
 msgid "Error Changing Account Info"
 msgstr "�贋�劫験��莖�荐����"
 
-#: src/protocols/oscar/oscar.c:6197
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+#: src/protocols/oscar/oscar.c:6252
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活����������筝�����"
 
-#: src/protocols/oscar/oscar.c:6200
+#: src/protocols/oscar/oscar.c:6255
 #, fuzzy, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活��紊��激��"
 
-#: src/protocols/oscar/oscar.c:6203
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+#: src/protocols/oscar/oscar.c:6258
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活��紊��激��"
 
-#: src/protocols/oscar/oscar.c:6206
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
-
-#: src/protocols/oscar/oscar.c:6209
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
-
-#: src/protocols/oscar/oscar.c:6212
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
-"invalid."
+#: src/protocols/oscar/oscar.c:6261
+#, c-format
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
+
+#: src/protocols/oscar/oscar.c:6264
+#, c-format
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
+
+#: src/protocols/oscar/oscar.c:6267
+#, c-format
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医�����≧������"
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6270
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��� 0x%04x鐚����ラ�����"
 
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6280
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8736,149 +9479,105 @@
 "����絽活������茴��弱���絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6281
+#: src/protocols/oscar/oscar.c:6288
 msgid "Account Info"
 msgstr "絽活��莖�荐�"
 
-#: src/protocols/oscar/oscar.c:6231
+#: src/protocols/oscar/oscar.c:6286
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���糸��灸散�医���� %s"
 
-#: src/protocols/oscar/oscar.c:6298
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+#: src/protocols/oscar/oscar.c:6353
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "�≧��渇���恰��荐���襲���荀��渇���恰��荐���襲���綽�����絨��合�贋・�g���"
 
-#: src/protocols/oscar/oscar.c:6480
+#: src/protocols/oscar/oscar.c:6572
 msgid "Unable to set AIM profile."
 msgstr "�≧�荐㊤� AIM ��篋肴�����"
 
-#: src/protocols/oscar/oscar.c:6481
-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:6495
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
+#: src/protocols/oscar/oscar.c:6573
+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:6587
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
 msgstr[0] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 msgstr[1] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 
-#: src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:6592
 msgid "Profile too long."
 msgstr "��篋肴�荐����激��"
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
+#: src/protocols/oscar/oscar.c:6628
+#, c-format
+msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
 msgstr[0] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 msgstr[1] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+#: src/protocols/oscar/oscar.c:6633
 msgid "Away message too long."
 msgstr "�∫��荐������激��"
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "�≧�荐㊤� AIM �∫��荐�����"
-
-#: src/protocols/oscar/oscar.c:6561
-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:6691
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-"���咲����絽活��筝������������絽活��鐚���篁ョ�≧�絨�絅遵���%s�����ユ���賢��絽活��綽���篁ヨ��"
-"��絖�罸��咲���㍼������宴���掩��絖�罸��������後�������腥榊�純����腟���鐚��������篁ャ����"
-"絖���腟�����"
-
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: src/protocols/oscar/oscar.c:6724
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "���咲����絽活��筝������������絽活��鐚���篁ョ�≧�絨�絅遵���%s�����ユ���賢��絽活��綽���篁ヨ�掩��絖�罸��咲���㍼������宴���掩��絖�罸��������後�������腥榊�純����腟���鐚��������篁ャ���後���腟�����"
+
+#: src/protocols/oscar/oscar.c:6726
+#: src/protocols/oscar/oscar.c:7124
+#: src/protocols/oscar/oscar.c:7138
+#: src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:6798
+#: src/protocols/oscar/oscar.c:6831
 msgid "Unable To Retrieve Buddy List"
 msgstr "�≧�莅���絅遵�羝���"
 
-#: src/protocols/oscar/oscar.c:6799
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-"Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃�����"
-"紊縁����遵�札��江��絨��鏅���緇���"
-
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:6832
+msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
+msgstr "Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃����阪け鐚����遵�札��江��絨��鏅���緇���"
+
+#: src/protocols/oscar/oscar.c:7022
+#: src/protocols/oscar/oscar.c:7023
+#: src/protocols/oscar/oscar.c:7028
+#: src/protocols/oscar/oscar.c:7182
+#: src/protocols/oscar/oscar.c:7183
+#: src/protocols/oscar/oscar.c:7188
 msgid "Orphans"
 msgstr "絖ゅ����"
 
-#: src/protocols/oscar/oscar.c:7090
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���"
-"荅���"
-
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7122
+#, c-format
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���荅���"
+
+#: src/protocols/oscar/oscar.c:7122
+#: src/protocols/oscar/oscar.c:7136
 msgid "(no name)"
 msgstr "(羃�����絖�)"
 
-#: src/protocols/oscar/oscar.c:7104
-#, 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 ""
-"���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟���"
-"����膤紫輝��荐援��筝�����"
-
-#: src/protocols/oscar/oscar.c:7187
-#, 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:7136
+#, 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 "���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟�������膤紫輝��荐援��筝�����"
+
+#: src/protocols/oscar/oscar.c:7219
+#, 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 綏牙���荐掩�����ュ�遺�鐚�絅刻���絅遵�羝���賢����������荀�絨�篁�鐚�絅刻����ュ���"
 
 # NOTE ����������荐怨�ヤ査�弱�榊��茯�茘�荀�羆�緇�蕁�ず腟�������訓����
-#: src/protocols/oscar/oscar.c:7193
+#: src/protocols/oscar/oscar.c:7225
 msgid "Authorization Given"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/oscar/oscar.c:7237
+#: src/protocols/oscar/oscar.c:7269
 #, fuzzy, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -8888,205 +9587,202 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: src/protocols/oscar/oscar.c:7314
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "篏睡���� %s ��荐延����篁�鐚�絅刻����ュソ��羝�����荀�羆���"
 
 # NOTE ���������弱�榊��茯�茘�荀�羆�茴���劫��荐掩��蕁�ず��
-#: src/protocols/oscar/oscar.c:7283
+#: src/protocols/oscar/oscar.c:7315
 msgid "Authorization Granted"
 msgstr "茯�茘��峨��"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7318
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "篏睡���� %s ���坂�������鐚���腟�篋����篁�鐚�絅刻����ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: src/protocols/oscar/oscar.c:7319
 msgid "Authorization Denied"
 msgstr "茯�茘�茴���"
 
 # NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
 # NOTE: KingAnt ��箴���絖�臂���篋�筝���鐚�����筝�篋�����
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7356
+#: src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "�脂����腆�(_E)鐚�"
 
-#: src/protocols/oscar/oscar.c:7360
+#: src/protocols/oscar/oscar.c:7392
 msgid "Invalid chat name specified."
 msgstr "腟��篋��≧������紊����腮宴��"
 
-#: src/protocols/oscar/oscar.c:7430
+#: src/protocols/oscar/oscar.c:7462
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "�≧��渇���恰��荐���襲���AIM ��紊�研筝���吓�恰��荐���襲����勌����"
 
-#: src/protocols/oscar/oscar.c:7565
+#. Available status messages are plain text
+#: src/protocols/oscar/oscar.c:7598
+#, fuzzy
+msgid "Available Message"
+msgstr "���肴���"
+
+#: src/protocols/oscar/oscar.c:7612
+#: src/protocols/oscar/oscar.c:7617
 msgid "Away Message"
 msgstr "�∫��荐���"
 
-#: src/protocols/oscar/oscar.c:7854
+#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#: src/protocols/oscar/oscar.c:7617
+#, fuzzy
+msgid "(pending)"
+msgstr "�¥�篏�罩g�緇�絨��壕�茘����"
+
+#: src/protocols/oscar/oscar.c:7924
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s ��絅遵�茯���"
 
-#: src/protocols/oscar/oscar.c:7855
+#: src/protocols/oscar/oscar.c:7925
 msgid "Buddy Comment:"
 msgstr "絅遵�茯����"
 
-#: src/protocols/oscar/oscar.c:7874
+#: src/protocols/oscar/oscar.c:7944
 msgid "Edit Buddy Comment"
 msgstr "膩�鹿絅遵�茯���"
 
-#: src/protocols/oscar/oscar.c:7880
+#: src/protocols/oscar/oscar.c:7950
 msgid "Get Status Msg"
 msgstr "��緇�����荐���"
 
 # NOTE 絨����贋・羔������壕⑮�冴���恰��荐�����
-#: src/protocols/oscar/oscar.c:7892
+#: src/protocols/oscar/oscar.c:7962
 msgid "Direct IM"
 msgstr "�恰��荐���"
 
-#: src/protocols/oscar/oscar.c:7909
+#: src/protocols/oscar/oscar.c:7979
 msgid "Re-request Authorization"
 msgstr "���域�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:7969
-#, fuzzy
+#: src/protocols/oscar/oscar.c:8039
 msgid "Require authorization"
 msgstr "荀�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:7972
-#, fuzzy
+#: src/protocols/oscar/oscar.c:8042
 msgid "Hide IP address"
-msgstr "IP 篏���"
+msgstr "�沿�� IP 篏���"
 
 # NOTE ���� http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:7975
+#: src/protocols/oscar/oscar.c:8045
 #, fuzzy
 msgid "Web aware"
 msgstr "��荐怨�銀�篏睡������恐莊���ョ��������������"
 
-#: src/protocols/oscar/oscar.c:7980
-#, fuzzy
+#: src/protocols/oscar/oscar.c:8050
 msgid "ICQ Privacy Options"
-msgstr "篁g��篌堺�����檎��"
-
-#: src/protocols/oscar/oscar.c:7997
+msgstr "ICQ �援��檎��"
+
+#: src/protocols/oscar/oscar.c:8067
 msgid "The new formatting is invalid."
 msgstr "�亥���弱����≧������"
 
-#: src/protocols/oscar/oscar.c:7998
+#: src/protocols/oscar/oscar.c:8068
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "絽活���弱������醇�壕�紊у�篁ュ�腥榊�純��"
 
-#: src/protocols/oscar/oscar.c:8005
+#: src/protocols/oscar/oscar.c:8075
 msgid "New screen name formatting:"
 msgstr "�亥��絽活���弱�鐚�"
 
-#: src/protocols/oscar/oscar.c:8057
+#: src/protocols/oscar/oscar.c:8127
 msgid "Change Address To:"
 msgstr "莅��翫�医���削�"
 
-#: src/protocols/oscar/oscar.c:8102
+#: src/protocols/oscar/oscar.c:8172
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��研羃������緇�薊�茘�</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: src/protocols/oscar/oscar.c:8175
 msgid "You are awaiting authorization from the following buddies"
 msgstr "������罩e���緇�筝���絅遵���茯�茘�"
 
-#: src/protocols/oscar/oscar.c:8106
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��"
-"��荀�羆����域�茘�����"
-
-#: src/protocols/oscar/oscar.c:8123
+#: src/protocols/oscar/oscar.c:8176
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御����荀�羆����域�茘�����"
+
+#: src/protocols/oscar/oscar.c:8193
 msgid "Find Buddy by E-mail"
 msgstr "篁ラ�糸��灸散�医��箴��上�絅遵�"
 
-#: src/protocols/oscar/oscar.c:8124
+#: src/protocols/oscar/oscar.c:8194
 msgid "Search for a buddy by e-mail address"
 msgstr "篏睡���糸��灸散�医����絨�絅遵�"
 
-#: src/protocols/oscar/oscar.c:8125
+#: src/protocols/oscar/oscar.c:8195
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "茫�莠後�ュ��合���糸��灸散�医����"
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "荐㊤�篏睡����莖�荐�..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: src/protocols/oscar/oscar.c:8288
 msgid "Set User Info (URL)..."
 msgstr "荐㊤�篏睡����莖�荐� (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "篆��劫�腆�..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: src/protocols/oscar/oscar.c:8299
 msgid "Change Password (URL)"
 msgstr "篆��劫�腆� (���嘒��)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: src/protocols/oscar/oscar.c:8303
 msgid "Configure IM Forwarding (URL)"
 msgstr "荐㊤��恰��荐�����莉��� (���嘒��)"
 
 #  NOTE 茘����翫�� by Ambrose
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-#, fuzzy
-msgid "Show privacy options..."
-msgstr "蕁�ず膣亥�"
+#: src/protocols/oscar/oscar.c:8313
+msgid "Show Privacy Options..."
+msgstr "蕁�ず�援��檎��..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: src/protocols/oscar/oscar.c:8320
 msgid "Format Screen Name..."
 msgstr "�弱���絽活��..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: src/protocols/oscar/oscar.c:8324
 msgid "Confirm Account"
 msgstr "腆肴�絽活��"
 
-#: src/protocols/oscar/oscar.c:8258
+#: src/protocols/oscar/oscar.c:8328
 msgid "Display Currently Registered Address"
 msgstr "蕁�ず������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:8262
+#: src/protocols/oscar/oscar.c:8332
 msgid "Change Currently Registered Address..."
 msgstr "篆��合������荐糸�����医��..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: src/protocols/oscar/oscar.c:8339
 msgid "Show Buddies Awaiting Authorization"
 msgstr "蕁�ず膈�緇�茯�茘���絅遵�"
 
-#: src/protocols/oscar/oscar.c:8275
+#: src/protocols/oscar/oscar.c:8345
 msgid "Search for Buddy by Email..."
 msgstr "篏睡���糸��灸散�医����絨�絅遵�..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: src/protocols/oscar/oscar.c:8350
 msgid "Search for Buddy by Information"
 msgstr "箴��ц�荐�絨��上ソ��"
 
-#: src/protocols/oscar/oscar.c:8350
+#: src/protocols/oscar/oscar.c:8416
 msgid "Use recent buddies group"
 msgstr "篏睡����Recent Buddies��臂ょ�"
 
-#: src/protocols/oscar/oscar.c:8353
+#: src/protocols/oscar/oscar.c:8419
 msgid "Show how long you have been idle"
 msgstr "蕁�ず篏���臀��箙�����"
 
-#: src/protocols/oscar/oscar.c:8362
+#: src/protocols/oscar/oscar.c:8428
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
 msgstr ""
 
@@ -9100,56 +9796,94 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: src/protocols/oscar/oscar.c:8545
+#: src/protocols/oscar/oscar.c:8547
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ��絎�罔∞�"
 
-#: src/protocols/oscar/oscar.c:8497
+#: src/protocols/oscar/oscar.c:8566
 msgid "Auth host"
 msgstr "茯�茘�篌堺����"
 
-#: src/protocols/oscar/oscar.c:8500
+#: src/protocols/oscar/oscar.c:8569
 msgid "Auth port"
 msgstr "茯�茘���荐���"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:8572
+#: src/protocols/zephyr/zephyr.c:2894
 msgid "Encoding"
 msgstr "膩�⊆"
 
-#: src/protocols/sametime/sametime.c:1134
+#: src/protocols/sametime/sametime.c:363
+msgid "Connection closed (writing)"
+msgstr "�g�����鐚�絲��ワ�"
+
+#: src/protocols/sametime/sametime.c:1208
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>臂ょ���腮縁�</b>%s<br>"
+
+#: src/protocols/sametime/sametime.c:1209
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Notes 臂ょ� ID鐚�</b>%s<br>"
+
+#: src/protocols/sametime/sametime.c:1211
+#, c-format
+msgid "Info for Group %s"
+msgstr "���主召腟� %s ��莖�荐�"
+
+#: src/protocols/sametime/sametime.c:1213
+#, fuzzy
+msgid "Notes Address Book Information"
+msgstr "綏ヤ�莖�荐�"
+
+# NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
+#: src/protocols/sametime/sametime.c:1245
+#, fuzzy
+msgid "Invite Group to Conference..."
+msgstr "������茘医�"
+
+#  NOTE 羈����evolution ��昆��茘������������������������荐�����
+#: src/protocols/sametime/sametime.c:1254
+#, fuzzy
+msgid "Get Notes Address Book Info"
+msgstr "紜����育��荐���"
+
+#: src/protocols/sametime/sametime.c:1406
 #, fuzzy
 msgid "Sending Handshake"
 msgstr "�渇�� Cookie 筝�"
 
 #  XXX ��⑮
-#: src/protocols/sametime/sametime.c:1139
+#: src/protocols/sametime/sametime.c:1411
 #, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "膈�緇���紮��活叱罟�罅�筝�..."
 
-#: src/protocols/sametime/sametime.c:1144
+#: src/protocols/sametime/sametime.c:1416
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1149
+msgstr "Handshake�九�医����鐚����榊�糸�ヨ�羆�"
+
+#: src/protocols/sametime/sametime.c:1421
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1154
+msgstr "膈�緇��糸�ヨ�羆�������"
+
+#: src/protocols/sametime/sametime.c:1426
 #, fuzzy
 msgid "Login Redirected"
 msgstr "�糸�ヤ失����"
 
-#: src/protocols/sametime/sametime.c:1159
+#: src/protocols/sametime/sametime.c:1432
 #, fuzzy
 msgid "Forcing Login"
 msgstr "�糸�ヤ賢"
 
-#: src/protocols/sametime/sametime.c:1163
+#: src/protocols/sametime/sametime.c:1436
 msgid "Login Acknowledged"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1168
+msgstr "�糸�ヨ�羆��九�医����"
+
+#: src/protocols/sametime/sametime.c:1441
 #, fuzzy
 msgid "Connected to Sametime Community Server"
 msgstr "�g��� SILC 篌堺����賢"
@@ -9157,129 +9891,440 @@
 #. * @todo Admin alerts should probably be in a conversation window
 #. rather than a gaim_notify_message. Or in some sort of updating
 #. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
+#: src/protocols/sametime/sametime.c:1535
 msgid "Admin Alert"
 msgstr ""
 
+#: src/protocols/sametime/sametime.c:1592
+#, fuzzy
+msgid "Connection reset"
+msgstr "�g�����"
+
+#: src/protocols/sametime/sametime.c:1599
+#, fuzzy, c-format
+msgid "Error reading from socket: %s"
+msgstr "莅��� Socket ���主�������"
+
+#. this is a regular connect, error out
+#: src/protocols/sametime/sametime.c:1628
+#: src/protocols/sametime/sametime.c:3613
+#, fuzzy
+msgid "Unable to connect to host"
+msgstr "�≧��g��遺失����"
+
+#: src/protocols/sametime/sametime.c:1665
+#, c-format
+msgid "Announcement from %s"
+msgstr "�� %s �惹��"
+
+#: src/protocols/sametime/sametime.c:1836
+#, fuzzy
+msgid "Conference Closed"
+msgstr "�g�����"
+
+#: src/protocols/sametime/sametime.c:2297
+#, fuzzy
+msgid "Unable to send message: "
+msgstr "�≧����肴����%s"
+
+#: src/protocols/sametime/sametime.c:2893
+#, fuzzy
+msgid "Place Closed"
+msgstr "綏峨�羔�"
+
+#: src/protocols/sametime/sametime.c:3180
+msgid "Microphone"
+msgstr "藝ュ��蘂�"
+
+#: src/protocols/sametime/sametime.c:3181
+msgid "Speakers"
+msgstr "����"
+
+# XXX ��⑮
+#: src/protocols/sametime/sametime.c:3182
+#, fuzzy
+msgid "Video Camera"
+msgstr "荀����鎀�"
+
+#: src/protocols/sametime/sametime.c:3186
+#, fuzzy
+msgid "File Transfer"
+msgstr "罟�罅��活叱"
+
+#: src/protocols/sametime/sametime.c:3207
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Status</b>: %s"
+msgstr "<b>����鐚�</b>%s"
+
+#: src/protocols/sametime/sametime.c:3212
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Message</b>: %s"
+msgstr ""
+"\n"
+"<b>%s鐚�</b>%s"
+
+#: src/protocols/sametime/sametime.c:3218
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Supports</b>: %s"
+msgstr "<b>����鐚�</b>%s"
+
+#: src/protocols/sametime/sametime.c:3223
+#, fuzzy
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>茘���鐚�<b>"
+
 #  XXX ������藥����茘����
-#: src/protocols/sametime/sametime.c:2758
+#: src/protocols/sametime/sametime.c:3241
 msgid "Active"
 msgstr "����"
 
-#: src/protocols/simple/simple.c:202
-#, c-format
+#: src/protocols/sametime/sametime.c:3330
+#, fuzzy
+msgid "Create conference with user"
+msgstr "�御���ヨ�����茘遺失����"
+
+#: src/protocols/sametime/sametime.c:3331
+#, c-format
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "茫��堺�亥����茘医�莠後�ヤ���筝脂�鐚������弱�坂�����茫�荐���畿%s"
+
+# NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
+#: src/protocols/sametime/sametime.c:3335
+#, fuzzy
+msgid "New Conference"
+msgstr "������茘医�"
+
+#: src/protocols/sametime/sametime.c:3337
+#, fuzzy
+msgid "Create"
+msgstr "��紊�"
+
+# NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
+#: src/protocols/sametime/sametime.c:3399
+#, fuzzy
+msgid "Available Conferences"
+msgstr "������茘医�"
+
+# NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
+#: src/protocols/sametime/sametime.c:3405
+#, fuzzy
+msgid "Create New Conference..."
+msgstr "������茘医�"
+
+# NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
+#: src/protocols/sametime/sametime.c:3412
+#, fuzzy
+msgid "Invite user to a conference"
+msgstr "������茘医�"
+
+#: src/protocols/sametime/sametime.c:3413
+#, c-format
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "緇�筝��合��羝���賢�後�筝�����茘医�鐚������弱�咲��茫�腟�戎����%s��絋������渇����筝����亥����茘医�鐚�筝����茫�����篏睡�������ワ����札�御���������井��茘医����檎����"
+
+# NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
+#: src/protocols/sametime/sametime.c:3418
+#, fuzzy
+msgid "Invite to Conference"
+msgstr "������茘医�"
+
+#: src/protocols/sametime/sametime.c:3420
+msgid "Invite"
+msgstr "��茫�"
+
+# NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
+#: src/protocols/sametime/sametime.c:3472
+#, fuzzy
+msgid "Invite to Conference..."
+msgstr "������茘医�"
+
+#: src/protocols/sametime/sametime.c:3518
+#, fuzzy
+msgid "No Sametime Community Server specified"
+msgstr "�g��� SILC 篌堺����賢"
+
+#: src/protocols/sametime/sametime.c:3539
+#, c-format
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr ""
+
+# NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
+# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: src/protocols/sametime/sametime.c:3544
+#, fuzzy
+msgid "Meanwhile Connection Setup"
+msgstr "�≧��g��活�茘���������腴��羣�"
+
+#: src/protocols/sametime/sametime.c:3545
+#, fuzzy
+msgid "No Sametime Community Server Specified"
+msgstr "�g��� SILC 篌堺����賢"
+
+#: src/protocols/sametime/sametime.c:4061
+msgid "<b>External User</b><br>"
+msgstr "<b>紊���戎����</b><br>"
+
+#: src/protocols/sametime/sametime.c:4064
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>篏睡����絽活��鐚�</b>%s<br>"
+
+#: src/protocols/sametime/sametime.c:4070
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>����鐚�</b>%s<br>"
+
+#: src/protocols/sametime/sametime.c:4076
+msgid "<b>Last Known Client:</b> "
+msgstr "<b>筝�罨≦群�ョ���句�鐚�</b>"
+
+#: src/protocols/sametime/sametime.c:4084
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "���ワ�0x%04x鐚�<br>"
+
+#: src/protocols/sametime/sametime.c:4091
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>��呃�</b>%s<br>"
+
+#: src/protocols/sametime/sametime.c:4097
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>����鐚�</b>%s"
+
+#: src/protocols/sametime/sametime.c:4342
+#: src/protocols/sametime/sametime.c:5369
+msgid "Possible Matches"
+msgstr "���順�悟�������"
+
+#: src/protocols/sametime/sametime.c:4383
+msgid "An ambiguous user ID was entered"
+msgstr "莠後�ヤ�筝���筝�����篏睡���� ID"
+
+#: src/protocols/sametime/sametime.c:4384
+#, fuzzy, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "莇������篏睡����篏睡����筝���腮宴��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
+
+#: src/protocols/sametime/sametime.c:4389
+msgid "Select User to Add"
+msgstr "�後�筝��医�篏睡����"
+
+#: src/protocols/sametime/sametime.c:4391
+msgid "Add User"
+msgstr "�医�篏睡����"
+
+#  TODO 茫�荀��ワ�茘�����緇��拷��
+#: src/protocols/sametime/sametime.c:4452
+msgid "Unable to add user: user not found"
+msgstr "�≧��医�篏睡����鐚��鞘��遺戎����"
+
+#: src/protocols/sametime/sametime.c:4454
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "��%s�������� Sametime 腓丞召筝㊦��篁私�篏睡����絽活��筝�膃���絎�絨�緇�����絅遵�羝���賢茴�Щ�ゃ��"
+
+#: src/protocols/sametime/sametime.c:4459
+msgid "Unable to add user"
+msgstr "�≧��医�篏睡����"
+
+#: src/protocols/sametime/sametime.c:5029
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "�≧�綮榊� Socket"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "IRC �援┗筝�������腥榊�遵���"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC ��絎�罔∞�"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC ��絎�罔∞�"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
-msgstr "篏睡����ID"
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "篁g��篌堺����"
-
-#: src/protocols/simple/simple.c:1438
-msgid "Proxy"
-msgstr "篁g��篌堺����"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"莅��� %s ��筝㊦�主��篋����鐚�\n"
+"%s��\n"
+
+#: src/protocols/sametime/sametime.c:5155
+#, fuzzy
+msgid "Remotely Stored Buddy List"
+msgstr "���阪ソ��羝���"
+
+#: src/protocols/sametime/sametime.c:5160
+#, fuzzy
+msgid "Buddy List Storage Mode"
+msgstr "絅遵�羝����綺�"
+
+#: src/protocols/sametime/sametime.c:5163
+#, fuzzy
+msgid "Local Buddy List Only"
+msgstr "����薈���絅遵�羝���(_D)"
+
+#: src/protocols/sametime/sametime.c:5165
+#, fuzzy
+msgid "Merge List from Server"
+msgstr "絨�篌堺�������絅遵���������"
+
+#: src/protocols/sametime/sametime.c:5167
+#, fuzzy
+msgid "Merge and Save List to Server"
+msgstr "����� CHL �弱�渇���遺�篌堺����"
+
+#: src/protocols/sametime/sametime.c:5169
+msgid "Synchronize List with Server"
+msgstr "��篌堺������罩ユ���"
+
+#: src/protocols/sametime/sametime.c:5218
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "���� Sametime 羝���畿絽活����%s��"
+
+#: src/protocols/sametime/sametime.c:5257
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "���� Sametime 羝���畿絽活����%s��"
+
+#: src/protocols/sametime/sametime.c:5308
+msgid "Unable to add group: group exists"
+msgstr "�≧��医�臂ょ�鐚�臂ょ�綏峨���"
+
+#: src/protocols/sametime/sametime.c:5309
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "臂ょ���腮宴��%s��綏牙�絖����惹����絅遵�羝���賢��"
+
+#: src/protocols/sametime/sametime.c:5312
+#: src/protocols/sametime/sametime.c:5437
+msgid "Unable to add group"
+msgstr "�≧��医�臂ょ�"
+
+#: src/protocols/sametime/sametime.c:5385
+msgid "Notes Address Book group results"
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5386
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr ""
+
+#  NOTE 羈����evolution ��昆��茘������������������������荐�����
+#: src/protocols/sametime/sametime.c:5391
+#, fuzzy
+msgid "Select Notes Address Book"
+msgstr "紜����育��荐���"
+
+#: src/protocols/sametime/sametime.c:5431
+msgid "Unable to add group: group not found"
+msgstr "�≧��医�臂ょ�鐚��鞘��亥召腟�"
+
+#: src/protocols/sametime/sametime.c:5433
+#, c-format
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr ""
+
+#  NOTE 羈����evolution ��昆��茘������������������������荐�����
+#: src/protocols/sametime/sametime.c:5473
+#, fuzzy
+msgid "Notes Address Book Group"
+msgstr "紜����育��荐���"
+
+#: src/protocols/sametime/sametime.c:5474
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr ""
+
+#: src/protocols/sametime/sametime.c:5489
+msgid "Import Sametime List..."
+msgstr "���� Sametime 羝���..."
+
+#: src/protocols/sametime/sametime.c:5493
+msgid "Export Sametime List..."
+msgstr "���� Sametime 羝���..."
+
+#  NOTE 羈����evolution ��昆��茘������������������������荐�����
+#: src/protocols/sametime/sametime.c:5497
+#, fuzzy
+msgid "Add Notes Address Book Group..."
+msgstr "紜����育��荐���"
+
+# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
+#. notesbuddy hack encoding
+#: src/protocols/sametime/sametime.c:5591
+#, fuzzy
+msgid "NotesBuddy encoding"
+msgstr "篌堺�������吡畿絎���絖���膩�⊆"
+
+#: src/protocols/sametime/sametime.c:5600
+msgid "Force login (ignore server redirects)"
+msgstr ""
+
+#. pretend to be Sametime Connect
+#: src/protocols/sametime/sametime.c:5610
+msgid "Hide client identity"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:52
+#: src/protocols/silc/buddy.c:420
+#: src/protocols/silc/buddy.c:545
+#: src/protocols/silc/buddy.c:712
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "篏睡���� %s 筝���恐莊��"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:53
+#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:120
+#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:139
+#: src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "篋ゆ�絲���"
 
-#: src/protocols/silc/buddy.c:53
+#: src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "�≧�篋ゆ�絲���"
 
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "篋ゆ�絲��遺賢�榊憥���"
 
-#: src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "篋ゆ�絲��医け��"
 
-#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "篋ゆ�絲��育�丈��"
 
-#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "篋ゆ�絲��域←筝㊥②"
 
-#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "篋ゆ�絲��医訓��紮�"
 
-#: src/protocols/silc/buddy.c:139
+#: src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "筝�������訓篋ゆ�絲���"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:258
+#: src/protocols/silc/buddy.c:388
+#: src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "��腴�戎����綏俄���恐莊��"
 
-#: src/protocols/silc/buddy.c:293
-#, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
+#: src/protocols/silc/buddy.c:294
+#, c-format
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
 msgstr "�� %s �九�遺���篋ゆ�絲��域�羆�鐚����割困��絲��医���"
 
-#: src/protocols/silc/buddy.c:297
+#: src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9290,463 +10335,496 @@
 "��腴�源罘���鐚�%s\n"
 "��腴���荐���鐚�%d"
 
-#: src/protocols/silc/buddy.c:310
+#: src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "篋ゆ�絲��域�羆�"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: src/protocols/silc/buddy.c:387
+#: src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "��絲�腆寂��恰��荐���"
 
-#: src/protocols/silc/buddy.c:422
+#: src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "�≧�荐㊤��恰��荐������"
 
-#: src/protocols/silc/buddy.c:464
+#: src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "荐㊤��恰��荐����腆�"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:512
+#: src/protocols/silc/buddy.c:547
+#: src/protocols/silc/ops.c:1492
+#: src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "��緇�����"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:548
+#: src/protocols/silc/ops.c:1493
+#: src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "�≧���緇�����"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:635
+#: src/protocols/silc/buddy.c:1610
 msgid "Show Public Key"
 msgstr "蕁�ず����"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/buddy.c:636
+#: src/protocols/silc/buddy.c:995
+#: src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "�≧�莠��ュ����"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:713
+#: src/protocols/silc/ops.c:1087
+#: src/protocols/silc/ops.c:1159
+#: src/protocols/silc/ops.c:1294
+#: src/protocols/silc/ops.c:1295
+#: src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "篏睡����莖�荐�"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:714
+#: src/protocols/silc/ops.c:1160
+#: src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "�≧�莅���篏睡����莖�荐�"
 
-#: src/protocols/silc/buddy.c:734
+#: src/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "絅遵� %s 筝�茴�拭篁�"
 
-#: src/protocols/silc/buddy.c:737
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"�頑�恰�����ュソ�������逸�����≧��九�域�絅遵���絅遵����ャ��荀���緇����逸�������緇���"
-"�違����篁ゅ�喝���"
+#: src/protocols/silc/buddy.c:738
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "�頑�恰�����ュソ�������逸�����≧��九�域�絅遵���絅遵����ャ��荀���緇����逸�������緇����違����篁ゅ�喝���"
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1029
 msgid "Open..."
 msgstr "����..."
 
-#: src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1038
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "絅遵� %s 筝���恐莊��"
 
-#: src/protocols/silc/buddy.c:1040
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
+#: src/protocols/silc/buddy.c:1041
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
 msgstr "荀��医�絅遵�鐚�綽������ヤ�鐚�絅刻������違��荀����ュ���逸�茫��������ャ����"
 
-#: src/protocols/silc/buddy.c:1043
+#: src/protocols/silc/buddy.c:1044
 msgid "Import..."
 msgstr "����..."
 
-#: src/protocols/silc/buddy.c:1130
+#: src/protocols/silc/buddy.c:1140
 msgid "Select correct user"
 msgstr "�御��罩g∈��篏睡����"
 
-#: src/protocols/silc/buddy.c:1132
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"莇������篏睡����篏睡����筝����違��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
-
-#: src/protocols/silc/buddy.c:1134
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"莇������篏睡����篏睡����筝���腮宴��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
-
-#: src/protocols/silc/buddy.c:1415
+#: src/protocols/silc/buddy.c:1142
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "莇������篏睡����篏睡����筝����違��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
+
+#: src/protocols/silc/buddy.c:1144
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "莇������篏睡����篏睡����筝���腮宴��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
+
+#: src/protocols/silc/buddy.c:1429
 msgid "Detached"
 msgstr "�����g�"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1433
+#: src/protocols/silc/silc.c:57
 msgid "Indisposed"
 msgstr "筝���"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1437
+#: src/protocols/silc/silc.c:59
 msgid "Wake Me Up"
 msgstr "������鐚�"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1439
+#: src/protocols/silc/silc.c:51
 msgid "Hyper Active"
 msgstr "罐球墾羇肢�"
 
-#: src/protocols/silc/buddy.c:1427
+#: src/protocols/silc/buddy.c:1441
 msgid "Robot"
 msgstr "罘�罌遺査"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: src/protocols/silc/buddy.c:1448
+#: src/protocols/silc/silc.c:658
+#: src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "��綽�"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: src/protocols/silc/buddy.c:1450
+#: src/protocols/silc/silc.c:660
+#: src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: src/protocols/silc/buddy.c:1452
+#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "�ゆ��"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/silc.c:664
+#: src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "絆�絋�"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: src/protocols/silc/buddy.c:1456
+#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: src/protocols/silc/buddy.c:1458
+#: src/protocols/silc/silc.c:668
+#: src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "�≧��"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: src/protocols/silc/buddy.c:1460
+#: src/protocols/silc/silc.c:670
+#: src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "����筝�"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: src/protocols/silc/buddy.c:1462
+#: src/protocols/silc/silc.c:672
+#: src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "�括��"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: src/protocols/silc/buddy.c:1464
+#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "�惹��"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: src/protocols/silc/buddy.c:1466
+#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "��絅�"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/silc.c:678
+#: src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1500
+#: src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "篏睡����罔≦�"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1509
+#: src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "綽���"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1513
+#: src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "����荐���"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1518
+#: src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "��機�号�"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1523
+#: src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "�悟�����"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1528
+#: src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "�����臀�"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: src/protocols/silc/buddy.c:1533
+#: src/protocols/silc/ops.c:1232
+#: src/protocols/silc/silc.c:726
+#: src/protocols/silc/silc.c:728
 msgid "Timezone"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1538
+#: src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "�����臀�"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1594
 msgid "Reset IM Key"
 msgstr "羝��ゅ�恰��荐������"
 
-#: src/protocols/silc/buddy.c:1572
+#: src/protocols/silc/buddy.c:1599
 msgid "IM with Key Exchange"
 msgstr "荀�篋ゆ�絲��遺��恰��荐���"
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1603
 msgid "IM with Password"
 msgstr "��絲�腆寂��恰��荐���"
 
-#: src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1615
 msgid "Get Public Key..."
 msgstr "��緇�����..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1622
+#: src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "緇�膓画君筝�腱脂�や戎����"
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/buddy.c:1631
+#: src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr "���醇�推�膵���"
+
+#: src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "絲�腆�(_P)鐚�"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "�脂�� %s 筝���恐莊��"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "�脂��莖�荐�"
 
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "�≧���緇��脂��莖�荐�"
 
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>�脂����腮縁�</b>%s"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>篏睡����篋堺�醐�</b>%d"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>�脂���窮���鐚�</b>%s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>�脂����絲��劫� (Cipher)鐚�</b>%s"
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>�脂��荳�蚕薊�茘�篁g⊆ (HMAC)鐚�</b>%s"
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>�脂��筝脂�鐚�</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>�脂��罔≦�鐚�</b>"
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>�窮���箙����井��膣�鐚�</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>�窮���箙����井��膣�������� (Babbleprint)鐚�</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "�医��脂������"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "��������..."
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "�脂��絲�腆�"
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "�脂�����井���"
 
-#: src/protocols/silc/chat.c:410
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"�脂��茯�茘�������我②�脂�������罨���茴����鐚�茯�茘����号���札������霅惹��������夓�"
-"膂順���絋���荐㊤�篋�絲�腆種����ラ�脂��絨怨���篋���莠後�ュ�腆種�絋���荐㊤�篋��脂�����逸����ラ��"
-"��絨怨��������������医�т��銀���"
+#: src/protocols/silc/chat.c:411
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "�脂��茯�茘�������我②�脂�������罨���茴����鐚�茯�茘����号���札������霅惹��������夓�膂順���絋���荐㊤�篋�絲�腆種����ラ�脂��絨怨���篋���莠後�ュ�腆種�絋���荐㊤�篋��脂�����逸����ラ�脂��絨怨��������������医�т��銀���"
 
 #  XXX ��⑮
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:421
+#: src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:905
 msgid "Channel Authentication"
 msgstr "�脂��茯�茘�"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:422
+#: src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "�医�鐚霡脂��"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "��紊����腮�"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:581
+#: src/protocols/silc/ops.c:1908
+#: src/protocols/silc/silc.c:934
 msgid "Passphrase"
 msgstr "絲�腆�"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "茫���畿�脂�� %s �х��絨��鎕�莠後�ュ��腮怨�絲�腆若��"
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "�医��脂��絨��鎕�"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "篏睡�����悟�����"
 
-#: src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "荐㊤�篏睡�����悟�����鐚�荀�羝��や戎�����悟�����鐚�莠後�ラ�九�喝���"
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "��緇�莖�荐�"
 
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "��茫�羝���"
 
 #  XXX ��⑮
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "胼�罩∽���"
 
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "�医�絨��鎕�"
 
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "羝��ゆ宛箙��ч�脂��罔≦�"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "荐㊤�羂娯��ч�脂��罔≦�"
 
 #  XXX may be wrong
-#: src/protocols/silc/chat.c:910
+#: src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "荐㊤�篏睡�����悟�����"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "羝��や源蕁�����"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "荐㊤�筝脂�����"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "羝��ょ����脂��罔≦�"
 
-#: src/protocols/silc/chat.c:933
+#: src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "荐㊤�腱����脂��罔≦�"
 
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "羝��ょ�絲��脂��罔≦�"
 
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "荐㊤�腱�絲��脂��罔≦�"
 
 #  XXX ��⑮
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:1032
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "���� <I>%s</I> ���脂���窮���"
 
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:1036
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> ���脂���窮����� <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
-#, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+#: src/protocols/silc/chat.c:1095
+#, c-format
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "���ュ���絖���鐚������薤������ラ�脂�� %s"
 
-#: src/protocols/silc/chat.c:1073
+#: src/protocols/silc/chat.c:1097
 msgid "Join Private Group"
 msgstr "���ュ���絖�"
 
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1098
 msgid "Cannot join private group"
 msgstr "�≧����ュ���絖�"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: src/protocols/silc/chat.c:1292
+#: src/protocols/silc/silc.c:1142
 msgid "Cannot call command"
 msgstr "�≧��決���篁�"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: src/protocols/silc/chat.c:1293
+#: src/protocols/silc/silc.c:1143
 msgid "Unknown command"
 msgstr "���ョ����篁�"
 
 #  NOTE ��篋��醇���腦�罔�蕁�
-#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: src/protocols/silc/ft.c:89
+#: src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96
+#: src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104
+#: src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210
+#: src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221
+#: src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "絎�����罟�罅��活叱"
 
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:90
+#: src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97
+#: src/protocols/silc/ft.c:101
 #: src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "罟�罅��活叱���主�����"
@@ -9760,9 +10838,8 @@
 msgstr "篋ゆ�絲��医け��"
 
 #: src/protocols/silc/ft.c:102
-#, fuzzy
 msgid "File transfer session does not exist"
-msgstr "羃���罟�罅��活叱綏ヤ����"
+msgstr "罟�罅��活叱綏ヤ����筝�絖���"
 
 #: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
@@ -9784,151 +10861,160 @@
 msgid "Cannot send file"
 msgstr "�≧��渇��罟�罅�"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:555
+#: src/protocols/silc/ops.c:564
+#: src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s �� <I>%s</I> ����紊�源蕁�篆��合�削�%s"
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 荐㊤��脂�� <I>%s</I> ��罔≦��削�%s"
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 羝��や��脂�� <I>%s</I> ������罔≦�"
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 荐㊤� <I>%s</I> ��篏睡����罔≦��削�%s"
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 羝��や� <I>%s's</I> ������罔≦�"
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "��← <I>%2$s</I> �� <I>%1$s</I> 荼√�� (%3$s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:743
+#: src/protocols/silc/ops.c:748
+#: src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "��← %s 緇�膓画君筝�腱脂�� (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:774
+#: src/protocols/silc/ops.c:779
+#: src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "茴� %s 緇�膓画君筝�腱脂�� (%s)"
 
 #  XXX 荀��後�
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "緇�篌堺�����糸��"
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "��篋肴�荐�"
 
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "����"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "�潔��"
 
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "�決岡"
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:1052
+#: src/protocols/silc/silc.c:927
 msgid "Organization"
 msgstr "��絮��罕�"
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "����"
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "�糸��灸散"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "��荐�"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "���ヨ��紊��"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1284
+#: src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "���井��膣�"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "���井��膣�������� (Babbleprint)"
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1298
 msgid "More..."
 msgstr "蕁�ず膣亥�..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: src/protocols/silc/ops.c:1369
+#: src/protocols/silc/silc.c:993
 msgid "Detach From Server"
 msgstr "��篌堺���������g�"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "�≧������g�"
 
-#: src/protocols/silc/ops.c:1166
+#: src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "�≧�荐㊤�筝脂�"
 
-#: src/protocols/silc/ops.c:1198
+#: src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "�≧��贋�号�援┗"
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "��紊��羝���"
 
-#: src/protocols/silc/ops.c:1246
+#: src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "�≧���緇���紊��羝���"
 
-#: src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "羃����九�医����"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1518
+#: src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "篌堺�����荐�"
 
-#: src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "�≧���緇�篌堺�����荐�"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1548
+#: src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "篌堺����輝荐�莖���"
 
-#: src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "�≧���緇�篌堺������腟沿�莖���"
 
-#: src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "篌堺�������腟沿�莖���"
 
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9949,121 +11035,120 @@
 msgstr ""
 "���亥�篌堺������罘�����鐚�%s\n"
 "���亥�篌堺������罘��割��縁�%s\n"
-"���亥�篌堺������句����醐�%d\n"
+"���亥�篌堺�������句����醐�%d\n"
 "���亥�篌堺�����脂�����醐�%d\n"
 "���亥�篌堺����失���������篋堺�醐�%d\n"
 "���亥�莊��怨�������篋堺�醐�%d\n"
-"���亥�膣域�� (Cell) 絎∽�句����醐�%d\n"
+"���亥�膣域�� (Cell) ���句����醐�%d\n"
 "���亥�膣域�� (Cell) �脂�����醐�%d\n"
 "���亥�膣域�� (Cell) 篌堺�������醐�%d\n"
-"絎∽�句�膰醇�醐�%d\n"
+"���句�膰醇�醐�%d\n"
 "�脂��膰醇�醐�%d\n"
 "篌堺����現�醐�%d\n"
 "莊��怨��現�醐�%d\n"
 "篌堺���������膰醇�醐�%d 篋�\n"
 "莊��怨�������膰醇�醐�%d 篋�\n"
 
-#: src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "膓画君腟沿�莖���"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1611
+#: src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Ping 紊掩��"
 
-#: src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "�延失�����九�� Ping ����"
 
-#: src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "�≧��援恐莊��腱脂�や戎����"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "�g��� SILC 篌堺�������主�����"
 
-#: src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "絲��遺困��紊掩��"
 
-#: src/protocols/silc/ops.c:1508
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+#: src/protocols/silc/ops.c:1722
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "�√奨�g�紊掩��鐚�茫��������育�g���綮榊��亥���g���"
 
-#: src/protocols/silc/ops.c:1543
+#: src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "篌堺����賢�隙��g�"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: src/protocols/silc/ops.c:1819
+#: src/protocols/silc/ops.c:1866
+#: src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "�√奨綏ヤ����筝�"
 
-#: src/protocols/silc/ops.c:1607
+#: src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "�咲�g��画�薊�茘�筝�"
 
-#: src/protocols/silc/ops.c:1654
+#: src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "�後�篌堺���������遺賢"
 
-#: src/protocols/silc/ops.c:1695
+#: src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "綽���莠後�ュ�腆�"
 
-#: src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "紊掩��鐚������膃��茫��贋�井����絎∽�句�腮�綣�"
-
-#: src/protocols/silc/ops.c:1727
+msgstr "紊掩��鐚������膃��茫��贋�井�������句�腮�綣�"
+
+#: src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "紊掩��鐚���腴��篆>算鐚鋇���吚��������"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "紊掩��鐚���腴����吓産茘遺賢��絲��遺困��臂ょ� (KE group)"
 
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "紊掩��鐚���腴����吓産茘遺賢����絲��劫� (cipher)"
 
 #  NOTE 茘���羣��� http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "紊掩��鐚���腴����吓産茘遺賢�������医��茘��御�羣� (PKCS)"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "紊掩��鐚���腴����吓産茘遺賢����羚��醇�� (hash function)"
 
-#  NOTE 茘���羣��� http://www.cert.org.tw/document/column/show.php?key=28    
-#: src/protocols/silc/ops.c:1742
+#  NOTE 茘���羣��� http://www.cert.org.tw/document/column/show.php?key=28
+#: src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "紊掩��鐚���腴����吓産茘遺賢��荳�蚕薊�茘�篁g⊆ (HMAC)"
 
-#: src/protocols/silc/ops.c:1744
+#: src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "紊掩��鐚������膂順�"
 
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "紊掩��鐚��≧���� Cookie"
 
-#: src/protocols/silc/ops.c:1757
+#: src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "紊掩��鐚�茯�茘�紊掩��"
 
 #: src/protocols/silc/pk.c:103
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
 msgstr "�九�� %s �����逸�篏��九�亥�����域���憝����筝�����篁��倶・���������医���"
 
 #: src/protocols/silc/pk.c:108
@@ -10084,7 +11169,8 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: src/protocols/silc/pk.c:115
+#: src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "�後�����"
 
@@ -10096,36 +11182,36 @@
 msgid "Unsupported public key type"
 msgstr "筝���吡�����育���"
 
-#: src/protocols/silc/silc.c:154
+#: src/protocols/silc/silc.c:155
 msgid "Connection failed"
 msgstr "�g�紊掩��"
 
-#: src/protocols/silc/silc.c:186
+#: src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
-msgstr "�≧���紮��� SILC ��絎∽�句��g�"
-
-#: src/protocols/silc/silc.c:197
+msgstr "�≧���紮��� SILC �����句��g�"
+
+#: src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "篋ゆ�絲��遺賢"
 
-#: src/protocols/silc/silc.c:270
+#: src/protocols/silc/silc.c:273
 msgid "Out of memory"
 msgstr "荐��狗�筝�紊�"
 
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: src/protocols/silc/silc.c:326
 msgid "Connecting to SILC Server"
 msgstr "�g��� SILC 篌堺����賢"
 
-#: src/protocols/silc/silc.c:630
+#: src/protocols/silc/silc.c:654
 msgid "Your Current Mood"
 msgstr "��������綽���"
 
-#: src/protocols/silc/silc.c:632
+#: src/protocols/silc/silc.c:656
 msgid "Normal"
 msgstr "罩e幻"
 
-#: src/protocols/silc/silc.c:657
+#: src/protocols/silc/silc.c:681
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10133,264 +11219,271 @@
 "\n"
 "��機�号�"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:689
+#: src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:691
+#: src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:693
+#: src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "荀����顑�"
 
-#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:698
 msgid "Your Current Status"
 msgstr "��������"
 
 #  XXX ��⑮
-#: src/protocols/silc/silc.c:681
+#: src/protocols/silc/silc.c:705
 msgid "Online Services"
 msgstr "�����膩�筝�����"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:708
 msgid "Let others see what services you are using"
 msgstr "莅�篁�篋阪�札緇��ユ��戎���d�膩�筝�����"
 
 #  NOTE XXX ��紮�腆守¨腓咲�����九�筝����肢�����鐚�������篏�膤紫輝���� :-/
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:714
 msgid "Let others see what computer you are using"
 msgstr "絎壕┗�ヤ査�ョ�����������藝守�肢��"
 
-#: src/protocols/silc/silc.c:697
+#: src/protocols/silc/silc.c:721
 msgid "Your VCard File"
 msgstr "���� VCard 罟�罅�"
 
 #  XXX 絅遵�鏅���
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: src/protocols/silc/silc.c:733
+#: src/protocols/silc/silc.c:734
 msgid "User Online Status Attributes"
 msgstr "篏睡����筝�膩�����絮���"
 
-#: src/protocols/silc/silc.c:712
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"���札腟��銀�篏睡������荀�����筝�膩���������篋肴�荐�����������莖�荐�鐚�����莠後�ユ�������"
-"篋榊��緇�荀���������"
-
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: src/protocols/silc/silc.c:735
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "���札腟��銀�篏睡������荀�����筝�膩���������篋肴�荐�����������莖�荐�鐚�����莠後�ユ������ヤ査��緇�荀���������"
+
+#: src/protocols/silc/silc.c:775
+#: src/protocols/silc/silc.c:781
+#: src/protocols/silc/silc.c:1421
 msgid "Message of the Day"
 msgstr "���ヨ���"
 
-#: src/protocols/silc/silc.c:752
+#: src/protocols/silc/silc.c:775
 msgid "No Message of the Day available"
 msgstr "羃������ヨ���"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: src/protocols/silc/silc.c:776
+#: src/protocols/silc/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "�����g�羃����檎�������ヨ���"
 
-#: src/protocols/silc/silc.c:800
+#: src/protocols/silc/silc.c:827
+#: src/protocols/silc/silc.c:871
+#: src/protocols/silc/silc.c:942
+#: src/protocols/silc/silc.c:943
+msgid "Create New SILC Key Pair"
+msgstr "�∝���亥�� SILC 絲���絨�"
+
+#: src/protocols/silc/silc.c:827
+msgid "Passphrases do not match"
+msgstr "絲�腆寂�膃�"
+
+#: src/protocols/silc/silc.c:871
+msgid "Key Pair Generation failed"
+msgstr "絲��医��∝��紊掩��"
+
+#: src/protocols/silc/silc.c:910
+msgid "Key Length"
+msgstr "絲��育�桁墾"
+
+#: src/protocols/silc/silc.c:912
+msgid "Public Key File"
+msgstr "���井�罅�"
+
+#: src/protocols/silc/silc.c:914
+msgid "Private Key File"
+msgstr "腱��井�罅�"
+
+#: src/protocols/silc/silc.c:923
+msgid "Real Name"
+msgstr "紮���"
+
+#: src/protocols/silc/silc.c:937
+msgid "Re-type Passphrase"
+msgstr "��罨∴叱�ュ�腆�"
+
+#: src/protocols/silc/silc.c:944
+msgid "Generate Key Pair"
+msgstr "�∝��絲��医�"
+
+#: src/protocols/silc/silc.c:988
 msgid "Online Status"
 msgstr "筝�膩�����"
 
-#: src/protocols/silc/silc.c:809
+#: src/protocols/silc/silc.c:997
 msgid "View Message of the Day"
 msgstr "蕁�ず���ヨ��� (MOTD)"
 
-#: src/protocols/silc/silc.c:882
+#: src/protocols/silc/silc.c:1001
+msgid "Create SILC Key Pair..."
+msgstr "�∝�� SILC 絲��医�..."
+
+#: src/protocols/silc/silc.c:1100
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "篏睡���� <I>%s</I> 筝���恐莊��"
 
-#: src/protocols/silc/silc.c:1033
+#: src/protocols/silc/silc.c:1292
 msgid "Topic too long"
 msgstr "��紊�源蕁�����"
 
-#: src/protocols/silc/silc.c:1114
+#: src/protocols/silc/silc.c:1373
 msgid "You must specify a nick"
 msgstr "綽�����絎��援┗"
 
-#: src/protocols/silc/silc.c:1216
+#: src/protocols/silc/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "�鞘��井��茘� %s"
 
-#: src/protocols/silc/silc.c:1221
+#: src/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s ���脂��罔≦��削�%s"
 
-#: src/protocols/silc/silc.c:1223
+#: src/protocols/silc/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 羃���荐㊤��脂��罔≦�"
 
-#: src/protocols/silc/silc.c:1236
+#: src/protocols/silc/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "�≧��� %s 荐㊤��脂��罔≦�"
 
-#: src/protocols/silc/silc.c:1266
+#: src/protocols/silc/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "���ョ����篁わ�%s鐚����醇�� Gaim �����鐚�"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [�脂��]鐚��∫����紊��"
 
-#: src/protocols/silc/silc.c:1333
+#: src/protocols/silc/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [�脂��]鐚��∫����紊��"
 
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;�遺源蕁�&gt;]鐚�罟∵���篆��壕��紊�源蕁�"
 
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;�脂��&gt; [&lt;絲�腆�&gt;]鐚����ヤ�����恐莊������紊��"
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list鐚����榊������恐腟>�����紊��羝���"
 
-#: src/protocols/silc/silc.c:1350
+#: src/protocols/silc/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;�援┗&gt;鐚��ョ�������援┗���檎��莖�荐�"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1613
+#: src/protocols/zephyr/zephyr.c:2598
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����"
 
-#: src/protocols/silc/silc.c:1358
+#: src/protocols/silc/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;�援┗&gt; [&lt;荐���&gt;]鐚����坂���腱�篋肴���畿��絎���篏睡����"
 
-#: src/protocols/silc/silc.c:1362
+#: src/protocols/silc/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd鐚�蕁�ず篌堺���������ヨ��� (MOTD)"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach鐚������g�����綏ヤ����"
 
-#: src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [荐���]鐚���失�����∝�鐚�筝���御�����堺��絎���荐���"
 
-#: src/protocols/silc/silc.c:1374
+#: src/protocols/silc/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;��篁�&gt;鐚��決� SILC ��絎���絎∽�句���篁�"
-
-#: src/protocols/silc/silc.c:1380
+msgstr "call &lt;��篁�&gt;鐚��決� SILC ��絎������句���篁�"
+
+#: src/protocols/silc/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;�援┗&gt; [-pubkey|&lt;����&gt;]鐚�緇�膓画君筝�腱脂�ゆ�援┗"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;�井�援┗&gt;鐚��壕������援┗"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;�援┗&gt;鐚��ョ���援┗���檎��莖�荐�"
 
-#: src/protocols/silc/silc.c:1392
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
+#: src/protocols/silc/silc.c:1651
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
 msgstr "cmode &lt;�脂��&gt; [+|-&lt;罔≦�&gt;]; [����]鐚�荐㊤���蕁�ず�脂��罔≦�"
 
-#: src/protocols/silc/silc.c:1396
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;�脂��&gt; +|-&lt;罔≦�&gt; &lt;�援┗&gt;鐚�����絎��脂��篆��号��絎����援┗��"
-"罔≦�"
-
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1655
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;�脂��&gt; +|-&lt;罔≦�&gt; &lt;�援┗&gt;鐚�����絎��脂��篆��号��絎����援┗��罔≦�"
+
+#: src/protocols/silc/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;篏睡����罔≦�&gt;鐚�荐㊤�����恐莊����罔≦�"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;�援┗&gt; [-pubkey]鐚���緇�篌堺�����������罨���"
 
-#: src/protocols/silc/silc.c:1408
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;�脂��&gt; [-|+]&lt;�援┗&gt;鐚���茫���絎����援┗���医���絎����援┗�育�脂����"
-"茴�������茵���������絎����援┗緇��脂����茴�������茵�賢腱脂��"
-
-#: src/protocols/silc/silc.c:1412
+#: src/protocols/silc/silc.c:1667
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;�脂��&gt; [-|+]&lt;�援┗&gt;鐚���茫���絎����援┗���医���絎����援┗�育�脂����茴�������茵���������絎����援┗緇��脂����茴�������茵�賢腱脂��"
+
+#: src/protocols/silc/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;�脂��&gt; &lt;�援┗&gt; [��荐�]鐚�����絎����援┗緇��脂��筝㊧権��"
 
 #  XXX ��⑮
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [篌堺����]鐚�茹���篌堺������膊∞��膣亥�"
 
 #  XXX ��⑮
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;�脂��&gt; +|-&lt;�援┗&gt;]鐚��惹��絎����脂��胼�罩∽��絎���絎∽�句�"
-
-#: src/protocols/silc/silc.c:1424
+msgstr "ban [&lt;�脂��&gt; +|-&lt;�援┗&gt;]鐚��惹��絎����脂��胼�罩∽��絎������句�"
+
+#: src/protocols/silc/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;�援┗|篌堺����&gt;鐚���緇�絎∽�句���篌堺����������"
-
-#: src/protocols/silc/silc.c:1428
+msgstr "getkey &lt;�援┗|篌堺����&gt;鐚���緇����句���篌堺����������"
+
+#: src/protocols/silc/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats鐚�茹���篌堺�����膓画君��腟沿�莖���"
 
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping鐚����g���篌堺�������� PING"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;�脂��&gt;鐚����咲�脂��筝㊦��篏睡����"
 
-#: src/protocols/silc/silc.c:1441
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;�脂��...&gt;鐚����堺��絎���筝���"
-"紊����脂����篏睡��������筝�蕁�篏睡����"
-
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "�恰��荐���"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "�娯�膂順讐�����恰��荐���"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "�後������恰��荐�����膂順�"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "�脂��荐���"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "�娯�膂順讐�����脂��荐���"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "�後������脂��荐�����膂順�"
+#: src/protocols/silc/silc.c:1700
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;�脂��...&gt;鐚����堺��絎���筝���紊����脂����篏睡��������筝�蕁�篏睡����"
 
 #. *< type
 #. *< ui_requirement
@@ -10401,94 +11494,117 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: src/protocols/silc/silc.c:1800
 msgid "SILC Protocol Plugin"
 msgstr "SILC ��絎�罔∞�"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: src/protocols/silc/silc.c:1802
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "絎����х恐��膓画君�恰����茘� (SILC) ��絎�"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1839
 msgid "Public Key file"
 msgstr "���井�罅�"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1843
 msgid "Private Key file"
 msgstr "腱��井�罅�"
 
+#: src/protocols/silc/silc.c:1853
+msgid "Cipher"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1863
+msgid "HMAC"
+msgstr ""
+
 #  XXX
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1866
 msgid "Public key authentication"
 msgstr "篏睡�����域�茘�"
 
 #  TODO 茘�����緇��拷�駕������顑�
-#: src/protocols/silc/silc.c:1611
+#: src/protocols/silc/silc.c:1869
 msgid "Reject watching by other users"
 msgstr "��腟�篌堺�������絅遵���������"
 
-#: src/protocols/silc/silc.c:1614
+#: src/protocols/silc/silc.c:1872
 msgid "Block invites"
 msgstr "��腟���茫�"
 
 #  XXX 絅遵��恔�緇���
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1875
 msgid "Block IMs without Key Exchange"
 msgstr "��腟�羃���篋ゆ�絲��亥���恰��荐���"
 
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1878
 msgid "Reject online status attribute requests"
 msgstr "��腟�筝�膩�����絮��ц�羆�"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: src/protocols/silc/silc.c:1881
+msgid "Block messages to whiteboard"
+msgstr ""
+
+# XXX ��⑮
+#: src/protocols/silc/silc.c:1884
+msgid "Automatically open whiteboard"
+msgstr "���������醇��"
+
+#: src/protocols/silc/silc.c:1887
+#, fuzzy
+msgid "Digitally sign and verify all messages"
+msgstr "�娯�膂順讐�����恰��荐���"
+
+#: src/protocols/silc/util.c:206
+#: src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
 msgstr "綮榊� SILC key pair 筝�..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "紮���鐚�������\t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "篏睡������腮縁�\t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "�糸��灸散鐚���\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "筝紙���腮縁���\t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "��絮��罕�鐚���\t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "��絎駈�������\t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "羲�膊�羈�鐚�����\t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "絲��育�桁墾鐚���\t%d ��篏���\n"
 
-#: src/protocols/silc/util.c:327
+#: src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10499,7 +11615,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10508,26 +11624,91 @@
 "���井��膣�������� (Babbleprint)鐚�\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:334
 msgid "Public Key Information"
 msgstr "���域�荐�"
 
-#: src/protocols/silc/util.c:515
+#: src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "�喝��"
 
-#: src/protocols/silc/util.c:539
+#: src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "�肢��"
 
-#: src/protocols/silc/util.c:543
+#: src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "�糸���絽�"
 
-#: src/protocols/silc/util.c:545
+#: src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "腟�腴��"
 
+#: src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#: src/protocols/silc/wb.c:288
+#, c-format
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr ""
+
+#: src/protocols/silc/wb.c:302
+#, fuzzy
+msgid "Whiteboard"
+msgstr "���醇�推�膵���"
+
+#: src/protocols/simple/simple.c:202
+#, c-format
+msgid "Could not add the buddy %s because every simple user has to start with 'sip:'."
+msgstr ""
+
+#: src/protocols/simple/simple.c:1227
+#, fuzzy
+msgid "Could not create listen socket"
+msgstr "�≧�綮榊� Socket"
+
+#: src/protocols/simple/simple.c:1281
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "SIP 篏睡������腮延�������腥榊�遵�������@��膃���"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: src/protocols/simple/simple.c:1428
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE ��荐���絎�罔∞�"
+
+#. *  summary
+#: src/protocols/simple/simple.c:1429
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE ��荐���絎�罔∞�"
+
+#: src/protocols/simple/simple.c:1451
+#, fuzzy
+msgid "Publish status (note: everyone may watch you)"
+msgstr "���紫����鐚�茫�羈����篁私�篋咲�処�順���井���"
+
+#: src/protocols/simple/simple.c:1454
+msgid "Use UDP"
+msgstr "篏睡�� UDP"
+
+#: src/protocols/simple/simple.c:1456
+#, fuzzy
+msgid "Use proxy"
+msgstr "篏睡�� Proxy"
+
+#: src/protocols/simple/simple.c:1458
+msgid "Proxy"
+msgstr "篁g��篌堺����"
+
 #: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
@@ -10647,12 +11828,8 @@
 msgstr "�������糸�ョ鎧腟援��茘���膈�膣�紊��鐚�篁ヨ�雁�≧��糸�ャ��"
 
 #: src/protocols/toc/toc.c:552
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
-"膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
+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 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅����g�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
 #: src/protocols/toc/toc.c:554
 #, c-format
@@ -10689,22 +11866,25 @@
 msgstr "TOC ���坂�筝������� (PAUSE) ��篁ゃ��"
 
 #: src/protocols/toc/toc.c:994
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-"�狗�����主����鐚�TOC ��綽順�ユ������箴���荐�����������遵�������肴�����鐚�絨���権�榊鎧"
-"腟宴��Gaim 絨��水���主����罔g��篋�����������������х������鐚�茫����茫���"
+msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
+msgstr "�狗�����主����鐚�TOC ��綽順�ユ������箴���荐�����������遵�������肴�����鐚�絨���権�榊鎧腟宴��Gaim 絨��水���主����罔g��篋�����������������х������鐚�茫����茫���"
 
 #: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "��緇�篏睡������篋肴�荐�"
 
+#: src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "荐㊤�篏睡����莖�荐�"
+
 #: src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "荐㊤�篏睡������篋肴�荐�"
 
+#: src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "篆��劫�腆�"
+
 #: src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
@@ -10714,8 +11894,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "罟�罅��活叱紊掩��鐚����醇����劫�羔��活叱��"
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: src/protocols/toc/toc.c:1892
+#: src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056
+#: src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "�≧������g�篁ヤ��活叱��"
 
@@ -10749,29 +11931,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2317
+#: src/protocols/toc/toc.c:2319
 msgid "TOC Protocol Plugin"
 msgstr "TOC ��絎�罔∞�"
 
-#: src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2338
 msgid "TOC host"
 msgstr "TOC 篌堺����"
 
-#: src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2342
 msgid "TOC port"
 msgstr "TOC ��荐���"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/protocols/yahoo/yahoo.c:706
+#: src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "�≧����堺���� Yahoo! 荐�����"
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:3487
 msgid "Buzz!!"
 msgstr "�駈�"
 
 # XXX ��⑮
-#: src/protocols/yahoo/yahoo.c:797
+#: src/protocols/yahoo/yahoo.c:803
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s �� Yahoo! 膤紫輝荐����"
@@ -10780,130 +11964,123 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:887
+#: src/protocols/yahoo/yahoo.c:899
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "篏睡���� %s �活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝���%s%s��"
 
 #  XXX
-#: src/protocols/yahoo/yahoo.c:893
+#: src/protocols/yahoo/yahoo.c:905
 msgid "Message (optional) :"
 msgstr "荐������札筝�紂��鐚�"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: src/protocols/yahoo/yahoo.c:947
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "篏睡���� %s ������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆���"
 
-#: src/protocols/yahoo/yahoo.c:938
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"篏睡���� %s ���坂�������鐚�������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆�鐚�%"
-"s"
-
-#: src/protocols/yahoo/yahoo.c:941
+#: src/protocols/yahoo/yahoo.c:950
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "篏睡���� %s ���坂�������鐚�������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆�鐚�%s"
+
+#: src/protocols/yahoo/yahoo.c:953
 msgid "Add buddy rejected"
 msgstr "�医�絅遵�茴���"
 
-#: src/protocols/yahoo/yahoo.c:1684
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-"Yahoo 篌堺�����羆�篋�篏睡���腮������茯�茘��劫�鐚���罩ら���������� Gaim 緇����巡�������"
-"�糸�� Yahoo��茫��� %s 罟∽�ユ��羃����贋�亥��������"
-
-#: src/protocols/yahoo/yahoo.c:1687
+#: src/protocols/yahoo/yahoo.c:1696
+#, c-format
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Yahoo 篌堺�����羆�篋�篏睡���腮������茯�茘��劫�鐚���罩ら���������� Gaim 緇����巡��������糸�� Yahoo��茫��� %s 罟∽�ユ��羃����贋�亥��������"
+
+#: src/protocols/yahoo/yahoo.c:1699
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 茯�茘�紊掩��"
 
-#: src/protocols/yahoo/yahoo.c:1760
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"����荅�申�ュ������絅遵������х�� %s��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝�"
-"���喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
-
-#: src/protocols/yahoo/yahoo.c:1763
+#: src/protocols/yahoo/yahoo.c:1772
+#, c-format
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "����荅�申�ュ������絅遵������х�� %s��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝����喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
+
+#: src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "綽順�ヤ戎����鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "篏睡������腮援�≧����"
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "�≧�篁ユ③絽悟�綺顄�茘�鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1809
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-"�≧�篁ユ③絽御�号��画�茯�茘�鐚���茵�ず��叱�ヤ������絲�腆種����� Yahoo! �贋�剛�茯�茘���"
-"羈���Gaim ���喝��荅���� Web Messenger �婭�茯�茘�鐚���腮��茘��号�����吨�������純��"
-
-#: src/protocols/yahoo/yahoo.c:1817
+#: src/protocols/yahoo/yahoo.c:1821
+msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
+msgstr "�≧�篁ユ③絽御�号��画�茯�茘�鐚���茵�ず��叱�ヤ������絲�腆種����� Yahoo! �贋�剛�茯�茘��号���Gaim ���喝��荅���� Web Messenger �婭�茯�茘�鐚���腮��茘��号�����吨�������純��"
+
+#: src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "�����絲�腆若��"
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: src/protocols/yahoo/yahoo.c:1832
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "篏���絽恰�句����茴�����������茫����糸�� Yahoo! 膓牙���"
 
-#: src/protocols/yahoo/yahoo.c:1823
+#: src/protocols/yahoo/yahoo.c:1835
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "���ョ�����篁g⊆ %d��綏牙��糸�ュ�� Yahoo!鐚�絎��合恐腴�筝����遵群膓�篆�③���������"
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: src/protocols/yahoo/yahoo.c:1889
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "�≧�絨�絅遵���%1$s���医��喝験����%3$s����失�������羝����х��臂ょ���%2$s����"
 
-#: src/protocols/yahoo/yahoo.c:1880
+#: src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
 msgstr "�≧�絨�絅遵��医��割失�������羝�����"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/yahoo.c:2136
+#: src/protocols/yahoo/yahoo.c:2282
 #: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "�≧�莅���"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoo.c:2304
+#: src/protocols/yahoo/yahoo.c:2432
+#: src/protocols/yahoo/yahoo.c:2531
+#: src/protocols/yahoo/yahoo.c:2541
+#: src/protocols/yahoo/yahoochat.c:1395
+#: src/protocols/yahoo/yahoochat.c:1465
 #: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "�g����"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
+#: src/protocols/yahoo/yahoo.c:2644
+#: src/protocols/yahoo/yahoo.c:3223
+#, fuzzy
+msgid "Not at Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
+#: src/protocols/yahoo/yahoo.c:2646
+#: src/protocols/yahoo/yahoo.c:3226
+#, fuzzy
+msgid "Not at Desk"
 msgstr "筝���婚篏�"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
+#: src/protocols/yahoo/yahoo.c:2648
+#: src/protocols/yahoo/yahoo.c:3229
+#, fuzzy
+msgid "Not in Office"
 msgstr "筝���商���"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: src/protocols/yahoo/yahoo.c:2652
+#: src/protocols/yahoo/yahoo.c:3235
 msgid "On Vacation"
 msgstr "羝≦���私�"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: src/protocols/yahoo/yahoo.c:2656
+#: src/protocols/yahoo/yahoo.c:3241
 msgid "Stepped Out"
 msgstr "莎医�阪サ篋�"
 
@@ -10911,79 +12088,85 @@
 # NOTE ��箙�茵�ず篏�筝�����荀�����絅遵��糸�ョ�膈�����(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2749
+#: src/protocols/yahoo/yahoo.c:2778
 msgid "Not on server list"
 msgstr "筝���失�������羝���賢"
 
 #  NOTE ��������箴����∝������銀���絎������∝�������箙�筝�筝�絎��������∝�鐚����喝Ű⑮���∝���箙�筝�紊��∵�
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
+#: src/protocols/yahoo/yahoo.c:2795
+#: src/protocols/yahoo/yahoo.c:2855
 #, fuzzy
 msgid "Appear Online"
 msgstr "�∝�"
 
 #  NOTE ��������箴����∝������銀���絎������∝�������箙�筝�筝�絎��������∝�鐚����喝Ű⑮���∝���箙�筝�紊��∵�
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
+#: src/protocols/yahoo/yahoo.c:2798
+#: src/protocols/yahoo/yahoo.c:2877
 #, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "�∝�"
 
-#: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
-msgid "Stealth"
-msgstr "��鐚鎴�"
+#: src/protocols/yahoo/yahoo.c:2816
+#, fuzzy
+msgid "Presence"
+msgstr "�鎁処┃絎�"
 
 #  NOTE ��������箴����∝������銀���絎������∝�������箙�筝�筝�絎��������∝�鐚����喝Ű⑮���∝���箙�筝�紊��∵�
-#: src/protocols/yahoo/yahoo.c:2849
+#: src/protocols/yahoo/yahoo.c:2871
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "�∝�"
 
 # NOTE #gaim �� Vann �� LSchiere 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: src/protocols/yahoo/yahoo.c:2896
+#: src/protocols/yahoo/yahoo.c:2918
 msgid "Join in Chat"
 msgstr "���ュソ��������������紊��"
 
 # NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
-#: src/protocols/yahoo/yahoo.c:2901
+#: src/protocols/yahoo/yahoo.c:2923
 msgid "Initiate Conference"
 msgstr "������茘医�"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:2948
+#, fuzzy
+msgid "Presence Settings"
+msgstr "篏睡���医�莅��梧┃絎�"
+
+#: src/protocols/yahoo/yahoo.c:2954
 msgid "Start Doodling"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:2985
 msgid "Active which ID?"
 msgstr "��������� ID鐚�"
 
 # NOTE #gaim �� Vann �� LSchiere 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2994
 msgid "Join who in chat?"
 msgstr "���ュ����絅遵�������������紊��鐚�"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3004
 msgid "Activate ID..."
 msgstr "���� ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
+#: src/protocols/yahoo/yahoo.c:3008
+#, fuzzy
+msgid "Join User in Chat..."
 msgstr "���ュソ��������������紊��..."
 
-#: src/protocols/yahoo/yahoo.c:3541
+#: src/protocols/yahoo/yahoo.c:3529
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt��紊��&gt;鐚����ヤ��� Yahoo! 膓画君��筝�����紊��"
 
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
+#: src/protocols/yahoo/yahoo.c:3533
+#, fuzzy
+msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 腟�ソ��筝������吟��綣�篁�鐚�絅刻�羈���"
 
-#: src/protocols/yahoo/yahoo.c:3550
+#: src/protocols/yahoo/yahoo.c:3538
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10997,145 +12180,133 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: src/protocols/yahoo/yahoo.c:3630
+#: src/protocols/yahoo/yahoo.c:3632
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo ��絎�罔∞�"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: src/protocols/yahoo/yahoo.c:3649
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: src/protocols/yahoo/yahoo.c:3652
 msgid "Pager host"
 msgstr "�喝�主鎧腟延失����"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: src/protocols/yahoo/yahoo.c:3655
 msgid "Japan Pager host"
 msgstr "�喝�主鎧腟延失������ユ���医��鐚�"
 
-#: src/protocols/yahoo/yahoo.c:3667
+#: src/protocols/yahoo/yahoo.c:3658
 msgid "Pager port"
 msgstr "�喝�主鎧腟演��荐���"
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: src/protocols/yahoo/yahoo.c:3661
 msgid "File transfer host"
 msgstr "罟�罅��活叱筝紙�"
 
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
+#: src/protocols/yahoo/yahoo.c:3664
+msgid "Japan file transfer host"
 msgstr "罟�罅��活叱筝紙�鐚��ユ���医��鐚�"
 
-#: src/protocols/yahoo/yahoo.c:3676
+#: src/protocols/yahoo/yahoo.c:3667
 msgid "File transfer port"
 msgstr "罟�罅��活叱��荐���"
 
 #  XXX �≦��筝�茘��鐚���茘����医�����������������潟���贋����(?!)
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
+#: src/protocols/yahoo/yahoo.c:3670
+msgid "Chat room locale"
 msgstr "��紊������ (Locale)"
 
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
+#: src/protocols/yahoo/yahoo.c:3673
+msgid "Chat room list URL"
 msgstr "��紊��羝�������恐��"
 
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
+#: src/protocols/yahoo/yahoo.c:3676
+msgid "YCHT host"
 msgstr "YCHT 筝紙�"
 
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
+#: src/protocols/yahoo/yahoo.c:3679
+msgid "YCHT port"
 msgstr "YCHT ��荐���"
 
-#: src/protocols/yahoo/yahoo_profile.c:672
+#: src/protocols/yahoo/yahoo_profile.c:676
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP 篏���鐚�</b>%s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan ��篋肴���"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: src/protocols/yahoo/yahoo_profile.c:753
 msgid "Yahoo! Profile"
 msgstr "Yahoo! ��篋肴���"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+#: src/protocols/yahoo/yahoo_profile.c:797
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "絨�筝�莎件�����筝����吓�у�茴����阪��腴ヤ�絎�����篋肴�荐���"
 
 # NOTE 羈������腟���⑮��箙�筝�蕁�ず鐚���茘�����篁ヤ���
-#: src/protocols/yahoo/yahoo_profile.c:795
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser"
+#: src/protocols/yahoo/yahoo_profile.c:799
+msgid "If you wish to view this profile, you will need to visit this link in your web browser"
 msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��g�"
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: src/protocols/yahoo/yahoo_profile.c:975
 msgid "Yahoo! ID"
 msgstr "Yahoo! 絽活��"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
 #: src/protocols/yahoo/yahoo_profile.c:1047
 #: src/protocols/yahoo/yahoo_profile.c:1051
+#: src/protocols/yahoo/yahoo_profile.c:1055
 msgid "Hobbies"
 msgstr "��絅�"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
 #: src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/yahoo/yahoo_profile.c:1069
 msgid "Latest News"
 msgstr "���井���"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: src/protocols/yahoo/yahoo_profile.c:1090
 msgid "Home Page"
 msgstr "膓臥��"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: src/protocols/yahoo/yahoo_profile.c:1105
 msgid "Cool Link 1"
 msgstr "�潔�g�(筝�)"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 2"
 msgstr "�潔�g�(篋�)"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/yahoo/yahoo_profile.c:1114
 msgid "Cool Link 3"
 msgstr "�潔�g�(筝�)"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
+#: src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Last Update"
 msgstr "�贋�井�ユ��"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: src/protocols/yahoo/yahoo_profile.c:1133
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�"
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
+#: src/protocols/yahoo/yahoo_profile.c:1139
+#, fuzzy
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
 msgstr "絨�筝�莎件�������篋肴�荐�篌寂���戎������絨���←��吡��茯�荐���"
 
-#: src/protocols/yahoo/yahoo_profile.c:1151
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"�≧���緇�篏睡��������篋肴�������緇������遵Ŭ��失�����榊憝�����х���馹�鐚�茫�腮�緇���荅���"
-
-#: src/protocols/yahoo/yahoo_profile.c:1154
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"�≧���緇�篏睡��������篋肴�������緇������処;腓咲����篏睡����筝��絖�����区��鐚�Yahoo! ��筝�"
-"���鞘��遺戎��������篋肴������ユ�����ラ��篏睡����腆阪�絖����茫�腮�緇���荅���"
-
-#: src/protocols/yahoo/yahoo_profile.c:1162
+#: src/protocols/yahoo/yahoo_profile.c:1155
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "�≧���緇�篏睡��������篋肴�������緇������遵Ŭ��失�����榊憝�����х���馹�鐚�茫�腮�緇���荅���"
+
+#: src/protocols/yahoo/yahoo_profile.c:1158
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "�≧���緇�篏睡��������篋肴�������緇������処;腓咲����篏睡����筝��絖�����区��鐚�Yahoo! ��筝����鞘��遺戎��������篋肴������ユ�����ラ��篏睡����腆阪�絖����茫�腮�緇���荅���"
+
+#: src/protocols/yahoo/yahoo_profile.c:1166
 msgid "The user's profile is empty."
 msgstr "����篏睡������莖�荐�����順����"
 
@@ -11174,23 +12345,24 @@
 msgstr "莅�����紊��羝����主�������"
 
 # NOTE 茹c������活��紊���篏睡�����悟����(marv)
-#: src/protocols/yahoo/yahoochat.c:1379
+#: src/protocols/yahoo/yahoochat.c:1381
 msgid "Voices"
 msgstr "����活��紊�"
 
 # NOTE 茹c��������鎀���篏睡�����悟����(marv)
-#: src/protocols/yahoo/yahoochat.c:1382
+#: src/protocols/yahoo/yahoochat.c:1384
 msgid "Webcams"
 msgstr "������鎀�"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoochat.c:1395
+#: src/protocols/yahoo/yahoochat.c:1465
 msgid "Unable to fetch room list."
 msgstr "�≧���緇���紊��羝�����"
 
 # NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
 # NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
 # NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: src/protocols/yahoo/yahoochat.c:1453
+#: src/protocols/yahoo/yahoochat.c:1458
 msgid "User Rooms"
 msgstr "篏睡����綮榊�箙���紊��"
 
@@ -11199,9 +12371,7 @@
 msgstr "�� YCHT 篌堺�����榊憥�g����"
 
 #: src/protocols/zephyr/zephyr.c:331
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
 msgstr "鐚��咲����荐������膩�⊆���主��篋������茫�罟∽�ュ験��羝���賢����膩�⊆���檎��鐚�"
 
 #: src/protocols/zephyr/zephyr.c:686
@@ -11209,21 +12379,25 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "�≧��渇���活��紊�� %s鐚�%s鐚�%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:719
+#: src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>篏睡����鐚�</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:723
+#: src/protocols/zephyr/zephyr.c:1139
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>�沿����Ǔ�糸��"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:728
+#: src/protocols/zephyr/zephyr.c:1141
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>緇� %2$s 莎桁群�� %1$s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1473
 msgid "Anyone"
 msgstr "篁私�篋�"
 
@@ -11234,93 +12408,80 @@
 # NOTE ���� http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: src/protocols/zephyr/zephyr.c:2273
+#: src/protocols/zephyr/zephyr.c:2274
 msgid "_Class:"
 msgstr "蕁��ワ���紊��(_C)鐚�"
 
 # XXX ��⑮
 # NOTE ���� http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html ���狗�腟�
 # NOTE ���� http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:2279
+#: src/protocols/zephyr/zephyr.c:2280
 msgid "_Instance:"
 msgstr "絲��鐚�嶓��(_I)鐚�"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2286
 msgid "_Recipient:"
 msgstr "�ュ���(_R)鐚�"
 
 #  FIXME ��⑮
-#: src/protocols/zephyr/zephyr.c:2296
+#: src/protocols/zephyr/zephyr.c:2297
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "��篋肴��紊��鐚�篋よ�鐚� %s,%s,%s 紊掩��"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: src/protocols/zephyr/zephyr.c:2603
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;�援┗&gt;鐚�絨��鞘戎����"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: src/protocols/zephyr/zephyr.c:2608
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;�援┗&gt;鐚�絨��鞘戎����"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: src/protocols/zephyr/zephyr.c:2613
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;絲��&rdquo;鐚�荐㊤�������蕁��ャ��鐚���紊��鐚�����絲����鐚��脂��鐚�"
-
-#: src/protocols/zephyr/zephyr.c:2617
+msgstr "instance &lt;絲��&gt;鐚�荐㊤�������蕁��ャ��鐚���紊��鐚�����絲����鐚��脂��鐚�"
+
+#: src/protocols/zephyr/zephyr.c:2618
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;絲��&rdquo;鐚�荐㊤�������蕁��ャ��鐚���紊��鐚�����絲����鐚��脂��鐚�"
-
-#: src/protocols/zephyr/zephyr.c:2622
-#, fuzzy
+msgstr "inst &lt;絲��&gt;鐚�荐㊤�������蕁��ャ��鐚���紊��鐚�����絲����鐚��脂��鐚�"
+
+#: src/protocols/zephyr/zephyr.c:2623
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;絲��&rdquo;鐚�荐㊤�������蕁��ャ��鐚���紊��鐚�����絲����鐚��脂��鐚�"
-
-#: src/protocols/zephyr/zephyr.c:2628
+msgstr "topic &lt;絲��&gt;鐚�荐㊤�������蕁��ャ��鐚���紊��鐚�����絲����鐚��脂��鐚�"
+
+#: src/protocols/zephyr/zephyr.c:2629
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;蕁���&gt; &lt;絲��&gt; &lt;�ュ���&gt;鐚����ヨ��紊��"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: src/protocols/zephyr/zephyr.c:2633
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+#: src/protocols/zephyr/zephyr.c:2634
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;絲��&gt;鐚����肴�����&lt;荐���,<i>絲��</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2639
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;蕁���&gt; &lt;絲��&gt鐚����肴�����&lt;<i>蕁���</i>,<i>絲��</i>,*&gt;"
-
-#: src/protocols/zephyr/zephyr.c:2645
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;蕁���&gt; &lt;絲��&gt; &lt;�ュ���&gt;鐚����肴����� &lt;<i>蕁���</i>,<i>"
-"絲��</i>,<i>�ュ���</i>&gt;"
-
-#: src/protocols/zephyr/zephyr.c:2651
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;絲��&gt; &lt;�ュ���&gt;鐚����肴����� &lt;MESSAGE,<i>絲��</i>,<i>�ュ���"
-"</i>&gt;"
-
-#: src/protocols/zephyr/zephyr.c:2656
+#: src/protocols/zephyr/zephyr.c:2640
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zi &lt;蕁���&gt; &lt;絲��&gt鐚����肴�����&lt;<i>蕁���</i>,<i>絲��</i>,*&gt;"
+
+#: src/protocols/zephyr/zephyr.c:2646
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;蕁���&gt; &lt;絲��&gt; &lt;�ュ���&gt;鐚����肴����� &lt;<i>蕁���</i>,<i>絲��</i>,<i>�ュ���</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:2652
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;絲��&gt; &lt;�ュ���&gt;鐚����肴����� &lt;MESSAGE,<i>絲��</i>,<i>�ュ���</i>&gt;"
+
+#: src/protocols/zephyr/zephyr.c:2657
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;蕁���&gt;鐚����肴����� &lt;<i>蕁���</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: src/protocols/zephyr/zephyr.c:2762
+#: src/protocols/zephyr/zephyr.c:2763
 msgid "Resubscribe"
 msgstr "���医���ユ������紊��"
 
 #  FIXME 荀�荀��ヨ⑮��
-#: src/protocols/zephyr/zephyr.c:2765
+#: src/protocols/zephyr/zephyr.c:2766
 msgid "Retrieve subscriptions from server"
 msgstr "�延失�����緇�����������紊����羝���"
 
@@ -11334,7 +12495,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2851
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr ��絎�罔∞�"
 
@@ -11344,11 +12506,11 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2876
 msgid "Export to .anyone"
 msgstr "���肴�� .anyone 罟�"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2879
 msgid "Export to .zephyr.subs"
 msgstr "���肴�� .zephyr.subs 罟�"
 
@@ -11358,17 +12520,15 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
+#: src/protocols/zephyr/zephyr.c:2882
 msgid "Import from .anyone"
-msgstr "���肴�� .anyone 罟�"
-
-#: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
+msgstr "�� .anyone 罟�罅�筝㊤����"
+
+#: src/protocols/zephyr/zephyr.c:2885
 msgid "Import from .zephyr.subs"
-msgstr "���肴�� .zephyr.subs 罟�"
-
-#: src/protocols/zephyr/zephyr.c:2886
+msgstr "�� .zephyr.subs 罟�筝㊤����"
+
+#: src/protocols/zephyr/zephyr.c:2888
 #, fuzzy
 msgid "Realm"
 msgstr "紮���"
@@ -11376,163 +12536,335 @@
 # FIXME ��⑮鐚�茘��緇�綏����緇��拷��
 # NOTE: Zephyr ����Exposure�����沿昆�括憠昆箙�������腮�����
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: src/protocols/zephyr/zephyr.c:2889
+#: src/protocols/zephyr/zephyr.c:2891
 msgid "Exposure"
 msgstr "�乗昆腮�綺�"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: src/proxy.c:1118
+#: src/proxy.c:1148
+#: src/proxy.c:1170
+#: src/proxy.c:1182
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "篁g��篌堺�����g���� %d"
+
 #. Forbidden
-#: src/proxy.c:1036
+#: src/proxy.c:1178
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "��腟�絖���鐚�Proxy 篌堺�����罩∫��荐��� %d ��莖����渇����"
 
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "篁g��篌堺�����g���� %d"
-
-#: src/proxy.c:1874
+#: src/proxy.c:2019
 msgid "Invalid proxy settings"
 msgstr "�≧����篁g��篌堺����┃絎�"
 
-#: src/proxy.c:1874
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"絨��惹��������荐㊤���篁g��篌堺��������箴�茯������腟����篌堺������腮怨���荐������≧����"
+#: src/proxy.c:2019
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "絨��惹��������荐㊤���篁g��篌堺��������箴�茯������腟����篌堺������腮怨���荐������≧����"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1341
+#: src/request.h:1350
 msgid "Accept"
 msgstr "�ュ�"
 
-#: src/server.c:243
+#: src/savedstatuses.c:502
+#, fuzzy
+msgid "saved statuses"
+msgstr "篌堺����輝荐�莖���"
+
+#: src/savedstatuses.c:709
+msgid "I'm not here right now"
+msgstr "���上������絖�筝�"
+
+#: src/server.c:224
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s �壕��援┗�� %s��\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "鐚�%d ��荐����"
-msgstr[1] "鐚�%d ��荐����"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "鐚�筝���荐����"
-
-#: src/server.c:859
-#, fuzzy, c-format
+#: src/server.c:691
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s ��茫�篋� %s �域��紊����%s��鐚�\n"
-
-#: src/server.c:864
+msgstr ""
+"%s ��茫� %s �域��紊����%s��鐚�\n"
+"%s"
+
+#: src/server.c:696
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ��茫�篋� %s �域��紊����%s��鐚�\n"
 
-#: src/server.c:868
+#: src/server.c:700
 msgid "Accept chat invitation?"
 msgstr "�ュ���茫����"
 
-#: src/status.c:153
-#, fuzzy
+#: src/status.c:152
 msgid "Unset"
-msgstr "����"
-
-#: src/status.c:156
+msgstr "��羔�荐㊤�"
+
+#: src/status.c:155
 msgid "Unavailable"
 msgstr "�∝�"
 
-#: src/status.c:621
+#: src/status.c:620
 #, c-format
 msgid "%s came back"
 msgstr "%s ��箴�篋�"
 
-#: src/status.c:626
+#: src/status.c:625
 #, c-format
 msgid "%s went away"
 msgstr "%s 綏牙��∫��"
 
-#: src/status.c:1308
+#: src/status.c:1271
 #, c-format
 msgid "%s became idle"
 msgstr "%s 莅��雁�����咲��臀�"
 
-#: src/status.c:1323
+#: src/status.c:1284
 #, c-format
 msgid "%s became unidle"
 msgstr "%s �演��臀����"
 
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "�����∫��"
+#: src/status.c:1357
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s 莅��雁�����咲��臀�"
+
+#: src/status.c:1359
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s �演��臀����"
+
+#: src/util.c:2120
+#, c-format
+msgid "Error Reading %s"
+msgstr "莅��� %s ��筝㊦�主��篋����"
 
 #: src/util.c:2121
-#, fuzzy, c-format
-msgid "Error Reading %s"
-msgstr ""
-"莅��� %s ��筝㊦�主��篋����鐚�\n"
-"%s��\n"
-
-#: src/util.c:2122
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"��В������絅遵�羝������主�������絅遵�羝������茴���ワ���罟�綏牙Щ��blist.xml~��"
-
-#: src/util.c:2567
+#, c-format
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "��В������ %s ���主�������絎���筝����茴���ワ�������罟�罅�綏牙Щ�� %s~��"
+
+#: src/util.c:2616
 msgid "Calculating..."
 msgstr "荐�膊�筝�..."
 
-#: src/util.c:2570
+#: src/util.c:2619
 msgid "Unknown."
 msgstr "���ャ��"
 
-#: src/util.c:2600
+#: src/util.c:2649
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "腱�"
 msgstr[1] "腱�"
 
-#: src/util.c:2614
+#: src/util.c:2663
 msgid "day"
 msgid_plural "days"
 msgstr[0] "��"
 msgstr[1] "��"
 
-#: src/util.c:2622
+#: src/util.c:2671
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "絨��"
 msgstr[1] "鎞��"
 
-#: src/util.c:2630
+#: src/util.c:2679
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"
 msgstr[1] "��"
 
-#: src/util.c:3053
+#: src/util.c:3117
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ������������\n"
 
-#~ msgid "Buddy List Sorting"
-#~ msgstr "絅遵�羝����綺�"
-
+#~ msgid "Write a gtkrc file with these settings to %s"
+#~ msgstr "絨���篋�荐㊤�絲��ュ�� %s �� gtkrc 罟�"
+#~ msgid "Screenname:"
+#~ msgstr "絽活��鐚�"
+#~ msgid "Host name"
+#~ msgstr "筝紙���腮�"
+#~ msgid "Nick name"
+#~ msgstr "�援┗"
+
+#, fuzzy
+#~ msgid "Active Message"
+#~ msgstr "���肴���"
+
+#, fuzzy
+#~ msgid "Busy Message"
+#~ msgstr "�∫��荐���"
+#~ msgid "Default status messages"
+#~ msgstr "��荐㊦����荐���"
+#~ msgid "Edit Status Messages"
+#~ msgstr "篆��合����荐���"
+#~ msgid "Set Status Messages..."
+#~ msgstr "荐㊤�����荐���..."
+#~ msgid "Not At Home"
+#~ msgstr "筝����"
+#~ msgid "Not At Desk"
+#~ msgstr "筝���婚篏�"
+#~ msgid "Not In Office"
+#~ msgstr "筝���商���"
+#~ msgid "Hello!"
+#~ msgstr "��ソ鐚�"
+#~ msgid "Gaim"
+#~ msgstr "Gaim"
+#~ msgid "Gaim - Signed off"
+#~ msgstr "Gaim - 綏牙�糸��"
+#~ msgid "Gaim - Away"
+#~ msgstr "Gaim - �∫��"
+#~ msgid "Set account idle time"
+#~ msgstr "荐㊤�絽活����臀�����"
+#~ msgid "Unset account idle time"
+#~ msgstr "��羔�絽活����臀�����荐㊤�"
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Do you wish to add him or her to your buddy list?"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
+#~ msgid "_Alias Buddy..."
+#~ msgstr "�咲����絅遵���筝��ュ��(_A)..."
+
+# XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
+#~ msgid "_Remove Buddy"
+#~ msgstr "腱脂�ら����絅遵�(_R)"
+# XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
+#~ msgid "Alias Contact..."
+#~ msgstr "�咲��腟�絅遵���筝��ュ��..."
+#~ msgid "/Tools/Account Ac_tions"
+#~ msgstr "/綏ュ��/絽活���檎����篁�(_T)"
+#~ msgid "/Tools/A_ccounts"
+#~ msgstr "/綏ュ��/絽活��羝���(_C)"
+#~ msgid "Idle "
+#~ msgstr "��臀� "
+#~ msgid "/Tools/Account Actions"
+#~ msgstr "/綏ュ��/絽活���檎����篁�"
+#~ msgid "Active Developers"
+#~ msgstr "�鞘算���取��"
+#, fuzzy
+#~ msgid "_Keep this pounce after the first time it runs"
+#~ msgstr "�峨�荐㊤�筝�����(_E)"
+
+#, fuzzy
+#~ msgid "Persists"
+#~ msgstr "荐怨�"
+
+#, fuzzy
+#~ msgid "Change password"
+#~ msgstr "鋓��劫�腆�"
+#~ msgid "Error processing event or response (%s)."
+#~ msgstr "����篋�篁倶����荀����主����� (%s)��"
+#~ msgid "Error Message Suppression"
+#~ msgstr "���荐�������"
+#~ msgid "Hide Disconnect Errors"
+#~ msgstr "筝�蕁�ず筝㊥�潔�g����"
+#~ msgid "Hide Login Errors"
+#~ msgstr "筝�蕁�ず�糸�ラ���"
+
+#, fuzzy
+#~ msgid "Hide Reconnecting Dialog"
+#~ msgstr "筝�蕁�ず筝㊥�潔�g����"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#~ msgid "Auto-Reconnect"
+#~ msgstr "�������育�g�"
+#~ msgid "When you are kicked offline, this reconnects you."
+#~ msgstr "�銀��欠���鐚�膤紫輝������綛�����育�g���"
+# NOTE 茘����後� by Etan Reisner (���取��箙�筝�)
+#~ msgid "Use last matching buddy"
+#~ msgstr "篏睡����緇�鐚���������鐚�筝����拷����絅遵�絽活��"
+# NOTE 罸頫�筝���お�件�筝��篋堺������\n������鐚�����荀�腦�������
+#, fuzzy
+#~ msgid ""
+#~ "The buddy with the lowest score is the buddy who will have priority in "
+#~ "the contact.\n"
+#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
+#~ "used to be\n"
+#~ "the built-in order: active, idle, away, away + idle, offline."
+#~ msgstr ""
+#~ "�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n"
+#~ "��腟����緇����取���鐚�腥�����絨����冴��������鐚����榊�倶��絲���\n"
+#~ "篏睡����絅遵�絽活����\n"
+#~ "���∝���������荐㊤� 4 ��鐚����∫��������鐚�����臀���1 ����\n"
+#~ "荀�緇��咲��荐㊦������罨≦���羃���臀�����臀����∫�����∫���守��臀���鐚�\n"
+#~ "篏睡���������荐㊤�弱�喝���"
+#~ msgid "_Keep the dialog open"
+#~ msgstr "篆���絨�荅掩�����(_K)"
+#~ msgid "A_way"
+#~ msgstr "�∫��(_W)"
+#~ msgid "_Idle"
+#~ msgstr "��臀�(_I)"
+#~ msgid "Retur_n from idle"
+#~ msgstr "�演��臀����(_N)"
+#~ msgid "Bro_wse..."
+#~ msgstr "�頳�(_W)..."
+#~ msgid "Remove Buddy Pounce"
+#~ msgstr "腱脂�ゅソ����������"
+#~ msgid "_Queue new messages when away"
+#~ msgstr "���∫����鐚�絨��������域���舟�ヤ���筝�(_Q)"
+
+#, fuzzy
+#~ msgid "Custom status"
+#~ msgstr "箴��х����"
+
+#, fuzzy
+#~ msgid "Could't open file"
+#~ msgstr "�≧��渇��罟�罅�"
+#~ msgid "Unable to set AIM away message."
+#~ msgstr "�≧�荐㊤� AIM �∫��荐�����"
+#~ 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 ""
+#~ "��������糸�ョ�綺鎘�����篆��号�����∫��荐������������絨�膓㊥��������荐㊤���������茫�"
+#~ "������糸�ュ���荐㊤�筝�罨<��"
+#~ msgid "Verify all IM message signatures"
+#~ msgstr "�後������恰��荐�����膂順�"
+#~ msgid "Digitally sign all channel messages"
+#~ msgstr "�娯�膂順讐�����脂��荐���"
+#~ msgid "Verify all channel message signatures"
+#~ msgstr "�後������脂��荐�����膂順�"
+
+#, fuzzy
+#~ msgid "Stealth"
+#~ msgstr "��鐚鎴�"
+#~ msgid "(%d message)"
+#~ msgid_plural "(%d messages)"
+#~ msgstr[0] "鐚�%d ��荐����"
+#~ msgstr[1] "鐚�%d ��荐����"
+#~ msgid "(1 message)"
+#~ msgstr "鐚�筝���荐����"
+
+#, fuzzy
+#~ msgid "Default auto-away"
+#~ msgstr "�����∫��"
 #~ msgid "_Sorting:"
 #~ msgstr "��綺�婧�(_S)鐚�"
-
 #~ msgid "Buddy Display"
 #~ msgstr "絅遵�蕁�ず"
 
@@ -11540,1597 +12872,10 @@
 #, fuzzy
 #~ msgid "Show more buddy details"
 #~ msgstr "蕁�ず篏睡����膣亥�"
-
 #~ msgid "Gnome Default"
 #~ msgstr "GNOME��荐㊤��"
-
 #~ msgid "Away m_essage:"
 #~ msgstr "�∫��荐���(_M)鐚�"
-
 #~ msgid "IRC"
 #~ msgstr "IRC"
 
-#  XXX
-#~ msgid "Quit message"
-#~ msgstr "�∝������榊��荐���"
-
-#  XXX ��⑮
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "���g��������∝���箙���������"
-
-#~ msgid "Mail Server"
-#~ msgstr "�灸散篌堺����"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s鐚�%d 絨��育�灸散 / �� %d 絨��灸散鐚�"
-
-#~ msgid "Check Mail"
-#~ msgstr "罟∽�ヤ拭膊�"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "罸�� X 霡�罟∽�ヤ�罨>拭膊宴��\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "�����糸��"
-
-#~ msgid "New..."
-#~ msgstr "�医�..."
-
-#~ msgid "Back"
-#~ msgstr "菴���"
-
-#~ msgid "Signoff"
-#~ msgstr "�糸��"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "綏ヤ��e��腓肴┃絎�"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "�沿��佈����翫�医轡篏��e��腓肴←藥���(_H)"
-
-#  NOTE GNOME 箙� zenity 箙��∽��茘��鐚����醇��緇��拷��
-#~ msgid "Orientation"
-#~ msgstr "�����劫��"
-
-#  NOTE GNOME 箙� zenity 箙��∽��茘��鐚����醇��緇��拷��
-#~ msgid "The orientation of the tray."
-#~ msgstr "�∽�睡���劫����"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "羃����e�� AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "羃���腟��絽活����"
-
-#~ msgid "No roomname given."
-#~ msgstr "羃���腟����紊����腮宴��"
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "�≧���� AIM URI"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "��絎� %s �� Socket 紊掩��鐚�\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "�≧����� Socket"
-
-#~ msgid "Remote Control"
-#~ msgstr "��腴�ァ��"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "��箴�絨� Gaim �����綣�兓���腴�ァ�吟��"
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "��� Third-Party �����綣�� gaim-remote 鎴ュ�件���箴� Gaim�画���腴�ァ�句����"
-#~ "����"
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "GTK篆∴��羝��"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "罟∽�ヤ戎����篁��∝����腮�拭�������処�醇③絽檎��篏���"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr "��紮��遺困茫���鐚�����罔∞��堺����困茫�荀�腦�筝㊨¨腓坂�罨∞��篋よ���"
-
-#~ msgid "_Apply"
-#~ msgstr "絅���(_A)"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "��薈�篋���絅遵�羝����������∝����筝�絮�(_B)"
-
-#~ msgid "Away!"
-#~ msgstr "�∫��鐚�"
-
-#~ msgid "Edit This Message"
-#~ msgstr "篆��号④荐���"
-
-#~ msgid "I'm Back!"
-#~ msgstr "����箴�篋�鐚�"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "��∈絎�荀�腱脂�ら�∫��荐�����%s��鐚�"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "腱脂�ら�∫��荐���"
-
-#~ msgid "Set All Away"
-#~ msgstr "����┃�咲�∫��"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "����遵�峨�筝���羃����������∫��荐���"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr "茫�腟��荐������罔�蕁�鐚�������篏睡����箴�篏睡�������筝��峨�絎���"
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "���≧�綮榊�筝���腥榊�順���∫��荐���"
-
-#~ msgid "New away message"
-#~ msgstr "�亥���∫��荐���"
-
-#~ msgid "Away title: "
-#~ msgstr "�∫������鐚�"
-
-#~ msgid "_Save"
-#~ msgstr "�峨�(_S)"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "�峨�筝�戎��(_V)"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "絅遵�羝������"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "絮�������㊤ぇ絨�"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "篏睡���劫�: %s ��篁� [�檎��] [膓峨��]\n"
-#~ "\n"
-#~ "    ��篁�:\n"
-#~ "       uri                      ���� AIM: 蕁�����膓峨��\n"
-#~ "       away                     �峨�ラ��荐㊦���∫������筝���咲�∫��荀�腦�\n"
-#~ "       back                     �演�∫��菴���筝�Щ�ら�∫��荀�腦�\n"
-#~ "       quit                     ����罩e���決��� Gaim\n"
-#~ "\n"
-#~ "    �檎��:\n"
-#~ "       -h, --help [��篁�]        蕁�ず��篁ょ��茯���\n"
-
-#  NOTE 茘����翫�� by Ambrose
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "鐚���轡篏���� 0鐚�Gaim �����決�\n"
-#~ "������ャ����腴�ァ�吟��罔∞�鐚�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "AIM: URI ���鐚�\n"
-#~ "���坂����恰��荐����遺���絽活��:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "������箴�絖�筝㍼���Penguin���������渇���阪�恰��荐�����絨�莟¥�����\n"
-#~ "��hello world������荀����榊��荐�������+����←����倶��絖�筝俄賢��腥榊�純��\n"
-#~ "茫�羈��鋇��∝�怨�����儀箴�����蚕 - 絋���篏��� Shell 筝��決�����鐚���&��\n"
-#~ "綽���茴���肴���後���鐚�筝��倶��篁ょ���決�絨掩���育�h��堺②��\n"
-#~ "����鐚�筝��∝����篏�絨����阪験������筝���羃���篁私��у���篋よ�荀�腦�鐚�\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "���ヤ�����紊��鐚�\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "���ャ��PenguinLounge��������紊����\n"
-#~ "\n"
-#~ "���ヤ���絅遵��井����絅遵�羝���賢鐚�\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "��腓堺�����ャ��Penguin���井����絅遵�羝���賢��\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "����罩e���決��� Gaim\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "篏睡����荐㊦���∫��荐����������験��荐㊤��冴���∫����������\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "������験��荐㊤��咲���∫��������\n"
-
-#  NOTE 茘����翫�� by Ambrose
-#~ msgid "Show fewer options"
-#~ msgstr "�沿�靘亥�"
-
-#~ msgid "Information"
-#~ msgstr "莖�荐�"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/絅遵�/�糸��(_S)"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/綏ュ��/�∫��(_A)"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/綏ュ��/罔∞��檎����篁�(_U)"
-
-#~ msgid "Rename Group"
-#~ msgstr "篆��合召腟���腮�"
-
-#~ msgid "New group name"
-#~ msgstr "�医��絖�"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "茫��咲�後���臂ょ�莠後�ヤ����亥����腮宴��"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>絽活��鐚�</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>茘���鐚�<b>"
-
-# XXX
-#~ msgid "Warned (%d%%) "
-#~ msgstr "茘��� (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/綏ュ��/�∫��"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "�渇��荐���畿茴��後���絅遵�"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "��緇�茴��後�絅遵���莖�荐�"
-
-#~ msgid "_Chat"
-#~ msgstr "��紊�(_C)"
-
-#~ msgid "Join a chat room"
-#~ msgstr "���ヤ�����紊��"
-
-#~ msgid "_Away"
-#~ msgstr "�∫��(_A)"
-
-#~ msgid "Set an away message"
-#~ msgstr "荐㊤�筝����∫��荐���"
-
-#~ msgid "Done."
-#~ msgstr "絎�����"
-
-#~ msgid "Signon: "
-#~ msgstr "�糸�ワ�"
-
-#~ msgid "Signon"
-#~ msgstr "�糸��"
-
-#~ msgid "Cancel All"
-#~ msgstr "�����羔�"
-
-#~ msgid "_Reconnect"
-#~ msgstr "���育�g�(_R)"
-
-# XXX ��⑮
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s 茴�賢�潔�g���</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "���延�����"
-
-#~ msgid "Reconnect _All"
-#~ msgstr "�������育�g�(_A)"
-
-#~ msgid "Time"
-#~ msgstr "����"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "��緇��∝�荐���"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/篋よ�/茘���(_W)..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/篋よ�/茘���..."
-
-#~ msgid "Warn"
-#~ msgstr "茘���"
-
-#~ msgid "Warn the user"
-#~ msgstr "茘���篏睡����"
-
-#~ msgid "Block the user"
-#~ msgstr "絨���篏睡����"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "�渇��罟�罅��割戎����"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "絨�篏睡�������ユ����絅遵�羝���"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "絨�篏睡����������絅遵�羝���賢腱脂��"
-
-#~ msgid "Send"
-#~ msgstr "����"
-
-#~ msgid "Invite"
-#~ msgstr "��茫�"
-
-#~ msgid "Invite a user"
-#~ msgstr "��茫�篏睡����"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "絨�������紊�����ユ����絅遵�羝���"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<mail>/篋よ�/����"
-
-#~ msgid "former lead developer"
-#~ msgstr "��筝肢����取��"
-
-#~ msgid "former maintainer"
-#~ msgstr "��膓㊧Ⅲ��"
-
-#  NOTE 羝�⑮�水�����鐚��医��壕⑮�水����駈�莅��括��絨���筝�鐚����吟����茫�筝���罸�������
-#  NOTE 絅緒�篏���佂�c���水�������篌寂�箙���篋榊��
-#~ msgid "Azerbaijani"
-#~ msgstr "�水�������"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova �� Vladimir (Kaladan) Petkov"
-
-#~ msgid "Burmese"
-#~ msgstr "膩��御��"
-
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "�����鐚��井�����鐚�"
-
-#~ msgid "Punjabi"
-#~ msgstr "��������"
-
-# NOTE 絲��坂�����������鐚�筝�����茯���鐚�筝��� :-)
-#~ msgid "Albanian"
-#~ msgstr "�睡�上郡絨寂���"
-
-#~ msgid "Turkish"
-#~ msgstr "���喝�倶��"
-
-#~ msgid "Ukrainian"
-#~ msgstr "�������"
-
-#  NOTE �榊�d研�∞輝筝�茘���鐚��銀���茘���綮���������������膈�鐚�鐚�羝�⑮筝����
-#  NOTE������������腱�����篁ョ乙�括�守�恰����莠���綮������坂蹴
-#~ msgid "Xhosa"
-#~ msgstr "腱�����"
-
-#~ msgid "Chinese"
-#~ msgstr "筝㊥��"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "絽活��(_S)"
-
-#~ msgid "Warn User"
-#~ msgstr "茘���篏睡����"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">茘��� %s?</span>\n"
-#~ "\n"
-#~ "������篏�絨���紜��� %s ��茘���膈�膣�鐚�����篁�鐚�絅刻�絨�茴����銀札�翫�贋�主���������吟��\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "篁ュ�水����荳�蚕�弱�肴⑥��鐚�(_A)"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>�水����茘���罸�莠�筝�羃����i瑳�顔����</b>"
-
-# XXX ��⑮
-#~ msgid "Show transfer details"
-#~ msgstr "蕁�ず�活叱膣亥�"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "�九�ュ��羃���荐㊤���鐚�篁ュ��号��荐㊤����援┗蕁�ず(_I)"
-
-#~ msgid "Display"
-#~ msgstr "蕁�ず"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "蕁�ず荐�������(_T)"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "綽順�ラ���(_O)"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "綽順�ュ�蕭�(_F)"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "綽順�ュ�蕭�紊у�(_Z)"
-
-#~ msgid "Default Formatting"
-#~ msgstr "��荐㊥�弱�"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "���肴�����篏睡����荐㊥�弱���(_S)"
-
-#~ msgid "Send Message"
-#~ msgstr "���肴���"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "��筝� Enter ���肴���(_S)"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "��筝� Ctrl-Enter ���肴���(_O)"
-
-#~ msgid "Window Closing"
-#~ msgstr "荀�腦�����"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "��筝� Escape ����荀�腦�(_E)"
-
-#~ msgid "Insertions"
-#~ msgstr "���ラ�檎��"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "��筝� Ctrl-{B/I/U} �贋�劫���罔e�(_F)"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "��筝� Ctrl-(�後���) ���ヨ;��(_I)"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "蕁�ず���窮��(_B)鐚�"
-
-#~ msgid "Pictures"
-#~ msgstr "��綵�"
-
-#~ msgid "Text"
-#~ msgstr "��絖�"
-
-#~ msgid "Pictures and text"
-#~ msgstr "��綵∵����絖�"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "�銀�篁句�主����鐚�絨�荀�腦����井��筝���(_R)"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "蕁�ず茘���膈�膣�(_W)"
-
-# XXX ��⑮
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "����絮���絅遵�(_A)"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "篏睡������膩�����篁�(_S)"
-
-#~ msgid "Show _formatting toolbar"
-#~ msgstr "蕁�ず�弱�綏ュ�桁��(_F)"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "���蕁���罔�膠や�蕁�ず�ュ��(_A)"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "�銀�篁句�主����鐚�絨�荀�腦����井��筝���(_R)"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "�銀�篁句�主����鐚�絨�篋よ�荀�腦����井��筝���(_R)"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "����紊���т札筝���蕁�兂���ヤ������援┗(_M)"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "罔�膠や�臀�(_L)鐚�"
-
-# NOTE 筝��贋・膺肢⑮鐚��剛����遵���丞���劫�膺肢⑮茘���
-#~ msgid "New conversation _placement:"
-#~ msgstr "�遺困茫�������(_P)鐚�"
-
-#~ msgid "Message Logs"
-#~ msgstr "荐����ヨ�"
-
-#~ msgid "System Logs"
-#~ msgstr "膤紫輝�ヨ�"
-
-#~ msgid "_Enable system log"
-#~ msgstr "篏睡��鎧腟掩�ヨ�(_E)"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "荐���絅遵����糸�ワ��糸��(_S)"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "荐���絅遵�����臀����羔���臀�(_I)"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "荐���絅遵��∫��鐚��鋐�(_B)"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "荐�������群�糸�ワ���臀���∫��膈�����(_O)"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "��臀������怨��(_T)鐚�"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Gaim 篏睡����羈�"
-
-#~ msgid "X usage"
-#~ msgstr "X Window 篏睡����羈�"
-
-#~ msgid "Windows usage"
-#~ msgstr "Windows 篏睡����羈�"
-
-#~ 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\">篏���鐚�</span>\t%s\n"
-#~ "<span weight=\"bold\">膓牙�鐚�</span>\t\t%s\n"
-#~ "<span weight=\"bold\">罟���鐚�</span>\t%s"
-
-#~ 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\">篏���鐚�</span>  %s\n"
-#~ "<span weight=\"bold\">膓牙�鐚�</span>  %s\n"
-#~ "<span weight=\"bold\">罟���鐚�</span>  %s"
-
-#~ msgid "Load"
-#~ msgstr "莠���"
-
-#~ msgid "Summary"
-#~ msgstr "膂∴唇"
-
-#  NOTE��膣亥���緇��亥�駈����榊���≫����醇���g���膣亥�鐚��e�堺������巡�絅�
-#~ msgid "Details"
-#~ msgstr "膣亥�"
-
-#~ msgid "_Edit"
-#~ msgstr "膩�鹿(_E)"
-
-#~ msgid "Interface"
-#~ msgstr "篁���"
-
-#~ msgid "Message Text"
-#~ msgstr "荐�����絖�"
-
-#~ msgid "Shortcuts"
-#~ msgstr "綽��潔��"
-
-#~ msgid "Away Messages"
-#~ msgstr "�∫��荐���"
-
-#~ msgid "Plugins"
-#~ msgstr "罔∞�羝���"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "膣���絖�"
-
-#~ msgid "Please create an account."
-#~ msgstr "茫�綮榊�筝���絽活����"
-
-#~ msgid "Login"
-#~ msgstr "�糸��"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>絽活��(_A)鐚�</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>絲�腆�(_P)鐚�</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "絽活��羝���(_C)"
-
-#~ msgid "P_references"
-#~ msgstr "�鎁処┃絎�(_R)"
-
-#~ msgid "_Sign on"
-#~ msgstr "�糸��(_S)"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "篏睡���劫�: %s [�檎��]...\n"
-#~ "\n"
-#~ "  -a, --acct          蕁�ず絽活��羝���\n"
-#~ "  -w, --away[=MESG]   �糸�ュ�蕁�ず�咲�∫�� (�御���у��� MESG �����絎���荀�\n"
-#~ "                      篏睡�����∫��荐�����腮�)\n"
-#~ "  -l, --login[=NAME]  �����糸�� (�御���у��� NAME �����絎���荀��糸�ョ��絽�\n"
-#~ "                      ��鐚�����篁ラ����篏��阪����)\n"
-#~ "  -n, --loginwin      筝������糸�ワ�蕁�ず�糸�ヨ�腦�\n"
-#~ "  -u, --user=NAME     篏睡��験�� NAME\n"
-#~ "  -c, --config=DIR    篏睡�� DIR �х��荐㊤�罟�\n"
-#~ "  -d, --debug         絨��ら�����叱�阪�井�羣�莠後�坂�\n"
-#~ "  -v, --version       蕁�ず�������研�∫��\n"
-#~ "  -h, --help          蕁�ず����茯������研�∫��\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "�≧�莠��ュ�鎁処┃絎�"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim �≧�莠��ユ�����鎁処┃絎�鐚����堺��������鎁処┃絎�罟��弱�紊�����茫�������鎁処┃"
-#~ "絎���荀�腦����域┃絎������鎁純��"
-
-# NOTE �推�絖��∝�頑⑮鐚���罔g���ュ�緇�絅���
-#~ msgid "Slightly less boring default"
-#~ msgstr "�∴��鐚���荐㍼�"
-
-#~ msgid "Available for friends only"
-#~ msgstr "����絅遵���札���井��筝�膩�"
-
-#~ msgid "Away for friends only"
-#~ msgstr "�∫��鐚�����絅遵���札���井��鐚�"
-
-# XXX
-#~ msgid "Invisible for friends only"
-#~ msgstr "�沿昆鐚�����絅遵���札���井��鐚�"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "�≧�茹f��筝紙���腮宴��"
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "莅��� Socket ���主�������"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "絲��� Socket ���主�������"
-
-#~ msgid "Authentication failed."
-#~ msgstr "茯�茘�紊掩����"
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "���ョ�����篁g⊆��"
-
-#~ msgid "Status: %s"
-#~ msgstr "����鐚�%s"
-
-#~ msgid "Could not connect"
-#~ msgstr "�≧��g�"
-
-#~ msgid "Reading data"
-#~ msgstr "莅���莖���筝�"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "��莢�莠�綛活 ��困茫�筝�"
-
-#~ msgid "Reading server key"
-#~ msgstr "莅��� Server Key 筝�"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "篋ゆ�絲��遺賢"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "�� GG Library 筝㊦����紊ч���\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "�≧���緇�篌堺��������"
-
-# XXX
-#~ msgid "Send as message"
-#~ msgstr "篁ヨ�������"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "��絨� GG 篌堺����"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "腟��篋��≧���� Gadu-Gadu UIN"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "�����絨��≧���� Gadu-Gadu UIN ���坂���荐�����"
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "�≧���緇���絨�腟���"
-
-#~ msgid "Birth Year"
-#~ msgstr "�榊��綛�"
-
-#~ msgid "Sex"
-#~ msgstr "�у��"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "Gadu-Gadu 篌堺�����筝�����峨�篁私���絅遵�羝�����"
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "�≧���失�������緇�絅遵�����"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "������絨�絅遵�羝����渇���� Gadu-Gadu 篌堺�����"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "�≧��渇��絅遵�羝����� Gadu-Gadu 篌堺�����"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "������絨�絅遵�羝����� Gadu-Gadu 篌堺���������"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "�≧����ゅ�� Gadu-Gadu 篌堺�������絅遵�羝���"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "絲�腆主�≧�篆���"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "�� Gadu-Gadu 篌堺����������主�����"
-
-#~ 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 篌堺����������主���馹�鐚���篁� Gaim 羃���莨��絎���������絎�"
-#~ "��綏ヤ���茫�緇�������荅���"
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "�≧����� Gadu-Gadu ��絅遵�羝���"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr "Gaim �≧��d� Gadu-Gadu 絅遵�羝���失������茫���藥���荅��罨<��"
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "�≧����阪ソ��羝���"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the buddy list server.  Please try again "
-#~ "later."
-#~ msgstr "Gaim �≧��d�絅遵�羝���失������茫���藥���荅��罨<��"
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "�≧����� Gadu-Gadu 絅遵�羝���"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "�≧�絖�������"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "���� Gaim 羃���莨���d�����篌堺�������篁ョ�≧���絨�����筝���莖�����茫�緇�������荅��"
-#~ "罨<��"
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "���� Gaim 羃���莨���d� Gadu-Gadu 篌堺�������篁ョ�≧�篆��号����絲�腆若��茫�緇�������"
-#~ "荅��罨<��"
-
-#~ msgid "Directory Search"
-#~ msgstr "������絨�"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "�≧�莅���篏睡����膂>�罟���"
-
-#~ 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 羃���莨���d�����篌堺�������篁ョ�≧���緇�篏睡������篋阪��莖�����茫�緇�������"
-#~ "荅��罨<��"
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim ���g� ICQ 篌堺�������主�������"
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "篏睡���� %s (%s%s%s%s%s) 荀�羆�����茯�茘���"
-
-#~ msgid "Send message through server"
-#~ msgstr "���幞�����渇��荐���"
-
-#~ msgid "Connecting..."
-#~ msgstr "�g�筝�..."
-
-#~ msgid "Nick:"
-#~ msgstr "�援┗鐚�"
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim 篏睡����"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "罟�罅��活叱綏画←��羔�"
-
-# XXX ����⑮����絅遵� %s ��莖�荐���罸�莠�����鐚�
-#~ msgid "Buddy Information for %s"
-#~ msgstr "%s ��絅遵�莖�荐�"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "�援┗��%s���≧��"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "�援┗�≧��"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber ��篋肴���"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "��紊��羝������"
-
-#~ msgid "Logged out"
-#~ msgstr "綏牙�糸�冴��"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "�沿�鋎�罐㊦鎧腟�"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "篏睡���� %s �活�絨������ヤ�鐚�絅刻���絅遵�羝���賢��"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "蕁�ず��篋よ�荀�腦�綏臥������������"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "蕁�ず��篋よ�綏臥�丈����������"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "������篋よ���臀�お箙�鐚�筝��綏牙��丈����"
-
-#~ msgid "%s has closed the conversation window."
-#~ msgstr "%s ����篋�篋よ�荀�腦���"
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ャ��"
-
-#  NOTE��User Properties��篆�����篏睡����莖�荐���鐚���茗�KingAnt��LSchiere茹i��
-#~ msgid "User Properties"
-#~ msgstr "篏睡����莖�荐�"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "罟�罅� %s �渇��綏臥�丈����"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ラ����絽活����"
-
-#~ msgid "Not specified"
-#~ msgstr "羃���紂��"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "%s �� ICQ 莖�荐�"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活��篁ョ��順�����"
-
-#~ msgid "Visible"
-#~ msgstr "�乗昆"
-
-#~ msgid "Available Message:"
-#~ msgstr "筝�膩�荐����"
-
-# XXX 茫�荀���
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "����轡篏�鐚�篏�荀阪�緇��駈���������紊��э�"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "荐㊤�筝�膩�荐���..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "�≧��∫����紊��"
-
-#~ msgid "Basic Profile"
-#~ msgstr "�堺�����"
-
-#~ msgid "Profile Information"
-#~ msgstr "��篋肴�荐�"
-
-# NOTE SimGuy: probably "Other IM services" if you can do that one :)
-#~ msgid "Instant Messagers"
-#~ msgstr "�銀��恰���活�絽活��"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ 絽活��"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "��箴���"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "荐㊤����� Trepia ��篋肴�����"
-
-#~ msgid "Profile"
-#~ msgstr "��篋肴���"
-
-#~ msgid "Set Profile"
-#~ msgstr "荐㊤���篋肴���"
-
-# NOTE 茘����翫�� by Paladin
-#~ msgid "Visit Homepage"
-#~ msgstr "��茹�膓臥��"
-
-# NOTE Debian 茘���local���冴�����亥���
-#~ msgid "Local Users"
-#~ msgstr "���亥���篏睡����"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia ��絎�罔∞�"
-
-# XXX ��⑮
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "��群膓�茴��糸�削����堺��群��Ί����糸�ャ��"
-
-#~ msgid "Please enter your password"
-#~ msgstr "茫�莠後�ユ����絲�腆�"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s �糸�ャ��"
-
-#~ msgid "%s signed on"
-#~ msgstr "%s 綏牙��糸��"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s �糸�冴��"
-
-#~ msgid "%s signed off"
-#~ msgstr "%s 綏牙��糸��"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s ����茴� %s 茘���篋���\n"
-#~ "�����域⑥��膈�膣��� %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "筝����水����"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s ��茫�篋� %s �域��紊����%s��鐚�\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "筝�絅醇��������∫��筝�筝�筝�鐚�"
-
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/篋よ�/�ュ��(_L)..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/�檎��/蕁�ず�����活�(_I)"
-
-# NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr "Gaim �≧�箴��у�����箴��ゅ�ュ襲��弢�鐚�����倶�� PNG 罟�������"
-
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "��荐㊦�� SILC Key Pair"
-
-#~ msgid "SILC Public Key"
-#~ msgstr "SILC ����"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "SILC 腱���"
-
-#  FIXME ��絅遵�鏅��h⑮鐚�茫���綽���茘�
-#~ msgid "Miscellaneous error"
-#~ msgstr "��蕁����"
-
-#~ msgid "Unable to connect to %s server"
-#~ msgstr "�≧��g��� %s 篌堺����"
-
-#~ msgid "Error writing to %s server"
-#~ msgstr "�� %s 篌堺����������主�����"
-
-#~ msgid "Error reading from %s server"
-#~ msgstr "�� %s 篌堺����������主�����"
-
-#~ msgid "Unable to connect to server"
-#~ msgstr "�≧��g��遺失����"
-
-#~ msgid "Unknown error when attempting to authorize with MSN login server."
-#~ msgstr "��荅���� MSN ���糸�ヤ失�����画�茯�茘�����鐚��主��篋�筝����������"
-
-#~ msgid "Requesting to send password"
-#~ msgstr "���阪�腆寂賢"
-
-#~ msgid "Myanmar"
-#~ msgstr "膩��御��"
-
-#~ msgid "Initiate Chat"
-#~ msgstr "������紊��"
-
-#~ msgid "Received HTTP error. Please report this."
-#~ msgstr "�九�遺��� HTTP ���鐚�茫������取���怨����"
-
-#~ msgid ""
-#~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%d "
-#~ "bytes)."
-#~ msgstr "Gaim �≧���� Yahoo! �勌��紊ф�� %d MB (%d ��篏���腟�) ��罟�罅���"
-
-#~ msgid "Syncing with server"
-#~ msgstr "��篌堺������罩ヤ賢"
-
-#~ msgid "Message could not be sent for an unknown reason"
-#~ msgstr "���坂������鐚��≧�絨�荐������冴��"
-
-#  FIXME weirdness
-#~ msgid ""
-#~ "%s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "(There was an error converting this message.  Check the 'Encoding' option "
-#~ "in the Account Editor)"
-#~ msgstr "鐚��咲����荐������膩�⊆���主��篋������茫�罟∽�ュ験��羝���賢����膩�⊆���檎��鐚�"
-
-#~ msgid "MSN error for account %s"
-#~ msgstr "絽活�� %s 箙� MSN ���"
-
-#~ msgid "Moving Gaim Settings.."
-#~ msgstr "腱糸��荐㊤�罟�罅�筝�..."
-
-#~ msgid "Moving Gaim user settings to: "
-#~ msgstr "���� Gaim ��篏睡����荐㊤��������上��Щ�鰹�"
-
-#~ msgid "Notification"
-#~ msgstr "����"
-
-#  NOTE ���腴�����荐�
-#  NOTE 篁ヤ���Address book������Person��箙�絨��� evolution PO 罟�箙�茘��鐚�荀�
-#  NOTE http://developer.gnome.org/projects/gtp/status/gnome-2.6/PO/evolution.HEAD.zh_TW.po
-#  NOTE 茘����翫�� by Ambrose
-#~ msgid "Local Addressbook"
-#~ msgstr "���亥���������"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>��臀�</b>"
-
-#~ msgid "(There was an error receiving this message)"
-#~ msgstr "鐚��九�����荐������主�����鐚�"
-
-#~ msgid "_Accounts"
-#~ msgstr "絽活��(_A)"
-
-#~ msgid "_Preferences"
-#~ msgstr "�鎁処┃絎�(_P)"
-
-#~ msgid "Update Buddy Icon"
-#~ msgstr "�贋�医ソ����腓�"
-
-#~ msgid ""
-#~ "No such command. If you didn't mean to type a command, you can turn "
-#~ "commands off from Tools->Preferences->Interface->Conversation->Enable "
-#~ "\"slash\" commands."
-#~ msgstr ""
-#~ "羃���篏���莠後�ョ����篁わ���絋�篏��≧�颮後�ユ��篁わ�篏���札�����鎴ュ�撃���鎁処┃絎���篁��≒��篋�"
-#~ "茫���篏睡������膩����鋌ゃ���檎����罩∽��篁よ叱�ョ�����純��"
-
-#~ msgid ""
-#~ "Syntax Error:  You typed the wrong number of arguments to that command. "
-#~ "If you didn't mean to type a command, you can turn commands off from "
-#~ "Tools->Preferences->Interface->Conversation->Enable \"slash\" commands."
-#~ msgstr ""
-#~ "茯�羈����鐚�莠後�ョ�����後��惹��篁ゆ���������御�檎�����鎂�篏��≧�颮後�ユ��篁わ�篏���札���"
-#~ "��鎴ュ�撃���鎁処┃絎���篁��≒��篋よ���篏睡������膩����鋌ゃ���檎����罩∽��篁よ叱�ョ�����純��"
-
-#~ msgid "Userid"
-#~ msgstr "篏睡���� ID"
-
-# NOTE 茘����翫�� by Ambrose
-#~ msgid "Your message did not get sent."
-#~ msgstr "�≧����堺����荐�����"
-
-#~ msgid "Your message to %s did not get sent:"
-#~ msgstr "�����腟� %s ��荐����≧����削�"
-
-#~ msgid "That file does not exist."
-#~ msgstr "罟�罅�筝�絖�����"
-
-#~ msgid "%s was not found.\n"
-#~ msgstr "%s �鞘��違��\n"
-
-#~ msgid "<font sml=\"msn\">%s</font><br>"
-#~ msgstr "<font sml=\"msn\">%s</font><br>"
-
-#~ msgid "Already logged in with Zephyr"
-#~ msgstr "綏牙��糸�� Zephyr"
-
-#~ msgid ""
-#~ "Because Zephyr uses your system username, you are unable to have multiple "
-#~ "accounts on it when logged in as the same user."
-#~ msgstr "���� Zephyr �����糸�ョ鎧腟援��絽活��鐚���������醇����紊��� Zephyr 絽恰�句����"
-
-#~ msgid "sorry, i ran out for a while. bbl"
-#~ msgstr "筝�絅醇��������∫��筝�筝�筝���"
-
-#~ msgid "boring default"
-#~ msgstr "�∴��鐚���荐㍼�"
-
-#~ msgid "help:  List available commands."
-#~ msgstr "help鐚����阪�������篁ゃ��"
-
-#~ msgid "_Send auto-response"
-#~ msgstr "���肴��������(_S)"
-
-#~ msgid "_Only send auto-response when idle"
-#~ msgstr "������臀����������肴��������(_O)"
-
-#~ msgid "That file already exists."
-#~ msgstr "�e��罟�罅�綏牙�絖�����"
-
-#~ msgid "MSN ID"
-#~ msgstr "MSN 絽活��"
-
-#~ msgid "Modes"
-#~ msgstr "罔≦�"
-
-#~ msgid "User Count:\t\t%d\n"
-#~ msgstr "篏睡�����醐�%d\n"
-
-#~ msgid "Channels"
-#~ msgstr "�脂��"
-
-#~ msgid "Buddy icon file:"
-#~ msgstr "絅遵���腓堺�罅�鐚�"
-
-#~ msgid "_Browse"
-#~ msgstr "�頳�(_B)"
-
-#~ msgid "_Reset"
-#~ msgstr "��臀�(_R)"
-
-#~ msgid "Show IMs and chats in _same tabbed window"
-#~ msgstr "篏睡����筝���罔�膠よ�腦�蕁�ず�恰��荐�������紊�(_S)"
-
-#~ msgid "New window _placement:"
-#~ msgstr "�域�腦�篏�臀�(_P)鐚�"
-
-#  FIXME 茘�����緇��拷��
-#~ msgid "Number of conversations per window:"
-#~ msgstr "荀�腦��т�篋よ����娯���鐚�"
-
-#~ msgid ""
-#~ "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-#~ "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE "
-#~ "TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-#~ msgstr ""
-#~ "<B>��吡�� IRC ��篁わ�</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-#~ "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE "
-#~ "TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-
-#~ msgid ""
-#~ "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-#~ "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-#~ msgstr ""
-#~ "<B>��吡�� IRC ��篁わ�</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-#~ "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-
-#~ msgid "No help is available at this time for this command."
-#~ msgstr "���������咲������篁ゆ�箴�茯�����"
-
-#~ msgid "Change your nickname"
-#~ msgstr "篆��号�援┗"
-
-#~ msgid "<html><body><b>Error retrieving profile</b></body></html>"
-#~ msgstr "<html><body><b>莅�����篋肴�荐����主�����</b></body></html>"
-
-#~ msgid "Real Name"
-#~ msgstr "紮���"
-
-#~ msgid "User Name"
-#~ msgstr "篏睡������腮�"
-
-#~ msgid "Host Name"
-#~ msgstr "筝紙���腮�"
-
-#~ msgid "%d bits"
-#~ msgstr "%d ��篏���"
-
-#~ msgid "Unknown error number %d."
-#~ msgstr "���ョ�����篁g⊆ %d��"
-
-#~ msgid "Syntax error"
-#~ msgstr "茯�羈����"
-
-#~ msgid "Command failed"
-#~ msgstr "��篁ゅけ��"
-
-#~ msgid "Unable to request USR\n"
-#~ msgstr "�≧���緇� USR\n"
-
-#~ msgid "Unable to login using MD5"
-#~ msgstr "�≧�篏睡�� MD5 �糸��"
-
-#~ msgid "Unable to send USR"
-#~ msgstr "�≧����� USR"
-
-#~ msgid "Unable to request CVR\n"
-#~ msgstr "�≧���緇� CVR\n"
-
-#~ msgid "Unable to request INF\n"
-#~ msgstr "�≧���緇� INF\n"
-
-#~ msgid "Got invalid XFR"
-#~ msgstr "��緇��≧���� XFR"
-
-#~ msgid "Unable to transfer"
-#~ msgstr "�≧��渇��"
-
-#~ msgid "Unable to parse message."
-#~ msgstr "�≧�茹f��荐�����"
-
-#~ msgid "Unable to write to server"
-#~ msgstr "�≧�絲��ュ�遺失����"
-
-#~ msgid ""
-#~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-#~ "meant %s@hotmail.com. No changes were made to your allow list."
-#~ msgstr ""
-#~ "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com��"
-#~ "����絨�筝���莅��贋������荐掩�����"
-
-#~ msgid "Invalid MSN screen name"
-#~ msgstr "�≧���� MSN 篏睡����絽活��"
-
-# MSN6.0筝㊥����絨���Block��筝�荅���茘����冴��絨�����
-#~ msgid ""
-#~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-#~ "meant %s@hotmail.com. No changes were made to your block list."
-#~ msgstr ""
-#~ "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com��"
-#~ "����絨�筝���莅��贋����絨���羝�����"
-
-#~ msgid "Unable to write to MSN Nexus server."
-#~ msgstr "�≧�絲��ュ�� MSN �� Nexus 篌堺������"
-
-#~ msgid "MSN Nexus server returned invalid redirect information."
-#~ msgstr "MSN Nexus 篌堺�����喝���≧�������医���莖�荐���"
-
-#~ msgid "Protocol not supported"
-#~ msgstr "筝���吨������荐���絎�"
-
-#~ msgid "The user %s (%s) wants to add you to their buddy list."
-#~ msgstr "篏睡���� %s鐚�%s鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���"
-
-#~ msgid "Unable to transfer to notification server"
-#~ msgstr "�≧��渇���渇���ヤ失����"
-
-#~ msgid "An MSN message may not have been received."
-#~ msgstr "���� MSN 荐�����醇�茴��九�違��"
-
-#~ msgid "Co_lorize screen names"
-#~ msgstr "絨�絽活��篁ラ��峨����(_L)"
-
-#~ msgid ""
-#~ "Error reading from %s server. Lastcommand was:\n"
-#~ " %s"
-#~ msgstr "�� %s 篌堺����������主�����鐚���緇�筝�����篁ょ�� %s"
-
-#~ msgid "Window"
-#~ msgstr "荀�腦�"
-
-#~ msgid "Buddy Icons"
-#~ msgstr "絅遵���腓�"
-
-#~ msgid "Typing Notification"
-#~ msgstr "莠後�ラ����"
-
-#~ msgid "Proxy Type"
-#~ msgstr "篁g��篌堺��������"
-
-#~ msgid "IMs"
-#~ msgstr "�恰��荐���"
-
-#~ msgid "Protocols"
-#~ msgstr "��荐���絎�"
-
-#~ msgid "Full Name:\t\t%s\n"
-#~ msgstr "����鐚�������\t%s\n"
-
-#~ msgid "First Name:\t%s\n"
-#~ msgstr "��鐚���������\t%s\n"
-
-# NOTE: 羈���緇傑����茘���膃��������鐚����㊥��茘����銀�����鐚��ユ���活⑮篋�篋�
-# NOTE: ��恐筝�綛冗���亥�eぇ絖後����掩���ュ����鐚��上����箙�莊����㊥��PO罟�������羈��後��
-#~ msgid "Middle Names:\t%s\n"
-#~ msgstr "�掩���ュ��鐚���\t%s\n"
-
-#~ msgid "Family Name:\t%s\n"
-#~ msgstr "紮�鐚���������\t%s\n"
-
-#~ msgid "Nickname:\t\t%s\n"
-#~ msgstr "�援┗鐚�������\t%s\n"
-
-#~ msgid "Birth Day:\t\t%s\n"
-#~ msgstr "���ワ�������\t%s\n"
-
-#~ msgid "Unit:\t\t%s\n"
-#~ msgstr "����鐚�������\t%s\n"
-
-#~ msgid "Homepage:\t%s\n"
-#~ msgstr "膓臥��鐚�������\t%s\n"
-
-#~ msgid "Address:\t%s\n"
-#~ msgstr "�医��鐚�������\t%s\n"
-
-#~ msgid "Tel:\t\t\t%s\n"
-#~ msgstr "�肢�鐚�������\t%s\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Note:\t\t%s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��荐誌�������\t%s\n"
-
-#~ msgid "Server:\t\t%s\n"
-#~ msgstr "篌堺���������\t%s\n"
-
-#~ msgid "Connection timeout"
-#~ msgstr "�g�綏臥�丈��"
-
-# NOTE �������po罟������������号�鐚���茯��堺�莠�羝�罐�
-#~ msgid "ZLocate"
-#~ msgstr "������絨� (ZLocate)"
-
-#~ msgid "_Show people joining in window"
-#~ msgstr "���腦�筝㊨¨腓阪�銀�篋咲�峨�ョ��篋�篁�(_S)"
-
-#~ msgid "_Show people leaving in window"
-#~ msgstr "���腦�筝㊨¨腓阪�銀�篋咲�∫����篋�篁�(_S)"
-
-#~ msgid "I_ndividual log file for each buddy's signons"
-#~ msgstr "篁ュ���ョ���ヨ�荐������ュソ�����糸��(_N)"
-
-#~ msgid "Fonts"
-#~ msgstr "絖���"
-
-#~ msgid "Set"
-#~ msgstr "荐㊤�絽活��"
-
-#~ msgid "idle for"
-#~ msgstr "��臀�����"
-
-#~ msgid "Buddy List Toolbar"
-#~ msgstr "絅遵�羝���轡�桁��"
-
-#~ msgid "Group Display"
-#~ msgstr "臂ょ�蕁�ず"
-
-#~ msgid "Show _numbers in groups"
-#~ msgstr "蕁�ず臂ょ�茖∞��絅遵�/��紊���悟��(_N)"
-
-#~ msgid "Show status _icons on tabs"
-#~ msgstr "���膠や�蕁�ず絅遵�����(_I)"
-
-#~ msgid "Sounds when you _log in"
-#~ msgstr "�糸�ユ���弱�咲�恰��鐚�_L)"
-
-#~ msgid "Seconds before _resending:"
-#~ msgstr "���阪��荀�����膈�緇�腱���(_R)鐚�"
-
-#~ msgid "Send auto-response in _active conversations"
-#~ msgstr "�����画���篋よ�箙�荀����肴��������(_A)"
-
-#~ msgid "New window _width:"
-#~ msgstr "�域�腦�絲�墾(_W)鐚�"
-
-#~ msgid "_Entry field height:"
-#~ msgstr "莠後�ユ�蕭�綺�(_E)鐚�"
-
-#~ msgid "Tab Completion"
-#~ msgstr "Tab Completion"
-
-#~ msgid "_Tab-complete nicks"
-#~ msgstr "篏睡�� Tab �球巷��叱�ユ�援┗(_T)"
-
-#~ msgid "_Old-style tab completion"
-#~ msgstr "��綣� Tab Completion (_O)"
-
-#~ msgid "_Sending messages removes away status"
-#~ msgstr "���肴�������羔��∫������(_S)"
-
-#~ msgid ""
-#~ "You are not currently signed on with any protocols that have the ability "
-#~ "to list rooms."
-#~ msgstr "��研���糸�ヤ算篏�筝�����������肴��紊������荐���絎���"
-
-#~ msgid "Warning: Passwords are stored in plain text!"
-#~ msgstr "茘���鐚�絲�腆弱�篁ユ����綵√��峨�鐚�"
-
-#~ msgid "<b>Screen Name:</b>"
-#~ msgstr "<b>絽活��鐚�</b>"
-
-#~ msgid "AIM Screen name"
-#~ msgstr "AIM 絽活��"
-
-#~ msgid "Preparing Buddy List"
-#~ msgstr "����絅遵�羝���賢"
-
-#~ msgid "Rendezvous Protocol Plugin"
-#~ msgstr "Rendezvous ��絎�罔∞�"
-
-#~ msgid "Share AIM screen name"
-#~ msgstr "�������� AIM 絽活��"
-
-#~ msgid "/Tools/P_rotocol Actions"
-#~ msgstr "/綏ュ��/��荐���絎��檎��荐㊤�(_R)"
-
-#~ msgid "/Tools/Protocol Actions"
-#~ msgstr "/綏ュ��/��荐���絎��檎��荐㊤�"
-
-#~ msgid "Style"
-#~ msgstr "蘂���"
-
-#~ msgid "_Bold"
-#~ msgstr "膕�蕭�(_B)"
-
-#~ msgid "_Italic"
-#~ msgstr "��蕭�(_I)"
-
-#~ msgid "_Underline"
-#~ msgstr "綺�膩�(_U)"
-
-#~ msgid "_Strikethrough"
-#~ msgstr "���ょ����絖�(_S)"
-
-#~ msgid "Face"
-#~ msgstr "絖�蕭�"
-
-#~ msgid "Use custo_m face"
-#~ msgstr "篏睡�������絖�蕭�(_M)"
-
-#~ msgid "Use custom si_ze"
-#~ msgstr "篏睡�������絖�蕭�紊у�(_Z)"
-
-#~ msgid "_Text color"
-#~ msgstr "��絖�蕁��(_T)"
-
-#~ msgid "Bac_kground color"
-#~ msgstr "�������(_K)"
-
-#~ msgid "Show graphical _smileys"
-#~ msgstr "蕁�ず茵���(_S)"
-
-#~ msgid "Show _URLs as links"
-#~ msgstr "蕁�ず URL �肴��g�(_U)"
-
-#~ msgid "Send _URLs as links"
-#~ msgstr "���� URL �肴��g�(_U)"
-
-#~ msgid "Hide window on _send"
-#~ msgstr "���肴��������荀�腦�(_S)"
-
-#~ msgid "Show _logins in window"
-#~ msgstr "���腦�筝㊨¨腓榊�糸�ヨ���(_L)"
-
-#~ msgid "Unable to send password"
-#~ msgstr "�≧����阪�腆�"
-
-#~ msgid "IO Error."
-#~ msgstr "IO �����"
-
-#~ msgid ""
-#~ "<b>Status:</b> %s\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "<b>����鐚�</b>%s\n"
-#~ "<b>荐����</b>%s"